Owen Taylor [Fri, 20 Sep 2002 22:06:28 +0000 (22:06 +0000)]
Set the IM context client window to NULL, not to the window that is about
Fri Sep 20 18:01:26 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_unrealize): Set the IM
context client window to NULL, not to the window that
is about to be destroyed. (#88231)
Tor Lillqvist [Thu, 19 Sep 2002 23:29:30 +0000 (23:29 +0000)]
On Win32, look explicitly for LANG, LC_ALL and LC_CTYPE, and if not found,
2002-09-20 Tor Lillqvist <tml@iki.fi>
* gtk/gtkmain.c (gtk_get_default_language): On Win32, look
explicitly for LANG, LC_ALL and LC_CTYPE, and if not found, use
g_win32_getlocale(). The setlocale() in msvcrt.dll would return a
locale name in the form Swedish_Finland for sv_FI.
(gdk_text_width, gdk_text_width_wc) Instead of code duplication,
let gdk_text_extents() and gdk_text_extents_wc() do the job.
* gdk/win32/gdkgc-win32.c (gdk_win32_gc_values_to_win32values):
Don't use the above removed functions in debugging output.
* gdk/win32/gdkdisplay-win32.c
* gdk/win32/gdkmain-win32.c
* gdk/win32/gdkprivate-win32.h
* gdk/win32/gdkselection-win32.c
* gdk/win32/gdkinput-win32.h
* gdk/win32/gdkinput.c: Make it compile again, pass a GdkDisplay in
a couple of places.
Owen Taylor [Thu, 19 Sep 2002 20:52:42 +0000 (20:52 +0000)]
Fix usage of compat GTK_TYPE_ macros without including gtkobject.h.
Thu Sep 19 16:39:29 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtksettings.h (GTK_SETTINGS_GET_CLASS): Fix
usage of compat GTK_TYPE_ macros without including
gtkobject.h.
* gdk/x11/gdkevents-x11.[ch]: Set a flag when initializing
to avoid having extra settings-notify events sent
when not needed.
Tor Lillqvist [Wed, 11 Sep 2002 21:51:59 +0000 (21:51 +0000)]
Merge from gtk-1-3-win32-production and gtk-2-0:
2002-09-12 Tor Lillqvist <tml@iki.fi>
Merge from gtk-1-3-win32-production and gtk-2-0:
* gdk/win32/gdkinput-win32.c (gdk_input_init): Use
GetSystemMetrics (SM_C[XY]SCREEN) instead of
gdk_screen_{width,height}().
* gdk/win32/gdkselection-win32.c (gdk_selection_convert): Don't
use return value from GlobalSize() as length of string when
calling MultiByteToWideChar(). Pass -1 instead (zero-terminated
string). Thanks to Iwasa Kazmi.
Tor Lillqvist [Wed, 11 Sep 2002 21:20:11 +0000 (21:20 +0000)]
Merge from gtk-2-0:
2002-09-12 Tor Lillqvist <tml@iki.fi>
Merge from gtk-2-0:
* gdk/win32/gdkgeometry-win32.c: Add GDK_NOTE debugging output
to some functions, related to moving and resizing and expose
and antiexpose queue processing. Use %p to output HWNDs.
Tentative fix for #79720 based on code by Florent Duguet:
* gdk/win32/gdkgeometry-win32 (gdk_window_queue_append): New
static function. Checks length of translate_queue, calls
_gdk_window_process_expose() if length is >= 128. Then appends
to translate_queue.
(gdk_window_queue_translation,_gdk_windowing_window_queue_antiexpose):
Call gdk_window_queue_append().
Tor Lillqvist [Wed, 11 Sep 2002 20:59:04 +0000 (20:59 +0000)]
Merge from gtk-2-0:
2002-09-12 Tor Lillqvist <tml@iki.fi>
Merge from gtk-2-0:
* gdk/win32/gdkevents-win32.c: Some spacing and indentation cleanup.
* gdk/win32/gdkevents-win32.c (_gdk_events_init): Search if the
system has some input locale identifier that uses a Latin
keyboard. This is needed to be able to get the virtual-key code
for the latin characters corresponding to ASCII control
characters. If no such keyboard is present, try to load one
then. Will this upset users with no wish to ever use a Latin-based
keyboard layout?
(vk_from_char): Convert all ASCII control chars to the
corresponding uppercase char before calling VkKeyScanEx(). Idea by
Florent Duguet. Makes Control-C work again. To make it hopefully
work like I think it should on non-Latin keyboards, too, use
latin_locale when looking for the corresponding keycode.
Fix for #81831 by Tim Evans:
* gdk/win32/gdkevents-win32.c (gdk_event_translate): Don't call
_gdk_event_button_generate() here, it would append the double- or
triple-click events too early, before the single-click event.
(real_window_procedure): If we got a single-click event, call
_gdk_event_button_generate() to perhaps append the double- or
triple-click event after that.
Merge from gtk-1-3-win32-production branch:
* gdk/win32/gdkevents-win32.c (propagate): Check for parent being
NULL before trying to propagate to it, and return FALSE in that
case. (If parent is NULL, we are handling gdk_parent_root, and
probably should have noticed that and bailed out earlier. But
better late than never.)
modify a warning when XSetLocaleModifiers() fails, and add a warning when
* modules/input/gtkimcontextxim.c
(get_im): modify a warning when XSetLocaleModifiers() fails, and
add a warning when XOpenIM() fails
(gtk_im_context_xim_filter_keypress): use XLookupString when xic
is not available. (#90661)
(gtk_im_context_xim_get_ic, gtk_im_with_preedit,
gtk_im_without_preeedit): filter key release events only when
input methods ask for (#81759)
Owen Taylor [Tue, 10 Sep 2002 15:19:13 +0000 (15:19 +0000)]
Patch from Eric Warmonhoven to get linux-fb compiling with multihead
Tue Sep 10 11:11:09 2002 Owen Taylor <otaylor@redhat.com>
* gdk/linux-fb/*: Patch from Eric Warmonhoven to
get linux-fb compiling with multihead changes.
Owen Taylor [Tue, 10 Sep 2002 13:45:18 +0000 (13:45 +0000)]
Take focus mode into account when tracking FocusIn/Out events, so we don't
Tue Sep 10 09:29:00 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): Take
focus mode into account when tracking FocusIn/Out events,
so we don't get confused by focus changes while a
keyboard grab is in effect. (Probably fixes #90563)
Tor Lillqvist [Sun, 8 Sep 2002 07:46:15 +0000 (07:46 +0000)]
Add AM_CONDITIONAL calls also in the non-x11 branch. Otherwise we get
2002-09-08 Tor Lillqvist <tml@iki.fi>
* configure.in: Add AM_CONDITIONAL calls also in the non-x11
branch. Otherwise we get "conditional \"$1\" was never defined.
Usually this means the macro was only invoked conditionally."
errors when running configure if using automake 1.6a. Yeah, I know
that autogen.sh says to use automake 1.4, but on Win32 I more or
less have to use the bleeding edge. I think.
Fix an earlier ChangeLog entry to include the file name:
2002-08-31 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfilesel.c: Include <sys/cygwin.h on Cygwin, for
Attach hotspot coordinates to the pixbuf as options "x_hot" and "y_hot".
* io-xpm.c (pixbuf_create_from_xpm):
* io-xbm.c (gdk_pixbuf__xbm_image_load_real):
* io-ico.c (DecodeHeader): Attach hotspot coordinates to the
pixbuf as options "x_hot" and "y_hot".
Owen Taylor [Fri, 6 Sep 2002 19:36:09 +0000 (19:36 +0000)]
Only set gc->colormap if it isn't already set. (Alex Larsson, #90632)
Fri Sep 6 15:35:01 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkgc.c (gdk_gc_new_with_values): Only set
gc->colormap if it isn't already set. (Alex Larsson,
#90632)
Owen Taylor [Fri, 6 Sep 2002 16:48:40 +0000 (16:48 +0000)]
Pass the actual input keycode to XIM, rather than the result of
Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
* modules/input/gtkimcontextxim.c: Pass the actual input
keycode to XIM, rather than the result of backconverting
the keysym. Fixes the <> input problem! (#74922)
* gtk/gtkimmodule.c: Fix bug where GTK_IM_MODULE environment
variable couldn't be used to force the input method to
the default input method.
Tor Lillqvist [Wed, 4 Sep 2002 21:14:37 +0000 (21:14 +0000)]
Fix braino, actually do check each char, not just the first one, when
2002-09-05 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkproperty-win32.c (gdk_property_change): Fix braino,
actually do check each char, not just the first one, when looping
through the text looking to insert CR in front of each LF. Bug
noticed and fix provided by Florent Duguet.
Tor Lillqvist [Sat, 31 Aug 2002 18:06:02 +0000 (18:06 +0000)]
On Cygwin, open /dev/windows instead of using the magic G_WIN32_MSG_HANDLE
2002-08-31 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (_gdk_events_init): On Cygwin, open
/dev/windows instead of using the magic G_WIN32_MSG_HANDLE fd that
is implemented (in GLib) only on native Win32. (#91683, Masahiro
Sakai)
Tor Lillqvist [Sat, 31 Aug 2002 17:33:43 +0000 (17:33 +0000)]
Use cygwin_conv_to_posix_path(). (gtk_file_selection_dir_activate): Call
2002-08-31 Tor Lillqvist <tml@iki.fi>
* Include <sys/cygwin.h on Cygwin, for cygwin_conv_to_posix_path().
(translate_win32_path, get_real_filename): Use
cygwin_conv_to_posix_path().
(gtk_file_selection_dir_activate): Call get_real_filename() here,
too. (#91843, Masahiro Sakai)
Tor Lillqvist [Mon, 26 Aug 2002 20:00:36 +0000 (20:00 +0000)]
Use MAX_PATH (from windef.h) insted of _MAX_PATH (from stdlib.h in mingw
2002-08-26 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkwindow-win32.c (RegisterGdkClass): Use MAX_PATH
(from windef.h) insted of _MAX_PATH (from stdlib.h in mingw and
MSVC, but not there in Cygwin) (#91681, Masahiro Sakai).
Tor Lillqvist [Sun, 25 Aug 2002 19:27:24 +0000 (19:27 +0000)]
Compile gtk_init_abi_check and gtk_init_check_abi_check when on
2002-08-25 Tor Lillqvist <tml@iki.fi>
* gtk/gtkmain.c: Compile gtk_init_abi_check and
gtk_init_check_abi_check when on G_PLATFORM_WIN32, not just on
G_OS_WIN32, to match gtkmain.h (#91649, Masahiro Sakai).
(check_sizeof_GtkWIndow, check_sizeof_GtkBox): Mention the
-mms-bitfields swicth in addition to -fnative-struct.
Tor Lillqvist [Sat, 24 Aug 2002 23:06:16 +0000 (23:06 +0000)]
Include gtkbox.h and gtkwindow.h on Win32, as the defines for struct
2002-08-25 Tor Lillqvist <tml@iki.fi>
* gtk/gtkmain.h: Include gtkbox.h and gtkwindow.h on Win32, as the
defines for struct packing checks use sizeof() on stuff from
these. (#84211, Andreas Holzmann)
Tor Lillqvist [Sat, 24 Aug 2002 22:03:46 +0000 (22:03 +0000)]
gdk/gdkevents.c gdk/gdkinternals.h gdk/x11/gdkevents-x11.c Move the
2002-08-25 Tor Lillqvist <tml@iki.fi>
* gdk/gdkevents.c
* gdk/gdkinternals.h
* gdk/x11/gdkevents-x11.c
* gdk/win32/gdkevents-win32.c: Move the GdkEventPrivate and
GdkEventFlags definitions from gdkevents.c to
gdkinternals.h. Remove the duplicated definitions in
gdkevents-x11.c and gdkevents-win32.c. (#89771)
Matthias Clasen [Thu, 22 Aug 2002 21:32:06 +0000 (21:32 +0000)]
gdk-pixbuf-io.c (_gdk_pixbuf_generic_image_load): No longer static, thus
* gdk-pixbuf-io.h:
gdk-pixbuf-io.c (_gdk_pixbuf_generic_image_load): No longer
static, thus _gdk_pixbuf-prefixed.
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_new_from_file):
Keep this logic in sync with gdk_pixbuf_new_from_file(). (Based
on a patch by Anders Carlsson)
* io-png.c (gdk_pixbuf__png_image_save): Plug a memory
leak. (#91422, Sven Neumann)
Tor Lillqvist [Wed, 21 Aug 2002 18:50:15 +0000 (18:50 +0000)]
Move GDK_DEP_LIBS from LDFLAGS to each of the libgdk_*_LIBADD, to fix
2002-08-21 Tor Lillqvist <tml@iki.fi>
* gdk/Makefile.am: Move GDK_DEP_LIBS from LDFLAGS to each of the
libgdk_*_LIBADD, to fix problems when cross-compiling, as
suggested by J. Ali Harlow in #87103.
Padraig O'Briain [Mon, 19 Aug 2002 14:39:44 +0000 (14:39 +0000)]
Use gtk_entry_set_positions() to update current_pos and selection_bound so
* gtk/gtkentry.c (gtk_entry_real_delete_text): Use
gtk_entry_set_positions() to update current_pos and selection_bound
so notifications are emitted (#90548)
Hidetoshi Tajima [Wed, 14 Aug 2002 15:11:41 +0000 (15:11 +0000)]
initialize gtk_selection_atoms only once at the 1st call. set length of
* gtk/gtkselection.c (gtk_selection_init): initialize
gtk_selection_atoms only once at the 1st call.
* gdk/x11/gdkselection-x11.c (gdk_selection_property_get):
set length of selection data from number of read bytes (#90595)
Matthias Clasen [Mon, 12 Aug 2002 21:34:45 +0000 (21:34 +0000)]
Remove gdk_screen_close, add a section for GdkDisplayManager, add
* gdk/gdk-sections.txt: Remove gdk_screen_close, add a section
for GdkDisplayManager, add gdk_visual_get_screen and
gdk_colormap_get_screen.
* gdk/gdkdisplaymanager.c:
* gdk/gdkdisplay.c (gdk_pointer_ungrab): Fix doc comments.
* gdk/x11/gdkcolor-x11.c (gdk_colormap_get_screen):
* gdk/x11/gdkimage-x11.c (gdk_image_new_bitmap): Make parameter
names match those in the header file, to silence gtk-doc.
(#89254, patch from Brett Nash;
#85809, patch from daten@dnetc.org;
#76391, patch from Ross Burton;
#74559, Manuel Clos;
#73569, #72005, Alexey A. Malyshev;
#70061, patch from Dennis Bj"orklund;
#64566, #63388, #58328, #57499, #81007, #77349, Vitaly Tishkov;
#78932, Vitaly Tishkov, patch from Ross Burton;
#73306)
Owen Taylor [Fri, 9 Aug 2002 03:57:02 +0000 (03:57 +0000)]
Remove explicit calls to pango_x/xft_shutdown_display() since Pango now
Thu Aug 8 23:26:05 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c gdk/x11/gdkscreen-x11.c: Remove
explicit calls to pango_x/xft_shutdown_display() since
Pango now does it by itself on XCloseDisplay().
Owen Taylor [Mon, 5 Aug 2002 21:22:22 +0000 (21:22 +0000)]
Patch from Soeren Sandmann to improve GtkLabel behavior when it gets a too
Mon Aug 5 17:20:45 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c: Patch from Soeren Sandmann
to improve GtkLabel behavior when it gets
a too small allocation. (Always display the
initial portion.) (#71742)
Owen Taylor [Mon, 5 Aug 2002 21:10:09 +0000 (21:10 +0000)]
When overriding LDFLAGS, include @LDFLAGS@, otherwise LDFLAGS the users
Mon Aug 5 17:01:30 2002 Owen Taylor <otaylor@redhat.com>
* gdk/Makefile.am (LDFLAGS): When overriding LDFLAGS,
include @LDFLAGS@, otherwise LDFLAGS the users passes
to configure don't get used. (#89946, Noah Levitt,
Albert Chin)
Owen Taylor [Mon, 5 Aug 2002 19:28:56 +0000 (19:28 +0000)]
Fix problem with wrong depth being used. (#89941, Jacob Berkman.) Remove
Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):
Fix problem with wrong depth being used. (#89941, Jacob
Berkman.) Remove an unneeded 'screen' variable.
Mon Aug 5 15:04:59 2002 Owen Taylor <otaylor@redhat.com>
More fixes for warnings reported by David L. Cooper II
* gtk/gtkaccelmap.c (accel_map_parse_accel_path): Use
GdkModifierType for accel_mods. (#85856)
* gdk/gdkdisplay.h (struct _GdkDisplay): Make button_number
signed, since we use -1 as an 'unset' value. (#85854)
* gdk/x11/xsettings-client.c (parse_settings): Suppress
a warning (#85853)
Owen Taylor [Mon, 5 Aug 2002 18:52:28 +0000 (18:52 +0000)]
Add a note that yes, we do know what () means and we can't change it.
Mon Aug 5 14:50:13 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkitemfactory.h: Add a note that yes, we do know
what () means and we can't change it.
Fixes for warnings reported by David L. Cooper II
* tests/testtext.c: Warning fixes. Fix order of arguments
to gtk_message_dialog_new(). (#85891)
* gtk/gtktreeitem.c (gtk_tree_item_paint): Fix incorrect
use GTK_STATE_INSENSITIVE for a shadow type. (Not clear
what the drawing intent was, but it's ENABLE_BROKEN
anyways.) (#85880)
* gtk/gtktexttypes.c: Use character literals
instead of direct constants to avoid warning. (#85878)
* gtk/theme-bits/decompose-bits.c gtk/gtkstyle.c:
Fix some signed/unsigned problems (#85876)
* gtk/gtksignal.c (gtk_signal_newv): Add an explicit
cast from GtkSignalRunType to GSignalFlags. (#85875)
* gtk/gtkitemfactory.c (gtk_item_factory_add_item): Fix
use of guint instead of GdkModifierType (#85871)
* gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems):
Fix signed/unsigned problem (#85870)
* gtk/gtkimcontext.c (gtk_im_context_class_init): Get
rid of GtkType/Signal*. (Fixes #85869 as a side effect)
* gtk/gtkdnd.c (gtk_drag_get_cursor): Fix some
signed/unsigned warnings (#85865)
Owen Taylor [Fri, 2 Aug 2002 04:57:53 +0000 (04:57 +0000)]
Switch back to using XftDraw so that we take advantage of the
Fri Aug 2 00:43:15 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c
gdk/x11/gdkpango-x11.c gdk/x11/gdkpixmap-x11.c
gdk/x11/gdkprivate-x11.h gdk/x11/gdkwindow-x11.c:
Switch back to using XftDraw so that we take
advantage of the draw-to-non-RENDER capabilities
of Xft2.
* demos/gtk-demo/changedisplay.c (query_for_toplevel):
Fix the case where the user clicks on the "click on
a window popup".
* gdk/gdkdisplay.c (gdk_display_dispose): Free the
event queue.
* gdk/x11/gdkevents-x11.c gdk/x11/gdkdisplay-x11.c:
Remove the event source when closing a display.
* gdk/gdkdisplay.[ch]: Add a ::closed signal, dispose()
isn't convenient enough by itself.
* gdk/x11/gdkevents-x11.c (gdk_xsettings_watch_cb):
Create foreign windows for watch windows if there isn't
an existing window, instead of installing a global filter.
* gdk/x11/gdkscreen-x11.c gdk/x11/gdkprivate-x11.h
gdk/x11/gdkevents-x11.c (_gdk_x11_events_uninit_screen):
Clean up the xsettings_client when we are done with
it.
* gdk/x11/gdkevents-x11.c (_gdk_events_init): Remove
excess call to _gdk_x11_events_init_screen()