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.243 by root, Fri Jan 6 05:43:36 2006 UTC vs.
Revision 1.321 by root, Tue May 1 21:30:01 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);
… …
867#endif 871#endif
868 /* nil */ ; 872 /* nil */ ;
869 } 873 }
870 } 874 }
871 875
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END))) 876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 877 return;
874 878
875 if (len <= 0) 879 if (len <= 0)
876 return; /* not mapped */ 880 return; /* not mapped */
877 881
878 if (OPTION (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 883 if (view_start)
880 { 884 {
881 view_start = 0; 885 view_start = 0;
882 want_refresh = 1; 886 want_refresh = 1;
883 } 887 }
… …
905 { 909 {
906 const char ch = C0_ESC; 910 const char ch = C0_ESC;
907 tt_write (&ch, 1); 911 tt_write (&ch, 1);
908 } 912 }
909 913
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); 914 tt_write (kbuf, (unsigned int)len);
921} 915}
922/*}}} */
923 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
993
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 995unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 997{
930 unsigned int n, s; 998 unsigned int n, s;
931 999
… …
972 1040
973 if (want_refresh) 1041 if (want_refresh)
974 { 1042 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1043 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1044 {
977 int row = -view_start; 1045 int row = view_start;
1046 int end_row = row + nrow;
978 1047
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1048 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1049 --row;
981 1050
982 while (row < -view_start + nrow) 1051 do
983 { 1052 {
984 int start_row = row; 1053 int start_row = row;
985 line_t *l; 1054 line_t *l;
986 1055
987 do 1056 do
988 { 1057 {
989 l = &ROW (row); 1058 l = &ROW (row++);
990 1059
991 if (!(l->f & LINE_FILTERED)) 1060 if (!(l->f & LINE_FILTERED))
992 { 1061 {
993 // line not filtered, mark it as filtered 1062 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1063 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1064 while (l->is_longer ())
996 { 1065 {
997 l = &ROW (++row); 1066 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1067 l->f |= LINE_FILTERED;
999 } 1068 }
1000 1069
1001 // and filter it 1070 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1071 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1072
1004 break; 1073 break;
1005 } 1074 }
1006 } 1075 }
1007 while (l->is_longer ()); 1076 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1077 }
1078 while (row < end_row);
1011 1079 }
1012 }
1013 1080
1014 scr_refresh (refresh_type); 1081 scr_refresh ();
1015 scrollbar_show (1); 1082 scrollbar_show (1);
1016#ifdef USE_XIM 1083#ifdef USE_XIM
1017 IMSendSpot (); 1084 IMSendSpot ();
1018#endif 1085#endif
1019 } 1086 }
… …
1022} 1089}
1023 1090
1024void 1091void
1025rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
1026{ 1093{
1027 SET_R (this); 1094 make_current ();
1028 SET_LOCALE (locale);
1029 1095
1030 display->flush (); 1096 display->flush ();
1031 1097
1032 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034} 1100}
1035 1101
1036void 1102void
1037rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
1038{ 1104{
1039 SET_R (this); 1105 make_current ();
1040 SET_LOCALE (locale);
1041 1106
1042 refresh_limit = 1; 1107 refresh_limit = 1;
1043 refresh_count = 0; 1108 refresh_count = 0;
1044 flush (); 1109 flush ();
1045} 1110}
… …
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1115{
1051 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1117 want_refresh = 1;
1053 1118
1054 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1120}
1056#endif 1121#endif
1057 1122
1058#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1059void 1124void
… …
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1139{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1142 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1143 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1145 }
1082} 1146}
1083#endif 1147#endif
… …
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1152{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1154 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1156 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1158 }
1096} 1159}
1097#endif 1160#endif
… …
1102{ 1165{
1103 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1169 {
1107 if (view_start == nsaved || 1170 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1110 1172
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1173 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1175 }
1115} 1176}
1116#endif 1177#endif
1117 1178
1118#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1119static struct event_handler 1180static struct event_handler
1120{ 1181{
1121 check_watcher cw_yield; 1182 check_watcher yield_ev;
1122 1183
1123 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1124 { 1185 {
1125 sched_yield (); 1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1126 w.stop (); 1194 w.stop ();
1127 } 1195 }
1128 1196
1129 event_handler () 1197 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1131 { 1199 {
1132 } 1200 }
1133} event_handler; 1201} event_handler;
1134#endif 1202#endif
1135 1203
… …
1146 1214
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1150 1218
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1220
1153 if (r > 0) 1221 if (r > 0)
1154 { 1222 {
1155 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1156 return true; 1224 return true;
1157 } 1225 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1227 {
1160#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1161 if (display->is_local) 1229 if (display->is_local)
1162 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1163#endif 1231#endif
1164 } 1232 }
1165 else 1233 else
1166 { 1234 {
1167 pty_ev.stop (); 1235 pty_ev.stop ();
1168 1236
1169 if (!OPTION (Opt_hold)) 1237 if (!option (Opt_hold))
1170 destroy (); 1238 destroy ();
1171 } 1239 }
1172 1240
1173 return false; 1241 return false;
1174} 1242}
1175 1243
1176void 1244void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1246{
1179 SET_R (this); 1247 make_current ();
1180 SET_LOCALE (locale);
1181 1248
1182 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1251 while (pty_fill ())
1185 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1190} 1257}
1191 1258
1192void 1259void
1193rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1194{ 1261{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1263 recolour_cursor ();
1197 1264
1198#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1266 hidden_pointer = 0;
1200 1267
1201 if (OPTION (Opt_pointerBlank)) 1268 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1203#endif 1270#endif
1204} 1271}
1205 1272
1206#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1207void 1274void
1208rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1209{ 1276{
1210 if (!OPTION (Opt_pointerBlank)) 1277 if (!option (Opt_pointerBlank))
1211 return; 1278 return;
1212 1279
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1281 XFlush (dpy);
1215 1282
1216 hidden_pointer = 1; 1283 hidden_pointer = 1;
1217} 1284}
1218 1285
1219void 1286void
1220rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1221{ 1288{
1222 SET_R (this); 1289 make_current ();
1223 SET_LOCALE (locale);
1224 1290
1225 pointer_blank (); 1291 pointer_blank ();
1226} 1292}
1227#endif 1293#endif
1228 1294
… …
1293 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1294 (32 + x + 1), 1360 (32 + x + 1),
1295 (32 + y + 1)); 1361 (32 + y + 1));
1296} 1362}
1297 1363
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 */ 1364/*{{{ process an X event */
1309void 1365void
1310rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1311{ 1367{
1312 dDisp; 1368 make_current ();
1313 1369
1314 SET_R (this); 1370 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1371
1317#if defined(CURSOR_BLINK) 1372 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1375 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1376
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1377 // for XQueryPointer
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1380 unsigned int unused_mask;
1347 1381
1348 switch (ev.type) 1382 switch (ev.type)
1349 { 1383 {
1350 case KeyPress: 1384 case KeyPress:
1351#if ISO_14755 1385 key_press (ev.xkey);
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1354 lookup_key (ev.xkey);
1355
1356 break; 1386 break;
1357 1387
1358 case KeyRelease: 1388 case KeyRelease:
1359 { 1389 key_release (ev.xkey);
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1421 break;
1422
1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop ();
1426 else if (ks == XK_Control_L || ks == XK_Control_R)
1427 mouse_slip_wheel_speed = 0;
1428#endif
1429 break; 1390 break;
1430 }
1431 1391
1432 case ButtonPress: 1392 case ButtonPress:
1433 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1434 break; 1394 break;
1435 1395
… …
1437 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1438 break; 1398 break;
1439 1399
1440 case ClientMessage: 1400 case ClientMessage:
1441 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1442 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1443 { 1403 {
1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1405 {
1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1407 {
1444 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1409 {
1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1445 destroy (); 1411 destroy ();
1412 }
1446#if ENABLE_EWMH 1413#if ENABLE_EWMH
1447 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1448 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1449 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1450 &ev); 1417 &ev);
1418#endif
1419 }
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1451#endif 1429#endif
1452 } 1430 }
1453#if ENABLE_XEMBED
1454 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1455 {
1456 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1457 focus_in ();
1458 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1459 focus_out ();
1460 }
1461#endif
1462#ifdef OFFIX_DND
1463 /* OffiX Dnd (drag 'n' drop) protocol */
1464 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1465 && (ev.xclient.data.l[0] == DndFile
1466 || ev.xclient.data.l[0] == DndDir
1467 || ev.xclient.data.l[0] == DndLink))
1468 {
1469 /* Get Dnd data */
1470 Atom ActualType;
1471 int ActualFormat;
1472 unsigned char *data;
1473 unsigned long Size, RemainingBytes;
1474
1475 XGetWindowProperty (disp, display->root,
1476 xa[XA_DNDSELECTION],
1477 0L, 1000000L,
1478 False, AnyPropertyType,
1479 &ActualType, &ActualFormat,
1480 &Size, &RemainingBytes,
1481 &data);
1482 set_string_property (XA_CUT_BUFFER0, data);
1483 XFree (data);
1484 selection_paste (display->root, XA_CUT_BUFFER0, true);
1485 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1486 }
1487#endif /* OFFIX_DND */
1488 break; 1431 break;
1489 1432
1490 case MappingNotify: 1433 case MappingNotify:
1491 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1492 break; 1435 break;
… …
1515 break; 1458 break;
1516 } 1459 }
1517 break; 1460 break;
1518 1461
1519 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1520 focus_in (); 1466 focus_in ();
1521 break; 1467 break;
1522 1468
1523 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1524 focus_out (); 1473 focus_out ();
1525 break; 1474 break;
1526 1475
1527 case ConfigureNotify: 1476 case ConfigureNotify:
1528 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1529 { 1478 {
1530 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1531 ; 1480 ;
1532 1481
1533 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1534 { 1483 {
1535 seen_resize = 1; 1484 seen_resize = 1;
1536 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1537 } 1486 }
1538 1487
1539#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489
1490#ifdef TRANSPARENT
1540 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1541 check_our_parents (); 1492 check_our_parents ();
1542#endif 1493#endif
1543 } 1494 }
1544 break; 1495 break;
1545 1496
1546 case PropertyNotify: 1497 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1547 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1548 && ev.xproperty.state == PropertyNewValue) 1500 && ev.xproperty.state == PropertyNewValue)
1549 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1550 1502
1551 break; 1503 break;
1552 1504
1553 case SelectionClear: 1505 case SelectionClear:
1554 selection_clear (); 1506 selection_clear ();
… …
1559 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1560 break; 1512 break;
1561 1513
1562 case SelectionRequest: 1514 case SelectionRequest:
1563 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1516 break;
1517
1518 case MapNotify:
1519 mapped = 1;
1520#ifdef TEXT_BLINK
1521 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1522#endif
1523 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1564 break; 1524 break;
1565 1525
1566 case UnmapNotify: 1526 case UnmapNotify:
1567 mapped = 0; 1527 mapped = 0;
1568#ifdef TEXT_BLINK 1528#ifdef TEXT_BLINK
1569 text_blink_ev.stop (); 1529 text_blink_ev.stop ();
1570#endif 1530#endif
1571 break; 1531 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1572
1573 case MapNotify:
1574 mapped = 1;
1575#ifdef TEXT_BLINK
1576 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1577#endif
1578 break; 1532 break;
1579 1533
1580#ifdef TRANSPARENT 1534#ifdef TRANSPARENT
1581 case ReparentNotify: 1535 case ReparentNotify:
1582 rootwin_cb (ev); 1536 rootwin_cb (ev);
… …
1588 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1589 { 1543 {
1590 do 1544 do
1591 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1592 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1593 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1594 1548
1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1596 1550
1597 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1598 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1599 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1600 1554
1601 scr_refresh (refresh_type); 1555 want_refresh = 1;
1602 } 1556 }
1603 else 1557 else
1604 { 1558 {
1605 XEvent unused_event; 1559 XEvent unused_event;
1606 1560
1607 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1608 ; 1562 ;
1609 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1610 ; 1564 ;
1611 1565
1612 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1613 { 1567 {
1614 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1615 scrollbar_show (0); 1569 scrollbar_show (0);
1616 } 1570 }
1617#ifdef MENUBAR
1618 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1619 menubar_expose ();
1620#endif
1621 1571
1622#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1623 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1624 XClearWindow (disp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1625#endif 1575#endif
1626 } 1576 }
1627 break; 1577 break;
1628 1578
1629 case MotionNotify: 1579 case MotionNotify:
1630#ifdef POINTER_BLANK 1580#ifdef POINTER_BLANK
1631 if (hidden_pointer) 1581 if (hidden_pointer)
1632 pointer_unblank (); 1582 pointer_unblank ();
1633#endif 1583#endif
1634#if MENUBAR
1635 if (isMenuBarWindow (ev.xany.window))
1636 {
1637 menubar_control (ev.xbutton);
1638 break;
1639 }
1640#endif
1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1642 break; 1585 break;
1643 1586
1644 if (ev.xany.window == vt) 1587 if (ev.xany.window == vt)
1645 { 1588 {
1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop 1591 ; // nop
1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1649 { 1593 {
1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1651 ; 1595 ;
1652 1596
1653 XQueryPointer (disp, vt, 1597 XQueryPointer (dpy, vt,
1654 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1657 &ev.xbutton.state); 1601 &ev.xbutton.state);
1658#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1722#endif 1666#endif
1723 } 1667 }
1724 } 1668 }
1725 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1726 { 1670 {
1727 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1728 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1729 ; 1673 ;
1730 1674
1731 XQueryPointer (disp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1732 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1733 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1734 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1735 &unused_mask); 1679 &unused_mask);
1736 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1737 scrollbar_size ()); 1681 scrollbar_size ());
1738 scr_refresh (refresh_type); 1682 want_refresh = 1;
1739 refresh_limit = 0; 1683 refresh_limit = 0;
1740 scrollbar_show (1); 1684 scrollbar_show (1);
1741 } 1685 }
1742 break; 1686 break;
1743 } 1687 }
1688
1689#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 }
1700#endif
1701
1702#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 {
1705 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease)
1708 if (hidden_pointer)
1709 pointer_unblank ();
1710
1711 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank ();
1713 }
1714#endif
1744} 1715}
1745 1716
1746void 1717void
1747rxvt_term::focus_in () 1718rxvt_term::focus_in ()
1748{ 1719{
1749 if (!focus) 1720 if (!focus)
1750 { 1721 {
1751 focus = 1; 1722 focus = 1;
1752 want_refresh = 1; 1723 want_refresh = 1;
1753 1724
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1755 1726
1756#if USE_XIM 1727#if USE_XIM
1757 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1758 { 1729 {
1759 IMSetStatusPosition (); 1730 IMSetPosition ();
1760 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1761 } 1732 }
1762#endif 1733#endif
1763#if CURSOR_BLINK 1734#if CURSOR_BLINK
1764 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1765 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1766#endif 1737#endif
1767#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1769 { 1740 {
1770 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
… …
1796#if USE_XIM 1767#if USE_XIM
1797 if (Input_Context != NULL) 1768 if (Input_Context != NULL)
1798 XUnsetICFocus (Input_Context); 1769 XUnsetICFocus (Input_Context);
1799#endif 1770#endif
1800#if CURSOR_BLINK 1771#if CURSOR_BLINK
1801 if (OPTION (Opt_cursorBlink)) 1772 if (option (Opt_cursorBlink))
1802 cursor_blink_ev.stop (); 1773 cursor_blink_ev.stop ();
1803 hidden_cursor = 0; 1774 hidden_cursor = 0;
1804#endif 1775#endif
1805#if OFF_FOCUS_FADING 1776#if OFF_FOCUS_FADING
1806 if (rs[Rs_fade]) 1777 if (rs[Rs_fade])
… …
1810 } 1781 }
1811#endif 1782#endif
1812 } 1783 }
1813} 1784}
1814 1785
1815#if TRANSPARENT 1786void
1787rxvt_term::update_fade_color (unsigned int idx)
1788{
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1791 {
1792 rgba c;
1793 pix_colors [Color_fade].get (c);
1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1795 }
1796#endif
1797}
1798
1799#if TRANSPARENT || ENABLE_PERL
1816void 1800void
1817rxvt_term::rootwin_cb (XEvent &ev) 1801rxvt_term::rootwin_cb (XEvent &ev)
1818{ 1802{
1819 SET_R (this); 1803 make_current ();
1820 SET_LOCALE (locale);
1821 1804
1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1807 return;
1808
1809# if TRANSPARENT
1822 switch (ev.type) 1810 switch (ev.type)
1823 { 1811 {
1824 case PropertyNotify: 1812 case PropertyNotify:
1825 /* 1813 /*
1826 * if user used some Esetroot compatible prog to set the root bg, 1814 * if user used some Esetroot compatible prog to set the root bg,
… …
1830 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1831 return; 1819 return;
1832 1820
1833 /* FALLTHROUGH */ 1821 /* FALLTHROUGH */
1834 case ReparentNotify: 1822 case ReparentNotify:
1835 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1823 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1836 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1837 break; 1825 break;
1838 } 1826 }
1827# endif
1839} 1828}
1840#endif 1829#endif
1841 1830
1842void 1831void
1843rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
1852 /* 1841 /*
1853 * VT window processing of button press 1842 * VT window processing of button press
1854 */ 1843 */
1855 if (ev.window == vt) 1844 if (ev.window == vt)
1856 { 1845 {
1846 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1847 return;
1848
1857#if ISO_14755 1849#if ISO_14755
1858 // 5.4 1850 // 5.4
1859 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1860 { 1852 {
1861 iso14755_54 (ev.x, ev.y); 1853 iso14755_54 (ev.x, ev.y);
… …
1903 else 1895 else
1904 { 1896 {
1905 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
1906 MEvent.clicks = 0; 1898 MEvent.clicks = 0;
1907 1899
1908 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1909 switch (ev.button) 1900 switch (ev.button)
1910 { 1901 {
1911 case Button1: 1902 case Button1:
1912 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1913 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1914#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1915 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1916#else 1907#else
1917 selection.rect = false; 1908 selection.rect = false;
1918#endif 1909#endif
1919 1910
1920 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1921 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1922 { 1913 {
1923 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1924 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1925 else 1916 else
1926 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1927 } 1918 }
1928 else 1919 else
1929 { 1920 {
1930 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1931 MEvent.clicks++; 1922 MEvent.clicks++;
1932 else 1923 else
1933 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1934 1925
1935 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1936 } 1927 }
1937 1928
1938 MEvent.button = Button1; 1929 MEvent.button = Button1;
1939 break; 1930 break;
1940 1931
1941 case Button3: 1932 case Button3:
1942 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1943 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1944 else 1935 else
1945 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1946 1937
1947 MEvent.button = Button3; 1938 MEvent.button = Button3;
1948 break; 1939 break;
1949 } 1940 }
1950 } 1941 }
1951 1942
1952 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1953 return; 1944 return;
1954 } 1945 }
1955 1946
… …
2094 } 2085 }
2095 } 2086 }
2096 2087
2097 return; 2088 return;
2098 } 2089 }
2099
2100#if MENUBAR
2101 /*
2102 * Menubar window processing of button press
2103 */
2104 if (isMenuBarWindow (ev.window))
2105 menubar_control (ev);
2106#endif
2107} 2090}
2108 2091
2109void 2092void
2110rxvt_term::button_release (XButtonEvent &ev) 2093rxvt_term::button_release (XButtonEvent &ev)
2111{ 2094{
… …
2117 2100
2118 if (scrollbar_isUpDn ()) 2101 if (scrollbar_isUpDn ())
2119 { 2102 {
2120 scrollBar.setIdle (); 2103 scrollBar.setIdle ();
2121 scrollbar_show (0); 2104 scrollbar_show (0);
2122#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2123 refresh_type &= ~SMOOTH_REFRESH;
2124#endif
2125 } 2105 }
2126 2106
2127#ifdef SELECTION_SCROLLING 2107#ifdef SELECTION_SCROLLING
2128 if (sel_scroll_ev.active) 2108 if (sel_scroll_ev.active)
2129 sel_scroll_ev.stop(); 2109 sel_scroll_ev.stop();
2130#endif 2110#endif
2131 2111
2132 if (ev.window == vt) 2112 if (ev.window == vt)
2133 { 2113 {
2114 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2115 return;
2116
2134#if ISO_14755 2117#if ISO_14755
2135 // 5.4 2118 // 5.4
2136 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2119 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2137 return; 2120 return;
2138#endif 2121#endif
2122
2139 if (reportmode) 2123 if (reportmode)
2140 { 2124 {
2141 /* mouse report from vt window */ 2125 /* mouse report from vt window */
2142 /* don't report release of wheel "buttons" */ 2126 /* don't report release of wheel "buttons" */
2143 if (ev.button >= 4) 2127 if (ev.button >= 4)
… …
2167 if (priv_modes & PrivMode_mouse_report 2151 if (priv_modes & PrivMode_mouse_report
2168 && bypass_keystate 2152 && bypass_keystate
2169 && ev.button == Button1 && MEvent.clicks <= 1) 2153 && ev.button == Button1 && MEvent.clicks <= 1)
2170 selection_extend (ev.x, ev.y, 0); 2154 selection_extend (ev.x, ev.y, 0);
2171 2155
2172 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2173 return;
2174
2175 switch (ev.button) 2156 switch (ev.button)
2176 { 2157 {
2177 case Button1: 2158 case Button1:
2178 case Button3: 2159 case Button3:
2179 selection_make (ev.time); 2160 selection_make (ev.time);
2180 break; 2161 break;
2162
2181 case Button2: 2163 case Button2:
2182 selection_request (ev.time, ev.x, ev.y); 2164 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2165 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2183 break; 2166 break;
2167
2184#ifdef MOUSE_WHEEL 2168#ifdef MOUSE_WHEEL
2185 case Button4: 2169 case Button4:
2186 case Button5: 2170 case Button5:
2187 { 2171 {
2188 int i; 2172 int i;
… …
2190 2174
2191 v = ev.button == Button4 ? UP : DN; 2175 v = ev.button == Button4 ? UP : DN;
2192 2176
2193 if (ev.state & ShiftMask) 2177 if (ev.state & ShiftMask)
2194 i = 1; 2178 i = 1;
2195 else if (OPTION (Opt_mouseWheelScrollPage)) 2179 else if (option (Opt_mouseWheelScrollPage))
2196 i = nrow - 1; 2180 i = nrow - 1;
2197 else 2181 else
2198 i = 5; 2182 i = 5;
2199 2183
2200# ifdef MOUSE_SLIP_WHEELING 2184# ifdef MOUSE_SLIP_WHEELING
… …
2210 slip_wheel_ev.start (); 2194 slip_wheel_ev.start ();
2211 } 2195 }
2212 else 2196 else
2213 { 2197 {
2214# endif 2198# endif
2215# ifdef JUMP_MOUSE_WHEEL
2216 scr_page (v, i); 2199 scr_page (v, i);
2217 scr_refresh (SMOOTH_REFRESH);
2218 scrollbar_show (1); 2200 scrollbar_show (1);
2219# else
2220 while (i--)
2221 {
2222 scr_page (v, 1);
2223 scr_refresh (SMOOTH_REFRESH);
2224 scrollbar_show (1);
2225 }
2226# endif
2227# ifdef MOUSE_SLIP_WHEELING 2201# ifdef MOUSE_SLIP_WHEELING
2228 } 2202 }
2229#endif 2203# endif
2230 } 2204 }
2231 break; 2205 break;
2232#endif 2206#endif
2233 } 2207 }
2234 } 2208 }
2235#ifdef MENUBAR
2236 else if (isMenuBarWindow (ev.window))
2237 menubar_control (ev);
2238#endif
2239} 2209}
2240 2210
2241#ifdef TRANSPARENT 2211#ifdef TRANSPARENT
2242#if TINTING 2212#if TINTING
2243/* taken from aterm-0.4.2 */ 2213/* taken from aterm-0.4.2 */
2244 2214
2245typedef uint32_t RUINT32T; 2215typedef uint32_t RUINT32T;
2246 2216
2247void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2217void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2248{ 2218{
2249 int sh_r, sh_g, sh_b; 2219 int sh_r, sh_g, sh_b;
2250 RUINT32T mask_r, mask_g, mask_b; 2220 RUINT32T mask_r, mask_g, mask_b;
2251 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2252 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2253 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2254 int i; 2224 int i;
2255 2225
2256 Visual *visual = display->visual; 2226 Visual *visual = term->visual;
2257 2227
2258 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2259 2229
2260 /* for convenience */ 2230 /* for convenience */
2261 mask_r = visual->red_mask; 2231 mask_r = visual->red_mask;
… …
2482 Atom atype; 2452 Atom atype;
2483 unsigned char *prop = NULL; 2453 unsigned char *prop = NULL;
2484 Window root, oldp, *list; 2454 Window root, oldp, *list;
2485 Pixmap rootpixmap = None; 2455 Pixmap rootpixmap = None;
2486 XWindowAttributes wattr, wrootattr; 2456 XWindowAttributes wattr, wrootattr;
2487 dDisp;
2488 2457
2489 pchanged = 0; 2458 pchanged = 0;
2490 2459
2491 if (!OPTION (Opt_transparent)) 2460 if (!option (Opt_transparent))
2492 return pchanged; /* Don't try any more */ 2461 return pchanged; /* Don't try any more */
2493 2462
2494 XGetWindowAttributes (disp, display->root, &wrootattr); 2463 XGetWindowAttributes (dpy, display->root, &wrootattr);
2495 rootdepth = wrootattr.depth; 2464 rootdepth = wrootattr.depth;
2496 2465
2497 XGetWindowAttributes (disp, parent[0], &wattr); 2466 XGetWindowAttributes (dpy, parent[0], &wattr);
2498 2467
2499 if (rootdepth != wattr.depth) 2468 if (rootdepth != wattr.depth)
2500 { 2469 {
2501 if (am_transparent) 2470 if (am_transparent)
2502 { 2471 {
2503 pchanged = 1; 2472 pchanged = 1;
2504 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2473 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2505 am_transparent = am_pixmap_trans = 0; 2474 am_transparent = am_pixmap_trans = 0;
2506 } 2475 }
2507 2476
2508 return pchanged; /* Don't try any more */ 2477 return pchanged; /* Don't try any more */
2509 } 2478 }
2510 2479
2511 /* Get all X ops out of the queue so that our information is up-to-date. */ 2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2512 XSync (disp, False); 2481 XSync (dpy, False);
2513 2482
2514 /* 2483 /*
2515 * Make the frame window set by the window manager have 2484 * Make the frame window set by the window manager have
2516 * the root background. Some window managers put multiple nested frame 2485 * the root background. Some window managers put multiple nested frame
2517 * windows for each client, so we have to take care about that. 2486 * windows for each client, so we have to take care about that.
2518 */ 2487 */
2519 i = (xa[XA_XROOTPMAP_ID] 2488 i = (xa[XA_XROOTPMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2523 2492
2524 if (!i || prop == NULL) 2493 if (!i || prop == NULL)
2525 i = (xa[XA_ESETROOT_PMAP_ID] 2494 i = (xa[XA_ESETROOT_PMAP_ID]
2526 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2495 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2527 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2528 &nitems, &bytes_after, &prop) == Success); 2497 &nitems, &bytes_after, &prop) == Success);
2529 2498
2530 if (!i || prop == NULL 2499 if (!i || prop == NULL
2531#if TINTING 2500#if TINTING
2532 || !rs[Rs_color + Color_tint] 2501 || !ISSET_PIXCOLOR (Color_tint)
2533#endif 2502#endif
2534 ) 2503 )
2535 have_pixmap = 0; 2504 have_pixmap = 0;
2536 else 2505 else
2537 { 2506 {
… …
2550 Window cr; 2519 Window cr;
2551 XImage *image; 2520 XImage *image;
2552 GC gc; 2521 GC gc;
2553 XGCValues gcvalue; 2522 XGCValues gcvalue;
2554 2523
2555 XTranslateCoordinates (disp, parent[0], display->root, 2524 XTranslateCoordinates (dpy, parent[0], display->root,
2556 0, 0, &sx, &sy, &cr); 2525 0, 0, &sx, &sy, &cr);
2557 nw = (unsigned int)szHint.width; 2526 nw = (unsigned int)szHint.width;
2558 nh = (unsigned int)szHint.height; 2527 nh = (unsigned int)szHint.height;
2559 nx = ny = 0; 2528 nx = ny = 0;
2560 2529
… …
2573 } 2542 }
2574 2543
2575 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2576 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2577 2546
2578 XSync (disp, False); 2547 XSync (dpy, False);
2579 allowedxerror = -1; 2548 allowedxerror = -1;
2580 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2549 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2581 2550
2582 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2583 /* XXX: may need a delay here? */ 2552 /* XXX: may need a delay here? */
2584 allowedxerror = 0; 2553 allowedxerror = 0;
2585 2554
… …
2588 if (am_transparent && am_pixmap_trans) 2557 if (am_transparent && am_pixmap_trans)
2589 { 2558 {
2590 pchanged = 1; 2559 pchanged = 1;
2591 if (pixmap != None) 2560 if (pixmap != None)
2592 { 2561 {
2593 XFreePixmap (disp, pixmap); 2562 XFreePixmap (dpy, pixmap);
2594 pixmap = None; 2563 pixmap = None;
2595 } 2564 }
2596 } 2565 }
2597 2566
2598 am_pixmap_trans = 0; 2567 am_pixmap_trans = 0;
2599 } 2568 }
2600 else 2569 else
2601 { 2570 {
2602 if (pixmap != None) 2571 if (pixmap != None)
2603 XFreePixmap (disp, pixmap); 2572 XFreePixmap (dpy, pixmap);
2604 2573
2605#if TINTING 2574#if TINTING
2606 if (ISSET_PIXCOLOR (Color_tint)) 2575 if (ISSET_PIXCOLOR (Color_tint))
2607 { 2576 {
2608 unsigned short rm, gm, bm;
2609 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2577 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2610 2578
2579 rgba c;
2611 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2580 pix_colors_focused [Color_tint].get (c);
2612 2581
2613 ShadeXImage (display, image, shade, rm, gm, bm); 2582 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2614 } 2583 }
2615#endif 2584#endif
2616 2585
2617 pixmap = XCreatePixmap (disp, vt, 2586 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2618 szHint.width, szHint.height, image->depth);
2619 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2587 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2620 XPutImage (disp, pixmap, gc, image, 0, 0, 2588 XPutImage (dpy, pixmap, gc, image, 0, 0,
2621 nx, ny, image->width, image->height); 2589 nx, ny, image->width, image->height);
2622 XFreeGC (disp, gc); 2590 XFreeGC (dpy, gc);
2623 XDestroyImage (image); 2591 XDestroyImage (image);
2624 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2592 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2625 XClearWindow (disp, parent[0]); 2593 XClearWindow (dpy, parent[0]);
2626 2594
2627 if (!am_transparent || !am_pixmap_trans) 2595 if (!am_transparent || !am_pixmap_trans)
2628 pchanged = 1; 2596 pchanged = 1;
2629 2597
2630 am_transparent = am_pixmap_trans = 1; 2598 am_transparent = am_pixmap_trans = 1;
2631 } 2599 }
2632 } 2600 }
2633 2601
2634 if (am_pixmap_trans) 2602 if (am_pixmap_trans)
2635 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2603 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2636 else 2604 else
2637 { 2605 {
2638 unsigned int n; 2606 unsigned int n;
2639 /* 2607 /*
2640 * InheritPixmap transparency 2608 * InheritPixmap transparency
2641 */ 2609 */
2642 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2610 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2643 { 2611 {
2644 oldp = parent[i]; 2612 oldp = parent[i];
2645 XQueryTree (disp, parent[i - 1], &root, 2613 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2646 &parent[i], &list, &n);
2647 XFree (list); 2614 XFree (list);
2648 2615
2649 if (parent[i] == display->root) 2616 if (parent[i] == display->root)
2650 { 2617 {
2651 if (oldp != None) 2618 if (oldp != None)
… …
2659 } 2626 }
2660 2627
2661 n = 0; 2628 n = 0;
2662 2629
2663 if (pchanged) 2630 if (pchanged)
2664 {
2665 for (; n < (unsigned int)i; n++) 2631 for (; n < (unsigned int)i; n++)
2666 { 2632 {
2667 XGetWindowAttributes (disp, parent[n], &wattr); 2633 XGetWindowAttributes (dpy, parent[n], &wattr);
2634
2668 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2635 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2669 { 2636 {
2670 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2637 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2671 break; 2638 break;
2672 } 2639 }
2673 } 2640 }
2674 }
2675 2641
2676 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2642 if (n > (sizeof (parent) / sizeof (parent[0])))
2677 { 2643 {
2678 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2644 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2679 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2645 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2680 am_transparent = 0; 2646 am_transparent = 0;
2681 /* XXX: also turn off Opt_transparent? */ 2647 /* XXX: also turn off Opt_transparent? */
2682 } 2648 }
2683 else 2649 else
2684 { 2650 {
2685#if WAIT_FOR_WM
2686 /* wait (an arbitrary period) for the WM to do its thing
2687 * needed for fvwm2.2.2 (and before?) */
2688 sleep (1);
2689#endif
2690 for (n = 0; n < (unsigned int)i; n++) 2651 for (n = 0; n < (unsigned int)i; n++)
2691 { 2652 {
2692 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2693 XClearWindow (disp, parent[n]); 2654 XClearWindow (dpy, parent[n]);
2694 } 2655 }
2695 2656
2696 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2657 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2697 am_transparent = 1; 2658 am_transparent = 1;
2698 } 2659 }
2699 2660
2700 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2661 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2701 parent[i] = None; 2662 parent[i] = None;
2702 } 2663 }
2703 2664
2704 if (scrollBar.win) 2665 if (scrollBar.win)
2705 { 2666 {
2706 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2667 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2707 scrollBar.setIdle (); 2668 scrollBar.setIdle ();
2708 scrollbar_show (0); 2669 scrollbar_show (0);
2709 } 2670 }
2710 2671
2711 if (am_transparent) 2672 if (am_transparent)
… …
2723 2684
2724bool 2685bool
2725rxvt_term::cmd_parse () 2686rxvt_term::cmd_parse ()
2726{ 2687{
2727 bool flag = false; 2688 bool flag = false;
2728 unicode_t ch = NOCHAR; 2689 wchar_t ch = NOCHAR;
2729 char *seq_begin; // remember start of esc-sequence here 2690 char *seq_begin; // remember start of esc-sequence here
2730 2691
2731 for (;;) 2692 for (;;)
2732 { 2693 {
2733 if (ch == NOCHAR) 2694 if (ch == NOCHAR)
… …
2754 if (seen_resize && cmd_pid) 2715 if (seen_resize && cmd_pid)
2755 kill (-cmd_pid, SIGWINCH); 2716 kill (-cmd_pid, SIGWINCH);
2756 } 2717 }
2757 2718
2758 /* Read a text string from the input buffer */ 2719 /* Read a text string from the input buffer */
2759 unicode_t buf[UBUFSIZ]; 2720 wchar_t buf[UBUFSIZ];
2760 bool refreshnow = false; 2721 bool refreshnow = false;
2761 int nlines = 0; 2722 int nlines = 0;
2762 unicode_t *str = buf; 2723 wchar_t *str = buf;
2763 unicode_t *eol = str + min (ncol, UBUFSIZ); 2724 wchar_t *eol = str + min (ncol, UBUFSIZ);
2764 2725
2765 for (;;) 2726 for (;;)
2766 { 2727 {
2767 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2728 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2768 break; 2729 break;
… …
2774 if (ch == C0_LF) 2735 if (ch == C0_LF)
2775 nlines++; 2736 nlines++;
2776 2737
2777 refresh_count++; 2738 refresh_count++;
2778 2739
2779 if (!OPTION (Opt_jumpScroll) 2740 if (!option (Opt_jumpScroll)
2780 || (refresh_count >= refresh_limit * (nrow - 1))) 2741 || (refresh_count >= refresh_limit * (nrow - 1)))
2781 { 2742 {
2782 refreshnow = true; 2743 refreshnow = true;
2783 refresh_count = 0; 2744 refresh_count = 0;
2784 ch = NOCHAR; 2745 ch = NOCHAR;
… …
2786 } 2747 }
2787 2748
2788 // scr_add_lines only works for nlines <= nrow - 1. 2749 // scr_add_lines only works for nlines <= nrow - 1.
2789 if (nlines >= nrow - 1) 2750 if (nlines >= nrow - 1)
2790 { 2751 {
2752 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2753 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2792 scr_add_lines (buf, nlines, str - buf); 2754 scr_add_lines (buf, str - buf, nlines);
2793 2755
2794 nlines = 0; 2756 nlines = 0;
2795 str = buf; 2757 str = buf;
2796 eol = str + min (ncol, UBUFSIZ); 2758 eol = str + min (ncol, UBUFSIZ);
2797 } 2759 }
… …
2811 2773
2812 seq_begin = cmdbuf_ptr; 2774 seq_begin = cmdbuf_ptr;
2813 ch = next_char (); 2775 ch = next_char ();
2814 } 2776 }
2815 2777
2778 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2779 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2817 scr_add_lines (buf, nlines, str - buf); 2780 scr_add_lines (buf, str - buf, nlines);
2818 2781
2819 /* 2782 /*
2820 * If there have been a lot of new lines, then update the screen 2783 * If there have been a lot of new lines, then update the screen
2821 * What the heck I'll cheat and only refresh less than every page-full. 2784 * What the heck I'll cheat and only refresh less than every page-full.
2822 * the number of pages between refreshes is refresh_limit, which 2785 * the number of pages between refreshes is refresh_limit, which
2823 * is incremented here because we must be doing flat-out scrolling. 2786 * is incremented here because we must be doing flat-out scrolling.
2824 */ 2787 */
2825 if (refreshnow) 2788 if (refreshnow)
2826 { 2789 {
2827 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2790 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2828 refresh_limit++; 2791 refresh_limit++;
2829 else 2792 else
2830 { 2793 {
2831 flag = true; 2794 flag = true;
2795 //TODO: due to popular request, implement "skipscroll" option here
2832 scr_refresh (refresh_type); 2796 scr_refresh ();
2833 flush_ev.stop (); 2797 want_refresh = 1;
2834 } 2798 }
2835 } 2799 }
2836 2800
2837 } 2801 }
2838 else 2802 else
… …
2853 } 2817 }
2854 2818
2855 return flag; 2819 return flag;
2856} 2820}
2857 2821
2858// read the next octet
2859unicode_t
2860rxvt_term::next_octet ()
2861{
2862 return cmdbuf_ptr < cmdbuf_endp
2863 ? *cmdbuf_ptr++
2864 : NOCHAR;
2865}
2866
2867// read the next character 2822// read the next character
2868unicode_t 2823wchar_t
2869rxvt_term::next_char () 2824rxvt_term::next_char () NOTHROW
2870{ 2825{
2871 while (cmdbuf_ptr < cmdbuf_endp) 2826 while (cmdbuf_ptr < cmdbuf_endp)
2872 { 2827 {
2873 // assume 7-bit to be ascii ALWAYS 2828 // assume 7-bit to be ascii ALWAYS
2874 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2829 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2883 cmdbuf_ptr = cmdbuf_endp; 2838 cmdbuf_ptr = cmdbuf_endp;
2884 break; 2839 break;
2885 } 2840 }
2886 2841
2887 if (len == (size_t)-1) 2842 if (len == (size_t)-1)
2888 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2843 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2889 2844
2890 // assume wchar == unicode 2845 // assume wchar == unicode
2891 cmdbuf_ptr += len; 2846 cmdbuf_ptr += len;
2892 return wc & UNICODE_MASK; 2847 return wc & UNICODE_MASK;
2893 } 2848 }
2894 2849
2895 return NOCHAR; 2850 return NOCHAR;
2896} 2851}
2852
2853// read the next octet
2854uint32_t
2855rxvt_term::next_octet () NOTHROW
2856{
2857 return cmdbuf_ptr < cmdbuf_endp
2858 ? (unsigned char)*cmdbuf_ptr++
2859 : NOCHAR;
2860}
2861
2862static class out_of_input out_of_input;
2897 2863
2898/* rxvt_cmd_getc () - Return next input character */ 2864/* rxvt_cmd_getc () - Return next input character */
2899/* 2865/*
2900 * Return the next input character after first passing any keyboard input 2866 * Return the next input character after first passing any keyboard input
2901 * to the command. 2867 * to the command.
2902 */ 2868 */
2903unicode_t 2869wchar_t
2904rxvt_term::cmd_getc () 2870rxvt_term::cmd_getc () THROW ((class out_of_input))
2905{ 2871{
2906 unicode_t c = next_char (); 2872 wchar_t c = next_char ();
2907 2873
2908 if (c == NOCHAR) 2874 if (c == NOCHAR)
2909 throw out_of_input; 2875 throw out_of_input;
2910 2876
2911 return c; 2877 return c;
2912} 2878}
2913 2879
2914unicode_t 2880uint32_t
2915rxvt_term::cmd_get8 () 2881rxvt_term::cmd_get8 () THROW ((class out_of_input))
2916{ 2882{
2917 unicode_t c = next_octet (); 2883 uint32_t c = next_octet ();
2918 2884
2919 if (c == NOCHAR) 2885 if (c == NOCHAR)
2920 throw out_of_input; 2886 throw out_of_input;
2921 2887
2922 return c; 2888 return c;
… …
3158 scr_charset_set (2, (unsigned int)cmd_getc ()); 3124 scr_charset_set (2, (unsigned int)cmd_getc ());
3159 break; 3125 break;
3160 case '+': 3126 case '+':
3161 scr_charset_set (3, (unsigned int)cmd_getc ()); 3127 scr_charset_set (3, (unsigned int)cmd_getc ());
3162 break; 3128 break;
3163#if ENABLE_FRILLS 3129#if !ENABLE_MINIMAL
3164 case '6': 3130 case '6':
3165 scr_backindex (); 3131 scr_backindex ();
3166 break; 3132 break;
3167#endif 3133#endif
3168 case '7': 3134 case '7':
3169 scr_cursor (SAVE); 3135 scr_cursor (SAVE);
3170 break; 3136 break;
3171 case '8': 3137 case '8':
3172 scr_cursor (RESTORE); 3138 scr_cursor (RESTORE);
3173 break; 3139 break;
3174#if ENABLE_FRILLS 3140#if !ENABLE_MINIMAL
3175 case '9': 3141 case '9':
3176 scr_forwardindex (); 3142 scr_forwardindex ();
3177 break; 3143 break;
3178#endif 3144#endif
3179 case '=': 3145 case '=':
… …
3189 break; 3155 break;
3190 3156
3191 /* 8.3.87: NEXT LINE */ 3157 /* 8.3.87: NEXT LINE */
3192 case C1_NEL: /* ESC E */ 3158 case C1_NEL: /* ESC E */
3193 { 3159 {
3194 unicode_t nlcr[] = { C0_LF, C0_CR }; 3160 wchar_t nlcr[] = { C0_LF, C0_CR };
3195 scr_add_lines (nlcr, 1, 2); 3161 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3196 } 3162 }
3197 break; 3163 break;
3198 3164
3199 /* kidnapped escape sequence: Should be 8.3.48 */ 3165 /* kidnapped escape sequence: Should be 8.3.48 */
3200 case C1_ESA: /* ESC G */ 3166 case C1_ESA: /* ESC G */
… …
3341 ndef = get_byte_array_bit (csi_defaults, i); 3307 ndef = get_byte_array_bit (csi_defaults, i);
3342 for (p = 0; p < nargs; p++) 3308 for (p = 0; p < nargs; p++)
3343 if (arg[p] == -1) 3309 if (arg[p] == -1)
3344 arg[p] = ndef; 3310 arg[p] = ndef;
3345 3311
3346#ifdef DEBUG_CMD
3347 fprintf (stderr, "CSI ");
3348 for (p = 0; p < nargs; p++)
3349 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3350 fprintf (stderr, "%c\n", ch);
3351#endif
3352
3353 /* 3312 /*
3354 * private mode handling 3313 * private mode handling
3355 */ 3314 */
3356 if (priv) 3315 if (priv)
3357 { 3316 {
3358 switch (priv) 3317 switch (priv)
3359 { 3318 {
3360 case '>': 3319 case '>':
3361 if (ch == CSI_DA) /* secondary device attributes */ 3320 if (ch == CSI_DA) /* secondary device attributes */
3362 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3321 {
3322 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3323 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3324 //
3325 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3326 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3327 // that we do not support xterm mouse reporting (should be 95 when we do).
3328 //
3329 tt_printf ("\033[>%d;94;0c", 'U');
3330 }
3363 break; 3331 break;
3364 case '?': 3332 case '?':
3365 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3333 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3366 process_terminal_mode (ch, priv, nargs, arg); 3334 process_terminal_mode (ch, priv, nargs, arg);
3367 break; 3335 break;
… …
3493 break; 3461 break;
3494 case 6: /* CPR requested */ 3462 case 6: /* CPR requested */
3495 scr_report_position (); 3463 scr_report_position ();
3496 break; 3464 break;
3497 case 7: /* unofficial extension */ 3465 case 7: /* unofficial extension */
3498 if (OPTION (Opt_insecure)) 3466 if (option (Opt_insecure))
3499 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3467 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3500 break; 3468 break;
3501 case 8: /* unofficial extension */ 3469 case 8: /* unofficial extension */
3502 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3470 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3503 break; 3471 break;
… …
3570 break; 3538 break;
3571 case CSI_75: 3539 case CSI_75:
3572 scr_cursor (RESTORE); 3540 scr_cursor (RESTORE);
3573 break; 3541 break;
3574 3542
3575#if ENABLE_FRILLS 3543#if !ENABLE_MINIMAL
3576 case CSI_74: 3544 case CSI_74:
3577 process_window_ops (arg, nargs); 3545 process_window_ops (arg, nargs);
3578 break; 3546 break;
3579#endif 3547#endif
3580 3548
… …
3587 break; 3555 break;
3588 } 3556 }
3589} 3557}
3590/*}}} */ 3558/*}}} */
3591 3559
3592#if ENABLE_FRILLS 3560#if !ENABLE_MINIMAL
3593/* ARGSUSED */ 3561/* ARGSUSED */
3594void 3562void
3595rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3563rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3596{ 3564{
3597 int x, y; 3565 int x, y;
3598 XWindowAttributes wattr; 3566 XWindowAttributes wattr;
3599 Window wdummy; 3567 Window wdummy;
3600 dDisp; 3568
3569 dLocal (Display *, dpy);
3601 3570
3602 if (nargs == 0) 3571 if (nargs == 0)
3603 return; 3572 return;
3604 3573
3605 switch (args[0]) 3574 switch (args[0])
3606 { 3575 {
3607 /* 3576 /*
3608 * commands 3577 * commands
3609 */ 3578 */
3610 case 1: /* deiconify window */ 3579 case 1: /* deiconify window */
3611 XMapWindow (disp, parent[0]); 3580 XMapWindow (dpy, parent[0]);
3612 break; 3581 break;
3613 case 2: /* iconify window */ 3582 case 2: /* iconify window */
3614 XIconifyWindow (disp, parent[0], display->screen); 3583 XIconifyWindow (dpy, parent[0], display->screen);
3615 break; 3584 break;
3616 case 3: /* set position (pixels) */ 3585 case 3: /* set position (pixels) */
3617 XMoveWindow (disp, parent[0], args[1], args[2]); 3586 XMoveWindow (dpy, parent[0], args[1], args[2]);
3618 break; 3587 break;
3619 case 4: /* set size (pixels) */ 3588 case 4: /* set size (pixels) */
3620 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3621 break; 3590 break;
3622 case 5: /* raise window */ 3591 case 5: /* raise window */
3623 XRaiseWindow (disp, parent[0]); 3592 XRaiseWindow (dpy, parent[0]);
3624 break; 3593 break;
3625 case 6: /* lower window */ 3594 case 6: /* lower window */
3626 XLowerWindow (disp, parent[0]); 3595 XLowerWindow (dpy, parent[0]);
3627 break; 3596 break;
3628 case 7: /* refresh window */ 3597 case 7: /* refresh window */
3629 scr_touch (true); 3598 scr_touch (true);
3630 break; 3599 break;
3631 case 8: /* set size (chars) */ 3600 case 8: /* set size (chars) */
… …
3638 if (args[0] >= 24) /* set height (chars) */ 3607 if (args[0] >= 24) /* set height (chars) */
3639 set_widthheight ((unsigned int)width, 3608 set_widthheight ((unsigned int)width,
3640 (unsigned int) (args[1] * fheight)); 3609 (unsigned int) (args[1] * fheight));
3641 break; 3610 break;
3642 3611
3643
3644 /* 3612 /*
3645 * reports - some output format copied from XTerm 3613 * reports - some output format copied from XTerm
3646 */ 3614 */
3647 case 11: /* report window state */ 3615 case 11: /* report window state */
3648 XGetWindowAttributes (disp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3649 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3617 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3650 break; 3618 break;
3651 case 13: /* report window position */ 3619 case 13: /* report window position */
3652 XGetWindowAttributes (disp, parent[0], &wattr); 3620 XGetWindowAttributes (dpy, parent[0], &wattr);
3653 XTranslateCoordinates (disp, parent[0], wattr.root, 3621 XTranslateCoordinates (dpy, parent[0], wattr.root,
3654 -wattr.border_width, -wattr.border_width, 3622 -wattr.border_width, -wattr.border_width,
3655 &x, &y, &wdummy); 3623 &x, &y, &wdummy);
3656 tt_printf ("\033[3;%d;%dt", x, y); 3624 tt_printf ("\033[3;%d;%dt", x, y);
3657 break; 3625 break;
3658 case 14: /* report window size (pixels) */ 3626 case 14: /* report window size (pixels) */
3659 XGetWindowAttributes (disp, parent[0], &wattr); 3627 XGetWindowAttributes (dpy, parent[0], &wattr);
3660 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3628 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3661 break; 3629 break;
3662 case 18: /* report text area size (chars) */ 3630 case 18: /* report text area size (chars) */
3663 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3631 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3664 break; 3632 break;
… …
3666 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3634 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3667 break; 3635 break;
3668 case 20: /* report icon label */ 3636 case 20: /* report icon label */
3669 { 3637 {
3670 char *s; 3638 char *s;
3671 XGetIconName (disp, parent[0], &s); 3639 XGetIconName (dpy, parent[0], &s);
3672 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3640 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3673 XFree (s); 3641 XFree (s);
3674 } 3642 }
3675 break; 3643 break;
3676 case 21: /* report window title */ 3644 case 21: /* report window title */
3677 { 3645 {
3678 char *s; 3646 char *s;
3679 XFetchName (disp, parent[0], &s); 3647 XFetchName (dpy, parent[0], &s);
3680 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3648 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3681 XFree (s); 3649 XFree (s);
3682 } 3650 }
3683 break; 3651 break;
3684 } 3652 }
3685} 3653}
… …
3712 seen_esc = true; 3680 seen_esc = true;
3713 continue; 3681 continue;
3714 } 3682 }
3715 else if (ch == C0_BEL || ch == CHAR_ST) 3683 else if (ch == C0_BEL || ch == CHAR_ST)
3716 break; 3684 break;
3685 else if (ch == C0_SYN)
3686 ch = cmd_get8 ();
3717 else if (ch < 0x20) 3687 else if (ch < 0x20)
3718 return NULL; /* other control character - exit */ 3688 return NULL; /* other control character - exit */
3719 3689
3720 seen_esc = false; 3690 seen_esc = false;
3721 3691
3722 if (n >= STRING_MAX - 1) 3692 if (n >= STRING_MAX - 1)
3723 // stop at some sane length 3693 // stop at some sane length
3724 return NULL; 3694 return NULL;
3725 3695
3726 if (ch == C0_SYN)
3727 string[n++] = cmd_get8 ();
3728 else
3729 string[n++] = ch; 3696 string[n++] = ch;
3730 } 3697 }
3731 3698
3732 string[n++] = '\0'; 3699 string[n++] = '\0';
3733 3700
3734 ends_how = (ch == 0x5c ? C0_ESC : ch); 3701 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3785void 3752void
3786rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3787{ 3754{
3788 if (str[0] == '?' && !str[1]) 3755 if (str[0] == '?' && !str[1])
3789 { 3756 {
3790 unsigned short r, g, b; 3757 rgba c;
3791 pix_colors_focused[color].get (display, r, g, b); 3758 pix_colors_focused[color].get (c);
3759
3760#if XFT
3761 if (c.a != rgba::MAX_CC)
3762 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3763 else
3764#endif
3792 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3765 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3793 } 3766 }
3794 else 3767 else
3795 set_window_color (color, str); 3768 set_window_color (color, str);
3796} 3769}
3797 3770
… …
3799 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3772 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3800 */ 3773 */
3801void 3774void
3802rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3775rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3803{ 3776{
3804 int changed = 0;
3805 int color; 3777 int color;
3806 char *buf, *name; 3778 char *buf, *name;
3807 bool query = str[0] == '?' && !str[1]; 3779 bool query = str[0] == '?' && !str[1];
3808 int saveop = op; 3780 int saveop = op;
3809 dDisp; 3781
3782 dLocal (Display *, dpy);
3810 3783
3811 assert (str != NULL); 3784 assert (str != NULL);
3785
3786 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3787 return;
3788
3812 switch (op) 3789 switch (op)
3813 { 3790 {
3814 case XTerm_name: 3791 case XTerm_name:
3815 set_title (str); 3792 set_title (str);
3816 /* FALLTHROUGH */ 3793 /* FALLTHROUGH */
… …
3830 unsigned long bytes_after; 3807 unsigned long bytes_after;
3831 unsigned char *value = 0; 3808 unsigned char *value = 0;
3832 const char *str = ""; 3809 const char *str = "";
3833 3810
3834 if (prop 3811 if (prop
3835 && XGetWindowProperty (disp, parent[0], 3812 && XGetWindowProperty (dpy, parent[0],
3836 prop, 0, 1<<16, 0, AnyPropertyType, 3813 prop, 0, 1<<16, 0, AnyPropertyType,
3837 &actual_type, &actual_format, 3814 &actual_type, &actual_format,
3838 &nitems, &bytes_after, &value) == Success 3815 &nitems, &bytes_after, &value) == Success
3839 && actual_type != None 3816 && actual_type != None
3840 && actual_format == 8) 3817 && actual_format == 8)
3841 str = (const char *)(value); 3818 str = (const char *)(value);
3842 3819
3843 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3820 tt_printf ("\033]%d;%s%c", op, str, resp);
3844 3821
3845 XFree (value); 3822 XFree (value);
3846 } 3823 }
3847 else 3824 else
3848 { 3825 {
… …
3852 { 3829 {
3853 *eq = 0; 3830 *eq = 0;
3854 set_utf8_property (display->atom (str), eq + 1); 3831 set_utf8_property (display->atom (str), eq + 1);
3855 } 3832 }
3856 else 3833 else
3857 XDeleteProperty (disp, parent[0], 3834 XDeleteProperty (dpy, parent[0],
3858 display->atom (str)); 3835 display->atom (str));
3859 } 3836 }
3860 break; 3837 break;
3861 3838
3862 case XTerm_Color: 3839 case XTerm_Color:
… …
3864 { 3841 {
3865 if ((name = strchr (buf, ';')) == NULL) 3842 if ((name = strchr (buf, ';')) == NULL)
3866 break; 3843 break;
3867 3844
3868 *name++ = '\0'; 3845 *name++ = '\0';
3869 color = atoi (buf); 3846 color = atoi (buf) + minCOLOR;
3870 3847
3871 if (color < 0 || color >= TOTAL_COLORS) 3848 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3872 break; 3849 break;
3873 3850
3874 if ((buf = strchr (name, ';')) != NULL) 3851 if ((buf = strchr (name, ';')) != NULL)
3875 *buf++ = '\0'; 3852 *buf++ = '\0';
3876 3853
3877 if (name[0] == '?' && !name[1]) 3854 process_color_seq (op, color, name, resp);
3878 {
3879 unsigned short r, g, b;
3880 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3881 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3882 }
3883 else
3884 set_window_color (color + minCOLOR, name);
3885 } 3855 }
3886 break; 3856 break;
3887 case XTerm_Color00: 3857 case XTerm_Color00:
3888 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3858 process_color_seq (op, Color_fg, str, resp);
3889 break; 3859 break;
3890 case XTerm_Color01: 3860 case XTerm_Color01:
3891 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3861 process_color_seq (op, Color_bg, str, resp);
3892 break; 3862 break;
3893#ifndef NO_CURSORCOLOR 3863#ifndef NO_CURSORCOLOR
3894 case XTerm_Color_cursor: 3864 case XTerm_Color_cursor:
3895 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3865 process_color_seq (op, Color_cursor, str, resp);
3896 break; 3866 break;
3897#endif 3867#endif
3898 case XTerm_Color_pointer_fg: 3868 case XTerm_Color_pointer_fg:
3899 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3869 process_color_seq (op, Color_pointer_fg, str, resp);
3900 break; 3870 break;
3901 case XTerm_Color_pointer_bg: 3871 case XTerm_Color_pointer_bg:
3902 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3872 process_color_seq (op, Color_pointer_bg, str, resp);
3903 break; 3873 break;
3904#ifndef NO_BOLD_UNDERLINE_REVERSE 3874#ifndef NO_BOLD_UNDERLINE_REVERSE
3905 case XTerm_Color_BD:
3906 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3907 break;
3908 case XTerm_Color_UL:
3909 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3910 break;
3911 case XTerm_Color_RV: 3875 case XTerm_Color_RV:
3912 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3876 process_color_seq (op, Color_RV, str, resp);
3877 break;
3878 case Rxvt_Color_BD:
3879 case URxvt_Color_BD:
3880 process_color_seq (op, Color_BD, str, resp);
3881 break;
3882 case Rxvt_Color_UL:
3883 case URxvt_Color_UL:
3884 process_color_seq (op, Color_UL, str, resp);
3913 break; 3885 break;
3914 case URxvt_Color_IT: 3886 case URxvt_Color_IT:
3915 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3887 process_color_seq (op, Color_IT, str, resp);
3916 break; 3888 break;
3917#endif 3889#endif
3918#if TRANSPARENT && TINTING 3890#if TRANSPARENT && TINTING
3919 case URxvt_Color_tint: 3891 case URxvt_Color_tint:
3920 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3892 process_color_seq (op, Color_tint, str, resp);
3893
3921 check_our_parents (); 3894 check_our_parents ();
3895
3922 if (am_transparent) 3896 if (am_transparent)
3923 want_full_refresh = want_refresh = 1; 3897 want_full_refresh = want_refresh = 1;
3924 break;
3925#endif
3926 3898
3899 break;
3900#endif
3901
3927 case XTerm_Pixmap: 3902 case Rxvt_Pixmap:
3903 {
3928 if (*str != ';') 3904 if (*str != ';')
3929 { 3905 {
3930#if XPM_BACKGROUND 3906#if XPM_BACKGROUND
3931 scale_pixmap (""); /* reset to default scaling */ 3907 scale_pixmap (""); /* reset to default scaling */
3932 set_bgPixmap (str); /* change pixmap */ 3908 set_bgPixmap (str); /* change pixmap */
3933#endif
3934 scr_touch (true); 3909 scr_touch (true);
3910#endif
3935 } 3911 }
3912
3913 int changed = 0;
3914
3936 while ((str = strchr (str, ';')) != NULL) 3915 while ((str = strchr (str, ';')) != NULL)
3937 { 3916 {
3938 str++; 3917 str++;
3939#if XPM_BACKGROUND 3918#if XPM_BACKGROUND
3940 changed += scale_pixmap (str); 3919 changed += scale_pixmap (str);
3941#endif 3920#endif
3942 } 3921 }
3943 3922
3944 if (changed) 3923 if (changed)
3945 { 3924 {
3946#ifdef XPM_BACKGROUND 3925#ifdef XPM_BACKGROUND
3947 resize_pixmap (); 3926 resize_pixmap ();
3948#endif
3949 scr_touch (true); 3927 scr_touch (true);
3928#endif
3950 } 3929 }
3930 }
3951 break; 3931 break;
3952 3932
3953 case XTerm_restoreFG: 3933 case Rxvt_restoreFG:
3954 set_window_color (Color_fg, str); 3934 set_window_color (Color_fg, str);
3955 break; 3935 break;
3956 case XTerm_restoreBG: 3936 case Rxvt_restoreBG:
3957 set_window_color (Color_bg, str); 3937 set_window_color (Color_bg, str);
3958 break; 3938 break;
3959 3939
3960 case XTerm_logfile: 3940 case XTerm_logfile:
3961 // TODO, when secure mode? 3941 // TODO, when secure mode?
3962 break; 3942 break;
3963 3943
3964#ifdef MENUBAR
3965 case URxvt_Menu:
3966 if (OPTION (Opt_insecure))
3967 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3968 break;
3969#endif
3970#if 0 3944#if 0
3971 case XTerm_dumpscreen: /* no error notices */ 3945 case Rxvt_dumpscreen: /* no error notices */
3972 { 3946 {
3973 int fd; 3947 int fd;
3974 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3948 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3975 { 3949 {
3976 scr_dump (fd); 3950 scr_dump (fd);
… …
3987 case URxvt_italicFont: 3961 case URxvt_italicFont:
3988 case URxvt_boldItalicFont: 3962 case URxvt_boldItalicFont:
3989#endif 3963#endif
3990 if (query) 3964 if (query)
3991 tt_printf ("\33]%d;%-.250s%c", saveop, 3965 tt_printf ("\33]%d;%-.250s%c", saveop,
3992 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3966 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3993 ? fontset[op - URxvt_font]->fontdesc : "", 3967 ? fontset[op - URxvt_font]->fontdesc : "",
3994 resp); 3968 resp);
3995 else 3969 else
3996 { 3970 {
3997 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3971 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4000 allocated.push_back ((void *)res); 3974 allocated.push_back ((void *)res);
4001 set_fonts (); 3975 set_fonts ();
4002 } 3976 }
4003 break; 3977 break;
4004 3978
4005#if ENABLE_FRILLS 3979 case URxvt_version:
3980 if (query)
3981 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3982 op,
3983 rs[Rs_name], VERSION[0], VERSION[2],
3984 resp);
3985 break;
3986
3987#if !ENABLE_MINIMAL
4006 case URxvt_locale: 3988 case URxvt_locale:
4007 if (query) 3989 if (query)
4008 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3990 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4009 else 3991 else
4010 { 3992 {
4011 set_locale (str); 3993 set_locale (str);
4012 pty.set_utf8_mode (enc_utf8); 3994 pty->set_utf8_mode (enc_utf8);
4013 init_xlocale (); 3995 init_xlocale ();
4014 } 3996 }
4015 break; 3997 break;
4016 3998
4017 case URxvt_view_up: 3999 case URxvt_view_up:
… …
4028 break; 4010 break;
4029#endif 4011#endif
4030 4012
4031#if ENABLE_PERL 4013#if ENABLE_PERL
4032 case URxvt_perl: 4014 case URxvt_perl:
4033 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4015 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4034 ; // no responses yet 4016 ; // no responses yet
4035 break; 4017 break;
4036#endif 4018#endif
4037 } 4019 }
4038} 4020}
… …
4070 return state; 4052 return state;
4071} 4053}
4072 4054
4073/* we're not using priv _yet_ */ 4055/* we're not using priv _yet_ */
4074void 4056void
4075rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4057rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4076{ 4058{
4077 unsigned int i, j; 4059 unsigned int i, j;
4078 int state; 4060 int state;
4079 4061
4080 static const struct 4062 static const struct
… …
4091 { 5, PrivMode_rVideo }, 4073 { 5, PrivMode_rVideo },
4092 { 6, PrivMode_relOrigin }, 4074 { 6, PrivMode_relOrigin },
4093 { 7, PrivMode_Autowrap }, 4075 { 7, PrivMode_Autowrap },
4094 // 8, bi-directional support mode 4076 // 8, bi-directional support mode
4095 { 9, PrivMode_MouseX10 }, 4077 { 9, PrivMode_MouseX10 },
4096#ifdef menuBar_esc
4097 { menuBar_esc, PrivMode_menuBar },
4098#endif
4099 // 18, 19 printing-related 4078 // 18, 19 printing-related
4100 { 25, PrivMode_VisibleCursor }, 4079 { 25, PrivMode_VisibleCursor },
4101#ifdef scrollBar_esc 4080#ifdef scrollBar_esc
4102 { scrollBar_esc, PrivMode_scrollBar }, 4081 { scrollBar_esc, PrivMode_scrollBar },
4103#endif 4082#endif
… …
4150 /* extra handling for values with state unkept */ 4129 /* extra handling for values with state unkept */
4151 switch (arg[i]) 4130 switch (arg[i])
4152 { 4131 {
4153#if ENABLE_STYLES 4132#if ENABLE_STYLES
4154 case 1021: 4133 case 1021:
4155 if (mode) 4134 set_option (Opt_intensityStyles, mode);
4156 SET_OPTION (Opt_intensityStyles);
4157 else
4158 CLR_OPTION (Opt_intensityStyles);
4159 4135
4160 scr_touch (true); 4136 scr_touch (true);
4161 break; 4137 break;
4162#endif 4138#endif
4163 case 1048: /* alternative cursor save */ 4139 case 1048: /* alternative cursor save */
4164 case 1049: 4140 case 1049:
4165 if (OPTION (Opt_secondaryScreen)) 4141 if (option (Opt_secondaryScreen))
4166 if (mode == 0) 4142 if (mode == 0)
4167 scr_cursor (RESTORE); 4143 scr_cursor (RESTORE);
4168 else if (mode == 1) 4144 else if (mode == 1)
4169 scr_cursor (SAVE); 4145 scr_cursor (SAVE);
4170 break; 4146 break;
… …
4185 case 3: /* 80/132 */ 4161 case 3: /* 80/132 */
4186 if (priv_modes & PrivMode_132OK) 4162 if (priv_modes & PrivMode_132OK)
4187 set_widthheight (((state ? 132 : 80) * fwidth), height); 4163 set_widthheight (((state ? 132 : 80) * fwidth), height);
4188 break; 4164 break;
4189 case 4: /* smooth scrolling */ 4165 case 4: /* smooth scrolling */
4190 if (!state) 4166 set_option (Opt_jumpScroll, !state);
4191 SET_OPTION (Opt_jumpScroll);
4192 else
4193 CLR_OPTION (Opt_jumpScroll);
4194 break; 4167 break;
4195 case 5: /* reverse video */ 4168 case 5: /* reverse video */
4196 scr_rvideo_mode (state); 4169 scr_rvideo_mode (state);
4197 break; 4170 break;
4198 case 6: /* relative/absolute origins */ 4171 case 6: /* relative/absolute origins */
… …
4204 /* case 8: - auto repeat, can't do on a per window basis */ 4177 /* case 8: - auto repeat, can't do on a per window basis */
4205 case 9: /* X10 mouse reporting */ 4178 case 9: /* X10 mouse reporting */
4206 if (state) /* orthogonal */ 4179 if (state) /* orthogonal */
4207 priv_modes &= ~PrivMode_MouseX11; 4180 priv_modes &= ~PrivMode_MouseX11;
4208 break; 4181 break;
4209#ifdef menuBar_esc
4210 case menuBar_esc:
4211#ifdef MENUBAR
4212 map_menuBar (state);
4213#endif
4214 break;
4215#endif
4216#ifdef scrollBar_esc 4182#ifdef scrollBar_esc
4217 case scrollBar_esc: 4183 case scrollBar_esc:
4218 if (scrollbar_mapping (state)) 4184 if (scrollbar_mapping (state))
4219 { 4185 {
4220 resize_all_windows (0, 0, 0); 4186 resize_all_windows (0, 0, 0);
… …
4239#if 0 4205#if 0
4240 case 1001: 4206 case 1001:
4241 break; /* X11 mouse highlighting */ 4207 break; /* X11 mouse highlighting */
4242#endif 4208#endif
4243 case 1010: /* scroll to bottom on TTY output inhibit */ 4209 case 1010: /* scroll to bottom on TTY output inhibit */
4244 if (!state) 4210 set_option (Opt_scrollTtyOutput, !state);
4245 SET_OPTION (Opt_scrollTtyOutput);
4246 else
4247 CLR_OPTION (Opt_scrollTtyOutput);
4248 break; 4211 break;
4249 case 1011: /* scroll to bottom on key press */ 4212 case 1011: /* scroll to bottom on key press */
4250 if (state) 4213 set_option (Opt_scrollTtyKeypress, state);
4251 SET_OPTION (Opt_scrollTtyKeypress);
4252 else
4253 CLR_OPTION (Opt_scrollTtyKeypress);
4254 break; 4214 break;
4255 case 1047: /* secondary screen w/ clearing last */ 4215 case 1047: /* secondary screen w/ clearing last */
4256 if (OPTION (Opt_secondaryScreen)) 4216 if (option (Opt_secondaryScreen))
4257 if (current_screen != PRIMARY) 4217 if (current_screen != PRIMARY)
4258 scr_erase_screen (2); 4218 scr_erase_screen (2);
4259 scr_change_screen (state); 4219 scr_change_screen (state);
4260 break; 4220 break;
4261 case 1049: /* secondary screen w/ clearing first */ 4221 case 1049: /* secondary screen w/ clearing first */
4262 scr_change_screen (state); 4222 scr_change_screen (state);
4263 if (OPTION (Opt_secondaryScreen)) 4223 if (option (Opt_secondaryScreen))
4264 if (current_screen != PRIMARY) 4224 if (current_screen != PRIMARY)
4265 scr_erase_screen (2); 4225 scr_erase_screen (2);
4266 break; 4226 break;
4267 default: 4227 default:
4268 break; 4228 break;
… …
4396 scr_color (Color_bg, Color_bg); 4356 scr_color (Color_bg, Color_bg);
4397 break; 4357 break;
4398 4358
4399 //case 50: // not variable spacing 4359 //case 50: // not variable spacing
4400 4360
4401#if ENABLE_FRILLS 4361#if !ENABLE_MINIMAL
4402 case 90: 4362 case 90:
4403 case 91: /* set bright fg color */ 4363 case 91: /* set bright fg color */
4404 case 92: 4364 case 92:
4405 case 93: 4365 case 93:
4406 case 94: 4366 case 94:
… …
4468const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4428const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4469 4429
4470void 4430void
4471rxvt_term::tt_write (const char *data, unsigned int len) 4431rxvt_term::tt_write (const char *data, unsigned int len)
4472{ 4432{
4473 if (pty.pty < 0) 4433 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4474 return; 4434 return;
4475 4435
4436 if (pty->pty < 0)
4437 return;
4438
4476 if (v_buflen == 0) 4439 if (v_buflen == 0)
4477 { 4440 {
4478 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4441 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4479 4442
4480 if ((unsigned int)written == len) 4443 if ((unsigned int)written == len)
4481 return; 4444 return;
4482 4445
4483 data += written; 4446 data += written;
… …
4492 pty_ev.set (EVENT_READ | EVENT_WRITE); 4455 pty_ev.set (EVENT_READ | EVENT_WRITE);
4493} 4456}
4494 4457
4495void rxvt_term::pty_write () 4458void rxvt_term::pty_write ()
4496{ 4459{
4497 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4460 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4498 4461
4499 if (written > 0) 4462 if (written > 0)
4500 { 4463 {
4501 v_buflen -= written; 4464 v_buflen -= written;
4502 4465

Diff Legend

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