ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.380 by root, Tue Jun 5 11:35:58 2012 UTC vs.
Revision 1.383 by sf-exg, Wed Aug 29 09:43:42 2012 UTC

392 rxvt_warn ("+ %s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393 393
394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
396 396
397 sprintf (number, "%d", event->request_code);
398 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
399 rxvt_warn ("+ (which is %s)\n", buffer);
400
401 if (event->request_code >= 128) 397 if (event->request_code >= 128)
402 { 398 {
399#if 0
400 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
401 int nexts;
402 char **exts = XListExtensions (dpy, &nexts);
403
404 while (nexts)
405 {
406 char *extname = exts [nexts - 1];
407 int major, first_event, first_error;
408
409 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
410 {
411 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
412 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
413
414 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
415 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
416 rxvt_warn ("+ (which is %s)\n", buffer);
417
418 break;
419 }
420
421 printf ("nextss %d %s\n", nexts, extname);//D
422 --nexts;
423 ++exts;
424 }
425#else
426 int nexts = 0;
427 char **exts = 0;
428#endif
429
430 if (!nexts)
431 {
432 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
433
403 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); 434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code); 435 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
436
437#if 0
438 sprintf (number, "RENDER.%d", event->minor_code);
439 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
440 rxvt_warn ("+ (which is %s)\n", buffer);
441#endif
442 }
443
444 XFreeExtensionList (exts);
445 }
446 else
447 {
448 sprintf (number, "%d", event->request_code);
449 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
450 rxvt_warn ("+ (which is %s)\n", buffer);
405 } 451 }
406 452
407 if (event->error_code == BadWindow 453 if (event->error_code == BadWindow
408 || event->error_code == BadPixmap 454 || event->error_code == BadPixmap
409 || event->error_code == BadCursor 455 || event->error_code == BadCursor
771 817
772 delete fontset[0]; 818 delete fontset[0];
773 fontset[0] = fs; 819 fontset[0] = fs;
774 820
775 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 821 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
776 prop.width += letterSpace; 822 prop.width = max (prop.width + letterSpace, 1);
777 823
778 fs->set_prop (prop, false); 824 fs->set_prop (prop, false);
779 825
780 fwidth = prop.width; 826 fwidth = prop.width;
781 fheight = prop.height + lineSpace; 827 fheight = prop.height + lineSpace;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines