OK, this is the patch fixing the typo.
Should be god for both S2_4 and trunk.

(file #17714)

No-one screamed...

Use GtkGrid for editor gui.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (59/60)

(Browse SVN revision 22586)

Use GtkGrid on start page.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (57/60)

(Browse SVN revision 22584)

Use GtkGrid in load dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (55/60)

(Browse SVN revision 22582)

Use GtkGrid for city dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (52/60)

(Browse SVN revision 22580)

Use GtkGrid for popup notify.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (50/60)

(Browse SVN revision 22578)

Use GtkGrid in unit selection dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (48/60)

(Browse SVN revision 22576)

Use GtkGrid for nations.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (46/60)

(Browse SVN revision 22574)

Use GtkGrid in player dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (44/60)

(Browse SVN revision 22572)

Use GtkGrid in choice dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (42/60)

(Browse SVN revision 22570)

Use GtkGrid for luaconsole.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (40/60)

(Browse SVN revision 22567)

Use GtkGrid in diplomacy dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (38/60)

(Browse SVN revision 22563)

Use GtkGrid in option dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (36/60)

(Browse SVN revision 22561)

Use GtkGrid on main page.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (34/60)

(Browse SVN revision 22558)

Use GtkGrid for chatline tools.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (32/60)

(Browse SVN revision 22556)

Use GtkGrid for city info.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (26/60)

(Browse SVN revision 22554)

Use GtkGrid for map widget.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (24/60)

(Browse SVN revision 22552)

Use GtkGrid in CMA gui.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (22/60)

(Browse SVN revision 22550)

Fixed some orientation related deprecations.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (15/60)

(Browse SVN revision 22548)

Removed unused requisition variable.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (10/60)

(Browse SVN revision 22546)

Removed redundant visibility-notify-event callback.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (8/60)

(Browse SVN revision 22544)

Rates dialog code modernization.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (6/60)

(Browse SVN revision 22542)

Use GdkRGBA for citydlg labels

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (4/60)

(Browse SVN revision 22540)

Center gtk3-client window as it opens.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (1/60)

(Browse SVN revision 22536)

This is what I have on my 2.4 branch.
It includes all the patches that got into trunk and a few that didn't.

Obviously, cherry-picking "Use g_strdup_printf() or g_strdup()..." patch has muddled the patchset a bit and is probably not really valid for 2.4.

There's also some some minor things like:
- 0001 patch, which got accepted and 0019, which didn't (patch #3560), do basically the same thing in different places - "gtk-button-images" is an upstream invention, not mine and arguably gui_gtkX_small_display_layout is sort of similar idea (using display space as efficiently as possible)
- 0004 patch is technically a bugfix, so it should have been picked up already
- patch #3572 is yet to be fully tested

(file #17382)

Actually, most of my testing was done on 2.4 branch, so I still have my changes rebased on top of S2_4 branch.
Though I did cherry-pick a few other patches from trunk, including one or two that I probably didn't need that much, so you'd need to clean them up a bit.

Months ago, I remember looking at some of the earlier commits to trunk in this ticket and thinking that they were visible improvements we might well want for S2_4.

On a brief look now I can't remember what exactly I was thinking of, unhelpfully. But anyway, in principle, is there a reason not to port the changes to the Gtk3 client code wholesale to S2_4? It's not like S2_4 gtk3 has a long history of testing behind it (I've noticed no feedback from users), and having two different gtk3 codebases to maintain seems like making a rod for our own backs. Unless all these GtkGrid changes are particularly risky, or bump the minimum required Gtk version or something?

(I haven't actually tried trunk gtk3 myself since the GtkGrid stuff went in.)

Use GtkGrid for editor gui.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (59/60)

(Browse SVN revision 22084)

Use GtkGrid on start page.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (57/60)

(Browse SVN revision 22075)

Use GtkGrid in load dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (55/60)

(Browse SVN revision 22072)

53/60 raised as patch #3572, just because I'm yet to test it.

Use GtkGrid in city settings.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (51/60)

(Browse SVN revision 22050)

Use GtkGrid in science dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (49/60)

(Browse SVN revision 22045)

Use GtkGrid for diplomat actions dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (47/60)

(Browse SVN revision 22042)

Use GtkGrid in city report.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (45/60)

(Browse SVN revision 22039)

Use GtkGrid in goto dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (43/60)

(Browse SVN revision 22033)

Use GtkGrid in for main menubar.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (41/60)

(Browse SVN revision 22027)

Use GtkGrid in spaceship dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (39/60)

(Browse SVN revision 22013)

Use GtkGrid in message dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (37/60)

(Browse SVN revision 22007)

Use GtkGrid in intelligence dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (35/60)

(Browse SVN revision 22004)

Use GtkGrid for CMA.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (33/60)

(Browse SVN revision 21996)

31/60 raised as patch #3566 for bug found in testing

29/60 raised as patch #3565 as it depends on patch #3561 and cannot be committed yet. (I want to go though patches in this ticket in order so every one is certainly handled)

27/60 raised as patch #3561 for problem found in testing.

Use GtkGrid in gui_main.c

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (25/60)

(Browse SVN revision 21991)

Use GtkGrid for basic info.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (23/60)

(Browse SVN revision 21985)

21/60 raised as patch #3560, since it seems not to work.

20/60 is duplicate of bug #20095

Use gtk_widget_get_display() instead of gdk_screen_get_display().

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (18/60)

(Browse SVN revision 21981)

16/60 is duplicate of patch #3348

I've raised new version of 14/60 as patch #3557

Also 12/60 handled as part of patch #3550.

Removed unused requisition variable.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (10/60)

(Browse SVN revision 21966)

Removed redundant visibility-notify-event callback.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (8/60)

(Browse SVN revision 21960)

Rates dialog code modernization.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (6/60)

(Browse SVN revision 21947)

Use GdkRGBA for citydlg labels

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (4/60)

(Browse SVN revision 21935)

Font style improvements in gtk3-client theme

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (2/60)

(Browse SVN revision 21910)

Usually we've enforced 1 patch/ticket policy to avoid tickets being in some pseudo state of being partly resolved (some patches committed) and partly not. With patchset of 60 patches I think we can try different approach here - forcing you to create 60 new tickets doesn't sound like good use of development time.

We resolve everything trivial (anything I end up committing without further comments) as part of this ticket. When ever some patch needs further discussion, it won't block this ticket, but new ticket will be created for the particular patch at that point.

This tarball carries complete patchset against r21858 trunk.

There are quite a few patches here, that are already attached to other bugs/patches here, but there are just too many changes already to show the current state in any other way.

This isn't final yet - while grids have a few upsides, one downside in regard of boxes is that there's no real equivalent of gtk_box_pack_end - attaching at the end is simple, from - not so. To do that, I'll need to fix a few things.

It's not quite 1:1 - I think I went in the other direction this time and added too much spacing - but it should mostly match previous behavior.

But - unless I've missed something - it's more or less done.

Probably made a mistake or two there, so please review (especially votebar wasn't quite tested - didn't came up with an easy test setup).

Among the changes there are a few minor enhancements (i.e. in rates dialog - though I'm not sure I've made it in the right part of it (namely in regard of refreshing the dialog on govt. change)).

Most of my testing was on S2_4, but the patches were cherry-picked from one branch to the other, so it should be fine.

(file #16493)

News update: git 1.7.12 was released.
It's with svn 1.7 patch here, so I'm slowly working on separating the changes I've already made (and tweaking them a little) into a series of git patches.

Unless something significant happens, within a week or two those patches will slowly be attached here.

Plans for a few callbacks:
- as create_line_at_mouse_pos is redundant, it will most likely become '{}'
- update_rect_at_mouse_pos probably likewise, after adjusting move_mapcanvas
- overlay_workers_at_city will simply be merged into butt_down_mapcanvas

Still planing to lean heavily on GtkGrid.

On semi-related note: complete 'git svn clone' took about 5 hours - ouch.

Seems a more detailed description is necessary:
- select a unit
- right click on a tile, that's far enough to make a visible difference but still being able to see the unit
- press and hold right mouse button, drag to select an area
- without releasing the button, press "c"

map does get centered, but the mouse is permanently grabbed
(gtk2 version might matter, it's 2.24.11 here)

On gtk2 client
- select a unit (I selected )
- center the map on a different tile ( I chosen via messages and it centereed )
- select an area, don't release the button ( I chosen )
- press "c" ( nothing happened, unit was still centered )

you asked what does earlier "center_tile_mapcanvas()" - it center map on unit when c is pressed, also probably center on some event via message output. I assume you changed it so of course its your fault, that 'c' make mess now.

Now, for something bit annoying, for a change: kind of similar test, but in "c" case, in gtk3 client leads to not quite correct display till mapcanvas gets redrawn - I'm not sure if it's related to my changes or not.

But in gtk2 client, it leads to mouse getting permanently being grabbed by mapcanvas - can't access menu, trying to close the window (with mouse) leads to getting messages about application not responding.

The exact procedure:
- select a unit
- center the map on a different tile
- select an area, don't release the button
- press "c"

Can someone else reproduce this in gtk2 client ?

Well, here's a funny thing: while tinkering with update_rect_at_mouse_pos, I thought I've made a regression, but gtk2 client seems to have the same problem.

Holding right mouse button, select an area. Without releasing the button, scroll with mouse wheel. When you stop scrolling, move the mouse a bit, while not releasing the button - observe part one of the problem. Now release it - second part of the problem (selection rectangle is drawn till map_canvas gets redrawn).

On a semi-related note: is toggle_focus_unit_state the function responsible for drawing focus circle ?

Also, it seems I'll go into total grid conversion, including converting all the boxes into grids. Crazy, ain't it ?

But I wonder: it seems that there's a good chance to make
a few options switchable without restart via gtk_orientable_set_orientation (that's gtk+ 2.16, actually).
I'll go back to this idea once I'm done with grids.

I hope that whatever issues there are lately in 'git svn', they'll going to get reasonably fixed soon, cause that's likely the most simple solution on my side - I'll simply import svn repo into git then.

Anyway, there has been some progress in the last few hours, but it's quite hard to isolate the changes in the older patches from the more recent ones.

Looks like I'll lean very heavy on the grids - though it's sometimes quite hard to figure out which {h,v}boxes were functional and which only decorative. Probably won't get it completely right in the first go.

On a semi-related note: it seems I've stumbled on one or two places with a similar problem to that bug with editor mode and GtkScrolledWindow (can't recall the number atm.).

No luck in finding that focus circle yet.

It's bit hard to separate, as I'm a bit low on on disk space on this machine and svn is not git, so I've only have branch-2.4 checked out.

So, step 2 will regard the simple part of gdk_window_get_pointer

- in chatline .c, one call was doing nothing, the other was connected to a signal that seems to have been redundant (AFAICT, things work correctly without handling that signal)
- one of the calls in mapctrl.c was made in a callback to an event where the pointer device wasn't really important (the little testing I've done suggest things work just like there use to with this change)

Now, I've got a little problem:
city_activated_callback (cityrep.c) and impr_callback (citydlg.c) - AFAICT, these two, while seem to be working, are actually incorrect both in gtk3 and gtk2; the problem is that, unless I'm missing something, they check for Ctrl being pressed during the callback, not when the event takes place; while in most cases, human reaction time will make it a non issue, it won't make it correct

Still left are those three functions in mapctrl.c - the plan for overlay_workers_at_city is unchanged atm., other two are a bit more complicated (want to made a significant change, but not break common client code in the process).

(file #16284)

Also, there's a little thing I've missed in the initial port (mainly cause it was still hybrid then) - except for most gdk_window_get_pointer calls, those calls can be made far more simple via the content of events they handle.

I missed something before gdk_device_ungrab in 2 occurences.

(file #16255)