… | |
… | |
35 | #include "keyboard.h" |
35 | #include "keyboard.h" |
36 | #include "rxvtperl.h" |
36 | #include "rxvtperl.h" |
37 | |
37 | |
38 | #include <limits> |
38 | #include <limits> |
39 | |
39 | |
|
|
40 | #include <cassert> |
40 | #include <csignal> |
41 | #include <csignal> |
41 | #include <cstring> |
42 | #include <cstring> |
42 | |
43 | |
43 | #include <termios.h> |
44 | #include <termios.h> |
44 | |
45 | |
… | |
… | |
101 | { |
102 | { |
102 | if (cc->c2 == c2) return c1; |
103 | if (cc->c2 == c2) return c1; |
103 | cc = (*this)[cc->c1]; |
104 | cc = (*this)[cc->c1]; |
104 | } |
105 | } |
105 | |
106 | |
106 | // check to see wether this combination already exists otherwise |
107 | // check to see whether this combination already exists otherwise |
107 | for (cc = v.end (); cc-- > v.begin (); ) |
108 | for (cc = v.end (); cc-- > v.begin (); ) |
108 | { |
109 | { |
109 | if (cc->c1 == c1 && cc->c2 == c2) |
110 | if (cc->c1 == c1 && cc->c2 == c2) |
110 | return COMPOSE_LO + (cc - v.begin ()); |
111 | return COMPOSE_LO + (cc - v.begin ()); |
111 | } |
112 | } |
… | |
… | |
227 | delete fontset[0]; |
228 | delete fontset[0]; |
228 | |
229 | |
229 | #ifdef HAVE_BG_PIXMAP |
230 | #ifdef HAVE_BG_PIXMAP |
230 | bgPixmap.destroy (); |
231 | bgPixmap.destroy (); |
231 | #endif |
232 | #endif |
|
|
233 | #ifdef HAVE_AFTERIMAGE |
|
|
234 | if (asv) |
|
|
235 | destroy_asvisual (asv, 0); |
|
|
236 | if (asimman) |
|
|
237 | destroy_image_manager (asimman, 0); |
|
|
238 | #endif |
232 | |
239 | |
233 | if (display) |
240 | if (display) |
234 | { |
241 | { |
235 | selection_clear (); |
242 | selection_clear (); |
|
|
243 | selection_clear (true); |
236 | |
244 | |
237 | #ifdef USE_XIM |
245 | #ifdef USE_XIM |
238 | im_destroy (); |
246 | im_destroy (); |
239 | #endif |
247 | #endif |
240 | scrollBar.destroy (); |
248 | scrollBar.destroy (); |
… | |
… | |
265 | /* clear all resources */ |
273 | /* clear all resources */ |
266 | for (int i = 0; i < allocated.size (); i++) |
274 | for (int i = 0; i < allocated.size (); i++) |
267 | free (allocated [i]); |
275 | free (allocated [i]); |
268 | |
276 | |
269 | free (selection.text); |
277 | free (selection.text); |
|
|
278 | free (selection.clip_text); |
270 | // TODO: manage env vars in child only(!) |
279 | // TODO: manage env vars in child only(!) |
271 | free (env_display); |
280 | free (env_display); |
272 | free (env_term); |
281 | free (env_term); |
273 | free (locale); |
282 | free (locale); |
274 | free (v_buffer); |
283 | free (v_buffer); |
… | |
… | |
382 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); |
391 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); |
383 | sprintf(number, "%d", event->request_code); |
392 | sprintf(number, "%d", event->request_code); |
384 | XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); |
393 | XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); |
385 | rxvt_warn ("(which is %s)\n", buffer); |
394 | rxvt_warn ("(which is %s)\n", buffer); |
386 | if (event->request_code >= 128) { |
395 | if (event->request_code >= 128) { |
387 | XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", |
396 | XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", |
388 | mesg, BUFSIZ); |
397 | mesg, BUFSIZ); |
389 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); |
398 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); |
390 | } |
399 | } |
391 | if ((event->error_code == BadWindow) || |
400 | if ((event->error_code == BadWindow) || |
392 | (event->error_code == BadPixmap) || |
401 | (event->error_code == BadPixmap) || |
393 | (event->error_code == BadCursor) || |
402 | (event->error_code == BadCursor) || |
394 | (event->error_code == BadFont) || |
403 | (event->error_code == BadFont) || |
395 | (event->error_code == BadDrawable) || |
404 | (event->error_code == BadDrawable) || |
396 | (event->error_code == BadColor) || |
405 | (event->error_code == BadColor) || |
397 | (event->error_code == BadGC) || |
406 | (event->error_code == BadGC) || |
398 | (event->error_code == BadIDChoice) || |
407 | (event->error_code == BadIDChoice) || |
399 | (event->error_code == BadValue) || |
408 | (event->error_code == BadValue) || |
400 | (event->error_code == BadAtom)) { |
409 | (event->error_code == BadAtom)) { |
401 | if (event->error_code == BadValue) |
410 | if (event->error_code == BadValue) |
402 | XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", |
411 | XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", |
403 | mesg, BUFSIZ); |
412 | mesg, BUFSIZ); |
404 | else if (event->error_code == BadAtom) |
413 | else if (event->error_code == BadAtom) |
405 | XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", |
414 | XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", |
406 | mesg, BUFSIZ); |
415 | mesg, BUFSIZ); |
407 | else |
416 | else |
408 | XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", |
417 | XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", |
409 | mesg, BUFSIZ); |
418 | mesg, BUFSIZ); |
410 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); |
419 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); |
411 | } |
420 | } |
412 | XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", |
421 | XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", |
413 | mesg, BUFSIZ); |
422 | mesg, BUFSIZ); |
414 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); |
423 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); |
415 | } |
424 | } |
416 | #endif |
425 | #endif |
417 | |
426 | |
418 | int |
427 | int |
… | |
… | |
470 | char **rxvt_environ; // startup environment |
479 | char **rxvt_environ; // startup environment |
471 | |
480 | |
472 | void |
481 | void |
473 | rxvt_init () |
482 | rxvt_init () |
474 | { |
483 | { |
|
|
484 | assert (("fontMask must not overlap other RS masks", |
|
|
485 | 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); |
|
|
486 | |
475 | ptytty::init (); |
487 | ptytty::init (); |
476 | |
488 | |
477 | if (!ev_default_loop (0)) |
489 | if (!ev_default_loop (0)) |
478 | rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); |
490 | rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); |
479 | |
491 | |
… | |
… | |
522 | if (rs[Rs_geometry]) |
534 | if (rs[Rs_geometry]) |
523 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
535 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
524 | |
536 | |
525 | if (flags & WidthValue) |
537 | if (flags & WidthValue) |
526 | { |
538 | { |
|
|
539 | if (!w) |
|
|
540 | rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n"); |
|
|
541 | |
527 | ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); |
542 | ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ()); |
528 | szHint.flags |= USSize; |
543 | szHint.flags |= USSize; |
529 | } |
544 | } |
530 | |
545 | |
531 | if (flags & HeightValue) |
546 | if (flags & HeightValue) |
532 | { |
547 | { |
|
|
548 | if (!h) |
|
|
549 | rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n"); |
|
|
550 | |
533 | nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); |
551 | nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ()); |
534 | szHint.flags |= USSize; |
552 | szHint.flags |= USSize; |
535 | } |
553 | } |
536 | |
554 | |
537 | if (flags & XValue) |
555 | if (flags & XValue) |
538 | { |
556 | { |
… | |
… | |
613 | szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; |
631 | szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; |
614 | |
632 | |
615 | if (recalc_y) |
633 | if (recalc_y) |
616 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
634 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
617 | |
635 | |
618 | ncol = width / fwidth; |
636 | ncol = width / fwidth; |
619 | nrow = height / fheight; |
637 | nrow = height / fheight; |
620 | } |
638 | } |
621 | |
639 | |
622 | /*----------------------------------------------------------------------*/ |
640 | /*----------------------------------------------------------------------*/ |
623 | /* |
641 | /* |
… | |
… | |
634 | |
652 | |
635 | ws.ws_col = ncol; |
653 | ws.ws_col = ncol; |
636 | ws.ws_row = nrow; |
654 | ws.ws_row = nrow; |
637 | ws.ws_xpixel = width; |
655 | ws.ws_xpixel = width; |
638 | ws.ws_ypixel = height; |
656 | ws.ws_ypixel = height; |
639 | (void)ioctl (pty->pty, TIOCSWINSZ, &ws); |
657 | ioctl (pty->pty, TIOCSWINSZ, &ws); |
640 | |
658 | |
641 | #if 0 |
659 | #if 0 |
642 | // TIOCSWINSZ is supposed to do this automatically and correctly |
660 | // TIOCSWINSZ is supposed to do this automatically and correctly |
643 | if (cmd_pid) /* force through to the command */ |
661 | if (cmd_pid) /* force through to the command */ |
644 | kill (-cmd_pid, SIGWINCH); |
662 | kill (-cmd_pid, SIGWINCH); |
… | |
… | |
674 | #endif |
692 | #endif |
675 | |
693 | |
676 | delete fontset[0]; |
694 | delete fontset[0]; |
677 | fontset[0] = fs; |
695 | fontset[0] = fs; |
678 | |
696 | |
679 | prop = (*fs)[1]->properties (); |
697 | prop = (*fs)[rxvt_fontset::firstFont]->properties (); |
680 | prop.height += lineSpace; |
698 | prop.height += lineSpace; |
|
|
699 | prop.width += letterSpace; |
681 | |
700 | |
682 | fs->set_prop (prop, false); |
701 | fs->set_prop (prop, false); |
683 | |
702 | |
684 | fwidth = prop.width; |
703 | fwidth = prop.width; |
685 | fheight = prop.height; |
704 | fheight = prop.height; |
… | |
… | |
899 | int old_width = szHint.width; |
918 | int old_width = szHint.width; |
900 | int old_height = szHint.height; |
919 | int old_height = szHint.height; |
901 | |
920 | |
902 | window_calc (newwidth, newheight); |
921 | window_calc (newwidth, newheight); |
903 | |
922 | |
904 | if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) |
923 | bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)); |
|
|
924 | |
|
|
925 | // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow |
|
|
926 | if (set_hint) |
|
|
927 | { |
|
|
928 | szHint.flags &= ~(PBaseSize | PResizeInc); |
905 | XSetWMNormalHints (dpy, parent[0], &szHint); |
929 | XSetWMNormalHints (dpy, parent[0], &szHint); |
|
|
930 | szHint.flags |= PBaseSize | PResizeInc; |
|
|
931 | } |
906 | |
932 | |
907 | if (!ignoreparent) |
933 | if (!ignoreparent) |
908 | { |
934 | { |
909 | #ifdef SMART_RESIZE |
935 | #ifdef SMART_RESIZE |
910 | /* |
936 | /* |
… | |
… | |
950 | #else |
976 | #else |
951 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
977 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
952 | #endif |
978 | #endif |
953 | } |
979 | } |
954 | |
980 | |
|
|
981 | if (set_hint) |
|
|
982 | XSetWMNormalHints (dpy, parent[0], &szHint); |
|
|
983 | |
955 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
984 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
956 | |
985 | |
957 | if (fix_screen || newwidth != old_width || newheight != old_height) |
986 | if (fix_screen || newwidth != old_width || newheight != old_height) |
958 | { |
987 | { |
959 | if (scrollBar.state) |
988 | if (scrollBar.state) |
… | |
… | |
965 | |
994 | |
966 | #ifdef HAVE_BG_PIXMAP |
995 | #ifdef HAVE_BG_PIXMAP |
967 | if (bgPixmap.window_size_sensitive ()) |
996 | if (bgPixmap.window_size_sensitive ()) |
968 | update_background (); |
997 | update_background (); |
969 | #endif |
998 | #endif |
970 | |
|
|
971 | scr_clear (); |
|
|
972 | } |
999 | } |
973 | |
1000 | |
974 | if (fix_screen || old_height == 0) |
1001 | if (fix_screen || old_height == 0) |
975 | scr_reset (); |
1002 | scr_reset (); |
976 | |
|
|
977 | // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version |
|
|
978 | //scr_touch (false); |
|
|
979 | |
1003 | |
980 | #ifdef HAVE_BG_PIXMAP |
1004 | #ifdef HAVE_BG_PIXMAP |
981 | // TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? |
1005 | // TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? |
982 | // if (bgPixmap.pixmap) |
1006 | // if (bgPixmap.pixmap) |
983 | // scr_touch (false); |
1007 | // scr_touch (false); |
… | |
… | |
1055 | |
1079 | |
1056 | /* Checking whether input method is running. */ |
1080 | /* Checking whether input method is running. */ |
1057 | bool |
1081 | bool |
1058 | rxvt_term::IMisRunning () |
1082 | rxvt_term::IMisRunning () |
1059 | { |
1083 | { |
1060 | char *p; |
|
|
1061 | Atom atom; |
1084 | Atom atom; |
1062 | Window win; |
1085 | Window win; |
1063 | char server[IMBUFSIZ]; |
1086 | char server[IMBUFSIZ]; |
1064 | |
1087 | |
1065 | /* get current locale modifier */ |
1088 | /* get current locale modifier */ |
1066 | if ((p = XSetLocaleModifiers (NULL)) != NULL) |
1089 | if (char *p = XSetLocaleModifiers (0)) |
1067 | { |
1090 | { |
1068 | strcpy (server, "@server="); |
1091 | strcpy (server, "@server="); |
1069 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1092 | strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */ |
1070 | |
1093 | |
1071 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1094 | if (p = strchr (server + 1, '@')) /* first one only */ |
1072 | *p = '\0'; |
1095 | *p = '\0'; |
1073 | |
1096 | |
1074 | atom = XInternAtom (dpy, server, False); |
1097 | atom = XInternAtom (dpy, server, False); |
1075 | win = XGetSelectionOwner (dpy, atom); |
1098 | win = XGetSelectionOwner (dpy, atom); |
1076 | |
1099 | |
… | |
… | |
1143 | |
1166 | |
1144 | term->make_current (); |
1167 | term->make_current (); |
1145 | |
1168 | |
1146 | if (text) |
1169 | if (text) |
1147 | { |
1170 | { |
1148 | void *str; |
1171 | wchar_t *str; |
1149 | |
1172 | |
1150 | if (!text->encoding_is_wchar && text->string.multi_byte) |
1173 | if (!text->encoding_is_wchar && text->string.multi_byte) |
1151 | { |
1174 | { |
1152 | // of course, X makes it ugly again |
1175 | // of course, X makes it ugly again |
1153 | if (term->rs[Rs_imLocale]) |
1176 | if (term->rs[Rs_imLocale]) |
1154 | SET_LOCALE (term->rs[Rs_imLocale]); |
1177 | SET_LOCALE (term->rs[Rs_imLocale]); |
1155 | |
1178 | |
1156 | str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); |
1179 | str = rxvt_temp_buf<wchar_t> (text->length + 1); |
1157 | mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); |
1180 | mbstowcs (str, text->string.multi_byte, text->length + 1); |
1158 | |
1181 | |
1159 | if (term->rs[Rs_imLocale]) |
1182 | if (term->rs[Rs_imLocale]) |
1160 | SET_LOCALE (term->locale); |
1183 | SET_LOCALE (term->locale); |
1161 | } |
1184 | } |
1162 | else |
1185 | else |
1163 | str = (void *)text->string.wide_char; |
1186 | str = text->string.wide_char; |
1164 | |
1187 | |
1165 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
1188 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
1166 | DT_INT, call_data->caret, |
1189 | DT_INT, call_data->caret, |
1167 | DT_INT, call_data->chg_first, |
1190 | DT_INT, call_data->chg_first, |
1168 | DT_INT, call_data->chg_length, |
1191 | DT_INT, call_data->chg_length, |