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.260 by root, Fri Jan 13 05:04:33 2006 UTC vs.
Revision 1.310 by root, Thu Feb 23 19:26:56 2006 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);
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;
978 int end_row = row + nrow; 1046 int end_row = row + nrow;
979 1047
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 1048 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 1049 --row;
982 1050
983 do 1051 do
984 { 1052 {
985 int start_row = row; 1053 int start_row = row;
1008 while (l->is_longer () && row < end_row); 1076 while (l->is_longer () && row < end_row);
1009 } 1077 }
1010 while (row < end_row); 1078 while (row < end_row);
1011 } 1079 }
1012 1080
1013 scr_refresh (refresh_type); 1081 scr_refresh ();
1014 scrollbar_show (1); 1082 scrollbar_show (1);
1015#ifdef USE_XIM 1083#ifdef USE_XIM
1016 IMSendSpot (); 1084 IMSendSpot ();
1017#endif 1085#endif
1018 } 1086 }
1021} 1089}
1022 1090
1023void 1091void
1024rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
1025{ 1093{
1026 SET_R (this); 1094 make_current ();
1027 SET_LOCALE (locale);
1028 1095
1029 display->flush (); 1096 display->flush ();
1030 1097
1031 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
1032 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
1033} 1100}
1034 1101
1035void 1102void
1036rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
1037{ 1104{
1038 SET_R (this); 1105 make_current ();
1039 SET_LOCALE (locale);
1040 1106
1041 refresh_limit = 1; 1107 refresh_limit = 1;
1042 refresh_count = 0; 1108 refresh_count = 0;
1043 flush (); 1109 flush ();
1044} 1110}
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
1049{ 1115{
1050 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1117 want_refresh = 1;
1052 1118
1053 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1054} 1120}
1055#endif 1121#endif
1056 1122
1057#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1058void 1124void
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1073{ 1139{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1076 { 1142 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1143 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080 } 1145 }
1081} 1146}
1082#endif 1147#endif
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1087{ 1152{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1154 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1156 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094 } 1158 }
1095} 1159}
1096#endif 1160#endif
1101{ 1165{
1102 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1103 || 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)
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1169 {
1106 if (view_start == nsaved || 1170 if (view_start == top_row || view_start == 0)
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1109 1172
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1173 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1113 } 1175 }
1114} 1176}
1115#endif 1177#endif
1116 1178
1117#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1118static struct event_handler 1180static struct event_handler
1119{ 1181{
1120 check_watcher cw_yield; 1182 check_watcher yield_ev;
1121 1183
1122 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1123 { 1185 {
1124 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
1125 w.stop (); 1194 w.stop ();
1126 } 1195 }
1127 1196
1128 event_handler () 1197 event_handler ()
1129 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1130 { 1199 {
1131 } 1200 }
1132} event_handler; 1201} event_handler;
1133#endif 1202#endif
1134 1203
1145 1214
1146 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1149 1218
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151 1220
1152 if (r > 0) 1221 if (r > 0)
1153 { 1222 {
1154 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1155 return true; 1224 return true;
1156 } 1225 }
1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 { 1227 {
1159#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1160 if (display->is_local) 1229 if (display->is_local)
1161 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1162#endif 1231#endif
1163 } 1232 }
1164 else 1233 else
1165 { 1234 {
1166 pty_ev.stop (); 1235 pty_ev.stop ();
1173} 1242}
1174 1243
1175void 1244void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1177{ 1246{
1178 SET_R (this); 1247 make_current ();
1179 SET_LOCALE (locale);
1180 1248
1181 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1182 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1251 while (pty_fill ())
1184 if (cmd_parse ()) 1252 if (cmd_parse ())
1189} 1257}
1190 1258
1191void 1259void
1192rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1193{ 1261{
1194 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1195 recolour_cursor (); 1263 recolour_cursor ();
1196 1264
1197#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1198 hidden_pointer = 0; 1266 hidden_pointer = 0;
1199 1267
1207rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1208{ 1276{
1209 if (!OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1210 return; 1278 return;
1211 1279
1212 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1213 XFlush (display->display); 1281 XFlush (dpy);
1214 1282
1215 hidden_pointer = 1; 1283 hidden_pointer = 1;
1216} 1284}
1217 1285
1218void 1286void
1219rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1220{ 1288{
1221 SET_R (this); 1289 make_current ();
1222 SET_LOCALE (locale);
1223 1290
1224 pointer_blank (); 1291 pointer_blank ();
1225} 1292}
1226#endif 1293#endif
1227 1294
1292 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1293 (32 + x + 1), 1360 (32 + x + 1),
1294 (32 + y + 1)); 1361 (32 + y + 1));
1295} 1362}
1296 1363
1297#ifdef USING_W11LIB
1298void
1299rxvt_W11_process_x_event (XEvent *ev)
1300{
1301 rxvt_t *r = rxvt_get_r ();
1302
1303 x_cb (*ev);
1304}
1305#endif
1306
1307/*{{{ process an X event */ 1364/*{{{ process an X event */
1308void 1365void
1309rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1310{ 1367{
1311 dDisp; 1368 make_current ();
1312 1369
1313 SET_R (this); 1370 dLocal (Display *, dpy);
1314 SET_LOCALE (locale);
1315 1371
1316 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318 return; 1375 return;
1319 1376
1320 // for XQueryPointer 1377 // for XQueryPointer
1321 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1323 unsigned int unused_mask; 1380 unsigned int unused_mask;
1324 1381
1325 switch (ev.type) 1382 switch (ev.type)
1326 { 1383 {
1327 case KeyPress: 1384 case KeyPress:
1328#if ISO_14755 1385 key_press (ev.xkey);
1329 if (!(iso14755buf & ISO_14755_52))
1330#endif
1331 lookup_key (ev.xkey);
1332
1333 break; 1386 break;
1334 1387
1335 case KeyRelease: 1388 case KeyRelease:
1336 { 1389 key_release (ev.xkey);
1337#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1338 KeySym keysym;
1339
1340 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1341#endif
1342
1343#if ENABLE_FRILLS || ISO_14755
1344 // ISO 14755 support
1345 if (iso14755buf)
1346 if (iso14755buf & ISO_14755_52)
1347 {
1348# if ENABLE_OVERLAY
1349 scr_overlay_off ();
1350# endif
1351# if ISO_14755
1352 // iso14755 part 5.2 handling: release time
1353 // first: controls
1354 if ((ev.xkey.state & ControlMask)
1355 && ((keysym >= 0x40 && keysym <= 0x5f)
1356 || (keysym >= 0x61 && keysym <= 0x7f)))
1357 {
1358 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1359 commit_iso14755 ();
1360 goto skip_switch;
1361 }
1362
1363 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1364 if (i[0] == keysym)
1365 {
1366 iso14755buf = ISO_14755_51 | i[1];
1367 commit_iso14755 ();
1368 goto skip_switch;
1369 }
1370
1371 scr_bell ();
1372# endif
1373 iso14755buf = 0;
1374 break;
1375 }
1376 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1377 {
1378# if ENABLE_OVERLAY
1379 scr_overlay_off ();
1380# endif
1381 if (iso14755buf & ISO_14755_51)
1382 commit_iso14755 ();
1383#if ISO_14755
1384 else if (iso14755buf & ISO_14755_STARTED)
1385 {
1386 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1387
1388 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1389 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1390 }
1391# endif
1392 else
1393 iso14755buf = 0;
1394 }
1395#endif
1396
1397 if (ev.xany.window == vt
1398 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1399 break;
1400
1401#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1402 if (!(ev.xkey.state & ControlMask))
1403 slip_wheel_ev.stop ();
1404 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1405 mouse_slip_wheel_speed = 0;
1406#endif
1407 break; 1390 break;
1408 }
1409 1391
1410 case ButtonPress: 1392 case ButtonPress:
1411 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1412 break; 1394 break;
1413 1395
1415 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1416 break; 1398 break;
1417 1399
1418 case ClientMessage: 1400 case ClientMessage:
1419 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1420 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1421 { 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 {
1422 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)))
1423 destroy (); 1411 destroy ();
1412 }
1424#if ENABLE_EWMH 1413#if ENABLE_EWMH
1425 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])
1426 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1427 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1428 &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 }
1429#endif 1429#endif
1430 } 1430 }
1431#if ENABLE_XEMBED
1432 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1433 {
1434 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1435 focus_in ();
1436 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1437 focus_out ();
1438 }
1439#endif
1440#ifdef OFFIX_DND
1441 /* OffiX Dnd (drag 'n' drop) protocol */
1442 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1443 && (ev.xclient.data.l[0] == DndFile
1444 || ev.xclient.data.l[0] == DndDir
1445 || ev.xclient.data.l[0] == DndLink))
1446 {
1447 /* Get Dnd data */
1448 Atom ActualType;
1449 int ActualFormat;
1450 unsigned char *data;
1451 unsigned long Size, RemainingBytes;
1452
1453 XGetWindowProperty (disp, display->root,
1454 xa[XA_DNDSELECTION],
1455 0L, 1000000L,
1456 False, AnyPropertyType,
1457 &ActualType, &ActualFormat,
1458 &Size, &RemainingBytes,
1459 &data);
1460 set_string_property (XA_CUT_BUFFER0, data);
1461 XFree (data);
1462 selection_paste (display->root, XA_CUT_BUFFER0, true);
1463 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1464 }
1465#endif /* OFFIX_DND */
1466 break; 1431 break;
1467 1432
1468 case MappingNotify: 1433 case MappingNotify:
1469 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1470 break; 1435 break;
1503 break; 1468 break;
1504 1469
1505 case ConfigureNotify: 1470 case ConfigureNotify:
1506 if (ev.xconfigure.window == parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1507 { 1472 {
1508 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1509 ; 1474 ;
1510 1475
1511 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1512 { 1477 {
1513 seen_resize = 1; 1478 seen_resize = 1;
1514 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1515 } 1480 }
1516 1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1517#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1518 if (OPTION (Opt_transparent)) 1485 if (OPTION (Opt_transparent))
1519 check_our_parents (); 1486 check_our_parents ();
1520#endif 1487#endif
1521 } 1488 }
1522 break; 1489 break;
1523 1490
1524 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1525 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1526 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1527 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1528 1496
1529 break; 1497 break;
1530 1498
1531 case SelectionClear: 1499 case SelectionClear:
1532 selection_clear (); 1500 selection_clear ();
1568 if (ev.xany.window == vt) 1536 if (ev.xany.window == vt)
1569 { 1537 {
1570 do 1538 do
1571 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1572 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1573 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1574 1542
1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1576 1544
1577 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1578 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1579 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1580 1548
1581 want_refresh = 1; 1549 want_refresh = 1;
1582 } 1550 }
1583 else 1551 else
1584 { 1552 {
1585 XEvent unused_event; 1553 XEvent unused_event;
1586 1554
1587 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1588 ; 1556 ;
1589 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1590 ; 1558 ;
1591 1559
1592 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1593 { 1561 {
1594 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1595 scrollbar_show (0); 1563 scrollbar_show (0);
1596 } 1564 }
1597#ifdef MENUBAR
1598 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1599 menubar_expose ();
1600#endif
1601 1565
1602#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1603 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1604 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1605#endif 1569#endif
1606 } 1570 }
1607 break; 1571 break;
1608 1572
1609 case MotionNotify: 1573 case MotionNotify:
1610 printf ("motion notify\n");//D
1611#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1612 if (hidden_pointer) 1575 if (hidden_pointer)
1613 pointer_unblank (); 1576 pointer_unblank ();
1614#endif 1577#endif
1615#if MENUBAR
1616 if (isMenuBarWindow (ev.xany.window))
1617 {
1618 menubar_control (ev.xbutton);
1619 break;
1620 }
1621#endif
1622 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1623 break; 1579 break;
1624 1580
1625 if (ev.xany.window == vt) 1581 if (ev.xany.window == vt)
1626 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1627 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1628 ; // nop 1585 ; // nop
1629 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1630 { 1587 {
1631 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1632 ; 1589 ;
1633 1590
1634 XQueryPointer (disp, vt, 1591 XQueryPointer (dpy, vt,
1635 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1636 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1637 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1638 &ev.xbutton.state); 1595 &ev.xbutton.state);
1639#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
1703#endif 1660#endif
1704 } 1661 }
1705 } 1662 }
1706 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1707 { 1664 {
1708 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1709 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1710 ; 1667 ;
1711 1668
1712 XQueryPointer (disp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1713 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1714 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1715 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1716 &unused_mask); 1673 &unused_mask);
1717 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1721 scrollbar_show (1); 1678 scrollbar_show (1);
1722 } 1679 }
1723 break; 1680 break;
1724 } 1681 }
1725 1682
1726skip_switch: ;
1727
1728#if defined(CURSOR_BLINK) 1683#if defined(CURSOR_BLINK)
1729 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1730 { 1685 {
1731 if (hidden_cursor) 1686 if (hidden_cursor)
1732 { 1687 {
1733 hidden_cursor = 0; 1688 hidden_cursor = 0;
1734 want_refresh = 1; 1689 want_refresh = 1;
1735 } 1690 }
1736 1691
1737 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738 } 1693 }
1739#endif 1694#endif
1740 1695
1741#if defined(POINTER_BLANK) 1696#if defined(POINTER_BLANK)
1742 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1759 if (!focus) 1714 if (!focus)
1760 { 1715 {
1761 focus = 1; 1716 focus = 1;
1762 want_refresh = 1; 1717 want_refresh = 1;
1763 1718
1764 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1765 1720
1766#if USE_XIM 1721#if USE_XIM
1767 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1768 { 1723 {
1769 IMSetStatusPosition (); 1724 IMSetPosition ();
1770 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1771 } 1726 }
1772#endif 1727#endif
1773#if CURSOR_BLINK 1728#if CURSOR_BLINK
1774 if (OPTION (Opt_cursorBlink)) 1729 if (OPTION (Opt_cursorBlink))
1775 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1776#endif 1731#endif
1777#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1779 { 1734 {
1780 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
1824 1779
1825#if TRANSPARENT 1780#if TRANSPARENT
1826void 1781void
1827rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1783{
1829 SET_R (this); 1784 make_current ();
1830 SET_LOCALE (locale);
1831 1785
1832 switch (ev.type) 1786 switch (ev.type)
1833 { 1787 {
1834 case PropertyNotify: 1788 case PropertyNotify:
1835 /* 1789 /*
1862 /* 1816 /*
1863 * VT window processing of button press 1817 * VT window processing of button press
1864 */ 1818 */
1865 if (ev.window == vt) 1819 if (ev.window == vt)
1866 { 1820 {
1821 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1822 return;
1823
1867#if ISO_14755 1824#if ISO_14755
1868 // 5.4 1825 // 5.4
1869 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1826 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1870 { 1827 {
1871 iso14755_54 (ev.x, ev.y); 1828 iso14755_54 (ev.x, ev.y);
1913 else 1870 else
1914 { 1871 {
1915 if (ev.button != MEvent.button) 1872 if (ev.button != MEvent.button)
1916 MEvent.clicks = 0; 1873 MEvent.clicks = 0;
1917 1874
1918 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1919 switch (ev.button) 1875 switch (ev.button)
1920 { 1876 {
1921 case Button1: 1877 case Button1:
1922 /* allow meta + click to select rectangular areas */ 1878 /* allow meta + click to select rectangular areas */
1923 /* should be done in screen.C */ 1879 /* should be done in screen.C */
1924#if ENABLE_FRILLS 1880#if ENABLE_FRILLS
1925 selection.rect = !!(ev.state & ModMetaMask); 1881 selection.rect = !!(ev.state & ModMetaMask);
1926#else 1882#else
1927 selection.rect = false; 1883 selection.rect = false;
1928#endif 1884#endif
1929 1885
1930 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1931 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1932 { 1888 {
1933 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1934 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1935 else 1891 else
1936 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
1937 } 1893 }
1938 else 1894 else
1939 { 1895 {
1940 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1941 MEvent.clicks++; 1897 MEvent.clicks++;
1942 else 1898 else
1943 MEvent.clicks = 1; 1899 MEvent.clicks = 1;
1944 1900
1945 selection_click (MEvent.clicks, ev.x, ev.y); 1901 selection_click (MEvent.clicks, ev.x, ev.y);
1946 } 1902 }
1947 1903
1948 MEvent.button = Button1; 1904 MEvent.button = Button1;
1949 break; 1905 break;
1950 1906
1951 case Button3: 1907 case Button3:
1952 if (MEvent.button == Button3 && clickintime) 1908 if (MEvent.button == Button3 && clickintime)
1953 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1954 else 1910 else
1955 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1956 1912
1957 MEvent.button = Button3; 1913 MEvent.button = Button3;
1958 break; 1914 break;
1959 } 1915 }
1960 } 1916 }
1961 1917
1962 MEvent.time = ev.time; 1918 MEvent.time = ev.time;
1963 return; 1919 return;
1964 } 1920 }
1965 1921
2104 } 2060 }
2105 } 2061 }
2106 2062
2107 return; 2063 return;
2108 } 2064 }
2109
2110#if MENUBAR
2111 /*
2112 * Menubar window processing of button press
2113 */
2114 if (isMenuBarWindow (ev.window))
2115 menubar_control (ev);
2116#endif
2117} 2065}
2118 2066
2119void 2067void
2120rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
2121{ 2069{
2127 2075
2128 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
2129 { 2077 {
2130 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
2131 scrollbar_show (0); 2079 scrollbar_show (0);
2132#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2133 refresh_type &= ~SMOOTH_REFRESH;
2134#endif
2135 } 2080 }
2136 2081
2137#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
2138 if (sel_scroll_ev.active) 2083 if (sel_scroll_ev.active)
2139 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
2140#endif 2085#endif
2141 2086
2142 if (ev.window == vt) 2087 if (ev.window == vt)
2143 { 2088 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2090 return;
2091
2144#if ISO_14755 2092#if ISO_14755
2145 // 5.4 2093 // 5.4
2146 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2094 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2147 return; 2095 return;
2148#endif 2096#endif
2097
2149 if (reportmode) 2098 if (reportmode)
2150 { 2099 {
2151 /* mouse report from vt window */ 2100 /* mouse report from vt window */
2152 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
2153 if (ev.button >= 4) 2102 if (ev.button >= 4)
2177 if (priv_modes & PrivMode_mouse_report 2126 if (priv_modes & PrivMode_mouse_report
2178 && bypass_keystate 2127 && bypass_keystate
2179 && ev.button == Button1 && MEvent.clicks <= 1) 2128 && ev.button == Button1 && MEvent.clicks <= 1)
2180 selection_extend (ev.x, ev.y, 0); 2129 selection_extend (ev.x, ev.y, 0);
2181 2130
2182 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2183 return;
2184
2185 switch (ev.button) 2131 switch (ev.button)
2186 { 2132 {
2187 case Button1: 2133 case Button1:
2188 case Button3: 2134 case Button3:
2189 selection_make (ev.time); 2135 selection_make (ev.time);
2190 break; 2136 break;
2137
2191 case Button2: 2138 case Button2:
2192 selection_request (ev.time, ev.x, ev.y); 2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2193 break; 2141 break;
2142
2194#ifdef MOUSE_WHEEL 2143#ifdef MOUSE_WHEEL
2195 case Button4: 2144 case Button4:
2196 case Button5: 2145 case Button5:
2197 { 2146 {
2198 int i; 2147 int i;
2230 } 2179 }
2231 break; 2180 break;
2232#endif 2181#endif
2233 } 2182 }
2234 } 2183 }
2235#ifdef MENUBAR
2236 else if (isMenuBarWindow (ev.window))
2237 menubar_control (ev);
2238#endif
2239} 2184}
2240 2185
2241#ifdef TRANSPARENT 2186#ifdef TRANSPARENT
2242#if TINTING 2187#if TINTING
2243/* taken from aterm-0.4.2 */ 2188/* taken from aterm-0.4.2 */
2244 2189
2245typedef uint32_t RUINT32T; 2190typedef uint32_t RUINT32T;
2246 2191
2247void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2248{ 2193{
2249 int sh_r, sh_g, sh_b; 2194 int sh_r, sh_g, sh_b;
2250 RUINT32T mask_r, mask_g, mask_b; 2195 RUINT32T mask_r, mask_g, mask_b;
2251 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2252 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2253 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2254 int i; 2199 int i;
2255 2200
2256 Visual *visual = display->visual; 2201 Visual *visual = term->visual;
2257 2202
2258 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2259 2204
2260 /* for convenience */ 2205 /* for convenience */
2261 mask_r = visual->red_mask; 2206 mask_r = visual->red_mask;
2482 Atom atype; 2427 Atom atype;
2483 unsigned char *prop = NULL; 2428 unsigned char *prop = NULL;
2484 Window root, oldp, *list; 2429 Window root, oldp, *list;
2485 Pixmap rootpixmap = None; 2430 Pixmap rootpixmap = None;
2486 XWindowAttributes wattr, wrootattr; 2431 XWindowAttributes wattr, wrootattr;
2487 dDisp;
2488 2432
2489 pchanged = 0; 2433 pchanged = 0;
2490 2434
2491 if (!OPTION (Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
2492 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2493 2437
2494 XGetWindowAttributes (disp, display->root, &wrootattr); 2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2495 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
2496 2440
2497 XGetWindowAttributes (disp, parent[0], &wattr); 2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2498 2442
2499 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
2500 { 2444 {
2501 if (am_transparent) 2445 if (am_transparent)
2502 { 2446 {
2503 pchanged = 1; 2447 pchanged = 1;
2504 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2505 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
2506 } 2450 }
2507 2451
2508 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
2509 } 2453 }
2510 2454
2511 /* Get all X ops out of the queue so that our information is up-to-date. */ 2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2512 XSync (disp, False); 2456 XSync (dpy, False);
2513 2457
2514 /* 2458 /*
2515 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
2516 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
2517 * windows for each client, so we have to take care about that. 2461 * windows for each client, so we have to take care about that.
2518 */ 2462 */
2519 i = (xa[XA_XROOTPMAP_ID] 2463 i = (xa[XA_XROOTPMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success); 2466 &nitems, &bytes_after, &prop) == Success);
2523 2467
2524 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2525 i = (xa[XA_ESETROOT_PMAP_ID] 2469 i = (xa[XA_ESETROOT_PMAP_ID]
2526 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2527 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2528 &nitems, &bytes_after, &prop) == Success); 2472 &nitems, &bytes_after, &prop) == Success);
2529 2473
2530 if (!i || prop == NULL 2474 if (!i || prop == NULL
2531#if TINTING 2475#if TINTING
2532 || !rs[Rs_color + Color_tint] 2476 || !ISSET_PIXCOLOR (Color_tint)
2533#endif 2477#endif
2534 ) 2478 )
2535 have_pixmap = 0; 2479 have_pixmap = 0;
2536 else 2480 else
2537 { 2481 {
2550 Window cr; 2494 Window cr;
2551 XImage *image; 2495 XImage *image;
2552 GC gc; 2496 GC gc;
2553 XGCValues gcvalue; 2497 XGCValues gcvalue;
2554 2498
2555 XTranslateCoordinates (disp, parent[0], display->root, 2499 XTranslateCoordinates (dpy, parent[0], display->root,
2556 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2557 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2558 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2559 nx = ny = 0; 2503 nx = ny = 0;
2560 2504
2573 } 2517 }
2574 2518
2575 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2576 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2577 2521
2578 XSync (disp, False); 2522 XSync (dpy, False);
2579 allowedxerror = -1; 2523 allowedxerror = -1;
2580 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2581 2525
2582 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2583 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2584 allowedxerror = 0; 2528 allowedxerror = 0;
2585 2529
2588 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2589 { 2533 {
2590 pchanged = 1; 2534 pchanged = 1;
2591 if (pixmap != None) 2535 if (pixmap != None)
2592 { 2536 {
2593 XFreePixmap (disp, pixmap); 2537 XFreePixmap (dpy, pixmap);
2594 pixmap = None; 2538 pixmap = None;
2595 } 2539 }
2596 } 2540 }
2597 2541
2598 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2599 } 2543 }
2600 else 2544 else
2601 { 2545 {
2602 if (pixmap != None) 2546 if (pixmap != None)
2603 XFreePixmap (disp, pixmap); 2547 XFreePixmap (dpy, pixmap);
2604 2548
2605#if TINTING 2549#if TINTING
2606 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2607 { 2551 {
2608 unsigned short rm, gm, bm;
2609 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2610 2553
2554 rgba c;
2611 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2555 pix_colors_focused [Color_tint].get (c);
2612 2556
2613 ShadeXImage (display, image, shade, rm, gm, bm); 2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2614 } 2558 }
2615#endif 2559#endif
2616 2560
2617 pixmap = XCreatePixmap (disp, vt, 2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2618 szHint.width, szHint.height, image->depth);
2619 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2620 XPutImage (disp, pixmap, gc, image, 0, 0, 2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2621 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2622 XFreeGC (disp, gc); 2565 XFreeGC (dpy, gc);
2623 XDestroyImage (image); 2566 XDestroyImage (image);
2624 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2625 XClearWindow (disp, parent[0]); 2568 XClearWindow (dpy, parent[0]);
2626 2569
2627 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2628 pchanged = 1; 2571 pchanged = 1;
2629 2572
2630 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2631 } 2574 }
2632 } 2575 }
2633 2576
2634 if (am_pixmap_trans) 2577 if (am_pixmap_trans)
2635 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2636 else 2579 else
2637 { 2580 {
2638 unsigned int n; 2581 unsigned int n;
2639 /* 2582 /*
2640 * InheritPixmap transparency 2583 * InheritPixmap transparency
2641 */ 2584 */
2642 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2643 { 2586 {
2644 oldp = parent[i]; 2587 oldp = parent[i];
2645 XQueryTree (disp, parent[i - 1], &root, 2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2646 &parent[i], &list, &n);
2647 XFree (list); 2589 XFree (list);
2648 2590
2649 if (parent[i] == display->root) 2591 if (parent[i] == display->root)
2650 { 2592 {
2651 if (oldp != None) 2593 if (oldp != None)
2659 } 2601 }
2660 2602
2661 n = 0; 2603 n = 0;
2662 2604
2663 if (pchanged) 2605 if (pchanged)
2664 {
2665 for (; n < (unsigned int)i; n++) 2606 for (; n < (unsigned int)i; n++)
2666 { 2607 {
2667 XGetWindowAttributes (disp, parent[n], &wattr); 2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2668 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2669 { 2611 {
2670 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2671 break; 2613 break;
2672 } 2614 }
2673 } 2615 }
2674 }
2675 2616
2676 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2677 { 2618 {
2678 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2679 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2680 am_transparent = 0; 2621 am_transparent = 0;
2681 /* XXX: also turn off Opt_transparent? */ 2622 /* XXX: also turn off Opt_transparent? */
2682 } 2623 }
2683 else 2624 else
2684 { 2625 {
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++) 2626 for (n = 0; n < (unsigned int)i; n++)
2691 { 2627 {
2692 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2693 XClearWindow (disp, parent[n]); 2629 XClearWindow (dpy, parent[n]);
2694 } 2630 }
2695 2631
2696 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2697 am_transparent = 1; 2633 am_transparent = 1;
2698 } 2634 }
2699 2635
2700 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2701 parent[i] = None; 2637 parent[i] = None;
2702 } 2638 }
2703 2639
2704 if (scrollBar.win) 2640 if (scrollBar.win)
2705 { 2641 {
2706 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2707 scrollBar.setIdle (); 2643 scrollBar.setIdle ();
2708 scrollbar_show (0); 2644 scrollbar_show (0);
2709 } 2645 }
2710 2646
2711 if (am_transparent) 2647 if (am_transparent)
2786 } 2722 }
2787 2723
2788 // scr_add_lines only works for nlines <= nrow - 1. 2724 // scr_add_lines only works for nlines <= nrow - 1.
2789 if (nlines >= nrow - 1) 2725 if (nlines >= nrow - 1)
2790 { 2726 {
2727 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2728 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2792 scr_add_lines (buf, str - buf, nlines); 2729 scr_add_lines (buf, str - buf, nlines);
2793 2730
2794 nlines = 0; 2731 nlines = 0;
2795 str = buf; 2732 str = buf;
2796 eol = str + min (ncol, UBUFSIZ); 2733 eol = str + min (ncol, UBUFSIZ);
2811 2748
2812 seq_begin = cmdbuf_ptr; 2749 seq_begin = cmdbuf_ptr;
2813 ch = next_char (); 2750 ch = next_char ();
2814 } 2751 }
2815 2752
2753 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2817 scr_add_lines (buf, str - buf, nlines); 2755 scr_add_lines (buf, str - buf, nlines);
2818 2756
2819 /* 2757 /*
2820 * If there have been a lot of new lines, then update the screen 2758 * 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. 2759 * What the heck I'll cheat and only refresh less than every page-full.
2827 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2828 refresh_limit++; 2766 refresh_limit++;
2829 else 2767 else
2830 { 2768 {
2831 flag = true; 2769 flag = true;
2770 //TODO: due to popular request, implement "skipscroll" option here
2832 scr_refresh (refresh_type); 2771 scr_refresh ();
2833 want_refresh = 1; 2772 want_refresh = 1;
2834 } 2773 }
2835 } 2774 }
2836 2775
2837 } 2776 }
2855 return flag; 2794 return flag;
2856} 2795}
2857 2796
2858// read the next character 2797// read the next character
2859wchar_t 2798wchar_t
2860rxvt_term::next_char () 2799rxvt_term::next_char () NOTHROW
2861{ 2800{
2862 while (cmdbuf_ptr < cmdbuf_endp) 2801 while (cmdbuf_ptr < cmdbuf_endp)
2863 { 2802 {
2864 // assume 7-bit to be ascii ALWAYS 2803 // assume 7-bit to be ascii ALWAYS
2865 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2804 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2886 return NOCHAR; 2825 return NOCHAR;
2887} 2826}
2888 2827
2889// read the next octet 2828// read the next octet
2890uint32_t 2829uint32_t
2891rxvt_term::next_octet () 2830rxvt_term::next_octet () NOTHROW
2892{ 2831{
2893 return cmdbuf_ptr < cmdbuf_endp 2832 return cmdbuf_ptr < cmdbuf_endp
2894 ? (unsigned char)*cmdbuf_ptr++ 2833 ? (unsigned char)*cmdbuf_ptr++
2895 : NOCHAR; 2834 : NOCHAR;
2896} 2835}
2836
2837static class out_of_input out_of_input;
2897 2838
2898/* rxvt_cmd_getc () - Return next input character */ 2839/* rxvt_cmd_getc () - Return next input character */
2899/* 2840/*
2900 * Return the next input character after first passing any keyboard input 2841 * Return the next input character after first passing any keyboard input
2901 * to the command. 2842 * to the command.
2902 */ 2843 */
2903wchar_t 2844wchar_t
2904rxvt_term::cmd_getc () 2845rxvt_term::cmd_getc () THROW ((class out_of_input))
2905{ 2846{
2906 wchar_t c = next_char (); 2847 wchar_t c = next_char ();
2907 2848
2908 if (c == NOCHAR) 2849 if (c == NOCHAR)
2909 throw out_of_input; 2850 throw out_of_input;
2910 2851
2911 return c; 2852 return c;
2912} 2853}
2913 2854
2914uint32_t 2855uint32_t
2915rxvt_term::cmd_get8 () 2856rxvt_term::cmd_get8 () THROW ((class out_of_input))
2916{ 2857{
2917 uint32_t c = next_octet (); 2858 uint32_t c = next_octet ();
2918 2859
2919 if (c == NOCHAR) 2860 if (c == NOCHAR)
2920 throw out_of_input; 2861 throw out_of_input;
3158 scr_charset_set (2, (unsigned int)cmd_getc ()); 3099 scr_charset_set (2, (unsigned int)cmd_getc ());
3159 break; 3100 break;
3160 case '+': 3101 case '+':
3161 scr_charset_set (3, (unsigned int)cmd_getc ()); 3102 scr_charset_set (3, (unsigned int)cmd_getc ());
3162 break; 3103 break;
3163#if ENABLE_FRILLS 3104#if !ENABLE_MINIMAL
3164 case '6': 3105 case '6':
3165 scr_backindex (); 3106 scr_backindex ();
3166 break; 3107 break;
3167#endif 3108#endif
3168 case '7': 3109 case '7':
3169 scr_cursor (SAVE); 3110 scr_cursor (SAVE);
3170 break; 3111 break;
3171 case '8': 3112 case '8':
3172 scr_cursor (RESTORE); 3113 scr_cursor (RESTORE);
3173 break; 3114 break;
3174#if ENABLE_FRILLS 3115#if !ENABLE_MINIMAL
3175 case '9': 3116 case '9':
3176 scr_forwardindex (); 3117 scr_forwardindex ();
3177 break; 3118 break;
3178#endif 3119#endif
3179 case '=': 3120 case '=':
3341 ndef = get_byte_array_bit (csi_defaults, i); 3282 ndef = get_byte_array_bit (csi_defaults, i);
3342 for (p = 0; p < nargs; p++) 3283 for (p = 0; p < nargs; p++)
3343 if (arg[p] == -1) 3284 if (arg[p] == -1)
3344 arg[p] = ndef; 3285 arg[p] = ndef;
3345 3286
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 /* 3287 /*
3354 * private mode handling 3288 * private mode handling
3355 */ 3289 */
3356 if (priv) 3290 if (priv)
3357 { 3291 {
3358 switch (priv) 3292 switch (priv)
3359 { 3293 {
3360 case '>': 3294 case '>':
3361 if (ch == CSI_DA) /* secondary device attributes */ 3295 if (ch == CSI_DA) /* secondary device attributes */
3362 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3296 {
3297 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3298 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3299 //
3300 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3301 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3302 // that we do not support xterm mouse reporting (should be 95 when we do).
3303 //
3304 tt_printf ("\033[>%d;94;0c", 'U');
3305 }
3363 break; 3306 break;
3364 case '?': 3307 case '?':
3365 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3366 process_terminal_mode (ch, priv, nargs, arg); 3309 process_terminal_mode (ch, priv, nargs, arg);
3367 break; 3310 break;
3570 break; 3513 break;
3571 case CSI_75: 3514 case CSI_75:
3572 scr_cursor (RESTORE); 3515 scr_cursor (RESTORE);
3573 break; 3516 break;
3574 3517
3575#if ENABLE_FRILLS 3518#if !ENABLE_MINIMAL
3576 case CSI_74: 3519 case CSI_74:
3577 process_window_ops (arg, nargs); 3520 process_window_ops (arg, nargs);
3578 break; 3521 break;
3579#endif 3522#endif
3580 3523
3587 break; 3530 break;
3588 } 3531 }
3589} 3532}
3590/*}}} */ 3533/*}}} */
3591 3534
3592#if ENABLE_FRILLS 3535#if !ENABLE_MINIMAL
3593/* ARGSUSED */ 3536/* ARGSUSED */
3594void 3537void
3595rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3538rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3596{ 3539{
3597 int x, y; 3540 int x, y;
3598 XWindowAttributes wattr; 3541 XWindowAttributes wattr;
3599 Window wdummy; 3542 Window wdummy;
3600 dDisp; 3543
3544 dLocal (Display *, dpy);
3601 3545
3602 if (nargs == 0) 3546 if (nargs == 0)
3603 return; 3547 return;
3604 3548
3605 switch (args[0]) 3549 switch (args[0])
3606 { 3550 {
3607 /* 3551 /*
3608 * commands 3552 * commands
3609 */ 3553 */
3610 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
3611 XMapWindow (disp, parent[0]); 3555 XMapWindow (dpy, parent[0]);
3612 break; 3556 break;
3613 case 2: /* iconify window */ 3557 case 2: /* iconify window */
3614 XIconifyWindow (disp, parent[0], display->screen); 3558 XIconifyWindow (dpy, parent[0], display->screen);
3615 break; 3559 break;
3616 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
3617 XMoveWindow (disp, parent[0], args[1], args[2]); 3561 XMoveWindow (dpy, parent[0], args[1], args[2]);
3618 break; 3562 break;
3619 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
3620 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3621 break; 3565 break;
3622 case 5: /* raise window */ 3566 case 5: /* raise window */
3623 XRaiseWindow (disp, parent[0]); 3567 XRaiseWindow (dpy, parent[0]);
3624 break; 3568 break;
3625 case 6: /* lower window */ 3569 case 6: /* lower window */
3626 XLowerWindow (disp, parent[0]); 3570 XLowerWindow (dpy, parent[0]);
3627 break; 3571 break;
3628 case 7: /* refresh window */ 3572 case 7: /* refresh window */
3629 scr_touch (true); 3573 scr_touch (true);
3630 break; 3574 break;
3631 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
3638 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
3639 set_widthheight ((unsigned int)width, 3583 set_widthheight ((unsigned int)width,
3640 (unsigned int) (args[1] * fheight)); 3584 (unsigned int) (args[1] * fheight));
3641 break; 3585 break;
3642 3586
3643
3644 /* 3587 /*
3645 * reports - some output format copied from XTerm 3588 * reports - some output format copied from XTerm
3646 */ 3589 */
3647 case 11: /* report window state */ 3590 case 11: /* report window state */
3648 XGetWindowAttributes (disp, parent[0], &wattr); 3591 XGetWindowAttributes (dpy, parent[0], &wattr);
3649 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3592 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3650 break; 3593 break;
3651 case 13: /* report window position */ 3594 case 13: /* report window position */
3652 XGetWindowAttributes (disp, parent[0], &wattr); 3595 XGetWindowAttributes (dpy, parent[0], &wattr);
3653 XTranslateCoordinates (disp, parent[0], wattr.root, 3596 XTranslateCoordinates (dpy, parent[0], wattr.root,
3654 -wattr.border_width, -wattr.border_width, 3597 -wattr.border_width, -wattr.border_width,
3655 &x, &y, &wdummy); 3598 &x, &y, &wdummy);
3656 tt_printf ("\033[3;%d;%dt", x, y); 3599 tt_printf ("\033[3;%d;%dt", x, y);
3657 break; 3600 break;
3658 case 14: /* report window size (pixels) */ 3601 case 14: /* report window size (pixels) */
3659 XGetWindowAttributes (disp, parent[0], &wattr); 3602 XGetWindowAttributes (dpy, parent[0], &wattr);
3660 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3603 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3661 break; 3604 break;
3662 case 18: /* report text area size (chars) */ 3605 case 18: /* report text area size (chars) */
3663 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3606 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3664 break; 3607 break;
3666 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3609 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3667 break; 3610 break;
3668 case 20: /* report icon label */ 3611 case 20: /* report icon label */
3669 { 3612 {
3670 char *s; 3613 char *s;
3671 XGetIconName (disp, parent[0], &s); 3614 XGetIconName (dpy, parent[0], &s);
3672 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3615 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3673 XFree (s); 3616 XFree (s);
3674 } 3617 }
3675 break; 3618 break;
3676 case 21: /* report window title */ 3619 case 21: /* report window title */
3677 { 3620 {
3678 char *s; 3621 char *s;
3679 XFetchName (disp, parent[0], &s); 3622 XFetchName (dpy, parent[0], &s);
3680 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3623 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3681 XFree (s); 3624 XFree (s);
3682 } 3625 }
3683 break; 3626 break;
3684 } 3627 }
3785void 3728void
3786rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3729rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3787{ 3730{
3788 if (str[0] == '?' && !str[1]) 3731 if (str[0] == '?' && !str[1])
3789 { 3732 {
3790 unsigned short r, g, b; 3733 rgba c;
3791 pix_colors_focused[color].get (display, r, g, b); 3734 pix_colors_focused[color].get (c);
3735
3736#if XFT
3737 if (c.a != rgba::MAX_CC)
3738 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3739 else
3740#endif
3792 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3741 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3793 } 3742 }
3794 else 3743 else
3795 set_window_color (color, str); 3744 set_window_color (color, str);
3796} 3745}
3797 3746
3799 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3748 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3800 */ 3749 */
3801void 3750void
3802rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3751rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3803{ 3752{
3804 int changed = 0;
3805 int color; 3753 int color;
3806 char *buf, *name; 3754 char *buf, *name;
3807 bool query = str[0] == '?' && !str[1]; 3755 bool query = str[0] == '?' && !str[1];
3808 int saveop = op; 3756 int saveop = op;
3809 dDisp; 3757
3758 dLocal (Display *, dpy);
3810 3759
3811 assert (str != NULL); 3760 assert (str != NULL);
3812 switch (op) 3761 switch (op)
3813 { 3762 {
3814 case XTerm_name: 3763 case XTerm_name:
3830 unsigned long bytes_after; 3779 unsigned long bytes_after;
3831 unsigned char *value = 0; 3780 unsigned char *value = 0;
3832 const char *str = ""; 3781 const char *str = "";
3833 3782
3834 if (prop 3783 if (prop
3835 && XGetWindowProperty (disp, parent[0], 3784 && XGetWindowProperty (dpy, parent[0],
3836 prop, 0, 1<<16, 0, AnyPropertyType, 3785 prop, 0, 1<<16, 0, AnyPropertyType,
3837 &actual_type, &actual_format, 3786 &actual_type, &actual_format,
3838 &nitems, &bytes_after, &value) == Success 3787 &nitems, &bytes_after, &value) == Success
3839 && actual_type != None 3788 && actual_type != None
3840 && actual_format == 8) 3789 && actual_format == 8)
3841 str = (const char *)(value); 3790 str = (const char *)(value);
3842 3791
3843 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3792 tt_printf ("\033]%d;%s%c", op, str, resp);
3844 3793
3845 XFree (value); 3794 XFree (value);
3846 } 3795 }
3847 else 3796 else
3848 { 3797 {
3852 { 3801 {
3853 *eq = 0; 3802 *eq = 0;
3854 set_utf8_property (display->atom (str), eq + 1); 3803 set_utf8_property (display->atom (str), eq + 1);
3855 } 3804 }
3856 else 3805 else
3857 XDeleteProperty (disp, parent[0], 3806 XDeleteProperty (dpy, parent[0],
3858 display->atom (str)); 3807 display->atom (str));
3859 } 3808 }
3860 break; 3809 break;
3861 3810
3862 case XTerm_Color: 3811 case XTerm_Color:
3872 break; 3821 break;
3873 3822
3874 if ((buf = strchr (name, ';')) != NULL) 3823 if ((buf = strchr (name, ';')) != NULL)
3875 *buf++ = '\0'; 3824 *buf++ = '\0';
3876 3825
3877 if (name[0] == '?' && !name[1]) 3826 process_color_seq (op, color, name, resp);
3878 {
3879 unsigned short r, g, b;
3880 pix_colors_focused[color].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, name);
3885 } 3827 }
3886 break; 3828 break;
3887 case XTerm_Color00: 3829 case XTerm_Color00:
3888 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3830 process_color_seq (op, Color_fg, str, resp);
3889 break; 3831 break;
3890 case XTerm_Color01: 3832 case XTerm_Color01:
3891 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3833 process_color_seq (op, Color_bg, str, resp);
3892 break; 3834 break;
3893#ifndef NO_CURSORCOLOR 3835#ifndef NO_CURSORCOLOR
3894 case XTerm_Color_cursor: 3836 case XTerm_Color_cursor:
3895 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3837 process_color_seq (op, Color_cursor, str, resp);
3896 break; 3838 break;
3897#endif 3839#endif
3898 case XTerm_Color_pointer_fg: 3840 case XTerm_Color_pointer_fg:
3899 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3841 process_color_seq (op, Color_pointer_fg, str, resp);
3900 break; 3842 break;
3901 case XTerm_Color_pointer_bg: 3843 case XTerm_Color_pointer_bg:
3902 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3844 process_color_seq (op, Color_pointer_bg, str, resp);
3903 break; 3845 break;
3904#ifndef NO_BOLD_UNDERLINE_REVERSE 3846#ifndef NO_BOLD_UNDERLINE_REVERSE
3905 case XTerm_Color_RV: 3847 case XTerm_Color_RV:
3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3848 process_color_seq (op, Color_RV, str, resp);
3907 break; 3849 break;
3908 case Rxvt_Color_BD: 3850 case Rxvt_Color_BD:
3909 case URxvt_Color_BD: 3851 case URxvt_Color_BD:
3910 process_color_seq (op, Color_BD, str, resp); 3852 process_color_seq (op, Color_BD, str, resp);
3911 break; 3853 break;
3912 case Rxvt_Color_UL: 3854 case Rxvt_Color_UL:
3913 case URxvt_Color_UL: 3855 case URxvt_Color_UL:
3914 process_color_seq (op, Color_UL, str, resp); 3856 process_color_seq (op, Color_UL, str, resp);
3915 break; 3857 break;
3916 case URxvt_Color_IT: 3858 case URxvt_Color_IT:
3917 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3859 process_color_seq (op, Color_IT, str, resp);
3918 break; 3860 break;
3919#endif 3861#endif
3920#if TRANSPARENT && TINTING 3862#if TRANSPARENT && TINTING
3921 case URxvt_Color_tint: 3863 case URxvt_Color_tint:
3922 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3864 process_color_seq (op, Color_tint, str, resp);
3865
3923 check_our_parents (); 3866 check_our_parents ();
3867
3924 if (am_transparent) 3868 if (am_transparent)
3925 want_full_refresh = want_refresh = 1; 3869 want_full_refresh = want_refresh = 1;
3870
3926 break; 3871 break;
3927#endif 3872#endif
3928 3873
3929 case Rxvt_Pixmap: 3874 case Rxvt_Pixmap:
3875 {
3930 if (*str != ';') 3876 if (*str != ';')
3931 { 3877 {
3932#if XPM_BACKGROUND 3878#if XPM_BACKGROUND
3933 scale_pixmap (""); /* reset to default scaling */ 3879 scale_pixmap (""); /* reset to default scaling */
3934 set_bgPixmap (str); /* change pixmap */ 3880 set_bgPixmap (str); /* change pixmap */
3935 scr_touch (true); 3881 scr_touch (true);
3936#endif 3882#endif
3937 } 3883 }
3938 3884
3885 int changed = 0;
3886
3939 while ((str = strchr (str, ';')) != NULL) 3887 while ((str = strchr (str, ';')) != NULL)
3940 { 3888 {
3941 str++; 3889 str++;
3942#if XPM_BACKGROUND 3890#if XPM_BACKGROUND
3943 changed += scale_pixmap (str); 3891 changed += scale_pixmap (str);
3944#endif 3892#endif
3945 } 3893 }
3946 3894
3947 if (changed) 3895 if (changed)
3948 { 3896 {
3949#ifdef XPM_BACKGROUND 3897#ifdef XPM_BACKGROUND
3950 resize_pixmap (); 3898 resize_pixmap ();
3951 scr_touch (true); 3899 scr_touch (true);
3952#endif 3900#endif
3953 } 3901 }
3902 }
3954 break; 3903 break;
3955 3904
3956 case Rxvt_restoreFG: 3905 case Rxvt_restoreFG:
3957 set_window_color (Color_fg, str); 3906 set_window_color (Color_fg, str);
3958 break; 3907 break;
3962 3911
3963 case XTerm_logfile: 3912 case XTerm_logfile:
3964 // TODO, when secure mode? 3913 // TODO, when secure mode?
3965 break; 3914 break;
3966 3915
3967#ifdef MENUBAR
3968 case URxvt_Menu:
3969 if (OPTION (Opt_insecure))
3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3971 break;
3972#endif
3973#if 0 3916#if 0
3974 case Rxvt_dumpscreen: /* no error notices */ 3917 case Rxvt_dumpscreen: /* no error notices */
3975 { 3918 {
3976 int fd; 3919 int fd;
3977 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3920 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
4003 allocated.push_back ((void *)res); 3946 allocated.push_back ((void *)res);
4004 set_fonts (); 3947 set_fonts ();
4005 } 3948 }
4006 break; 3949 break;
4007 3950
4008#if ENABLE_FRILLS 3951 case URxvt_version:
3952 if (query)
3953 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3954 op,
3955 rs[Rs_name], VERSION[0], VERSION[2],
3956 resp);
3957 break;
3958
3959#if !ENABLE_MINIMAL
4009 case URxvt_locale: 3960 case URxvt_locale:
4010 if (query) 3961 if (query)
4011 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3962 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4012 else 3963 else
4013 { 3964 {
4014 set_locale (str); 3965 set_locale (str);
4015 pty.set_utf8_mode (enc_utf8); 3966 pty->set_utf8_mode (enc_utf8);
4016 init_xlocale (); 3967 init_xlocale ();
4017 } 3968 }
4018 break; 3969 break;
4019 3970
4020 case URxvt_view_up: 3971 case URxvt_view_up:
4073 return state; 4024 return state;
4074} 4025}
4075 4026
4076/* we're not using priv _yet_ */ 4027/* we're not using priv _yet_ */
4077void 4028void
4078rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4029rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4079{ 4030{
4080 unsigned int i, j; 4031 unsigned int i, j;
4081 int state; 4032 int state;
4082 4033
4083 static const struct 4034 static const struct
4094 { 5, PrivMode_rVideo }, 4045 { 5, PrivMode_rVideo },
4095 { 6, PrivMode_relOrigin }, 4046 { 6, PrivMode_relOrigin },
4096 { 7, PrivMode_Autowrap }, 4047 { 7, PrivMode_Autowrap },
4097 // 8, bi-directional support mode 4048 // 8, bi-directional support mode
4098 { 9, PrivMode_MouseX10 }, 4049 { 9, PrivMode_MouseX10 },
4099#ifdef menuBar_esc
4100 { menuBar_esc, PrivMode_menuBar },
4101#endif
4102 // 18, 19 printing-related 4050 // 18, 19 printing-related
4103 { 25, PrivMode_VisibleCursor }, 4051 { 25, PrivMode_VisibleCursor },
4104#ifdef scrollBar_esc 4052#ifdef scrollBar_esc
4105 { scrollBar_esc, PrivMode_scrollBar }, 4053 { scrollBar_esc, PrivMode_scrollBar },
4106#endif 4054#endif
4201 /* case 8: - auto repeat, can't do on a per window basis */ 4149 /* case 8: - auto repeat, can't do on a per window basis */
4202 case 9: /* X10 mouse reporting */ 4150 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 4151 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 4152 priv_modes &= ~PrivMode_MouseX11;
4205 break; 4153 break;
4206#ifdef menuBar_esc
4207 case menuBar_esc:
4208#ifdef MENUBAR
4209 map_menuBar (state);
4210#endif
4211 break;
4212#endif
4213#ifdef scrollBar_esc 4154#ifdef scrollBar_esc
4214 case scrollBar_esc: 4155 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 4156 if (scrollbar_mapping (state))
4216 { 4157 {
4217 resize_all_windows (0, 0, 0); 4158 resize_all_windows (0, 0, 0);
4387 scr_color (Color_bg, Color_bg); 4328 scr_color (Color_bg, Color_bg);
4388 break; 4329 break;
4389 4330
4390 //case 50: // not variable spacing 4331 //case 50: // not variable spacing
4391 4332
4392#if ENABLE_FRILLS 4333#if !ENABLE_MINIMAL
4393 case 90: 4334 case 90:
4394 case 91: /* set bright fg color */ 4335 case 91: /* set bright fg color */
4395 case 92: 4336 case 92:
4396 case 93: 4337 case 93:
4397 case 94: 4338 case 94:
4462rxvt_term::tt_write (const char *data, unsigned int len) 4403rxvt_term::tt_write (const char *data, unsigned int len)
4463{ 4404{
4464 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4405 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4465 return; 4406 return;
4466 4407
4467 if (pty.pty < 0) 4408 if (pty->pty < 0)
4468 return; 4409 return;
4469 4410
4470 if (v_buflen == 0) 4411 if (v_buflen == 0)
4471 { 4412 {
4472 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4413 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4473 4414
4474 if ((unsigned int)written == len) 4415 if ((unsigned int)written == len)
4475 return; 4416 return;
4476 4417
4477 data += written; 4418 data += written;
4486 pty_ev.set (EVENT_READ | EVENT_WRITE); 4427 pty_ev.set (EVENT_READ | EVENT_WRITE);
4487} 4428}
4488 4429
4489void rxvt_term::pty_write () 4430void rxvt_term::pty_write ()
4490{ 4431{
4491 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4432 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4492 4433
4493 if (written > 0) 4434 if (written > 0)
4494 { 4435 {
4495 v_buflen -= written; 4436 v_buflen -= written;
4496 4437

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines