- Change error message when the client gets a message with a [] text format
tag that is not valid to make it more obvious what is wrong. This can
help determine the error faster if the server inadvertently sends the
client a message with displayed text that has square brackets around it.
This happened for bug [ 1804610 ] cast : info.c:message_callback:
unidentified messages where the 'cast command returned data with headings
like [lvl] and [sp].
9 lines of code changed in 2 files:
Fix for bug 1800702 - gdk_draw_drawable: assertion `src != NULL' failed.
gtk/gx11.c: Call sdl_gen_map() or gtk_draw_map() based on displaymode in use.
gtk-v2/src/main.c: Call draw_map() instead of gtk_draw_map(). draw_map()
will figure out what function (sdl, opengl, gtk) to call do actually
draw the map.
MSW 2007-09-25
13 lines of code changed in 3 files:
- Spelling/grammar fixes.
- Doxygen commenting work.
- Reformat block comments to use 79 columns.
302 lines of code changed in 6 files:
- Fix abbreviated ChangeLog comment.
2 lines of code changed in 1 file:
- Spelling/grammar fixes.
- Doxygen commenting work.
- Some indentation adjustments.
- Reformat block comments to use 79 columns.
- else block structures changed to comply with project coding standards.
897 lines of code changed in 6 files:
- Spelling/grammar fixes.
- Doxygen commenting work.
- Some indentation adjustments.
- Reformat block comments to use 79 columns.
202 lines of code changed in 4 files:
gtk/text.c: Remove call to void_callback() for MSG_TYPE_MONUMENT - if there
is no code to handle it, no reason to set the callback. Fixes bug 1759860 -
gravestone messages go to stdout and not client window.
MSW 2007-09-23
6 lines of code changed in 2 files:
- Doxygen commenting work.
- Spelling fix visable --> visible.
- Reformat block comments to use 79 columns.
175 lines of code changed in 2 files:
gtk-v2/src/metaserver.c: Modify metaserver_connect_to so it can connect to
servers running on different ports (eg, localhost:13328). Gtk1 client
already handles this fine, so this is only a change for the gtk2 client.
MSW 2007-09-16
15 lines of code changed in 2 files:
- Undo delete-too-many-characters regression in 7165 (EOL white space removal)
2 lines of code changed in 1 file:
- Tab-->space changes only.
3531 lines of code changed in 17 files:
- Delete end-of-line whitespace.
5 lines of code changed in 2 files:
gtk-v2/src/map.c
gtk-v2/src/main.c
- Fix for SourceForge Bugs Tracker #1794455 "Libglade client Magic Map:
cannot return to Map". During the libglade conversion, and incorrect
g_signal_connect() call was placed in map.c. The corrected connection
is now made in main.c where the magic_map pointer is initialized.
gtk-v2/glade/README
- Add a note for .glade file developers concerning the MAGIC_MAP_PAGE
define that constrains the tab on which magic maps must appear.
18 lines of code changed in 5 files:
Improve metaserver handling some - in particular, if server is listed
on both metaserver 1 & 2, listed it only once. Also, for gtk2 client,
fix handling of not showing cached entries if they are listed on the
metaserver. Add filtering of protocol versions, so we only show player
compatible servers.
--
common/metaserver.c: Add check_server_version() to do version checking.
Add checks to find duplicate server entries.
gtk-v2/src/metaserver.c: Move retrieval of data from metaserver before
adding cached entries to table - otherwise, can not detect duplicates.
Add check to proper version information.
MSW 2007-09-13
78 lines of code changed in 3 files:
common/client.h
- Add doxygen file header.
gtk-v2/src/gtk2proto.h
gtk-v2/src/main.c
gtk-v2/src/metaserver.c
- Remove unused return value for get_metaserver().
gtk-v2/src/metaserver.c
- Doxygen comment formatting, and add comment headers for all functions.
- Remove commented-out IP Address column formerly shown in metaserver dialog.
98 lines of code changed in 5 files:
- Doxygenification of source/comments.
43 lines of code changed in 2 files:
gtk-v2/src/about.c
gtk-v2/src/image.h
gtk-v2/src/sound.c
gtk-v2/src/main.h
- Doxygenification of comments in various client files.
131 lines of code changed in 5 files:
- A minor rearrangement of the order of the oroborus tabs above the map view,
and some modifications to the word descriptions of some of the layouts.
47 lines of code changed in 2 files:
gtk-v2/glade/AUTHORS
- Add oroboros.glade and add short paragraph descriptions of each of the new
layout files.
gtk-v2/glade/Makefile.am
gtk-v2/glade/Makefile.in
gtk-v2/glade/oroboros.gladep
gtk-v2/glade/oroboros.gladep
- A layout designed expressly for clients running with 1024x768 resolution.
2792 lines of code changed in 7 files:
Remove spurious end-of-comment leftover from doxygenification
1 lines of code changed in 1 file:
- Doxyfile from server modified/added for client.
- svn:ignore autom4te
288 lines of code changed in 2 files:
- Tabs --> spaces, commenting, and doxygenation. No functional code changes.
406 lines of code changed in 2 files:
- Remove whitespace regression from prior commit as you cannot predict what the
user's terminal width will be.
12 lines of code changed in 2 files:
configure
configure.in
- Tabs --> spaces, indenting uniformity, and typo corrections only.
269 lines of code changed in 3 files:
aclocal.m4
configure
Makefile.in
common/Makefile.in
gtk/Makefile.in
gtk-v2/Makefile.in
gtk-v2/themes/Makefile.in
gtk-v2/src/Makefile.in
gtk-v2/glade/Makefile.in
help/Makefile.in
pixmaps/Makefile.in
sound-src/Makefile.in
utils/Makefile.in
x11/Makefile.in
- Result of new and fixed m4 files.
autogen.sh
- Point aclocal at macros so that undefined macros do not crash ./configure
macros/gtk.m4
macros/sdl.m4
- ./configure should never crash, so add to remove errors as follows:
aclocal:configure.in:?: warning: macro `AM_PATH_GTK' not found in library
./configure: line ?: syntax error near unexpected token `1.0.0'
./configure: line ?: ` AM_PATH_GTK(1.0.0)'
aclocal:configure.in:?: warning: macro `AM_PATH_SDL' not found in library
./configure: line ?: syntax error near unexpected token `1.1.3'
./configure: line ?: ` AM_PATH_SDL(1.1.3)'
macros/curses.m4
macros/gnome-print-check.m4
macros/gnome-gettext.m4
macros/linger.m4
macros/need-declaration.m4
- Update .m4 files from a newer glade package to remove many warnings like
the following:
macros/linger.m4:4: warning: underquoted definition of AC_STRUCT_LINGER
520 lines of code changed in 25 files:
- Add error_dialog() to display a graphical dialog that notifies the user when
a Glade layout file cannot be loaded. Client version information is shown
with an error description and the file that could not be loaded.
46 lines of code changed in 2 files:
- Add missing layout to list.
0 lines of code changed in 2 files:
- Submit ChangeLog edits for the commit of Revision 7100.
185 lines of code changed in 1 file:
This is a merge of client/branches/gtk-v2-libglade to trunk. It converts the
GTK-V2 client to a libglade-2.0 client that supports changing the UI layout
with glade-2 generated .glade XML files. Various alternate client layouts
are included.
AUTHORS
- Reformatted for aesthetics.
- Added libglade-2.0 conversion author.
ChangeLog
- Summarize gtk-v2-libglade branch merge to trunk.
common/init.c
- Typo corrected in LOG message (inic.c --> init.c).
configure
- LIBGLADE_CFLAGS/LIBS addition.
- gtkv2 checks converted to HAVE_GTK2.
- gtk-v2/glade directory addition now supported.
- V2 client now depends on libglade2.0 instead of GTK+ 2.0.
- Some reformatting resulting from autoconf/automake changes flowing down.
configure.in
- gtk-v2/glade directory addition now supported.
- Update indenting; tab->space conversion for readability.
- Minor message updates for consistency like GTK2 -> GTK+ 2.0.
- V2 client dependency checks changed to require libglade-2.0 vs. gtk+-2.0.
gtk-v2/glade
gtk-v2/glade/Makefile
gtk-v2/glade/Makefile.am
gtk-v2/glade/Makefile.in
- A fully autoconf/automake supported directory to be used for the control
of glade-2 layouts compatible with this client.
gtk-v2/glade/AUTHORS
- A file to attribute the authors of the glade-2 XML layout projects in this
directory.
gtk-v2/glade/README
- A help file for prospective glade-2 XML layout creation that describes how
to create a new layout and workarounds for various issues that may arise.
gtk-v2/glade/caelestis.glade
gtk-v2/glade/caelestis.gladep
gtk-v2/glade/chthonic.glade
gtk-v2/glade/chthonic.gladep
gtk-v2/glade/gtk-v1.glade
gtk-v2/glade/gtk-v1.gladep
gtk-v2/glade/meflin.glade
gtk-v2/glade/meflin.gladep
- New layout files for the V2 client. make install places the .glade files
in the crossfire-client data directory, where they are detected by the
client in order to allow a user to select a new layout from the
configuration popup dialog.
gtk-v2/glade/dialogs.glade
gtk-v2/glade/dialogs.gladep
- This glade-2 XML layout project contains pop-up dialogs formerly contained
in the ../gtk-v2.glade files. It was created to reduce the overhead in
setting up a new main window layout. The client allows a user to specify
a new file at the command-line, but does not attempt to support in-client
selection of an alternate file.
- Various modification to the original pop-up dialogs have been made to
support the libglade-2.0 conversion. The generated code allowed the XML
file to have variations in it that cause problems for libglade.
- Minor alterations have been mode to appearance and/or text on various
dialogs.
gtk-v2/glade/gtk-v2.glade
gtk-v2/glade/gtk-v2.gladep
gtk-v2/gtk-v2.glade
gtk-v2/gtk-v2.gladep
- Moved to gtk-v2/glade sub-directory.
- This is the original gtk-v2 client layout by mwedel.
- All popup dialogs have moved into gtk-v2/glade/dialogs.glade.
gtk-v2/Makefile.am
gtk-v2/Makefile.in
- LIBGLADE_CFLAGS/LIBS addition
- gtk-v2/glade directory addition now supported.
- DIST_COMMON modifications by autoconf/automake to remove files not under
SVN control.
- Remove gtk-v2/gtk-v2.glade and gtk-v2/gtk-v2.gladep from EXTRA_DIST as they
are now located in the gtk-v2/glade subdirectory.
gtk-v2/README-dev
- Reformat for aesthetics and readability.
- Various updates to content based upon IRC or mailing list discussions.
- Rework content to third-party point-of-view to make it easier for other
developers to modify the document.
gtk-v2/src
- Inexplicable property changes to svn:ignore simply reposition .deps entry.
gtk-v2/src/about.c
gtk-v2/src/inventory.c
gtk-v2/src/keys.c
gtk-v2/src/map.c
gtk-v2/src/metaserver.c
gtk-v2/src/spells.c
- Include glade.h
- Remove includes of glade-2 generated source files.
- Conversion to libglade-2.0 requires use of glade_get_widget_tree() and
change from lookup_widget() to glade_xml_get_widget() and insertion of
g_signal_connect() to replace functionality previously found in glade-2
generated source files.
gtk-v2/src/config.c
- Include glade.h
- Various code comment improvements.
- Remove includes of glade-2 generated source files.
- All functions without a comment header now have one.
- Significant code comment reformatting to use of a 79 character line width
and to reduce line lengths over 80 characters.
- Add static char pointers themedir and gladedir to better support loading
combo box widgets from the crossfire-client data directory, and to reduce
the number of redundant hard-coded strings.
- The configuration popup dialog now supports in-client selection of an XML
layout file to redefine the root window appearance. Modified functions
include load_defaults(), save_defaults(), setup_config_window(), and
read_config_window(). New functions are scandir_glade_filter,
fill_combobox_from_datadir() which is derived from code factored out of
setup_config_window() so it can be used multiple times. Modifications to
save_winpos() and load_window_positions() alters screen position saving to
remove hard-coded copy/pasted code and more flexibly support multiple XML
UI layout files.
- Conversion to libglade-2.0 requires use of glade_get_widget_tree() and
change from lookup_widget() to glade_xml_get_widget() and insertion of
g_signal_connect() to replace functionality previously found in glade-2
generated source files.
- scandir_filter() renamed to scandir_theme_filter() for more consistent
naming for multiple scandir filter functions now required since the window
layout combo box also requires on.
gtk-v2/src/image.c
gtk-v2/src/opengl.c
gtk-v2/src/sdl.c
- Include glade.h
gtk-v2/src/info.c
gtk-v2/src/pickup.c
gtk-v2/src/stats.c
- Include glade.h
- Remove includes of glade-2 generated source files.
- Conversion to libglade-2.0 requires use of glade_get_widget_tree() and
change from lookup_widget() to glade_xml_get_widget().
gtk-v2/src/interface.c
gtk-v2/src/interface.h
gtk-v2/src/callbacks.h
gtk-v2/src/support.c
gtk-v2/src/support.h
- Remove glade-2 generated source files.
gtk-v2/src/magicmap.c
- Include glade.h
- Remove includes of glade-2 generated source files.
gtk-v2/src/main.c
gtk-v2/src/main.h
- Include glade.h
- General changes to support the conversion to libglade-2.0 require runtime
processing of the glade-2 XML layout file names and locations.
- Add support for command-line specification of glade-2 generated XML files
that describe the UI windows and pop-up dialogs.
- Conversion to libglade-2.0 requires use of glade_get_widget_tree() and
change from lookup_widget() to glade_xml_get_widget() and insertion of
g_signal_connect() to replace functionality previously found in glade-2
generated source files.
gtk-v2/src/Makefile.am
gtk-v2/src/Makefile.in
- LIBGLADE_CFLAGS/LIBS addition.
- Replace GTK2_CFLAGS/LIBS with LIBGLADE_CFLAGS/LIBS.
- Changes resulting from removal of glade-2 generated source files.
gtk-v2/src/menubar.c
- Include glade.h
- Remove includes of glade-2 generated source files.
- Include image.h and gtk2proto.h as support the libglade-2.0 conversion.
- Conversion to libglade-2.0 requires use of glade_get_widget_tree() and
change from lookup_widget() to glade_xml_get_widget() and insertion of
g_signal_connect() to replace functionality previously found in glade-2
generated source files.
gtk-v2/TODO
- Reformat for aesthetics and readability.
- Add todo for non-functional scroll bar handles on the map display.
- Adjust todo for lower screen resolution support since the libglade-2.0 port
at least partially addresses usability on smaller desktops.
help/about.h
- EOL whitespace removed.
- Minor reformat for aesthetics.
- Added libglade-2.0 conversion author.
Makefile.in
common/Makefile.in
gtk/Makefile.in
gtk/themes/Makefile.in
help/Makefile.in
pixmaps/Makefile.in
sound-src/Makefile.in
- LIBGLADE_CFLAGS/LIBS addition
x11/Makefile.in
- LIBGLADE_CFLAGS/LIBS addition
- DIST_COMMON modifications by autoconf/automake to remove files not under
SVN control.
1336 lines of code changed in 48 files:
common/metaserver.c: Update to use official and not test metaserver2 location.
MSW 2007-08-31
4 lines of code changed in 2 files: