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.274 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.321 by root, Tue May 1 21:30:01 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
227# if !UNICODE3 226# if !UNICODE3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 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// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */
298void 303void
299rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
300{ 305{
301 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
302 unsigned int newlen; 307 unsigned int newlen;
303 KeySym keysym; 308 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 309 int valid_keysym;
308 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
309 316
310 /* 317 /*
311 * 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
312 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
313 * 320 *
… …
461 { 468 {
462 switch (keysym) 469 switch (keysym)
463 { 470 {
464 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
465 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
466 selection_request (ev.time, Sel_Primary); 473 selection_request (ev.time);
467 return; 474 return;
468#if TODO 475#if TODO
469 /* rxvt extras */ 476 /* rxvt extras */
470 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
471 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
870 return; 877 return;
871 878
872 if (len <= 0) 879 if (len <= 0)
873 return; /* not mapped */ 880 return; /* not mapped */
874 881
875 if (OPTION (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 883 if (view_start)
877 { 884 {
878 view_start = 0; 885 view_start = 0;
879 want_refresh = 1; 886 want_refresh = 1;
880 } 887 }
… …
902 { 909 {
903 const char ch = C0_ESC; 910 const char ch = C0_ESC;
904 tt_write (&ch, 1); 911 tt_write (&ch, 1);
905 } 912 }
906 913
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
918} 915}
919/*}}} */ 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}
920 993
921#if defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
922unsigned int 995unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 997{
… …
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 } 1175 }
1103} 1176}
1104#endif 1177#endif
1105 1178
1106#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1107static struct event_handler 1180static struct event_handler
1108{ 1181{
1109 check_watcher cw_yield; 1182 check_watcher yield_ev;
1110 1183
1111 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1112 { 1185 {
1113 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
1114 w.stop (); 1194 w.stop ();
1115 } 1195 }
1116 1196
1117 event_handler () 1197 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1119 { 1199 {
1120 } 1200 }
1121} event_handler; 1201} event_handler;
1122#endif 1202#endif
1123 1203
… …
1143 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1144 return true; 1224 return true;
1145 } 1225 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1227 {
1148#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1149 if (display->is_local) 1229 if (display->is_local)
1150 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1151#endif 1231#endif
1152 } 1232 }
1153 else 1233 else
1154 { 1234 {
1155 pty_ev.stop (); 1235 pty_ev.stop ();
1156 1236
1157 if (!OPTION (Opt_hold)) 1237 if (!option (Opt_hold))
1158 destroy (); 1238 destroy ();
1159 } 1239 }
1160 1240
1161 return false; 1241 return false;
1162} 1242}
… …
1177} 1257}
1178 1258
1179void 1259void
1180rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1181{ 1261{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1263 recolour_cursor ();
1184 1264
1185#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1266 hidden_pointer = 0;
1187 1267
1188 if (OPTION (Opt_pointerBlank)) 1268 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1190#endif 1270#endif
1191} 1271}
1192 1272
1193#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1194void 1274void
1195rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1196{ 1276{
1197 if (!OPTION (Opt_pointerBlank)) 1277 if (!option (Opt_pointerBlank))
1198 return; 1278 return;
1199 1279
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1281 XFlush (dpy);
1202 1282
1203 hidden_pointer = 1; 1283 hidden_pointer = 1;
1204} 1284}
1205 1285
1206void 1286void
… …
1279 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1280 (32 + x + 1), 1360 (32 + x + 1),
1281 (32 + y + 1)); 1361 (32 + y + 1));
1282} 1362}
1283 1363
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293
1294/*{{{ process an X event */ 1364/*{{{ process an X event */
1295void 1365void
1296rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1297{ 1367{
1298 make_current (); 1368 make_current ();
1299 1369
1300 dDisp; 1370 dLocal (Display *, dpy);
1301 1371
1302 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1375 return;
… …
1310 unsigned int unused_mask; 1380 unsigned int unused_mask;
1311 1381
1312 switch (ev.type) 1382 switch (ev.type)
1313 { 1383 {
1314 case KeyPress: 1384 case KeyPress:
1315#if ISO_14755 1385 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1386 break;
1321 1387
1322 case KeyRelease: 1388 case KeyRelease:
1323 { 1389 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1390 break;
1395 }
1396 1391
1397 case ButtonPress: 1392 case ButtonPress:
1398 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1399 break; 1394 break;
1400 1395
… …
1402 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1403 break; 1398 break;
1404 1399
1405 case ClientMessage: 1400 case ClientMessage:
1406 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1407 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1408 { 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 {
1409 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)))
1410 destroy (); 1411 destroy ();
1412 }
1411#if ENABLE_EWMH 1413#if ENABLE_EWMH
1412 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])
1413 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1415 &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 }
1416#endif 1429#endif
1417 } 1430 }
1418#if ENABLE_XEMBED
1419 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1420 {
1421 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1422 focus_in ();
1423 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1424 focus_out ();
1425 }
1426#endif
1427#ifdef OFFIX_DND
1428 /* OffiX Dnd (drag 'n' drop) protocol */
1429 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1430 && (ev.xclient.data.l[0] == DndFile
1431 || ev.xclient.data.l[0] == DndDir
1432 || ev.xclient.data.l[0] == DndLink))
1433 {
1434 /* Get Dnd data */
1435 Atom ActualType;
1436 int ActualFormat;
1437 unsigned char *data;
1438 unsigned long Size, RemainingBytes;
1439
1440 XGetWindowProperty (disp, display->root,
1441 xa[XA_DNDSELECTION],
1442 0L, 1000000L,
1443 False, AnyPropertyType,
1444 &ActualType, &ActualFormat,
1445 &Size, &RemainingBytes,
1446 &data);
1447 set_string_property (XA_CUT_BUFFER0, data);
1448 XFree (data);
1449 selection_paste (display->root, XA_CUT_BUFFER0, true);
1450 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1451 }
1452#endif /* OFFIX_DND */
1453 break; 1431 break;
1454 1432
1455 case MappingNotify: 1433 case MappingNotify:
1456 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1457 break; 1435 break;
… …
1480 break; 1458 break;
1481 } 1459 }
1482 break; 1460 break;
1483 1461
1484 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1485 focus_in (); 1466 focus_in ();
1486 break; 1467 break;
1487 1468
1488 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1489 focus_out (); 1473 focus_out ();
1490 break; 1474 break;
1491 1475
1492 case ConfigureNotify: 1476 case ConfigureNotify:
1493 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1494 { 1478 {
1495 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1496 ; 1480 ;
1497 1481
1498 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1499 { 1483 {
1500 seen_resize = 1; 1484 seen_resize = 1;
1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1502 } 1486 }
1503 1487
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505 1489
1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1490#ifdef TRANSPARENT
1507 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1508 check_our_parents (); 1492 check_our_parents ();
1509#endif 1493#endif
1510 } 1494 }
1511 break; 1495 break;
1512 1496
1513 case PropertyNotify: 1497 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515 && ev.xproperty.state == PropertyNewValue) 1500 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517 1502
1518 break; 1503 break;
1519 1504
1520 case SelectionClear: 1505 case SelectionClear:
1521 selection_clear (); 1506 selection_clear ();
… …
1557 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1558 { 1543 {
1559 do 1544 do
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1562 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1548
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1550
1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1569 1554
1570 want_refresh = 1; 1555 want_refresh = 1;
1571 } 1556 }
1572 else 1557 else
1573 { 1558 {
1574 XEvent unused_event; 1559 XEvent unused_event;
1575 1560
1576 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1562 ;
1578 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1564 ;
1580 1565
1581 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1582 { 1567 {
1583 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1584 scrollbar_show (0); 1569 scrollbar_show (0);
1585 } 1570 }
1586 1571
1587#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (disp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1590#endif 1575#endif
1591 } 1576 }
1592 break; 1577 break;
1593 1578
1594 case MotionNotify: 1579 case MotionNotify:
… …
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop 1591 ; // nop
1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1608 { 1593 {
1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1610 ; 1595 ;
1611 1596
1612 XQueryPointer (disp, vt, 1597 XQueryPointer (dpy, vt,
1613 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1614 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1615 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1616 &ev.xbutton.state); 1601 &ev.xbutton.state);
1617#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1681#endif 1666#endif
1682 } 1667 }
1683 } 1668 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1685 { 1670 {
1686 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1688 ; 1673 ;
1689 1674
1690 XQueryPointer (disp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1691 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1679 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1699 scrollbar_show (1); 1684 scrollbar_show (1);
1700 } 1685 }
1701 break; 1686 break;
1702 } 1687 }
1703 1688
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1708 { 1691 {
1709 if (hidden_cursor) 1692 if (hidden_cursor)
1710 { 1693 {
1711 hidden_cursor = 0; 1694 hidden_cursor = 0;
1712 want_refresh = 1; 1695 want_refresh = 1;
… …
1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1716 } 1699 }
1717#endif 1700#endif
1718 1701
1719#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1721 { 1704 {
1722 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1723 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1724 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1725 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1737 if (!focus) 1720 if (!focus)
1738 { 1721 {
1739 focus = 1; 1722 focus = 1;
1740 want_refresh = 1; 1723 want_refresh = 1;
1741 1724
1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 1726
1744#if USE_XIM 1727#if USE_XIM
1745 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1746 { 1729 {
1747 IMSetStatusPosition (); 1730 IMSetPosition ();
1748 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1749 } 1732 }
1750#endif 1733#endif
1751#if CURSOR_BLINK 1734#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1754#endif 1737#endif
1755#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1757 { 1740 {
… …
1784#if USE_XIM 1767#if USE_XIM
1785 if (Input_Context != NULL) 1768 if (Input_Context != NULL)
1786 XUnsetICFocus (Input_Context); 1769 XUnsetICFocus (Input_Context);
1787#endif 1770#endif
1788#if CURSOR_BLINK 1771#if CURSOR_BLINK
1789 if (OPTION (Opt_cursorBlink)) 1772 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop (); 1773 cursor_blink_ev.stop ();
1791 hidden_cursor = 0; 1774 hidden_cursor = 0;
1792#endif 1775#endif
1793#if OFF_FOCUS_FADING 1776#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1777 if (rs[Rs_fade])
… …
1798 } 1781 }
1799#endif 1782#endif
1800 } 1783 }
1801} 1784}
1802 1785
1803#if TRANSPARENT 1786void
1787rxvt_term::update_fade_color (unsigned int idx)
1788{
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1791 {
1792 rgba c;
1793 pix_colors [Color_fade].get (c);
1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1795 }
1796#endif
1797}
1798
1799#if TRANSPARENT || ENABLE_PERL
1804void 1800void
1805rxvt_term::rootwin_cb (XEvent &ev) 1801rxvt_term::rootwin_cb (XEvent &ev)
1806{ 1802{
1807 make_current (); 1803 make_current ();
1808 1804
1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1807 return;
1808
1809# if TRANSPARENT
1809 switch (ev.type) 1810 switch (ev.type)
1810 { 1811 {
1811 case PropertyNotify: 1812 case PropertyNotify:
1812 /* 1813 /*
1813 * if user used some Esetroot compatible prog to set the root bg, 1814 * if user used some Esetroot compatible prog to set the root bg,
… …
1817 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1818 return; 1819 return;
1819 1820
1820 /* FALLTHROUGH */ 1821 /* FALLTHROUGH */
1821 case ReparentNotify: 1822 case ReparentNotify:
1822 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1823 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1823 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1824 break; 1825 break;
1825 } 1826 }
1827# endif
1826} 1828}
1827#endif 1829#endif
1828 1830
1829void 1831void
1830rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
1839 /* 1841 /*
1840 * VT window processing of button press 1842 * VT window processing of button press
1841 */ 1843 */
1842 if (ev.window == vt) 1844 if (ev.window == vt)
1843 { 1845 {
1846 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1847 return;
1848
1844#if ISO_14755 1849#if ISO_14755
1845 // 5.4 1850 // 5.4
1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1847 { 1852 {
1848 iso14755_54 (ev.x, ev.y); 1853 iso14755_54 (ev.x, ev.y);
… …
1890 else 1895 else
1891 { 1896 {
1892 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
1893 MEvent.clicks = 0; 1898 MEvent.clicks = 0;
1894 1899
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1896 switch (ev.button) 1900 switch (ev.button)
1897 { 1901 {
1898 case Button1: 1902 case Button1:
1899 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1901#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1903#else 1907#else
1904 selection.rect = false; 1908 selection.rect = false;
1905#endif 1909#endif
1906 1910
1907 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1909 { 1913 {
1910 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1911 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1912 else 1916 else
1913 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1914 } 1918 }
1915 else 1919 else
1916 { 1920 {
1917 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1918 MEvent.clicks++; 1922 MEvent.clicks++;
1919 else 1923 else
1920 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1921 1925
1922 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1923 } 1927 }
1924 1928
1925 MEvent.button = Button1; 1929 MEvent.button = Button1;
1926 break; 1930 break;
1927 1931
1928 case Button3: 1932 case Button3:
1929 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1931 else 1935 else
1932 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1933 1937
1934 MEvent.button = Button3; 1938 MEvent.button = Button3;
1935 break; 1939 break;
1936 } 1940 }
1937 } 1941 }
1938 1942
1939 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1940 return; 1944 return;
1941 } 1945 }
1942 1946
… …
2105 sel_scroll_ev.stop(); 2109 sel_scroll_ev.stop();
2106#endif 2110#endif
2107 2111
2108 if (ev.window == vt) 2112 if (ev.window == vt)
2109 { 2113 {
2114 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2115 return;
2116
2110#if ISO_14755 2117#if ISO_14755
2111 // 5.4 2118 // 5.4
2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2119 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2113 return; 2120 return;
2114#endif 2121#endif
2122
2115 if (reportmode) 2123 if (reportmode)
2116 { 2124 {
2117 /* mouse report from vt window */ 2125 /* mouse report from vt window */
2118 /* don't report release of wheel "buttons" */ 2126 /* don't report release of wheel "buttons" */
2119 if (ev.button >= 4) 2127 if (ev.button >= 4)
… …
2143 if (priv_modes & PrivMode_mouse_report 2151 if (priv_modes & PrivMode_mouse_report
2144 && bypass_keystate 2152 && bypass_keystate
2145 && ev.button == Button1 && MEvent.clicks <= 1) 2153 && ev.button == Button1 && MEvent.clicks <= 1)
2146 selection_extend (ev.x, ev.y, 0); 2154 selection_extend (ev.x, ev.y, 0);
2147 2155
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2151 switch (ev.button) 2156 switch (ev.button)
2152 { 2157 {
2153 case Button1: 2158 case Button1:
2154 case Button3: 2159 case Button3:
2155 selection_make (ev.time); 2160 selection_make (ev.time);
2156 break; 2161 break;
2157 2162
2158 case Button2: 2163 case Button2:
2159 if (IN_RANGE_EXC (ev.x, 0, width) 2164 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160 && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2165 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2161 {
2162 if (ev.state & ShiftMask)
2163 selection_request (ev.time, Sel_Clipboard);
2164 else
2165 selection_request (ev.time, Sel_Primary);
2166 }
2167 break; 2166 break;
2168 2167
2169#ifdef MOUSE_WHEEL 2168#ifdef MOUSE_WHEEL
2170 case Button4: 2169 case Button4:
2171 case Button5: 2170 case Button5:
… …
2175 2174
2176 v = ev.button == Button4 ? UP : DN; 2175 v = ev.button == Button4 ? UP : DN;
2177 2176
2178 if (ev.state & ShiftMask) 2177 if (ev.state & ShiftMask)
2179 i = 1; 2178 i = 1;
2180 else if (OPTION (Opt_mouseWheelScrollPage)) 2179 else if (option (Opt_mouseWheelScrollPage))
2181 i = nrow - 1; 2180 i = nrow - 1;
2182 else 2181 else
2183 i = 5; 2182 i = 5;
2184 2183
2185# ifdef MOUSE_SLIP_WHEELING 2184# ifdef MOUSE_SLIP_WHEELING
… …
2213#if TINTING 2212#if TINTING
2214/* taken from aterm-0.4.2 */ 2213/* taken from aterm-0.4.2 */
2215 2214
2216typedef uint32_t RUINT32T; 2215typedef uint32_t RUINT32T;
2217 2216
2218void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2217void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2219{ 2218{
2220 int sh_r, sh_g, sh_b; 2219 int sh_r, sh_g, sh_b;
2221 RUINT32T mask_r, mask_g, mask_b; 2220 RUINT32T mask_r, mask_g, mask_b;
2222 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2223 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2224 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2225 int i; 2224 int i;
2226 2225
2227 Visual *visual = display->visual; 2226 Visual *visual = term->visual;
2228 2227
2229 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2230 2229
2231 /* for convenience */ 2230 /* for convenience */
2232 mask_r = visual->red_mask; 2231 mask_r = visual->red_mask;
… …
2453 Atom atype; 2452 Atom atype;
2454 unsigned char *prop = NULL; 2453 unsigned char *prop = NULL;
2455 Window root, oldp, *list; 2454 Window root, oldp, *list;
2456 Pixmap rootpixmap = None; 2455 Pixmap rootpixmap = None;
2457 XWindowAttributes wattr, wrootattr; 2456 XWindowAttributes wattr, wrootattr;
2458 dDisp;
2459 2457
2460 pchanged = 0; 2458 pchanged = 0;
2461 2459
2462 if (!OPTION (Opt_transparent)) 2460 if (!option (Opt_transparent))
2463 return pchanged; /* Don't try any more */ 2461 return pchanged; /* Don't try any more */
2464 2462
2465 XGetWindowAttributes (disp, display->root, &wrootattr); 2463 XGetWindowAttributes (dpy, display->root, &wrootattr);
2466 rootdepth = wrootattr.depth; 2464 rootdepth = wrootattr.depth;
2467 2465
2468 XGetWindowAttributes (disp, parent[0], &wattr); 2466 XGetWindowAttributes (dpy, parent[0], &wattr);
2469 2467
2470 if (rootdepth != wattr.depth) 2468 if (rootdepth != wattr.depth)
2471 { 2469 {
2472 if (am_transparent) 2470 if (am_transparent)
2473 { 2471 {
2474 pchanged = 1; 2472 pchanged = 1;
2475 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2473 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2476 am_transparent = am_pixmap_trans = 0; 2474 am_transparent = am_pixmap_trans = 0;
2477 } 2475 }
2478 2476
2479 return pchanged; /* Don't try any more */ 2477 return pchanged; /* Don't try any more */
2480 } 2478 }
2481 2479
2482 /* Get all X ops out of the queue so that our information is up-to-date. */ 2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2483 XSync (disp, False); 2481 XSync (dpy, False);
2484 2482
2485 /* 2483 /*
2486 * Make the frame window set by the window manager have 2484 * Make the frame window set by the window manager have
2487 * the root background. Some window managers put multiple nested frame 2485 * the root background. Some window managers put multiple nested frame
2488 * windows for each client, so we have to take care about that. 2486 * windows for each client, so we have to take care about that.
2489 */ 2487 */
2490 i = (xa[XA_XROOTPMAP_ID] 2488 i = (xa[XA_XROOTPMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2494 2492
2495 if (!i || prop == NULL) 2493 if (!i || prop == NULL)
2496 i = (xa[XA_ESETROOT_PMAP_ID] 2494 i = (xa[XA_ESETROOT_PMAP_ID]
2497 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2495 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2498 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2499 &nitems, &bytes_after, &prop) == Success); 2497 &nitems, &bytes_after, &prop) == Success);
2500 2498
2501 if (!i || prop == NULL 2499 if (!i || prop == NULL
2502#if TINTING 2500#if TINTING
2503 || !rs[Rs_color + Color_tint] 2501 || !ISSET_PIXCOLOR (Color_tint)
2504#endif 2502#endif
2505 ) 2503 )
2506 have_pixmap = 0; 2504 have_pixmap = 0;
2507 else 2505 else
2508 { 2506 {
… …
2521 Window cr; 2519 Window cr;
2522 XImage *image; 2520 XImage *image;
2523 GC gc; 2521 GC gc;
2524 XGCValues gcvalue; 2522 XGCValues gcvalue;
2525 2523
2526 XTranslateCoordinates (disp, parent[0], display->root, 2524 XTranslateCoordinates (dpy, parent[0], display->root,
2527 0, 0, &sx, &sy, &cr); 2525 0, 0, &sx, &sy, &cr);
2528 nw = (unsigned int)szHint.width; 2526 nw = (unsigned int)szHint.width;
2529 nh = (unsigned int)szHint.height; 2527 nh = (unsigned int)szHint.height;
2530 nx = ny = 0; 2528 nx = ny = 0;
2531 2529
… …
2544 } 2542 }
2545 2543
2546 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2547 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2548 2546
2549 XSync (disp, False); 2547 XSync (dpy, False);
2550 allowedxerror = -1; 2548 allowedxerror = -1;
2551 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2549 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2552 2550
2553 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2554 /* XXX: may need a delay here? */ 2552 /* XXX: may need a delay here? */
2555 allowedxerror = 0; 2553 allowedxerror = 0;
2556 2554
… …
2559 if (am_transparent && am_pixmap_trans) 2557 if (am_transparent && am_pixmap_trans)
2560 { 2558 {
2561 pchanged = 1; 2559 pchanged = 1;
2562 if (pixmap != None) 2560 if (pixmap != None)
2563 { 2561 {
2564 XFreePixmap (disp, pixmap); 2562 XFreePixmap (dpy, pixmap);
2565 pixmap = None; 2563 pixmap = None;
2566 } 2564 }
2567 } 2565 }
2568 2566
2569 am_pixmap_trans = 0; 2567 am_pixmap_trans = 0;
2570 } 2568 }
2571 else 2569 else
2572 { 2570 {
2573 if (pixmap != None) 2571 if (pixmap != None)
2574 XFreePixmap (disp, pixmap); 2572 XFreePixmap (dpy, pixmap);
2575 2573
2576#if TINTING 2574#if TINTING
2577 if (ISSET_PIXCOLOR (Color_tint)) 2575 if (ISSET_PIXCOLOR (Color_tint))
2578 { 2576 {
2579 unsigned short rm, gm, bm;
2580 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2577 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2581 2578
2579 rgba c;
2582 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2580 pix_colors_focused [Color_tint].get (c);
2583 2581
2584 ShadeXImage (display, image, shade, rm, gm, bm); 2582 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2585 } 2583 }
2586#endif 2584#endif
2587 2585
2588 pixmap = XCreatePixmap (disp, vt, 2586 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2589 szHint.width, szHint.height, image->depth);
2590 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2587 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2591 XPutImage (disp, pixmap, gc, image, 0, 0, 2588 XPutImage (dpy, pixmap, gc, image, 0, 0,
2592 nx, ny, image->width, image->height); 2589 nx, ny, image->width, image->height);
2593 XFreeGC (disp, gc); 2590 XFreeGC (dpy, gc);
2594 XDestroyImage (image); 2591 XDestroyImage (image);
2595 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2592 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2596 XClearWindow (disp, parent[0]); 2593 XClearWindow (dpy, parent[0]);
2597 2594
2598 if (!am_transparent || !am_pixmap_trans) 2595 if (!am_transparent || !am_pixmap_trans)
2599 pchanged = 1; 2596 pchanged = 1;
2600 2597
2601 am_transparent = am_pixmap_trans = 1; 2598 am_transparent = am_pixmap_trans = 1;
2602 } 2599 }
2603 } 2600 }
2604 2601
2605 if (am_pixmap_trans) 2602 if (am_pixmap_trans)
2606 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2603 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2607 else 2604 else
2608 { 2605 {
2609 unsigned int n; 2606 unsigned int n;
2610 /* 2607 /*
2611 * InheritPixmap transparency 2608 * InheritPixmap transparency
2612 */ 2609 */
2613 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2610 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2614 { 2611 {
2615 oldp = parent[i]; 2612 oldp = parent[i];
2616 XQueryTree (disp, parent[i - 1], &root, 2613 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2617 &parent[i], &list, &n);
2618 XFree (list); 2614 XFree (list);
2619 2615
2620 if (parent[i] == display->root) 2616 if (parent[i] == display->root)
2621 { 2617 {
2622 if (oldp != None) 2618 if (oldp != None)
… …
2630 } 2626 }
2631 2627
2632 n = 0; 2628 n = 0;
2633 2629
2634 if (pchanged) 2630 if (pchanged)
2635 {
2636 for (; n < (unsigned int)i; n++) 2631 for (; n < (unsigned int)i; n++)
2637 { 2632 {
2638 XGetWindowAttributes (disp, parent[n], &wattr); 2633 XGetWindowAttributes (dpy, parent[n], &wattr);
2634
2639 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2635 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2640 { 2636 {
2641 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2637 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2642 break; 2638 break;
2643 } 2639 }
2644 } 2640 }
2645 }
2646 2641
2647 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2642 if (n > (sizeof (parent) / sizeof (parent[0])))
2648 { 2643 {
2649 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2644 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2650 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2645 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2651 am_transparent = 0; 2646 am_transparent = 0;
2652 /* XXX: also turn off Opt_transparent? */ 2647 /* XXX: also turn off Opt_transparent? */
2653 } 2648 }
2654 else 2649 else
2655 { 2650 {
2656#if WAIT_FOR_WM
2657 /* wait (an arbitrary period) for the WM to do its thing
2658 * needed for fvwm2.2.2 (and before?) */
2659 sleep (1);
2660#endif
2661 for (n = 0; n < (unsigned int)i; n++) 2651 for (n = 0; n < (unsigned int)i; n++)
2662 { 2652 {
2663 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2664 XClearWindow (disp, parent[n]); 2654 XClearWindow (dpy, parent[n]);
2665 } 2655 }
2666 2656
2667 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2657 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2668 am_transparent = 1; 2658 am_transparent = 1;
2669 } 2659 }
2670 2660
2671 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2661 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2672 parent[i] = None; 2662 parent[i] = None;
2673 } 2663 }
2674 2664
2675 if (scrollBar.win) 2665 if (scrollBar.win)
2676 { 2666 {
2677 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2667 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2678 scrollBar.setIdle (); 2668 scrollBar.setIdle ();
2679 scrollbar_show (0); 2669 scrollbar_show (0);
2680 } 2670 }
2681 2671
2682 if (am_transparent) 2672 if (am_transparent)
… …
2745 if (ch == C0_LF) 2735 if (ch == C0_LF)
2746 nlines++; 2736 nlines++;
2747 2737
2748 refresh_count++; 2738 refresh_count++;
2749 2739
2750 if (!OPTION (Opt_jumpScroll) 2740 if (!option (Opt_jumpScroll)
2751 || (refresh_count >= refresh_limit * (nrow - 1))) 2741 || (refresh_count >= refresh_limit * (nrow - 1)))
2752 { 2742 {
2753 refreshnow = true; 2743 refreshnow = true;
2754 refresh_count = 0; 2744 refresh_count = 0;
2755 ch = NOCHAR; 2745 ch = NOCHAR;
… …
2795 * the number of pages between refreshes is refresh_limit, which 2785 * the number of pages between refreshes is refresh_limit, which
2796 * is incremented here because we must be doing flat-out scrolling. 2786 * is incremented here because we must be doing flat-out scrolling.
2797 */ 2787 */
2798 if (refreshnow) 2788 if (refreshnow)
2799 { 2789 {
2800 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2790 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2801 refresh_limit++; 2791 refresh_limit++;
2802 else 2792 else
2803 { 2793 {
2804 flag = true; 2794 flag = true;
2795 //TODO: due to popular request, implement "skipscroll" option here
2805 scr_refresh (); 2796 scr_refresh ();
2806 want_refresh = 1; 2797 want_refresh = 1;
2807 } 2798 }
2808 } 2799 }
2809 2800
… …
3133 scr_charset_set (2, (unsigned int)cmd_getc ()); 3124 scr_charset_set (2, (unsigned int)cmd_getc ());
3134 break; 3125 break;
3135 case '+': 3126 case '+':
3136 scr_charset_set (3, (unsigned int)cmd_getc ()); 3127 scr_charset_set (3, (unsigned int)cmd_getc ());
3137 break; 3128 break;
3138#if ENABLE_FRILLS 3129#if !ENABLE_MINIMAL
3139 case '6': 3130 case '6':
3140 scr_backindex (); 3131 scr_backindex ();
3141 break; 3132 break;
3142#endif 3133#endif
3143 case '7': 3134 case '7':
3144 scr_cursor (SAVE); 3135 scr_cursor (SAVE);
3145 break; 3136 break;
3146 case '8': 3137 case '8':
3147 scr_cursor (RESTORE); 3138 scr_cursor (RESTORE);
3148 break; 3139 break;
3149#if ENABLE_FRILLS 3140#if !ENABLE_MINIMAL
3150 case '9': 3141 case '9':
3151 scr_forwardindex (); 3142 scr_forwardindex ();
3152 break; 3143 break;
3153#endif 3144#endif
3154 case '=': 3145 case '=':
… …
3316 ndef = get_byte_array_bit (csi_defaults, i); 3307 ndef = get_byte_array_bit (csi_defaults, i);
3317 for (p = 0; p < nargs; p++) 3308 for (p = 0; p < nargs; p++)
3318 if (arg[p] == -1) 3309 if (arg[p] == -1)
3319 arg[p] = ndef; 3310 arg[p] = ndef;
3320 3311
3321#ifdef DEBUG_CMD
3322 fprintf (stderr, "CSI ");
3323 for (p = 0; p < nargs; p++)
3324 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3325 fprintf (stderr, "%c\n", ch);
3326#endif
3327
3328 /* 3312 /*
3329 * private mode handling 3313 * private mode handling
3330 */ 3314 */
3331 if (priv) 3315 if (priv)
3332 { 3316 {
3333 switch (priv) 3317 switch (priv)
3334 { 3318 {
3335 case '>': 3319 case '>':
3336 if (ch == CSI_DA) /* secondary device attributes */ 3320 if (ch == CSI_DA) /* secondary device attributes */
3337 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3321 {
3322 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3323 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3324 //
3325 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3326 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3327 // that we do not support xterm mouse reporting (should be 95 when we do).
3328 //
3329 tt_printf ("\033[>%d;94;0c", 'U');
3330 }
3338 break; 3331 break;
3339 case '?': 3332 case '?':
3340 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3333 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3341 process_terminal_mode (ch, priv, nargs, arg); 3334 process_terminal_mode (ch, priv, nargs, arg);
3342 break; 3335 break;
… …
3468 break; 3461 break;
3469 case 6: /* CPR requested */ 3462 case 6: /* CPR requested */
3470 scr_report_position (); 3463 scr_report_position ();
3471 break; 3464 break;
3472 case 7: /* unofficial extension */ 3465 case 7: /* unofficial extension */
3473 if (OPTION (Opt_insecure)) 3466 if (option (Opt_insecure))
3474 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3467 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3475 break; 3468 break;
3476 case 8: /* unofficial extension */ 3469 case 8: /* unofficial extension */
3477 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3470 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3478 break; 3471 break;
… …
3545 break; 3538 break;
3546 case CSI_75: 3539 case CSI_75:
3547 scr_cursor (RESTORE); 3540 scr_cursor (RESTORE);
3548 break; 3541 break;
3549 3542
3550#if ENABLE_FRILLS 3543#if !ENABLE_MINIMAL
3551 case CSI_74: 3544 case CSI_74:
3552 process_window_ops (arg, nargs); 3545 process_window_ops (arg, nargs);
3553 break; 3546 break;
3554#endif 3547#endif
3555 3548
… …
3562 break; 3555 break;
3563 } 3556 }
3564} 3557}
3565/*}}} */ 3558/*}}} */
3566 3559
3567#if ENABLE_FRILLS 3560#if !ENABLE_MINIMAL
3568/* ARGSUSED */ 3561/* ARGSUSED */
3569void 3562void
3570rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3563rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3571{ 3564{
3572 int x, y; 3565 int x, y;
3573 XWindowAttributes wattr; 3566 XWindowAttributes wattr;
3574 Window wdummy; 3567 Window wdummy;
3575 dDisp; 3568
3569 dLocal (Display *, dpy);
3576 3570
3577 if (nargs == 0) 3571 if (nargs == 0)
3578 return; 3572 return;
3579 3573
3580 switch (args[0]) 3574 switch (args[0])
3581 { 3575 {
3582 /* 3576 /*
3583 * commands 3577 * commands
3584 */ 3578 */
3585 case 1: /* deiconify window */ 3579 case 1: /* deiconify window */
3586 XMapWindow (disp, parent[0]); 3580 XMapWindow (dpy, parent[0]);
3587 break; 3581 break;
3588 case 2: /* iconify window */ 3582 case 2: /* iconify window */
3589 XIconifyWindow (disp, parent[0], display->screen); 3583 XIconifyWindow (dpy, parent[0], display->screen);
3590 break; 3584 break;
3591 case 3: /* set position (pixels) */ 3585 case 3: /* set position (pixels) */
3592 XMoveWindow (disp, parent[0], args[1], args[2]); 3586 XMoveWindow (dpy, parent[0], args[1], args[2]);
3593 break; 3587 break;
3594 case 4: /* set size (pixels) */ 3588 case 4: /* set size (pixels) */
3595 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3596 break; 3590 break;
3597 case 5: /* raise window */ 3591 case 5: /* raise window */
3598 XRaiseWindow (disp, parent[0]); 3592 XRaiseWindow (dpy, parent[0]);
3599 break; 3593 break;
3600 case 6: /* lower window */ 3594 case 6: /* lower window */
3601 XLowerWindow (disp, parent[0]); 3595 XLowerWindow (dpy, parent[0]);
3602 break; 3596 break;
3603 case 7: /* refresh window */ 3597 case 7: /* refresh window */
3604 scr_touch (true); 3598 scr_touch (true);
3605 break; 3599 break;
3606 case 8: /* set size (chars) */ 3600 case 8: /* set size (chars) */
… …
3613 if (args[0] >= 24) /* set height (chars) */ 3607 if (args[0] >= 24) /* set height (chars) */
3614 set_widthheight ((unsigned int)width, 3608 set_widthheight ((unsigned int)width,
3615 (unsigned int) (args[1] * fheight)); 3609 (unsigned int) (args[1] * fheight));
3616 break; 3610 break;
3617 3611
3618
3619 /* 3612 /*
3620 * reports - some output format copied from XTerm 3613 * reports - some output format copied from XTerm
3621 */ 3614 */
3622 case 11: /* report window state */ 3615 case 11: /* report window state */
3623 XGetWindowAttributes (disp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3624 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3617 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3625 break; 3618 break;
3626 case 13: /* report window position */ 3619 case 13: /* report window position */
3627 XGetWindowAttributes (disp, parent[0], &wattr); 3620 XGetWindowAttributes (dpy, parent[0], &wattr);
3628 XTranslateCoordinates (disp, parent[0], wattr.root, 3621 XTranslateCoordinates (dpy, parent[0], wattr.root,
3629 -wattr.border_width, -wattr.border_width, 3622 -wattr.border_width, -wattr.border_width,
3630 &x, &y, &wdummy); 3623 &x, &y, &wdummy);
3631 tt_printf ("\033[3;%d;%dt", x, y); 3624 tt_printf ("\033[3;%d;%dt", x, y);
3632 break; 3625 break;
3633 case 14: /* report window size (pixels) */ 3626 case 14: /* report window size (pixels) */
3634 XGetWindowAttributes (disp, parent[0], &wattr); 3627 XGetWindowAttributes (dpy, parent[0], &wattr);
3635 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3628 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3636 break; 3629 break;
3637 case 18: /* report text area size (chars) */ 3630 case 18: /* report text area size (chars) */
3638 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3631 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3639 break; 3632 break;
… …
3641 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3634 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3642 break; 3635 break;
3643 case 20: /* report icon label */ 3636 case 20: /* report icon label */
3644 { 3637 {
3645 char *s; 3638 char *s;
3646 XGetIconName (disp, parent[0], &s); 3639 XGetIconName (dpy, parent[0], &s);
3647 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3640 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3648 XFree (s); 3641 XFree (s);
3649 } 3642 }
3650 break; 3643 break;
3651 case 21: /* report window title */ 3644 case 21: /* report window title */
3652 { 3645 {
3653 char *s; 3646 char *s;
3654 XFetchName (disp, parent[0], &s); 3647 XFetchName (dpy, parent[0], &s);
3655 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3648 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3656 XFree (s); 3649 XFree (s);
3657 } 3650 }
3658 break; 3651 break;
3659 } 3652 }
3660} 3653}
… …
3687 seen_esc = true; 3680 seen_esc = true;
3688 continue; 3681 continue;
3689 } 3682 }
3690 else if (ch == C0_BEL || ch == CHAR_ST) 3683 else if (ch == C0_BEL || ch == CHAR_ST)
3691 break; 3684 break;
3685 else if (ch == C0_SYN)
3686 ch = cmd_get8 ();
3692 else if (ch < 0x20) 3687 else if (ch < 0x20)
3693 return NULL; /* other control character - exit */ 3688 return NULL; /* other control character - exit */
3694 3689
3695 seen_esc = false; 3690 seen_esc = false;
3696 3691
3697 if (n >= STRING_MAX - 1) 3692 if (n >= STRING_MAX - 1)
3698 // stop at some sane length 3693 // stop at some sane length
3699 return NULL; 3694 return NULL;
3700 3695
3701 if (ch == C0_SYN)
3702 string[n++] = cmd_get8 ();
3703 else
3704 string[n++] = ch; 3696 string[n++] = ch;
3705 } 3697 }
3706 3698
3707 string[n++] = '\0'; 3699 string[n++] = '\0';
3708 3700
3709 ends_how = (ch == 0x5c ? C0_ESC : ch); 3701 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3760void 3752void
3761rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3762{ 3754{
3763 if (str[0] == '?' && !str[1]) 3755 if (str[0] == '?' && !str[1])
3764 { 3756 {
3765 unsigned short r, g, b; 3757 rgba c;
3766 pix_colors_focused[color].get (display, r, g, b); 3758 pix_colors_focused[color].get (c);
3759
3760#if XFT
3761 if (c.a != rgba::MAX_CC)
3762 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3763 else
3764#endif
3767 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3765 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3768 } 3766 }
3769 else 3767 else
3770 set_window_color (color, str); 3768 set_window_color (color, str);
3771} 3769}
3772 3770
… …
3778{ 3776{
3779 int color; 3777 int color;
3780 char *buf, *name; 3778 char *buf, *name;
3781 bool query = str[0] == '?' && !str[1]; 3779 bool query = str[0] == '?' && !str[1];
3782 int saveop = op; 3780 int saveop = op;
3783 dDisp; 3781
3782 dLocal (Display *, dpy);
3784 3783
3785 assert (str != NULL); 3784 assert (str != NULL);
3785
3786 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3787 return;
3788
3786 switch (op) 3789 switch (op)
3787 { 3790 {
3788 case XTerm_name: 3791 case XTerm_name:
3789 set_title (str); 3792 set_title (str);
3790 /* FALLTHROUGH */ 3793 /* FALLTHROUGH */
… …
3804 unsigned long bytes_after; 3807 unsigned long bytes_after;
3805 unsigned char *value = 0; 3808 unsigned char *value = 0;
3806 const char *str = ""; 3809 const char *str = "";
3807 3810
3808 if (prop 3811 if (prop
3809 && XGetWindowProperty (disp, parent[0], 3812 && XGetWindowProperty (dpy, parent[0],
3810 prop, 0, 1<<16, 0, AnyPropertyType, 3813 prop, 0, 1<<16, 0, AnyPropertyType,
3811 &actual_type, &actual_format, 3814 &actual_type, &actual_format,
3812 &nitems, &bytes_after, &value) == Success 3815 &nitems, &bytes_after, &value) == Success
3813 && actual_type != None 3816 && actual_type != None
3814 && actual_format == 8) 3817 && actual_format == 8)
3815 str = (const char *)(value); 3818 str = (const char *)(value);
3816 3819
3817 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3820 tt_printf ("\033]%d;%s%c", op, str, resp);
3818 3821
3819 XFree (value); 3822 XFree (value);
3820 } 3823 }
3821 else 3824 else
3822 { 3825 {
… …
3826 { 3829 {
3827 *eq = 0; 3830 *eq = 0;
3828 set_utf8_property (display->atom (str), eq + 1); 3831 set_utf8_property (display->atom (str), eq + 1);
3829 } 3832 }
3830 else 3833 else
3831 XDeleteProperty (disp, parent[0], 3834 XDeleteProperty (dpy, parent[0],
3832 display->atom (str)); 3835 display->atom (str));
3833 } 3836 }
3834 break; 3837 break;
3835 3838
3836 case XTerm_Color: 3839 case XTerm_Color:
… …
3846 break; 3849 break;
3847 3850
3848 if ((buf = strchr (name, ';')) != NULL) 3851 if ((buf = strchr (name, ';')) != NULL)
3849 *buf++ = '\0'; 3852 *buf++ = '\0';
3850 3853
3851 if (name[0] == '?' && !name[1]) 3854 process_color_seq (op, color, name, resp);
3852 {
3853 unsigned short r, g, b;
3854 pix_colors_focused[color].get (display, r, g, b);
3855 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3856 }
3857 else
3858 set_window_color (color, name);
3859 } 3855 }
3860 break; 3856 break;
3861 case XTerm_Color00: 3857 case XTerm_Color00:
3862 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3858 process_color_seq (op, Color_fg, str, resp);
3863 break; 3859 break;
3864 case XTerm_Color01: 3860 case XTerm_Color01:
3865 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3861 process_color_seq (op, Color_bg, str, resp);
3866 break; 3862 break;
3867#ifndef NO_CURSORCOLOR 3863#ifndef NO_CURSORCOLOR
3868 case XTerm_Color_cursor: 3864 case XTerm_Color_cursor:
3869 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3865 process_color_seq (op, Color_cursor, str, resp);
3870 break; 3866 break;
3871#endif 3867#endif
3872 case XTerm_Color_pointer_fg: 3868 case XTerm_Color_pointer_fg:
3873 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3869 process_color_seq (op, Color_pointer_fg, str, resp);
3874 break; 3870 break;
3875 case XTerm_Color_pointer_bg: 3871 case XTerm_Color_pointer_bg:
3876 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3872 process_color_seq (op, Color_pointer_bg, str, resp);
3877 break; 3873 break;
3878#ifndef NO_BOLD_UNDERLINE_REVERSE 3874#ifndef NO_BOLD_UNDERLINE_REVERSE
3879 case XTerm_Color_RV: 3875 case XTerm_Color_RV:
3880 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3876 process_color_seq (op, Color_RV, str, resp);
3881 break; 3877 break;
3882 case Rxvt_Color_BD: 3878 case Rxvt_Color_BD:
3883 case URxvt_Color_BD: 3879 case URxvt_Color_BD:
3884 process_color_seq (op, Color_BD, str, resp); 3880 process_color_seq (op, Color_BD, str, resp);
3885 break; 3881 break;
3886 case Rxvt_Color_UL: 3882 case Rxvt_Color_UL:
3887 case URxvt_Color_UL: 3883 case URxvt_Color_UL:
3888 process_color_seq (op, Color_UL, str, resp); 3884 process_color_seq (op, Color_UL, str, resp);
3889 break; 3885 break;
3890 case URxvt_Color_IT: 3886 case URxvt_Color_IT:
3891 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3887 process_color_seq (op, Color_IT, str, resp);
3892 break; 3888 break;
3893#endif 3889#endif
3894#if TRANSPARENT && TINTING 3890#if TRANSPARENT && TINTING
3895 case URxvt_Color_tint: 3891 case URxvt_Color_tint:
3896 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3892 process_color_seq (op, Color_tint, str, resp);
3893
3897 check_our_parents (); 3894 check_our_parents ();
3895
3898 if (am_transparent) 3896 if (am_transparent)
3899 want_full_refresh = want_refresh = 1; 3897 want_full_refresh = want_refresh = 1;
3898
3900 break; 3899 break;
3901#endif 3900#endif
3902 3901
3903 case Rxvt_Pixmap: 3902 case Rxvt_Pixmap:
3904 { 3903 {
… …
3962 case URxvt_italicFont: 3961 case URxvt_italicFont:
3963 case URxvt_boldItalicFont: 3962 case URxvt_boldItalicFont:
3964#endif 3963#endif
3965 if (query) 3964 if (query)
3966 tt_printf ("\33]%d;%-.250s%c", saveop, 3965 tt_printf ("\33]%d;%-.250s%c", saveop,
3967 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3966 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3968 ? fontset[op - URxvt_font]->fontdesc : "", 3967 ? fontset[op - URxvt_font]->fontdesc : "",
3969 resp); 3968 resp);
3970 else 3969 else
3971 { 3970 {
3972 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3971 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3975 allocated.push_back ((void *)res); 3974 allocated.push_back ((void *)res);
3976 set_fonts (); 3975 set_fonts ();
3977 } 3976 }
3978 break; 3977 break;
3979 3978
3980#if ENABLE_FRILLS 3979 case URxvt_version:
3980 if (query)
3981 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3982 op,
3983 rs[Rs_name], VERSION[0], VERSION[2],
3984 resp);
3985 break;
3986
3987#if !ENABLE_MINIMAL
3981 case URxvt_locale: 3988 case URxvt_locale:
3982 if (query) 3989 if (query)
3983 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3990 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3984 else 3991 else
3985 { 3992 {
3986 set_locale (str); 3993 set_locale (str);
3987 pty->set_utf8_mode (enc_utf8); 3994 pty->set_utf8_mode (enc_utf8);
3988 init_xlocale (); 3995 init_xlocale ();
… …
4003 break; 4010 break;
4004#endif 4011#endif
4005 4012
4006#if ENABLE_PERL 4013#if ENABLE_PERL
4007 case URxvt_perl: 4014 case URxvt_perl:
4008 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4015 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4009 ; // no responses yet 4016 ; // no responses yet
4010 break; 4017 break;
4011#endif 4018#endif
4012 } 4019 }
4013} 4020}
… …
4129 scr_touch (true); 4136 scr_touch (true);
4130 break; 4137 break;
4131#endif 4138#endif
4132 case 1048: /* alternative cursor save */ 4139 case 1048: /* alternative cursor save */
4133 case 1049: 4140 case 1049:
4134 if (OPTION (Opt_secondaryScreen)) 4141 if (option (Opt_secondaryScreen))
4135 if (mode == 0) 4142 if (mode == 0)
4136 scr_cursor (RESTORE); 4143 scr_cursor (RESTORE);
4137 else if (mode == 1) 4144 else if (mode == 1)
4138 scr_cursor (SAVE); 4145 scr_cursor (SAVE);
4139 break; 4146 break;
… …
4204 break; 4211 break;
4205 case 1011: /* scroll to bottom on key press */ 4212 case 1011: /* scroll to bottom on key press */
4206 set_option (Opt_scrollTtyKeypress, state); 4213 set_option (Opt_scrollTtyKeypress, state);
4207 break; 4214 break;
4208 case 1047: /* secondary screen w/ clearing last */ 4215 case 1047: /* secondary screen w/ clearing last */
4209 if (OPTION (Opt_secondaryScreen)) 4216 if (option (Opt_secondaryScreen))
4210 if (current_screen != PRIMARY) 4217 if (current_screen != PRIMARY)
4211 scr_erase_screen (2); 4218 scr_erase_screen (2);
4212 scr_change_screen (state); 4219 scr_change_screen (state);
4213 break; 4220 break;
4214 case 1049: /* secondary screen w/ clearing first */ 4221 case 1049: /* secondary screen w/ clearing first */
4215 scr_change_screen (state); 4222 scr_change_screen (state);
4216 if (OPTION (Opt_secondaryScreen)) 4223 if (option (Opt_secondaryScreen))
4217 if (current_screen != PRIMARY) 4224 if (current_screen != PRIMARY)
4218 scr_erase_screen (2); 4225 scr_erase_screen (2);
4219 break; 4226 break;
4220 default: 4227 default:
4221 break; 4228 break;
… …
4349 scr_color (Color_bg, Color_bg); 4356 scr_color (Color_bg, Color_bg);
4350 break; 4357 break;
4351 4358
4352 //case 50: // not variable spacing 4359 //case 50: // not variable spacing
4353 4360
4354#if ENABLE_FRILLS 4361#if !ENABLE_MINIMAL
4355 case 90: 4362 case 90:
4356 case 91: /* set bright fg color */ 4363 case 91: /* set bright fg color */
4357 case 92: 4364 case 92:
4358 case 93: 4365 case 93:
4359 case 94: 4366 case 94:

Diff Legend

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