… | |
… | |
168 | sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); |
168 | sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); |
169 | #endif |
169 | #endif |
170 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
170 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
171 | slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); |
171 | slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); |
172 | #endif |
172 | #endif |
173 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
173 | #if BG_IMAGE_FROM_ROOT || ENABLE_PERL |
174 | rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), |
174 | rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), |
175 | #endif |
175 | #endif |
176 | scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), |
176 | scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), |
177 | #if USE_XIM |
177 | #if USE_XIM |
178 | im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), |
178 | im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), |
… | |
… | |
226 | |
226 | |
227 | #ifdef HAVE_BG_PIXMAP |
227 | #ifdef HAVE_BG_PIXMAP |
228 | bg_destroy (); |
228 | bg_destroy (); |
229 | #endif |
229 | #endif |
230 | |
230 | |
|
|
231 | #if HAVE_IMG |
|
|
232 | delete bg_img; |
|
|
233 | #endif |
|
|
234 | |
231 | if (display) |
235 | if (display) |
232 | { |
236 | { |
233 | selection_clear (); |
237 | selection_clear (); |
234 | selection_clear (true); |
238 | selection_clear (true); |
235 | |
239 | |
… | |
… | |
311 | { |
315 | { |
312 | #if USE_XIM |
316 | #if USE_XIM |
313 | im_ev.stop (display); |
317 | im_ev.stop (display); |
314 | #endif |
318 | #endif |
315 | scrollbar_ev.stop (display); |
319 | scrollbar_ev.stop (display); |
316 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
320 | #if BG_IMAGE_FROM_ROOT || ENABLE_PERL |
317 | rootwin_ev.stop (display); |
321 | rootwin_ev.stop (display); |
318 | #endif |
322 | #endif |
319 | termwin_ev.stop (display); |
323 | termwin_ev.stop (display); |
320 | vt_ev.stop (display); |
324 | vt_ev.stop (display); |
321 | } |
325 | } |
… | |
… | |
392 | rxvt_warn ("+ %s: %s\n", mesg, buffer); |
396 | rxvt_warn ("+ %s: %s\n", mesg, buffer); |
393 | |
397 | |
394 | XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ); |
398 | XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ); |
395 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code); |
399 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code); |
396 | |
400 | |
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) |
401 | if (event->request_code >= 128) |
402 | { |
402 | { |
|
|
403 | #if 0 |
|
|
404 | /* XListExtensions and probably query extensions hangs when there are multiple queues errors */ |
|
|
405 | int nexts; |
|
|
406 | char **exts = XListExtensions (dpy, &nexts); |
|
|
407 | |
|
|
408 | while (nexts) |
|
|
409 | { |
|
|
410 | char *extname = exts [nexts - 1]; |
|
|
411 | int major, first_event, first_error; |
|
|
412 | |
|
|
413 | if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code) |
|
|
414 | { |
|
|
415 | XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); |
|
|
416 | rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code); |
|
|
417 | |
|
|
418 | snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code); |
|
|
419 | XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ); |
|
|
420 | rxvt_warn ("+ (which is %s)\n", buffer); |
|
|
421 | |
|
|
422 | break; |
|
|
423 | } |
|
|
424 | |
|
|
425 | printf ("nextss %d %s\n", nexts, extname);//D |
|
|
426 | --nexts; |
|
|
427 | ++exts; |
|
|
428 | } |
|
|
429 | #else |
|
|
430 | int nexts = 0; |
|
|
431 | char **exts = 0; |
|
|
432 | #endif |
|
|
433 | |
|
|
434 | if (!nexts) |
|
|
435 | { |
|
|
436 | rxvt_warn ("+ (which is an unknown extension)\n", buffer); |
|
|
437 | |
403 | XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); |
438 | XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); |
404 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code); |
439 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code); |
|
|
440 | |
|
|
441 | #if 0 |
|
|
442 | sprintf (number, "RENDER.%d", event->minor_code); |
|
|
443 | XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); |
|
|
444 | rxvt_warn ("+ (which is %s)\n", buffer); |
|
|
445 | #endif |
|
|
446 | } |
|
|
447 | |
|
|
448 | XFreeExtensionList (exts); |
|
|
449 | } |
|
|
450 | else |
|
|
451 | { |
|
|
452 | sprintf (number, "%d", event->request_code); |
|
|
453 | XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); |
|
|
454 | rxvt_warn ("+ (which is %s)\n", buffer); |
405 | } |
455 | } |
406 | |
456 | |
407 | if (event->error_code == BadWindow |
457 | if (event->error_code == BadWindow |
408 | || event->error_code == BadPixmap |
458 | || event->error_code == BadPixmap |
409 | || event->error_code == BadCursor |
459 | || event->error_code == BadCursor |
… | |
… | |
771 | |
821 | |
772 | delete fontset[0]; |
822 | delete fontset[0]; |
773 | fontset[0] = fs; |
823 | fontset[0] = fs; |
774 | |
824 | |
775 | prop = (*fs)[rxvt_fontset::firstFont]->properties (); |
825 | prop = (*fs)[rxvt_fontset::firstFont]->properties (); |
776 | prop.width += letterSpace; |
826 | prop.width = max (prop.width + letterSpace, 1); |
777 | |
827 | |
778 | fs->set_prop (prop, false); |
828 | fs->set_prop (prop, false); |
779 | |
829 | |
780 | fwidth = prop.width; |
830 | fwidth = prop.width; |
781 | fheight = prop.height + lineSpace; |
831 | fheight = prop.height + lineSpace; |