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.267 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.315 by root, Tue Aug 22 13:07:17 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)
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 *
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/*}}} */ 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}
923 993
924#if defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
925unsigned int 995unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 997{
1006 while (l->is_longer () && row < end_row); 1076 while (l->is_longer () && row < end_row);
1007 } 1077 }
1008 while (row < end_row); 1078 while (row < end_row);
1009 } 1079 }
1010 1080
1011 scr_refresh (refresh_type); 1081 scr_refresh ();
1012 scrollbar_show (1); 1082 scrollbar_show (1);
1013#ifdef USE_XIM 1083#ifdef USE_XIM
1014 IMSendSpot (); 1084 IMSendSpot ();
1015#endif 1085#endif
1016 } 1086 }
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1115{
1046 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1117 want_refresh = 1;
1048 1118
1049 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1120}
1051#endif 1121#endif
1052 1122
1053#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1054void 1124void
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1069{ 1139{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1072 { 1142 {
1073 refresh_type |= SMOOTH_REFRESH;
1074 want_refresh = 1; 1143 want_refresh = 1;
1075 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1076 } 1145 }
1077} 1146}
1078#endif 1147#endif
1082rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1083{ 1152{
1084 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1085 { 1154 {
1086 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1087 refresh_type |= SMOOTH_REFRESH;
1088 want_refresh = 1; 1156 want_refresh = 1;
1089 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1090 } 1158 }
1091} 1159}
1092#endif 1160#endif
1100 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1101 { 1169 {
1102 if (view_start == top_row || view_start == 0) 1170 if (view_start == top_row || view_start == 0)
1103 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1104 1172
1105 refresh_type |= SMOOTH_REFRESH;
1106 want_refresh = 1; 1173 want_refresh = 1;
1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1108 } 1175 }
1109} 1176}
1110#endif 1177#endif
1111 1178
1112#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1113static struct event_handler 1180static struct event_handler
1114{ 1181{
1115 check_watcher cw_yield; 1182 check_watcher yield_ev;
1116 1183
1117 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1118 { 1185 {
1119 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
1120 w.stop (); 1194 w.stop ();
1121 } 1195 }
1122 1196
1123 event_handler () 1197 event_handler ()
1124 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1125 { 1199 {
1126 } 1200 }
1127} event_handler; 1201} event_handler;
1128#endif 1202#endif
1129 1203
1140 1214
1141 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1142 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1143 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1144 1218
1145 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1146 1220
1147 if (r > 0) 1221 if (r > 0)
1148 { 1222 {
1149 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1150 return true; 1224 return true;
1151 } 1225 }
1152 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1153 { 1227 {
1154#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1155 if (display->is_local) 1229 if (display->is_local)
1156 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1157#endif 1231#endif
1158 } 1232 }
1159 else 1233 else
1160 { 1234 {
1161 pty_ev.stop (); 1235 pty_ev.stop ();
1183} 1257}
1184 1258
1185void 1259void
1186rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1187{ 1261{
1188 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1189 recolour_cursor (); 1263 recolour_cursor ();
1190 1264
1191#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1192 hidden_pointer = 0; 1266 hidden_pointer = 0;
1193 1267
1201rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1202{ 1276{
1203 if (!OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1204 return; 1278 return;
1205 1279
1206 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1207 XFlush (display->display); 1281 XFlush (dpy);
1208 1282
1209 hidden_pointer = 1; 1283 hidden_pointer = 1;
1210} 1284}
1211 1285
1212void 1286void
1285 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1286 (32 + x + 1), 1360 (32 + x + 1),
1287 (32 + y + 1)); 1361 (32 + y + 1));
1288} 1362}
1289 1363
1290#ifdef USING_W11LIB
1291void
1292rxvt_W11_process_x_event (XEvent *ev)
1293{
1294 rxvt_t *r = rxvt_get_r ();
1295
1296 x_cb (*ev);
1297}
1298#endif
1299
1300/*{{{ process an X event */ 1364/*{{{ process an X event */
1301void 1365void
1302rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1303{ 1367{
1304 make_current (); 1368 make_current ();
1305 1369
1306 dDisp; 1370 dLocal (Display *, dpy);
1307 1371
1308 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1309 && SHOULD_INVOKE (HOOK_X_EVENT) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1310 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1311 return; 1375 return;
1316 unsigned int unused_mask; 1380 unsigned int unused_mask;
1317 1381
1318 switch (ev.type) 1382 switch (ev.type)
1319 { 1383 {
1320 case KeyPress: 1384 case KeyPress:
1321#if ISO_14755 1385 key_press (ev.xkey);
1322 if (!(iso14755buf & ISO_14755_52))
1323#endif
1324 lookup_key (ev.xkey);
1325
1326 break; 1386 break;
1327 1387
1328 case KeyRelease: 1388 case KeyRelease:
1329 { 1389 key_release (ev.xkey);
1330#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1331 KeySym keysym;
1332
1333 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1334#endif
1335
1336#if ENABLE_FRILLS || ISO_14755
1337 // ISO 14755 support
1338 if (iso14755buf)
1339 if (iso14755buf & ISO_14755_52)
1340 {
1341# if ENABLE_OVERLAY
1342 scr_overlay_off ();
1343# endif
1344# if ISO_14755
1345 // iso14755 part 5.2 handling: release time
1346 // first: controls
1347 if ((ev.xkey.state & ControlMask)
1348 && ((keysym >= 0x40 && keysym <= 0x5f)
1349 || (keysym >= 0x61 && keysym <= 0x7f)))
1350 {
1351 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1352 commit_iso14755 ();
1353 goto skip_switch;
1354 }
1355
1356 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1357 if (i[0] == keysym)
1358 {
1359 iso14755buf = ISO_14755_51 | i[1];
1360 commit_iso14755 ();
1361 goto skip_switch;
1362 }
1363
1364 scr_bell ();
1365# endif
1366 iso14755buf = 0;
1367 break;
1368 }
1369 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374 if (iso14755buf & ISO_14755_51)
1375 commit_iso14755 ();
1376#if ISO_14755
1377 else if (iso14755buf & ISO_14755_STARTED)
1378 {
1379 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1380
1381 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1382 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1383 }
1384# endif
1385 else
1386 iso14755buf = 0;
1387 }
1388#endif
1389
1390 if (ev.xany.window == vt
1391 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1392 break;
1393
1394#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1395 if (!(ev.xkey.state & ControlMask))
1396 slip_wheel_ev.stop ();
1397 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1398 mouse_slip_wheel_speed = 0;
1399#endif
1400 break; 1390 break;
1401 }
1402 1391
1403 case ButtonPress: 1392 case ButtonPress:
1404 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1405 break; 1394 break;
1406 1395
1408 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1409 break; 1398 break;
1410 1399
1411 case ClientMessage: 1400 case ClientMessage:
1412 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1413 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1414 { 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 {
1415 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)))
1416 destroy (); 1411 destroy ();
1412 }
1417#if ENABLE_EWMH 1413#if ENABLE_EWMH
1418 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])
1419 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1420 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1421 &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 }
1422#endif 1429#endif
1423 } 1430 }
1424#if ENABLE_XEMBED
1425 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1426 {
1427 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1428 focus_in ();
1429 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1430 focus_out ();
1431 }
1432#endif
1433#ifdef OFFIX_DND
1434 /* OffiX Dnd (drag 'n' drop) protocol */
1435 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1436 && (ev.xclient.data.l[0] == DndFile
1437 || ev.xclient.data.l[0] == DndDir
1438 || ev.xclient.data.l[0] == DndLink))
1439 {
1440 /* Get Dnd data */
1441 Atom ActualType;
1442 int ActualFormat;
1443 unsigned char *data;
1444 unsigned long Size, RemainingBytes;
1445
1446 XGetWindowProperty (disp, display->root,
1447 xa[XA_DNDSELECTION],
1448 0L, 1000000L,
1449 False, AnyPropertyType,
1450 &ActualType, &ActualFormat,
1451 &Size, &RemainingBytes,
1452 &data);
1453 set_string_property (XA_CUT_BUFFER0, data);
1454 XFree (data);
1455 selection_paste (display->root, XA_CUT_BUFFER0, true);
1456 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1457 }
1458#endif /* OFFIX_DND */
1459 break; 1431 break;
1460 1432
1461 case MappingNotify: 1433 case MappingNotify:
1462 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1463 break; 1435 break;
1496 break; 1468 break;
1497 1469
1498 case ConfigureNotify: 1470 case ConfigureNotify:
1499 if (ev.xconfigure.window == parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1500 { 1472 {
1501 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1502 ; 1474 ;
1503 1475
1504 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1505 { 1477 {
1506 seen_resize = 1; 1478 seen_resize = 1;
1507 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1508 } 1480 }
1509 1481
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1510#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1511 if (OPTION (Opt_transparent)) 1485 if (OPTION (Opt_transparent))
1512 check_our_parents (); 1486 check_our_parents ();
1513#endif 1487#endif
1514 } 1488 }
1515 break; 1489 break;
1516 1490
1517 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1518 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1519 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1520 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1521 1496
1522 break; 1497 break;
1523 1498
1524 case SelectionClear: 1499 case SelectionClear:
1525 selection_clear (); 1500 selection_clear ();
1561 if (ev.xany.window == vt) 1536 if (ev.xany.window == vt)
1562 { 1537 {
1563 do 1538 do
1564 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1565 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1567 1542
1568 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1569 1544
1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1571 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1572 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1573 1548
1574 want_refresh = 1; 1549 want_refresh = 1;
1575 } 1550 }
1576 else 1551 else
1577 { 1552 {
1578 XEvent unused_event; 1553 XEvent unused_event;
1579 1554
1580 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1581 ; 1556 ;
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1583 ; 1558 ;
1584 1559
1585 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1586 { 1561 {
1587 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1588 scrollbar_show (0); 1563 scrollbar_show (0);
1589 } 1564 }
1590 1565
1591#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1592 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1593 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1594#endif 1569#endif
1595 } 1570 }
1596 break; 1571 break;
1597 1572
1598 case MotionNotify: 1573 case MotionNotify:
1608 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1609 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1610 ; // nop 1585 ; // nop
1611 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1612 { 1587 {
1613 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1614 ; 1589 ;
1615 1590
1616 XQueryPointer (disp, vt, 1591 XQueryPointer (dpy, vt,
1617 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1618 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1619 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1620 &ev.xbutton.state); 1595 &ev.xbutton.state);
1621#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
1685#endif 1660#endif
1686 } 1661 }
1687 } 1662 }
1688 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1689 { 1664 {
1690 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1691 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1692 ; 1667 ;
1693 1668
1694 XQueryPointer (disp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1695 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1696 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1697 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1698 &unused_mask); 1673 &unused_mask);
1699 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1703 scrollbar_show (1); 1678 scrollbar_show (1);
1704 } 1679 }
1705 break; 1680 break;
1706 } 1681 }
1707 1682
1708skip_switch: ;
1709
1710#if defined(CURSOR_BLINK) 1683#if defined(CURSOR_BLINK)
1711 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1712 { 1685 {
1713 if (hidden_cursor) 1686 if (hidden_cursor)
1714 { 1687 {
1715 hidden_cursor = 0; 1688 hidden_cursor = 0;
1716 want_refresh = 1; 1689 want_refresh = 1;
1717 } 1690 }
1718 1691
1719 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1720 } 1693 }
1721#endif 1694#endif
1722 1695
1723#if defined(POINTER_BLANK) 1696#if defined(POINTER_BLANK)
1724 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1741 if (!focus) 1714 if (!focus)
1742 { 1715 {
1743 focus = 1; 1716 focus = 1;
1744 want_refresh = 1; 1717 want_refresh = 1;
1745 1718
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 1720
1748#if USE_XIM 1721#if USE_XIM
1749 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1750 { 1723 {
1751 IMSetStatusPosition (); 1724 IMSetPosition ();
1752 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1753 } 1726 }
1754#endif 1727#endif
1755#if CURSOR_BLINK 1728#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink)) 1729 if (OPTION (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758#endif 1731#endif
1759#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1761 { 1734 {
1762 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
1802 } 1775 }
1803#endif 1776#endif
1804 } 1777 }
1805} 1778}
1806 1779
1807#if TRANSPARENT 1780void
1781rxvt_term::update_fade_color (unsigned int idx)
1782{
1783#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade])
1785 {
1786 rgba c;
1787 pix_colors [Color_fade].get (c);
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 }
1790#endif
1791}
1792
1793#if TRANSPARENT || ENABLE_PERL
1808void 1794void
1809rxvt_term::rootwin_cb (XEvent &ev) 1795rxvt_term::rootwin_cb (XEvent &ev)
1810{ 1796{
1811 make_current (); 1797 make_current ();
1812 1798
1799 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1800 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1801 return;
1802
1803# if TRANSPARENT
1813 switch (ev.type) 1804 switch (ev.type)
1814 { 1805 {
1815 case PropertyNotify: 1806 case PropertyNotify:
1816 /* 1807 /*
1817 * if user used some Esetroot compatible prog to set the root bg, 1808 * if user used some Esetroot compatible prog to set the root bg,
1825 case ReparentNotify: 1816 case ReparentNotify:
1826 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1827 want_refresh = want_full_refresh = 1; 1818 want_refresh = want_full_refresh = 1;
1828 break; 1819 break;
1829 } 1820 }
1821# endif
1830} 1822}
1831#endif 1823#endif
1832 1824
1833void 1825void
1834rxvt_term::button_press (XButtonEvent &ev) 1826rxvt_term::button_press (XButtonEvent &ev)
1843 /* 1835 /*
1844 * VT window processing of button press 1836 * VT window processing of button press
1845 */ 1837 */
1846 if (ev.window == vt) 1838 if (ev.window == vt)
1847 { 1839 {
1840 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1841 return;
1842
1848#if ISO_14755 1843#if ISO_14755
1849 // 5.4 1844 // 5.4
1850 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1845 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1851 { 1846 {
1852 iso14755_54 (ev.x, ev.y); 1847 iso14755_54 (ev.x, ev.y);
1894 else 1889 else
1895 { 1890 {
1896 if (ev.button != MEvent.button) 1891 if (ev.button != MEvent.button)
1897 MEvent.clicks = 0; 1892 MEvent.clicks = 0;
1898 1893
1899 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1900 switch (ev.button) 1894 switch (ev.button)
1901 { 1895 {
1902 case Button1: 1896 case Button1:
1903 /* allow meta + click to select rectangular areas */ 1897 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */ 1898 /* should be done in screen.C */
1905#if ENABLE_FRILLS 1899#if ENABLE_FRILLS
1906 selection.rect = !!(ev.state & ModMetaMask); 1900 selection.rect = !!(ev.state & ModMetaMask);
1907#else 1901#else
1908 selection.rect = false; 1902 selection.rect = false;
1909#endif 1903#endif
1910 1904
1911 /* allow shift+left click to extend selection */ 1905 /* allow shift+left click to extend selection */
1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1906 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913 { 1907 {
1914 if (MEvent.button == Button1 && clickintime) 1908 if (MEvent.button == Button1 && clickintime)
1915 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1916 else 1910 else
1917 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1918 } 1912 }
1919 else 1913 else
1920 { 1914 {
1921 if (MEvent.button == Button1 && clickintime) 1915 if (MEvent.button == Button1 && clickintime)
1922 MEvent.clicks++; 1916 MEvent.clicks++;
1923 else 1917 else
1924 MEvent.clicks = 1; 1918 MEvent.clicks = 1;
1925 1919
1926 selection_click (MEvent.clicks, ev.x, ev.y); 1920 selection_click (MEvent.clicks, ev.x, ev.y);
1927 } 1921 }
1928 1922
1929 MEvent.button = Button1; 1923 MEvent.button = Button1;
1930 break; 1924 break;
1931 1925
1932 case Button3: 1926 case Button3:
1933 if (MEvent.button == Button3 && clickintime) 1927 if (MEvent.button == Button3 && clickintime)
1934 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1935 else 1929 else
1936 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1937 1931
1938 MEvent.button = Button3; 1932 MEvent.button = Button3;
1939 break; 1933 break;
1940 } 1934 }
1941 } 1935 }
1942 1936
1943 MEvent.time = ev.time; 1937 MEvent.time = ev.time;
1944 return; 1938 return;
1945 } 1939 }
1946 1940
2100 2094
2101 if (scrollbar_isUpDn ()) 2095 if (scrollbar_isUpDn ())
2102 { 2096 {
2103 scrollBar.setIdle (); 2097 scrollBar.setIdle ();
2104 scrollbar_show (0); 2098 scrollbar_show (0);
2105#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2106 refresh_type &= ~SMOOTH_REFRESH;
2107#endif
2108 } 2099 }
2109 2100
2110#ifdef SELECTION_SCROLLING 2101#ifdef SELECTION_SCROLLING
2111 if (sel_scroll_ev.active) 2102 if (sel_scroll_ev.active)
2112 sel_scroll_ev.stop(); 2103 sel_scroll_ev.stop();
2113#endif 2104#endif
2114 2105
2115 if (ev.window == vt) 2106 if (ev.window == vt)
2116 { 2107 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2109 return;
2110
2117#if ISO_14755 2111#if ISO_14755
2118 // 5.4 2112 // 5.4
2119 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2120 return; 2114 return;
2121#endif 2115#endif
2116
2122 if (reportmode) 2117 if (reportmode)
2123 { 2118 {
2124 /* mouse report from vt window */ 2119 /* mouse report from vt window */
2125 /* don't report release of wheel "buttons" */ 2120 /* don't report release of wheel "buttons" */
2126 if (ev.button >= 4) 2121 if (ev.button >= 4)
2150 if (priv_modes & PrivMode_mouse_report 2145 if (priv_modes & PrivMode_mouse_report
2151 && bypass_keystate 2146 && bypass_keystate
2152 && ev.button == Button1 && MEvent.clicks <= 1) 2147 && ev.button == Button1 && MEvent.clicks <= 1)
2153 selection_extend (ev.x, ev.y, 0); 2148 selection_extend (ev.x, ev.y, 0);
2154 2149
2155 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2156 return;
2157
2158 switch (ev.button) 2150 switch (ev.button)
2159 { 2151 {
2160 case Button1: 2152 case Button1:
2161 case Button3: 2153 case Button3:
2162 selection_make (ev.time); 2154 selection_make (ev.time);
2163 break; 2155 break;
2156
2164 case Button2: 2157 case Button2:
2165 selection_request (ev.time, ev.x, ev.y); 2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2166 break; 2160 break;
2161
2167#ifdef MOUSE_WHEEL 2162#ifdef MOUSE_WHEEL
2168 case Button4: 2163 case Button4:
2169 case Button5: 2164 case Button5:
2170 { 2165 {
2171 int i; 2166 int i;
2211#if TINTING 2206#if TINTING
2212/* taken from aterm-0.4.2 */ 2207/* taken from aterm-0.4.2 */
2213 2208
2214typedef uint32_t RUINT32T; 2209typedef uint32_t RUINT32T;
2215 2210
2216void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2211void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2217{ 2212{
2218 int sh_r, sh_g, sh_b; 2213 int sh_r, sh_g, sh_b;
2219 RUINT32T mask_r, mask_g, mask_b; 2214 RUINT32T mask_r, mask_g, mask_b;
2220 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2215 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2221 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2216 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2222 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2217 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2223 int i; 2218 int i;
2224 2219
2225 Visual *visual = display->visual; 2220 Visual *visual = term->visual;
2226 2221
2227 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2222 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2228 2223
2229 /* for convenience */ 2224 /* for convenience */
2230 mask_r = visual->red_mask; 2225 mask_r = visual->red_mask;
2451 Atom atype; 2446 Atom atype;
2452 unsigned char *prop = NULL; 2447 unsigned char *prop = NULL;
2453 Window root, oldp, *list; 2448 Window root, oldp, *list;
2454 Pixmap rootpixmap = None; 2449 Pixmap rootpixmap = None;
2455 XWindowAttributes wattr, wrootattr; 2450 XWindowAttributes wattr, wrootattr;
2456 dDisp;
2457 2451
2458 pchanged = 0; 2452 pchanged = 0;
2459 2453
2460 if (!OPTION (Opt_transparent)) 2454 if (!OPTION (Opt_transparent))
2461 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2462 2456
2463 XGetWindowAttributes (disp, display->root, &wrootattr); 2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2464 rootdepth = wrootattr.depth; 2458 rootdepth = wrootattr.depth;
2465 2459
2466 XGetWindowAttributes (disp, parent[0], &wattr); 2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2467 2461
2468 if (rootdepth != wattr.depth) 2462 if (rootdepth != wattr.depth)
2469 { 2463 {
2470 if (am_transparent) 2464 if (am_transparent)
2471 { 2465 {
2472 pchanged = 1; 2466 pchanged = 1;
2473 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2474 am_transparent = am_pixmap_trans = 0; 2468 am_transparent = am_pixmap_trans = 0;
2475 } 2469 }
2476 2470
2477 return pchanged; /* Don't try any more */ 2471 return pchanged; /* Don't try any more */
2478 } 2472 }
2479 2473
2480 /* Get all X ops out of the queue so that our information is up-to-date. */ 2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2481 XSync (disp, False); 2475 XSync (dpy, False);
2482 2476
2483 /* 2477 /*
2484 * Make the frame window set by the window manager have 2478 * Make the frame window set by the window manager have
2485 * the root background. Some window managers put multiple nested frame 2479 * the root background. Some window managers put multiple nested frame
2486 * windows for each client, so we have to take care about that. 2480 * windows for each client, so we have to take care about that.
2487 */ 2481 */
2488 i = (xa[XA_XROOTPMAP_ID] 2482 i = (xa[XA_XROOTPMAP_ID]
2489 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success); 2485 &nitems, &bytes_after, &prop) == Success);
2492 2486
2493 if (!i || prop == NULL) 2487 if (!i || prop == NULL)
2494 i = (xa[XA_ESETROOT_PMAP_ID] 2488 i = (xa[XA_ESETROOT_PMAP_ID]
2495 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2497 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2498 2492
2499 if (!i || prop == NULL 2493 if (!i || prop == NULL
2500#if TINTING 2494#if TINTING
2501 || !rs[Rs_color + Color_tint] 2495 || !ISSET_PIXCOLOR (Color_tint)
2502#endif 2496#endif
2503 ) 2497 )
2504 have_pixmap = 0; 2498 have_pixmap = 0;
2505 else 2499 else
2506 { 2500 {
2519 Window cr; 2513 Window cr;
2520 XImage *image; 2514 XImage *image;
2521 GC gc; 2515 GC gc;
2522 XGCValues gcvalue; 2516 XGCValues gcvalue;
2523 2517
2524 XTranslateCoordinates (disp, parent[0], display->root, 2518 XTranslateCoordinates (dpy, parent[0], display->root,
2525 0, 0, &sx, &sy, &cr); 2519 0, 0, &sx, &sy, &cr);
2526 nw = (unsigned int)szHint.width; 2520 nw = (unsigned int)szHint.width;
2527 nh = (unsigned int)szHint.height; 2521 nh = (unsigned int)szHint.height;
2528 nx = ny = 0; 2522 nx = ny = 0;
2529 2523
2542 } 2536 }
2543 2537
2544 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2545 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2546 2540
2547 XSync (disp, False); 2541 XSync (dpy, False);
2548 allowedxerror = -1; 2542 allowedxerror = -1;
2549 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2550 2544
2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2552 /* XXX: may need a delay here? */ 2546 /* XXX: may need a delay here? */
2553 allowedxerror = 0; 2547 allowedxerror = 0;
2554 2548
2557 if (am_transparent && am_pixmap_trans) 2551 if (am_transparent && am_pixmap_trans)
2558 { 2552 {
2559 pchanged = 1; 2553 pchanged = 1;
2560 if (pixmap != None) 2554 if (pixmap != None)
2561 { 2555 {
2562 XFreePixmap (disp, pixmap); 2556 XFreePixmap (dpy, pixmap);
2563 pixmap = None; 2557 pixmap = None;
2564 } 2558 }
2565 } 2559 }
2566 2560
2567 am_pixmap_trans = 0; 2561 am_pixmap_trans = 0;
2568 } 2562 }
2569 else 2563 else
2570 { 2564 {
2571 if (pixmap != None) 2565 if (pixmap != None)
2572 XFreePixmap (disp, pixmap); 2566 XFreePixmap (dpy, pixmap);
2573 2567
2574#if TINTING 2568#if TINTING
2575 if (ISSET_PIXCOLOR (Color_tint)) 2569 if (ISSET_PIXCOLOR (Color_tint))
2576 { 2570 {
2577 unsigned short rm, gm, bm;
2578 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2579 2572
2573 rgba c;
2580 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2574 pix_colors_focused [Color_tint].get (c);
2581 2575
2582 ShadeXImage (display, image, shade, rm, gm, bm); 2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2583 } 2577 }
2584#endif 2578#endif
2585 2579
2586 pixmap = XCreatePixmap (disp, vt, 2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2587 szHint.width, szHint.height, image->depth);
2588 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2589 XPutImage (disp, pixmap, gc, image, 0, 0, 2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2590 nx, ny, image->width, image->height); 2583 nx, ny, image->width, image->height);
2591 XFreeGC (disp, gc); 2584 XFreeGC (dpy, gc);
2592 XDestroyImage (image); 2585 XDestroyImage (image);
2593 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2594 XClearWindow (disp, parent[0]); 2587 XClearWindow (dpy, parent[0]);
2595 2588
2596 if (!am_transparent || !am_pixmap_trans) 2589 if (!am_transparent || !am_pixmap_trans)
2597 pchanged = 1; 2590 pchanged = 1;
2598 2591
2599 am_transparent = am_pixmap_trans = 1; 2592 am_transparent = am_pixmap_trans = 1;
2600 } 2593 }
2601 } 2594 }
2602 2595
2603 if (am_pixmap_trans) 2596 if (am_pixmap_trans)
2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2605 else 2598 else
2606 { 2599 {
2607 unsigned int n; 2600 unsigned int n;
2608 /* 2601 /*
2609 * InheritPixmap transparency 2602 * InheritPixmap transparency
2610 */ 2603 */
2611 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2612 { 2605 {
2613 oldp = parent[i]; 2606 oldp = parent[i];
2614 XQueryTree (disp, parent[i - 1], &root, 2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2615 &parent[i], &list, &n);
2616 XFree (list); 2608 XFree (list);
2617 2609
2618 if (parent[i] == display->root) 2610 if (parent[i] == display->root)
2619 { 2611 {
2620 if (oldp != None) 2612 if (oldp != None)
2628 } 2620 }
2629 2621
2630 n = 0; 2622 n = 0;
2631 2623
2632 if (pchanged) 2624 if (pchanged)
2633 {
2634 for (; n < (unsigned int)i; n++) 2625 for (; n < (unsigned int)i; n++)
2635 { 2626 {
2636 XGetWindowAttributes (disp, parent[n], &wattr); 2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2637 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2638 { 2630 {
2639 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2640 break; 2632 break;
2641 } 2633 }
2642 } 2634 }
2643 }
2644 2635
2645 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2646 { 2637 {
2647 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2648 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2649 am_transparent = 0; 2640 am_transparent = 0;
2650 /* XXX: also turn off Opt_transparent? */ 2641 /* XXX: also turn off Opt_transparent? */
2651 } 2642 }
2652 else 2643 else
2653 { 2644 {
2654#if WAIT_FOR_WM
2655 /* wait (an arbitrary period) for the WM to do its thing
2656 * needed for fvwm2.2.2 (and before?) */
2657 sleep (1);
2658#endif
2659 for (n = 0; n < (unsigned int)i; n++) 2645 for (n = 0; n < (unsigned int)i; n++)
2660 { 2646 {
2661 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2662 XClearWindow (disp, parent[n]); 2648 XClearWindow (dpy, parent[n]);
2663 } 2649 }
2664 2650
2665 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2666 am_transparent = 1; 2652 am_transparent = 1;
2667 } 2653 }
2668 2654
2669 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2670 parent[i] = None; 2656 parent[i] = None;
2671 } 2657 }
2672 2658
2673 if (scrollBar.win) 2659 if (scrollBar.win)
2674 { 2660 {
2675 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2676 scrollBar.setIdle (); 2662 scrollBar.setIdle ();
2677 scrollbar_show (0); 2663 scrollbar_show (0);
2678 } 2664 }
2679 2665
2680 if (am_transparent) 2666 if (am_transparent)
2798 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2799 refresh_limit++; 2785 refresh_limit++;
2800 else 2786 else
2801 { 2787 {
2802 flag = true; 2788 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2803 scr_refresh (refresh_type); 2790 scr_refresh ();
2804 want_refresh = 1; 2791 want_refresh = 1;
2805 } 2792 }
2806 } 2793 }
2807 2794
2808 } 2795 }
2826 return flag; 2813 return flag;
2827} 2814}
2828 2815
2829// read the next character 2816// read the next character
2830wchar_t 2817wchar_t
2831rxvt_term::next_char () 2818rxvt_term::next_char () NOTHROW
2832{ 2819{
2833 while (cmdbuf_ptr < cmdbuf_endp) 2820 while (cmdbuf_ptr < cmdbuf_endp)
2834 { 2821 {
2835 // assume 7-bit to be ascii ALWAYS 2822 // assume 7-bit to be ascii ALWAYS
2836 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2823 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2857 return NOCHAR; 2844 return NOCHAR;
2858} 2845}
2859 2846
2860// read the next octet 2847// read the next octet
2861uint32_t 2848uint32_t
2862rxvt_term::next_octet () 2849rxvt_term::next_octet () NOTHROW
2863{ 2850{
2864 return cmdbuf_ptr < cmdbuf_endp 2851 return cmdbuf_ptr < cmdbuf_endp
2865 ? (unsigned char)*cmdbuf_ptr++ 2852 ? (unsigned char)*cmdbuf_ptr++
2866 : NOCHAR; 2853 : NOCHAR;
2867} 2854}
2855
2856static class out_of_input out_of_input;
2868 2857
2869/* rxvt_cmd_getc () - Return next input character */ 2858/* rxvt_cmd_getc () - Return next input character */
2870/* 2859/*
2871 * Return the next input character after first passing any keyboard input 2860 * Return the next input character after first passing any keyboard input
2872 * to the command. 2861 * to the command.
2873 */ 2862 */
2874wchar_t 2863wchar_t
2875rxvt_term::cmd_getc () 2864rxvt_term::cmd_getc () THROW ((class out_of_input))
2876{ 2865{
2877 wchar_t c = next_char (); 2866 wchar_t c = next_char ();
2878 2867
2879 if (c == NOCHAR) 2868 if (c == NOCHAR)
2880 throw out_of_input; 2869 throw out_of_input;
2881 2870
2882 return c; 2871 return c;
2883} 2872}
2884 2873
2885uint32_t 2874uint32_t
2886rxvt_term::cmd_get8 () 2875rxvt_term::cmd_get8 () THROW ((class out_of_input))
2887{ 2876{
2888 uint32_t c = next_octet (); 2877 uint32_t c = next_octet ();
2889 2878
2890 if (c == NOCHAR) 2879 if (c == NOCHAR)
2891 throw out_of_input; 2880 throw out_of_input;
3129 scr_charset_set (2, (unsigned int)cmd_getc ()); 3118 scr_charset_set (2, (unsigned int)cmd_getc ());
3130 break; 3119 break;
3131 case '+': 3120 case '+':
3132 scr_charset_set (3, (unsigned int)cmd_getc ()); 3121 scr_charset_set (3, (unsigned int)cmd_getc ());
3133 break; 3122 break;
3134#if ENABLE_FRILLS 3123#if !ENABLE_MINIMAL
3135 case '6': 3124 case '6':
3136 scr_backindex (); 3125 scr_backindex ();
3137 break; 3126 break;
3138#endif 3127#endif
3139 case '7': 3128 case '7':
3140 scr_cursor (SAVE); 3129 scr_cursor (SAVE);
3141 break; 3130 break;
3142 case '8': 3131 case '8':
3143 scr_cursor (RESTORE); 3132 scr_cursor (RESTORE);
3144 break; 3133 break;
3145#if ENABLE_FRILLS 3134#if !ENABLE_MINIMAL
3146 case '9': 3135 case '9':
3147 scr_forwardindex (); 3136 scr_forwardindex ();
3148 break; 3137 break;
3149#endif 3138#endif
3150 case '=': 3139 case '=':
3312 ndef = get_byte_array_bit (csi_defaults, i); 3301 ndef = get_byte_array_bit (csi_defaults, i);
3313 for (p = 0; p < nargs; p++) 3302 for (p = 0; p < nargs; p++)
3314 if (arg[p] == -1) 3303 if (arg[p] == -1)
3315 arg[p] = ndef; 3304 arg[p] = ndef;
3316 3305
3317#ifdef DEBUG_CMD
3318 fprintf (stderr, "CSI ");
3319 for (p = 0; p < nargs; p++)
3320 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3321 fprintf (stderr, "%c\n", ch);
3322#endif
3323
3324 /* 3306 /*
3325 * private mode handling 3307 * private mode handling
3326 */ 3308 */
3327 if (priv) 3309 if (priv)
3328 { 3310 {
3329 switch (priv) 3311 switch (priv)
3330 { 3312 {
3331 case '>': 3313 case '>':
3332 if (ch == CSI_DA) /* secondary device attributes */ 3314 if (ch == CSI_DA) /* secondary device attributes */
3333 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3315 {
3316 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3317 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3318 //
3319 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3320 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3321 // that we do not support xterm mouse reporting (should be 95 when we do).
3322 //
3323 tt_printf ("\033[>%d;94;0c", 'U');
3324 }
3334 break; 3325 break;
3335 case '?': 3326 case '?':
3336 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3327 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3337 process_terminal_mode (ch, priv, nargs, arg); 3328 process_terminal_mode (ch, priv, nargs, arg);
3338 break; 3329 break;
3541 break; 3532 break;
3542 case CSI_75: 3533 case CSI_75:
3543 scr_cursor (RESTORE); 3534 scr_cursor (RESTORE);
3544 break; 3535 break;
3545 3536
3546#if ENABLE_FRILLS 3537#if !ENABLE_MINIMAL
3547 case CSI_74: 3538 case CSI_74:
3548 process_window_ops (arg, nargs); 3539 process_window_ops (arg, nargs);
3549 break; 3540 break;
3550#endif 3541#endif
3551 3542
3558 break; 3549 break;
3559 } 3550 }
3560} 3551}
3561/*}}} */ 3552/*}}} */
3562 3553
3563#if ENABLE_FRILLS 3554#if !ENABLE_MINIMAL
3564/* ARGSUSED */ 3555/* ARGSUSED */
3565void 3556void
3566rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3557rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3567{ 3558{
3568 int x, y; 3559 int x, y;
3569 XWindowAttributes wattr; 3560 XWindowAttributes wattr;
3570 Window wdummy; 3561 Window wdummy;
3571 dDisp; 3562
3563 dLocal (Display *, dpy);
3572 3564
3573 if (nargs == 0) 3565 if (nargs == 0)
3574 return; 3566 return;
3575 3567
3576 switch (args[0]) 3568 switch (args[0])
3577 { 3569 {
3578 /* 3570 /*
3579 * commands 3571 * commands
3580 */ 3572 */
3581 case 1: /* deiconify window */ 3573 case 1: /* deiconify window */
3582 XMapWindow (disp, parent[0]); 3574 XMapWindow (dpy, parent[0]);
3583 break; 3575 break;
3584 case 2: /* iconify window */ 3576 case 2: /* iconify window */
3585 XIconifyWindow (disp, parent[0], display->screen); 3577 XIconifyWindow (dpy, parent[0], display->screen);
3586 break; 3578 break;
3587 case 3: /* set position (pixels) */ 3579 case 3: /* set position (pixels) */
3588 XMoveWindow (disp, parent[0], args[1], args[2]); 3580 XMoveWindow (dpy, parent[0], args[1], args[2]);
3589 break; 3581 break;
3590 case 4: /* set size (pixels) */ 3582 case 4: /* set size (pixels) */
3591 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3583 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3592 break; 3584 break;
3593 case 5: /* raise window */ 3585 case 5: /* raise window */
3594 XRaiseWindow (disp, parent[0]); 3586 XRaiseWindow (dpy, parent[0]);
3595 break; 3587 break;
3596 case 6: /* lower window */ 3588 case 6: /* lower window */
3597 XLowerWindow (disp, parent[0]); 3589 XLowerWindow (dpy, parent[0]);
3598 break; 3590 break;
3599 case 7: /* refresh window */ 3591 case 7: /* refresh window */
3600 scr_touch (true); 3592 scr_touch (true);
3601 break; 3593 break;
3602 case 8: /* set size (chars) */ 3594 case 8: /* set size (chars) */
3609 if (args[0] >= 24) /* set height (chars) */ 3601 if (args[0] >= 24) /* set height (chars) */
3610 set_widthheight ((unsigned int)width, 3602 set_widthheight ((unsigned int)width,
3611 (unsigned int) (args[1] * fheight)); 3603 (unsigned int) (args[1] * fheight));
3612 break; 3604 break;
3613 3605
3614
3615 /* 3606 /*
3616 * reports - some output format copied from XTerm 3607 * reports - some output format copied from XTerm
3617 */ 3608 */
3618 case 11: /* report window state */ 3609 case 11: /* report window state */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3610 XGetWindowAttributes (dpy, parent[0], &wattr);
3620 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3611 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3621 break; 3612 break;
3622 case 13: /* report window position */ 3613 case 13: /* report window position */
3623 XGetWindowAttributes (disp, parent[0], &wattr); 3614 XGetWindowAttributes (dpy, parent[0], &wattr);
3624 XTranslateCoordinates (disp, parent[0], wattr.root, 3615 XTranslateCoordinates (dpy, parent[0], wattr.root,
3625 -wattr.border_width, -wattr.border_width, 3616 -wattr.border_width, -wattr.border_width,
3626 &x, &y, &wdummy); 3617 &x, &y, &wdummy);
3627 tt_printf ("\033[3;%d;%dt", x, y); 3618 tt_printf ("\033[3;%d;%dt", x, y);
3628 break; 3619 break;
3629 case 14: /* report window size (pixels) */ 3620 case 14: /* report window size (pixels) */
3630 XGetWindowAttributes (disp, parent[0], &wattr); 3621 XGetWindowAttributes (dpy, parent[0], &wattr);
3631 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3622 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3632 break; 3623 break;
3633 case 18: /* report text area size (chars) */ 3624 case 18: /* report text area size (chars) */
3634 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3625 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3635 break; 3626 break;
3637 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3628 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3638 break; 3629 break;
3639 case 20: /* report icon label */ 3630 case 20: /* report icon label */
3640 { 3631 {
3641 char *s; 3632 char *s;
3642 XGetIconName (disp, parent[0], &s); 3633 XGetIconName (dpy, parent[0], &s);
3643 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3634 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3644 XFree (s); 3635 XFree (s);
3645 } 3636 }
3646 break; 3637 break;
3647 case 21: /* report window title */ 3638 case 21: /* report window title */
3648 { 3639 {
3649 char *s; 3640 char *s;
3650 XFetchName (disp, parent[0], &s); 3641 XFetchName (dpy, parent[0], &s);
3651 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3642 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3652 XFree (s); 3643 XFree (s);
3653 } 3644 }
3654 break; 3645 break;
3655 } 3646 }
3683 seen_esc = true; 3674 seen_esc = true;
3684 continue; 3675 continue;
3685 } 3676 }
3686 else if (ch == C0_BEL || ch == CHAR_ST) 3677 else if (ch == C0_BEL || ch == CHAR_ST)
3687 break; 3678 break;
3679 else if (ch == C0_SYN)
3680 ch = cmd_get8 ();
3688 else if (ch < 0x20) 3681 else if (ch < 0x20)
3689 return NULL; /* other control character - exit */ 3682 return NULL; /* other control character - exit */
3690 3683
3691 seen_esc = false; 3684 seen_esc = false;
3692 3685
3693 if (n >= STRING_MAX - 1) 3686 if (n >= STRING_MAX - 1)
3694 // stop at some sane length 3687 // stop at some sane length
3695 return NULL; 3688 return NULL;
3696 3689
3697 if (ch == C0_SYN)
3698 string[n++] = cmd_get8 ();
3699 else
3700 string[n++] = ch; 3690 string[n++] = ch;
3701 } 3691 }
3702 3692
3703 string[n++] = '\0'; 3693 string[n++] = '\0';
3704 3694
3705 ends_how = (ch == 0x5c ? C0_ESC : ch); 3695 ends_how = (ch == 0x5c ? C0_ESC : ch);
3756void 3746void
3757rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3747rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3758{ 3748{
3759 if (str[0] == '?' && !str[1]) 3749 if (str[0] == '?' && !str[1])
3760 { 3750 {
3761 unsigned short r, g, b; 3751 rgba c;
3762 pix_colors_focused[color].get (display, r, g, b); 3752 pix_colors_focused[color].get (c);
3753
3754#if XFT
3755 if (c.a != rgba::MAX_CC)
3756 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3757 else
3758#endif
3763 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3759 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3764 } 3760 }
3765 else 3761 else
3766 set_window_color (color, str); 3762 set_window_color (color, str);
3767} 3763}
3768 3764
3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3766 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3771 */ 3767 */
3772void 3768void
3773rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3769rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3774{ 3770{
3775 int changed = 0;
3776 int color; 3771 int color;
3777 char *buf, *name; 3772 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3773 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3774 int saveop = op;
3780 dDisp; 3775
3776 dLocal (Display *, dpy);
3781 3777
3782 assert (str != NULL); 3778 assert (str != NULL);
3779
3780 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3781 return;
3782
3783 switch (op) 3783 switch (op)
3784 { 3784 {
3785 case XTerm_name: 3785 case XTerm_name:
3786 set_title (str); 3786 set_title (str);
3787 /* FALLTHROUGH */ 3787 /* FALLTHROUGH */
3801 unsigned long bytes_after; 3801 unsigned long bytes_after;
3802 unsigned char *value = 0; 3802 unsigned char *value = 0;
3803 const char *str = ""; 3803 const char *str = "";
3804 3804
3805 if (prop 3805 if (prop
3806 && XGetWindowProperty (disp, parent[0], 3806 && XGetWindowProperty (dpy, parent[0],
3807 prop, 0, 1<<16, 0, AnyPropertyType, 3807 prop, 0, 1<<16, 0, AnyPropertyType,
3808 &actual_type, &actual_format, 3808 &actual_type, &actual_format,
3809 &nitems, &bytes_after, &value) == Success 3809 &nitems, &bytes_after, &value) == Success
3810 && actual_type != None 3810 && actual_type != None
3811 && actual_format == 8) 3811 && actual_format == 8)
3812 str = (const char *)(value); 3812 str = (const char *)(value);
3813 3813
3814 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3814 tt_printf ("\033]%d;%s%c", op, str, resp);
3815 3815
3816 XFree (value); 3816 XFree (value);
3817 } 3817 }
3818 else 3818 else
3819 { 3819 {
3823 { 3823 {
3824 *eq = 0; 3824 *eq = 0;
3825 set_utf8_property (display->atom (str), eq + 1); 3825 set_utf8_property (display->atom (str), eq + 1);
3826 } 3826 }
3827 else 3827 else
3828 XDeleteProperty (disp, parent[0], 3828 XDeleteProperty (dpy, parent[0],
3829 display->atom (str)); 3829 display->atom (str));
3830 } 3830 }
3831 break; 3831 break;
3832 3832
3833 case XTerm_Color: 3833 case XTerm_Color:
3843 break; 3843 break;
3844 3844
3845 if ((buf = strchr (name, ';')) != NULL) 3845 if ((buf = strchr (name, ';')) != NULL)
3846 *buf++ = '\0'; 3846 *buf++ = '\0';
3847 3847
3848 if (name[0] == '?' && !name[1]) 3848 process_color_seq (op, color, name, resp);
3849 {
3850 unsigned short r, g, b;
3851 pix_colors_focused[color].get (display, r, g, b);
3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853 }
3854 else
3855 set_window_color (color, name);
3856 } 3849 }
3857 break; 3850 break;
3858 case XTerm_Color00: 3851 case XTerm_Color00:
3859 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3852 process_color_seq (op, Color_fg, str, resp);
3860 break; 3853 break;
3861 case XTerm_Color01: 3854 case XTerm_Color01:
3862 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3855 process_color_seq (op, Color_bg, str, resp);
3863 break; 3856 break;
3864#ifndef NO_CURSORCOLOR 3857#ifndef NO_CURSORCOLOR
3865 case XTerm_Color_cursor: 3858 case XTerm_Color_cursor:
3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3859 process_color_seq (op, Color_cursor, str, resp);
3867 break; 3860 break;
3868#endif 3861#endif
3869 case XTerm_Color_pointer_fg: 3862 case XTerm_Color_pointer_fg:
3870 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3863 process_color_seq (op, Color_pointer_fg, str, resp);
3871 break; 3864 break;
3872 case XTerm_Color_pointer_bg: 3865 case XTerm_Color_pointer_bg:
3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3866 process_color_seq (op, Color_pointer_bg, str, resp);
3874 break; 3867 break;
3875#ifndef NO_BOLD_UNDERLINE_REVERSE 3868#ifndef NO_BOLD_UNDERLINE_REVERSE
3876 case XTerm_Color_RV: 3869 case XTerm_Color_RV:
3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3870 process_color_seq (op, Color_RV, str, resp);
3878 break; 3871 break;
3879 case Rxvt_Color_BD: 3872 case Rxvt_Color_BD:
3880 case URxvt_Color_BD: 3873 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp); 3874 process_color_seq (op, Color_BD, str, resp);
3882 break; 3875 break;
3883 case Rxvt_Color_UL: 3876 case Rxvt_Color_UL:
3884 case URxvt_Color_UL: 3877 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp); 3878 process_color_seq (op, Color_UL, str, resp);
3886 break; 3879 break;
3887 case URxvt_Color_IT: 3880 case URxvt_Color_IT:
3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3881 process_color_seq (op, Color_IT, str, resp);
3889 break; 3882 break;
3890#endif 3883#endif
3891#if TRANSPARENT && TINTING 3884#if TRANSPARENT && TINTING
3892 case URxvt_Color_tint: 3885 case URxvt_Color_tint:
3893 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3886 process_color_seq (op, Color_tint, str, resp);
3887
3894 check_our_parents (); 3888 check_our_parents ();
3889
3895 if (am_transparent) 3890 if (am_transparent)
3896 want_full_refresh = want_refresh = 1; 3891 want_full_refresh = want_refresh = 1;
3892
3897 break; 3893 break;
3898#endif 3894#endif
3899 3895
3900 case Rxvt_Pixmap: 3896 case Rxvt_Pixmap:
3897 {
3901 if (*str != ';') 3898 if (*str != ';')
3902 { 3899 {
3903#if XPM_BACKGROUND 3900#if XPM_BACKGROUND
3904 scale_pixmap (""); /* reset to default scaling */ 3901 scale_pixmap (""); /* reset to default scaling */
3905 set_bgPixmap (str); /* change pixmap */ 3902 set_bgPixmap (str); /* change pixmap */
3906 scr_touch (true); 3903 scr_touch (true);
3907#endif 3904#endif
3908 } 3905 }
3909 3906
3907 int changed = 0;
3908
3910 while ((str = strchr (str, ';')) != NULL) 3909 while ((str = strchr (str, ';')) != NULL)
3911 { 3910 {
3912 str++; 3911 str++;
3913#if XPM_BACKGROUND 3912#if XPM_BACKGROUND
3914 changed += scale_pixmap (str); 3913 changed += scale_pixmap (str);
3915#endif 3914#endif
3916 } 3915 }
3917 3916
3918 if (changed) 3917 if (changed)
3919 { 3918 {
3920#ifdef XPM_BACKGROUND 3919#ifdef XPM_BACKGROUND
3921 resize_pixmap (); 3920 resize_pixmap ();
3922 scr_touch (true); 3921 scr_touch (true);
3923#endif 3922#endif
3924 } 3923 }
3924 }
3925 break; 3925 break;
3926 3926
3927 case Rxvt_restoreFG: 3927 case Rxvt_restoreFG:
3928 set_window_color (Color_fg, str); 3928 set_window_color (Color_fg, str);
3929 break; 3929 break;
3968 allocated.push_back ((void *)res); 3968 allocated.push_back ((void *)res);
3969 set_fonts (); 3969 set_fonts ();
3970 } 3970 }
3971 break; 3971 break;
3972 3972
3973#if ENABLE_FRILLS 3973 case URxvt_version:
3974 if (query)
3975 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3976 op,
3977 rs[Rs_name], VERSION[0], VERSION[2],
3978 resp);
3979 break;
3980
3981#if !ENABLE_MINIMAL
3974 case URxvt_locale: 3982 case URxvt_locale:
3975 if (query) 3983 if (query)
3976 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3984 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3977 else 3985 else
3978 { 3986 {
3979 set_locale (str); 3987 set_locale (str);
3980 pty.set_utf8_mode (enc_utf8); 3988 pty->set_utf8_mode (enc_utf8);
3981 init_xlocale (); 3989 init_xlocale ();
3982 } 3990 }
3983 break; 3991 break;
3984 3992
3985 case URxvt_view_up: 3993 case URxvt_view_up:
3996 break; 4004 break;
3997#endif 4005#endif
3998 4006
3999#if ENABLE_PERL 4007#if ENABLE_PERL
4000 case URxvt_perl: 4008 case URxvt_perl:
4001 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4009 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4002 ; // no responses yet 4010 ; // no responses yet
4003 break; 4011 break;
4004#endif 4012#endif
4005 } 4013 }
4006} 4014}
4038 return state; 4046 return state;
4039} 4047}
4040 4048
4041/* we're not using priv _yet_ */ 4049/* we're not using priv _yet_ */
4042void 4050void
4043rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4051rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4044{ 4052{
4045 unsigned int i, j; 4053 unsigned int i, j;
4046 int state; 4054 int state;
4047 4055
4048 static const struct 4056 static const struct
4342 scr_color (Color_bg, Color_bg); 4350 scr_color (Color_bg, Color_bg);
4343 break; 4351 break;
4344 4352
4345 //case 50: // not variable spacing 4353 //case 50: // not variable spacing
4346 4354
4347#if ENABLE_FRILLS 4355#if !ENABLE_MINIMAL
4348 case 90: 4356 case 90:
4349 case 91: /* set bright fg color */ 4357 case 91: /* set bright fg color */
4350 case 92: 4358 case 92:
4351 case 93: 4359 case 93:
4352 case 94: 4360 case 94:
4417rxvt_term::tt_write (const char *data, unsigned int len) 4425rxvt_term::tt_write (const char *data, unsigned int len)
4418{ 4426{
4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4427 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return; 4428 return;
4421 4429
4422 if (pty.pty < 0) 4430 if (pty->pty < 0)
4423 return; 4431 return;
4424 4432
4425 if (v_buflen == 0) 4433 if (v_buflen == 0)
4426 { 4434 {
4427 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4435 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4428 4436
4429 if ((unsigned int)written == len) 4437 if ((unsigned int)written == len)
4430 return; 4438 return;
4431 4439
4432 data += written; 4440 data += written;
4441 pty_ev.set (EVENT_READ | EVENT_WRITE); 4449 pty_ev.set (EVENT_READ | EVENT_WRITE);
4442} 4450}
4443 4451
4444void rxvt_term::pty_write () 4452void rxvt_term::pty_write ()
4445{ 4453{
4446 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4454 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4447 4455
4448 if (written > 0) 4456 if (written > 0)
4449 { 4457 {
4450 v_buflen -= written; 4458 v_buflen -= written;
4451 4459

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines