AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

If we can't find helvetica, fall back to "fixed". If we can't find

Browse Source 
Tue Feb  9 19:11:43 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkstyle.c (gtk_style_new): If we can't find
	  helvetica, fall back to "fixed". If we can't
	  find "fixed", exit cleanly.
This commit is contained in:
Owen Taylor 1999-02-10 00:21:09 +00:00 committed by Owen Taylor
parent 782ad2e7d2
commit 72d5843898
14 changed files with 120 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
Tue Feb 9 19:11:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_new): If we can't find
helvetica, fall back to "fixed". If we can't
find "fixed", exit cleanly.
Tue Feb 9 16:03:44 1999 Owen Taylor <otaylor@redhat.com>
* acconfig.h configure.in: Rename
XIM_INST_IS_MISSING_OR_STRANGE to USE_X11R6_XIM
* Conditionalize destroy callbacks with USE_X11R6_XIM.
Tue Feb 9 15:35:13 1999 Owen Taylor <otaylor@redhat.com> Tue Feb 9 15:35:13 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_style_set): Added * gtk/gtklabel.c (gtk_label_style_set): Added

13
ChangeLog.pre-2-0
View File

@ -1,3 +1,16 @@
Tue Feb 9 19:11:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_new): If we can't find
helvetica, fall back to "fixed". If we can't
find "fixed", exit cleanly.
Tue Feb 9 16:03:44 1999 Owen Taylor <otaylor@redhat.com>
* acconfig.h configure.in: Rename
XIM_INST_IS_MISSING_OR_STRANGE to USE_X11R6_XIM
* Conditionalize destroy callbacks with USE_X11R6_XIM.
Tue Feb 9 15:35:13 1999 Owen Taylor <otaylor@redhat.com> Tue Feb 9 15:35:13 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_style_set): Added * gtk/gtklabel.c (gtk_label_style_set): Added

13
ChangeLog.pre-2-10
View File

@ -1,3 +1,16 @@
Tue Feb 9 19:11:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_new): If we can't find
helvetica, fall back to "fixed". If we can't
find "fixed", exit cleanly.
Tue Feb 9 16:03:44 1999 Owen Taylor <otaylor@redhat.com>
* acconfig.h configure.in: Rename
XIM_INST_IS_MISSING_OR_STRANGE to USE_X11R6_XIM
* Conditionalize destroy callbacks with USE_X11R6_XIM.
Tue Feb 9 15:35:13 1999 Owen Taylor <otaylor@redhat.com> Tue Feb 9 15:35:13 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_style_set): Added * gtk/gtklabel.c (gtk_label_style_set): Added

13
ChangeLog.pre-2-2
View File

@ -1,3 +1,16 @@
Tue Feb 9 19:11:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_new): If we can't find
helvetica, fall back to "fixed". If we can't
find "fixed", exit cleanly.
Tue Feb 9 16:03:44 1999 Owen Taylor <otaylor@redhat.com>
* acconfig.h configure.in: Rename
XIM_INST_IS_MISSING_OR_STRANGE to USE_X11R6_XIM
* Conditionalize destroy callbacks with USE_X11R6_XIM.
Tue Feb 9 15:35:13 1999 Owen Taylor <otaylor@redhat.com> Tue Feb 9 15:35:13 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_style_set): Added * gtk/gtklabel.c (gtk_label_style_set): Added

13
ChangeLog.pre-2-4
View File

@ -1,3 +1,16 @@
Tue Feb 9 19:11:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_new): If we can't find
helvetica, fall back to "fixed". If we can't
find "fixed", exit cleanly.
Tue Feb 9 16:03:44 1999 Owen Taylor <otaylor@redhat.com>
* acconfig.h configure.in: Rename
XIM_INST_IS_MISSING_OR_STRANGE to USE_X11R6_XIM
* Conditionalize destroy callbacks with USE_X11R6_XIM.
Tue Feb 9 15:35:13 1999 Owen Taylor <otaylor@redhat.com> Tue Feb 9 15:35:13 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_style_set): Added * gtk/gtklabel.c (gtk_label_style_set): Added

13
ChangeLog.pre-2-6
View File

@ -1,3 +1,16 @@
Tue Feb 9 19:11:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_new): If we can't find
helvetica, fall back to "fixed". If we can't
find "fixed", exit cleanly.
Tue Feb 9 16:03:44 1999 Owen Taylor <otaylor@redhat.com>
* acconfig.h configure.in: Rename
XIM_INST_IS_MISSING_OR_STRANGE to USE_X11R6_XIM
* Conditionalize destroy callbacks with USE_X11R6_XIM.
Tue Feb 9 15:35:13 1999 Owen Taylor <otaylor@redhat.com> Tue Feb 9 15:35:13 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_style_set): Added * gtk/gtklabel.c (gtk_label_style_set): Added

13
ChangeLog.pre-2-8
View File

@ -1,3 +1,16 @@
Tue Feb 9 19:11:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_new): If we can't find
helvetica, fall back to "fixed". If we can't
find "fixed", exit cleanly.
Tue Feb 9 16:03:44 1999 Owen Taylor <otaylor@redhat.com>
* acconfig.h configure.in: Rename
XIM_INST_IS_MISSING_OR_STRANGE to USE_X11R6_XIM
* Conditionalize destroy callbacks with USE_X11R6_XIM.
Tue Feb 9 15:35:13 1999 Owen Taylor <otaylor@redhat.com> Tue Feb 9 15:35:13 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_style_set): Added * gtk/gtklabel.c (gtk_label_style_set): Added

6
acconfig.h
View File

@ -35,10 +35,8 @@
#undef RESOURCE_BASE #undef RESOURCE_BASE
/* Define to enable POSIX threading awareness */ /* Define to use X11R6 additions to XIM */
#undef USE_PTHREADS #undef USE_X11R6_XIM
#undef XIM_INST_IS_MISSING_OR_STRANGE
#undef XINPUT_NONE #undef XINPUT_NONE
#undef XINPUT_GXI #undef XINPUT_GXI

5
configure.in
View File

@ -328,9 +328,10 @@ if test x$enable_xim_inst = xmaybe ; then
fi fi
if test "x$enable_xim" = "xyes"; then if test "x$enable_xim" = "xyes"; then
AC_DEFINE(USE_XIM)
GTK_XIM_FLAGS="-DUSE_XIM" GTK_XIM_FLAGS="-DUSE_XIM"
if test "x$enable_xim_inst" = "xno"; then if test "x$enable_xim_inst" = "xyes"; then
AC_DEFINE(XIM_INST_IS_MISSING_OR_STRANGE) AC_DEFINE(USE_X11R6_XIM)
fi fi
fi fi

2
gdk/gdkevents.c
View File

@ -1955,7 +1955,7 @@ gdk_events_queue (void)
while (!gdk_event_queue_find_first() && XPending (gdk_display)) while (!gdk_event_queue_find_first() && XPending (gdk_display))
{ {
#ifdef USE_XIM #ifdef USE_XIM
Window w = None; Window w = None;
XNextEvent (gdk_display, &xevent); XNextEvent (gdk_display, &xevent);

13
gdk/gdkim.c
View File

@ -54,7 +54,7 @@ typedef struct {
gpointer value; gpointer value;
} GdkImArg; } GdkImArg;
#ifndef XIM_INST_IS_MISSING_OR_STRANGE #ifdef USE_X11R6_XIM
static void gdk_im_instantiate_cb (Display *display, static void gdk_im_instantiate_cb (Display *display,
XPointer client_data, XPointer client_data,
XPointer call_data); XPointer call_data);
@ -318,6 +318,7 @@ gdk_im_set_best_style (GdkIMStyle style)
return xim_best_allowed_style; return xim_best_allowed_style;
} }
#ifdef USE_X11R6_XIM
static void static void
gdk_im_destroy_cb (XIM im, XPointer client_data, XPointer call_data) gdk_im_destroy_cb (XIM im, XPointer client_data, XPointer call_data)
{ {
@ -340,13 +341,10 @@ gdk_im_destroy_cb (XIM im, XPointer client_data, XPointer call_data)
private->xic = NULL; private->xic = NULL;
} }
#ifndef XIM_INST_IS_MISSING_OR_STRANGE
XRegisterIMInstantiateCallback (gdk_display, NULL, NULL, NULL, XRegisterIMInstantiateCallback (gdk_display, NULL, NULL, NULL,
gdk_im_instantiate_cb, NULL); gdk_im_instantiate_cb, NULL);
#endif
} }
#ifndef XIM_INST_IS_MISSING_OR_STRANGE
static void static void
gdk_im_instantiate_cb (Display *display, gdk_im_instantiate_cb (Display *display,
XPointer client_data, XPointer call_data) XPointer client_data, XPointer call_data)
@ -366,7 +364,6 @@ gdk_im_instantiate_cb (Display *display,
static gint static gint
gdk_im_real_open (void) gdk_im_real_open (void)
{ {
XIMCallback destroy_cb;
GList *node; GList *node;
xim_im = XOpenIM (GDK_DISPLAY(), NULL, NULL, NULL); xim_im = XOpenIM (GDK_DISPLAY(), NULL, NULL, NULL);
@ -377,10 +374,14 @@ gdk_im_real_open (void)
} }
else else
{ {
#ifdef USE_X11R6_XIM
XIMCallback destroy_cb;
destroy_cb.callback = gdk_im_destroy_cb; destroy_cb.callback = gdk_im_destroy_cb;
destroy_cb.client_data = NULL; destroy_cb.client_data = NULL;
if (NULL != XSetIMValues (xim_im, XNDestroyCallback, &destroy_cb, NULL)) if (NULL != XSetIMValues (xim_im, XNDestroyCallback, &destroy_cb, NULL))
GDK_NOTE (XIM, g_warning ("Could not set destroy callback to IM. Be careful to not destroy your input method.")); GDK_NOTE (XIM, g_warning ("Could not set destroy callback to IM. Be careful to not destroy your input method."));
#endif
XGetIMValues (xim_im, XNQueryInputStyle, &xim_styles, NULL, NULL); XGetIMValues (xim_im, XNQueryInputStyle, &xim_styles, NULL, NULL);
@ -411,7 +412,7 @@ gdk_im_open (void)
if (gdk_im_real_open ()) if (gdk_im_real_open ())
return TRUE; return TRUE;
#ifndef XIM_INST_IS_MISSING_OR_STRANGE #ifdef USE_X11R6_XIM
XRegisterIMInstantiateCallback (gdk_display, NULL, NULL, NULL, XRegisterIMInstantiateCallback (gdk_display, NULL, NULL, NULL,
gdk_im_instantiate_cb, NULL); gdk_im_instantiate_cb, NULL);
#endif #endif

2
gdk/x11/gdkevents-x11.c
View File

@ -1955,7 +1955,7 @@ gdk_events_queue (void)
while (!gdk_event_queue_find_first() && XPending (gdk_display)) while (!gdk_event_queue_find_first() && XPending (gdk_display))
{ {
#ifdef USE_XIM #ifdef USE_XIM
Window w = None; Window w = None;
XNextEvent (gdk_display, &xevent); XNextEvent (gdk_display, &xevent);

13
gdk/x11/gdkim-x11.c
View File

@ -54,7 +54,7 @@ typedef struct {
gpointer value; gpointer value;
} GdkImArg; } GdkImArg;
#ifndef XIM_INST_IS_MISSING_OR_STRANGE #ifdef USE_X11R6_XIM
static void gdk_im_instantiate_cb (Display *display, static void gdk_im_instantiate_cb (Display *display,
XPointer client_data, XPointer client_data,
XPointer call_data); XPointer call_data);
@ -318,6 +318,7 @@ gdk_im_set_best_style (GdkIMStyle style)
return xim_best_allowed_style; return xim_best_allowed_style;
} }
#ifdef USE_X11R6_XIM
static void static void
gdk_im_destroy_cb (XIM im, XPointer client_data, XPointer call_data) gdk_im_destroy_cb (XIM im, XPointer client_data, XPointer call_data)
{ {
@ -340,13 +341,10 @@ gdk_im_destroy_cb (XIM im, XPointer client_data, XPointer call_data)
private->xic = NULL; private->xic = NULL;
} }
#ifndef XIM_INST_IS_MISSING_OR_STRANGE
XRegisterIMInstantiateCallback (gdk_display, NULL, NULL, NULL, XRegisterIMInstantiateCallback (gdk_display, NULL, NULL, NULL,
gdk_im_instantiate_cb, NULL); gdk_im_instantiate_cb, NULL);
#endif
} }
#ifndef XIM_INST_IS_MISSING_OR_STRANGE
static void static void
gdk_im_instantiate_cb (Display *display, gdk_im_instantiate_cb (Display *display,
XPointer client_data, XPointer call_data) XPointer client_data, XPointer call_data)
@ -366,7 +364,6 @@ gdk_im_instantiate_cb (Display *display,
static gint static gint
gdk_im_real_open (void) gdk_im_real_open (void)
{ {
XIMCallback destroy_cb;
GList *node; GList *node;
xim_im = XOpenIM (GDK_DISPLAY(), NULL, NULL, NULL); xim_im = XOpenIM (GDK_DISPLAY(), NULL, NULL, NULL);
@ -377,10 +374,14 @@ gdk_im_real_open (void)
} }
else else
{ {
#ifdef USE_X11R6_XIM
XIMCallback destroy_cb;
destroy_cb.callback = gdk_im_destroy_cb; destroy_cb.callback = gdk_im_destroy_cb;
destroy_cb.client_data = NULL; destroy_cb.client_data = NULL;
if (NULL != XSetIMValues (xim_im, XNDestroyCallback, &destroy_cb, NULL)) if (NULL != XSetIMValues (xim_im, XNDestroyCallback, &destroy_cb, NULL))
GDK_NOTE (XIM, g_warning ("Could not set destroy callback to IM. Be careful to not destroy your input method.")); GDK_NOTE (XIM, g_warning ("Could not set destroy callback to IM. Be careful to not destroy your input method."));
#endif
XGetIMValues (xim_im, XNQueryInputStyle, &xim_styles, NULL, NULL); XGetIMValues (xim_im, XNQueryInputStyle, &xim_styles, NULL, NULL);
@ -411,7 +412,7 @@ gdk_im_open (void)
if (gdk_im_real_open ()) if (gdk_im_real_open ())
return TRUE; return TRUE;
#ifndef XIM_INST_IS_MISSING_OR_STRANGE #ifdef USE_X11R6_XIM
XRegisterIMInstantiateCallback (gdk_display, NULL, NULL, NULL, XRegisterIMInstantiateCallback (gdk_display, NULL, NULL, NULL,
gdk_im_instantiate_cb, NULL); gdk_im_instantiate_cb, NULL);
#endif #endif

10
gtk/gtkstyle.c
View File

@ -396,8 +396,14 @@ gtk_style_new (void)
style = g_new0 (GtkStyle, 1); style = g_new0 (GtkStyle, 1);
if (!default_font) if (!default_font)
default_font = {
gdk_font_load ("-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*"); default_font =
gdk_font_load ("-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*");
if (!default_font)
default_font = gdk_font_load ("fixed");
if (!default_font)
g_error ("Unable to load default font.");
}
style->font = default_font; style->font = default_font;
gdk_font_ref (style->font); gdk_font_ref (style->font);