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.249 by root, Sun Jan 8 01:02:15 2006 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 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 {
… …
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 ENABLE_OVERLAY
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 ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (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
… …
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;
1054 int end_row = row + nrow;
978 1055
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1056 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1057 --row;
981 1058
982 while (row < -view_start + nrow) 1059 do
983 { 1060 {
984 int start_row = row; 1061 int start_row = row;
985 line_t *l; 1062 line_t *l;
986 1063
987 do 1064 do
988 { 1065 {
989 l = &ROW (row); 1066 l = &ROW (row++);
990 1067
991 if (!(l->f & LINE_FILTERED)) 1068 if (!(l->f & LINE_FILTERED))
992 { 1069 {
993 // line not filtered, mark it as filtered 1070 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1071 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1072 while (l->is_longer ())
996 { 1073 {
997 l = &ROW (++row); 1074 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1075 l->f |= LINE_FILTERED;
999 } 1076 }
1000 1077
1001 // and filter it 1078 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1080
1004 break; 1081 break;
1005 } 1082 }
1006 } 1083 }
1007 while (l->is_longer ()); 1084 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1085 }
1086 while (row < end_row);
1011 1087 }
1012 }
1013 1088
1014 scr_refresh (refresh_type); 1089 scr_refresh ();
1015 scrollbar_show (1); 1090 scrollbar_show (1);
1016#ifdef USE_XIM 1091#ifdef USE_XIM
1017 IMSendSpot (); 1092 IMSendSpot ();
1018#endif 1093#endif
1019 } 1094 }
… …
1022} 1097}
1023 1098
1024void 1099void
1025rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
1026{ 1101{
1027 SET_R (this); 1102 make_current ();
1028 SET_LOCALE (locale);
1029 1103
1030 display->flush (); 1104 display->flush ();
1031 1105
1032 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
1033 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
1034} 1108}
1035 1109
1036void 1110void
1037rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1038{ 1112{
1039 SET_R (this); 1113 make_current ();
1040 SET_LOCALE (locale);
1041 1114
1042 refresh_limit = 1; 1115 refresh_limit = 1;
1043 refresh_count = 0; 1116 refresh_count = 0;
1044 flush (); 1117 flush ();
1045} 1118}
… …
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1123{
1051 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1125 want_refresh = 1;
1053 1126
1054 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1128}
1056#endif 1129#endif
1057 1130
1058#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
1059void 1132void
… …
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1147{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1150 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1151 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1153 }
1082} 1154}
1083#endif 1155#endif
… …
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1160{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1162 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1164 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1166 }
1096} 1167}
1097#endif 1168#endif
… …
1102{ 1173{
1103 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1177 {
1107 if (view_start == nsaved || 1178 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1179 mouse_slip_wheel_speed = 0;
1110 1180
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1181 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1183 }
1115} 1184}
1116#endif 1185#endif
1117 1186
1118#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1119static struct event_handler 1188static struct event_handler
1120{ 1189{
1121 check_watcher cw_yield; 1190 check_watcher yield_ev;
1122 1191
1123 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1124 { 1193 {
1125 sched_yield (); 1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1126 w.stop (); 1202 w.stop ();
1127 } 1203 }
1128 1204
1129 event_handler () 1205 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1131 { 1207 {
1132 } 1208 }
1133} event_handler; 1209} event_handler;
1134#endif 1210#endif
1135 1211
… …
1146 1222
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1150 1226
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1228
1153 if (r > 0) 1229 if (r > 0)
1154 { 1230 {
1155 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1156 return true; 1232 return true;
1157 } 1233 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1235 {
1160#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1161 if (display->is_local) 1237 if (display->is_local)
1162 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1163#endif 1239#endif
1164 } 1240 }
1165 else 1241 else
1166 { 1242 {
1167 pty_ev.stop (); 1243 pty_ev.stop ();
1168 1244
1169 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1170 destroy (); 1246 destroy ();
1171 } 1247 }
1172 1248
1173 return false; 1249 return false;
1174} 1250}
1175 1251
1176void 1252void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1254{
1179 SET_R (this); 1255 make_current ();
1180 SET_LOCALE (locale);
1181 1256
1182 if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1259 while (pty_fill ())
1185 if (cmd_parse ()) 1260 if (cmd_parse ())
… …
1190} 1265}
1191 1266
1192void 1267void
1193rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1194{ 1269{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1271 recolour_cursor ();
1197 1272
1198#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1274 hidden_pointer = 0;
1200 1275
1201 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1203#endif 1278#endif
1204} 1279}
1205 1280
1206#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1207void 1282void
1208rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1209{ 1284{
1210 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1211 return; 1286 return;
1212 1287
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1289 XFlush (dpy);
1215 1290
1216 hidden_pointer = 1; 1291 hidden_pointer = 1;
1217} 1292}
1218 1293
1219void 1294void
1220rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
1221{ 1296{
1222 SET_R (this); 1297 make_current ();
1223 SET_LOCALE (locale);
1224 1298
1225 pointer_blank (); 1299 pointer_blank ();
1226} 1300}
1227#endif 1301#endif
1228 1302
… …
1293 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1294 (32 + x + 1), 1368 (32 + x + 1),
1295 (32 + y + 1)); 1369 (32 + y + 1));
1296} 1370}
1297 1371
1298#ifdef USING_W11LIB
1299void
1300rxvt_W11_process_x_event (XEvent *ev)
1301{
1302 rxvt_t *r = rxvt_get_r ();
1303
1304 x_cb (*ev);
1305}
1306#endif
1307
1308/*{{{ process an X event */ 1372/*{{{ process an X event */
1309void 1373void
1310rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1311{ 1375{
1312 dDisp; 1376 make_current ();
1313 1377
1314 SET_R (this); 1378 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1379
1380 if (ev.xany.window == vt
1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1383 return;
1384
1385 // for XQueryPointer
1317 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
1318 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
1319 unsigned int unused_mask; 1388 unsigned int unused_mask;
1320 1389
1321 switch (ev.type) 1390 switch (ev.type)
1322 { 1391 {
1323 case KeyPress: 1392 case KeyPress:
1324#if ISO_14755 1393 key_press (ev.xkey);
1325 if (!(iso14755buf & ISO_14755_52))
1326#endif
1327 lookup_key (ev.xkey);
1328
1329 break; 1394 break;
1330 1395
1331 case KeyRelease: 1396 case KeyRelease:
1332 { 1397 key_release (ev.xkey);
1333#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1334 KeySym ks;
1335
1336 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1337#endif
1338
1339#if ENABLE_FRILLS || ISO_14755
1340 // ISO 14755 support
1341 if (iso14755buf)
1342 if (iso14755buf & ISO_14755_52)
1343 {
1344# if ENABLE_OVERLAY
1345 scr_overlay_off ();
1346# endif
1347# if ISO_14755
1348 // iso14755 part 5.2 handling: release time
1349 // first: controls
1350 if ((ev.xkey.state & ControlMask)
1351 && ((ks >= 0x40 && ks <= 0x5f)
1352 || (ks >= 0x61 && ks <= 0x7f)))
1353 {
1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1355 commit_iso14755 ();
1356 goto skip_switch;
1357 }
1358
1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1360 if (i[0] == ks)
1361 {
1362 iso14755buf = ISO_14755_51 | i[1];
1363 commit_iso14755 ();
1364 goto skip_switch;
1365 }
1366
1367 scr_bell ();
1368# endif
1369 iso14755buf = 0;
1370 break;
1371 }
1372 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1373 {
1374# if ENABLE_OVERLAY
1375 scr_overlay_off ();
1376# endif
1377 if (iso14755buf & ISO_14755_51)
1378 commit_iso14755 ();
1379#if ISO_14755
1380 else if (iso14755buf & ISO_14755_STARTED)
1381 {
1382 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1383
1384 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1385 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1386 }
1387# endif
1388 else
1389 iso14755buf = 0;
1390 }
1391#endif
1392
1393 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1395 break;
1396
1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1398 if (!(ev.xkey.state & ControlMask))
1399 slip_wheel_ev.stop ();
1400 else if (ks == XK_Control_L || ks == XK_Control_R)
1401 mouse_slip_wheel_speed = 0;
1402#endif
1403 break; 1398 break;
1404 }
1405 1399
1406 case ButtonPress: 1400 case ButtonPress:
1407 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1408 break; 1402 break;
1409 1403
… …
1411 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1412 break; 1406 break;
1413 1407
1414 case ClientMessage: 1408 case ClientMessage:
1415 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1416 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1417 { 1411 {
1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1413 {
1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1415 {
1418 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1417 {
1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1419 destroy (); 1419 destroy ();
1420 }
1420#if ENABLE_EWMH 1421#if ENABLE_EWMH
1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1422 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1424 &ev); 1425 &ev);
1426#endif
1427 }
1428 }
1429#if ENABLE_XEMBED
1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1431 {
1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1425#endif 1437#endif
1426 } 1438 }
1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1435#endif
1436#ifdef OFFIX_DND
1437 /* OffiX Dnd (drag 'n' drop) protocol */
1438 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1439 && (ev.xclient.data.l[0] == DndFile
1440 || ev.xclient.data.l[0] == DndDir
1441 || ev.xclient.data.l[0] == DndLink))
1442 {
1443 /* Get Dnd data */
1444 Atom ActualType;
1445 int ActualFormat;
1446 unsigned char *data;
1447 unsigned long Size, RemainingBytes;
1448
1449 XGetWindowProperty (disp, display->root,
1450 xa[XA_DNDSELECTION],
1451 0L, 1000000L,
1452 False, AnyPropertyType,
1453 &ActualType, &ActualFormat,
1454 &Size, &RemainingBytes,
1455 &data);
1456 set_string_property (XA_CUT_BUFFER0, data);
1457 XFree (data);
1458 selection_paste (display->root, XA_CUT_BUFFER0, true);
1459 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1460 }
1461#endif /* OFFIX_DND */
1462 break; 1439 break;
1463 1440
1464 case MappingNotify: 1441 case MappingNotify:
1465 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1466 break; 1443 break;
… …
1489 break; 1466 break;
1490 } 1467 }
1491 break; 1468 break;
1492 1469
1493 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1494 focus_in (); 1474 focus_in ();
1495 break; 1475 break;
1496 1476
1497 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1498 focus_out (); 1481 focus_out ();
1499 break; 1482 break;
1500 1483
1501 case ConfigureNotify: 1484 case ConfigureNotify:
1502 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1503 { 1486 {
1504 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1505 ; 1488 ;
1506 1489
1507 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1508 { 1491 {
1509 seen_resize = 1; 1492 seen_resize = 1;
1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1511 } 1494 }
1512 1495
1513#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1497
1498#ifdef TRANSPARENT
1514 if (OPTION (Opt_transparent)) 1499 if (option (Opt_transparent))
1515 check_our_parents (); 1500 check_our_parents ();
1516#endif 1501#endif
1517 } 1502 }
1518 break; 1503 break;
1519 1504
1520 case PropertyNotify: 1505 case PropertyNotify:
1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1521 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1507 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1522 && ev.xproperty.state == PropertyNewValue) 1508 && ev.xproperty.state == PropertyNewValue)
1523 selection_property (ev.xproperty.window, ev.xproperty.atom); 1509 selection_property (ev.xproperty.window, ev.xproperty.atom);
1524 1510
1525 break; 1511 break;
1526 1512
1527 case SelectionClear: 1513 case SelectionClear:
1528 selection_clear (); 1514 selection_clear ();
… …
1564 if (ev.xany.window == vt) 1550 if (ev.xany.window == vt)
1565 { 1551 {
1566 do 1552 do
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1570 1556
1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1572 1558
1573 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1574 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1575 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1576 1562
1577 scr_refresh (refresh_type); 1563 want_refresh = 1;
1578 } 1564 }
1579 else 1565 else
1580 { 1566 {
1581 XEvent unused_event; 1567 XEvent unused_event;
1582 1568
1583 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1584 ; 1570 ;
1585 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1586 ; 1572 ;
1587 1573
1588 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1589 { 1575 {
1590 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1591 scrollbar_show (0); 1577 scrollbar_show (0);
1592 } 1578 }
1593#ifdef MENUBAR
1594 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1595 menubar_expose ();
1596#endif
1597 1579
1598#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1599 if (am_transparent && ev.xany.window == parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1600 XClearWindow (disp, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1601#endif 1583#endif
1602 } 1584 }
1603 break; 1585 break;
1604 1586
1605 case MotionNotify: 1587 case MotionNotify:
1606#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1607 if (hidden_pointer) 1589 if (hidden_pointer)
1608 pointer_unblank (); 1590 pointer_unblank ();
1609#endif 1591#endif
1610#if MENUBAR
1611 if (isMenuBarWindow (ev.xany.window))
1612 {
1613 menubar_control (ev.xbutton);
1614 break;
1615 }
1616#endif
1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1618 break; 1593 break;
1619 1594
1620 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1621 { 1596 {
1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop 1599 ; // nop
1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1625 { 1601 {
1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1627 ; 1603 ;
1628 1604
1629 XQueryPointer (disp, vt, 1605 XQueryPointer (dpy, vt,
1630 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1633 &ev.xbutton.state); 1609 &ev.xbutton.state);
1634#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1698#endif 1674#endif
1699 } 1675 }
1700 } 1676 }
1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1702 { 1678 {
1703 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1704 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1705 ; 1681 ;
1706 1682
1707 XQueryPointer (disp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1708 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1709 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1710 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1711 &unused_mask); 1687 &unused_mask);
1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1713 scrollbar_size ()); 1689 scrollbar_size ());
1714 scr_refresh (refresh_type); 1690 want_refresh = 1;
1715 refresh_limit = 0; 1691 refresh_limit = 0;
1716 scrollbar_show (1); 1692 scrollbar_show (1);
1717 } 1693 }
1718 break; 1694 break;
1719 } 1695 }
1720 1696
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1725 { 1699 {
1726 if (hidden_cursor) 1700 if (hidden_cursor)
1727 { 1701 {
1728 hidden_cursor = 0; 1702 hidden_cursor = 0;
1729 want_refresh = 1; 1703 want_refresh = 1;
1730 } 1704 }
1731 1705
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733 } 1707 }
1734#endif 1708#endif
1735 1709
1736#if defined(POINTER_BLANK) 1710#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 { 1712 {
1739 if (ev.type == MotionNotify 1713 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress 1714 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease) 1715 || ev.type == ButtonRelease)
1742 if (hidden_pointer) 1716 if (hidden_pointer)
… …
1754 if (!focus) 1728 if (!focus)
1755 { 1729 {
1756 focus = 1; 1730 focus = 1;
1757 want_refresh = 1; 1731 want_refresh = 1;
1758 1732
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1760 1734
1761#if USE_XIM 1735#if USE_XIM
1762 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1763 { 1737 {
1764 IMSetStatusPosition (); 1738 IMSetPosition ();
1765 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1766 } 1740 }
1767#endif 1741#endif
1768#if CURSOR_BLINK 1742#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771#endif 1745#endif
1772#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1774 { 1748 {
1775 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1776 scr_recolour (); 1750 scr_recolour ();
1751 }
1752#endif
1753#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell))
1755 {
1756 XWMHints *h;
1757
1758 h = XGetWMHints(dpy, parent[0]);
1759 if (h != NULL)
1760 {
1761 h->flags &= ~XUrgencyHint;
1762 XSetWMHints(dpy, parent[0], h);
1763 }
1777 } 1764 }
1778#endif 1765#endif
1779 } 1766 }
1780} 1767}
1781 1768
… …
1801#if USE_XIM 1788#if USE_XIM
1802 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1803 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1804#endif 1791#endif
1805#if CURSOR_BLINK 1792#if CURSOR_BLINK
1806 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1807 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1808 hidden_cursor = 0; 1795 hidden_cursor = 0;
1809#endif 1796#endif
1810#if OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
… …
1815 } 1802 }
1816#endif 1803#endif
1817 } 1804 }
1818} 1805}
1819 1806
1820#if TRANSPARENT 1807void
1808rxvt_term::update_fade_color (unsigned int idx)
1809{
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 rgba c;
1814 pix_colors [Color_fade].get (c);
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 }
1817#endif
1818}
1819
1820#if TRANSPARENT || ENABLE_PERL
1821void 1821void
1822rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1823{ 1823{
1824 SET_R (this); 1824 make_current ();
1825 SET_LOCALE (locale);
1826 1825
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return;
1829
1830# if TRANSPARENT
1827 switch (ev.type) 1831 switch (ev.type)
1828 { 1832 {
1829 case PropertyNotify: 1833 case PropertyNotify:
1830 /* 1834 /*
1831 * if user used some Esetroot compatible prog to set the root bg, 1835 * if user used some Esetroot compatible prog to set the root bg,
… …
1835 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1836 return; 1840 return;
1837 1841
1838 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1839 case ReparentNotify: 1843 case ReparentNotify:
1840 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1841 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1842 break; 1846 break;
1843 } 1847 }
1848# endif
1844} 1849}
1845#endif 1850#endif
1846 1851
1847void 1852void
1848rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
… …
1857 /* 1862 /*
1858 * VT window processing of button press 1863 * VT window processing of button press
1859 */ 1864 */
1860 if (ev.window == vt) 1865 if (ev.window == vt)
1861 { 1866 {
1867 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1868 return;
1869
1862#if ISO_14755 1870#if ISO_14755
1863 // 5.4 1871 // 5.4
1864 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1872 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1865 { 1873 {
1866 iso14755_54 (ev.x, ev.y); 1874 iso14755_54 (ev.x, ev.y);
… …
1908 else 1916 else
1909 { 1917 {
1910 if (ev.button != MEvent.button) 1918 if (ev.button != MEvent.button)
1911 MEvent.clicks = 0; 1919 MEvent.clicks = 0;
1912 1920
1913 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1914 switch (ev.button) 1921 switch (ev.button)
1915 { 1922 {
1916 case Button1: 1923 case Button1:
1917 /* allow meta + click to select rectangular areas */ 1924 /* allow meta + click to select rectangular areas */
1918 /* should be done in screen.C */ 1925 /* should be done in screen.C */
1919#if ENABLE_FRILLS 1926#if ENABLE_FRILLS
1920 selection.rect = !!(ev.state & ModMetaMask); 1927 selection.rect = !!(ev.state & ModMetaMask);
1921#else 1928#else
1922 selection.rect = false; 1929 selection.rect = false;
1923#endif 1930#endif
1924 1931
1925 /* allow shift+left click to extend selection */ 1932 /* allow shift+left click to extend selection */
1926 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1933 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1927 { 1934 {
1928 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1929 selection_rotate (ev.x, ev.y); 1936 selection_rotate (ev.x, ev.y);
1930 else 1937 else
1931 selection_extend (ev.x, ev.y, 1); 1938 selection_extend (ev.x, ev.y, 1);
1932 } 1939 }
1933 else 1940 else
1934 { 1941 {
1935 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1936 MEvent.clicks++; 1943 MEvent.clicks++;
1937 else 1944 else
1938 MEvent.clicks = 1; 1945 MEvent.clicks = 1;
1939 1946
1940 selection_click (MEvent.clicks, ev.x, ev.y); 1947 selection_click (MEvent.clicks, ev.x, ev.y);
1941 } 1948 }
1942 1949
1943 MEvent.button = Button1; 1950 MEvent.button = Button1;
1944 break; 1951 break;
1945 1952
1946 case Button3: 1953 case Button3:
1947 if (MEvent.button == Button3 && clickintime) 1954 if (MEvent.button == Button3 && clickintime)
1948 selection_rotate (ev.x, ev.y); 1955 selection_rotate (ev.x, ev.y);
1949 else 1956 else
1950 selection_extend (ev.x, ev.y, 1); 1957 selection_extend (ev.x, ev.y, 1);
1951 1958
1952 MEvent.button = Button3; 1959 MEvent.button = Button3;
1953 break; 1960 break;
1954 } 1961 }
1955 } 1962 }
1956 1963
1957 MEvent.time = ev.time; 1964 MEvent.time = ev.time;
1958 return; 1965 return;
1959 } 1966 }
1960 1967
… …
2099 } 2106 }
2100 } 2107 }
2101 2108
2102 return; 2109 return;
2103 } 2110 }
2104
2105#if MENUBAR
2106 /*
2107 * Menubar window processing of button press
2108 */
2109 if (isMenuBarWindow (ev.window))
2110 menubar_control (ev);
2111#endif
2112} 2111}
2113 2112
2114void 2113void
2115rxvt_term::button_release (XButtonEvent &ev) 2114rxvt_term::button_release (XButtonEvent &ev)
2116{ 2115{
… …
2122 2121
2123 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
2124 { 2123 {
2125 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
2126 scrollbar_show (0); 2125 scrollbar_show (0);
2127#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2128 refresh_type &= ~SMOOTH_REFRESH;
2129#endif
2130 } 2126 }
2131 2127
2132#ifdef SELECTION_SCROLLING 2128#ifdef SELECTION_SCROLLING
2133 if (sel_scroll_ev.active) 2129 if (sel_scroll_ev.active)
2134 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
2135#endif 2131#endif
2136 2132
2137 if (ev.window == vt) 2133 if (ev.window == vt)
2138 { 2134 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2136 return;
2137
2139#if ISO_14755 2138#if ISO_14755
2140 // 5.4 2139 // 5.4
2141 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2142 return; 2141 return;
2143#endif 2142#endif
2143
2144 if (reportmode) 2144 if (reportmode)
2145 { 2145 {
2146 /* mouse report from vt window */ 2146 /* mouse report from vt window */
2147 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
2148 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
2172 if (priv_modes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
2173 && bypass_keystate 2173 && bypass_keystate
2174 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
2175 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
2176 2176
2177 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178 return;
2179
2180 switch (ev.button) 2177 switch (ev.button)
2181 { 2178 {
2182 case Button1: 2179 case Button1:
2183 case Button3: 2180 case Button3:
2184 selection_make (ev.time); 2181 selection_make (ev.time);
2185 break; 2182 break;
2183
2186 case Button2: 2184 case Button2:
2187 selection_request (ev.time, ev.x, ev.y); 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2188 break; 2187 break;
2188
2189#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2190 case Button4: 2190 case Button4:
2191 case Button5: 2191 case Button5:
2192 { 2192 {
2193 int i; 2193 int i;
… …
2195 2195
2196 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2197 2197
2198 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2199 i = 1; 2199 i = 1;
2200 else if (OPTION (Opt_mouseWheelScrollPage)) 2200 else if (option (Opt_mouseWheelScrollPage))
2201 i = nrow - 1; 2201 i = nrow - 1;
2202 else 2202 else
2203 i = 5; 2203 i = 5;
2204 2204
2205# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2215 slip_wheel_ev.start (); 2215 slip_wheel_ev.start ();
2216 } 2216 }
2217 else 2217 else
2218 { 2218 {
2219# endif 2219# endif
2220# ifdef JUMP_MOUSE_WHEEL
2221 scr_page (v, i); 2220 scr_page (v, i);
2222 scr_refresh (SMOOTH_REFRESH);
2223 scrollbar_show (1); 2221 scrollbar_show (1);
2224# else
2225 while (i--)
2226 {
2227 scr_page (v, 1);
2228 scr_refresh (SMOOTH_REFRESH);
2229 scrollbar_show (1);
2230 }
2231# endif
2232# ifdef MOUSE_SLIP_WHEELING 2222# ifdef MOUSE_SLIP_WHEELING
2233 } 2223 }
2234#endif 2224# endif
2235 } 2225 }
2236 break; 2226 break;
2237#endif 2227#endif
2238 } 2228 }
2239 } 2229 }
2240#ifdef MENUBAR
2241 else if (isMenuBarWindow (ev.window))
2242 menubar_control (ev);
2243#endif
2244} 2230}
2245 2231
2246#ifdef TRANSPARENT 2232#ifdef TRANSPARENT
2247#if TINTING 2233#if TINTING
2248/* taken from aterm-0.4.2 */ 2234/* taken from aterm-0.4.2 */
2249 2235
2250typedef uint32_t RUINT32T; 2236typedef uint32_t RUINT32T;
2251 2237
2252void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2238void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2253{ 2239{
2254 int sh_r, sh_g, sh_b; 2240 int sh_r, sh_g, sh_b;
2255 RUINT32T mask_r, mask_g, mask_b; 2241 RUINT32T mask_r, mask_g, mask_b;
2256 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2257 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2258 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2259 int i; 2245 int i;
2260 2246
2261 Visual *visual = display->visual; 2247 Visual *visual = term->visual;
2262 2248
2263 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2264 2250
2265 /* for convenience */ 2251 /* for convenience */
2266 mask_r = visual->red_mask; 2252 mask_r = visual->red_mask;
… …
2487 Atom atype; 2473 Atom atype;
2488 unsigned char *prop = NULL; 2474 unsigned char *prop = NULL;
2489 Window root, oldp, *list; 2475 Window root, oldp, *list;
2490 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2491 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2492 dDisp;
2493 2478
2494 pchanged = 0; 2479 pchanged = 0;
2495 2480
2496 if (!OPTION (Opt_transparent)) 2481 if (!option (Opt_transparent))
2497 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2498 2483
2499 XGetWindowAttributes (disp, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2500 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2501 2486
2502 XGetWindowAttributes (disp, parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2503 2488
2504 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2505 { 2490 {
2506 if (am_transparent) 2491 if (am_transparent)
2507 { 2492 {
2508 pchanged = 1; 2493 pchanged = 1;
2509 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2510 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2511 } 2496 }
2512 2497
2513 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2514 } 2499 }
2515 2500
2516 /* Get all X ops out of the queue so that our information is up-to-date. */ 2501 /* Get all X ops out of the queue so that our information is up-to-date. */
2517 XSync (disp, False); 2502 XSync (dpy, False);
2518 2503
2519 /* 2504 /*
2520 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2521 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2522 * windows for each client, so we have to take care about that. 2507 * windows for each client, so we have to take care about that.
2523 */ 2508 */
2524 i = (xa[XA_XROOTPMAP_ID] 2509 i = (xa[XA_XROOTPMAP_ID]
2525 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2526 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2527 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2528 2513
2529 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2530 i = (xa[XA_ESETROOT_PMAP_ID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2531 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2532 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2533 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2534 2519
2535 if (!i || prop == NULL 2520 if (!i || prop == NULL
2536#if TINTING 2521#if TINTING
2537 || !rs[Rs_color + Color_tint] 2522 || !ISSET_PIXCOLOR (Color_tint)
2538#endif 2523#endif
2539 ) 2524 )
2540 have_pixmap = 0; 2525 have_pixmap = 0;
2541 else 2526 else
2542 { 2527 {
… …
2555 Window cr; 2540 Window cr;
2556 XImage *image; 2541 XImage *image;
2557 GC gc; 2542 GC gc;
2558 XGCValues gcvalue; 2543 XGCValues gcvalue;
2559 2544
2560 XTranslateCoordinates (disp, parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2561 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2562 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2563 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2564 nx = ny = 0; 2549 nx = ny = 0;
2565 2550
… …
2578 } 2563 }
2579 2564
2580 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2581 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2582 2567
2583 XSync (disp, False); 2568 XSync (dpy, False);
2584 allowedxerror = -1; 2569 allowedxerror = -1;
2585 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2586 2571
2587 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2588 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2589 allowedxerror = 0; 2574 allowedxerror = 0;
2590 2575
… …
2593 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2594 { 2579 {
2595 pchanged = 1; 2580 pchanged = 1;
2596 if (pixmap != None) 2581 if (pixmap != None)
2597 { 2582 {
2598 XFreePixmap (disp, pixmap); 2583 XFreePixmap (dpy, pixmap);
2599 pixmap = None; 2584 pixmap = None;
2600 } 2585 }
2601 } 2586 }
2602 2587
2603 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2604 } 2589 }
2605 else 2590 else
2606 { 2591 {
2607 if (pixmap != None) 2592 if (pixmap != None)
2608 XFreePixmap (disp, pixmap); 2593 XFreePixmap (dpy, pixmap);
2609 2594
2610#if TINTING 2595#if TINTING
2611 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2612 { 2597 {
2613 unsigned short rm, gm, bm;
2614 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2615 2599
2600 rgba c;
2616 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2601 pix_colors_focused [Color_tint].get (c);
2617 2602
2618 ShadeXImage (display, image, shade, rm, gm, bm); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2619 } 2604 }
2620#endif 2605#endif
2621 2606
2622 pixmap = XCreatePixmap (disp, vt, 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2623 szHint.width, szHint.height, image->depth);
2624 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2625 XPutImage (disp, pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2626 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2627 XFreeGC (disp, gc); 2611 XFreeGC (dpy, gc);
2628 XDestroyImage (image); 2612 XDestroyImage (image);
2629 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2630 XClearWindow (disp, parent[0]); 2614 XClearWindow (dpy, parent[0]);
2631 2615
2632 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2633 pchanged = 1; 2617 pchanged = 1;
2634 2618
2635 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2636 } 2620 }
2637 } 2621 }
2638 2622
2639 if (am_pixmap_trans) 2623 if (am_pixmap_trans)
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2641 else 2625 else
2642 { 2626 {
2643 unsigned int n; 2627 unsigned int n;
2644 /* 2628 /*
2645 * InheritPixmap transparency 2629 * InheritPixmap transparency
2646 */ 2630 */
2647 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 { 2632 {
2649 oldp = parent[i]; 2633 oldp = parent[i];
2650 XQueryTree (disp, parent[i - 1], &root, 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2651 &parent[i], &list, &n);
2652 XFree (list); 2635 XFree (list);
2653 2636
2654 if (parent[i] == display->root) 2637 if (parent[i] == display->root)
2655 { 2638 {
2656 if (oldp != None) 2639 if (oldp != None)
… …
2664 } 2647 }
2665 2648
2666 n = 0; 2649 n = 0;
2667 2650
2668 if (pchanged) 2651 if (pchanged)
2669 {
2670 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2671 { 2653 {
2672 XGetWindowAttributes (disp, parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2655
2673 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2674 { 2657 {
2675 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2676 break; 2659 break;
2677 } 2660 }
2678 } 2661 }
2679 }
2680 2662
2681 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2682 { 2664 {
2683 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2684 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2685 am_transparent = 0; 2667 am_transparent = 0;
2686 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2687 } 2669 }
2688 else 2670 else
2689 { 2671 {
2690#if WAIT_FOR_WM
2691 /* wait (an arbitrary period) for the WM to do its thing
2692 * needed for fvwm2.2.2 (and before?) */
2693 sleep (1);
2694#endif
2695 for (n = 0; n < (unsigned int)i; n++) 2672 for (n = 0; n < (unsigned int)i; n++)
2696 { 2673 {
2697 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2698 XClearWindow (disp, parent[n]); 2675 XClearWindow (dpy, parent[n]);
2699 } 2676 }
2700 2677
2701 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2702 am_transparent = 1; 2679 am_transparent = 1;
2703 } 2680 }
2704 2681
2705 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2706 parent[i] = None; 2683 parent[i] = None;
2707 } 2684 }
2708 2685
2709 if (scrollBar.win) 2686 if (scrollBar.win)
2710 { 2687 {
2711 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2712 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2713 scrollbar_show (0); 2690 scrollbar_show (0);
2714 } 2691 }
2715 2692
2716 if (am_transparent) 2693 if (am_transparent)
… …
2779 if (ch == C0_LF) 2756 if (ch == C0_LF)
2780 nlines++; 2757 nlines++;
2781 2758
2782 refresh_count++; 2759 refresh_count++;
2783 2760
2784 if (!OPTION (Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2785 || (refresh_count >= refresh_limit * (nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2786 { 2763 {
2787 refreshnow = true; 2764 refreshnow = true;
2788 refresh_count = 0; 2765 refresh_count = 0;
2789 ch = NOCHAR; 2766 ch = NOCHAR;
… …
2791 } 2768 }
2792 2769
2793 // scr_add_lines only works for nlines <= nrow - 1. 2770 // scr_add_lines only works for nlines <= nrow - 1.
2794 if (nlines >= nrow - 1) 2771 if (nlines >= nrow - 1)
2795 { 2772 {
2773 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2796 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2774 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2797 scr_add_lines (buf, str - buf, nlines); 2775 scr_add_lines (buf, str - buf, nlines);
2798 2776
2799 nlines = 0; 2777 nlines = 0;
2800 str = buf; 2778 str = buf;
2801 eol = str + min (ncol, UBUFSIZ); 2779 eol = str + min (ncol, UBUFSIZ);
… …
2816 2794
2817 seq_begin = cmdbuf_ptr; 2795 seq_begin = cmdbuf_ptr;
2818 ch = next_char (); 2796 ch = next_char ();
2819 } 2797 }
2820 2798
2799 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2821 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2800 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2822 scr_add_lines (buf, str - buf, nlines); 2801 scr_add_lines (buf, str - buf, nlines);
2823 2802
2824 /* 2803 /*
2825 * If there have been a lot of new lines, then update the screen 2804 * If there have been a lot of new lines, then update the screen
2826 * What the heck I'll cheat and only refresh less than every page-full. 2805 * What the heck I'll cheat and only refresh less than every page-full.
2827 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2828 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2829 */ 2808 */
2830 if (refreshnow) 2809 if (refreshnow)
2831 { 2810 {
2832 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2833 refresh_limit++; 2812 refresh_limit++;
2834 else 2813 else
2835 { 2814 {
2836 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2837 scr_refresh (refresh_type); 2817 scr_refresh ();
2838 flush_ev.stop (); 2818 want_refresh = 1;
2839 } 2819 }
2840 } 2820 }
2841 2821
2842 } 2822 }
2843 else 2823 else
… …
2860 return flag; 2840 return flag;
2861} 2841}
2862 2842
2863// read the next character 2843// read the next character
2864wchar_t 2844wchar_t
2865rxvt_term::next_char () 2845rxvt_term::next_char () NOTHROW
2866{ 2846{
2867 while (cmdbuf_ptr < cmdbuf_endp) 2847 while (cmdbuf_ptr < cmdbuf_endp)
2868 { 2848 {
2869 // assume 7-bit to be ascii ALWAYS 2849 // assume 7-bit to be ascii ALWAYS
2870 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2850 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2891 return NOCHAR; 2871 return NOCHAR;
2892} 2872}
2893 2873
2894// read the next octet 2874// read the next octet
2895uint32_t 2875uint32_t
2896rxvt_term::next_octet () 2876rxvt_term::next_octet () NOTHROW
2897{ 2877{
2898 return cmdbuf_ptr < cmdbuf_endp 2878 return cmdbuf_ptr < cmdbuf_endp
2899 ? (unsigned char)*cmdbuf_ptr++ 2879 ? (unsigned char)*cmdbuf_ptr++
2900 : NOCHAR; 2880 : NOCHAR;
2901} 2881}
2882
2883static class out_of_input out_of_input;
2902 2884
2903/* rxvt_cmd_getc () - Return next input character */ 2885/* rxvt_cmd_getc () - Return next input character */
2904/* 2886/*
2905 * Return the next input character after first passing any keyboard input 2887 * Return the next input character after first passing any keyboard input
2906 * to the command. 2888 * to the command.
2907 */ 2889 */
2908wchar_t 2890wchar_t
2909rxvt_term::cmd_getc () 2891rxvt_term::cmd_getc () THROW ((class out_of_input))
2910{ 2892{
2911 wchar_t c = next_char (); 2893 wchar_t c = next_char ();
2912 2894
2913 if (c == NOCHAR) 2895 if (c == NOCHAR)
2914 throw out_of_input; 2896 throw out_of_input;
2915 2897
2916 return c; 2898 return c;
2917} 2899}
2918 2900
2919uint32_t 2901uint32_t
2920rxvt_term::cmd_get8 () 2902rxvt_term::cmd_get8 () THROW ((class out_of_input))
2921{ 2903{
2922 uint32_t c = next_octet (); 2904 uint32_t c = next_octet ();
2923 2905
2924 if (c == NOCHAR) 2906 if (c == NOCHAR)
2925 throw out_of_input; 2907 throw out_of_input;
… …
3163 scr_charset_set (2, (unsigned int)cmd_getc ()); 3145 scr_charset_set (2, (unsigned int)cmd_getc ());
3164 break; 3146 break;
3165 case '+': 3147 case '+':
3166 scr_charset_set (3, (unsigned int)cmd_getc ()); 3148 scr_charset_set (3, (unsigned int)cmd_getc ());
3167 break; 3149 break;
3168#if ENABLE_FRILLS 3150#if !ENABLE_MINIMAL
3169 case '6': 3151 case '6':
3170 scr_backindex (); 3152 scr_backindex ();
3171 break; 3153 break;
3172#endif 3154#endif
3173 case '7': 3155 case '7':
3174 scr_cursor (SAVE); 3156 scr_cursor (SAVE);
3175 break; 3157 break;
3176 case '8': 3158 case '8':
3177 scr_cursor (RESTORE); 3159 scr_cursor (RESTORE);
3178 break; 3160 break;
3179#if ENABLE_FRILLS 3161#if !ENABLE_MINIMAL
3180 case '9': 3162 case '9':
3181 scr_forwardindex (); 3163 scr_forwardindex ();
3182 break; 3164 break;
3183#endif 3165#endif
3184 case '=': 3166 case '=':
… …
3346 ndef = get_byte_array_bit (csi_defaults, i); 3328 ndef = get_byte_array_bit (csi_defaults, i);
3347 for (p = 0; p < nargs; p++) 3329 for (p = 0; p < nargs; p++)
3348 if (arg[p] == -1) 3330 if (arg[p] == -1)
3349 arg[p] = ndef; 3331 arg[p] = ndef;
3350 3332
3351#ifdef DEBUG_CMD
3352 fprintf (stderr, "CSI ");
3353 for (p = 0; p < nargs; p++)
3354 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3355 fprintf (stderr, "%c\n", ch);
3356#endif
3357
3358 /* 3333 /*
3359 * private mode handling 3334 * private mode handling
3360 */ 3335 */
3361 if (priv) 3336 if (priv)
3362 { 3337 {
3363 switch (priv) 3338 switch (priv)
3364 { 3339 {
3365 case '>': 3340 case '>':
3366 if (ch == CSI_DA) /* secondary device attributes */ 3341 if (ch == CSI_DA) /* secondary device attributes */
3367 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3342 {
3343 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3344 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3345 //
3346 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3347 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3348 // that we do not support xterm mouse reporting (should be 95 when we do).
3349 //
3350 tt_printf ("\033[>%d;94;0c", 'U');
3351 }
3368 break; 3352 break;
3369 case '?': 3353 case '?':
3370 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3371 process_terminal_mode (ch, priv, nargs, arg); 3355 process_terminal_mode (ch, priv, nargs, arg);
3372 break; 3356 break;
… …
3498 break; 3482 break;
3499 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3500 scr_report_position (); 3484 scr_report_position ();
3501 break; 3485 break;
3502 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3503 if (OPTION (Opt_insecure)) 3487 if (option (Opt_insecure))
3504 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3505 break; 3489 break;
3506 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3507 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3508 break; 3492 break;
… …
3575 break; 3559 break;
3576 case CSI_75: 3560 case CSI_75:
3577 scr_cursor (RESTORE); 3561 scr_cursor (RESTORE);
3578 break; 3562 break;
3579 3563
3580#if ENABLE_FRILLS 3564#if !ENABLE_MINIMAL
3581 case CSI_74: 3565 case CSI_74:
3582 process_window_ops (arg, nargs); 3566 process_window_ops (arg, nargs);
3583 break; 3567 break;
3584#endif 3568#endif
3585 3569
… …
3592 break; 3576 break;
3593 } 3577 }
3594} 3578}
3595/*}}} */ 3579/*}}} */
3596 3580
3597#if ENABLE_FRILLS 3581#if !ENABLE_MINIMAL
3598/* ARGSUSED */ 3582/* ARGSUSED */
3599void 3583void
3600rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3584rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3601{ 3585{
3602 int x, y; 3586 int x, y;
3603 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3604 Window wdummy; 3588 Window wdummy;
3605 dDisp; 3589
3590 dLocal (Display *, dpy);
3606 3591
3607 if (nargs == 0) 3592 if (nargs == 0)
3608 return; 3593 return;
3609 3594
3610 switch (args[0]) 3595 switch (args[0])
3611 { 3596 {
3612 /* 3597 /*
3613 * commands 3598 * commands
3614 */ 3599 */
3615 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3616 XMapWindow (disp, parent[0]); 3601 XMapWindow (dpy, parent[0]);
3617 break; 3602 break;
3618 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3619 XIconifyWindow (disp, parent[0], display->screen); 3604 XIconifyWindow (dpy, parent[0], display->screen);
3620 break; 3605 break;
3621 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3622 XMoveWindow (disp, parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3623 break; 3608 break;
3624 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3625 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3626 break; 3611 break;
3627 case 5: /* raise window */ 3612 case 5: /* raise window */
3628 XRaiseWindow (disp, parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3629 break; 3614 break;
3630 case 6: /* lower window */ 3615 case 6: /* lower window */
3631 XLowerWindow (disp, parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3632 break; 3617 break;
3633 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3634 scr_touch (true); 3619 scr_touch (true);
3635 break; 3620 break;
3636 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
… …
3643 if (args[0] >= 24) /* set height (chars) */ 3628 if (args[0] >= 24) /* set height (chars) */
3644 set_widthheight ((unsigned int)width, 3629 set_widthheight ((unsigned int)width,
3645 (unsigned int) (args[1] * fheight)); 3630 (unsigned int) (args[1] * fheight));
3646 break; 3631 break;
3647 3632
3648
3649 /* 3633 /*
3650 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3651 */ 3635 */
3652 case 11: /* report window state */ 3636 case 11: /* report window state */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3654 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3655 break; 3639 break;
3656 case 13: /* report window position */ 3640 case 13: /* report window position */
3657 XGetWindowAttributes (disp, parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3658 XTranslateCoordinates (disp, parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3659 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3660 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3661 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3662 break; 3646 break;
3663 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3664 XGetWindowAttributes (disp, parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3665 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3666 break; 3650 break;
3667 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3668 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3669 break; 3653 break;
… …
3671 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3672 break; 3656 break;
3673 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3674 { 3658 {
3675 char *s; 3659 char *s;
3676 XGetIconName (disp, parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3677 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3678 XFree (s); 3662 XFree (s);
3679 } 3663 }
3680 break; 3664 break;
3681 case 21: /* report window title */ 3665 case 21: /* report window title */
3682 { 3666 {
3683 char *s; 3667 char *s;
3684 XFetchName (disp, parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3685 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3669 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3686 XFree (s); 3670 XFree (s);
3687 } 3671 }
3688 break; 3672 break;
3689 } 3673 }
3690} 3674}
… …
3717 seen_esc = true; 3701 seen_esc = true;
3718 continue; 3702 continue;
3719 } 3703 }
3720 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3721 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3722 else if (ch < 0x20) 3708 else if (ch < 0x20)
3723 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3724 3710
3725 seen_esc = false; 3711 seen_esc = false;
3726 3712
3727 if (n >= STRING_MAX - 1) 3713 if (n >= STRING_MAX - 1)
3728 // stop at some sane length 3714 // stop at some sane length
3729 return NULL; 3715 return NULL;
3730 3716
3731 if (ch == C0_SYN)
3732 string[n++] = cmd_get8 ();
3733 else
3734 string[n++] = ch; 3717 string[n++] = ch;
3735 } 3718 }
3736 3719
3737 string[n++] = '\0'; 3720 string[n++] = '\0';
3738 3721
3739 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3790void 3773void
3791rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3774rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3792{ 3775{
3793 if (str[0] == '?' && !str[1]) 3776 if (str[0] == '?' && !str[1])
3794 { 3777 {
3795 unsigned short r, g, b; 3778 rgba c;
3796 pix_colors_focused[color].get (display, r, g, b); 3779 pix_colors_focused[color].get (c);
3780
3781#if XFT
3782 if (c.a != rgba::MAX_CC)
3783 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3784 else
3785#endif
3797 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3798 } 3787 }
3799 else 3788 else
3800 set_window_color (color, str); 3789 set_window_color (color, str);
3801} 3790}
3802 3791
… …
3804 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3805 */ 3794 */
3806void 3795void
3807rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3808{ 3797{
3809 int changed = 0;
3810 int color; 3798 int color;
3811 char *buf, *name; 3799 char *buf, *name;
3812 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3813 int saveop = op; 3801 int saveop = op;
3814 dDisp; 3802
3803 dLocal (Display *, dpy);
3815 3804
3816 assert (str != NULL); 3805 assert (str != NULL);
3806
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return;
3809
3817 switch (op) 3810 switch (op)
3818 { 3811 {
3819 case XTerm_name: 3812 case XTerm_name:
3820 set_title (str); 3813 set_title (str);
3821 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3835 unsigned long bytes_after; 3828 unsigned long bytes_after;
3836 unsigned char *value = 0; 3829 unsigned char *value = 0;
3837 const char *str = ""; 3830 const char *str = "";
3838 3831
3839 if (prop 3832 if (prop
3840 && XGetWindowProperty (disp, parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3841 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3842 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3843 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3844 && actual_type != None 3837 && actual_type != None
3845 && actual_format == 8) 3838 && actual_format == 8)
3846 str = (const char *)(value); 3839 str = (const char *)(value);
3847 3840
3848 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3841 tt_printf ("\033]%d;%s%c", op, str, resp);
3849 3842
3850 XFree (value); 3843 XFree (value);
3851 } 3844 }
3852 else 3845 else
3853 { 3846 {
… …
3857 { 3850 {
3858 *eq = 0; 3851 *eq = 0;
3859 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3860 } 3853 }
3861 else 3854 else
3862 XDeleteProperty (disp, parent[0], 3855 XDeleteProperty (dpy, parent[0],
3863 display->atom (str)); 3856 display->atom (str));
3864 } 3857 }
3865 break; 3858 break;
3866 3859
3867 case XTerm_Color: 3860 case XTerm_Color:
… …
3869 { 3862 {
3870 if ((name = strchr (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3871 break; 3864 break;
3872 3865
3873 *name++ = '\0'; 3866 *name++ = '\0';
3874 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3875 3868
3876 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3877 break; 3870 break;
3878 3871
3879 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3880 *buf++ = '\0'; 3873 *buf++ = '\0';
3881 3874
3882 if (name[0] == '?' && !name[1]) 3875 process_color_seq (op, color, name, resp);
3883 {
3884 unsigned short r, g, b;
3885 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3886 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3887 }
3888 else
3889 set_window_color (color + minCOLOR, name);
3890 } 3876 }
3891 break; 3877 break;
3892 case XTerm_Color00: 3878 case XTerm_Color00:
3893 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3879 process_color_seq (op, Color_fg, str, resp);
3894 break; 3880 break;
3895 case XTerm_Color01: 3881 case XTerm_Color01:
3896 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3882 process_color_seq (op, Color_bg, str, resp);
3897 break; 3883 break;
3898#ifndef NO_CURSORCOLOR 3884#ifndef NO_CURSORCOLOR
3899 case XTerm_Color_cursor: 3885 case XTerm_Color_cursor:
3900 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3886 process_color_seq (op, Color_cursor, str, resp);
3901 break; 3887 break;
3902#endif 3888#endif
3903 case XTerm_Color_pointer_fg: 3889 case XTerm_Color_pointer_fg:
3904 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3890 process_color_seq (op, Color_pointer_fg, str, resp);
3905 break; 3891 break;
3906 case XTerm_Color_pointer_bg: 3892 case XTerm_Color_pointer_bg:
3907 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3893 process_color_seq (op, Color_pointer_bg, str, resp);
3908 break; 3894 break;
3909#ifndef NO_BOLD_UNDERLINE_REVERSE 3895#ifndef NO_BOLD_UNDERLINE_REVERSE
3910 case XTerm_Color_BD:
3911 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3912 break;
3913 case XTerm_Color_UL:
3914 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3915 break;
3916 case XTerm_Color_RV: 3896 case XTerm_Color_RV:
3917 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3897 process_color_seq (op, Color_RV, str, resp);
3898 break;
3899 case Rxvt_Color_BD:
3900 case URxvt_Color_BD:
3901 process_color_seq (op, Color_BD, str, resp);
3902 break;
3903 case Rxvt_Color_UL:
3904 case URxvt_Color_UL:
3905 process_color_seq (op, Color_UL, str, resp);
3918 break; 3906 break;
3919 case URxvt_Color_IT: 3907 case URxvt_Color_IT:
3920 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3908 process_color_seq (op, Color_IT, str, resp);
3921 break; 3909 break;
3922#endif 3910#endif
3923#if TRANSPARENT && TINTING 3911#if TRANSPARENT && TINTING
3924 case URxvt_Color_tint: 3912 case URxvt_Color_tint:
3925 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3913 process_color_seq (op, Color_tint, str, resp);
3914
3926 check_our_parents (); 3915 check_our_parents ();
3916
3927 if (am_transparent) 3917 if (am_transparent)
3928 want_full_refresh = want_refresh = 1; 3918 want_full_refresh = want_refresh = 1;
3929 break;
3930#endif
3931 3919
3920 break;
3921#endif
3922
3932 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3924 {
3933 if (*str != ';') 3925 if (*str != ';')
3934 { 3926 {
3935#if XPM_BACKGROUND 3927#if XPM_BACKGROUND
3936 scale_pixmap (""); /* reset to default scaling */ 3928 scale_pixmap (""); /* reset to default scaling */
3937 set_bgPixmap (str); /* change pixmap */ 3929 set_bgPixmap (str); /* change pixmap */
3938#endif
3939 scr_touch (true); 3930 scr_touch (true);
3931#endif
3940 } 3932 }
3933
3934 int changed = 0;
3935
3941 while ((str = strchr (str, ';')) != NULL) 3936 while ((str = strchr (str, ';')) != NULL)
3942 { 3937 {
3943 str++; 3938 str++;
3944#if XPM_BACKGROUND 3939#if XPM_BACKGROUND
3945 changed += scale_pixmap (str); 3940 changed += scale_pixmap (str);
3946#endif 3941#endif
3947 } 3942 }
3948 3943
3949 if (changed) 3944 if (changed)
3950 { 3945 {
3951#ifdef XPM_BACKGROUND 3946#ifdef XPM_BACKGROUND
3952 resize_pixmap (); 3947 resize_pixmap ();
3953#endif
3954 scr_touch (true); 3948 scr_touch (true);
3949#endif
3955 } 3950 }
3951 }
3956 break; 3952 break;
3957 3953
3958 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3959 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3960 break; 3956 break;
3961 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3962 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3963 break; 3959 break;
3964 3960
3965 case XTerm_logfile: 3961 case XTerm_logfile:
3966 // TODO, when secure mode? 3962 // TODO, when secure mode?
3967 break; 3963 break;
3968 3964
3969#ifdef MENUBAR
3970 case URxvt_Menu:
3971 if (OPTION (Opt_insecure))
3972 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3973 break;
3974#endif
3975#if 0 3965#if 0
3976 case XTerm_dumpscreen: /* no error notices */ 3966 case Rxvt_dumpscreen: /* no error notices */
3977 { 3967 {
3978 int fd; 3968 int fd;
3979 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3980 { 3970 {
3981 scr_dump (fd); 3971 scr_dump (fd);
… …
3992 case URxvt_italicFont: 3982 case URxvt_italicFont:
3993 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3994#endif 3984#endif
3995 if (query) 3985 if (query)
3996 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3997 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3998 ? fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3999 resp); 3989 resp);
4000 else 3990 else
4001 { 3991 {
4002 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4005 allocated.push_back ((void *)res); 3995 allocated.push_back ((void *)res);
4006 set_fonts (); 3996 set_fonts ();
4007 } 3997 }
4008 break; 3998 break;
4009 3999
4010#if ENABLE_FRILLS 4000 case URxvt_version:
4001 if (query)
4002 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4003 op,
4004 rs[Rs_name], VERSION[0], VERSION[2],
4005 resp);
4006 break;
4007
4008#if !ENABLE_MINIMAL
4011 case URxvt_locale: 4009 case URxvt_locale:
4012 if (query) 4010 if (query)
4013 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 4011 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4014 else 4012 else
4015 { 4013 {
4016 set_locale (str); 4014 set_locale (str);
4017 pty.set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
4018 init_xlocale (); 4016 init_xlocale ();
4019 } 4017 }
4020 break; 4018 break;
4021 4019
4022 case URxvt_view_up: 4020 case URxvt_view_up:
… …
4033 break; 4031 break;
4034#endif 4032#endif
4035 4033
4036#if ENABLE_PERL 4034#if ENABLE_PERL
4037 case URxvt_perl: 4035 case URxvt_perl:
4038 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4039 ; // no responses yet 4037 ; // no responses yet
4040 break; 4038 break;
4041#endif 4039#endif
4042 } 4040 }
4043} 4041}
… …
4075 return state; 4073 return state;
4076} 4074}
4077 4075
4078/* we're not using priv _yet_ */ 4076/* we're not using priv _yet_ */
4079void 4077void
4080rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4078rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4081{ 4079{
4082 unsigned int i, j; 4080 unsigned int i, j;
4083 int state; 4081 int state;
4084 4082
4085 static const struct 4083 static const struct
… …
4096 { 5, PrivMode_rVideo }, 4094 { 5, PrivMode_rVideo },
4097 { 6, PrivMode_relOrigin }, 4095 { 6, PrivMode_relOrigin },
4098 { 7, PrivMode_Autowrap }, 4096 { 7, PrivMode_Autowrap },
4099 // 8, bi-directional support mode 4097 // 8, bi-directional support mode
4100 { 9, PrivMode_MouseX10 }, 4098 { 9, PrivMode_MouseX10 },
4101#ifdef menuBar_esc
4102 { menuBar_esc, PrivMode_menuBar },
4103#endif
4104 // 18, 19 printing-related 4099 // 18, 19 printing-related
4105 { 25, PrivMode_VisibleCursor }, 4100 { 25, PrivMode_VisibleCursor },
4106#ifdef scrollBar_esc 4101#ifdef scrollBar_esc
4107 { scrollBar_esc, PrivMode_scrollBar }, 4102 { scrollBar_esc, PrivMode_scrollBar },
4108#endif 4103#endif
… …
4162 scr_touch (true); 4157 scr_touch (true);
4163 break; 4158 break;
4164#endif 4159#endif
4165 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4166 case 1049: 4161 case 1049:
4167 if (OPTION (Opt_secondaryScreen)) 4162 if (option (Opt_secondaryScreen))
4168 if (mode == 0) 4163 if (mode == 0)
4169 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4170 else if (mode == 1) 4165 else if (mode == 1)
4171 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4172 break; 4167 break;
… …
4203 /* case 8: - auto repeat, can't do on a per window basis */ 4198 /* case 8: - auto repeat, can't do on a per window basis */
4204 case 9: /* X10 mouse reporting */ 4199 case 9: /* X10 mouse reporting */
4205 if (state) /* orthogonal */ 4200 if (state) /* orthogonal */
4206 priv_modes &= ~PrivMode_MouseX11; 4201 priv_modes &= ~PrivMode_MouseX11;
4207 break; 4202 break;
4208#ifdef menuBar_esc
4209 case menuBar_esc:
4210#ifdef MENUBAR
4211 map_menuBar (state);
4212#endif
4213 break;
4214#endif
4215#ifdef scrollBar_esc 4203#ifdef scrollBar_esc
4216 case scrollBar_esc: 4204 case scrollBar_esc:
4217 if (scrollbar_mapping (state)) 4205 if (scrollbar_mapping (state))
4218 { 4206 {
4219 resize_all_windows (0, 0, 0); 4207 resize_all_windows (0, 0, 0);
… …
4244 break; 4232 break;
4245 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4246 set_option (Opt_scrollTtyKeypress, state); 4234 set_option (Opt_scrollTtyKeypress, state);
4247 break; 4235 break;
4248 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4249 if (OPTION (Opt_secondaryScreen)) 4237 if (option (Opt_secondaryScreen))
4250 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4251 scr_erase_screen (2); 4239 scr_erase_screen (2);
4252 scr_change_screen (state); 4240 scr_change_screen (state);
4253 break; 4241 break;
4254 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4255 scr_change_screen (state); 4243 scr_change_screen (state);
4256 if (OPTION (Opt_secondaryScreen)) 4244 if (option (Opt_secondaryScreen))
4257 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4258 scr_erase_screen (2); 4246 scr_erase_screen (2);
4259 break; 4247 break;
4260 default: 4248 default:
4261 break; 4249 break;
… …
4389 scr_color (Color_bg, Color_bg); 4377 scr_color (Color_bg, Color_bg);
4390 break; 4378 break;
4391 4379
4392 //case 50: // not variable spacing 4380 //case 50: // not variable spacing
4393 4381
4394#if ENABLE_FRILLS 4382#if !ENABLE_MINIMAL
4395 case 90: 4383 case 90:
4396 case 91: /* set bright fg color */ 4384 case 91: /* set bright fg color */
4397 case 92: 4385 case 92:
4398 case 93: 4386 case 93:
4399 case 94: 4387 case 94:
… …
4461const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4449const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4462 4450
4463void 4451void
4464rxvt_term::tt_write (const char *data, unsigned int len) 4452rxvt_term::tt_write (const char *data, unsigned int len)
4465{ 4453{
4466 if (pty.pty < 0) 4454 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4467 return; 4455 return;
4468 4456
4457 if (pty->pty < 0)
4458 return;
4459
4469 if (v_buflen == 0) 4460 if (v_buflen == 0)
4470 { 4461 {
4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4462 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4472 4463
4473 if ((unsigned int)written == len) 4464 if ((unsigned int)written == len)
4474 return; 4465 return;
4475 4466
4476 data += written; 4467 data += written;
… …
4485 pty_ev.set (EVENT_READ | EVENT_WRITE); 4476 pty_ev.set (EVENT_READ | EVENT_WRITE);
4486} 4477}
4487 4478
4488void rxvt_term::pty_write () 4479void rxvt_term::pty_write ()
4489{ 4480{
4490 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4481 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491 4482
4492 if (written > 0) 4483 if (written > 0)
4493 { 4484 {
4494 v_buflen -= written; 4485 v_buflen -= written;
4495 4486

Diff Legend

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