From ce925f974db25427308abfdc60f14a7f2b3ce526 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Mon, 9 Aug 2004 04:48:04 +0000
Subject: [PATCH] Add more verbose X failure messages...
---
src/conio/console.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/conio/console.c b/src/conio/console.c
index 70b66b1175..a30247b416 100644
--- a/src/conio/console.c
+++ b/src/conio/console.c
@@ -1103,6 +1103,7 @@ init_mode(int mode)
idx = find_vmode(mode & 0x7f);
if (idx == -1 || vmodelist[idx].type == NOMODE) {
+ fprintf(stderr,"Cannot initialize selected mode\n");
return(-1);
}
vmode = vmodelist[idx];
@@ -1131,8 +1132,10 @@ init_mode(int mode)
/* Update font. */
xfont = vmode.fontname;
- if(load_font())
+ if(load_font()) {
+ fprintf(stderr,"Cannot load ``%s'' font\n",xfont);
return(-1);
+ }
/* Resize window if necessary. */
resize_window();
@@ -1174,6 +1177,7 @@ init_window()
dpy = XOpenDisplay(NULL);
if (dpy == NULL) {
+ fprintf(stderr,"Cannot open connection to X server\n");
return(-1);
}
xfd = ConnectionNumber(dpy);
@@ -1257,12 +1261,18 @@ console_init()
if(dpy!=NULL)
return(0);
- if(kbd_init())
+ if(kbd_init()) {
+ fprintf(stderr,"Cannot initialize X keyboard\n");
return(-1);
- if(video_init())
+ }
+ if(video_init()) {
+ fprintf(stderr,"X video init failure\n");
return(-1);
- if(mouse_init())
+ }
+ if(mouse_init()) {
+ fprintf(stderr,"Cannot initialize X mouse\n");
return(-1);
+ }
_beginthread(video_async_event,1<<16,NULL);
return(0);
--
GitLab