… | |
… | |
36 | #include "keyboard.h" |
36 | #include "keyboard.h" |
37 | #include "rxvtperl.h" |
37 | #include "rxvtperl.h" |
38 | |
38 | |
39 | #include <limits> |
39 | #include <limits> |
40 | |
40 | |
41 | #include <cassert> |
41 | #include <assert.h> |
42 | #include <csignal> |
42 | #include <signal.h> |
43 | #include <cstring> |
43 | #include <string.h> |
44 | |
44 | |
45 | #include <termios.h> |
45 | #include <termios.h> |
46 | |
46 | |
47 | #ifdef HAVE_XSETLOCALE |
47 | #ifdef HAVE_XSETLOCALE |
48 | # define X_LOCALE |
48 | # define X_LOCALE |
49 | # include <X11/Xlocale.h> |
49 | # include <X11/Xlocale.h> |
50 | #else |
50 | #else |
51 | # ifdef HAVE_SETLOCALE |
|
|
52 | # include <clocale> |
51 | # include <locale.h> |
53 | # endif |
|
|
54 | #endif |
52 | #endif |
55 | |
53 | |
56 | struct termios rxvt_term::def_tio; |
54 | struct termios rxvt_term::def_tio; |
57 | vector<rxvt_term *> rxvt_term::termlist; |
55 | vector<rxvt_term *> rxvt_term::termlist; |
58 | |
56 | |
… | |
… | |
174 | #endif |
172 | #endif |
175 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
173 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
176 | rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), |
174 | rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), |
177 | #endif |
175 | #endif |
178 | scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), |
176 | scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), |
179 | #ifdef USE_XIM |
177 | #if USE_XIM |
180 | im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), |
178 | im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), |
181 | #endif |
179 | #endif |
182 | #ifdef POINTER_BLANK |
180 | #ifdef POINTER_BLANK |
183 | pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); |
181 | pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); |
184 | #endif |
182 | #endif |
… | |
… | |
197 | termlist.push_back (this); |
195 | termlist.push_back (this); |
198 | |
196 | |
199 | #ifdef KEYSYM_RESOURCE |
197 | #ifdef KEYSYM_RESOURCE |
200 | keyboard = new keyboard_manager; |
198 | keyboard = new keyboard_manager; |
201 | #endif |
199 | #endif |
202 | |
|
|
203 | // this->envv = 0; |
|
|
204 | } |
200 | } |
205 | |
201 | |
206 | // clean up the most important stuff, do *not* call x or free mem etc. |
202 | // clean up the most important stuff, do *not* call x or free mem etc. |
207 | // for use before an emergency exit |
203 | // for use before an emergency exit |
208 | void |
204 | void |
… | |
… | |
235 | if (display) |
231 | if (display) |
236 | { |
232 | { |
237 | selection_clear (); |
233 | selection_clear (); |
238 | selection_clear (true); |
234 | selection_clear (true); |
239 | |
235 | |
240 | #ifdef USE_XIM |
236 | #if USE_XIM |
241 | im_destroy (); |
237 | im_destroy (); |
242 | #endif |
238 | #endif |
243 | scrollBar.destroy (); |
239 | scrollBar.destroy (); |
244 | if (gc) XFreeGC (dpy, gc); |
240 | if (gc) XFreeGC (dpy, gc); |
245 | |
241 | |
… | |
… | |
269 | for (int i = 0; i < allocated.size (); i++) |
265 | for (int i = 0; i < allocated.size (); i++) |
270 | free (allocated [i]); |
266 | free (allocated [i]); |
271 | |
267 | |
272 | free (selection.text); |
268 | free (selection.text); |
273 | free (selection.clip_text); |
269 | free (selection.clip_text); |
274 | // TODO: manage env vars in child only(!) |
|
|
275 | free (env_display); |
|
|
276 | free (env_term); |
|
|
277 | free (locale); |
270 | free (locale); |
278 | free (v_buffer); |
271 | free (v_buffer); |
279 | |
272 | |
280 | delete selection_req; |
273 | delete selection_req; |
281 | |
274 | |
… | |
… | |
355 | |
348 | |
356 | delete this; |
349 | delete this; |
357 | } |
350 | } |
358 | |
351 | |
359 | void |
352 | void |
360 | rxvt_term::set_option (uint8_t opt, bool set) |
353 | rxvt_term::set_option (uint8_t opt, bool set) NOTHROW |
361 | { |
354 | { |
362 | if (!opt) |
355 | if (!opt) |
363 | return; |
356 | return; |
364 | |
357 | |
365 | uint8_t mask = 1 << (opt & 7); |
358 | uint8_t mask = 1 << (opt & 7); |
… | |
… | |
369 | } |
362 | } |
370 | |
363 | |
371 | /*----------------------------------------------------------------------*/ |
364 | /*----------------------------------------------------------------------*/ |
372 | /* |
365 | /* |
373 | * Exit gracefully, clearing the utmp entry and restoring tty attributes |
366 | * Exit gracefully, clearing the utmp entry and restoring tty attributes |
374 | * TODO: if debugging, this should free up any known resources if we can |
|
|
375 | */ |
367 | */ |
376 | static XErrorHandler old_xerror_handler; |
368 | static XErrorHandler old_xerror_handler; |
377 | |
369 | |
378 | static void |
370 | static void |
379 | rxvt_emergency_cleanup () |
371 | rxvt_emergency_cleanup () |
… | |
… | |
381 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
373 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
382 | (*t)->emergency_cleanup (); |
374 | (*t)->emergency_cleanup (); |
383 | } |
375 | } |
384 | |
376 | |
385 | #if !ENABLE_MINIMAL |
377 | #if !ENABLE_MINIMAL |
386 | static void |
378 | static void ecb_cold |
387 | print_x_error (Display *dpy, XErrorEvent *event) |
379 | print_x_error (Display *dpy, XErrorEvent *event) |
388 | { |
380 | { |
389 | char buffer[BUFSIZ]; |
381 | char buffer[BUFSIZ]; |
390 | char mesg[BUFSIZ]; |
382 | char mesg[BUFSIZ]; |
391 | char number[32]; |
383 | char number[32]; |
392 | const char mtype[] = "XlibMessage"; |
384 | |
393 | XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); |
|
|
394 | XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); |
|
|
395 | rxvt_warn ("An X Error occurred, trying to continue after report.\n"); |
385 | rxvt_warn ("An X Error occurred, trying to continue after report.\n"); |
|
|
386 | |
|
|
387 | XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ); |
|
|
388 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial); |
|
|
389 | |
|
|
390 | XGetErrorText (dpy, event->error_code, buffer, BUFSIZ); |
|
|
391 | XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ); |
396 | rxvt_warn ("%s: %s\n", mesg, buffer); |
392 | rxvt_warn ("+ %s: %s\n", mesg, buffer); |
|
|
393 | |
397 | XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); |
394 | XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ); |
398 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); |
395 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code); |
399 | sprintf(number, "%d", event->request_code); |
396 | |
400 | XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); |
|
|
401 | rxvt_warn ("(which is %s)\n", buffer); |
|
|
402 | if (event->request_code >= 128) { |
397 | if (event->request_code >= 128) |
|
|
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, mtype, "MinorCode", "Request Minor code %d", |
434 | XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); |
404 | mesg, BUFSIZ); |
435 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code); |
405 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), 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); |
406 | } |
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); |
|
|
451 | } |
|
|
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 |
410 | (event->error_code == BadFont) || |
456 | || event->error_code == BadFont |
411 | (event->error_code == BadDrawable) || |
457 | || event->error_code == BadDrawable |
412 | (event->error_code == BadColor) || |
458 | || event->error_code == BadColor |
413 | (event->error_code == BadGC) || |
459 | || event->error_code == BadGC |
414 | (event->error_code == BadIDChoice) || |
460 | || event->error_code == BadIDChoice |
415 | (event->error_code == BadValue) || |
461 | || event->error_code == BadValue |
416 | (event->error_code == BadAtom)) { |
462 | || event->error_code == BadAtom) |
|
|
463 | { |
417 | if (event->error_code == BadValue) |
464 | if (event->error_code == BadValue) |
418 | XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", |
465 | XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ); |
419 | mesg, BUFSIZ); |
|
|
420 | else if (event->error_code == BadAtom) |
466 | else if (event->error_code == BadAtom) |
421 | XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", |
467 | XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ); |
422 | mesg, BUFSIZ); |
|
|
423 | else |
468 | else |
424 | XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", |
469 | XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); |
425 | mesg, BUFSIZ); |
|
|
426 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); |
|
|
427 | } |
|
|
428 | XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", |
|
|
429 | mesg, BUFSIZ); |
|
|
430 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); |
|
|
431 | } |
|
|
432 | #endif |
|
|
433 | |
470 | |
434 | int |
471 | snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid); |
|
|
472 | } |
|
|
473 | } |
|
|
474 | #endif |
|
|
475 | |
|
|
476 | int ecb_cold |
435 | rxvt_xerror_handler (Display *display, XErrorEvent *event) |
477 | rxvt_xerror_handler (Display *display, XErrorEvent *event) |
436 | { |
478 | { |
437 | if (GET_R->allowedxerror == -1) |
479 | if (GET_R->allowedxerror == -1) |
438 | GET_R->allowedxerror = event->error_code; |
480 | GET_R->allowedxerror = event->error_code; |
439 | else |
481 | else |
… | |
… | |
448 | } |
490 | } |
449 | |
491 | |
450 | return 0; |
492 | return 0; |
451 | } |
493 | } |
452 | |
494 | |
453 | int |
495 | int ecb_cold |
454 | rxvt_xioerror_handler (Display *display) |
496 | rxvt_xioerror_handler (Display *display) |
455 | { |
497 | { |
456 | rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", |
498 | rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", |
457 | DisplayString (display)); |
499 | DisplayString (display)); |
458 | rxvt_emergency_cleanup (); |
500 | rxvt_emergency_cleanup (); |
… | |
… | |
578 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
620 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
579 | // TODO: handle this with exceptions and tolerate the memory loss |
621 | // TODO: handle this with exceptions and tolerate the memory loss |
580 | XSetIOErrorHandler (rxvt_xioerror_handler); |
622 | XSetIOErrorHandler (rxvt_xioerror_handler); |
581 | |
623 | |
582 | XrmInitialize (); |
624 | XrmInitialize (); |
|
|
625 | |
|
|
626 | #if HAVE_PIXBUF |
|
|
627 | g_type_init (); |
|
|
628 | #endif |
583 | } |
629 | } |
584 | |
630 | |
585 | /*----------------------------------------------------------------------*/ |
631 | /*----------------------------------------------------------------------*/ |
586 | /* |
632 | /* |
587 | * window size/position calculations for XSizeHint and other storage. |
633 | * window size/position calculations for XSizeHint and other storage. |
… | |
… | |
715 | // size, i.e., when the wm does not honour our size hints, there are |
761 | // size, i.e., when the wm does not honour our size hints, there are |
716 | // extra areas not covered by the terminal screen. Such gaps, when a |
762 | // extra areas not covered by the terminal screen. Such gaps, when a |
717 | // bg pixmap is set, would have to be cleared manually to properly |
763 | // bg pixmap is set, would have to be cleared manually to properly |
718 | // refresh the background. We take the simpler route and shrink the |
764 | // refresh the background. We take the simpler route and shrink the |
719 | // vt window so as to avoid creating gaps. |
765 | // vt window so as to avoid creating gaps. |
720 | width = ncol * fwidth; |
766 | vt_width = ncol * fwidth; |
721 | height = nrow * fheight; |
767 | vt_height = nrow * fheight; |
722 | } |
768 | } |
723 | |
769 | |
724 | /*----------------------------------------------------------------------*/ |
770 | /*----------------------------------------------------------------------*/ |
725 | /* |
771 | /* |
726 | * Tell the teletype handler what size the window is. |
772 | * Tell the teletype handler what size the window is. |
… | |
… | |
734 | |
780 | |
735 | struct winsize ws; |
781 | struct winsize ws; |
736 | |
782 | |
737 | ws.ws_col = ncol; |
783 | ws.ws_col = ncol; |
738 | ws.ws_row = nrow; |
784 | ws.ws_row = nrow; |
739 | ws.ws_xpixel = width; |
785 | ws.ws_xpixel = vt_width; |
740 | ws.ws_ypixel = height; |
786 | ws.ws_ypixel = vt_height; |
741 | ioctl (pty->pty, TIOCSWINSZ, &ws); |
787 | ioctl (pty->pty, TIOCSWINSZ, &ws); |
742 | |
788 | |
743 | #if 0 |
789 | #if 0 |
744 | // TIOCSWINSZ is supposed to do this automatically and correctly |
790 | // TIOCSWINSZ is supposed to do this automatically and correctly |
745 | if (cmd_pid) /* force through to the command */ |
791 | if (cmd_pid) /* force through to the command */ |
… | |
… | |
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.height += lineSpace; |
822 | prop.width = max (prop.width + letterSpace, 1); |
777 | prop.width += letterSpace; |
|
|
778 | |
823 | |
779 | fs->set_prop (prop, false); |
824 | fs->set_prop (prop, false); |
780 | |
825 | |
781 | fwidth = prop.width; |
826 | fwidth = prop.width; |
782 | fheight = prop.height; |
827 | fheight = prop.height + lineSpace; |
783 | fbase = prop.ascent; |
828 | fbase = prop.ascent; |
784 | |
829 | |
785 | for (int style = 1; style < 4; style++) |
830 | for (int style = 1; style < 4; style++) |
786 | { |
831 | { |
787 | #if ENABLE_STYLES |
832 | #if ENABLE_STYLES |
… | |
… | |
949 | |
994 | |
950 | /*----------------------------------------------------------------------*/ |
995 | /*----------------------------------------------------------------------*/ |
951 | /* |
996 | /* |
952 | * find if fg/bg matches any of the normal (low-intensity) colors |
997 | * find if fg/bg matches any of the normal (low-intensity) colors |
953 | */ |
998 | */ |
954 | void |
999 | char * |
955 | rxvt_term::set_colorfgbg () |
1000 | rxvt_term::get_colorfgbg () |
956 | { |
1001 | { |
957 | unsigned int i; |
1002 | unsigned int i; |
958 | const char *xpmb = ""; |
1003 | const char *xpmb = ""; |
959 | char fstr[] = "default"; |
1004 | char fstr[] = "default"; |
960 | char bstr[] = "default"; |
1005 | char bstr[] = "default"; |
|
|
1006 | char *env_colorfgbg; |
961 | |
1007 | |
962 | for (i = Color_Black; i <= Color_White; i++) |
1008 | for (i = Color_Black; i <= Color_White; i++) |
963 | if (pix_colors[Color_fg] == pix_colors[i]) |
1009 | if (pix_colors[Color_fg] == pix_colors[i]) |
964 | { |
1010 | { |
965 | sprintf (fstr, "%d", i - Color_Black); |
1011 | sprintf (fstr, "%d", i - Color_Black); |
… | |
… | |
968 | |
1014 | |
969 | for (i = Color_Black; i <= Color_White; i++) |
1015 | for (i = Color_Black; i <= Color_White; i++) |
970 | if (pix_colors[Color_bg] == pix_colors[i]) |
1016 | if (pix_colors[Color_bg] == pix_colors[i]) |
971 | { |
1017 | { |
972 | sprintf (bstr, "%d", i - Color_Black); |
1018 | sprintf (bstr, "%d", i - Color_Black); |
973 | #ifdef BG_IMAGE_FROM_FILE |
1019 | #if BG_IMAGE_FROM_FILE |
974 | xpmb = "default;"; |
1020 | xpmb = "default;"; |
975 | #endif |
1021 | #endif |
976 | break; |
1022 | break; |
977 | } |
1023 | } |
978 | |
1024 | |
|
|
1025 | env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg")); |
979 | sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); |
1026 | sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); |
|
|
1027 | return env_colorfgbg; |
980 | } |
1028 | } |
981 | |
1029 | |
982 | /*----------------------------------------------------------------------*/ |
1030 | /*----------------------------------------------------------------------*/ |
983 | |
1031 | |
984 | bool |
1032 | bool |
… | |
… | |
1077 | if (scrollBar.state) |
1125 | if (scrollBar.state) |
1078 | scrollBar.resize (); |
1126 | scrollBar.resize (); |
1079 | |
1127 | |
1080 | XMoveResizeWindow (dpy, vt, |
1128 | XMoveResizeWindow (dpy, vt, |
1081 | window_vt_x, window_vt_y, |
1129 | window_vt_x, window_vt_y, |
1082 | width, height); |
1130 | vt_width, vt_height); |
|
|
1131 | |
|
|
1132 | HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END)); |
1083 | |
1133 | |
1084 | #ifdef HAVE_BG_PIXMAP |
1134 | #ifdef HAVE_BG_PIXMAP |
1085 | if (bg_window_size_sensitive ()) |
1135 | if (bg_window_size_sensitive ()) |
1086 | update_background (); |
1136 | update_background (); |
1087 | #endif |
1137 | #endif |
1088 | } |
1138 | } |
1089 | |
1139 | |
1090 | if (fix_screen || old_height == 0) |
1140 | if (fix_screen || old_height == 0) |
1091 | scr_reset (); |
1141 | scr_reset (); |
1092 | |
1142 | |
1093 | #ifdef USE_XIM |
1143 | #if USE_XIM |
1094 | im_set_position (); |
1144 | im_set_position (); |
1095 | #endif |
1145 | #endif |
1096 | } |
1146 | } |
1097 | |
1147 | |
1098 | /* |
1148 | /* |
… | |
… | |
1112 | newwidth = wattr.width - szHint.base_width; |
1162 | newwidth = wattr.width - szHint.base_width; |
1113 | if (newheight == 0) |
1163 | if (newheight == 0) |
1114 | newheight = wattr.height - szHint.base_height; |
1164 | newheight = wattr.height - szHint.base_height; |
1115 | } |
1165 | } |
1116 | |
1166 | |
1117 | if (newwidth != width || newheight != height) |
1167 | if (newwidth != vt_width || newheight != vt_height) |
1118 | { |
1168 | { |
1119 | newwidth += szHint.base_width; |
1169 | newwidth += szHint.base_width; |
1120 | newheight += szHint.base_height; |
1170 | newheight += szHint.base_height; |
1121 | resize_all_windows (newwidth, newheight, 0); |
1171 | resize_all_windows (newwidth, newheight, 0); |
1122 | } |
1172 | } |
1123 | } |
1173 | } |
1124 | |
1174 | |
1125 | /* -------------------------------------------------------------------- * |
1175 | /* -------------------------------------------------------------------- * |
1126 | * - X INPUT METHOD ROUTINES - * |
1176 | * - X INPUT METHOD ROUTINES - * |
1127 | * -------------------------------------------------------------------- */ |
1177 | * -------------------------------------------------------------------- */ |
1128 | #ifdef USE_XIM |
1178 | #if USE_XIM |
1129 | |
1179 | |
1130 | void |
1180 | void |
1131 | rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) |
1181 | rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) |
1132 | { |
1182 | { |
1133 | fg = pix_colors [Color_fg]; |
1183 | fg = pix_colors [Color_fg]; |
… | |
… | |
1530 | im_destroy (); |
1580 | im_destroy (); |
1531 | |
1581 | |
1532 | if (Input_Context) |
1582 | if (Input_Context) |
1533 | return; |
1583 | return; |
1534 | |
1584 | |
1535 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
|
|
1536 | if (rs[Rs_imLocale]) |
1585 | if (rs[Rs_imLocale]) |
1537 | SET_LOCALE (rs[Rs_imLocale]); |
1586 | SET_LOCALE (rs[Rs_imLocale]); |
1538 | #endif |
|
|
1539 | |
1587 | |
1540 | p = rs[Rs_inputMethod]; |
1588 | p = rs[Rs_inputMethod]; |
1541 | if (p && *p) |
1589 | if (p && *p) |
1542 | { |
1590 | { |
1543 | bool found = false; |
1591 | bool found = false; |
… | |
… | |
1571 | /* try with no modifiers base IF the user didn't specify an IM */ |
1619 | /* try with no modifiers base IF the user didn't specify an IM */ |
1572 | if (im_get_ic ("@im=none")) |
1620 | if (im_get_ic ("@im=none")) |
1573 | goto done; |
1621 | goto done; |
1574 | |
1622 | |
1575 | done: |
1623 | done: |
1576 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
|
|
1577 | if (rs[Rs_imLocale]) |
1624 | if (rs[Rs_imLocale]) |
1578 | SET_LOCALE (locale); |
1625 | SET_LOCALE (locale); |
1579 | #endif |
|
|
1580 | } |
1626 | } |
1581 | |
1627 | |
1582 | void |
1628 | void |
1583 | rxvt_term::im_set_position () |
1629 | rxvt_term::im_set_position () |
1584 | { |
1630 | { |
… | |
… | |
1629 | { |
1675 | { |
1630 | Window cr; |
1676 | Window cr; |
1631 | XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); |
1677 | XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); |
1632 | } |
1678 | } |
1633 | |
1679 | |
1634 | Pixmap |
|
|
1635 | rxvt_term::get_pixmap_property (Atom property) |
|
|
1636 | { |
|
|
1637 | Pixmap pixmap = None; |
|
|
1638 | |
|
|
1639 | int aformat; |
|
|
1640 | unsigned long nitems, bytes_after; |
|
|
1641 | Atom atype; |
|
|
1642 | unsigned char *prop; |
|
|
1643 | int result = XGetWindowProperty (dpy, display->root, property, |
|
|
1644 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
|
|
1645 | &nitems, &bytes_after, &prop); |
|
|
1646 | if (result == Success) |
|
|
1647 | { |
|
|
1648 | if (atype == XA_PIXMAP) |
|
|
1649 | pixmap = *(Pixmap *)prop; |
|
|
1650 | XFree (prop); |
|
|
1651 | } |
|
|
1652 | |
|
|
1653 | return pixmap; |
|
|
1654 | } |
|
|
1655 | |
|
|
1656 | #ifdef HAVE_BG_PIXMAP |
1680 | #ifdef HAVE_BG_PIXMAP |
1657 | |
1681 | |
1658 | void |
1682 | void |
1659 | rxvt_term::update_background () |
1683 | rxvt_term::update_background () |
1660 | { |
1684 | { |