ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.250 by root, Sun Jan 8 06:35:23 2006 UTC vs.
Revision 1.339 by ayin, Fri Aug 3 14:03:28 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 144 return;
149 145
150 for (;;) 146 for (;;)
151 { 147 {
152 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
153 149
154 text_t t = l.t[x]; 150 text_t t = l.t[x];
155 151
156 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
157 { 153 {
… …
230# if !UNICODE3 226# if !UNICODE3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */
301void 303void
302rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
303{ 305{
304 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
305 unsigned int newlen; 307 unsigned int newlen;
306 KeySym keysym; 308 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 309 int valid_keysym;
311 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
… …
443 scr_move_to (0, 1); 447 scr_move_to (0, 1);
444 return; 448 return;
445 } 449 }
446 else if (keysym == XK_End) 450 else if (keysym == XK_End)
447 { 451 {
448 scr_move_to (1, 0); 452 scr_move_to (1, 1);
449 return; 453 return;
450 } 454 }
451 } 455 }
452#endif 456#endif
453 } 457 }
… …
464 { 468 {
465 switch (keysym) 469 switch (keysym)
466 { 470 {
467 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
470 return; 474 return;
471#if TODO 475#if TODO
472 /* rxvt extras */ 476 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
493 { 497 {
494 commit_iso14755 (); 498 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
496# if ISO_14755 500# if ISO_14755
497 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 510# endif
499 return; 511 return;
500 } 512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
… …
507# endif 519# endif
508 return; 520 return;
509 } 521 }
510 else 522 else
511 { 523 {
512# if ENABLE_OVERLAY 524# if ISO_14755
513 scr_overlay_off (); 525 scr_overlay_off ();
514# endif 526# endif
515 iso14755buf = 0; 527 iso14755buf = 0;
516 } 528 }
517 } 529 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
521 { 533 {
522 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 535# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 538# endif
527 } 539 }
528#endif 540#endif
529 541
530#ifdef PRINTPIPE 542#ifdef PRINTPIPE
531 if (keysym == XK_Print) 543 if (keysym == XK_Print)
532 { 544 {
533 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
534 return; 546 return;
… …
716 728
717 case XK_Find: 729 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
719 break; 731 break;
720 732
721#ifdef XK_KP_End 733#ifdef XK_KP_Insert
722 case XK_KP_Insert: 734 case XK_KP_Insert:
723 /* allow shift to override */ 735 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 { 737 {
726 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
… …
867#endif 879#endif
868 /* nil */ ; 880 /* nil */ ;
869 } 881 }
870 } 882 }
871 883
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) 884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
… …
905 { 917 {
906 const char ch = C0_ESC; 918 const char ch = C0_ESC;
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
921} 923}
922/*}}} */
923 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 1003unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 1005{
930 unsigned int n, s; 1006 unsigned int n, s;
931 1007
… …
959void 1035void
960rxvt_term::flush () 1036rxvt_term::flush ()
961{ 1037{
962 flush_ev.stop (); 1038 flush_ev.stop ();
963 1039
964#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
965 if (want_full_refresh) 1041 if (want_full_refresh)
966 { 1042 {
967 want_full_refresh = 0; 1043 want_full_refresh = 0;
968 scr_clear (); 1044 scr_clear ();
969 scr_touch (false); 1045 scr_touch (false);
… …
972 1048
973 if (want_refresh) 1049 if (want_refresh)
974 { 1050 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1052 {
977 int row = -view_start; 1053 int row = view_start;
978 int end_row = row + nrow; 1054 int end_row = row + nrow;
979 1055
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 1056 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 1057 --row;
982 1058
983 do 1059 do
984 { 1060 {
985 int start_row = row; 1061 int start_row = row;
… …
1005 break; 1081 break;
1006 } 1082 }
1007 } 1083 }
1008 while (l->is_longer () && row < end_row); 1084 while (l->is_longer () && row < end_row);
1009 } 1085 }
1010 while (++row < end_row); 1086 while (row < end_row);
1011 } 1087 }
1012 1088
1013 scr_refresh (refresh_type); 1089 scr_refresh ();
1014 scrollbar_show (1); 1090 scrollbar_show (1);
1015#ifdef USE_XIM 1091#ifdef USE_XIM
1016 IMSendSpot (); 1092 IMSendSpot ();
1017#endif 1093#endif
1018 } 1094 }
… …
1021} 1097}
1022 1098
1023void 1099void
1024rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
1025{ 1101{
1026 SET_R (this); 1102 make_current ();
1027 SET_LOCALE (locale);
1028 1103
1029 display->flush (); 1104 display->flush ();
1030 1105
1031 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1108}
1034 1109
1035void 1110void
1036rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1037{ 1112{
1038 SET_R (this); 1113 make_current ();
1039 SET_LOCALE (locale);
1040 1114
1041 refresh_limit = 1;
1042 refresh_count = 0; 1115 refresh_count = 0;
1043 flush (); 1116 flush ();
1044} 1117}
1045 1118
1046#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
1049{ 1122{
1050 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1124 want_refresh = 1;
1052 1125
1053 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1054} 1127}
1055#endif 1128#endif
1056 1129
1057#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
1058void 1131void
… …
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
1073{ 1146{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1076 { 1149 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1150 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080 } 1152 }
1081} 1153}
1082#endif 1154#endif
… …
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1087{ 1159{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1161 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1163 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094 } 1165 }
1095} 1166}
1096#endif 1167#endif
… …
1101{ 1172{
1102 if (mouse_slip_wheel_speed == 0 1173 if (mouse_slip_wheel_speed == 0
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1176 {
1106 if (view_start == nsaved || 1177 if (view_start == top_row || view_start == 0)
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0; 1178 mouse_slip_wheel_speed = 0;
1109 1179
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1180 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1113 } 1182 }
1114} 1183}
1115#endif 1184#endif
1116 1185
1117#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1118static struct event_handler 1187static struct event_handler
1119{ 1188{
1120 check_watcher cw_yield; 1189 check_watcher yield_ev;
1121 1190
1122 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1123 { 1192 {
1124 sched_yield (); 1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1125 w.stop (); 1201 w.stop ();
1126 } 1202 }
1127 1203
1128 event_handler () 1204 event_handler ()
1129 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1130 { 1206 {
1131 } 1207 }
1132} event_handler; 1208} event_handler;
1133#endif 1209#endif
1134 1210
… …
1145 1221
1146 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1149 1225
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151 1227
1152 if (r > 0) 1228 if (r > 0)
1153 { 1229 {
1154 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1155 return true; 1231 return true;
1156 } 1232 }
1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 { 1234 {
1159#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1160 if (display->is_local) 1236 if (display->is_local)
1161 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1162#endif 1238#endif
1163 } 1239 }
1164 else 1240 else
1165 { 1241 {
1166 pty_ev.stop (); 1242 pty_ev.stop ();
1167 1243
1168 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1169 destroy (); 1245 destroy ();
1170 } 1246 }
1171 1247
1172 return false; 1248 return false;
1173} 1249}
1174 1250
1175void 1251void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1177{ 1253{
1178 SET_R (this); 1254 make_current ();
1179 SET_LOCALE (locale);
1180 1255
1181 if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
1182 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1258 while (pty_fill ())
1184 if (cmd_parse ()) 1259 if (cmd_parse ())
… …
1189} 1264}
1190 1265
1191void 1266void
1192rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1193{ 1268{
1194 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1195 recolour_cursor (); 1270 recolour_cursor ();
1196 1271
1197#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1198 hidden_pointer = 0; 1273 hidden_pointer = 0;
1199 1274
1200 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1201 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1202#endif 1277#endif
1203} 1278}
1204 1279
1205#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1206void 1281void
1207rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1208{ 1283{
1209 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1210 return; 1285 return;
1211 1286
1212 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1213 XFlush (display->display); 1288 XFlush (dpy);
1214 1289
1215 hidden_pointer = 1; 1290 hidden_pointer = 1;
1216} 1291}
1217 1292
1218void 1293void
1219rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
1220{ 1295{
1221 SET_R (this); 1296 make_current ();
1222 SET_LOCALE (locale);
1223 1297
1224 pointer_blank (); 1298 pointer_blank ();
1225} 1299}
1226#endif 1300#endif
1227 1301
… …
1292 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1293 (32 + x + 1), 1367 (32 + x + 1),
1294 (32 + y + 1)); 1368 (32 + y + 1));
1295} 1369}
1296 1370
1297#ifdef USING_W11LIB
1298void
1299rxvt_W11_process_x_event (XEvent *ev)
1300{
1301 rxvt_t *r = rxvt_get_r ();
1302
1303 x_cb (*ev);
1304}
1305#endif
1306
1307/*{{{ process an X event */ 1371/*{{{ process an X event */
1308void 1372void
1309rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1310{ 1374{
1311 dDisp; 1375 make_current ();
1312 1376
1313 SET_R (this); 1377 dLocal (Display *, dpy);
1314 SET_LOCALE (locale);
1315 1378
1379 if (ev.xany.window == vt
1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1382 return;
1383
1384 // for XQueryPointer
1316 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
1317 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1318 unsigned int unused_mask; 1387 unsigned int unused_mask;
1319 1388
1320 switch (ev.type) 1389 switch (ev.type)
1321 { 1390 {
1322 case KeyPress: 1391 case KeyPress:
1323#if ISO_14755 1392 key_press (ev.xkey);
1324 if (!(iso14755buf & ISO_14755_52))
1325#endif
1326 lookup_key (ev.xkey);
1327
1328 break; 1393 break;
1329 1394
1330 case KeyRelease: 1395 case KeyRelease:
1331 { 1396 key_release (ev.xkey);
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1333 KeySym ks;
1334
1335 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif
1337
1338#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support
1340 if (iso14755buf)
1341 if (iso14755buf & ISO_14755_52)
1342 {
1343# if ENABLE_OVERLAY
1344 scr_overlay_off ();
1345# endif
1346# if ISO_14755
1347 // iso14755 part 5.2 handling: release time
1348 // first: controls
1349 if ((ev.xkey.state & ControlMask)
1350 && ((ks >= 0x40 && ks <= 0x5f)
1351 || (ks >= 0x61 && ks <= 0x7f)))
1352 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == ks)
1360 {
1361 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 ();
1363 goto skip_switch;
1364 }
1365
1366 scr_bell ();
1367# endif
1368 iso14755buf = 0;
1369 break;
1370 }
1371 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372 {
1373# if ENABLE_OVERLAY
1374 scr_overlay_off ();
1375# endif
1376 if (iso14755buf & ISO_14755_51)
1377 commit_iso14755 ();
1378#if ISO_14755
1379 else if (iso14755buf & ISO_14755_STARTED)
1380 {
1381 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385 }
1386# endif
1387 else
1388 iso14755buf = 0;
1389 }
1390#endif
1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1394 break;
1395
1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop ();
1399 else if (ks == XK_Control_L || ks == XK_Control_R)
1400 mouse_slip_wheel_speed = 0;
1401#endif
1402 break; 1397 break;
1403 }
1404 1398
1405 case ButtonPress: 1399 case ButtonPress:
1406 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1407 break; 1401 break;
1408 1402
… …
1410 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1411 break; 1405 break;
1412 1406
1413 case ClientMessage: 1407 case ClientMessage:
1414 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416 { 1410 {
1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1412 {
1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1414 {
1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1418 destroy (); 1418 destroy ();
1419 }
1419#if ENABLE_EWMH 1420#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev); 1424 &ev);
1425#endif
1426 }
1427 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1424#endif 1436#endif
1425 } 1437 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break;
1462
1463 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1438 break;
1466 1439
1467 /* 1440 /*
1468 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1469 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1488 break; 1461 break;
1489 } 1462 }
1490 break; 1463 break;
1491 1464
1492 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1493 focus_in (); 1469 focus_in ();
1494 break; 1470 break;
1495 1471
1496 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1497 focus_out (); 1476 focus_out ();
1498 break; 1477 break;
1499 1478
1500 case ConfigureNotify: 1479 case ConfigureNotify:
1501 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent[0])
1502 { 1481 {
1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ; 1483 ;
1505 1484
1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507 { 1486 {
1508 seen_resize = 1; 1487 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1491 {
1492 resize_pixmap ();
1493 scr_touch (true);
1494 }
1495#endif
1510 } 1496 }
1511 1497
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1513 if (OPTION (Opt_transparent)) 1501 if (option (Opt_transparent))
1514 check_our_parents (); 1502 check_our_parents ();
1515#endif 1503#endif
1516 } 1504 }
1517 break; 1505 break;
1518 1506
1519 case PropertyNotify: 1507 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1509 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521 && ev.xproperty.state == PropertyNewValue) 1510 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom); 1511 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523 1512
1524 break; 1513 break;
1525 1514
1526 case SelectionClear: 1515 case SelectionClear:
1527 selection_clear (); 1516 selection_clear ();
… …
1550 text_blink_ev.stop (); 1539 text_blink_ev.stop ();
1551#endif 1540#endif
1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1553 break; 1542 break;
1554 1543
1555#ifdef TRANSPARENT 1544#ifdef ENABLE_TRANSPARENCY
1556 case ReparentNotify: 1545 case ReparentNotify:
1557 rootwin_cb (ev); 1546 rootwin_cb (ev);
1558 break; 1547 break;
1559#endif /* TRANSPARENT */ 1548#endif /* ENABLE_TRANSPARENCY */
1560 1549
1561 case GraphicsExpose: 1550 case GraphicsExpose:
1562 case Expose: 1551 case Expose:
1563 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1564 { 1553 {
1565 do 1554 do
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569 1558
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571 1560
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1575 1564
1576 scr_refresh (refresh_type); 1565 want_refresh = 1;
1577 } 1566 }
1578 else 1567 else
1579 { 1568 {
1580 XEvent unused_event; 1569 XEvent unused_event;
1581 1570
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1583 ; 1572 ;
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1585 ; 1574 ;
1586 1575
1587 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1588 { 1577 {
1589 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1590 scrollbar_show (0); 1579 scrollbar_show (0);
1591 } 1580 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596 1581
1597#ifdef TRANSPARENT 1582#ifdef ENABLE_TRANSPARENCY
1598 if (am_transparent && ev.xany.window == parent[0]) 1583 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window); 1584 XClearWindow (dpy, ev.xany.window);
1600#endif 1585#endif
1601 } 1586 }
1602 break; 1587 break;
1603 1588
1604 case MotionNotify: 1589 case MotionNotify:
1605#ifdef POINTER_BLANK 1590#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1591 if (hidden_pointer)
1607 pointer_unblank (); 1592 pointer_unblank ();
1608#endif 1593#endif
1609#if MENUBAR
1610 if (isMenuBarWindow (ev.xany.window))
1611 {
1612 menubar_control (ev.xbutton);
1613 break;
1614 }
1615#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1595 break;
1618 1596
1619 if (ev.xany.window == vt) 1597 if (ev.xany.window == vt)
1620 { 1598 {
1599 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1600 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop 1601 ; // nop
1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1602 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1624 { 1603 {
1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1604 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1626 ; 1605 ;
1627 1606
1628 XQueryPointer (disp, vt, 1607 XQueryPointer (dpy, vt,
1629 &unused_root, &unused_child, 1608 &unused_root, &unused_child,
1630 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1632 &ev.xbutton.state); 1611 &ev.xbutton.state);
1633#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
… …
1697#endif 1676#endif
1698 } 1677 }
1699 } 1678 }
1700 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1679 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1701 { 1680 {
1702 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1703 MotionNotify, &ev)) 1682 MotionNotify, &ev))
1704 ; 1683 ;
1705 1684
1706 XQueryPointer (disp, scrollBar.win, 1685 XQueryPointer (dpy, scrollBar.win,
1707 &unused_root, &unused_child, 1686 &unused_root, &unused_child,
1708 &unused_root_x, &unused_root_y, 1687 &unused_root_x, &unused_root_y,
1709 &ev.xbutton.x, &ev.xbutton.y, 1688 &ev.xbutton.x, &ev.xbutton.y,
1710 &unused_mask); 1689 &unused_mask);
1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1712 scrollbar_size ()); 1691 scrollbar_size ());
1713 scr_refresh (refresh_type);
1714 refresh_limit = 0; 1692 want_refresh = 1;
1715 scrollbar_show (1); 1693 scrollbar_show (1);
1716 } 1694 }
1717 break; 1695 break;
1718 } 1696 }
1719 1697
1720skip_switch: ;
1721
1722#if defined(CURSOR_BLINK) 1698#if defined(CURSOR_BLINK)
1723 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1699 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1724 { 1700 {
1725 if (hidden_cursor) 1701 if (hidden_cursor)
1726 { 1702 {
1727 hidden_cursor = 0; 1703 hidden_cursor = 0;
1728 want_refresh = 1; 1704 want_refresh = 1;
1729 } 1705 }
1730 1706
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1732 } 1708 }
1733#endif 1709#endif
1734 1710
1735#if defined(POINTER_BLANK) 1711#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1737 { 1713 {
1738 if (ev.type == MotionNotify 1714 if (ev.type == MotionNotify
1739 || ev.type == ButtonPress 1715 || ev.type == ButtonPress
1740 || ev.type == ButtonRelease) 1716 || ev.type == ButtonRelease)
1741 if (hidden_pointer) 1717 if (hidden_pointer)
… …
1753 if (!focus) 1729 if (!focus)
1754 { 1730 {
1755 focus = 1; 1731 focus = 1;
1756 want_refresh = 1; 1732 want_refresh = 1;
1757 1733
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1759 1735
1760#if USE_XIM 1736#if USE_XIM
1761 if (Input_Context != NULL) 1737 if (Input_Context != NULL)
1762 { 1738 {
1763 IMSetStatusPosition (); 1739 IMSetPosition ();
1764 XSetICFocus (Input_Context); 1740 XSetICFocus (Input_Context);
1765 } 1741 }
1766#endif 1742#endif
1767#if CURSOR_BLINK 1743#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1744 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1770#endif 1746#endif
1771#if OFF_FOCUS_FADING 1747#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade]) 1748 if (rs[Rs_fade])
1773 { 1749 {
1774 pix_colors = pix_colors_focused; 1750 pix_colors = pix_colors_focused;
1775 scr_recolour (); 1751 scr_recolour ();
1776 } 1752 }
1777#endif 1753#endif
1754#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell))
1756 {
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]);
1760 if (h != NULL)
1761 {
1762 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h);
1764 }
1765 }
1766#endif
1778 } 1767 }
1779} 1768}
1780 1769
1781void 1770void
1782rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1790 1779
1791#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1792 if (iso14755buf) 1781 if (iso14755buf)
1793 { 1782 {
1794 iso14755buf = 0; 1783 iso14755buf = 0;
1795# if ENABLE_OVERLAY 1784# if ISO_14755
1796 scr_overlay_off (); 1785 scr_overlay_off ();
1797# endif 1786# endif
1798 } 1787 }
1799#endif 1788#endif
1800#if USE_XIM 1789#if USE_XIM
1801 if (Input_Context != NULL) 1790 if (Input_Context != NULL)
1802 XUnsetICFocus (Input_Context); 1791 XUnsetICFocus (Input_Context);
1803#endif 1792#endif
1804#if CURSOR_BLINK 1793#if CURSOR_BLINK
1805 if (OPTION (Opt_cursorBlink)) 1794 if (option (Opt_cursorBlink))
1806 cursor_blink_ev.stop (); 1795 cursor_blink_ev.stop ();
1807 hidden_cursor = 0; 1796 hidden_cursor = 0;
1808#endif 1797#endif
1809#if OFF_FOCUS_FADING 1798#if OFF_FOCUS_FADING
1810 if (rs[Rs_fade]) 1799 if (rs[Rs_fade])
… …
1814 } 1803 }
1815#endif 1804#endif
1816 } 1805 }
1817} 1806}
1818 1807
1819#if TRANSPARENT 1808void
1809rxvt_term::update_fade_color (unsigned int idx)
1810{
1811#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade])
1813 {
1814 rgba c;
1815 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 }
1818#endif
1819}
1820
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL
1820void 1822void
1821rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1822{ 1824{
1823 SET_R (this); 1825 make_current ();
1824 SET_LOCALE (locale);
1825 1826
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1831# if ENABLE_TRANSPARENCY
1826 switch (ev.type) 1832 switch (ev.type)
1827 { 1833 {
1828 case PropertyNotify: 1834 case PropertyNotify:
1829 /* 1835 /*
1830 * if user used some Esetroot compatible prog to set the root bg, 1836 * if user used some Esetroot compatible prog to set the root bg,
… …
1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1835 return; 1841 return;
1836 1842
1837 /* FALLTHROUGH */ 1843 /* FALLTHROUGH */
1838 case ReparentNotify: 1844 case ReparentNotify:
1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1845 if (option (Opt_transparent))
1840 want_refresh = want_full_refresh = 1; 1846 check_our_parents ();
1841 break; 1847 break;
1842 } 1848 }
1849# endif
1843} 1850}
1844#endif 1851#endif
1845 1852
1846void 1853void
1847rxvt_term::button_press (XButtonEvent &ev) 1854rxvt_term::button_press (XButtonEvent &ev)
… …
1856 /* 1863 /*
1857 * VT window processing of button press 1864 * VT window processing of button press
1858 */ 1865 */
1859 if (ev.window == vt) 1866 if (ev.window == vt)
1860 { 1867 {
1868 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1869 return;
1870
1861#if ISO_14755 1871#if ISO_14755
1862 // 5.4 1872 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1873 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 { 1874 {
1865 iso14755_54 (ev.x, ev.y); 1875 iso14755_54 (ev.x, ev.y);
… …
1907 else 1917 else
1908 { 1918 {
1909 if (ev.button != MEvent.button) 1919 if (ev.button != MEvent.button)
1910 MEvent.clicks = 0; 1920 MEvent.clicks = 0;
1911 1921
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913 switch (ev.button) 1922 switch (ev.button)
1914 { 1923 {
1915 case Button1: 1924 case Button1:
1916 /* allow meta + click to select rectangular areas */ 1925 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */ 1926 /* should be done in screen.C */
1918#if ENABLE_FRILLS 1927#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask); 1928 selection.rect = !!(ev.state & ModMetaMask);
1920#else 1929#else
1921 selection.rect = false; 1930 selection.rect = false;
1922#endif 1931#endif
1923 1932
1924 /* allow shift+left click to extend selection */ 1933 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1934 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1935 {
1927 if (MEvent.button == Button1 && clickintime) 1936 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1937 selection_rotate (ev.x, ev.y);
1929 else 1938 else
1930 selection_extend (ev.x, ev.y, 1); 1939 selection_extend (ev.x, ev.y, 1);
1931 } 1940 }
1932 else 1941 else
1933 { 1942 {
1934 if (MEvent.button == Button1 && clickintime) 1943 if (MEvent.button == Button1 && clickintime)
1935 MEvent.clicks++; 1944 MEvent.clicks++;
1936 else 1945 else
1937 MEvent.clicks = 1; 1946 MEvent.clicks = 1;
1938 1947
1939 selection_click (MEvent.clicks, ev.x, ev.y); 1948 selection_click (MEvent.clicks, ev.x, ev.y);
1940 } 1949 }
1941 1950
1942 MEvent.button = Button1; 1951 MEvent.button = Button1;
1943 break; 1952 break;
1944 1953
1945 case Button3: 1954 case Button3:
1946 if (MEvent.button == Button3 && clickintime) 1955 if (MEvent.button == Button3 && clickintime)
1947 selection_rotate (ev.x, ev.y); 1956 selection_rotate (ev.x, ev.y);
1948 else 1957 else
1949 selection_extend (ev.x, ev.y, 1); 1958 selection_extend (ev.x, ev.y, 1);
1950 1959
1951 MEvent.button = Button3; 1960 MEvent.button = Button3;
1952 break; 1961 break;
1953 } 1962 }
1954 } 1963 }
1955 1964
1956 MEvent.time = ev.time; 1965 MEvent.time = ev.time;
1957 return; 1966 return;
1958 } 1967 }
1959 1968
… …
2098 } 2107 }
2099 } 2108 }
2100 2109
2101 return; 2110 return;
2102 } 2111 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2112}
2112 2113
2113void 2114void
2114rxvt_term::button_release (XButtonEvent &ev) 2115rxvt_term::button_release (XButtonEvent &ev)
2115{ 2116{
… …
2121 2122
2122 if (scrollbar_isUpDn ()) 2123 if (scrollbar_isUpDn ())
2123 { 2124 {
2124 scrollBar.setIdle (); 2125 scrollBar.setIdle ();
2125 scrollbar_show (0); 2126 scrollbar_show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2127 }
2130 2128
2131#ifdef SELECTION_SCROLLING 2129#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active) 2130 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2131 sel_scroll_ev.stop();
2134#endif 2132#endif
2135 2133
2136 if (ev.window == vt) 2134 if (ev.window == vt)
2137 { 2135 {
2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2137 return;
2138
2138#if ISO_14755 2139#if ISO_14755
2139 // 5.4 2140 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2141 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return; 2142 return;
2142#endif 2143#endif
2144
2143 if (reportmode) 2145 if (reportmode)
2144 { 2146 {
2145 /* mouse report from vt window */ 2147 /* mouse report from vt window */
2146 /* don't report release of wheel "buttons" */ 2148 /* don't report release of wheel "buttons" */
2147 if (ev.button >= 4) 2149 if (ev.button >= 4)
… …
2171 if (priv_modes & PrivMode_mouse_report 2173 if (priv_modes & PrivMode_mouse_report
2172 && bypass_keystate 2174 && bypass_keystate
2173 && ev.button == Button1 && MEvent.clicks <= 1) 2175 && ev.button == Button1 && MEvent.clicks <= 1)
2174 selection_extend (ev.x, ev.y, 0); 2176 selection_extend (ev.x, ev.y, 0);
2175 2177
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2179 switch (ev.button) 2178 switch (ev.button)
2180 { 2179 {
2181 case Button1: 2180 case Button1:
2182 case Button3: 2181 case Button3:
2183 selection_make (ev.time); 2182 selection_make (ev.time);
2184 break; 2183 break;
2184
2185 case Button2: 2185 case Button2:
2186 selection_request (ev.time, ev.x, ev.y); 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2188 break;
2189
2188#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2189 case Button4: 2191 case Button4:
2190 case Button5: 2192 case Button5:
2191 { 2193 {
2192 int i; 2194 int i;
… …
2194 2196
2195 v = ev.button == Button4 ? UP : DN; 2197 v = ev.button == Button4 ? UP : DN;
2196 2198
2197 if (ev.state & ShiftMask) 2199 if (ev.state & ShiftMask)
2198 i = 1; 2200 i = 1;
2199 else if (OPTION (Opt_mouseWheelScrollPage)) 2201 else if (option (Opt_mouseWheelScrollPage))
2200 i = nrow - 1; 2202 i = nrow - 1;
2201 else 2203 else
2202 i = 5; 2204 i = 5;
2203 2205
2204# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
… …
2214 slip_wheel_ev.start (); 2216 slip_wheel_ev.start ();
2215 } 2217 }
2216 else 2218 else
2217 { 2219 {
2218# endif 2220# endif
2219# ifdef JUMP_MOUSE_WHEEL
2220 scr_page (v, i); 2221 scr_page (v, i);
2221 scr_refresh (SMOOTH_REFRESH);
2222 scrollbar_show (1); 2222 scrollbar_show (1);
2223# else
2224 while (i--)
2225 {
2226 scr_page (v, 1);
2227 scr_refresh (SMOOTH_REFRESH);
2228 scrollbar_show (1);
2229 }
2230# endif
2231# ifdef MOUSE_SLIP_WHEELING 2223# ifdef MOUSE_SLIP_WHEELING
2232 } 2224 }
2233#endif 2225# endif
2234 } 2226 }
2235 break; 2227 break;
2236#endif 2228#endif
2237 } 2229 }
2238 } 2230 }
2239#ifdef MENUBAR
2240 else if (isMenuBarWindow (ev.window))
2241 menubar_control (ev);
2242#endif
2243} 2231}
2244
2245#ifdef TRANSPARENT
2246#if TINTING
2247/* taken from aterm-0.4.2 */
2248
2249typedef uint32_t RUINT32T;
2250
2251void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2252{
2253 int sh_r, sh_g, sh_b;
2254 RUINT32T mask_r, mask_g, mask_b;
2255 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2256 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2257 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2258 int i;
2259
2260 Visual *visual = display->visual;
2261
2262 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2263
2264 /* for convenience */
2265 mask_r = visual->red_mask;
2266 mask_g = visual->green_mask;
2267 mask_b = visual->blue_mask;
2268
2269 /* boring lookup table pre-initialization */
2270 switch (srcImage->bits_per_pixel) {
2271 case 15:
2272 if ((mask_r != 0x7c00) ||
2273 (mask_g != 0x03e0) ||
2274 (mask_b != 0x001f))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2277 lookup_r = lookup;
2278 lookup_g = lookup+32;
2279 lookup_b = lookup+32+32;
2280 sh_r = 10;
2281 sh_g = 5;
2282 sh_b = 0;
2283 break;
2284 case 16:
2285 if ((mask_r != 0xf800) ||
2286 (mask_g != 0x07e0) ||
2287 (mask_b != 0x001f))
2288 return;
2289 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2290 lookup_r = lookup;
2291 lookup_g = lookup+32;
2292 lookup_b = lookup+32+64;
2293 sh_r = 11;
2294 sh_g = 5;
2295 sh_b = 0;
2296 break;
2297 case 24:
2298 if ((mask_r != 0xff0000) ||
2299 (mask_g != 0x00ff00) ||
2300 (mask_b != 0x0000ff))
2301 return;
2302 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2303 lookup_r = lookup;
2304 lookup_g = lookup+256;
2305 lookup_b = lookup+256+256;
2306 sh_r = 16;
2307 sh_g = 8;
2308 sh_b = 0;
2309 break;
2310 case 32:
2311 if ((mask_r != 0xff0000) ||
2312 (mask_g != 0x00ff00) ||
2313 (mask_b != 0x0000ff))
2314 return;
2315 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2316 lookup_r = lookup;
2317 lookup_g = lookup+256;
2318 lookup_b = lookup+256+256;
2319 sh_r = 16;
2320 sh_g = 8;
2321 sh_b = 0;
2322 break;
2323 default:
2324 return; /* we do not support this color depth */
2325 }
2326
2327 /* prepare limits for color transformation (each channel is handled separately) */
2328 if (shade < 0) {
2329 shade = -shade;
2330 if (shade < 0) shade = 0;
2331 if (shade > 100) shade = 100;
2332
2333 lower_lim_r = 65535-rm;
2334 lower_lim_g = 65535-gm;
2335 lower_lim_b = 65535-bm;
2336
2337 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2338 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2339 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2340
2341 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2342 } else {
2343 if (shade < 0) shade = 0;
2344 if (shade > 100) shade = 100;
2345
2346 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2347
2348 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2349 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2350 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2351 }
2352
2353 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2354 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2355 {
2356 unsigned int tmp;
2357
2358 tmp = lower_lim_r;
2359 lower_lim_r = lower_lim_b;
2360 lower_lim_b = tmp;
2361
2362 tmp = upper_lim_r;
2363 upper_lim_r = upper_lim_b;
2364 upper_lim_b = tmp;
2365 }
2366
2367 /* fill our lookup tables */
2368 for (i = 0; i <= mask_r>>sh_r; i++)
2369 {
2370 RUINT32T tmp;
2371 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2372 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2373 lookup_r[i] = (tmp/65535)<<sh_r;
2374 }
2375 for (i = 0; i <= mask_g>>sh_g; i++)
2376 {
2377 RUINT32T tmp;
2378 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2379 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2380 lookup_g[i] = (tmp/65535)<<sh_g;
2381 }
2382 for (i = 0; i <= mask_b>>sh_b; i++)
2383 {
2384 RUINT32T tmp;
2385 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2386 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2387 lookup_b[i] = (tmp/65535)<<sh_b;
2388 }
2389
2390 /* apply table to input image (replacing colors by newly calculated ones) */
2391 switch (srcImage->bits_per_pixel)
2392 {
2393 case 15:
2394 {
2395 unsigned short *p1, *pf, *p, *pl;
2396 p1 = (unsigned short *) srcImage->data;
2397 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2398 while (p1 < pf)
2399 {
2400 p = p1;
2401 pl = p1 + srcImage->width;
2402 for (; p < pl; p++)
2403 {
2404 *p = lookup_r[(*p & 0x7c00)>>10] |
2405 lookup_g[(*p & 0x03e0)>> 5] |
2406 lookup_b[(*p & 0x001f)];
2407 }
2408 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 case 16:
2413 {
2414 unsigned short *p1, *pf, *p, *pl;
2415 p1 = (unsigned short *) srcImage->data;
2416 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2417 while (p1 < pf)
2418 {
2419 p = p1;
2420 pl = p1 + srcImage->width;
2421 for (; p < pl; p++)
2422 {
2423 *p = lookup_r[(*p & 0xf800)>>11] |
2424 lookup_g[(*p & 0x07e0)>> 5] |
2425 lookup_b[(*p & 0x001f)];
2426 }
2427 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2428 }
2429 break;
2430 }
2431 case 24:
2432 {
2433 unsigned char *p1, *pf, *p, *pl;
2434 p1 = (unsigned char *) srcImage->data;
2435 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2436 while (p1 < pf)
2437 {
2438 p = p1;
2439 pl = p1 + srcImage->width * 3;
2440 for (; p < pl; p += 3)
2441 {
2442 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2443 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2444 p[2] = lookup_r[(p[2] & 0x0000ff)];
2445 }
2446 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2447 }
2448 break;
2449 }
2450 case 32:
2451 {
2452 RUINT32T *p1, *pf, *p, *pl;
2453 p1 = (RUINT32T *) srcImage->data;
2454 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2455
2456 while (p1 < pf)
2457 {
2458 p = p1;
2459 pl = p1 + srcImage->width;
2460 for (; p < pl; p++)
2461 {
2462 *p = lookup_r[(*p & 0xff0000)>>16] |
2463 lookup_g[(*p & 0x00ff00)>> 8] |
2464 lookup_b[(*p & 0x0000ff)] |
2465 (*p & ~0xffffff);
2466 }
2467 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2468 }
2469 break;
2470 }
2471 }
2472
2473 free (lookup);
2474}
2475#endif
2476
2477/*
2478 * Check our parents are still who we think they are.
2479 * Do transparency updates if required
2480 */
2481int
2482rxvt_term::check_our_parents ()
2483{
2484 int i, pchanged, aformat, have_pixmap, rootdepth;
2485 unsigned long nitems, bytes_after;
2486 Atom atype;
2487 unsigned char *prop = NULL;
2488 Window root, oldp, *list;
2489 Pixmap rootpixmap = None;
2490 XWindowAttributes wattr, wrootattr;
2491 dDisp;
2492
2493 pchanged = 0;
2494
2495 if (!OPTION (Opt_transparent))
2496 return pchanged; /* Don't try any more */
2497
2498 XGetWindowAttributes (disp, display->root, &wrootattr);
2499 rootdepth = wrootattr.depth;
2500
2501 XGetWindowAttributes (disp, parent[0], &wattr);
2502
2503 if (rootdepth != wattr.depth)
2504 {
2505 if (am_transparent)
2506 {
2507 pchanged = 1;
2508 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2509 am_transparent = am_pixmap_trans = 0;
2510 }
2511
2512 return pchanged; /* Don't try any more */
2513 }
2514
2515 /* Get all X ops out of the queue so that our information is up-to-date. */
2516 XSync (disp, False);
2517
2518 /*
2519 * Make the frame window set by the window manager have
2520 * the root background. Some window managers put multiple nested frame
2521 * windows for each client, so we have to take care about that.
2522 */
2523 i = (xa[XA_XROOTPMAP_ID]
2524 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2525 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2526 &nitems, &bytes_after, &prop) == Success);
2527
2528 if (!i || prop == NULL)
2529 i = (xa[XA_ESETROOT_PMAP_ID]
2530 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2531 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2532 &nitems, &bytes_after, &prop) == Success);
2533
2534 if (!i || prop == NULL
2535#if TINTING
2536 || !rs[Rs_color + Color_tint]
2537#endif
2538 )
2539 have_pixmap = 0;
2540 else
2541 {
2542 have_pixmap = 1;
2543 rootpixmap = *(Pixmap *)prop;
2544 XFree (prop);
2545 }
2546
2547 if (have_pixmap)
2548 {
2549 /*
2550 * Copy display->root pixmap transparency
2551 */
2552 int sx, sy, nx, ny;
2553 unsigned int nw, nh;
2554 Window cr;
2555 XImage *image;
2556 GC gc;
2557 XGCValues gcvalue;
2558
2559 XTranslateCoordinates (disp, parent[0], display->root,
2560 0, 0, &sx, &sy, &cr);
2561 nw = (unsigned int)szHint.width;
2562 nh = (unsigned int)szHint.height;
2563 nx = ny = 0;
2564
2565 if (sx < 0)
2566 {
2567 nw += sx;
2568 nx = -sx;
2569 sx = 0;
2570 }
2571
2572 if (sy < 0)
2573 {
2574 nh += sy;
2575 ny = -sy;
2576 sy = 0;
2577 }
2578
2579 min_it (nw, (unsigned int) (wrootattr.width - sx));
2580 min_it (nh, (unsigned int) (wrootattr.height - sy));
2581
2582 XSync (disp, False);
2583 allowedxerror = -1;
2584 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2585
2586 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2587 /* XXX: may need a delay here? */
2588 allowedxerror = 0;
2589
2590 if (image == NULL)
2591 {
2592 if (am_transparent && am_pixmap_trans)
2593 {
2594 pchanged = 1;
2595 if (pixmap != None)
2596 {
2597 XFreePixmap (disp, pixmap);
2598 pixmap = None;
2599 }
2600 }
2601
2602 am_pixmap_trans = 0;
2603 }
2604 else
2605 {
2606 if (pixmap != None)
2607 XFreePixmap (disp, pixmap);
2608
2609#if TINTING
2610 if (ISSET_PIXCOLOR (Color_tint))
2611 {
2612 unsigned short rm, gm, bm;
2613 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2614
2615 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2616
2617 ShadeXImage (display, image, shade, rm, gm, bm);
2618 }
2619#endif
2620
2621 pixmap = XCreatePixmap (disp, vt,
2622 szHint.width, szHint.height, image->depth);
2623 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2624 XPutImage (disp, pixmap, gc, image, 0, 0,
2625 nx, ny, image->width, image->height);
2626 XFreeGC (disp, gc);
2627 XDestroyImage (image);
2628 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2629 XClearWindow (disp, parent[0]);
2630
2631 if (!am_transparent || !am_pixmap_trans)
2632 pchanged = 1;
2633
2634 am_transparent = am_pixmap_trans = 1;
2635 }
2636 }
2637
2638 if (am_pixmap_trans)
2639 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2640 else
2641 {
2642 unsigned int n;
2643 /*
2644 * InheritPixmap transparency
2645 */
2646 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2647 {
2648 oldp = parent[i];
2649 XQueryTree (disp, parent[i - 1], &root,
2650 &parent[i], &list, &n);
2651 XFree (list);
2652
2653 if (parent[i] == display->root)
2654 {
2655 if (oldp != None)
2656 pchanged = 1;
2657
2658 break;
2659 }
2660
2661 if (oldp != parent[i])
2662 pchanged = 1;
2663 }
2664
2665 n = 0;
2666
2667 if (pchanged)
2668 {
2669 for (; n < (unsigned int)i; n++)
2670 {
2671 XGetWindowAttributes (disp, parent[n], &wattr);
2672 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2673 {
2674 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2675 break;
2676 }
2677 }
2678 }
2679
2680 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2681 {
2682 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2683 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2684 am_transparent = 0;
2685 /* XXX: also turn off Opt_transparent? */
2686 }
2687 else
2688 {
2689#if WAIT_FOR_WM
2690 /* wait (an arbitrary period) for the WM to do its thing
2691 * needed for fvwm2.2.2 (and before?) */
2692 sleep (1);
2693#endif
2694 for (n = 0; n < (unsigned int)i; n++)
2695 {
2696 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2697 XClearWindow (disp, parent[n]);
2698 }
2699
2700 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2701 am_transparent = 1;
2702 }
2703
2704 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2705 parent[i] = None;
2706 }
2707
2708 if (scrollBar.win)
2709 {
2710 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2711 scrollBar.setIdle ();
2712 scrollbar_show (0);
2713 }
2714
2715 if (am_transparent)
2716 {
2717 want_refresh = want_full_refresh = 1;
2718 if (am_pixmap_trans)
2719 flush ();
2720 }
2721
2722 return pchanged;
2723}
2724#endif
2725 2232
2726/*}}} */ 2233/*}}} */
2727 2234
2728bool 2235bool
2729rxvt_term::cmd_parse () 2236rxvt_term::cmd_parse ()
… …
2778 if (ch == C0_LF) 2285 if (ch == C0_LF)
2779 nlines++; 2286 nlines++;
2780 2287
2781 refresh_count++; 2288 refresh_count++;
2782 2289
2783 if (!OPTION (Opt_jumpScroll) 2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2784 || (refresh_count >= refresh_limit * (nrow - 1)))
2785 { 2291 {
2786 refreshnow = true;
2787 refresh_count = 0; 2292 refresh_count = 0;
2293
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2295 {
2296 refreshnow = true;
2788 ch = NOCHAR; 2297 ch = NOCHAR;
2789 break; 2298 break;
2299 }
2790 } 2300 }
2791 2301
2792 // scr_add_lines only works for nlines <= nrow - 1. 2302 // scr_add_lines only works for nlines <= nrow - 1.
2793 if (nlines >= nrow - 1) 2303 if (nlines >= nrow - 1)
2794 { 2304 {
2305 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2795 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2306 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2796 scr_add_lines (buf, str - buf, nlines); 2307 scr_add_lines (buf, str - buf, nlines);
2797 2308
2798 nlines = 0; 2309 nlines = 0;
2799 str = buf; 2310 str = buf;
2800 eol = str + min (ncol, UBUFSIZ); 2311 eol = str + min (ncol, UBUFSIZ);
… …
2815 2326
2816 seq_begin = cmdbuf_ptr; 2327 seq_begin = cmdbuf_ptr;
2817 ch = next_char (); 2328 ch = next_char ();
2818 } 2329 }
2819 2330
2331 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2820 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2332 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2821 scr_add_lines (buf, str - buf, nlines); 2333 scr_add_lines (buf, str - buf, nlines);
2822 2334
2823 /* 2335 /*
2824 * If there have been a lot of new lines, then update the screen 2336 * If there have been a lot of new lines, then update the screen
2825 * What the heck I'll cheat and only refresh less than every page-full. 2337 * What the heck we'll cheat and only refresh less than every page-full.
2826 * the number of pages between refreshes is refresh_limit, which 2338 * if skipScroll is enabled.
2827 * is incremented here because we must be doing flat-out scrolling.
2828 */ 2339 */
2829 if (refreshnow) 2340 if (refreshnow)
2830 { 2341 {
2831 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2832 refresh_limit++;
2833 else
2834 {
2835 flag = true; 2342 flag = true;
2836 scr_refresh (refresh_type); 2343 scr_refresh ();
2837 flush_ev.stop (); 2344 want_refresh = 1;
2838 }
2839 } 2345 }
2840 2346
2841 } 2347 }
2842 else 2348 else
2843 { 2349 {
… …
2859 return flag; 2365 return flag;
2860} 2366}
2861 2367
2862// read the next character 2368// read the next character
2863wchar_t 2369wchar_t
2864rxvt_term::next_char () 2370rxvt_term::next_char () NOTHROW
2865{ 2371{
2866 while (cmdbuf_ptr < cmdbuf_endp) 2372 while (cmdbuf_ptr < cmdbuf_endp)
2867 { 2373 {
2868 // assume 7-bit to be ascii ALWAYS 2374 // assume 7-bit to be ascii ALWAYS
2869 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2375 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2890 return NOCHAR; 2396 return NOCHAR;
2891} 2397}
2892 2398
2893// read the next octet 2399// read the next octet
2894uint32_t 2400uint32_t
2895rxvt_term::next_octet () 2401rxvt_term::next_octet () NOTHROW
2896{ 2402{
2897 return cmdbuf_ptr < cmdbuf_endp 2403 return cmdbuf_ptr < cmdbuf_endp
2898 ? (unsigned char)*cmdbuf_ptr++ 2404 ? (unsigned char)*cmdbuf_ptr++
2899 : NOCHAR; 2405 : NOCHAR;
2900} 2406}
2407
2408static class out_of_input out_of_input;
2901 2409
2902/* rxvt_cmd_getc () - Return next input character */ 2410/* rxvt_cmd_getc () - Return next input character */
2903/* 2411/*
2904 * Return the next input character after first passing any keyboard input 2412 * Return the next input character after first passing any keyboard input
2905 * to the command. 2413 * to the command.
2906 */ 2414 */
2907wchar_t 2415wchar_t
2908rxvt_term::cmd_getc () 2416rxvt_term::cmd_getc () THROW ((class out_of_input))
2909{ 2417{
2910 wchar_t c = next_char (); 2418 wchar_t c = next_char ();
2911 2419
2912 if (c == NOCHAR) 2420 if (c == NOCHAR)
2913 throw out_of_input; 2421 throw out_of_input;
2914 2422
2915 return c; 2423 return c;
2916} 2424}
2917 2425
2918uint32_t 2426uint32_t
2919rxvt_term::cmd_get8 () 2427rxvt_term::cmd_get8 () THROW ((class out_of_input))
2920{ 2428{
2921 uint32_t c = next_octet (); 2429 uint32_t c = next_octet ();
2922 2430
2923 if (c == NOCHAR) 2431 if (c == NOCHAR)
2924 throw out_of_input; 2432 throw out_of_input;
… …
2990 { 2498 {
2991 if ((buf[len++] = cmd_getc ()) == 'i') 2499 if ((buf[len++] = cmd_getc ()) == 'i')
2992 break; /* done = 1 */ 2500 break; /* done = 1 */
2993 } 2501 }
2994 } 2502 }
2995 2503
2996 for (i = 0; i < len; i++) 2504 for (i = 0; i < len; i++)
2997 if (putc (buf[i], fd) == EOF) 2505 if (putc (buf[i], fd) == EOF)
2998 { 2506 {
2999 done = 1; 2507 done = 1;
3000 break; 2508 break;
… …
3062 process_dcs_seq (); 2570 process_dcs_seq ();
3063 break; 2571 break;
3064 case 0x9b: /* CSI */ 2572 case 0x9b: /* CSI */
3065 process_csi_seq (); 2573 process_csi_seq ();
3066 break; 2574 break;
3067 case 0x9d: /* CSI */ 2575 case 0x9d: /* OSC */
3068 process_osc_seq (); 2576 process_osc_seq ();
3069 break; 2577 break;
3070#endif 2578#endif
3071 } 2579 }
3072} 2580}
… …
3162 scr_charset_set (2, (unsigned int)cmd_getc ()); 2670 scr_charset_set (2, (unsigned int)cmd_getc ());
3163 break; 2671 break;
3164 case '+': 2672 case '+':
3165 scr_charset_set (3, (unsigned int)cmd_getc ()); 2673 scr_charset_set (3, (unsigned int)cmd_getc ());
3166 break; 2674 break;
3167#if ENABLE_FRILLS 2675#if !ENABLE_MINIMAL
3168 case '6': 2676 case '6':
3169 scr_backindex (); 2677 scr_backindex ();
3170 break; 2678 break;
3171#endif 2679#endif
3172 case '7': 2680 case '7':
3173 scr_cursor (SAVE); 2681 scr_cursor (SAVE);
3174 break; 2682 break;
3175 case '8': 2683 case '8':
3176 scr_cursor (RESTORE); 2684 scr_cursor (RESTORE);
3177 break; 2685 break;
3178#if ENABLE_FRILLS 2686#if !ENABLE_MINIMAL
3179 case '9': 2687 case '9':
3180 scr_forwardindex (); 2688 scr_forwardindex ();
3181 break; 2689 break;
3182#endif 2690#endif
3183 case '=': 2691 case '=':
… …
3300 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
3301 unsigned int nargs, p; 2809 unsigned int nargs, p;
3302 int n, ndef; 2810 int n, ndef;
3303 int arg[ESC_ARGS]; 2811 int arg[ESC_ARGS];
3304 2812
3305 for (nargs = ESC_ARGS; nargs > 0;) 2813 memset (arg, 0, sizeof (arg));
3306 arg[--nargs] = 0; 2814 nargs = 0;
3307 2815
3308 priv = 0; 2816 priv = 0;
3309 ch = cmd_getc (); 2817 ch = cmd_getc ();
3310 if (ch >= '<' && ch <= '?') 2818 if (ch >= '<' && ch <= '?')
3311 { /* '<' '=' '>' '?' */ 2819 { /* '<' '=' '>' '?' */
… …
3345 ndef = get_byte_array_bit (csi_defaults, i); 2853 ndef = get_byte_array_bit (csi_defaults, i);
3346 for (p = 0; p < nargs; p++) 2854 for (p = 0; p < nargs; p++)
3347 if (arg[p] == -1) 2855 if (arg[p] == -1)
3348 arg[p] = ndef; 2856 arg[p] = ndef;
3349 2857
3350#ifdef DEBUG_CMD
3351 fprintf (stderr, "CSI ");
3352 for (p = 0; p < nargs; p++)
3353 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3354 fprintf (stderr, "%c\n", ch);
3355#endif
3356
3357 /* 2858 /*
3358 * private mode handling 2859 * private mode handling
3359 */ 2860 */
3360 if (priv) 2861 if (priv)
3361 { 2862 {
3362 switch (priv) 2863 switch (priv)
3363 { 2864 {
3364 case '>': 2865 case '>':
3365 if (ch == CSI_DA) /* secondary device attributes */ 2866 if (ch == CSI_DA) /* secondary device attributes */
3366 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2867 {
2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870 //
2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2873 // that we do not support xterm mouse reporting (should be 95 when we do).
2874 //
2875 tt_printf ("\033[>%d;94;0c", 'U');
2876 }
3367 break; 2877 break;
3368 case '?': 2878 case '?':
3369 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3370 process_terminal_mode (ch, priv, nargs, arg); 2880 process_terminal_mode (ch, priv, nargs, arg);
3371 break; 2881 break;
… …
3497 break; 3007 break;
3498 case 6: /* CPR requested */ 3008 case 6: /* CPR requested */
3499 scr_report_position (); 3009 scr_report_position ();
3500 break; 3010 break;
3501 case 7: /* unofficial extension */ 3011 case 7: /* unofficial extension */
3502 if (OPTION (Opt_insecure)) 3012 if (option (Opt_insecure))
3503 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3013 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3504 break; 3014 break;
3505 case 8: /* unofficial extension */ 3015 case 8: /* unofficial extension */
3506 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3507 break; 3017 break;
… …
3574 break; 3084 break;
3575 case CSI_75: 3085 case CSI_75:
3576 scr_cursor (RESTORE); 3086 scr_cursor (RESTORE);
3577 break; 3087 break;
3578 3088
3579#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3580 case CSI_74: 3090 case CSI_74:
3581 process_window_ops (arg, nargs); 3091 process_window_ops (arg, nargs);
3582 break; 3092 break;
3583#endif 3093#endif
3584 3094
… …
3591 break; 3101 break;
3592 } 3102 }
3593} 3103}
3594/*}}} */ 3104/*}}} */
3595 3105
3596#if ENABLE_FRILLS 3106#if !ENABLE_MINIMAL
3597/* ARGSUSED */ 3107/* ARGSUSED */
3598void 3108void
3599rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3109rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3600{ 3110{
3601 int x, y; 3111 int x, y;
3602 XWindowAttributes wattr; 3112 XWindowAttributes wattr;
3603 Window wdummy; 3113 Window wdummy;
3604 dDisp; 3114
3115 dLocal (Display *, dpy);
3605 3116
3606 if (nargs == 0) 3117 if (nargs == 0)
3607 return; 3118 return;
3608 3119
3609 switch (args[0]) 3120 switch (args[0])
3610 { 3121 {
3611 /* 3122 /*
3612 * commands 3123 * commands
3613 */ 3124 */
3614 case 1: /* deiconify window */ 3125 case 1: /* deiconify window */
3615 XMapWindow (disp, parent[0]); 3126 XMapWindow (dpy, parent[0]);
3616 break; 3127 break;
3617 case 2: /* iconify window */ 3128 case 2: /* iconify window */
3618 XIconifyWindow (disp, parent[0], display->screen); 3129 XIconifyWindow (dpy, parent[0], display->screen);
3619 break; 3130 break;
3620 case 3: /* set position (pixels) */ 3131 case 3: /* set position (pixels) */
3621 XMoveWindow (disp, parent[0], args[1], args[2]); 3132 XMoveWindow (dpy, parent[0], args[1], args[2]);
3622 break; 3133 break;
3623 case 4: /* set size (pixels) */ 3134 case 4: /* set size (pixels) */
3624 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3135 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3625 break; 3136 break;
3626 case 5: /* raise window */ 3137 case 5: /* raise window */
3627 XRaiseWindow (disp, parent[0]); 3138 XRaiseWindow (dpy, parent[0]);
3628 break; 3139 break;
3629 case 6: /* lower window */ 3140 case 6: /* lower window */
3630 XLowerWindow (disp, parent[0]); 3141 XLowerWindow (dpy, parent[0]);
3631 break; 3142 break;
3632 case 7: /* refresh window */ 3143 case 7: /* refresh window */
3633 scr_touch (true); 3144 scr_touch (true);
3634 break; 3145 break;
3635 case 8: /* set size (chars) */ 3146 case 8: /* set size (chars) */
… …
3642 if (args[0] >= 24) /* set height (chars) */ 3153 if (args[0] >= 24) /* set height (chars) */
3643 set_widthheight ((unsigned int)width, 3154 set_widthheight ((unsigned int)width,
3644 (unsigned int) (args[1] * fheight)); 3155 (unsigned int) (args[1] * fheight));
3645 break; 3156 break;
3646 3157
3647
3648 /* 3158 /*
3649 * reports - some output format copied from XTerm 3159 * reports - some output format copied from XTerm
3650 */ 3160 */
3651 case 11: /* report window state */ 3161 case 11: /* report window state */
3652 XGetWindowAttributes (disp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3653 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3163 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3654 break; 3164 break;
3655 case 13: /* report window position */ 3165 case 13: /* report window position */
3656 XGetWindowAttributes (disp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3657 XTranslateCoordinates (disp, parent[0], wattr.root, 3167 XTranslateCoordinates (dpy, parent[0], wattr.root,
3658 -wattr.border_width, -wattr.border_width, 3168 -wattr.border_width, -wattr.border_width,
3659 &x, &y, &wdummy); 3169 &x, &y, &wdummy);
3660 tt_printf ("\033[3;%d;%dt", x, y); 3170 tt_printf ("\033[3;%d;%dt", x, y);
3661 break; 3171 break;
3662 case 14: /* report window size (pixels) */ 3172 case 14: /* report window size (pixels) */
3663 XGetWindowAttributes (disp, parent[0], &wattr); 3173 XGetWindowAttributes (dpy, parent[0], &wattr);
3664 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3174 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3665 break; 3175 break;
3666 case 18: /* report text area size (chars) */ 3176 case 18: /* report text area size (chars) */
3667 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3177 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3668 break; 3178 break;
… …
3670 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3180 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3671 break; 3181 break;
3672 case 20: /* report icon label */ 3182 case 20: /* report icon label */
3673 { 3183 {
3674 char *s; 3184 char *s;
3675 XGetIconName (disp, parent[0], &s); 3185 XGetIconName (dpy, parent[0], &s);
3676 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3677 XFree (s); 3187 XFree (s);
3678 } 3188 }
3679 break; 3189 break;
3680 case 21: /* report window title */ 3190 case 21: /* report window title */
3681 { 3191 {
3682 char *s; 3192 char *s;
3683 XFetchName (disp, parent[0], &s); 3193 XFetchName (dpy, parent[0], &s);
3684 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3194 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3685 XFree (s); 3195 XFree (s);
3686 } 3196 }
3687 break; 3197 break;
3688 } 3198 }
3689} 3199}
… …
3716 seen_esc = true; 3226 seen_esc = true;
3717 continue; 3227 continue;
3718 } 3228 }
3719 else if (ch == C0_BEL || ch == CHAR_ST) 3229 else if (ch == C0_BEL || ch == CHAR_ST)
3720 break; 3230 break;
3231 else if (ch == C0_SYN)
3232 ch = cmd_get8 ();
3721 else if (ch < 0x20) 3233 else if (ch < 0x20)
3722 return NULL; /* other control character - exit */ 3234 return NULL; /* other control character - exit */
3723 3235
3724 seen_esc = false; 3236 seen_esc = false;
3725 3237
3726 if (n >= STRING_MAX - 1) 3238 if (n >= STRING_MAX - 1)
3727 // stop at some sane length 3239 // stop at some sane length
3728 return NULL; 3240 return NULL;
3729 3241
3730 if (ch == C0_SYN)
3731 string[n++] = cmd_get8 ();
3732 else
3733 string[n++] = ch; 3242 string[n++] = ch;
3734 } 3243 }
3735 3244
3736 string[n++] = '\0'; 3245 string[n++] = '\0';
3737 3246
3738 ends_how = (ch == 0x5c ? C0_ESC : ch); 3247 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3789void 3298void
3790rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3299rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3791{ 3300{
3792 if (str[0] == '?' && !str[1]) 3301 if (str[0] == '?' && !str[1])
3793 { 3302 {
3794 unsigned short r, g, b; 3303 rgba c;
3795 pix_colors_focused[color].get (display, r, g, b); 3304 pix_colors_focused[color].get (c);
3305
3306#if XFT
3307 if (c.a != rgba::MAX_CC)
3308 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3309 else
3310#endif
3796 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3311 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3797 } 3312 }
3798 else 3313 else
3799 set_window_color (color, str); 3314 set_window_color (color, str);
3800} 3315}
3801 3316
… …
3803 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3318 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3804 */ 3319 */
3805void 3320void
3806rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3321rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3807{ 3322{
3808 int changed = 0;
3809 int color; 3323 int color;
3810 char *buf, *name; 3324 char *buf, *name;
3811 bool query = str[0] == '?' && !str[1]; 3325 bool query = str[0] == '?' && !str[1];
3812 int saveop = op; 3326 int saveop = op;
3813 dDisp; 3327
3328 dLocal (Display *, dpy);
3814 3329
3815 assert (str != NULL); 3330 assert (str != NULL);
3331
3332 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3333 return;
3334
3816 switch (op) 3335 switch (op)
3817 { 3336 {
3818 case XTerm_name: 3337 case XTerm_name:
3819 set_title (str); 3338 set_title (str);
3820 /* FALLTHROUGH */ 3339 /* FALLTHROUGH */
… …
3834 unsigned long bytes_after; 3353 unsigned long bytes_after;
3835 unsigned char *value = 0; 3354 unsigned char *value = 0;
3836 const char *str = ""; 3355 const char *str = "";
3837 3356
3838 if (prop 3357 if (prop
3839 && XGetWindowProperty (disp, parent[0], 3358 && XGetWindowProperty (dpy, parent[0],
3840 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3841 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3842 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3843 && actual_type != None 3362 && actual_type != None
3844 && actual_format == 8) 3363 && actual_format == 8)
3845 str = (const char *)(value); 3364 str = (const char *)(value);
3846 3365
3847 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3366 tt_printf ("\033]%d;%s%c", op, str, resp);
3848 3367
3849 XFree (value); 3368 XFree (value);
3850 } 3369 }
3851 else 3370 else
3852 { 3371 {
… …
3856 { 3375 {
3857 *eq = 0; 3376 *eq = 0;
3858 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
3859 } 3378 }
3860 else 3379 else
3861 XDeleteProperty (disp, parent[0], 3380 XDeleteProperty (dpy, parent[0],
3862 display->atom (str)); 3381 display->atom (str));
3863 } 3382 }
3864 break; 3383 break;
3865 3384
3866 case XTerm_Color: 3385 case XTerm_Color:
… …
3868 { 3387 {
3869 if ((name = strchr (buf, ';')) == NULL) 3388 if ((name = strchr (buf, ';')) == NULL)
3870 break; 3389 break;
3871 3390
3872 *name++ = '\0'; 3391 *name++ = '\0';
3873 color = atoi (buf); 3392 color = atoi (buf) + minCOLOR;
3874 3393
3875 if (color < 0 || color >= TOTAL_COLORS) 3394 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3876 break; 3395 break;
3877 3396
3878 if ((buf = strchr (name, ';')) != NULL) 3397 if ((buf = strchr (name, ';')) != NULL)
3879 *buf++ = '\0'; 3398 *buf++ = '\0';
3880 3399
3881 if (name[0] == '?' && !name[1]) 3400 process_color_seq (op, color, name, resp);
3882 {
3883 unsigned short r, g, b;
3884 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3885 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3886 }
3887 else
3888 set_window_color (color + minCOLOR, name);
3889 } 3401 }
3890 break; 3402 break;
3891 case XTerm_Color00: 3403 case XTerm_Color00:
3892 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3404 process_color_seq (op, Color_fg, str, resp);
3893 break; 3405 break;
3894 case XTerm_Color01: 3406 case XTerm_Color01:
3895 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3407 process_color_seq (op, Color_bg, str, resp);
3896 break; 3408 break;
3897#ifndef NO_CURSORCOLOR 3409#ifndef NO_CURSORCOLOR
3898 case XTerm_Color_cursor: 3410 case XTerm_Color_cursor:
3899 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3411 process_color_seq (op, Color_cursor, str, resp);
3900 break; 3412 break;
3901#endif 3413#endif
3902 case XTerm_Color_pointer_fg: 3414 case XTerm_Color_pointer_fg:
3903 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3415 process_color_seq (op, Color_pointer_fg, str, resp);
3904 break; 3416 break;
3905 case XTerm_Color_pointer_bg: 3417 case XTerm_Color_pointer_bg:
3906 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3418 process_color_seq (op, Color_pointer_bg, str, resp);
3907 break; 3419 break;
3908#ifndef NO_BOLD_UNDERLINE_REVERSE 3420#ifndef NO_BOLD_UNDERLINE_REVERSE
3909 case XTerm_Color_BD:
3910 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3911 break;
3912 case XTerm_Color_UL:
3913 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3914 break;
3915 case XTerm_Color_RV: 3421 case XTerm_Color_RV:
3916 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3422 process_color_seq (op, Color_RV, str, resp);
3423 break;
3424 case Rxvt_Color_BD:
3425 case URxvt_Color_BD:
3426 process_color_seq (op, Color_BD, str, resp);
3427 break;
3428 case Rxvt_Color_UL:
3429 case URxvt_Color_UL:
3430 process_color_seq (op, Color_UL, str, resp);
3917 break; 3431 break;
3918 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3919 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3920 break; 3434 break;
3921#endif 3435#endif
3922#if TRANSPARENT && TINTING 3436#if ENABLE_TRANSPARENCY && TINTING
3923 case URxvt_Color_tint: 3437 case URxvt_Color_tint:
3924 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3438 process_color_seq (op, Color_tint, str, resp);
3439
3925 check_our_parents (); 3440 check_our_parents ();
3441
3926 if (am_transparent) 3442 if (am_transparent)
3927 want_full_refresh = want_refresh = 1; 3443 want_full_refresh = want_refresh = 1;
3928 break;
3929#endif
3930 3444
3931 case XTerm_Pixmap: 3445 break;
3932 if (*str != ';') 3446#endif
3933 { 3447
3934#if XPM_BACKGROUND 3448#if XPM_BACKGROUND
3449 case Rxvt_Pixmap:
3450 {
3451 if (*str != ';')
3452 {
3935 scale_pixmap (""); /* reset to default scaling */ 3453 scale_pixmap (""); /* reset to default scaling */
3936 set_bgPixmap (str); /* change pixmap */ 3454 set_bgPixmap (str); /* change pixmap */
3937#endif
3938 scr_touch (true); 3455 scr_touch (true);
3939 } 3456 }
3457
3458 int changed = 0;
3459
3940 while ((str = strchr (str, ';')) != NULL) 3460 while ((str = strchr (str, ';')) != NULL)
3941 { 3461 {
3942 str++; 3462 str++;
3943#if XPM_BACKGROUND
3944 changed += scale_pixmap (str); 3463 changed += scale_pixmap (str);
3945#endif
3946 } 3464 }
3947 3465
3948 if (changed) 3466 if (changed)
3949 { 3467 {
3950#ifdef XPM_BACKGROUND
3951 resize_pixmap (); 3468 resize_pixmap ();
3952#endif
3953 scr_touch (true); 3469 scr_touch (true);
3954 } 3470 }
3471#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3472 if (option (Opt_transparent))
3473 check_our_parents ();
3474#endif
3475 }
3955 break; 3476 break;
3477#endif
3956 3478
3957 case XTerm_restoreFG: 3479 case Rxvt_restoreFG:
3958 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
3959 break; 3481 break;
3960 case XTerm_restoreBG: 3482 case Rxvt_restoreBG:
3961 set_window_color (Color_bg, str); 3483 set_window_color (Color_bg, str);
3962 break; 3484 break;
3963 3485
3964 case XTerm_logfile: 3486 case XTerm_logfile:
3965 // TODO, when secure mode? 3487 // TODO, when secure mode?
3966 break; 3488 break;
3967 3489
3968#ifdef MENUBAR
3969 case URxvt_Menu:
3970 if (OPTION (Opt_insecure))
3971 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3972 break;
3973#endif
3974#if 0 3490#if 0
3975 case XTerm_dumpscreen: /* no error notices */ 3491 case Rxvt_dumpscreen: /* no error notices */
3976 { 3492 {
3977 int fd; 3493 int fd;
3978 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3494 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3979 { 3495 {
3980 scr_dump (fd); 3496 scr_dump (fd);
… …
3991 case URxvt_italicFont: 3507 case URxvt_italicFont:
3992 case URxvt_boldItalicFont: 3508 case URxvt_boldItalicFont:
3993#endif 3509#endif
3994 if (query) 3510 if (query)
3995 tt_printf ("\33]%d;%-.250s%c", saveop, 3511 tt_printf ("\33]%d;%-.250s%c", saveop,
3996 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3512 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3997 ? fontset[op - URxvt_font]->fontdesc : "", 3513 ? fontset[op - URxvt_font]->fontdesc : "",
3998 resp); 3514 resp);
3999 else 3515 else
4000 { 3516 {
4001 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3517 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4004 allocated.push_back ((void *)res); 3520 allocated.push_back ((void *)res);
4005 set_fonts (); 3521 set_fonts ();
4006 } 3522 }
4007 break; 3523 break;
4008 3524
4009#if ENABLE_FRILLS 3525 case URxvt_version:
3526 if (query)
3527 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3528 op,
3529 rs[Rs_name], VERSION[0], VERSION[2],
3530 resp);
3531 break;
3532
3533#if !ENABLE_MINIMAL
4010 case URxvt_locale: 3534 case URxvt_locale:
4011 if (query) 3535 if (query)
4012 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3536 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4013 else 3537 else
4014 { 3538 {
4015 set_locale (str); 3539 set_locale (str);
4016 pty.set_utf8_mode (enc_utf8); 3540 pty->set_utf8_mode (enc_utf8);
4017 init_xlocale (); 3541 init_xlocale ();
4018 } 3542 }
4019 break; 3543 break;
4020 3544
4021 case URxvt_view_up: 3545 case URxvt_view_up:
… …
4032 break; 3556 break;
4033#endif 3557#endif
4034 3558
4035#if ENABLE_PERL 3559#if ENABLE_PERL
4036 case URxvt_perl: 3560 case URxvt_perl:
4037 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3561 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4038 ; // no responses yet 3562 ; // no responses yet
4039 break; 3563 break;
4040#endif 3564#endif
4041 } 3565 }
4042} 3566}
… …
4074 return state; 3598 return state;
4075} 3599}
4076 3600
4077/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
4078void 3602void
4079rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4080{ 3604{
4081 unsigned int i, j; 3605 unsigned int i, j;
4082 int state; 3606 int state;
4083 3607
4084 static const struct 3608 static const struct
… …
4095 { 5, PrivMode_rVideo }, 3619 { 5, PrivMode_rVideo },
4096 { 6, PrivMode_relOrigin }, 3620 { 6, PrivMode_relOrigin },
4097 { 7, PrivMode_Autowrap }, 3621 { 7, PrivMode_Autowrap },
4098 // 8, bi-directional support mode 3622 // 8, bi-directional support mode
4099 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
4100#ifdef menuBar_esc
4101 { menuBar_esc, PrivMode_menuBar },
4102#endif
4103 // 18, 19 printing-related 3624 // 18, 19 printing-related
4104 { 25, PrivMode_VisibleCursor }, 3625 { 25, PrivMode_VisibleCursor },
4105#ifdef scrollBar_esc 3626#ifdef scrollBar_esc
4106 { scrollBar_esc, PrivMode_scrollBar }, 3627 { scrollBar_esc, PrivMode_scrollBar },
4107#endif 3628#endif
… …
4161 scr_touch (true); 3682 scr_touch (true);
4162 break; 3683 break;
4163#endif 3684#endif
4164 case 1048: /* alternative cursor save */ 3685 case 1048: /* alternative cursor save */
4165 case 1049: 3686 case 1049:
4166 if (OPTION (Opt_secondaryScreen)) 3687 if (option (Opt_secondaryScreen))
4167 if (mode == 0) 3688 if (mode == 0)
4168 scr_cursor (RESTORE); 3689 scr_cursor (RESTORE);
4169 else if (mode == 1) 3690 else if (mode == 1)
4170 scr_cursor (SAVE); 3691 scr_cursor (SAVE);
4171 break; 3692 break;
… …
4202 /* case 8: - auto repeat, can't do on a per window basis */ 3723 /* case 8: - auto repeat, can't do on a per window basis */
4203 case 9: /* X10 mouse reporting */ 3724 case 9: /* X10 mouse reporting */
4204 if (state) /* orthogonal */ 3725 if (state) /* orthogonal */
4205 priv_modes &= ~PrivMode_MouseX11; 3726 priv_modes &= ~PrivMode_MouseX11;
4206 break; 3727 break;
4207#ifdef menuBar_esc
4208 case menuBar_esc:
4209#ifdef MENUBAR
4210 map_menuBar (state);
4211#endif
4212 break;
4213#endif
4214#ifdef scrollBar_esc 3728#ifdef scrollBar_esc
4215 case scrollBar_esc: 3729 case scrollBar_esc:
4216 if (scrollbar_mapping (state)) 3730 if (scrollbar_mapping (state))
4217 { 3731 {
4218 resize_all_windows (0, 0, 0); 3732 resize_all_windows (0, 0, 0);
… …
4243 break; 3757 break;
4244 case 1011: /* scroll to bottom on key press */ 3758 case 1011: /* scroll to bottom on key press */
4245 set_option (Opt_scrollTtyKeypress, state); 3759 set_option (Opt_scrollTtyKeypress, state);
4246 break; 3760 break;
4247 case 1047: /* secondary screen w/ clearing last */ 3761 case 1047: /* secondary screen w/ clearing last */
4248 if (OPTION (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
4249 if (current_screen != PRIMARY) 3763 if (current_screen != PRIMARY)
4250 scr_erase_screen (2); 3764 scr_erase_screen (2);
4251 scr_change_screen (state); 3765 scr_change_screen (state);
4252 break; 3766 break;
4253 case 1049: /* secondary screen w/ clearing first */ 3767 case 1049: /* secondary screen w/ clearing first */
4254 scr_change_screen (state); 3768 scr_change_screen (state);
4255 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4256 if (current_screen != PRIMARY) 3770 if (current_screen != PRIMARY)
4257 scr_erase_screen (2); 3771 scr_erase_screen (2);
4258 break; 3772 break;
4259 default: 3773 default:
4260 break; 3774 break;
… …
4388 scr_color (Color_bg, Color_bg); 3902 scr_color (Color_bg, Color_bg);
4389 break; 3903 break;
4390 3904
4391 //case 50: // not variable spacing 3905 //case 50: // not variable spacing
4392 3906
4393#if ENABLE_FRILLS 3907#if !ENABLE_MINIMAL
4394 case 90: 3908 case 90:
4395 case 91: /* set bright fg color */ 3909 case 91: /* set bright fg color */
4396 case 92: 3910 case 92:
4397 case 93: 3911 case 93:
4398 case 94: 3912 case 94:
… …
4460const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3974const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4461 3975
4462void 3976void
4463rxvt_term::tt_write (const char *data, unsigned int len) 3977rxvt_term::tt_write (const char *data, unsigned int len)
4464{ 3978{
4465 if (pty.pty < 0) 3979 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4466 return; 3980 return;
4467 3981
3982 if (pty->pty < 0)
3983 return;
3984
4468 if (v_buflen == 0) 3985 if (v_buflen == 0)
4469 { 3986 {
4470 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3987 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4471 3988
4472 if ((unsigned int)written == len) 3989 if ((unsigned int)written == len)
4473 return; 3990 return;
4474 3991
4475 data += written; 3992 data += written;
… …
4484 pty_ev.set (EVENT_READ | EVENT_WRITE); 4001 pty_ev.set (EVENT_READ | EVENT_WRITE);
4485} 4002}
4486 4003
4487void rxvt_term::pty_write () 4004void rxvt_term::pty_write ()
4488{ 4005{
4489 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4006 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490 4007
4491 if (written > 0) 4008 if (written > 0)
4492 { 4009 {
4493 v_buflen -= written; 4010 v_buflen -= written;
4494 4011

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines