| … | |
… | |
| 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), |
| … | |
… | |
| 311 | { |
311 | { |
| 312 | #if USE_XIM |
312 | #if USE_XIM |
| 313 | im_ev.stop (display); |
313 | im_ev.stop (display); |
| 314 | #endif |
314 | #endif |
| 315 | scrollbar_ev.stop (display); |
315 | scrollbar_ev.stop (display); |
| 316 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
316 | #if BG_IMAGE_FROM_ROOT || ENABLE_PERL |
| 317 | rootwin_ev.stop (display); |
317 | rootwin_ev.stop (display); |
| 318 | #endif |
318 | #endif |
| 319 | termwin_ev.stop (display); |
319 | termwin_ev.stop (display); |
| 320 | vt_ev.stop (display); |
320 | vt_ev.stop (display); |
| 321 | } |
321 | } |
| … | |
… | |
| 432 | rxvt_warn ("+ (which is an unknown extension)\n", buffer); |
432 | rxvt_warn ("+ (which is an unknown extension)\n", buffer); |
| 433 | |
433 | |
| 434 | XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); |
434 | XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); |
| 435 | 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 | |
436 | |
|
|
437 | #if 0 |
| 437 | sprintf (number, "%d", event->minor_code); |
438 | sprintf (number, "RENDER.%d", event->minor_code); |
| 438 | XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); |
439 | XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); |
| 439 | rxvt_warn ("+ (which is %s)\n", buffer); |
440 | rxvt_warn ("+ (which is %s)\n", buffer); |
|
|
441 | #endif |
| 440 | } |
442 | } |
| 441 | |
443 | |
| 442 | XFreeExtensionList (exts); |
444 | XFreeExtensionList (exts); |
| 443 | } |
445 | } |
| 444 | else |
446 | else |
| … | |
… | |
| 815 | |
817 | |
| 816 | delete fontset[0]; |
818 | delete fontset[0]; |
| 817 | fontset[0] = fs; |
819 | fontset[0] = fs; |
| 818 | |
820 | |
| 819 | prop = (*fs)[rxvt_fontset::firstFont]->properties (); |
821 | prop = (*fs)[rxvt_fontset::firstFont]->properties (); |
| 820 | prop.width += letterSpace; |
822 | prop.width = max (prop.width + letterSpace, 1); |
| 821 | |
823 | |
| 822 | fs->set_prop (prop, false); |
824 | fs->set_prop (prop, false); |
| 823 | |
825 | |
| 824 | fwidth = prop.width; |
826 | fwidth = prop.width; |
| 825 | fheight = prop.height + lineSpace; |
827 | fheight = prop.height + lineSpace; |
