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

Improve error messages for X errors and losing connection to the X server.

Browse Source 
2001-05-11  Havoc Pennington  <hp@pobox.com>

	* gdk/x11/gdkmain-x11.c: Improve error messages for X errors and
	losing connection to the X server.
This commit is contained in:
Havoc Pennington 2001-05-20 22:48:40 +00:00 committed by Havoc Pennington
parent 6144752d20
commit dd0aa0d815
9 changed files with 66 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2001-05-11 Havoc Pennington <hp@pobox.com>
* gdk/x11/gdkmain-x11.c: Improve error messages for X errors and
losing connection to the X server.
Sun May 20 13:59:20 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Start checks for X from pangox/pangoxft

5
ChangeLog.pre-2-0
View File

@ -1,3 +1,8 @@
2001-05-11 Havoc Pennington <hp@pobox.com>
* gdk/x11/gdkmain-x11.c: Improve error messages for X errors and
losing connection to the X server.
Sun May 20 13:59:20 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Start checks for X from pangox/pangoxft

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2001-05-11 Havoc Pennington <hp@pobox.com>
* gdk/x11/gdkmain-x11.c: Improve error messages for X errors and
losing connection to the X server.
Sun May 20 13:59:20 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Start checks for X from pangox/pangoxft

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
2001-05-11 Havoc Pennington <hp@pobox.com>
* gdk/x11/gdkmain-x11.c: Improve error messages for X errors and
losing connection to the X server.
Sun May 20 13:59:20 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Start checks for X from pangox/pangoxft

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
2001-05-11 Havoc Pennington <hp@pobox.com>
* gdk/x11/gdkmain-x11.c: Improve error messages for X errors and
losing connection to the X server.
Sun May 20 13:59:20 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Start checks for X from pangox/pangoxft

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
2001-05-11 Havoc Pennington <hp@pobox.com>
* gdk/x11/gdkmain-x11.c: Improve error messages for X errors and
losing connection to the X server.
Sun May 20 13:59:20 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Start checks for X from pangox/pangoxft

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2001-05-11 Havoc Pennington <hp@pobox.com>
* gdk/x11/gdkmain-x11.c: Improve error messages for X errors and
losing connection to the X server.
Sun May 20 13:59:20 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Start checks for X from pangox/pangoxft

1
docs/reference/gtk/tmpl/gtkrc.sgml
View File

@ -495,6 +495,7 @@ This can later be composited together with other
#GtkRcStyle structures to form a #GtkStyle.
</para>
@parent_instance:
@name:
@bg_pixmap_name:
@font_desc:

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

@ -617,24 +617,32 @@ gdk_x_error (Display *display,
{
if (gdk_error_warnings)
{
char buf[64];
gchar buf[64];
gchar *msg;
XGetErrorText (display, error->error_code, buf, 63);
msg =
g_strdup_printf ("The program '%s' received an X Window System error.\n"
"This probably reflects a bug in the program.\n"
"The error was '%s'.\n"
" (Details: serial %ld error_code %d request_code %d minor_code %d)\n"
" (Note to programmers: normally, X errors are reported asynchronously;\n"
" that is, you will receive the error a while after causing it.\n"
" To debug your program, run it with the --sync command line\n"
" option to change this behavior. You can then get a meaningful\n"
" backtrace from your debugger if you break on the gdk_x_error() function.)",
g_get_prgname (),
buf,
error->serial,
error->error_code,
error->request_code,
error->minor_code);
#ifdef G_ENABLE_DEBUG
g_error ("%s\n serial %ld error_code %d request_code %d minor_code %d\n",
buf,
error->serial,
error->error_code,
error->request_code,
error->minor_code);
g_error ("%s", msg);
#else /* !G_ENABLE_DEBUG */
fprintf (stderr, "Gdk-ERROR **: %s\n serial %ld error_code %d request_code %d minor_code %d\n",
buf,
error->serial,
error->error_code,
error->request_code,
error->minor_code);
fprintf (stderr, "%s\n", msg);
exit(1);
#endif /* G_ENABLE_DEBUG */
@ -675,11 +683,17 @@ gdk_x_io_error (Display *display)
*/
if (errno == EPIPE)
{
fprintf (stderr, "Gdk-ERROR **: X connection to %s broken (explicit kill or server shutdown).\n", gdk_display ? DisplayString (gdk_display) : gdk_get_display());
fprintf (stderr,
"The application '%s' lost its connection to the display %s;\n"
"most likely the X server was shut down or you killed/destroyed\n"
"the application.\n",
g_get_prgname (),
gdk_display ? DisplayString (gdk_display) : gdk_get_display());
}
else
{
fprintf (stderr, "Gdk-ERROR **: Fatal IO error %d (%s) on X server %s.\n",
fprintf (stderr, "%s: Fatal IO error %d (%s) on X server %s.\n",
g_get_prgname (),
errno, g_strerror (errno),
gdk_display ? DisplayString (gdk_display) : gdk_get_display());
}