summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
Diffstat (limited to 'gdk')
-rw-r--r--gdk/gdk.h42
-rw-r--r--gdk/gdkcolor.c4
-rw-r--r--gdk/gdkcolor.h20
-rw-r--r--gdk/gdkdnd.h2
-rw-r--r--gdk/gdkevents.c6
-rw-r--r--gdk/gdkevents.h4
-rw-r--r--gdk/gdkfont.h4
-rw-r--r--gdk/gdkgc.c2
-rw-r--r--gdk/gdkgc.h2
-rw-r--r--gdk/gdki18n.h1
-rw-r--r--gdk/gdkim.h2
-rw-r--r--gdk/gdkinput.h55
-rw-r--r--gdk/gdkproperty.h68
-rw-r--r--gdk/gdkrectangle.c2
-rw-r--r--gdk/gdkselection.h2
-rw-r--r--gdk/gdkwindow.h4
-rw-r--r--gdk/x11/gdkcolor-x11.c4
-rw-r--r--gdk/x11/gdkdnd-x11.c52
-rw-r--r--gdk/x11/gdkfont-x11.c4
-rw-r--r--gdk/x11/gdkim-x11.c2
-rw-r--r--gdk/x11/gdkinput.c2
-rw-r--r--gdk/x11/gdkmain-x11.c11
-rw-r--r--gdk/x11/gdkpixmap-x11.c20
-rw-r--r--gdk/x11/gdkproperty-x11.c18
-rw-r--r--gdk/x11/gdkselection-x11.c24
-rw-r--r--gdk/x11/gdkwindow-x11.c6
-rw-r--r--gdk/x11/gxid.c2
27 files changed, 189 insertions, 176 deletions
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 1a49aa54a7..d609e5b494 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -70,9 +70,9 @@ void gdk_error_trap_push (void);
gint gdk_error_trap_pop (void);
-void gdk_set_use_xshm (gint use_xshm);
+void gdk_set_use_xshm (gboolean use_xshm);
-gint gdk_get_use_xshm (void);
+gboolean gdk_get_use_xshm (void);
gchar* gdk_get_display (void);
gint gdk_input_add_full (gint source,
@@ -86,20 +86,18 @@ gint gdk_input_add (gint source,
gpointer data);
void gdk_input_remove (gint tag);
-gint gdk_pointer_grab (GdkWindow *window,
- gint owner_events,
- GdkEventMask event_mask,
- GdkWindow *confine_to,
- GdkCursor *cursor,
- guint32 time);
-void gdk_pointer_ungrab (guint32 time);
-
-gint gdk_keyboard_grab (GdkWindow *window,
- gint owner_events,
- guint32 time);
-void gdk_keyboard_ungrab (guint32 time);
-
-gint gdk_pointer_is_grabbed (void);
+gint gdk_pointer_grab (GdkWindow *window,
+ gboolean owner_events,
+ GdkEventMask event_mask,
+ GdkWindow *confine_to,
+ GdkCursor *cursor,
+ guint32 time);
+void gdk_pointer_ungrab (guint32 time);
+gint gdk_keyboard_grab (GdkWindow *window,
+ gboolean owner_events,
+ guint32 time);
+void gdk_keyboard_ungrab (guint32 time);
+gboolean gdk_pointer_is_grabbed (void);
gint gdk_screen_width (void);
gint gdk_screen_height (void);
@@ -115,12 +113,12 @@ void gdk_key_repeat_restore (void);
/* Rectangle utilities
*/
-gint gdk_rectangle_intersect (GdkRectangle *src1,
- GdkRectangle *src2,
- GdkRectangle *dest);
-void gdk_rectangle_union (GdkRectangle *src1,
- GdkRectangle *src2,
- GdkRectangle *dest);
+gboolean gdk_rectangle_intersect (GdkRectangle *src1,
+ GdkRectangle *src2,
+ GdkRectangle *dest);
+void gdk_rectangle_union (GdkRectangle *src1,
+ GdkRectangle *src2,
+ GdkRectangle *dest);
/* Conversion functions between wide char and multibyte strings.
*/
diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index 47a35af48c..913e698dd0 100644
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -101,7 +101,7 @@ gdk_colors_store (GdkColormap *colormap,
static GMemChunk *color_chunk;
GdkColor*
-gdk_color_copy (GdkColor *color)
+gdk_color_copy (const GdkColor *color)
{
GdkColor *new_color;
@@ -221,7 +221,7 @@ gdk_color_hash (const GdkColor *colora)
(colora->blue >> 6));
}
-gint
+gboolean
gdk_color_equal (const GdkColor *colora,
const GdkColor *colorb)
{
diff --git a/gdk/gdkcolor.h b/gdk/gdkcolor.h
index 94630f0980..d2af35266a 100644
--- a/gdk/gdkcolor.h
+++ b/gdk/gdkcolor.h
@@ -32,7 +32,7 @@ struct _GdkColormap
GdkColormap* gdk_colormap_new (GdkVisual *visual,
- gint allocate);
+ gboolean allocate);
GdkColormap* gdk_colormap_ref (GdkColormap *cmap);
void gdk_colormap_unref (GdkColormap *cmap);
@@ -59,22 +59,20 @@ void gdk_colormap_free_colors (GdkColormap *colormap,
GdkVisual *gdk_colormap_get_visual (GdkColormap *colormap);
-GdkColor *gdk_color_copy (GdkColor *color);
-void gdk_color_free (GdkColor *color);
-
-gint gdk_color_parse (const gchar *spec,
- GdkColor *color);
-guint gdk_color_hash (const GdkColor *colora);
-gint gdk_color_equal (const GdkColor *colora,
- const GdkColor *colorb);
-
+GdkColor *gdk_color_copy (const GdkColor *color);
+void gdk_color_free (GdkColor *color);
+gint gdk_color_parse (const gchar *spec,
+ GdkColor *color);
+guint gdk_color_hash (const GdkColor *colora);
+gboolean gdk_color_equal (const GdkColor *colora,
+ const GdkColor *colorb);
/* The following functions are deprecated */
void gdk_colors_store (GdkColormap *colormap,
GdkColor *colors,
gint ncolors);
gint gdk_colors_alloc (GdkColormap *colormap,
- gint contiguous,
+ gboolean contiguous,
gulong *planes,
gint nplanes,
gulong *pixels,
diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index 3a749fb96e..3d5e802e9b 100644
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -91,8 +91,6 @@ void gdk_drag_drop (GdkDragContext *context,
void gdk_drag_abort (GdkDragContext *context,
guint32 time);
-GdkAtom gdk_drag_get_selection (GdkDragContext *context);
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 300d194ab9..8df54a0939 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -462,7 +462,7 @@ gdk_event_get_time (GdkEvent *event)
*/
void
-gdk_set_show_events (gint show_events)
+gdk_set_show_events (gboolean show_events)
{
if (show_events)
gdk_debug_flags |= GDK_DEBUG_EVENTS;
@@ -470,10 +470,10 @@ gdk_set_show_events (gint show_events)
gdk_debug_flags &= ~GDK_DEBUG_EVENTS;
}
-gint
+gboolean
gdk_get_show_events (void)
{
- return gdk_debug_flags & GDK_DEBUG_EVENTS;
+ return (gdk_debug_flags & GDK_DEBUG_EVENTS) != 0;
}
static void
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index bf37ced815..29dde26a77 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -419,8 +419,8 @@ void gdk_event_handler_set (GdkEventFunc func,
gpointer data,
GDestroyNotify notify);
-void gdk_set_show_events (gint show_events);
-gint gdk_get_show_events (void);
+void gdk_set_show_events (gboolean show_events);
+gboolean gdk_get_show_events (void);
/*
* The following function adds a global filter for all client
diff --git a/gdk/gdkfont.h b/gdk/gdkfont.h
index fab92938f0..213c545d0f 100644
--- a/gdk/gdkfont.h
+++ b/gdk/gdkfont.h
@@ -25,11 +25,11 @@ struct _GdkFont
};
GdkFont* gdk_font_load (const gchar *font_name);
-GdkFont* gdk_fontset_load (gchar *fontset_name);
+GdkFont* gdk_fontset_load (const gchar *fontset_name);
GdkFont* gdk_font_ref (GdkFont *font);
void gdk_font_unref (GdkFont *font);
gint gdk_font_id (const GdkFont *font);
-gint gdk_font_equal (const GdkFont *fonta,
+gboolean gdk_font_equal (const GdkFont *fonta,
const GdkFont *fontb);
gint gdk_string_width (GdkFont *font,
diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index 557828251e..3853485215 100644
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@@ -294,7 +294,7 @@ gdk_gc_set_line_attributes (GdkGC *gc,
void
gdk_gc_set_dashes (GdkGC *gc,
gint dash_offset,
- gchar dash_list[],
+ gint8 dash_list[],
gint n)
{
g_return_if_fail (gc != NULL);
diff --git a/gdk/gdkgc.h b/gdk/gdkgc.h
index 0fe9deb2f3..072ddfe74e 100644
--- a/gdk/gdkgc.h
+++ b/gdk/gdkgc.h
@@ -219,7 +219,7 @@ void gdk_gc_set_line_attributes (GdkGC *gc,
GdkJoinStyle join_style);
void gdk_gc_set_dashes (GdkGC *gc,
gint dash_offset,
- gchar dash_list[],
+ gint8 dash_list[],
gint n);
void gdk_gc_copy (GdkGC *dst_gc,
GdkGC *src_gc);
diff --git a/gdk/gdki18n.h b/gdk/gdki18n.h
index 62213ebe61..7e277648b6 100644
--- a/gdk/gdki18n.h
+++ b/gdk/gdki18n.h
@@ -47,6 +47,7 @@
# define gdk_iswalnum(c) iswalnum(c)
# define gdk_iswspace(c) iswspace(c)
#else
+# include <ctype.h>
# define gdk_iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
# define gdk_iswspace(c) ((wchar_t)(c) <= 0xFF && isspace(c))
#endif
diff --git a/gdk/gdkim.h b/gdk/gdkim.h
index 3f3ceb692c..bf74f20fa7 100644
--- a/gdk/gdkim.h
+++ b/gdk/gdkim.h
@@ -96,7 +96,7 @@ struct _GdkICAttr
GdkColormap *status_colormap;
};
-gint gdk_im_ready (void);
+gboolean gdk_im_ready (void);
void gdk_im_begin (GdkIC *ic,
GdkWindow *window);
diff --git a/gdk/gdkinput.h b/gdk/gdkinput.h
index c34c677955..35550b2655 100644
--- a/gdk/gdkinput.h
+++ b/gdk/gdkinput.h
@@ -73,34 +73,33 @@ struct _GdkTimeCoord
gdouble ytilt;
};
-GList *gdk_input_list_devices (void);
-void gdk_input_set_extension_events (GdkWindow *window,
- gint mask,
- GdkExtensionMode mode);
-void gdk_input_set_source (guint32 deviceid,
- GdkInputSource source);
-gint gdk_input_set_mode (guint32 deviceid,
- GdkInputMode mode);
-void gdk_input_set_axes (guint32 deviceid,
- GdkAxisUse *axes);
-void gdk_input_set_key (guint32 deviceid,
- guint index,
- guint keyval,
- GdkModifierType modifiers);
-void gdk_input_window_get_pointer (GdkWindow *window,
- guint32 deviceid,
- gdouble *x,
- gdouble *y,
- gdouble *pressure,
- gdouble *xtilt,
- gdouble *ytilt,
- GdkModifierType *mask);
-
-GdkTimeCoord *gdk_input_motion_events (GdkWindow *window,
- guint32 deviceid,
- guint32 start,
- guint32 stop,
- gint *nevents_return);
+GList * gdk_input_list_devices (void);
+void gdk_input_set_extension_events (GdkWindow *window,
+ gint mask,
+ GdkExtensionMode mode);
+void gdk_input_set_source (guint32 deviceid,
+ GdkInputSource source);
+gboolean gdk_input_set_mode (guint32 deviceid,
+ GdkInputMode mode);
+void gdk_input_set_axes (guint32 deviceid,
+ GdkAxisUse *axes);
+void gdk_input_set_key (guint32 deviceid,
+ guint index,
+ guint keyval,
+ GdkModifierType modifiers);
+void gdk_input_window_get_pointer (GdkWindow *window,
+ guint32 deviceid,
+ gdouble *x,
+ gdouble *y,
+ gdouble *pressure,
+ gdouble *xtilt,
+ gdouble *ytilt,
+ GdkModifierType *mask);
+GdkTimeCoord *gdk_input_motion_events (GdkWindow *window,
+ guint32 deviceid,
+ guint32 start,
+ guint32 stop,
+ gint *nevents_return);
#ifdef __cplusplus
}
diff --git a/gdk/gdkproperty.h b/gdk/gdkproperty.h
index afba2d2bfe..7bc897ac8f 100644
--- a/gdk/gdkproperty.h
+++ b/gdk/gdkproperty.h
@@ -14,38 +14,42 @@ typedef enum
GDK_PROP_MODE_APPEND
} GdkPropMode;
-GdkAtom gdk_atom_intern (const gchar *atom_name,
- gboolean only_if_exists);
-gchar* gdk_atom_name (GdkAtom atom);
-gboolean gdk_property_get (GdkWindow *window,
- GdkAtom property,
- GdkAtom type,
- gulong offset,
- gulong length,
- gint pdelete,
- GdkAtom *actual_property_type,
- gint *actual_format,
- gint *actual_length,
- guchar **data);
-
-void gdk_property_change (GdkWindow *window,
- GdkAtom property,
- GdkAtom type,
- gint format,
- GdkPropMode mode,
- guchar *data,
- gint nelements);
-void gdk_property_delete (GdkWindow *window,
- GdkAtom property);
-
-gint gdk_text_property_to_text_list (GdkAtom encoding, gint format,
- guchar *text, gint length,
- gchar ***list);
-void gdk_free_text_list (gchar **list);
-gint gdk_string_to_compound_text (gchar *str,
- GdkAtom *encoding, gint *format,
- guchar **ctext, gint *length);
-void gdk_free_compound_text (guchar *ctext);
+GdkAtom gdk_atom_intern (const gchar *atom_name,
+ gboolean only_if_exists);
+gchar* gdk_atom_name (GdkAtom atom);
+
+gboolean gdk_property_get (GdkWindow *window,
+ GdkAtom property,
+ GdkAtom type,
+ gulong offset,
+ gulong length,
+ gint pdelete,
+ GdkAtom *actual_property_type,
+ gint *actual_format,
+ gint *actual_length,
+ guchar **data);
+void gdk_property_change (GdkWindow *window,
+ GdkAtom property,
+ GdkAtom type,
+ gint format,
+ GdkPropMode mode,
+ const guchar *data,
+ gint nelements);
+void gdk_property_delete (GdkWindow *window,
+ GdkAtom property);
+
+gint gdk_text_property_to_text_list (GdkAtom encoding,
+ gint format,
+ const guchar *text,
+ gint length,
+ gchar ***list);
+void gdk_free_text_list (gchar **list);
+gint gdk_string_to_compound_text (const gchar *str,
+ GdkAtom *encoding,
+ gint *format,
+ guchar **ctext,
+ gint *length);
+void gdk_free_compound_text (guchar *ctext);
#ifdef __cplusplus
}
diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c
index 381ccd5f7b..9d8bb5a17b 100644
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.c
@@ -41,7 +41,7 @@ gdk_rectangle_union (GdkRectangle *src1,
dest->height = MAX (src1->y + src1->height, src2->y + src2->height) - dest->y;
}
-gint
+gboolean
gdk_rectangle_intersect (GdkRectangle *src1,
GdkRectangle *src2,
GdkRectangle *dest)
diff --git a/gdk/gdkselection.h b/gdk/gdkselection.h
index d8f7d6e1f3..94723d6b4d 100644
--- a/gdk/gdkselection.h
+++ b/gdk/gdkselection.h
@@ -42,7 +42,7 @@ typedef enum
gboolean gdk_selection_owner_set (GdkWindow *owner,
GdkAtom selection,
guint32 time,
- gint send_event);
+ gboolean send_event);
GdkWindow* gdk_selection_owner_get (GdkAtom selection);
void gdk_selection_convert (GdkWindow *requestor,
GdkAtom selection,
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index dc51277ae6..47c09e9ef0 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -241,7 +241,7 @@ void gdk_window_set_background (GdkWindow *window,
GdkColor *color);
void gdk_window_set_back_pixmap (GdkWindow *window,
GdkPixmap *pixmap,
- gint parent_relative);
+ gboolean parent_relative);
void gdk_window_set_cursor (GdkWindow *window,
GdkCursor *cursor);
void gdk_window_get_user_data (GdkWindow *window,
@@ -280,7 +280,7 @@ void gdk_window_set_icon (GdkWindow *window,
GdkPixmap *pixmap,
GdkBitmap *mask);
void gdk_window_set_icon_name (GdkWindow *window,
- gchar *name);
+ const gchar *name);
void gdk_window_set_group (GdkWindow *window,
GdkWindow *leader);
void gdk_window_set_decorations (GdkWindow *window,
diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index 26994cbe8b..7759fb5f1b 100644
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -43,7 +43,7 @@ static GHashTable *colormap_hash = NULL;
GdkColormap*
gdk_colormap_new (GdkVisual *visual,
- gint private_cmap)
+ gboolean private_cmap)
{
GdkColormap *colormap;
GdkColormapPrivateX *private;
@@ -344,7 +344,7 @@ gdk_colormap_change (GdkColormap *colormap,
gboolean
gdk_colors_alloc (GdkColormap *colormap,
- gint contiguous,
+ gboolean contiguous,
gulong *planes,
gint nplanes,
gulong *pixels,
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 653f2086d4..590c4174d1 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -950,6 +950,7 @@ motif_read_target_table (void)
guchar *p;
gboolean success = FALSE;
+ gdk_error_trap_push ();
XGetWindowProperty (gdk_display, motif_drag_window,
motif_drag_targets_atom,
0, (sizeof(MotifTargetTableHeader)+3)/4, FALSE,
@@ -957,12 +958,13 @@ motif_read_target_table (void)
&type, &format, &nitems, &bytes_after,
(guchar **)&header);
- if ((format != 8) || (nitems < sizeof (MotifTargetTableHeader)))
+ if (gdk_error_trap_pop () || (format != 8) || (nitems < sizeof (MotifTargetTableHeader)))
goto error;
header->n_lists = card16_to_host (header->n_lists, header->byte_order);
header->total_size = card32_to_host (header->total_size, header->byte_order);
+ gdk_error_trap_push ();
XGetWindowProperty (gdk_display, motif_drag_window, motif_drag_targets_atom,
(sizeof(MotifTargetTableHeader)+3)/4,
(header->total_size + 3)/4 - (sizeof(MotifTargetTableHeader) + 3)/4,
@@ -970,7 +972,7 @@ motif_read_target_table (void)
motif_drag_targets_atom, &type, &format, &nitems,
&bytes_after, &target_bytes);
- if ((format != 8) || (bytes_after != 0) ||
+ if (gdk_error_trap_pop () || (format != 8) || (bytes_after != 0) ||
(nitems != header->total_size - sizeof(MotifTargetTableHeader)))
goto error;
@@ -1294,29 +1296,33 @@ motif_check_dest (Window win)
if (!motif_drag_receiver_info_atom)
motif_drag_receiver_info_atom = gdk_atom_intern ("_MOTIF_DRAG_RECEIVER_INFO", FALSE);
+ gdk_error_trap_push ();
XGetWindowProperty (gdk_display, win,
motif_drag_receiver_info_atom,
0, (sizeof(*info)+3)/4, False, AnyPropertyType,
&type, &format, &nitems, &after,
(guchar **)&info);
-
- if (type != None)
+
+ if (gdk_error_trap_pop() == 0)
{
- if ((format == 8) && (nitems == sizeof(*info)))
- {
- if ((info->protocol_version == 0) &&
- ((info->protocol_style == XmDRAG_PREFER_PREREGISTER) ||
- (info->protocol_style == XmDRAG_PREFER_DYNAMIC) ||
- (info->protocol_style == XmDRAG_DYNAMIC)))
- retval = TRUE;
- }
- else
+ if (type != None)
{
- GDK_NOTE (DND,
- g_warning ("Invalid Motif drag receiver property on window %ld\n", win));
+ if ((format == 8) && (nitems == sizeof(*info)))
+ {
+ if ((info->protocol_version == 0) &&
+ ((info->protocol_style == XmDRAG_PREFER_PREREGISTER) ||
+ (info->protocol_style == XmDRAG_PREFER_DYNAMIC) ||
+ (info->protocol_style == XmDRAG_DYNAMIC)))
+ retval = TRUE;
+ }
+ else
+ {
+ GDK_NOTE (DND,
+ g_warning ("Invalid Motif drag receiver property on window %ld\n", win));
+ }
+
+ XFree (info);
}
-
- XFree (info);
}
return retval ? win : GDK_NONE;
@@ -1475,13 +1481,14 @@ motif_read_initiator_info (Window source_window,
if (!motif_drag_initiator_info)
motif_drag_initiator_info = gdk_atom_intern ("_MOTIF_DRAG_INITIATOR_INFO", FALSE);
+ gdk_error_trap_push ();
XGetWindowProperty (gdk_display, source_window, atom,
0, sizeof(*initiator_info), FALSE,
motif_drag_initiator_info,
&type, &format, &nitems, &bytes_after,
(guchar **)&initiator_info);
- if ((format != 8) || (nitems != sizeof (MotifDragInitiatorInfo)) || (bytes_after != 0))
+ if (gdk_error_trap_pop () || (format != 8) || (nitems != sizeof (MotifDragInitiatorInfo)) || (bytes_after != 0))
{
g_warning ("Error reading initiator info\n");
return FALSE;
@@ -2308,7 +2315,7 @@ xdnd_check_dest (Window win)
{
if ((format == 32) && (nitems == 1))
{
- if (*version == 3)
+ if (*version >= 3)
retval = TRUE;
}
else
@@ -2511,13 +2518,14 @@ xdnd_enter_filter (GdkXEvent *xev,
new_context->targets = NULL;
if (get_types)
{
+ gdk_error_trap_push ();
XGetWindowProperty (GDK_DRAWABLE_XDISPLAY (event->any.window),
source_window,
gdk_atom_intern ("XdndTypeList", FALSE), 0, 65536,
False, XA_ATOM, &type, &format, &nitems,
&after, (guchar **)&data);
- if ((format != 32) || (type != XA_ATOM))
+ if (gdk_error_trap_pop () || (format != 32) || (type != XA_ATOM))
{
gdk_drag_context_unref (new_context);
return GDK_FILTER_REMOVE;
@@ -2779,10 +2787,12 @@ gdk_drag_get_protocol (guint32 xid,
if (xid == gdk_root_window)
rootwin = TRUE;
+ gdk_error_warnings = 0;
+
if (!rootwin)
{
gdk_error_code = 0;
-
+
XGetWindowProperty (gdk_display, xid,
gdk_atom_intern ("ENLIGHTENMENT_DESKTOP", FALSE),
0, 0, False, AnyPropertyType,
diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c
index 55b4524fce..b4e1020bca 100644
--- a/gdk/x11/gdkfont-x11.c
+++ b/gdk/x11/gdkfont-x11.c
@@ -134,7 +134,7 @@ gdk_font_load (const gchar *font_name)
}
GdkFont*
-gdk_fontset_load (gchar *fontset_name)
+gdk_fontset_load (const gchar *fontset_name)
{
GdkFont *font;
GdkFontPrivateX *private;
@@ -276,7 +276,7 @@ gdk_font_id (const GdkFont *font)
}
}
-gint
+gboolean
gdk_font_equal (const GdkFont *fonta,
const GdkFont *fontb)
{
diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index a13d1a6124..6ad29752e3 100644
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -445,7 +445,7 @@ gdk_im_close (void)
}
}
-gint
+gboolean
gdk_im_ready (void)
{
return (xim_im != NULL);
diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index 348251458d..cb2dd269c7 100644
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -73,7 +73,7 @@ gdk_input_set_source (guint32 deviceid, GdkInputSource source)
gdkdev->info.source = source;
}
-gint
+gboolean
gdk_input_set_mode (guint32 deviceid, GdkInputMode mode)
{
if (deviceid == GDK_CORE_POINTER)
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index de696cca98..332ad77183 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -42,7 +42,6 @@
#include <X11/Xlib.h>
#include <X11/Xos.h>
#include <X11/Xutil.h>
-#include <X11/Xmu/WinUtil.h>
#include <X11/cursorfont.h>
#include "gdk.h"
@@ -191,12 +190,12 @@ _gdk_windowing_init_check (int argc, char **argv)
}
void
-gdk_set_use_xshm (gint use_xshm)
+gdk_set_use_xshm (gboolean use_xshm)
{
gdk_use_xshm = use_xshm;
}
-gint
+gboolean
gdk_get_use_xshm (void)
{
return gdk_use_xshm;
@@ -227,7 +226,7 @@ gdk_get_use_xshm (void)
gint
gdk_pointer_grab (GdkWindow * window,
- gint owner_events,
+ gboolean owner_events,
GdkEventMask event_mask,
GdkWindow * confine_to,
GdkCursor * cursor,
@@ -337,7 +336,7 @@ gdk_pointer_ungrab (guint32 time)
*--------------------------------------------------------------
*/
-gint
+gboolean
gdk_pointer_is_grabbed (void)
{
return gdk_xgrab_window != NULL;
@@ -365,7 +364,7 @@ gdk_pointer_is_grabbed (void)
gint
gdk_keyboard_grab (GdkWindow * window,
- gint owner_events,
+ gboolean owner_events,
guint32 time)
{
g_return_val_if_fail (window != NULL, 0);
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index c27517c9a3..45807cb613 100644
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@@ -212,21 +212,23 @@ gdk_pixmap_seek_string (FILE *infile,
{
char instr[1024];
- while (!feof (infile))
+ while (1)
{
- fscanf (infile, "%1023s", instr);
+ if (fscanf (infile, "%1023s", instr) != 1)
+ return FALSE;
+
if (skip_comments == TRUE && strcmp (instr, "/*") == 0)
{
- fscanf (infile, "%1023s", instr);
- while (!feof (infile) && strcmp (instr, "*/") != 0)
- fscanf (infile, "%1023s", instr);
- fscanf(infile, "%1023s", instr);
+ do
+ {
+ if (fscanf (infile, "%1023s", instr) != 1)
+ return FALSE;
+ }
+ while (strcmp (instr, "*/") != 0);
}
- if (strcmp (instr, str)==0)
+ else if (strcmp (instr, str) == 0)
return TRUE;
}
-
- return FALSE;
}
static gint
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 54fa55c51f..58b51a9712 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -91,7 +91,7 @@ gdk_atom_name (GdkAtom atom)
}
}
-gint
+gboolean
gdk_property_get (GdkWindow *window,
GdkAtom property,
GdkAtom type,
@@ -190,13 +190,13 @@ gdk_property_get (GdkWindow *window,
}
void
-gdk_property_change (GdkWindow *window,
- GdkAtom property,
- GdkAtom type,
- gint format,
- GdkPropMode mode,
- guchar *data,
- gint nelements)
+gdk_property_change (GdkWindow *window,
+ GdkAtom property,
+ GdkAtom type,
+ gint format,
+ GdkPropMode mode,
+ const guchar *data,
+ gint nelements)
{
Display *xdisplay;
Window xwindow;
@@ -219,7 +219,7 @@ gdk_property_change (GdkWindow *window,
}
XChangeProperty (xdisplay, xwindow, property, type,
- format, mode, data, nelements);
+ format, mode, (guchar *)data, nelements);
}
void
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index e1272f4213..42e00195ed 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -34,11 +34,11 @@
#include "gdkx.h"
-gint
+gboolean
gdk_selection_owner_set (GdkWindow *owner,
GdkAtom selection,
guint32 time,
- gint send_event)
+ gboolean send_event)
{
Display *xdisplay;
Window xwindow;
@@ -187,9 +187,11 @@ gdk_selection_send_notify (guint32 requestor,
}
gint
-gdk_text_property_to_text_list (GdkAtom encoding, gint format,
- guchar *text, gint length,
- gchar ***list)
+gdk_text_property_to_text_list (GdkAtom encoding,
+ gint format,
+ const guchar *text,
+ gint length,
+ gchar ***list)
{
XTextProperty property;
gint count = 0;
@@ -198,7 +200,7 @@ gdk_text_property_to_text_list (GdkAtom encoding, gint format,
if (!list)
return 0;
- property.value = text;
+ property.value = (guchar *)text;
property.encoding = encoding;
property.format = format;
property.nitems = length;
@@ -220,15 +222,17 @@ gdk_free_text_list (gchar **list)
}
gint
-gdk_string_to_compound_text (gchar *str,
- GdkAtom *encoding, gint *format,
- guchar **ctext, gint *length)
+gdk_string_to_compound_text (const gchar *str,
+ GdkAtom *encoding,
+ gint *format,
+ guchar **ctext,
+ gint *length)
{
gint res;
XTextProperty property;
res = XmbTextListToTextProperty (GDK_DISPLAY(),
- &str, 1, XCompoundTextStyle,
+ (char **)&str, 1, XCompoundTextStyle,
&property);
if (res != Success)
{
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 26cbcb8c2b..fe1be34a49 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1069,7 +1069,7 @@ gdk_window_set_background (GdkWindow *window,
void
gdk_window_set_back_pixmap (GdkWindow *window,
GdkPixmap *pixmap,
- gint parent_relative)
+ gboolean parent_relative)
{
Pixmap xpixmap;
@@ -1643,8 +1643,8 @@ gdk_window_set_icon (GdkWindow *window,
}
void
-gdk_window_set_icon_name (GdkWindow *window,
- gchar * name)
+gdk_window_set_icon_name (GdkWindow *window,
+ const gchar *name)
{
XTextProperty property;
gint res;
diff --git a/gdk/x11/gxid.c b/gdk/x11/gxid.c
index 5eb4b7f855..2b0994cbcb 100644
--- a/gdk/x11/gxid.c
+++ b/gdk/x11/gxid.c
@@ -355,7 +355,7 @@ handle_claim_device(GxidClaimDevice *msg)
{
/* FIXME: this is a bit improper. We probably should do this only
when a window is first claimed. But we might be fooled if
- an old client died without releasing its windows. So until
+ an old client died without releasing it's windows. So until
we look for client-window closings, do it here
(We do look for closings now...)
View Lorry Controller Status