aboutsummaryrefslogtreecommitdiff
path: root/gtk.c (follow)
Commit message (Collapse)AuthorAge
* Actually do what the comment says at the top of main() regarding notSimon Tatham2012-12-28
| | | | | | | | bombing out due to an option that we don't recognise but GTK will. Somehow my basically workable plan had been completely nullified by putting the error check in the wrong place. [originally from svn r9733]
* Fix overnight build failure last night, by making the new call toSimon Tatham2012-11-21
| | | | | | | | | | | | gtk_widget_get_allocation conditional on GTK being new enough to have that function. I'm assuming until someone proves otherwise that if it isn't that new, then it also isn't one of the versions of GTK which exhibit the bug which that call was working around (since gtk_widget_get_allocation came in 2.18, and the problem seems to have arisen since 2.20). [originally from svn r9712]
* Work around an annoying GTK behaviour I noticed the other day on mySimon Tatham2012-11-20
| | | | | | | | | | | | | | | | Ubuntu 12.04 machine. What seems to happen is that we set up a window containing a menu bar, a drawing area and a status bar, and set the size of the drawing area; then the window is displayed _without_ the menu bar; then we reduce the drawing area's size request to (1,1) to let the user resize the window smaller; and now GTK gets round to constructing the menu bar, and the drawing area helpfully shrinks a bit to make room for it. My fix is to set a 'shrink pending' flag instead of shrinking the drawing area's size request, and defer the actual shrink operation until the menu bar and status bar are both present. [originally from svn r9711]
* Allow --save to work with --soln, causing saved game files to beSimon Tatham2011-12-28
| | | | | | written out with the Solve operation having already been performed. [originally from svn r9375]
* Fix bug in error reporting for --save caused by freeing 'realname'Simon Tatham2011-12-28
| | | | | | before the error messages wanted to use it. [originally from svn r9374]
* Fix bug in --save caused by failure to initialise ctx.error to zeroSimon Tatham2011-12-28
| | | | | | before later checking to see if an errno code was dumped in it. [originally from svn r9373]
* Fixes to r8997: firstly, move the fix out of #ifdef CAIRO so that itSimon Tatham2010-11-06
| | | | | | | | | applies to both drawing mechanisms, and secondly, make sure to paint the spare pieces of window in the _puzzle's_ background colour rather than the (sometimes slightly different) system default. [originally from svn r9021] [r8997 == 26c669a6b2892b97b4a9bc6842f633291951fdbd]
* Jonas Koelker reports that using the version of GTK currently inSimon Tatham2010-09-14
| | | | | | | | | | | | | | Debian sid (2.20.1), there's a redraw problem when the window has a different aspect ratio from the puzzle (due to resizing or maximising): pieces of the window outside the real puzzle rectangle don't get redrawn when exposed (e.g. by the drop-down menus). Introduced code to explicitly redraw the whole exposed area, including the parts that fall outside the pixmap. This makes the problem go away in my hasty test install of sid, and doesn't seem to affect the build on lenny. [originally from svn r8997]
* Patch from Mark Wooding to introduce a draw_thick_line() function inSimon Tatham2010-05-29
| | | | | | | | | | | | the drawing API, for use by Loopy. It's optional: drawing.c will construct an acceptable alternative using a filled polygon if the front end doesn't provide it. Net and Netslide previously had static functions called draw_thick_line(), whose claim to the name is less justified and so they've been renamed. [originally from svn r8962]
* Patch from Mark Wooding to (optionally at compile time) use theSimon Tatham2010-05-29
| | | | | | | | Cairo rendering library in place of GDK, which provides pretty antialiased graphics much like we get on MacOS. Inertia and Untangle are perhaps the two games most obviously improved by this. [originally from svn r8961]
* Patch from Mark Wooding to disable GTK's internal double buffering,Simon Tatham2010-05-29
| | | | | | | which I didn't know about, but which is clearly a waste of effort since we keep our own backing pixmap for the puzzle window. [originally from svn r8960]
* Patch from Mark Wooding to use GTK stock items for standard 'OK',Simon Tatham2010-05-29
| | | | | | | | 'Yes' and 'No' buttons, which means they get the standard icons that go on those button types. Also reorders yes/no boxes so that they're the GNOME standard way round. [originally from svn r8959]
* Patch from Debian, to bring the use of the X selection/clipboard inSimon Tatham2010-04-25
| | | | | | | | | line with freedesktop.org. (This is relatively simple for Puzzles, since it only writes to the clipboard and never reads it, so the question of which selection to use when is most easily dealt with by always writing to both.) [originally from svn r8929]
* Introduce, and implement as usefully as I can in all front ends, aSimon Tatham2009-12-27
| | | | | | | | | | new function in the drawing API which permits the display of text from outside basic ASCII. A fallback mechanism is provided so that puzzles can give a list of strings they'd like to display in order of preference and the system will return the best one it can manage; puzzles are required to cope with ASCII-only front ends. [originally from svn r8793]
* Patch from Frode Austvik to tinker with the GTK interface ifSimon Tatham2009-12-17
| | | | | | | | compiling gtk.c with STYLUS_BASED defined: most notably, it provides a row of numeric 'keys' made of GTK button widgets for puzzles that want a numeric keypad. [originally from svn r8783]
* Patch from Mark Wooding: when I did r7980 I had completely failed toSimon Tatham2009-06-21
| | | | | | | | | notice that there was an _official_ way to have menu items marked as selected or unselected, which is the GtkRadioMenuItem class. Replace my ad-hoc use of bullet characters with that. [originally from svn r8601] [r7980 == ae6c7381272f84c0fd398f6d3e496f571ba42ec8]
* Patch from Mark Wooding: use gdk_event_request_motions() whereSimon Tatham2009-06-21
| | | | | | | | available, which magically seems to eliminate most if not all of the update lag when dragging a point in a large (say 250-point) Untangle. I don't fully understand how this works, but it seems to! [originally from svn r8600]
* Patch from Mark Wooding: stop setting GTK_EXPAND for the x-directionSimon Tatham2009-06-21
| | | | | | | | | | | | on labels in tables. The effect is that if you resize (e.g.) Solo's configuration panel, the labels to the left of the various input boxes will remain just big enough to fit their text in, and all the extra space will be taken up by the useful part, i.e. the input boxes themselves. Previously the labels and input boxes would expand in a 1:1 ratio, causing lots of space to the right of the label text that wasn't used for anything. [originally from svn r8599]
* Make menus accessible from the keyboard in the Gtk front-end.Jacob Nevins2009-03-01
| | | | [originally from svn r8486]
* Switch over to using the new-style GtkFileChooser in place of theSimon Tatham2009-01-26
| | | | | | | deprecated GtkFileSelection, at least when the latter is available. Patch mostly due to Ori Avtalion. [originally from svn r8431]
* Add an automatic check for HAVE_SENSIBLE_ABSOLUTE_SIZE_FUNCTION bySimon Tatham2009-01-24
| | | | | | | | using PANGO_CHECK_VERSION. (Irritatingly, the latter is not available in all versions of Pango, so we have to be cautious about using it at all. *sigh*) [originally from svn r8430]
* Add missing call to gtk_selection_clear_targets(), without which theSimon Tatham2008-12-01
| | | | | | | | list of selection targets offered by GTK Puzzles grows an extra copy of each of the three supported text formats every time the user makes a selection! [originally from svn r8365]
* The other day I found it useful for a (silly) special purpose toSimon Tatham2008-11-29
| | | | | | | | | generate a thousand saved-game files of randomly generated puzzles. On the general principle that if I find it useful someone else conceivably might too, add a --save option to the Unix puzzle binaries, for use with --generate in much the same way as --print. [originally from svn r8351]
* Check return values from fwrite when saving files.Simon Tatham2008-11-04
| | | | [originally from svn r8278]
* Lambros provides this workaround for a compiler warning on hisSimon Tatham2008-09-14
| | | | | | | Ubuntu system. I'm inclined to think the real problem is in his gtk headers, but this is a harmless enough change to avoid hassle. [originally from svn r8181]
* Don't call changed_preset() until after we've initialisedSimon Tatham2008-09-06
| | | | | | fe->copy_menu_item. [originally from svn r8163]
* New infrastructure feature. Games are now permitted to beSimon Tatham2008-09-06
| | | | | | | | | | | | | | | | | | | | | | _conditionally_ able to format the current puzzle as text to be sent to the clipboard. For instance, if a game were to support playing on a square grid and on other kinds of grid such as hexagonal, then it might reasonably feel that only the former could be sensibly rendered in ASCII art; so it can now arrange for the "Copy" menu item to be greyed out depending on the game_params. To do this I've introduced a new backend function (can_format_as_text_now()), and renamed the existing static backend field "can_format_as_text" to "can_format_as_text_ever". The latter will cause compile errors for anyone maintaining a third-party front end; if any such person is reading this, I apologise to them for the inconvenience, but I did do it deliberately so that they'd know to update their front end. As yet, no checked-in game actually uses this feature; all current games can still either copy always or copy never. [originally from svn r8161]
* New feature in midend.c which allows us to ask for the number of theSimon Tatham2008-04-08
| | | | | | | | | | currently selected preset, if any. I've used this in the GTK front end to have the Type menu mark the currently selected menu item. (After considerable beating of GTK with sticks, I might add. Grr.) Currently the same UI feature is not yet supported on Windows or MacOS, but I hope to do those too at some point if it's feasible. [originally from svn r7980]
* Ben Hutchings' patch to allow Gtk windows to be shrunk as well as grownJacob Nevins2007-03-03
| | | | | | | | (from Debian bug#379452). Tested on Gtk 2. I've been unable to find a Gtk+-1.2 installation on which Puzzles compiles, so not tested there. [originally from svn r7367]
* Refactoring patch from Ben Hutchings: move all the Gtk resize code into oneJacob Nevins2007-03-03
| | | | | | place. (From Debian bug#379452) [originally from svn r7366]
* In Windows/Gtk front-ends, consistently use the ellipsis convention for namingJacob Nevins2007-01-04
| | | | | | menu items which bring up dialogs. [originally from svn r7058]
* Phil Bordelon's patch yesterday should have initialised the GErrorSimon Tatham2007-01-03
| | | | | | to NULL. [originally from svn r7052]
* Phil Bordelon points out that my invocation of gdk_pixbuf_save()Simon Tatham2007-01-02
| | | | | | isn't quite right. [originally from svn r7050]
* Make errors in option parsing actually _do_ something in interactive mode.Jacob Nevins2006-12-30
| | | | [originally from svn r7039]
* Aha, this seems to be a more sensible way of getting screenshots:Simon Tatham2006-12-27
| | | | | | | | | instead of having the puzzle binary export its window ID to a script which then runs xwd, we can use the gdk-pixbuf library to have the puzzle binary _itself_ read its own internal pixmap and save it straight to a PNG. How handy. And faster, and less timing-sensitive. [originally from svn r7022]
* Support for run-time icons in the GTK puzzles. This involved anotherSimon Tatham2006-12-27
| | | | | | | | | | mkfiles.pl change (I don't seem to be planning ahead very well this week), this time to provide a list of fallback options for an object file. That way, I have a no-icon.c which quietly replaces icons/foo-icon.c if the latter doesn't exist, and so again people checking straight out from Subversion shouldn't have trouble. [originally from svn r7021]
* New mechanism for automatic generation of the puzzle screenshots onSimon Tatham2006-12-26
| | | | | | | | | | | | | | | | | | | the web, which I hope will also end up being extended to generate both Windows and X icons for each individual puzzle. The mechanism is: for each puzzle there's a save file in the `icons' subdirectory showing a game state which I think is a decent illustration of the puzzle, and then there's a nasty set of scripts which runs each puzzle binary, loads that save file, grabs a screenshot using xwd, and munges it into shape. In order to support this I've added two new options (--redo and --windowid) to all the GTK puzzles, which I don't expect ever to be used outside the icons makefile. I've also added two more options (--load and --id) which force a GTK puzzle to treat its command-line option as a save file or as a game ID respectively (the previous behaviour was always to guess, and sometimes it guessed wrong). [originally from svn r7014]
* Since r6711, puzzles built with Gtk 1.2 would take double actions when a menuJacob Nevins2006-06-26
| | | | | | | | | | accelerator key (N/U/R/Q) was pressed -- once for the menu accelerator, and once more in key_event(). This workaround, while unlovely, should at least not break in future (since the things it relies on are unlikely to change). [originally from svn r6745] [r6711 == 077aa510c78f3273bd0d4ca4f1ca14780822ebf9]
* Trivial patch from Ben Hutchings to support resizable windows underSimon Tatham2006-05-20
| | | | | | | GTK. All the infrastructure in the midend and beyond was already there; it was just a matter of enabling it! [originally from svn r6712]
* Ben Hutchings's patch to add display of key accelerators in the GameSimon Tatham2006-05-20
| | | | | | menu. [originally from svn r6711]
* Cleanup: relieve frontends of the duty to callSimon Tatham2005-10-22
| | | | | | | | | | | | | midend_rewrite_statusbar() and check the result against the last string returned. This is now done centrally in drawing.c, and the front end status bar function need only do what it says on the tin. While I'm modifying the prototype of drawing_init(), I've also renamed it drawing_new() for the same reason as random_new() (it _allocates_ a drawing object, rather than just initialising one passed in). [originally from svn r6420]
* New puzzle: `Tents'. Requires a potentially shared algorithms moduleSimon Tatham2005-10-13
| | | | | | | maxflow.c. Also in this checkin, fixes to the OS X and GTK back ends to get ALIGN_VNORMAL right. This is the first time I've used it! :-) [originally from svn r6390]
* Backspace and Delete keys now function like Space in Solo.Simon Tatham2005-08-29
| | | | [originally from svn r6237]
* There seems to be some odd behaviour when GTK is asked to draw anSimon Tatham2005-08-28
| | | | | | | | outline polygon with a clipping rectangle active. I don't know or care whether this is GTK or my X server or what, but I'm working around it by drawing the lines myself, which seems to sort it out. [originally from svn r6227]
* Don't report an error when loading a saved game from the commandSimon Tatham2005-08-23
| | | | | | line unless there really _is_ an error! [originally from svn r6203]
* Substantial infrastructure upheaval. I've separated the drawing APISimon Tatham2005-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as seen by the back ends from the one implemented by the front end, and shoved a piece of middleware (drawing.c) in between to permit interchange of multiple kinds of the latter. I've also added a number of functions to the drawing API to permit printing as well as on-screen drawing, and retired print.py in favour of integrated printing done by means of that API. The immediate visible change is that print.py is dead, and each puzzle now does its own printing: where you would previously have typed `print.py solo 2x3', you now type `solo --print 2x3' and it should work in much the same way. Advantages of the new mechanism available right now: - Map is now printable, because the new print function can make use of the output from the existing game ID decoder rather than me having to replicate all those fiddly algorithms in Python. - the new print functions can cope with non-initial game states, which means each puzzle supporting --print also supports --with-solutions. - there's also a --scale option permitting users to adjust the size of the printed puzzles. Advantages which will be available at some point: - the new API should permit me to implement native printing mechanisms on Windows and OS X. [originally from svn r6190]
* (GTK only so far) Allow the argument passed to a game binary to beSimon Tatham2005-07-24
| | | | | | | | either a game ID or a save file name. (The former takes priority, because you can usually find a synonym for the latter, such as by prepending `./' or `$PWD/'.) [originally from svn r6135]
* Add a `full' parameter to validate_params(), analogous to the one inJacob Nevins2005-07-05
| | | | | | | | | | | encode_params(). This is necessary for cases where generation-time parameters that are normally omitted from descriptive IDs can place restrictions on other parameters; in particular, when the default value of a relevant generation-time parameter is not the one used to generate the descriptive ID, validation could reject self-generated IDs (e.g., Net `5x2w:56182ae7c2', and some cases in `Pegs'). [originally from svn r6068]
* draw_polygon() and draw_circle() have always had a portabilitySimon Tatham2005-07-03
| | | | | | | | | | | | | | | | | | | constraint: because some front ends interpret `draw filled shape' to mean `including its boundary' while others interpret it to mean `not including its boundary' (and X seems to vacillate between the two opinions as it moves around the shape!), you MUST NOT draw a filled shape only. You can fill in one colour and outline in another, you can fill or outline in the same colour, or you can just outline, but just filling is a no-no. This leads to a _lot_ of double calls to these functions, so I've changed the interface. draw_circle() and draw_polygon() now each take two colour arguments, a fill colour (which can be -1 for none) and an outline colour (which must be valid). This should simplify code in the game back ends, while also reducing the possibility for coding error. [originally from svn r6047]
* Load and Save are now supported on all three desktop platforms, andSimon Tatham2005-06-30
| | | | | | | documented. (This means the GTK temporary dependency on an environment variable is now gone.) [originally from svn r6042]