callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to guess if we can use the mb* functions safely. (For glibc, they do

Browse Source 
Tue Mar 17 01:55:00 1998  Owen Taylor  <owt1@cornell.edu>

	* gtk/gtkmain.c gtk/gtkentry.c: Try to guess if we can
	  use the mb* functions safely. (For glibc, they do
	  UTF-8). Heuristic is (X_LOCALE && locale != C/POSIX)
	  || (mblen("\xc0", MB_CUR_MAX) == 1).

	(From: "Richard Lloyd" <rkl@csc.liv.ac.uk>)

	* gdk/gdk.c (gdk_ic_get_attr): Use an intermediate
	  variable to avoid taking the address of the result
	  of va_arg.

	* gtk/gtkentry.c gtk/gtkeditable.c gtkobject.c
	  gtk/testselection.c: signedness fixups

	* gtk/gtkcontainer.c: Fixed implicit cast between
	  gpointer and func pointer by changing.

	* gtk/gtkcombo.c, gtk/gtkentry.c, gtk/gtktext.c:
	  static void forward declaration vs. void actual fixed

	* gtk/testgtk.c: Limit total number of tree items to 10,000
This commit is contained in:
Owen Taylor 1998-03-17 19:03:52 +00:00 committed by Owen Taylor
parent a783d668f1
commit 70b3b3e6e1
22 changed files with 432 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ChangeLog
View File

@ -1,3 +1,35 @@
Tue Mar 17 01:55:00 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c gtk/gtkentry.c: Try to guess if we can
use the mb* functions safely. (For glibc, they do
UTF-8). Heuristic is (X_LOCALE && locale != C/POSIX)
|| (mblen("\xc0", MB_CUR_MAX) == 1).
(From: "Richard Lloyd" <rkl@csc.liv.ac.uk>)
* gdk/gdk.c (gdk_ic_get_attr): Use an intermediate
variable to avoid taking the address of the result
of va_arg.
* gtk/gtkentry.c gtk/gtkeditable.c gtkobject.c
gtk/testselection.c: signedness fixups
* gtk/gtkcontainer.c: Fixed implicit cast between
gpointer and func pointer by changing.
* gtk/gtkcombo.c, gtk/gtkentry.c, gtk/gtktext.c:
static void forward declaration vs. void actual fixed
* gtk/testgtk.c: Limit total number of tree items to 10,000
Mon Mar 16 21:14:52 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkvisual.c: Put visual names into #ifdef G_ENABLE_DEBUG
gtk-jbuhler-980315-0.patch
* gdk/gdkcc.c: Changed DEBUG => G_ENABLE_DEBUG, eliminate
unused variable warnings.
Tue Mar 17 16:19:47 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.c:
@ -52,7 +84,6 @@ Mon Mar 16 18:19:31 GMT 1998 Tony Gale <gale@gimp.org>
- new question on updating progressbars
- update all the links to gtk.org
>>>>>>> 1.255
Mon Mar 16 09:15:03 GMT 1998 Tony Gale <gale@gimp.org>
* docs/gtk_tut.sgml:

33
ChangeLog.pre-2-0
View File

@ -1,3 +1,35 @@
Tue Mar 17 01:55:00 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c gtk/gtkentry.c: Try to guess if we can
use the mb* functions safely. (For glibc, they do
UTF-8). Heuristic is (X_LOCALE && locale != C/POSIX)
|| (mblen("\xc0", MB_CUR_MAX) == 1).
(From: "Richard Lloyd" <rkl@csc.liv.ac.uk>)
* gdk/gdk.c (gdk_ic_get_attr): Use an intermediate
variable to avoid taking the address of the result
of va_arg.
* gtk/gtkentry.c gtk/gtkeditable.c gtkobject.c
gtk/testselection.c: signedness fixups
* gtk/gtkcontainer.c: Fixed implicit cast between
gpointer and func pointer by changing.
* gtk/gtkcombo.c, gtk/gtkentry.c, gtk/gtktext.c:
static void forward declaration vs. void actual fixed
* gtk/testgtk.c: Limit total number of tree items to 10,000
Mon Mar 16 21:14:52 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkvisual.c: Put visual names into #ifdef G_ENABLE_DEBUG
gtk-jbuhler-980315-0.patch
* gdk/gdkcc.c: Changed DEBUG => G_ENABLE_DEBUG, eliminate
unused variable warnings.
Tue Mar 17 16:19:47 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.c:
@ -52,7 +84,6 @@ Mon Mar 16 18:19:31 GMT 1998 Tony Gale <gale@gimp.org>
- new question on updating progressbars
- update all the links to gtk.org
>>>>>>> 1.255
Mon Mar 16 09:15:03 GMT 1998 Tony Gale <gale@gimp.org>
* docs/gtk_tut.sgml:

33
ChangeLog.pre-2-10
View File

@ -1,3 +1,35 @@
Tue Mar 17 01:55:00 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c gtk/gtkentry.c: Try to guess if we can
use the mb* functions safely. (For glibc, they do
UTF-8). Heuristic is (X_LOCALE && locale != C/POSIX)
|| (mblen("\xc0", MB_CUR_MAX) == 1).
(From: "Richard Lloyd" <rkl@csc.liv.ac.uk>)
* gdk/gdk.c (gdk_ic_get_attr): Use an intermediate
variable to avoid taking the address of the result
of va_arg.
* gtk/gtkentry.c gtk/gtkeditable.c gtkobject.c
gtk/testselection.c: signedness fixups
* gtk/gtkcontainer.c: Fixed implicit cast between
gpointer and func pointer by changing.
* gtk/gtkcombo.c, gtk/gtkentry.c, gtk/gtktext.c:
static void forward declaration vs. void actual fixed
* gtk/testgtk.c: Limit total number of tree items to 10,000
Mon Mar 16 21:14:52 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkvisual.c: Put visual names into #ifdef G_ENABLE_DEBUG
gtk-jbuhler-980315-0.patch
* gdk/gdkcc.c: Changed DEBUG => G_ENABLE_DEBUG, eliminate
unused variable warnings.
Tue Mar 17 16:19:47 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.c:
@ -52,7 +84,6 @@ Mon Mar 16 18:19:31 GMT 1998 Tony Gale <gale@gimp.org>
- new question on updating progressbars
- update all the links to gtk.org
>>>>>>> 1.255
Mon Mar 16 09:15:03 GMT 1998 Tony Gale <gale@gimp.org>
* docs/gtk_tut.sgml:

33
ChangeLog.pre-2-2
View File

@ -1,3 +1,35 @@
Tue Mar 17 01:55:00 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c gtk/gtkentry.c: Try to guess if we can
use the mb* functions safely. (For glibc, they do
UTF-8). Heuristic is (X_LOCALE && locale != C/POSIX)
|| (mblen("\xc0", MB_CUR_MAX) == 1).
(From: "Richard Lloyd" <rkl@csc.liv.ac.uk>)
* gdk/gdk.c (gdk_ic_get_attr): Use an intermediate
variable to avoid taking the address of the result
of va_arg.
* gtk/gtkentry.c gtk/gtkeditable.c gtkobject.c
gtk/testselection.c: signedness fixups
* gtk/gtkcontainer.c: Fixed implicit cast between
gpointer and func pointer by changing.
* gtk/gtkcombo.c, gtk/gtkentry.c, gtk/gtktext.c:
static void forward declaration vs. void actual fixed
* gtk/testgtk.c: Limit total number of tree items to 10,000
Mon Mar 16 21:14:52 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkvisual.c: Put visual names into #ifdef G_ENABLE_DEBUG
gtk-jbuhler-980315-0.patch
* gdk/gdkcc.c: Changed DEBUG => G_ENABLE_DEBUG, eliminate
unused variable warnings.
Tue Mar 17 16:19:47 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.c:
@ -52,7 +84,6 @@ Mon Mar 16 18:19:31 GMT 1998 Tony Gale <gale@gimp.org>
- new question on updating progressbars
- update all the links to gtk.org
>>>>>>> 1.255
Mon Mar 16 09:15:03 GMT 1998 Tony Gale <gale@gimp.org>
* docs/gtk_tut.sgml:

33
ChangeLog.pre-2-4
View File

@ -1,3 +1,35 @@
Tue Mar 17 01:55:00 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c gtk/gtkentry.c: Try to guess if we can
use the mb* functions safely. (For glibc, they do
UTF-8). Heuristic is (X_LOCALE && locale != C/POSIX)
|| (mblen("\xc0", MB_CUR_MAX) == 1).
(From: "Richard Lloyd" <rkl@csc.liv.ac.uk>)
* gdk/gdk.c (gdk_ic_get_attr): Use an intermediate
variable to avoid taking the address of the result
of va_arg.
* gtk/gtkentry.c gtk/gtkeditable.c gtkobject.c
gtk/testselection.c: signedness fixups
* gtk/gtkcontainer.c: Fixed implicit cast between
gpointer and func pointer by changing.
* gtk/gtkcombo.c, gtk/gtkentry.c, gtk/gtktext.c:
static void forward declaration vs. void actual fixed
* gtk/testgtk.c: Limit total number of tree items to 10,000
Mon Mar 16 21:14:52 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkvisual.c: Put visual names into #ifdef G_ENABLE_DEBUG
gtk-jbuhler-980315-0.patch
* gdk/gdkcc.c: Changed DEBUG => G_ENABLE_DEBUG, eliminate
unused variable warnings.
Tue Mar 17 16:19:47 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.c:
@ -52,7 +84,6 @@ Mon Mar 16 18:19:31 GMT 1998 Tony Gale <gale@gimp.org>
- new question on updating progressbars
- update all the links to gtk.org
>>>>>>> 1.255
Mon Mar 16 09:15:03 GMT 1998 Tony Gale <gale@gimp.org>
* docs/gtk_tut.sgml:

33
ChangeLog.pre-2-6
View File

@ -1,3 +1,35 @@
Tue Mar 17 01:55:00 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c gtk/gtkentry.c: Try to guess if we can
use the mb* functions safely. (For glibc, they do
UTF-8). Heuristic is (X_LOCALE && locale != C/POSIX)
|| (mblen("\xc0", MB_CUR_MAX) == 1).
(From: "Richard Lloyd" <rkl@csc.liv.ac.uk>)
* gdk/gdk.c (gdk_ic_get_attr): Use an intermediate
variable to avoid taking the address of the result
of va_arg.
* gtk/gtkentry.c gtk/gtkeditable.c gtkobject.c
gtk/testselection.c: signedness fixups
* gtk/gtkcontainer.c: Fixed implicit cast between
gpointer and func pointer by changing.
* gtk/gtkcombo.c, gtk/gtkentry.c, gtk/gtktext.c:
static void forward declaration vs. void actual fixed
* gtk/testgtk.c: Limit total number of tree items to 10,000
Mon Mar 16 21:14:52 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkvisual.c: Put visual names into #ifdef G_ENABLE_DEBUG
gtk-jbuhler-980315-0.patch
* gdk/gdkcc.c: Changed DEBUG => G_ENABLE_DEBUG, eliminate
unused variable warnings.
Tue Mar 17 16:19:47 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.c:
@ -52,7 +84,6 @@ Mon Mar 16 18:19:31 GMT 1998 Tony Gale <gale@gimp.org>
- new question on updating progressbars
- update all the links to gtk.org
>>>>>>> 1.255
Mon Mar 16 09:15:03 GMT 1998 Tony Gale <gale@gimp.org>
* docs/gtk_tut.sgml:

33
ChangeLog.pre-2-8
View File

@ -1,3 +1,35 @@
Tue Mar 17 01:55:00 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c gtk/gtkentry.c: Try to guess if we can
use the mb* functions safely. (For glibc, they do
UTF-8). Heuristic is (X_LOCALE && locale != C/POSIX)
|| (mblen("\xc0", MB_CUR_MAX) == 1).
(From: "Richard Lloyd" <rkl@csc.liv.ac.uk>)
* gdk/gdk.c (gdk_ic_get_attr): Use an intermediate
variable to avoid taking the address of the result
of va_arg.
* gtk/gtkentry.c gtk/gtkeditable.c gtkobject.c
gtk/testselection.c: signedness fixups
* gtk/gtkcontainer.c: Fixed implicit cast between
gpointer and func pointer by changing.
* gtk/gtkcombo.c, gtk/gtkentry.c, gtk/gtktext.c:
static void forward declaration vs. void actual fixed
* gtk/testgtk.c: Limit total number of tree items to 10,000
Mon Mar 16 21:14:52 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkvisual.c: Put visual names into #ifdef G_ENABLE_DEBUG
gtk-jbuhler-980315-0.patch
* gdk/gdkcc.c: Changed DEBUG => G_ENABLE_DEBUG, eliminate
unused variable warnings.
Tue Mar 17 16:19:47 1998 Tim Janik <timj@gimp.org>
* gdk/gdk.c:
@ -52,7 +84,6 @@ Mon Mar 16 18:19:31 GMT 1998 Tony Gale <gale@gimp.org>
- new question on updating progressbars
- update all the links to gtk.org
>>>>>>> 1.255
Mon Mar 16 09:15:03 GMT 1998 Tony Gale <gale@gimp.org>
* docs/gtk_tut.sgml:

20
gdk/gdk.c
View File

@ -3430,6 +3430,7 @@ gdk_ic_new (GdkWindow* client_window,
GdkIMStyle style, ...)
{
va_list list;
void *argsptr;
GdkICPrivate *private;
XVaNestedList preedit_attr;
@ -3440,7 +3441,8 @@ gdk_ic_new (GdkWindow* client_window,
private = g_new (GdkICPrivate, 1);
va_start (list, style);
preedit_attr = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
preedit_attr = (XVaNestedList)&argsptr;
va_end (list);
private->style = gdk_im_decide_style (style);
@ -3500,6 +3502,7 @@ void
gdk_ic_set_values (GdkIC ic, ...)
{
va_list list;
void *argsptr;
XVaNestedList args;
GdkICPrivate *private;
@ -3508,7 +3511,8 @@ gdk_ic_set_values (GdkIC ic, ...)
private = (GdkICPrivate *) ic;
va_start (list, ic);
args = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
args = (XVaNestedList)&argsptr;
va_end (list);
XSetICValues (private->xic, XNVaNestedList, args, NULL);
@ -3518,6 +3522,7 @@ void
gdk_ic_get_values (GdkIC ic, ...)
{
va_list list;
void *argsptr;
XVaNestedList args;
GdkICPrivate *private;
@ -3526,7 +3531,8 @@ gdk_ic_get_values (GdkIC ic, ...)
private = (GdkICPrivate *) ic;
va_start (list, ic);
args = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
args = (XVaNestedList)&argsptr;
va_end (list);
XGetICValues (private->xic, XNVaNestedList, args, NULL);
@ -3536,6 +3542,7 @@ void
gdk_ic_set_attr (GdkIC ic, const char *target, ...)
{
va_list list;
void *argsptr;
XVaNestedList attr;
GdkICPrivate *private;
@ -3545,7 +3552,8 @@ gdk_ic_set_attr (GdkIC ic, const char *target, ...)
private = (GdkICPrivate *) ic;
va_start (list, target);
attr = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
attr = (XVaNestedList)&argsptr;
va_end (list);
XSetICValues (private->xic, target, attr, NULL);
@ -3555,6 +3563,7 @@ void
gdk_ic_get_attr (GdkIC ic, const char *target, ...)
{
va_list list;
void *argsptr;
XVaNestedList attr;
GdkICPrivate *private;
@ -3564,7 +3573,8 @@ gdk_ic_get_attr (GdkIC ic, const char *target, ...)
private = (GdkICPrivate *) ic;
va_start (list, target);
attr = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
attr = (XVaNestedList)&argsptr;
va_end (list);
XGetICValues (private->xic, target, attr, NULL);

21
gdk/gdkcc.c
View File

@ -851,8 +851,9 @@ gdk_color_context_get_pixels (GdkColorContext *cc,
gint bad_alloc = FALSE;
gint failed[MAX_IMAGE_COLORS], allocated[MAX_IMAGE_COLORS];
GdkColor defs[MAX_IMAGE_COLORS], cmap[MAX_IMAGE_COLORS];
#ifdef G_ENABLE_DEBUG
gint exact_col = 0, subst_col = 0, close_col = 0, black_col = 0;
#endif
g_assert (cc != NULL);
g_assert (reds != NULL);
g_assert (greens != NULL);
@ -934,7 +935,7 @@ gdk_color_context_get_pixels (GdkColorContext *cc,
return;
}
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
exact_col = ncols;
#endif
@ -1012,7 +1013,7 @@ gdk_color_context_get_pixels (GdkColorContext *cc,
defs[i] = cmap[close];
defs[i].pixel = colors[i];
allocated[ncols++] = colors[i];
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
close_col++;
#endif
} else
@ -1086,14 +1087,14 @@ gdk_color_context_get_pixels (GdkColorContext *cc,
defs[i].pixel = cc->black_pixel;
defs[i].red = defs[i].green = defs[i].blue = 0;
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
black_col++;
#endif
}
else
{
defs[i] = defs[close];
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
subst_col++;
#endif
}
@ -1123,7 +1124,9 @@ gdk_color_context_get_pixels_incremental (GdkColorContext *cc,
gint bad_alloc = FALSE;
gint failed[MAX_IMAGE_COLORS], allocated[MAX_IMAGE_COLORS];
GdkColor defs[MAX_IMAGE_COLORS], cmap[MAX_IMAGE_COLORS];
#ifdef G_ENABLE_DEBUG
gint exact_col = 0, subst_col = 0, close_col = 0, black_col = 0;
#endif
g_assert (cc != NULL);
g_assert (reds != NULL);
@ -1204,7 +1207,7 @@ gdk_color_context_get_pixels_incremental (GdkColorContext *cc,
return;
}
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
exact_col = ncols;
#endif
@ -1276,7 +1279,7 @@ gdk_color_context_get_pixels_incremental (GdkColorContext *cc,
defs[i] = cmap[close];
defs[i].pixel = colors[i];
allocated[ncols++] = colors[i];
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
close_col++;
#endif
}
@ -1348,14 +1351,14 @@ gdk_color_context_get_pixels_incremental (GdkColorContext *cc,
defs[i].pixel = cc->black_pixel;
defs[i].red = defs[i].green = defs[i].blue = 0;
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
black_col++;
#endif
}
else
{
defs[i] = defs[close];
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
subst_col++;
#endif
}

4
gdk/gdkvisual.c
View File

@ -40,6 +40,8 @@ static gint navailable_depths;
static GdkVisualType available_types[6];
static gint navailable_types;
#ifdef G_ENABLE_DEBUG
static gchar* visual_names[] =
{
"static gray",
@ -50,6 +52,8 @@ static gchar* visual_names[] =
"direct color",
};
#endif /* G_ENABLE_DEBUG */
static GHashTable *visual_hash = NULL;
void

21
gdk/x11/gdkcc-x11.c
View File

@ -851,8 +851,9 @@ gdk_color_context_get_pixels (GdkColorContext *cc,
gint bad_alloc = FALSE;
gint failed[MAX_IMAGE_COLORS], allocated[MAX_IMAGE_COLORS];
GdkColor defs[MAX_IMAGE_COLORS], cmap[MAX_IMAGE_COLORS];
#ifdef G_ENABLE_DEBUG
gint exact_col = 0, subst_col = 0, close_col = 0, black_col = 0;
#endif
g_assert (cc != NULL);
g_assert (reds != NULL);
g_assert (greens != NULL);
@ -934,7 +935,7 @@ gdk_color_context_get_pixels (GdkColorContext *cc,
return;
}
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
exact_col = ncols;
#endif
@ -1012,7 +1013,7 @@ gdk_color_context_get_pixels (GdkColorContext *cc,
defs[i] = cmap[close];
defs[i].pixel = colors[i];
allocated[ncols++] = colors[i];
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
close_col++;
#endif
} else
@ -1086,14 +1087,14 @@ gdk_color_context_get_pixels (GdkColorContext *cc,
defs[i].pixel = cc->black_pixel;
defs[i].red = defs[i].green = defs[i].blue = 0;
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
black_col++;
#endif
}
else
{
defs[i] = defs[close];
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
subst_col++;
#endif
}
@ -1123,7 +1124,9 @@ gdk_color_context_get_pixels_incremental (GdkColorContext *cc,
gint bad_alloc = FALSE;
gint failed[MAX_IMAGE_COLORS], allocated[MAX_IMAGE_COLORS];
GdkColor defs[MAX_IMAGE_COLORS], cmap[MAX_IMAGE_COLORS];
#ifdef G_ENABLE_DEBUG
gint exact_col = 0, subst_col = 0, close_col = 0, black_col = 0;
#endif
g_assert (cc != NULL);
g_assert (reds != NULL);
@ -1204,7 +1207,7 @@ gdk_color_context_get_pixels_incremental (GdkColorContext *cc,
return;
}
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
exact_col = ncols;
#endif
@ -1276,7 +1279,7 @@ gdk_color_context_get_pixels_incremental (GdkColorContext *cc,
defs[i] = cmap[close];
defs[i].pixel = colors[i];
allocated[ncols++] = colors[i];
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
close_col++;
#endif
}
@ -1348,14 +1351,14 @@ gdk_color_context_get_pixels_incremental (GdkColorContext *cc,
defs[i].pixel = cc->black_pixel;
defs[i].red = defs[i].green = defs[i].blue = 0;
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
black_col++;
#endif
}
else
{
defs[i] = defs[close];
#ifdef DEBUG
#ifdef G_ENABLE_DEBUG
subst_col++;
#endif
}

20
gdk/x11/gdkmain-x11.c
View File

@ -3430,6 +3430,7 @@ gdk_ic_new (GdkWindow* client_window,
GdkIMStyle style, ...)
{
va_list list;
void *argsptr;
GdkICPrivate *private;
XVaNestedList preedit_attr;
@ -3440,7 +3441,8 @@ gdk_ic_new (GdkWindow* client_window,
private = g_new (GdkICPrivate, 1);
va_start (list, style);
preedit_attr = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
preedit_attr = (XVaNestedList)&argsptr;
va_end (list);
private->style = gdk_im_decide_style (style);
@ -3500,6 +3502,7 @@ void
gdk_ic_set_values (GdkIC ic, ...)
{
va_list list;
void *argsptr;
XVaNestedList args;
GdkICPrivate *private;
@ -3508,7 +3511,8 @@ gdk_ic_set_values (GdkIC ic, ...)
private = (GdkICPrivate *) ic;
va_start (list, ic);
args = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
args = (XVaNestedList)&argsptr;
va_end (list);
XSetICValues (private->xic, XNVaNestedList, args, NULL);
@ -3518,6 +3522,7 @@ void
gdk_ic_get_values (GdkIC ic, ...)
{
va_list list;
void *argsptr;
XVaNestedList args;
GdkICPrivate *private;
@ -3526,7 +3531,8 @@ gdk_ic_get_values (GdkIC ic, ...)
private = (GdkICPrivate *) ic;
va_start (list, ic);
args = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
args = (XVaNestedList)&argsptr;
va_end (list);
XGetICValues (private->xic, XNVaNestedList, args, NULL);
@ -3536,6 +3542,7 @@ void
gdk_ic_set_attr (GdkIC ic, const char *target, ...)
{
va_list list;
void *argsptr;
XVaNestedList attr;
GdkICPrivate *private;
@ -3545,7 +3552,8 @@ gdk_ic_set_attr (GdkIC ic, const char *target, ...)
private = (GdkICPrivate *) ic;
va_start (list, target);
attr = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
attr = (XVaNestedList)&argsptr;
va_end (list);
XSetICValues (private->xic, target, attr, NULL);
@ -3555,6 +3563,7 @@ void
gdk_ic_get_attr (GdkIC ic, const char *target, ...)
{
va_list list;
void *argsptr;
XVaNestedList attr;
GdkICPrivate *private;
@ -3564,7 +3573,8 @@ gdk_ic_get_attr (GdkIC ic, const char *target, ...)
private = (GdkICPrivate *) ic;
va_start (list, target);
attr = (XVaNestedList) & (va_arg (list, void *));
argsptr = va_arg (list, void *);
attr = (XVaNestedList)&argsptr;
va_end (list);
XGetICValues (private->xic, target, attr, NULL);

4
gdk/x11/gdkvisual-x11.c
View File

@ -40,6 +40,8 @@ static gint navailable_depths;
static GdkVisualType available_types[6];
static gint navailable_types;
#ifdef G_ENABLE_DEBUG
static gchar* visual_names[] =
{
"static gray",
@ -50,6 +52,8 @@ static gchar* visual_names[] =
"direct color",
};
#endif /* G_ENABLE_DEBUG */
static GHashTable *visual_hash = NULL;
void

4
gtk/gtkcombo.c
View File

@ -71,7 +71,7 @@ static void gtk_combo_size_allocate (GtkWidget *widget,
static GtkHBoxClass *parent_class = NULL;
void
static void
gtk_combo_class_init (GtkComboClass * klass)
{
GtkObjectClass *oclass;
@ -437,7 +437,7 @@ gtk_combo_list_key_press (GtkWidget * widget, GdkEventKey * event, GtkCombo * co
return FALSE;
}
void
static void
gtk_combo_init (GtkCombo * combo)
{
GtkWidget *arrow;

2
gtk/gtkcontainer.c
View File

@ -42,7 +42,7 @@ typedef void (*GtkContainerSignal1) (GtkObject *object,
gpointer arg1,
gpointer data);
typedef void (*GtkContainerSignal2) (GtkObject *object,
gpointer arg1,
GtkFunction arg1,
gpointer arg2,
gpointer data);
typedef gint (*GtkContainerSignal3) (GtkObject *object,

3
gtk/gtkdebug.h
View File

@ -23,7 +23,8 @@ extern "C" {
#endif /* __cplusplus */
typedef enum {
GTK_DEBUG_OBJECTS = 1<<0
GTK_DEBUG_OBJECTS = 1<<0,
GTK_DEBUG_MISC = 1<<1
} GtkDebugFlag;
#ifdef G_ENABLE_DEBUG

5
gtk/gtkeditable.c
View File

@ -360,7 +360,7 @@ gtk_editable_selection_handler (GtkWidget *widget,
{
gtk_selection_data_set (selection_data,
GDK_SELECTION_TYPE_STRING,
8*sizeof(gchar), str, length);
8*sizeof(gchar), (guchar *)str, length);
}
else if (selection_data->target == text_atom ||
selection_data->target == ctext_atom)
@ -441,7 +441,8 @@ gtk_editable_selection_received (GtkWidget *widget,
case STRING:
selection_data->data[selection_data->length] = 0;
gtk_editable_insert_text (editable, selection_data->data,
strlen (selection_data->data), &tmp_pos);
strlen ((gchar *)selection_data->data),
&tmp_pos);
editable->current_pos = tmp_pos;
break;
case CTEXT:

151
gtk/gtkentry.c
View File

@ -26,6 +26,7 @@
#include "gtkmain.h"
#include "gtkselection.h"
#include "gtksignal.h"
#include "gtkprivate.h"
#define MIN_ENTRY_WIDTH 150
#define DRAW_TIMEOUT 20
@ -861,7 +862,6 @@ gtk_entry_key_press (GtkWidget *widget,
gint return_val;
gint key;
guint initial_pos;
guint tmp_pos;
gint extend_selection;
gint extend_start;
@ -995,6 +995,8 @@ gtk_entry_key_press (GtkWidget *widget,
}
if (event->length > 0)
{
gint tmp_pos;
extend_selection = FALSE;
gtk_editable_delete_selection (editable);
@ -1508,7 +1510,7 @@ gtk_entry_update_text (GtkEditable *editable,
gtk_entry_queue_draw (GTK_ENTRY(editable));
}
gchar *
static gchar *
gtk_entry_get_chars (GtkEditable *editable,
gint start_pos,
gint end_pos)
@ -1551,13 +1553,21 @@ gtk_move_forward_character (GtkEntry *entry)
GtkEditable *editable;
editable = GTK_EDITABLE (entry);
if (editable->current_pos < entry->text_length)
if (gtk_use_mb)
{
len = mblen (entry->text+editable->current_pos, MB_CUR_MAX);
editable->current_pos += (len>0)? len:1;
if (editable->current_pos < entry->text_length)
{
len = mblen (entry->text+editable->current_pos, MB_CUR_MAX);
editable->current_pos += (len>0)? len:1;
}
if (editable->current_pos > entry->text_length)
editable->current_pos = entry->text_length;
}
else
{
if (editable->current_pos < entry->text_length)
editable->current_pos ++;
}
if (editable->current_pos > entry->text_length)
editable->current_pos = entry->text_length;
}
static gint
@ -1583,11 +1593,14 @@ gtk_move_backward_character (GtkEntry *entry)
GtkEditable *editable;
editable = GTK_EDITABLE (entry);
/* this routine is correct only if string is state-independent-encoded */
if (0 < editable->current_pos)
editable->current_pos = move_backward_character (entry->text,
editable->current_pos);
{
if (gtk_use_mb)
editable->current_pos = move_backward_character (entry->text,
editable->current_pos);
else
editable->current_pos--;
}
}
static void
@ -1605,26 +1618,46 @@ gtk_move_forward_word (GtkEntry *entry)
{
text = entry->text;
i = editable->current_pos;
len = mbtowc (&c, text+i, MB_CUR_MAX);
if (!iswalnum(c))
for (; i < entry->text_length; i+=len)
{
len = mbtowc (&c, text+i, MB_CUR_MAX);
if (len < 1 || iswalnum(c))
break;
}
for (; i < entry->text_length; i+=len)
if (gtk_use_mb)
{
len = mbtowc (&c, text+i, MB_CUR_MAX);
if (len < 1 || !iswalnum(c))
break;
if (!iswalnum(c))
for (; i < entry->text_length; i+=len)
{
len = mbtowc (&c, text+i, MB_CUR_MAX);
if (len < 1 || iswalnum(c))
break;
}
for (; i < entry->text_length; i+=len)
{
len = mbtowc (&c, text+i, MB_CUR_MAX);
if (len < 1 || !iswalnum(c))
break;
}
editable->current_pos = i;
if (editable->current_pos > entry->text_length)
editable->current_pos = entry->text_length;
}
else
{
if (!isalnum (text[i]))
for (; i < entry->text_length; i++)
{
if (isalnum(text[i]))
break;
}
for (; i < entry->text_length; i++)
{
if (!isalnum(text[i]))
break;
}
editable->current_pos = i;
if (editable->current_pos > entry->text_length)
editable->current_pos = entry->text_length;
editable->current_pos = i;
}
}
}
@ -1639,39 +1672,57 @@ gtk_move_backward_word (GtkEntry *entry)
GtkEditable *editable;
editable = GTK_EDITABLE (entry);
if (entry->text)
if (entry->text && editable->current_pos > 0)
{
text = entry->text;
i=move_backward_character(text, editable->current_pos);
if (i < 0) /* Per */
{
editable->selection_start_pos = 0;
editable->selection_end_pos = 0;
return;
}
len = mbtowc (&c, text+i, MB_CUR_MAX);
if (!iswalnum(c))
for (; i >= 0; i=move_backward_character(text, i))
{
len = mbtowc (&c, text+i, MB_CUR_MAX);
if (iswalnum(c))
break;
}
for (; i >= 0; i=move_backward_character(text, i))
if (gtk_use_mb)
{
i=move_backward_character(text, editable->current_pos);
len = mbtowc (&c, text+i, MB_CUR_MAX);
if (!iswalnum(c))
for (; i >= 0; i=move_backward_character(text, i))
{
len = mbtowc (&c, text+i, MB_CUR_MAX);
if (iswalnum(c))
break;
}
for (; i >= 0; i=move_backward_character(text, i))
{
i += len;
break;
len = mbtowc (&c, text+i, MB_CUR_MAX);
if (!iswalnum(c))
{
i += len;
break;
}
}
}
else
{
i = editable->current_pos - 1;
if (!isalnum(text[i]))
for (; i >= 0; i--)
{
if (isalnum(text[i]))
break;
}
for (; i >= 0; i--)
{
if (!isalnum(text[i]))
{
i++;
break;
}
}
}
if (i < 0)
i = 0;
i = 0;
editable->current_pos = i;
}
}

31
gtk/gtkmain.c
View File

@ -15,6 +15,7 @@
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <X11/Xlocale.h> /* so we get the right setlocale */
#include <stdio.h>
#include <stdlib.h>
#include "gtkbutton.h"
@ -32,6 +33,7 @@
#include "gtkwidget.h"
#include "gtkwindow.h"
#include "gtkprivate.h"
#include "gdk/gdki18n.h"
#include "../config.h"
@ -166,11 +168,14 @@ guint gtk_debug_flags = 0; /* Global GTK debug flag */
#ifdef G_ENABLE_DEBUG
static GDebugKey gtk_debug_keys[] = {
{"objects", GTK_DEBUG_OBJECTS}
{"objects", GTK_DEBUG_OBJECTS},
{"misc", GTK_DEBUG_MISC}
};
static const guint gtk_ndebug_keys = sizeof (gtk_debug_keys) / sizeof (GDebugKey);
gboolean gtk_use_mb = -1;
#endif /* G_ENABLE_DEBUG */
@ -180,6 +185,8 @@ void
gtk_init (int *argc,
char ***argv)
{
gchar *current_locale;
if (0)
{
g_set_error_handler (gtk_error);
@ -255,6 +262,28 @@ gtk_init (int *argc,
#endif /* G_ENABLE_DEBUG */
/* Check if there is a good chance the mb functions will handle things
* correctly - set if either mblen("\xc0", MB_CUR_MAX) == 1 in the
* C locale, or were using X's mb functions. (-DX_LOCALE && locale != C)
*/
current_locale = setlocale (LC_CTYPE, NULL);
setlocale (LC_CTYPE, "C");
#ifdef X_LOCALE
if ((strcmp (current_locale, "C")) && (!strcmp (current_locale, "POSIX")))
gtk_use_mb = TRUE;
else
#endif
{
gtk_use_mb = (mblen ("\xc0", MB_CUR_MAX) == 1);
}
setlocale (LC_CTYPE, current_locale);
GTK_NOTE (MISC, g_print("%s multi-byte string functions.\n",
gtk_use_mb ? "Using" : "Not using"));
/* Initialize the default visual and colormap to be
* used in creating widgets. (We want to use the system
* defaults so as to be nice to the colormap).

2
gtk/gtkobject.c
View File

@ -348,7 +348,7 @@ gtk_object_class_add_signals (GtkObjectClass *class,
g_return_if_fail (class != NULL);
new_signals = g_new (gint, class->nsignals + nsignals);
new_signals = g_new (guint, class->nsignals + nsignals);
for (i = 0; i < class->nsignals; i++)
new_signals[i] = class->signals[i];
for (i = 0; i < nsignals; i++)

6
gtk/gtkprivate.h
View File

@ -60,7 +60,11 @@ enum
#define GTK_PRIVATE_SET_FLAG(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) |= (PRIVATE_ ## flag)); }G_STMT_END
#define GTK_PRIVATE_UNSET_FLAG(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) &= ~(PRIVATE_ ## flag)); }G_STMT_END
/* True if there is a good chance the mb functions will handle things
* correctly - set if either mblen("\xc0", MB_CUR_MAX) == 1 in the
* C locale, or were using X's mb functions. (-DX_LOCALE && locale != C)
*/
extern gboolean gtk_use_mb;
#ifdef __cplusplus
}

2
gtk/gtktext.c
View File

@ -4546,7 +4546,7 @@ recompute_geometry (GtkText* text)
/* Selection */
/**********************************************************************/
void
static void
gtk_text_set_selection (GtkEditable *editable,
gint start,
gint end)