… | |
… | |
390 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); |
390 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); |
391 | sprintf(number, "%d", event->request_code); |
391 | sprintf(number, "%d", event->request_code); |
392 | XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); |
392 | XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); |
393 | rxvt_warn ("(which is %s)\n", buffer); |
393 | rxvt_warn ("(which is %s)\n", buffer); |
394 | if (event->request_code >= 128) { |
394 | if (event->request_code >= 128) { |
395 | XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", |
395 | XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", |
396 | mesg, BUFSIZ); |
396 | mesg, BUFSIZ); |
397 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); |
397 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); |
398 | } |
398 | } |
399 | if ((event->error_code == BadWindow) || |
399 | if ((event->error_code == BadWindow) || |
400 | (event->error_code == BadPixmap) || |
400 | (event->error_code == BadPixmap) || |
401 | (event->error_code == BadCursor) || |
401 | (event->error_code == BadCursor) || |
402 | (event->error_code == BadFont) || |
402 | (event->error_code == BadFont) || |
403 | (event->error_code == BadDrawable) || |
403 | (event->error_code == BadDrawable) || |
404 | (event->error_code == BadColor) || |
404 | (event->error_code == BadColor) || |
405 | (event->error_code == BadGC) || |
405 | (event->error_code == BadGC) || |
406 | (event->error_code == BadIDChoice) || |
406 | (event->error_code == BadIDChoice) || |
407 | (event->error_code == BadValue) || |
407 | (event->error_code == BadValue) || |
408 | (event->error_code == BadAtom)) { |
408 | (event->error_code == BadAtom)) { |
409 | if (event->error_code == BadValue) |
409 | if (event->error_code == BadValue) |
410 | XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", |
410 | XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", |
411 | mesg, BUFSIZ); |
411 | mesg, BUFSIZ); |
412 | else if (event->error_code == BadAtom) |
412 | else if (event->error_code == BadAtom) |
413 | XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", |
413 | XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", |
414 | mesg, BUFSIZ); |
414 | mesg, BUFSIZ); |
415 | else |
415 | else |
416 | XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", |
416 | XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", |
417 | mesg, BUFSIZ); |
417 | mesg, BUFSIZ); |
418 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); |
418 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); |
419 | } |
419 | } |
420 | XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", |
420 | XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", |
421 | mesg, BUFSIZ); |
421 | mesg, BUFSIZ); |
422 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); |
422 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); |
423 | } |
423 | } |
424 | #endif |
424 | #endif |
425 | |
425 | |
426 | int |
426 | int |
… | |
… | |
688 | #endif |
688 | #endif |
689 | |
689 | |
690 | delete fontset[0]; |
690 | delete fontset[0]; |
691 | fontset[0] = fs; |
691 | fontset[0] = fs; |
692 | |
692 | |
693 | prop = (*fs)[1]->properties (); |
693 | prop = (*fs)[rxvt_fontset::firstFont]->properties (); |
694 | prop.height += lineSpace; |
694 | prop.height += lineSpace; |
695 | prop.width += letterSpace; |
695 | prop.width += letterSpace; |
696 | |
696 | |
697 | fs->set_prop (prop, false); |
697 | fs->set_prop (prop, false); |
698 | |
698 | |