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.242 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.287 by root, Sat Jan 28 20:08:05 2006 UTC

64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2) 73#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
147 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 145 return;
149 146
150 for (;;) 147 for (;;)
151 { 148 {
152 const line_t &l = ROW(y - view_start); 149 const line_t &l = ROW(y + view_start);
153 150
154 text_t t = l.t[x]; 151 text_t t = l.t[x];
155 152
156 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
157 { 154 {
302rxvt_term::lookup_key (XKeyEvent &ev) 299rxvt_term::lookup_key (XKeyEvent &ev)
303{ 300{
304 int ctrl, meta, shft, len; 301 int ctrl, meta, shft, len;
305 unsigned int newlen; 302 unsigned int newlen;
306 KeySym keysym; 303 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 304 int valid_keysym;
311 char kbuf[KBUFSZ]; 305 char kbuf[KBUFSZ];
312 306
313 /* 307 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
443 scr_move_to (0, 1); 437 scr_move_to (0, 1);
444 return; 438 return;
445 } 439 }
446 else if (keysym == XK_End) 440 else if (keysym == XK_End)
447 { 441 {
448 scr_move_to (1, 0); 442 scr_move_to (1, 1);
449 return; 443 return;
450 } 444 }
451 } 445 }
452#endif 446#endif
453 } 447 }
464 { 458 {
465 switch (keysym) 459 switch (keysym)
466 { 460 {
467 /* normal XTerm key bindings */ 461 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 462 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 463 selection_request (ev.time);
470 return; 464 return;
471#if TODO 465#if TODO
472 /* rxvt extras */ 466 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 467 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 468 change_font (FONT_UP);
867#endif 861#endif
868 /* nil */ ; 862 /* nil */ ;
869 } 863 }
870 } 864 }
871 865
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END))) 866 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 867 return;
874 868
875 if (len <= 0) 869 if (len <= 0)
876 return; /* not mapped */ 870 return; /* not mapped */
877 871
905 { 899 {
906 const char ch = C0_ESC; 900 const char ch = C0_ESC;
907 tt_write (&ch, 1); 901 tt_write (&ch, 1);
908 } 902 }
909 903
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); 904 tt_write (kbuf, (unsigned int)len);
921} 905}
922/*}}} */ 906/*}}} */
923 907
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 908#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 909unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 910rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 911{
930 unsigned int n, s; 912 unsigned int n, s;
931 913
972 954
973 if (want_refresh) 955 if (want_refresh)
974 { 956 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 957 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 958 {
977 int row = -view_start; 959 int row = view_start;
960 int end_row = row + nrow;
978 961
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 962 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 963 --row;
981 964
982 while (row < -view_start + nrow) 965 do
983 { 966 {
984 int start_row = row; 967 int start_row = row;
985 line_t *l; 968 line_t *l;
986 969
987 do 970 do
988 { 971 {
989 l = &ROW (row); 972 l = &ROW (row++);
990 973
991 if (!(l->f & LINE_FILTERED)) 974 if (!(l->f & LINE_FILTERED))
992 { 975 {
993 // line not filtered, mark it as filtered 976 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 977 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 978 while (l->is_longer ())
996 { 979 {
997 l = &ROW (++row); 980 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 981 l->f |= LINE_FILTERED;
999 } 982 }
1000 983
1001 // and filter it 984 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 985 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 986
1004 break; 987 break;
1005 } 988 }
1006 } 989 }
1007 while (l->is_longer ()); 990 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 991 }
992 while (row < end_row);
1011 993 }
1012 }
1013 994
1014 scr_refresh (refresh_type); 995 scr_refresh ();
1015 scrollbar_show (1); 996 scrollbar_show (1);
1016#ifdef USE_XIM 997#ifdef USE_XIM
1017 IMSendSpot (); 998 IMSendSpot ();
1018#endif 999#endif
1019 } 1000 }
1022} 1003}
1023 1004
1024void 1005void
1025rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::check_cb (check_watcher &w)
1026{ 1007{
1027 SET_R (this); 1008 make_current ();
1028 SET_LOCALE (locale);
1029 1009
1030 display->flush (); 1010 display->flush ();
1031 1011
1032 if (want_refresh && !flush_ev.active) 1012 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1013 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034} 1014}
1035 1015
1036void 1016void
1037rxvt_term::flush_cb (time_watcher &w) 1017rxvt_term::flush_cb (time_watcher &w)
1038{ 1018{
1039 SET_R (this); 1019 make_current ();
1040 SET_LOCALE (locale);
1041 1020
1042 refresh_limit = 1; 1021 refresh_limit = 1;
1043 refresh_count = 0; 1022 refresh_count = 0;
1044 flush (); 1023 flush ();
1045} 1024}
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1028rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1029{
1051 hidden_cursor = !hidden_cursor; 1030 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1031 want_refresh = 1;
1053 1032
1054 w.start (w.at + BLINK_INTERVAL); 1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1034}
1056#endif 1035#endif
1057 1036
1058#ifdef TEXT_BLINK 1037#ifdef TEXT_BLINK
1059void 1038void
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1052rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1053{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1054 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1055 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1056 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1057 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1059 }
1082} 1060}
1083#endif 1061#endif
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1065rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1066{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1067 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1068 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1069 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1070 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1072 }
1096} 1073}
1097#endif 1074#endif
1102{ 1079{
1103 if (mouse_slip_wheel_speed == 0 1080 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1081 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1082 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1083 {
1107 if (view_start == nsaved || 1084 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1085 mouse_slip_wheel_speed = 0;
1110 1086
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1087 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1089 }
1115} 1090}
1116#endif 1091#endif
1146 1121
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1122 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1123 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1124 cmdbuf_endp = cmdbuf_ptr + n;
1150 1125
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1126 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1127
1153 if (r > 0) 1128 if (r > 0)
1154 { 1129 {
1155 cmdbuf_endp += r; 1130 cmdbuf_endp += r;
1156 return true; 1131 return true;
1174} 1149}
1175 1150
1176void 1151void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1152rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1153{
1179 SET_R (this); 1154 make_current ();
1180 SET_LOCALE (locale);
1181 1155
1182 if (revents & EVENT_READ) 1156 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1157 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1158 while (pty_fill ())
1185 if (cmd_parse ()) 1159 if (cmd_parse ())
1190} 1164}
1191 1165
1192void 1166void
1193rxvt_term::pointer_unblank () 1167rxvt_term::pointer_unblank ()
1194{ 1168{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1169 XDefineCursor (xdisp, vt, TermWin_cursor);
1196 recolour_cursor (); 1170 recolour_cursor ();
1197 1171
1198#ifdef POINTER_BLANK 1172#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1173 hidden_pointer = 0;
1200 1174
1208rxvt_term::pointer_blank () 1182rxvt_term::pointer_blank ()
1209{ 1183{
1210 if (!OPTION (Opt_pointerBlank)) 1184 if (!OPTION (Opt_pointerBlank))
1211 return; 1185 return;
1212 1186
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1187 XDefineCursor (xdisp, vt, display->blank_cursor);
1214 XFlush (display->display); 1188 XFlush (xdisp);
1215 1189
1216 hidden_pointer = 1; 1190 hidden_pointer = 1;
1217} 1191}
1218 1192
1219void 1193void
1220rxvt_term::pointer_cb (time_watcher &w) 1194rxvt_term::pointer_cb (time_watcher &w)
1221{ 1195{
1222 SET_R (this); 1196 make_current ();
1223 SET_LOCALE (locale);
1224 1197
1225 pointer_blank (); 1198 pointer_blank ();
1226} 1199}
1227#endif 1200#endif
1228 1201
1293 (32 + button_number + key_state), 1266 (32 + button_number + key_state),
1294 (32 + x + 1), 1267 (32 + x + 1),
1295 (32 + y + 1)); 1268 (32 + y + 1));
1296} 1269}
1297 1270
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 */ 1271/*{{{ process an X event */
1309void 1272void
1310rxvt_term::x_cb (XEvent &ev) 1273rxvt_term::x_cb (XEvent &ev)
1311{ 1274{
1312 dDisp; 1275 make_current ();
1313 1276
1314 SET_R (this); 1277 dLocal (Display *, xdisp);
1315 SET_LOCALE (locale);
1316 1278
1317#if defined(CURSOR_BLINK) 1279 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1280 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1282 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1283
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1284 // 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; 1285 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1286 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1287 unsigned int unused_mask;
1347 1288
1348 switch (ev.type) 1289 switch (ev.type)
1355 1296
1356 break; 1297 break;
1357 1298
1358 case KeyRelease: 1299 case KeyRelease:
1359 { 1300 {
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1301#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1361 KeySym ks; 1302 KeySym keysym;
1362 1303
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1304 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif 1305#endif
1365 1306
1366#if ENABLE_FRILLS || ISO_14755 1307#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support 1308 // ISO 14755 support
1368 if (iso14755buf) 1309 if (iso14755buf)
1373# endif 1314# endif
1374# if ISO_14755 1315# if ISO_14755
1375 // iso14755 part 5.2 handling: release time 1316 // iso14755 part 5.2 handling: release time
1376 // first: controls 1317 // first: controls
1377 if ((ev.xkey.state & ControlMask) 1318 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f) 1319 && ((keysym >= 0x40 && keysym <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f))) 1320 || (keysym >= 0x61 && keysym <= 0x7f)))
1380 { 1321 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1322 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1382 commit_iso14755 (); 1323 commit_iso14755 ();
1383 return; // case-break; 1324 goto skip_switch;
1384 } 1325 }
1385 1326
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1327 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks) 1328 if (i[0] == keysym)
1388 { 1329 {
1389 iso14755buf = ISO_14755_51 | i[1]; 1330 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 (); 1331 commit_iso14755 ();
1391 return; // case-break; 1332 goto skip_switch;
1392 } 1333 }
1393 1334
1394 scr_bell (); 1335 scr_bell ();
1395# endif 1336# endif
1396 iso14755buf = 0; 1337 iso14755buf = 0;
1415 else 1356 else
1416 iso14755buf = 0; 1357 iso14755buf = 0;
1417 } 1358 }
1418#endif 1359#endif
1419 1360
1361 if (ev.xany.window == vt
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1362 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1421 break; 1363 break;
1422 1364
1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1365#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424 if (!(ev.xkey.state & ControlMask)) 1366 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop (); 1367 slip_wheel_ev.stop ();
1426 else if (ks == XK_Control_L || ks == XK_Control_R) 1368 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1427 mouse_slip_wheel_speed = 0; 1369 mouse_slip_wheel_speed = 0;
1428#endif 1370#endif
1429 break; 1371 break;
1430 } 1372 }
1431 1373
1437 button_release (ev.xbutton); 1379 button_release (ev.xbutton);
1438 break; 1380 break;
1439 1381
1440 case ClientMessage: 1382 case ClientMessage:
1441 if (ev.xclient.format == 32 1383 if (ev.xclient.format == 32
1442 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1384 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1443 { 1385 {
1386 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1387 {
1388 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1389 {
1444 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1390 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1391 {
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1445 destroy (); 1393 destroy ();
1394 }
1446#if ENABLE_EWMH 1395#if ENABLE_EWMH
1447 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1448 XSendEvent (disp, ev.xclient.window = display->root, 1397 XSendEvent (xdisp, ev.xclient.window = display->root,
1449 False, SubstructureRedirectMask | SubstructureNotifyMask, 1398 False, SubstructureRedirectMask | SubstructureNotifyMask,
1450 &ev); 1399 &ev);
1400#endif
1401 }
1402 }
1403#if ENABLE_XEMBED
1404 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1405 {
1406 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1407 focus_in ();
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out ();
1410 }
1451#endif 1411#endif
1452 } 1412 }
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; 1413 break;
1489 1414
1490 case MappingNotify: 1415 case MappingNotify:
1491 XRefreshKeyboardMapping (&ev.xmapping); 1416 XRefreshKeyboardMapping (&ev.xmapping);
1492 break; 1417 break;
1525 break; 1450 break;
1526 1451
1527 case ConfigureNotify: 1452 case ConfigureNotify:
1528 if (ev.xconfigure.window == parent[0]) 1453 if (ev.xconfigure.window == parent[0])
1529 { 1454 {
1530 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1531 ; 1456 ;
1532 1457
1533 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1534 { 1459 {
1535 seen_resize = 1; 1460 seen_resize = 1;
1536 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1537 } 1462 }
1538 1463
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1539#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1540 if (OPTION (Opt_transparent)) 1467 if (OPTION (Opt_transparent))
1541 check_our_parents (); 1468 check_our_parents ();
1542#endif 1469#endif
1543 } 1470 }
1544 break; 1471 break;
1545 1472
1546 case PropertyNotify: 1473 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1547 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1548 && ev.xproperty.state == PropertyNewValue) 1476 && ev.xproperty.state == PropertyNewValue)
1549 selection_property (ev.xproperty.window, ev.xproperty.atom); 1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1550 1478
1551 break; 1479 break;
1552 1480
1553 case SelectionClear: 1481 case SelectionClear:
1554 selection_clear (); 1482 selection_clear ();
1559 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1560 break; 1488 break;
1561 1489
1562 case SelectionRequest: 1490 case SelectionRequest:
1563 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1492 break;
1493
1494 case MapNotify:
1495 mapped = 1;
1496#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1498#endif
1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1564 break; 1500 break;
1565 1501
1566 case UnmapNotify: 1502 case UnmapNotify:
1567 mapped = 0; 1503 mapped = 0;
1568#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1569 text_blink_ev.stop (); 1505 text_blink_ev.stop ();
1570#endif 1506#endif
1571 break; 1507 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; 1508 break;
1579 1509
1580#ifdef TRANSPARENT 1510#ifdef TRANSPARENT
1581 case ReparentNotify: 1511 case ReparentNotify:
1582 rootwin_cb (ev); 1512 rootwin_cb (ev);
1588 if (ev.xany.window == vt) 1518 if (ev.xany.window == vt)
1589 { 1519 {
1590 do 1520 do
1591 scr_expose (ev.xexpose.x, ev.xexpose.y, 1521 scr_expose (ev.xexpose.x, ev.xexpose.y,
1592 ev.xexpose.width, ev.xexpose.height, False); 1522 ev.xexpose.width, ev.xexpose.height, False);
1593 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1594 1524
1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1596 1526
1597 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1598 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1599 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1600 1530
1601 scr_refresh (refresh_type); 1531 want_refresh = 1;
1602 } 1532 }
1603 else 1533 else
1604 { 1534 {
1605 XEvent unused_event; 1535 XEvent unused_event;
1606 1536
1607 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1608 ; 1538 ;
1609 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1610 ; 1540 ;
1611 1541
1612 if (isScrollbarWindow (ev.xany.window)) 1542 if (isScrollbarWindow (ev.xany.window))
1613 { 1543 {
1614 scrollBar.setIdle (); 1544 scrollBar.setIdle ();
1615 scrollbar_show (0); 1545 scrollbar_show (0);
1616 } 1546 }
1617#ifdef MENUBAR
1618 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1619 menubar_expose ();
1620#endif
1621 1547
1622#ifdef TRANSPARENT 1548#ifdef TRANSPARENT
1623 if (am_transparent && ev.xany.window == parent[0]) 1549 if (am_transparent && ev.xany.window == parent[0])
1624 XClearWindow (disp, ev.xany.window); 1550 XClearWindow (xdisp, ev.xany.window);
1625#endif 1551#endif
1626 } 1552 }
1627 break; 1553 break;
1628 1554
1629 case MotionNotify: 1555 case MotionNotify:
1630#ifdef POINTER_BLANK 1556#ifdef POINTER_BLANK
1631 if (hidden_pointer) 1557 if (hidden_pointer)
1632 pointer_unblank (); 1558 pointer_unblank ();
1633#endif 1559#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) 1560 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1642 break; 1561 break;
1643 1562
1644 if (ev.xany.window == vt) 1563 if (ev.xany.window == vt)
1645 { 1564 {
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop 1567 ; // nop
1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1649 { 1569 {
1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1651 ; 1571 ;
1652 1572
1653 XQueryPointer (disp, vt, 1573 XQueryPointer (xdisp, vt,
1654 &unused_root, &unused_child, 1574 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1575 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1576 &ev.xbutton.x, &ev.xbutton.y,
1657 &ev.xbutton.state); 1577 &ev.xbutton.state);
1658#ifdef MOUSE_THRESHOLD 1578#ifdef MOUSE_THRESHOLD
1722#endif 1642#endif
1723 } 1643 }
1724 } 1644 }
1725 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1726 { 1646 {
1727 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1728 MotionNotify, &ev)) 1648 MotionNotify, &ev))
1729 ; 1649 ;
1730 1650
1731 XQueryPointer (disp, scrollBar.win, 1651 XQueryPointer (xdisp, scrollBar.win,
1732 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1733 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1734 &ev.xbutton.x, &ev.xbutton.y, 1654 &ev.xbutton.x, &ev.xbutton.y,
1735 &unused_mask); 1655 &unused_mask);
1736 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1737 scrollbar_size ()); 1657 scrollbar_size ());
1738 scr_refresh (refresh_type); 1658 want_refresh = 1;
1739 refresh_limit = 0; 1659 refresh_limit = 0;
1740 scrollbar_show (1); 1660 scrollbar_show (1);
1741 } 1661 }
1742 break; 1662 break;
1743 } 1663 }
1664
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1669 {
1670 if (hidden_cursor)
1671 {
1672 hidden_cursor = 0;
1673 want_refresh = 1;
1674 }
1675
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1677 }
1678#endif
1679
1680#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 {
1683 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease)
1686 if (hidden_pointer)
1687 pointer_unblank ();
1688
1689 if (ev.type == KeyPress && hidden_pointer == 0)
1690 pointer_blank ();
1691 }
1692#endif
1744} 1693}
1745 1694
1746void 1695void
1747rxvt_term::focus_in () 1696rxvt_term::focus_in ()
1748{ 1697{
1760 XSetICFocus (Input_Context); 1709 XSetICFocus (Input_Context);
1761 } 1710 }
1762#endif 1711#endif
1763#if CURSOR_BLINK 1712#if CURSOR_BLINK
1764 if (OPTION (Opt_cursorBlink)) 1713 if (OPTION (Opt_cursorBlink))
1765 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1766#endif 1715#endif
1767#if OFF_FOCUS_FADING 1716#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1717 if (rs[Rs_fade])
1769 { 1718 {
1770 pix_colors = pix_colors_focused; 1719 pix_colors = pix_colors_focused;
1814 1763
1815#if TRANSPARENT 1764#if TRANSPARENT
1816void 1765void
1817rxvt_term::rootwin_cb (XEvent &ev) 1766rxvt_term::rootwin_cb (XEvent &ev)
1818{ 1767{
1819 SET_R (this); 1768 make_current ();
1820 SET_LOCALE (locale);
1821 1769
1822 switch (ev.type) 1770 switch (ev.type)
1823 { 1771 {
1824 case PropertyNotify: 1772 case PropertyNotify:
1825 /* 1773 /*
1852 /* 1800 /*
1853 * VT window processing of button press 1801 * VT window processing of button press
1854 */ 1802 */
1855 if (ev.window == vt) 1803 if (ev.window == vt)
1856 { 1804 {
1805 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1857#if ISO_14755 1808#if ISO_14755
1858 // 5.4 1809 // 5.4
1859 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1860 { 1811 {
1861 iso14755_54 (ev.x, ev.y); 1812 iso14755_54 (ev.x, ev.y);
1873#ifdef MOUSE_REPORT_DOUBLECLICK 1824#ifdef MOUSE_REPORT_DOUBLECLICK
1874 if (ev.button == MEvent.button && clickintime) 1825 if (ev.button == MEvent.button && clickintime)
1875 { 1826 {
1876 /* same button, within alloted time */ 1827 /* same button, within alloted time */
1877 MEvent.clicks++; 1828 MEvent.clicks++;
1829
1878 if (MEvent.clicks > 1) 1830 if (MEvent.clicks > 1)
1879 { 1831 {
1880 /* only report double clicks */ 1832 /* only report double clicks */
1881 MEvent.clicks = 2; 1833 MEvent.clicks = 2;
1882 mouse_report (ev); 1834 mouse_report (ev);
1902 else 1854 else
1903 { 1855 {
1904 if (ev.button != MEvent.button) 1856 if (ev.button != MEvent.button)
1905 MEvent.clicks = 0; 1857 MEvent.clicks = 0;
1906 1858
1907 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1908 switch (ev.button) 1859 switch (ev.button)
1909 { 1860 {
1910 case Button1: 1861 case Button1:
1911 /* allow meta + click to select rectangular areas */ 1862 /* allow meta + click to select rectangular areas */
1912 /* should be done in screen.C */ 1863 /* should be done in screen.C */
1913#if ENABLE_FRILLS 1864#if ENABLE_FRILLS
1914 selection.rect = !!(ev.state & ModMetaMask); 1865 selection.rect = !!(ev.state & ModMetaMask);
1915#else 1866#else
1916 selection.rect = false; 1867 selection.rect = false;
1917#endif 1868#endif
1918 1869
1919 /* allow shift+left click to extend selection */ 1870 /* allow shift+left click to extend selection */
1920 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1871 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1921 { 1872 {
1922 if (MEvent.button == Button1 && clickintime) 1873 if (MEvent.button == Button1 && clickintime)
1923 selection_rotate (ev.x, ev.y); 1874 selection_rotate (ev.x, ev.y);
1924 else 1875 else
1925 selection_extend (ev.x, ev.y, 1); 1876 selection_extend (ev.x, ev.y, 1);
1926 } 1877 }
1927 else 1878 else
1928 { 1879 {
1929 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1930 MEvent.clicks++; 1881 MEvent.clicks++;
1931 else 1882 else
1932 MEvent.clicks = 1; 1883 MEvent.clicks = 1;
1933 1884
1934 selection_click (MEvent.clicks, ev.x, ev.y); 1885 selection_click (MEvent.clicks, ev.x, ev.y);
1935 } 1886 }
1936 1887
1937 MEvent.button = Button1; 1888 MEvent.button = Button1;
1938 break; 1889 break;
1939 1890
1940 case Button3: 1891 case Button3:
1941 if (MEvent.button == Button3 && clickintime) 1892 if (MEvent.button == Button3 && clickintime)
1942 selection_rotate (ev.x, ev.y); 1893 selection_rotate (ev.x, ev.y);
1943 else 1894 else
1944 selection_extend (ev.x, ev.y, 1); 1895 selection_extend (ev.x, ev.y, 1);
1945 1896
1946 MEvent.button = Button3; 1897 MEvent.button = Button3;
1947 break; 1898 break;
1948 } 1899 }
1949 } 1900 }
1950 1901
1951 MEvent.time = ev.time; 1902 MEvent.time = ev.time;
1952 return; 1903 return;
1953 } 1904 }
1954 1905
2090 } 2041 }
2091 2042
2092 break; 2043 break;
2093 } 2044 }
2094 } 2045 }
2046
2095 return; 2047 return;
2096 } 2048 }
2097#if MENUBAR
2098 /*
2099 * Menubar window processing of button press
2100 */
2101 if (isMenuBarWindow (ev.window))
2102 menubar_control (ev);
2103#endif
2104} 2049}
2105 2050
2106void 2051void
2107rxvt_term::button_release (XButtonEvent &ev) 2052rxvt_term::button_release (XButtonEvent &ev)
2108{ 2053{
2114 2059
2115 if (scrollbar_isUpDn ()) 2060 if (scrollbar_isUpDn ())
2116 { 2061 {
2117 scrollBar.setIdle (); 2062 scrollBar.setIdle ();
2118 scrollbar_show (0); 2063 scrollbar_show (0);
2119#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2120 refresh_type &= ~SMOOTH_REFRESH;
2121#endif
2122 } 2064 }
2123 2065
2124#ifdef SELECTION_SCROLLING 2066#ifdef SELECTION_SCROLLING
2125 if (sel_scroll_ev.active) 2067 if (sel_scroll_ev.active)
2126 sel_scroll_ev.stop(); 2068 sel_scroll_ev.stop();
2127#endif 2069#endif
2128 2070
2129 if (ev.window == vt) 2071 if (ev.window == vt)
2130 { 2072 {
2073 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2074 return;
2075
2131#if ISO_14755 2076#if ISO_14755
2132 // 5.4 2077 // 5.4
2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2078 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2134 return; 2079 return;
2135#endif 2080#endif
2081
2136 if (reportmode) 2082 if (reportmode)
2137 { 2083 {
2138 /* mouse report from vt window */ 2084 /* mouse report from vt window */
2139 /* don't report release of wheel "buttons" */ 2085 /* don't report release of wheel "buttons" */
2140 if (ev.button >= 4) 2086 if (ev.button >= 4)
2164 if (priv_modes & PrivMode_mouse_report 2110 if (priv_modes & PrivMode_mouse_report
2165 && bypass_keystate 2111 && bypass_keystate
2166 && ev.button == Button1 && MEvent.clicks <= 1) 2112 && ev.button == Button1 && MEvent.clicks <= 1)
2167 selection_extend (ev.x, ev.y, 0); 2113 selection_extend (ev.x, ev.y, 0);
2168 2114
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return;
2171
2172 switch (ev.button) 2115 switch (ev.button)
2173 { 2116 {
2174 case Button1: 2117 case Button1:
2175 case Button3: 2118 case Button3:
2176 selection_make (ev.time); 2119 selection_make (ev.time);
2177 break; 2120 break;
2121
2178 case Button2: 2122 case Button2:
2179 selection_request (ev.time, ev.x, ev.y); 2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2180 break; 2125 break;
2126
2181#ifdef MOUSE_WHEEL 2127#ifdef MOUSE_WHEEL
2182 case Button4: 2128 case Button4:
2183 case Button5: 2129 case Button5:
2184 { 2130 {
2185 int i; 2131 int i;
2207 slip_wheel_ev.start (); 2153 slip_wheel_ev.start ();
2208 } 2154 }
2209 else 2155 else
2210 { 2156 {
2211# endif 2157# endif
2212# ifdef JUMP_MOUSE_WHEEL
2213 scr_page (v, i); 2158 scr_page (v, i);
2214 scr_refresh (SMOOTH_REFRESH);
2215 scrollbar_show (1); 2159 scrollbar_show (1);
2216# else
2217 while (i--)
2218 {
2219 scr_page (v, 1);
2220 scr_refresh (SMOOTH_REFRESH);
2221 scrollbar_show (1);
2222 }
2223# endif
2224# ifdef MOUSE_SLIP_WHEELING 2160# ifdef MOUSE_SLIP_WHEELING
2225 } 2161 }
2226#endif 2162# endif
2227 } 2163 }
2228 break; 2164 break;
2229#endif 2165#endif
2230 } 2166 }
2231 } 2167 }
2232#ifdef MENUBAR
2233 else if (isMenuBarWindow (ev.window))
2234 menubar_control (ev);
2235#endif
2236} 2168}
2237 2169
2238#ifdef TRANSPARENT 2170#ifdef TRANSPARENT
2239#if TINTING 2171#if TINTING
2240/* taken from aterm-0.4.2 */ 2172/* taken from aterm-0.4.2 */
2241 2173
2242typedef uint32_t RUINT32T; 2174typedef uint32_t RUINT32T;
2243 2175
2244void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2176void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2245{ 2177{
2246 int sh_r, sh_g, sh_b; 2178 int sh_r, sh_g, sh_b;
2247 RUINT32T mask_r, mask_g, mask_b; 2179 RUINT32T mask_r, mask_g, mask_b;
2248 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2249 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2250 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2251 int i; 2183 int i;
2252 2184
2253 Visual *visual = display->visual; 2185 Visual *visual = term->visual;
2254 2186
2255 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2256 2188
2257 /* for convenience */ 2189 /* for convenience */
2258 mask_r = visual->red_mask; 2190 mask_r = visual->red_mask;
2479 Atom atype; 2411 Atom atype;
2480 unsigned char *prop = NULL; 2412 unsigned char *prop = NULL;
2481 Window root, oldp, *list; 2413 Window root, oldp, *list;
2482 Pixmap rootpixmap = None; 2414 Pixmap rootpixmap = None;
2483 XWindowAttributes wattr, wrootattr; 2415 XWindowAttributes wattr, wrootattr;
2484 dDisp;
2485 2416
2486 pchanged = 0; 2417 pchanged = 0;
2487 2418
2488 if (!OPTION (Opt_transparent)) 2419 if (!OPTION (Opt_transparent))
2489 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2490 2421
2491 XGetWindowAttributes (disp, display->root, &wrootattr); 2422 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2492 rootdepth = wrootattr.depth; 2423 rootdepth = wrootattr.depth;
2493 2424
2494 XGetWindowAttributes (disp, parent[0], &wattr); 2425 XGetWindowAttributes (xdisp, parent[0], &wattr);
2495 2426
2496 if (rootdepth != wattr.depth) 2427 if (rootdepth != wattr.depth)
2497 { 2428 {
2498 if (am_transparent) 2429 if (am_transparent)
2499 { 2430 {
2500 pchanged = 1; 2431 pchanged = 1;
2501 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2502 am_transparent = am_pixmap_trans = 0; 2433 am_transparent = am_pixmap_trans = 0;
2503 } 2434 }
2504 2435
2505 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2506 } 2437 }
2507 2438
2508 /* Get all X ops out of the queue so that our information is up-to-date. */ 2439 /* Get all X ops out of the queue so that our information is up-to-date. */
2509 XSync (disp, False); 2440 XSync (xdisp, False);
2510 2441
2511 /* 2442 /*
2512 * Make the frame window set by the window manager have 2443 * Make the frame window set by the window manager have
2513 * the root background. Some window managers put multiple nested frame 2444 * the root background. Some window managers put multiple nested frame
2514 * windows for each client, so we have to take care about that. 2445 * windows for each client, so we have to take care about that.
2515 */ 2446 */
2516 i = (xa[XA_XROOTPMAP_ID] 2447 i = (xa[XA_XROOTPMAP_ID]
2517 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2518 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2519 &nitems, &bytes_after, &prop) == Success); 2450 &nitems, &bytes_after, &prop) == Success);
2520 2451
2521 if (!i || prop == NULL) 2452 if (!i || prop == NULL)
2522 i = (xa[XA_ESETROOT_PMAP_ID] 2453 i = (xa[XA_ESETROOT_PMAP_ID]
2523 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2524 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2525 &nitems, &bytes_after, &prop) == Success); 2456 &nitems, &bytes_after, &prop) == Success);
2526 2457
2527 if (!i || prop == NULL 2458 if (!i || prop == NULL
2528#if TINTING 2459#if TINTING
2547 Window cr; 2478 Window cr;
2548 XImage *image; 2479 XImage *image;
2549 GC gc; 2480 GC gc;
2550 XGCValues gcvalue; 2481 XGCValues gcvalue;
2551 2482
2552 XTranslateCoordinates (disp, parent[0], display->root, 2483 XTranslateCoordinates (xdisp, parent[0], display->root,
2553 0, 0, &sx, &sy, &cr); 2484 0, 0, &sx, &sy, &cr);
2554 nw = (unsigned int)szHint.width; 2485 nw = (unsigned int)szHint.width;
2555 nh = (unsigned int)szHint.height; 2486 nh = (unsigned int)szHint.height;
2556 nx = ny = 0; 2487 nx = ny = 0;
2557 2488
2570 } 2501 }
2571 2502
2572 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2503 min_it (nw, (unsigned int) (wrootattr.width - sx));
2573 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2504 min_it (nh, (unsigned int) (wrootattr.height - sy));
2574 2505
2575 XSync (disp, False); 2506 XSync (xdisp, False);
2576 allowedxerror = -1; 2507 allowedxerror = -1;
2577 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2578 2509
2579 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2580 /* XXX: may need a delay here? */ 2511 /* XXX: may need a delay here? */
2581 allowedxerror = 0; 2512 allowedxerror = 0;
2582 2513
2585 if (am_transparent && am_pixmap_trans) 2516 if (am_transparent && am_pixmap_trans)
2586 { 2517 {
2587 pchanged = 1; 2518 pchanged = 1;
2588 if (pixmap != None) 2519 if (pixmap != None)
2589 { 2520 {
2590 XFreePixmap (disp, pixmap); 2521 XFreePixmap (xdisp, pixmap);
2591 pixmap = None; 2522 pixmap = None;
2592 } 2523 }
2593 } 2524 }
2594 2525
2595 am_pixmap_trans = 0; 2526 am_pixmap_trans = 0;
2596 } 2527 }
2597 else 2528 else
2598 { 2529 {
2599 if (pixmap != None) 2530 if (pixmap != None)
2600 XFreePixmap (disp, pixmap); 2531 XFreePixmap (xdisp, pixmap);
2601 2532
2602#if TINTING 2533#if TINTING
2603 if (ISSET_PIXCOLOR (Color_tint)) 2534 if (ISSET_PIXCOLOR (Color_tint))
2604 { 2535 {
2605 unsigned short rm, gm, bm; 2536 unsigned short rm, gm, bm;
2606 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2607 2538
2608 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2609 2540
2610 ShadeXImage (display, image, shade, rm, gm, bm); 2541 ShadeXImage (this, image, shade, rm, gm, bm);
2611 } 2542 }
2612#endif 2543#endif
2613 2544
2614 pixmap = XCreatePixmap (disp, vt, 2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2615 szHint.width, szHint.height, image->depth);
2616 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2617 XPutImage (disp, pixmap, gc, image, 0, 0, 2547 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2618 nx, ny, image->width, image->height); 2548 nx, ny, image->width, image->height);
2619 XFreeGC (disp, gc); 2549 XFreeGC (xdisp, gc);
2620 XDestroyImage (image); 2550 XDestroyImage (image);
2621 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2622 XClearWindow (disp, parent[0]); 2552 XClearWindow (xdisp, parent[0]);
2623 2553
2624 if (!am_transparent || !am_pixmap_trans) 2554 if (!am_transparent || !am_pixmap_trans)
2625 pchanged = 1; 2555 pchanged = 1;
2626 2556
2627 am_transparent = am_pixmap_trans = 1; 2557 am_transparent = am_pixmap_trans = 1;
2628 } 2558 }
2629 } 2559 }
2630 2560
2631 if (am_pixmap_trans) 2561 if (am_pixmap_trans)
2632 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2633 else 2563 else
2634 { 2564 {
2635 unsigned int n; 2565 unsigned int n;
2636 /* 2566 /*
2637 * InheritPixmap transparency 2567 * InheritPixmap transparency
2638 */ 2568 */
2639 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2640 { 2570 {
2641 oldp = parent[i]; 2571 oldp = parent[i];
2642 XQueryTree (disp, parent[i - 1], &root, 2572 XQueryTree (xdisp, parent[i - 1], &root,
2643 &parent[i], &list, &n); 2573 &parent[i], &list, &n);
2644 XFree (list); 2574 XFree (list);
2645 2575
2646 if (parent[i] == display->root) 2576 if (parent[i] == display->root)
2647 { 2577 {
2659 2589
2660 if (pchanged) 2590 if (pchanged)
2661 { 2591 {
2662 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2663 { 2593 {
2664 XGetWindowAttributes (disp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2665 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2666 { 2596 {
2667 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2668 break; 2598 break;
2669 } 2599 }
2670 } 2600 }
2671 } 2601 }
2672 2602
2673 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2674 { 2604 {
2675 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2676 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2677 am_transparent = 0; 2607 am_transparent = 0;
2678 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2679 } 2609 }
2680 else 2610 else
2681 { 2611 {
2682#if WAIT_FOR_WM
2683 /* wait (an arbitrary period) for the WM to do its thing
2684 * needed for fvwm2.2.2 (and before?) */
2685 sleep (1);
2686#endif
2687 for (n = 0; n < (unsigned int)i; n++) 2612 for (n = 0; n < (unsigned int)i; n++)
2688 { 2613 {
2689 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2690 XClearWindow (disp, parent[n]); 2615 XClearWindow (xdisp, parent[n]);
2691 } 2616 }
2692 2617
2693 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2694 am_transparent = 1; 2619 am_transparent = 1;
2695 } 2620 }
2696 2621
2697 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2698 parent[i] = None; 2623 parent[i] = None;
2699 } 2624 }
2700 2625
2701 if (scrollBar.win) 2626 if (scrollBar.win)
2702 { 2627 {
2703 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2704 scrollBar.setIdle (); 2629 scrollBar.setIdle ();
2705 scrollbar_show (0); 2630 scrollbar_show (0);
2706 } 2631 }
2707 2632
2708 if (am_transparent) 2633 if (am_transparent)
2720 2645
2721bool 2646bool
2722rxvt_term::cmd_parse () 2647rxvt_term::cmd_parse ()
2723{ 2648{
2724 bool flag = false; 2649 bool flag = false;
2725 unicode_t ch = NOCHAR; 2650 wchar_t ch = NOCHAR;
2726 char *seq_begin; // remember start of esc-sequence here 2651 char *seq_begin; // remember start of esc-sequence here
2727 2652
2728 for (;;) 2653 for (;;)
2729 { 2654 {
2730 if (ch == NOCHAR) 2655 if (ch == NOCHAR)
2751 if (seen_resize && cmd_pid) 2676 if (seen_resize && cmd_pid)
2752 kill (-cmd_pid, SIGWINCH); 2677 kill (-cmd_pid, SIGWINCH);
2753 } 2678 }
2754 2679
2755 /* Read a text string from the input buffer */ 2680 /* Read a text string from the input buffer */
2756 unicode_t buf[UBUFSIZ]; 2681 wchar_t buf[UBUFSIZ];
2757 bool refreshnow = false; 2682 bool refreshnow = false;
2758 int nlines = 0; 2683 int nlines = 0;
2759 unicode_t *str = buf; 2684 wchar_t *str = buf;
2760 unicode_t *eol = str + min (ncol, UBUFSIZ); 2685 wchar_t *eol = str + min (ncol, UBUFSIZ);
2761 2686
2762 for (;;) 2687 for (;;)
2763 { 2688 {
2764 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2689 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2765 break; 2690 break;
2783 } 2708 }
2784 2709
2785 // scr_add_lines only works for nlines <= nrow - 1. 2710 // scr_add_lines only works for nlines <= nrow - 1.
2786 if (nlines >= nrow - 1) 2711 if (nlines >= nrow - 1)
2787 { 2712 {
2713 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2788 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2714 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789 scr_add_lines (buf, nlines, str - buf); 2715 scr_add_lines (buf, str - buf, nlines);
2790 2716
2791 nlines = 0; 2717 nlines = 0;
2792 str = buf; 2718 str = buf;
2793 eol = str + min (ncol, UBUFSIZ); 2719 eol = str + min (ncol, UBUFSIZ);
2794 } 2720 }
2808 2734
2809 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2810 ch = next_char (); 2736 ch = next_char ();
2811 } 2737 }
2812 2738
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2813 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2814 scr_add_lines (buf, nlines, str - buf); 2741 scr_add_lines (buf, str - buf, nlines);
2815 2742
2816 /* 2743 /*
2817 * If there have been a lot of new lines, then update the screen 2744 * If there have been a lot of new lines, then update the screen
2818 * What the heck I'll cheat and only refresh less than every page-full. 2745 * What the heck I'll cheat and only refresh less than every page-full.
2819 * the number of pages between refreshes is refresh_limit, which 2746 * the number of pages between refreshes is refresh_limit, which
2824 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2825 refresh_limit++; 2752 refresh_limit++;
2826 else 2753 else
2827 { 2754 {
2828 flag = true; 2755 flag = true;
2829 scr_refresh (refresh_type); 2756 scr_refresh ();
2830 flush_ev.stop (); 2757 want_refresh = 1;
2831 } 2758 }
2832 } 2759 }
2833 2760
2834 } 2761 }
2835 else 2762 else
2850 } 2777 }
2851 2778
2852 return flag; 2779 return flag;
2853} 2780}
2854 2781
2855// read the next octet
2856unicode_t
2857rxvt_term::next_octet ()
2858{
2859 return cmdbuf_ptr < cmdbuf_endp
2860 ? *cmdbuf_ptr++
2861 : NOCHAR;
2862}
2863
2864// read the next character 2782// read the next character
2865unicode_t 2783wchar_t
2866rxvt_term::next_char () 2784rxvt_term::next_char () NOTHROW
2867{ 2785{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2786 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2787 {
2870 // assume 7-bit to be ascii ALWAYS 2788 // assume 7-bit to be ascii ALWAYS
2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2880 cmdbuf_ptr = cmdbuf_endp; 2798 cmdbuf_ptr = cmdbuf_endp;
2881 break; 2799 break;
2882 } 2800 }
2883 2801
2884 if (len == (size_t)-1) 2802 if (len == (size_t)-1)
2885 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2803 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2886 2804
2887 // assume wchar == unicode 2805 // assume wchar == unicode
2888 cmdbuf_ptr += len; 2806 cmdbuf_ptr += len;
2889 return wc & UNICODE_MASK; 2807 return wc & UNICODE_MASK;
2890 } 2808 }
2891 2809
2892 return NOCHAR; 2810 return NOCHAR;
2893} 2811}
2812
2813// read the next octet
2814uint32_t
2815rxvt_term::next_octet () NOTHROW
2816{
2817 return cmdbuf_ptr < cmdbuf_endp
2818 ? (unsigned char)*cmdbuf_ptr++
2819 : NOCHAR;
2820}
2821
2822static class out_of_input out_of_input;
2894 2823
2895/* rxvt_cmd_getc () - Return next input character */ 2824/* rxvt_cmd_getc () - Return next input character */
2896/* 2825/*
2897 * Return the next input character after first passing any keyboard input 2826 * Return the next input character after first passing any keyboard input
2898 * to the command. 2827 * to the command.
2899 */ 2828 */
2900unicode_t 2829wchar_t
2901rxvt_term::cmd_getc () 2830rxvt_term::cmd_getc () THROW ((class out_of_input))
2902{ 2831{
2903 unicode_t c = next_char (); 2832 wchar_t c = next_char ();
2904 2833
2905 if (c == NOCHAR) 2834 if (c == NOCHAR)
2906 throw out_of_input; 2835 throw out_of_input;
2907 2836
2908 return c; 2837 return c;
2909} 2838}
2910 2839
2911unicode_t 2840uint32_t
2912rxvt_term::cmd_get8 () 2841rxvt_term::cmd_get8 () THROW ((class out_of_input))
2913{ 2842{
2914 unicode_t c = next_octet (); 2843 uint32_t c = next_octet ();
2915 2844
2916 if (c == NOCHAR) 2845 if (c == NOCHAR)
2917 throw out_of_input; 2846 throw out_of_input;
2918 2847
2919 return c; 2848 return c;
3186 break; 3115 break;
3187 3116
3188 /* 8.3.87: NEXT LINE */ 3117 /* 8.3.87: NEXT LINE */
3189 case C1_NEL: /* ESC E */ 3118 case C1_NEL: /* ESC E */
3190 { 3119 {
3191 unicode_t nlcr[] = { C0_LF, C0_CR }; 3120 wchar_t nlcr[] = { C0_LF, C0_CR };
3192 scr_add_lines (nlcr, 1, 2); 3121 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3193 } 3122 }
3194 break; 3123 break;
3195 3124
3196 /* kidnapped escape sequence: Should be 8.3.48 */ 3125 /* kidnapped escape sequence: Should be 8.3.48 */
3197 case C1_ESA: /* ESC G */ 3126 case C1_ESA: /* ESC G */
3338 ndef = get_byte_array_bit (csi_defaults, i); 3267 ndef = get_byte_array_bit (csi_defaults, i);
3339 for (p = 0; p < nargs; p++) 3268 for (p = 0; p < nargs; p++)
3340 if (arg[p] == -1) 3269 if (arg[p] == -1)
3341 arg[p] = ndef; 3270 arg[p] = ndef;
3342 3271
3343#ifdef DEBUG_CMD
3344 fprintf (stderr, "CSI ");
3345 for (p = 0; p < nargs; p++)
3346 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3347 fprintf (stderr, "%c\n", ch);
3348#endif
3349
3350 /* 3272 /*
3351 * private mode handling 3273 * private mode handling
3352 */ 3274 */
3353 if (priv) 3275 if (priv)
3354 { 3276 {
3355 switch (priv) 3277 switch (priv)
3356 { 3278 {
3357 case '>': 3279 case '>':
3358 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3281 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
3284 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 //
3359 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3289 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[2]);
3290 }
3360 break; 3291 break;
3361 case '?': 3292 case '?':
3362 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3363 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
3364 break; 3295 break;
3592rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3593{ 3524{
3594 int x, y; 3525 int x, y;
3595 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
3596 Window wdummy; 3527 Window wdummy;
3597 dDisp; 3528
3529 dLocal (Display *, xdisp);
3598 3530
3599 if (nargs == 0) 3531 if (nargs == 0)
3600 return; 3532 return;
3601 3533
3602 switch (args[0]) 3534 switch (args[0])
3603 { 3535 {
3604 /* 3536 /*
3605 * commands 3537 * commands
3606 */ 3538 */
3607 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
3608 XMapWindow (disp, parent[0]); 3540 XMapWindow (xdisp, parent[0]);
3609 break; 3541 break;
3610 case 2: /* iconify window */ 3542 case 2: /* iconify window */
3611 XIconifyWindow (disp, parent[0], display->screen); 3543 XIconifyWindow (xdisp, parent[0], display->screen);
3612 break; 3544 break;
3613 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
3614 XMoveWindow (disp, parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3615 break; 3547 break;
3616 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
3617 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3618 break; 3550 break;
3619 case 5: /* raise window */ 3551 case 5: /* raise window */
3620 XRaiseWindow (disp, parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
3621 break; 3553 break;
3622 case 6: /* lower window */ 3554 case 6: /* lower window */
3623 XLowerWindow (disp, parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
3624 break; 3556 break;
3625 case 7: /* refresh window */ 3557 case 7: /* refresh window */
3626 scr_touch (true); 3558 scr_touch (true);
3627 break; 3559 break;
3628 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
3640 3572
3641 /* 3573 /*
3642 * reports - some output format copied from XTerm 3574 * reports - some output format copied from XTerm
3643 */ 3575 */
3644 case 11: /* report window state */ 3576 case 11: /* report window state */
3645 XGetWindowAttributes (disp, parent[0], &wattr); 3577 XGetWindowAttributes (xdisp, parent[0], &wattr);
3646 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3647 break; 3579 break;
3648 case 13: /* report window position */ 3580 case 13: /* report window position */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3581 XGetWindowAttributes (xdisp, parent[0], &wattr);
3650 XTranslateCoordinates (disp, parent[0], wattr.root, 3582 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3651 -wattr.border_width, -wattr.border_width, 3583 -wattr.border_width, -wattr.border_width,
3652 &x, &y, &wdummy); 3584 &x, &y, &wdummy);
3653 tt_printf ("\033[3;%d;%dt", x, y); 3585 tt_printf ("\033[3;%d;%dt", x, y);
3654 break; 3586 break;
3655 case 14: /* report window size (pixels) */ 3587 case 14: /* report window size (pixels) */
3656 XGetWindowAttributes (disp, parent[0], &wattr); 3588 XGetWindowAttributes (xdisp, parent[0], &wattr);
3657 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3658 break; 3590 break;
3659 case 18: /* report text area size (chars) */ 3591 case 18: /* report text area size (chars) */
3660 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3592 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3661 break; 3593 break;
3663 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3595 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3664 break; 3596 break;
3665 case 20: /* report icon label */ 3597 case 20: /* report icon label */
3666 { 3598 {
3667 char *s; 3599 char *s;
3668 XGetIconName (disp, parent[0], &s); 3600 XGetIconName (xdisp, parent[0], &s);
3669 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3670 XFree (s); 3602 XFree (s);
3671 } 3603 }
3672 break; 3604 break;
3673 case 21: /* report window title */ 3605 case 21: /* report window title */
3674 { 3606 {
3675 char *s; 3607 char *s;
3676 XFetchName (disp, parent[0], &s); 3608 XFetchName (xdisp, parent[0], &s);
3677 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3678 XFree (s); 3610 XFree (s);
3679 } 3611 }
3680 break; 3612 break;
3681 } 3613 }
3783rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3784{ 3716{
3785 if (str[0] == '?' && !str[1]) 3717 if (str[0] == '?' && !str[1])
3786 { 3718 {
3787 unsigned short r, g, b; 3719 unsigned short r, g, b;
3788 pix_colors_focused[color].get (display, r, g, b); 3720 pix_colors_focused[color].get (this, r, g, b);
3789 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3790 } 3722 }
3791 else 3723 else
3792 set_window_color (color, str); 3724 set_window_color (color, str);
3793} 3725}
3796 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3728 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3797 */ 3729 */
3798void 3730void
3799rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3731rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3800{ 3732{
3801 int changed = 0;
3802 int color; 3733 int color;
3803 char *buf, *name; 3734 char *buf, *name;
3804 bool query = str[0] == '?' && !str[1]; 3735 bool query = str[0] == '?' && !str[1];
3805 int saveop = op; 3736 int saveop = op;
3806 dDisp; 3737
3738 dLocal (Display *, xdisp);
3807 3739
3808 assert (str != NULL); 3740 assert (str != NULL);
3809 switch (op) 3741 switch (op)
3810 { 3742 {
3811 case XTerm_name: 3743 case XTerm_name:
3827 unsigned long bytes_after; 3759 unsigned long bytes_after;
3828 unsigned char *value = 0; 3760 unsigned char *value = 0;
3829 const char *str = ""; 3761 const char *str = "";
3830 3762
3831 if (prop 3763 if (prop
3832 && XGetWindowProperty (disp, parent[0], 3764 && XGetWindowProperty (xdisp, parent[0],
3833 prop, 0, 1<<16, 0, AnyPropertyType, 3765 prop, 0, 1<<16, 0, AnyPropertyType,
3834 &actual_type, &actual_format, 3766 &actual_type, &actual_format,
3835 &nitems, &bytes_after, &value) == Success 3767 &nitems, &bytes_after, &value) == Success
3836 && actual_type != None 3768 && actual_type != None
3837 && actual_format == 8) 3769 && actual_format == 8)
3849 { 3781 {
3850 *eq = 0; 3782 *eq = 0;
3851 set_utf8_property (display->atom (str), eq + 1); 3783 set_utf8_property (display->atom (str), eq + 1);
3852 } 3784 }
3853 else 3785 else
3854 XDeleteProperty (disp, parent[0], 3786 XDeleteProperty (xdisp, parent[0],
3855 display->atom (str)); 3787 display->atom (str));
3856 } 3788 }
3857 break; 3789 break;
3858 3790
3859 case XTerm_Color: 3791 case XTerm_Color:
3861 { 3793 {
3862 if ((name = strchr (buf, ';')) == NULL) 3794 if ((name = strchr (buf, ';')) == NULL)
3863 break; 3795 break;
3864 3796
3865 *name++ = '\0'; 3797 *name++ = '\0';
3866 color = atoi (buf); 3798 color = atoi (buf) + minCOLOR;
3867 3799
3868 if (color < 0 || color >= TOTAL_COLORS) 3800 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3869 break; 3801 break;
3870 3802
3871 if ((buf = strchr (name, ';')) != NULL) 3803 if ((buf = strchr (name, ';')) != NULL)
3872 *buf++ = '\0'; 3804 *buf++ = '\0';
3873 3805
3874 if (name[0] == '?' && !name[1]) 3806 if (name[0] == '?' && !name[1])
3875 { 3807 {
3876 unsigned short r, g, b; 3808 unsigned short r, g, b;
3877 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3809 pix_colors_focused[color].get (this, r, g, b);
3878 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3879 } 3811 }
3880 else 3812 else
3881 set_window_color (color + minCOLOR, name); 3813 set_window_color (color, name);
3882 } 3814 }
3883 break; 3815 break;
3884 case XTerm_Color00: 3816 case XTerm_Color00:
3885 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3817 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3886 break; 3818 break;
3887 case XTerm_Color01: 3819 case XTerm_Color01:
3888 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3820 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3889 break; 3821 break;
3890#ifndef NO_CURSORCOLOR 3822#ifndef NO_CURSORCOLOR
3891 case XTerm_Color_cursor: 3823 case XTerm_Color_cursor:
3892 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3893 break; 3825 break;
3897 break; 3829 break;
3898 case XTerm_Color_pointer_bg: 3830 case XTerm_Color_pointer_bg:
3899 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3900 break; 3832 break;
3901#ifndef NO_BOLD_UNDERLINE_REVERSE 3833#ifndef NO_BOLD_UNDERLINE_REVERSE
3902 case XTerm_Color_BD:
3903 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3904 break;
3905 case XTerm_Color_UL:
3906 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3907 break;
3908 case XTerm_Color_RV: 3834 case XTerm_Color_RV:
3909 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3836 break;
3837 case Rxvt_Color_BD:
3838 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp);
3840 break;
3841 case Rxvt_Color_UL:
3842 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp);
3910 break; 3844 break;
3911 case URxvt_Color_IT: 3845 case URxvt_Color_IT:
3912 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3913 break; 3847 break;
3914#endif 3848#endif
3919 if (am_transparent) 3853 if (am_transparent)
3920 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3921 break; 3855 break;
3922#endif 3856#endif
3923 3857
3924 case XTerm_Pixmap: 3858 case Rxvt_Pixmap:
3859 {
3925 if (*str != ';') 3860 if (*str != ';')
3926 { 3861 {
3927#if XPM_BACKGROUND 3862#if XPM_BACKGROUND
3928 scale_pixmap (""); /* reset to default scaling */ 3863 scale_pixmap (""); /* reset to default scaling */
3929 set_bgPixmap (str); /* change pixmap */ 3864 set_bgPixmap (str); /* change pixmap */
3930#endif
3931 scr_touch (true); 3865 scr_touch (true);
3866#endif
3932 } 3867 }
3868
3869 int changed = 0;
3870
3933 while ((str = strchr (str, ';')) != NULL) 3871 while ((str = strchr (str, ';')) != NULL)
3934 { 3872 {
3935 str++; 3873 str++;
3936#if XPM_BACKGROUND 3874#if XPM_BACKGROUND
3937 changed += scale_pixmap (str); 3875 changed += scale_pixmap (str);
3938#endif 3876#endif
3939 } 3877 }
3940 3878
3941 if (changed) 3879 if (changed)
3942 { 3880 {
3943#ifdef XPM_BACKGROUND 3881#ifdef XPM_BACKGROUND
3944 resize_pixmap (); 3882 resize_pixmap ();
3945#endif
3946 scr_touch (true); 3883 scr_touch (true);
3884#endif
3947 } 3885 }
3886 }
3948 break; 3887 break;
3949 3888
3950 case XTerm_restoreFG: 3889 case Rxvt_restoreFG:
3951 set_window_color (Color_fg, str); 3890 set_window_color (Color_fg, str);
3952 break; 3891 break;
3953 case XTerm_restoreBG: 3892 case Rxvt_restoreBG:
3954 set_window_color (Color_bg, str); 3893 set_window_color (Color_bg, str);
3955 break; 3894 break;
3956 3895
3957 case XTerm_logfile: 3896 case XTerm_logfile:
3958 // TODO, when secure mode? 3897 // TODO, when secure mode?
3959 break; 3898 break;
3960 3899
3961#ifdef MENUBAR
3962 case URxvt_Menu:
3963 if (OPTION (Opt_insecure))
3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965 break;
3966#endif
3967#if 0 3900#if 0
3968 case XTerm_dumpscreen: /* no error notices */ 3901 case Rxvt_dumpscreen: /* no error notices */
3969 { 3902 {
3970 int fd; 3903 int fd;
3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3904 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3972 { 3905 {
3973 scr_dump (fd); 3906 scr_dump (fd);
4004 if (query) 3937 if (query)
4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4006 else 3939 else
4007 { 3940 {
4008 set_locale (str); 3941 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8); 3942 pty->set_utf8_mode (enc_utf8);
4010 init_xlocale (); 3943 init_xlocale ();
4011 } 3944 }
4012 break; 3945 break;
4013 3946
4014 case URxvt_view_up: 3947 case URxvt_view_up:
4025 break; 3958 break;
4026#endif 3959#endif
4027 3960
4028#if ENABLE_PERL 3961#if ENABLE_PERL
4029 case URxvt_perl: 3962 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3963 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4031 ; // no responses yet 3964 ; // no responses yet
4032 break; 3965 break;
4033#endif 3966#endif
4034 } 3967 }
4035} 3968}
4067 return state; 4000 return state;
4068} 4001}
4069 4002
4070/* we're not using priv _yet_ */ 4003/* we're not using priv _yet_ */
4071void 4004void
4072rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4005rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4073{ 4006{
4074 unsigned int i, j; 4007 unsigned int i, j;
4075 int state; 4008 int state;
4076 4009
4077 static const struct 4010 static const struct
4088 { 5, PrivMode_rVideo }, 4021 { 5, PrivMode_rVideo },
4089 { 6, PrivMode_relOrigin }, 4022 { 6, PrivMode_relOrigin },
4090 { 7, PrivMode_Autowrap }, 4023 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode 4024 // 8, bi-directional support mode
4092 { 9, PrivMode_MouseX10 }, 4025 { 9, PrivMode_MouseX10 },
4093#ifdef menuBar_esc
4094 { menuBar_esc, PrivMode_menuBar },
4095#endif
4096 // 18, 19 printing-related 4026 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor }, 4027 { 25, PrivMode_VisibleCursor },
4098#ifdef scrollBar_esc 4028#ifdef scrollBar_esc
4099 { scrollBar_esc, PrivMode_scrollBar }, 4029 { scrollBar_esc, PrivMode_scrollBar },
4100#endif 4030#endif
4147 /* extra handling for values with state unkept */ 4077 /* extra handling for values with state unkept */
4148 switch (arg[i]) 4078 switch (arg[i])
4149 { 4079 {
4150#if ENABLE_STYLES 4080#if ENABLE_STYLES
4151 case 1021: 4081 case 1021:
4152 if (mode) 4082 set_option (Opt_intensityStyles, mode);
4153 SET_OPTION (Opt_intensityStyles);
4154 else
4155 CLR_OPTION (Opt_intensityStyles);
4156 4083
4157 scr_touch (true); 4084 scr_touch (true);
4158 break; 4085 break;
4159#endif 4086#endif
4160 case 1048: /* alternative cursor save */ 4087 case 1048: /* alternative cursor save */
4182 case 3: /* 80/132 */ 4109 case 3: /* 80/132 */
4183 if (priv_modes & PrivMode_132OK) 4110 if (priv_modes & PrivMode_132OK)
4184 set_widthheight (((state ? 132 : 80) * fwidth), height); 4111 set_widthheight (((state ? 132 : 80) * fwidth), height);
4185 break; 4112 break;
4186 case 4: /* smooth scrolling */ 4113 case 4: /* smooth scrolling */
4187 if (!state) 4114 set_option (Opt_jumpScroll, !state);
4188 SET_OPTION (Opt_jumpScroll);
4189 else
4190 CLR_OPTION (Opt_jumpScroll);
4191 break; 4115 break;
4192 case 5: /* reverse video */ 4116 case 5: /* reverse video */
4193 scr_rvideo_mode (state); 4117 scr_rvideo_mode (state);
4194 break; 4118 break;
4195 case 6: /* relative/absolute origins */ 4119 case 6: /* relative/absolute origins */
4201 /* case 8: - auto repeat, can't do on a per window basis */ 4125 /* case 8: - auto repeat, can't do on a per window basis */
4202 case 9: /* X10 mouse reporting */ 4126 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 4127 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 4128 priv_modes &= ~PrivMode_MouseX11;
4205 break; 4129 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 4130#ifdef scrollBar_esc
4214 case scrollBar_esc: 4131 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 4132 if (scrollbar_mapping (state))
4216 { 4133 {
4217 resize_all_windows (0, 0, 0); 4134 resize_all_windows (0, 0, 0);
4236#if 0 4153#if 0
4237 case 1001: 4154 case 1001:
4238 break; /* X11 mouse highlighting */ 4155 break; /* X11 mouse highlighting */
4239#endif 4156#endif
4240 case 1010: /* scroll to bottom on TTY output inhibit */ 4157 case 1010: /* scroll to bottom on TTY output inhibit */
4241 if (!state) 4158 set_option (Opt_scrollTtyOutput, !state);
4242 SET_OPTION (Opt_scrollTtyOutput);
4243 else
4244 CLR_OPTION (Opt_scrollTtyOutput);
4245 break; 4159 break;
4246 case 1011: /* scroll to bottom on key press */ 4160 case 1011: /* scroll to bottom on key press */
4247 if (state) 4161 set_option (Opt_scrollTtyKeypress, state);
4248 SET_OPTION (Opt_scrollTtyKeypress);
4249 else
4250 CLR_OPTION (Opt_scrollTtyKeypress);
4251 break; 4162 break;
4252 case 1047: /* secondary screen w/ clearing last */ 4163 case 1047: /* secondary screen w/ clearing last */
4253 if (OPTION (Opt_secondaryScreen)) 4164 if (OPTION (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 4165 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 4166 scr_erase_screen (2);
4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4376const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4466 4377
4467void 4378void
4468rxvt_term::tt_write (const char *data, unsigned int len) 4379rxvt_term::tt_write (const char *data, unsigned int len)
4469{ 4380{
4470 if (pty.pty < 0) 4381 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4471 return; 4382 return;
4472 4383
4384 if (pty->pty < 0)
4385 return;
4386
4473 if (v_buflen == 0) 4387 if (v_buflen == 0)
4474 { 4388 {
4475 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4389 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4476 4390
4477 if ((unsigned int)written == len) 4391 if ((unsigned int)written == len)
4478 return; 4392 return;
4479 4393
4480 data += written; 4394 data += written;
4489 pty_ev.set (EVENT_READ | EVENT_WRITE); 4403 pty_ev.set (EVENT_READ | EVENT_WRITE);
4490} 4404}
4491 4405
4492void rxvt_term::pty_write () 4406void rxvt_term::pty_write ()
4493{ 4407{
4494 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4408 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4495 4409
4496 if (written > 0) 4410 if (written > 0)
4497 { 4411 {
4498 v_buflen -= written; 4412 v_buflen -= written;
4499 4413

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines