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.179 by root, Wed Dec 15 05:39:08 2004 UTC vs.
Revision 1.202 by root, Sat Mar 12 23:35:14 2005 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
54#include <signal.h> 57#include <csignal>
55 58
56/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
57 60
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59 62
… …
114 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 119 XK_Print, 0x2399,
117 120
118 XK_space, 0x2423, 121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
119 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
120 0, 131 0,
121}; 132};
122 133
123void 134void
124rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
… …
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 284 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 285 * escape sequence to toggle the Keypad.
275 * 286 *
276 * Always permit `shift' to override the current setting 287 * Always permit `shift' to override the current setting
277 */ 288 */
278 shft = (ev.state & ShiftMask); 289 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 290 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 291 meta = ev.state & ModMetaMask;
281 292
282 if (numlock_state || (ev.state & ModNumLockMask)) 293 if (numlock_state || (ev.state & ModNumLockMask))
283 { 294 {
284 numlock_state = (ev.state & ModNumLockMask); 295 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 296 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
305 316
306 // the XOpenIM manpage lies about hardcoding the locale 317 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 318 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 319 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 320 SET_LOCALE (rs[Rs_imLocale]);
321
310 // assume wchar_t == unicode or better 322 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 323 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 324 KBUFSZ, &keysym, &status_return);
325
313 if (rs[Rs_imLocale]) 326 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 327 SET_LOCALE (locale);
315 328
316 if (status_return == XLookupChars 329 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 330 || status_return == XLookupBoth)
… …
344 valid_keysym = keysym != NoSymbol; 357 valid_keysym = keysym != NoSymbol;
345 } 358 }
346 359
347 if (valid_keysym) 360 if (valid_keysym)
348 { 361 {
362#ifdef KEYSYM_RESOURCE
363 if (keyboard->dispatch (this, keysym, ev.state))
364 return;
365#endif
366
349 if (TermWin.saveLines) 367 if (TermWin.saveLines)
350 { 368 {
351#ifdef UNSHIFTED_SCROLLKEYS 369#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 370 if (!ctrl && !meta)
353#else 371#else
… …
487 } 505 }
488#endif 506#endif
489 507
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 508 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 509 {
492#ifdef KEYSYM_RESOURCE
493 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 {
495 unsigned int l;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 { 510 {
518 newlen = 1; 511 newlen = 1;
519 switch (keysym) 512 switch (keysym)
520 { 513 {
521#ifndef NO_BACKSPACE_KEY 514#ifndef NO_BACKSPACE_KEY
… …
529 else 522 else
530 strcpy (kbuf, key_backspace); 523 strcpy (kbuf, key_backspace);
531 break; 524 break;
532#endif 525#endif
533#ifndef NO_DELETE_KEY 526#ifndef NO_DELETE_KEY
527# ifdef XK_KP_Prior
528 case XK_KP_Delete:
529 /* allow shift to override */
530 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
531 {
532 strcpy (kbuf, "\033On");
533 break;
534 }
535 /* FALLTHROUGH */
536# endif
534 case XK_Delete: 537 case XK_Delete:
535 strcpy (kbuf, key_delete); 538 strcpy (kbuf, key_delete);
536 break; 539 break;
537#endif 540#endif
538 case XK_Tab: 541 case XK_Tab:
… …
641#ifdef XK_KP_Begin 644#ifdef XK_KP_Begin
642 case XK_KP_Begin: 645 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 646 strcpy (kbuf, "\033Ou");
644 break; 647 break;
645 648
646 case XK_KP_Insert:
647 strcpy (kbuf, "\033Op");
648 break;
649
650 case XK_KP_Delete:
651 strcpy (kbuf, "\033On");
652 break;
653#endif 649#endif
654 case XK_KP_F1: /* "\033OP" */ 650 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 651 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 652 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 653 case XK_KP_F4: /* "\033OS" */
… …
689 break; 685 break;
690 686
691 case XK_Find: 687 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 688 strcpy (kbuf, "\033[1~");
693 break; 689 break;
690
691#ifdef XK_KP_End
692 case XK_KP_Insert:
693 /* allow shift to override */
694 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
695 {
696 strcpy (kbuf, "\033Op");
697 break;
698 }
699 /* FALLTHROUGH */
700#endif
694 case XK_Insert: 701 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 702 strcpy (kbuf, "\033[2~");
696 break; 703 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 704#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 705 case DXK_Remove:
… …
788#undef FKEY 795#undef FKEY
789 default: 796 default:
790 newlen = 0; 797 newlen = 0;
791 break; 798 break;
792 } 799 }
800
793 if (newlen) 801 if (newlen)
794 len = strlen (kbuf); 802 len = strlen (kbuf);
795 } 803 }
796 804
797 /* 805 /*
… …
805 } 813 }
806 else if (ctrl && keysym == XK_minus) 814 else if (ctrl && keysym == XK_minus)
807 { 815 {
808 len = 1; 816 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 817 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
818 }
819 else if (keysym == XK_ISO_Left_Tab)
820 {
821 strcpy (kbuf, "\033[Z");
822 len = 3;
810 } 823 }
811 else 824 else
812 { 825 {
813#ifdef META8_OPTION 826#ifdef META8_OPTION
814 /* set 8-bit on */ 827 /* set 8-bit on */
… …
873#endif /* DEBUG_CMD */ 886#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 887 tt_write (kbuf, (unsigned int)len);
875} 888}
876/*}}} */ 889/*}}} */
877 890
878#if (MENUBAR_MAX) 891#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 892/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */ 893/* attempt to `write' count to the input buffer */
881unsigned int 894unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 895rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883{ 896{
… …
906 919
907 cmd_parse (); 920 cmd_parse ();
908 921
909 return 0; 922 return 0;
910} 923}
911#endif /* MENUBAR_MAX */ 924#endif
912 925
913void 926void
914rxvt_term::flush () 927rxvt_term::flush ()
915{ 928{
916 flush_ev.stop (); 929 flush_ev.stop ();
… …
1017{ 1030{
1018 if (mouse_slip_wheel_speed == 0 1031 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1032 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1033 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1034 {
1035 if (TermWin.view_start == TermWin.nscrolled ||
1036 TermWin.view_start == 0)
1037 mouse_slip_wheel_speed = 0;
1038
1022 refresh_type |= SMOOTH_REFRESH; 1039 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1040 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1041 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1042 }
1026} 1043}
… …
1089rxvt_term::pointer_blank () 1106rxvt_term::pointer_blank ()
1090{ 1107{
1091 if (! (options & Opt_pointerBlank)) 1108 if (! (options & Opt_pointerBlank))
1092 return; 1109 return;
1093 1110
1094 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1111 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1095 XFlush (display->display); 1112 XFlush (display->display);
1096 1113
1097 hidden_pointer = 1; 1114 hidden_pointer = 1;
1098} 1115}
1099 1116
… …
1188 1205
1189/*{{{ process an X event */ 1206/*{{{ process an X event */
1190void 1207void
1191rxvt_term::x_cb (XEvent &ev) 1208rxvt_term::x_cb (XEvent &ev)
1192{ 1209{
1210 dDisp;
1211
1193 SET_R (this); 1212 SET_R (this);
1194 SET_LOCALE (locale); 1213 SET_LOCALE (locale);
1195 1214
1196#if defined(CURSOR_BLINK) 1215#if defined(CURSOR_BLINK)
1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1216 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1313 button_release (ev.xbutton); 1332 button_release (ev.xbutton);
1314 break; 1333 break;
1315 1334
1316 case ClientMessage: 1335 case ClientMessage:
1317 if (ev.xclient.format == 32 1336 if (ev.xclient.format == 32
1337 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1338 {
1318 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1339 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1319 destroy (); 1340 destroy ();
1341#if ENABLE_EWMH
1342 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1343 XSendEvent (disp, ev.xclient.window = display->root,
1344 False, SubstructureRedirectMask | SubstructureNotifyMask,
1345 &ev);
1346#endif
1347 }
1348#if ENABLE_XEMBED
1349 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1350 {
1351 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1352 focus_in ();
1353 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1354 focus_out ();
1355 }
1356#endif
1320#ifdef OFFIX_DND 1357#ifdef OFFIX_DND
1321 /* OffiX Dnd (drag 'n' drop) protocol */ 1358 /* OffiX Dnd (drag 'n' drop) protocol */
1322 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1359 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1323 && (ev.xclient.data.l[0] == DndFile 1360 && (ev.xclient.data.l[0] == DndFile
1324 || ev.xclient.data.l[0] == DndDir 1361 || ev.xclient.data.l[0] == DndDir
1325 || ev.xclient.data.l[0] == DndLink)) 1362 || ev.xclient.data.l[0] == DndLink))
1326 { 1363 {
1327 /* Get Dnd data */ 1364 /* Get Dnd data */
1328 Atom ActualType; 1365 Atom ActualType;
1329 int ActualFormat; 1366 int ActualFormat;
1330 unsigned char *data; 1367 unsigned char *data;
1331 unsigned long Size, RemainingBytes; 1368 unsigned long Size, RemainingBytes;
1332 1369
1333 XGetWindowProperty (display->display, display->root, 1370 XGetWindowProperty (disp, display->root,
1334 xa[XA_DNDSELECTION], 1371 xa[XA_DNDSELECTION],
1335 0L, 1000000L, 1372 0L, 1000000L,
1336 False, AnyPropertyType, 1373 False, AnyPropertyType,
1337 &ActualType, &ActualFormat, 1374 &ActualType, &ActualFormat,
1338 &Size, &RemainingBytes, 1375 &Size, &RemainingBytes,
1339 &data); 1376 &data);
1340 set_string_property (XA_CUT_BUFFER0, data); 1377 set_string_property (XA_CUT_BUFFER0, data);
1341 XFree (data); 1378 XFree (data);
1342 selection_paste (display->root, XA_CUT_BUFFER0, true); 1379 selection_paste (display->root, XA_CUT_BUFFER0, true);
1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1380 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1344 } 1381 }
1345#endif /* OFFIX_DND */ 1382#endif /* OFFIX_DND */
1346 break; 1383 break;
1347 1384
1348 case MappingNotify: 1385 case MappingNotify:
… …
1373 break; 1410 break;
1374 } 1411 }
1375 break; 1412 break;
1376 1413
1377 case FocusIn: 1414 case FocusIn:
1378 if (!TermWin.focus) 1415 focus_in ();
1379 {
1380 TermWin.focus = 1;
1381 want_refresh = 1;
1382#ifdef USE_XIM
1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1386 XSetICFocus (Input_Context);
1387 }
1388#endif
1389#ifdef CURSOR_BLINK
1390 if (options & Opt_cursorBlink)
1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392#endif
1393#ifdef OFF_FOCUS_FADING
1394 if (rs[Rs_fade])
1395 {
1396 pix_colors = pix_colors_focused;
1397 scr_recolour ();
1398 }
1399#endif
1400
1401 }
1402 break; 1416 break;
1403 1417
1404 case FocusOut: 1418 case FocusOut:
1405 if (TermWin.focus) 1419 focus_out ();
1406 {
1407 TermWin.focus = 0;
1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1416#ifdef USE_XIM
1417 if (Input_Context != NULL)
1418 XUnsetICFocus (Input_Context);
1419#endif
1420#ifdef CURSOR_BLINK
1421 if (options & Opt_cursorBlink)
1422 cursor_blink_ev.stop ();
1423 hidden_cursor = 0;
1424#endif
1425#ifdef OFF_FOCUS_FADING
1426 if (rs[Rs_fade])
1427 {
1428 pix_colors = pix_colors_unfocused;
1429 scr_recolour ();
1430 }
1431#endif
1432 }
1433 break; 1420 break;
1434 1421
1435 case ConfigureNotify: 1422 case ConfigureNotify:
1436 if (ev.xconfigure.window == TermWin.parent[0]) 1423 if (ev.xconfigure.window == TermWin.parent[0])
1437 { 1424 {
… …
1441 { /* Wrap lots of configures into one */ 1428 { /* Wrap lots of configures into one */
1442 width = ev.xconfigure.width; 1429 width = ev.xconfigure.width;
1443 height = ev.xconfigure.height; 1430 height = ev.xconfigure.height;
1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1431 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1445 } 1432 }
1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1433 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1447 1434
1448 if (szHint.width != width || szHint.height != height) 1435 if (szHint.width != width || szHint.height != height)
1449 { 1436 {
1450 seen_resize = 1; 1437 seen_resize = 1;
1451 resize_all_windows (width, height, 1); 1438 resize_all_windows (width, height, 1);
… …
1503 if (ev.xany.window == TermWin.vt) 1490 if (ev.xany.window == TermWin.vt)
1504 { 1491 {
1505 do 1492 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1493 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1494 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1495 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1509 1496
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1497 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1498
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1515 1502
1516 scr_refresh (refresh_type); 1503 scr_refresh (refresh_type);
1517 } 1504 }
1518 else 1505 else
1519 { 1506 {
1520 XEvent unused_event; 1507 XEvent unused_event;
1521 1508
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523 ; 1510 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1511 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1512 ;
1526 1513
1527 if (isScrollbarWindow (ev.xany.window)) 1514 if (isScrollbarWindow (ev.xany.window))
1528 { 1515 {
1529 scrollBar.setIdle (); 1516 scrollBar.setIdle ();
… …
1534 menubar_expose (); 1521 menubar_expose ();
1535#endif 1522#endif
1536 1523
1537#ifdef TRANSPARENT 1524#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1525 if (am_transparent && ev.xany.window == TermWin.parent[0])
1539 XClearWindow (display->display, ev.xany.window); 1526 XClearWindow (disp, ev.xany.window);
1540#endif 1527#endif
1541 } 1528 }
1542 break; 1529 break;
1543 1530
1544 case MotionNotify: 1531 case MotionNotify:
… …
1558 1545
1559 if (ev.xany.window == TermWin.vt) 1546 if (ev.xany.window == TermWin.vt)
1560 { 1547 {
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1548 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1549 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1550 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1564 ; 1551 ;
1565 1552
1566 XQueryPointer (display->display, TermWin.vt, 1553 XQueryPointer (disp, TermWin.vt,
1567 &unused_root, &unused_child, 1554 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1555 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1556 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1557 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1558#ifdef MOUSE_THRESHOLD
… …
1635#endif 1622#endif
1636 } 1623 }
1637 } 1624 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1625 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1626 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1627 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641 MotionNotify, &ev)) 1628 MotionNotify, &ev))
1642 ; 1629 ;
1643 1630
1644 XQueryPointer (display->display, scrollBar.win, 1631 XQueryPointer (disp, scrollBar.win,
1645 &unused_root, &unused_child, 1632 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1633 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1634 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1635 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1651 scr_refresh (refresh_type); 1638 scr_refresh (refresh_type);
1652 refresh_limit = 0; 1639 refresh_limit = 0;
1653 scrollbar_show (1); 1640 scrollbar_show (1);
1654 } 1641 }
1655 break; 1642 break;
1643 }
1644}
1645
1646void
1647rxvt_term::focus_in ()
1648{
1649 if (!TermWin.focus)
1650 {
1651 TermWin.focus = 1;
1652 want_refresh = 1;
1653#ifdef USE_XIM
1654 if (Input_Context != NULL)
1655 {
1656 IMSetStatusPosition ();
1657 XSetICFocus (Input_Context);
1658 }
1659#endif
1660#ifdef CURSOR_BLINK
1661 if (options & Opt_cursorBlink)
1662 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1663#endif
1664#ifdef OFF_FOCUS_FADING
1665 if (rs[Rs_fade])
1666 {
1667 pix_colors = pix_colors_focused;
1668 scr_recolour ();
1669 }
1670#endif
1671 }
1672}
1673
1674void
1675rxvt_term::focus_out ()
1676{
1677 if (TermWin.focus)
1678 {
1679 TermWin.focus = 0;
1680 want_refresh = 1;
1681
1682#if ENABLE_FRILLS || ISO_14755
1683 iso14755buf = 0;
1684#endif
1685#if ENABLE_OVERLAY
1686 scr_overlay_off ();
1687#endif
1688#ifdef USE_XIM
1689 if (Input_Context != NULL)
1690 XUnsetICFocus (Input_Context);
1691#endif
1692#ifdef CURSOR_BLINK
1693 if (options & Opt_cursorBlink)
1694 cursor_blink_ev.stop ();
1695 hidden_cursor = 0;
1696#endif
1697#ifdef OFF_FOCUS_FADING
1698 if (rs[Rs_fade])
1699 {
1700 pix_colors = pix_colors_unfocused;
1701 scr_recolour ();
1702 }
1703#endif
1656 } 1704 }
1657} 1705}
1658 1706
1659#if TRANSPARENT 1707#if TRANSPARENT
1660void 1708void
… …
1751 { 1799 {
1752 case Button1: 1800 case Button1:
1753 /* allow meta + click to select rectangular areas */ 1801 /* allow meta + click to select rectangular areas */
1754 /* should be done in screen.C */ 1802 /* should be done in screen.C */
1755#if ENABLE_FRILLS 1803#if ENABLE_FRILLS
1756 selection.rect = !! (ev.state & ModMetaMask); 1804 selection.rect = !!(ev.state & ModMetaMask);
1757#else 1805#else
1758 selection.rect = false; 1806 selection.rect = false;
1759#endif 1807#endif
1760 1808
1761 /* allow shift+left click to extend selection */ 1809 /* allow shift+left click to extend selection */
… …
2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2135 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2136 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2137 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090 int i; 2138 int i;
2091 2139
2092 Visual* visual = display->visual; 2140 Visual *visual = display->visual;
2093 2141
2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2142 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095 2143
2096 /* for convenience */ 2144 /* for convenience */
2097 mask_r = visual->red_mask; 2145 mask_r = visual->red_mask;
… …
2318 Atom atype; 2366 Atom atype;
2319 unsigned char *prop = NULL; 2367 unsigned char *prop = NULL;
2320 Window root, oldp, *list; 2368 Window root, oldp, *list;
2321 Pixmap rootpixmap = None; 2369 Pixmap rootpixmap = None;
2322 XWindowAttributes wattr, wrootattr; 2370 XWindowAttributes wattr, wrootattr;
2371 dDisp;
2323 2372
2324 pchanged = 0; 2373 pchanged = 0;
2325 2374
2326 if (!(options & Opt_transparent)) 2375 if (!(options & Opt_transparent))
2327 return pchanged; /* Don't try any more */ 2376 return pchanged; /* Don't try any more */
2328 2377
2329 XGetWindowAttributes (display->display, display->root, &wrootattr); 2378 XGetWindowAttributes (disp, display->root, &wrootattr);
2330 rootdepth = wrootattr.depth; 2379 rootdepth = wrootattr.depth;
2331 2380
2332 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2381 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2333 2382
2334 if (rootdepth != wattr.depth) 2383 if (rootdepth != wattr.depth)
2335 { 2384 {
2336 if (am_transparent) 2385 if (am_transparent)
2337 { 2386 {
2338 pchanged = 1; 2387 pchanged = 1;
2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2388 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2340 am_transparent = am_pixmap_trans = 0; 2389 am_transparent = am_pixmap_trans = 0;
2341 } 2390 }
2342 2391
2343 return pchanged; /* Don't try any more */ 2392 return pchanged; /* Don't try any more */
2344 } 2393 }
2345 2394
2346 /* Get all X ops out of the queue so that our information is up-to-date. */ 2395 /* Get all X ops out of the queue so that our information is up-to-date. */
2347 XSync (display->display, False); 2396 XSync (disp, False);
2348 2397
2349 /* 2398 /*
2350 * Make the frame window set by the window manager have 2399 * Make the frame window set by the window manager have
2351 * the root background. Some window managers put multiple nested frame 2400 * the root background. Some window managers put multiple nested frame
2352 * windows for each client, so we have to take care about that. 2401 * windows for each client, so we have to take care about that.
2353 */ 2402 */
2354 i = (xa[XA_XROOTPMAP_ID] 2403 i = (xa[XA_XROOTPMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2404 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2405 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2406 &nitems, &bytes_after, &prop) == Success);
2358 2407
2359 if (!i || prop == NULL) 2408 if (!i || prop == NULL)
2360 i = (xa[XA_ESETROOT_PMAP_ID] 2409 i = (xa[XA_ESETROOT_PMAP_ID]
2361 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2410 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2411 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363 &nitems, &bytes_after, &prop) == Success); 2412 &nitems, &bytes_after, &prop) == Success);
2364 2413
2365 if (!i || prop == NULL 2414 if (!i || prop == NULL
2366#if TINTING 2415#if TINTING
… …
2385 Window cr; 2434 Window cr;
2386 XImage *image; 2435 XImage *image;
2387 GC gc; 2436 GC gc;
2388 XGCValues gcvalue; 2437 XGCValues gcvalue;
2389 2438
2390 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2439 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2391 0, 0, &sx, &sy, &cr); 2440 0, 0, &sx, &sy, &cr);
2392 nw = (unsigned int)szHint.width; 2441 nw = (unsigned int)szHint.width;
2393 nh = (unsigned int)szHint.height; 2442 nh = (unsigned int)szHint.height;
2394 nx = ny = 0; 2443 nx = ny = 0;
2395 2444
… …
2408 } 2457 }
2409 2458
2410 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2459 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2411 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2460 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2412 2461
2413 XSync (display->display, False); 2462 XSync (disp, False);
2414 allowedxerror = -1; 2463 allowedxerror = -1;
2415 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2464 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2416 2465
2417 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2466 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2418 /* XXX: may need a delay here? */ 2467 /* XXX: may need a delay here? */
2419 allowedxerror = 0; 2468 allowedxerror = 0;
2420 2469
… …
2423 if (am_transparent && am_pixmap_trans) 2472 if (am_transparent && am_pixmap_trans)
2424 { 2473 {
2425 pchanged = 1; 2474 pchanged = 1;
2426 if (TermWin.pixmap != None) 2475 if (TermWin.pixmap != None)
2427 { 2476 {
2428 XFreePixmap (display->display, TermWin.pixmap); 2477 XFreePixmap (disp, TermWin.pixmap);
2429 TermWin.pixmap = None; 2478 TermWin.pixmap = None;
2430 } 2479 }
2431 } 2480 }
2432 2481
2433 am_pixmap_trans = 0; 2482 am_pixmap_trans = 0;
2434 } 2483 }
2435 else 2484 else
2436 { 2485 {
2437 if (TermWin.pixmap != None) 2486 if (TermWin.pixmap != None)
2438 XFreePixmap (display->display, TermWin.pixmap); 2487 XFreePixmap (disp, TermWin.pixmap);
2439 2488
2440#if TINTING 2489#if TINTING
2441 if (ISSET_PIXCOLOR (Color_tint)) 2490 if (ISSET_PIXCOLOR (Color_tint))
2442 { 2491 {
2443 unsigned short rm, gm, bm; 2492 unsigned short rm, gm, bm;
… …
2447 2496
2448 ShadeXImage (display, image, shade, rm, gm, bm); 2497 ShadeXImage (display, image, shade, rm, gm, bm);
2449 } 2498 }
2450#endif 2499#endif
2451 2500
2452 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2501 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2453 szHint.width, szHint.height, image->depth); 2502 szHint.width, szHint.height, image->depth);
2454 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2503 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2455 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2504 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2456 nx, ny, image->width, image->height); 2505 nx, ny, image->width, image->height);
2457 XFreeGC (display->display, gc); 2506 XFreeGC (disp, gc);
2458 XDestroyImage (image); 2507 XDestroyImage (image);
2459 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2508 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2460 XClearWindow (display->display, TermWin.parent[0]); 2509 XClearWindow (disp, TermWin.parent[0]);
2461 2510
2462 if (!am_transparent || !am_pixmap_trans) 2511 if (!am_transparent || !am_pixmap_trans)
2463 pchanged = 1; 2512 pchanged = 1;
2464 2513
2465 am_transparent = am_pixmap_trans = 1; 2514 am_transparent = am_pixmap_trans = 1;
2466 } 2515 }
2467 } 2516 }
2468 2517
2469 if (am_pixmap_trans) 2518 if (am_pixmap_trans)
2470 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2519 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2471 else 2520 else
2472 { 2521 {
2473 unsigned int n; 2522 unsigned int n;
2474 /* 2523 /*
2475 * InheritPixmap transparency 2524 * InheritPixmap transparency
2476 */ 2525 */
2477 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2526 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2478 { 2527 {
2479 oldp = TermWin.parent[i]; 2528 oldp = TermWin.parent[i];
2480 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2529 XQueryTree (disp, TermWin.parent[i - 1], &root,
2481 &TermWin.parent[i], &list, &n); 2530 &TermWin.parent[i], &list, &n);
2482 XFree (list); 2531 XFree (list);
2483 2532
2484 if (TermWin.parent[i] == display->root) 2533 if (TermWin.parent[i] == display->root)
2485 { 2534 {
… …
2497 2546
2498 if (pchanged) 2547 if (pchanged)
2499 { 2548 {
2500 for (; n < (unsigned int)i; n++) 2549 for (; n < (unsigned int)i; n++)
2501 { 2550 {
2502 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2551 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2503 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2552 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2504 { 2553 {
2505 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2554 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2506 break; 2555 break;
2507 } 2556 }
2508 } 2557 }
2509 } 2558 }
2510 2559
2511 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2560 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2512 { 2561 {
2513 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2562 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2514 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2563 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2515 am_transparent = 0; 2564 am_transparent = 0;
2516 /* XXX: also turn off Opt_transparent? */ 2565 /* XXX: also turn off Opt_transparent? */
2517 } 2566 }
2518 else 2567 else
2519 { 2568 {
… …
2522 * needed for fvwm2.2.2 (and before?) */ 2571 * needed for fvwm2.2.2 (and before?) */
2523 sleep (1); 2572 sleep (1);
2524#endif 2573#endif
2525 for (n = 0; n < (unsigned int)i; n++) 2574 for (n = 0; n < (unsigned int)i; n++)
2526 { 2575 {
2527 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2576 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2528 XClearWindow (display->display, TermWin.parent[n]); 2577 XClearWindow (disp, TermWin.parent[n]);
2529 } 2578 }
2530 2579
2531 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2580 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2532 am_transparent = 1; 2581 am_transparent = 1;
2533 } 2582 }
2534 2583
2535 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2584 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2536 TermWin.parent[i] = None; 2585 TermWin.parent[i] = None;
2537 } 2586 }
2538 2587
2539 if (scrollBar.win) 2588 if (scrollBar.win)
2540 { 2589 {
2541 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2590 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2542 scrollBar.setIdle (); 2591 scrollBar.setIdle ();
2543 scrollbar_show (0); 2592 scrollbar_show (0);
2544 } 2593 }
2545 2594
2546 if (am_transparent) 2595 if (am_transparent)
… …
2584 // some window managers resize the window early, and these programs 2633 // some window managers resize the window early, and these programs
2585 // then sometimes get the size wrong. 2634 // then sometimes get the size wrong.
2586 // unfortunately other programs are even more buggy and dislike 2635 // unfortunately other programs are even more buggy and dislike
2587 // being sent SIGWINCH, so only do it when we were in fact being 2636 // being sent SIGWINCH, so only do it when we were in fact being
2588 // resized. 2637 // resized.
2589 if (seen_resize) 2638 if (seen_resize && cmd_pid)
2590 kill (-cmd_pid, SIGWINCH); 2639 kill (-cmd_pid, SIGWINCH);
2591 } 2640 }
2592 2641
2593 /* Read a text string from the input buffer */ 2642 /* Read a text string from the input buffer */
2594 unicode_t buf[UBUFSIZ]; 2643 unicode_t buf[UBUFSIZ];
… …
2707 if (len == (size_t)-1) 2756 if (len == (size_t)-1)
2708 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2757 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2709 2758
2710 // assume wchar == unicode 2759 // assume wchar == unicode
2711 cmdbuf_ptr += len; 2760 cmdbuf_ptr += len;
2712 return wc; 2761 return wc & UNICODE_MASK;
2713 } 2762 }
2714 2763
2715 return NOCHAR; 2764 return NOCHAR;
2716} 2765}
2717 2766
… …
3180 { 3229 {
3181 switch (priv) 3230 switch (priv)
3182 { 3231 {
3183 case '>': 3232 case '>':
3184 if (ch == CSI_DA) /* secondary device attributes */ 3233 if (ch == CSI_DA) /* secondary device attributes */
3185 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3234 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3186 break; 3235 break;
3187 case '?': 3236 case '?':
3188 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3237 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3189 process_terminal_mode (ch, priv, nargs, arg); 3238 process_terminal_mode (ch, priv, nargs, arg);
3190 break; 3239 break;
… …
3419rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3468rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3420{ 3469{
3421 int x, y; 3470 int x, y;
3422 XWindowAttributes wattr; 3471 XWindowAttributes wattr;
3423 Window wdummy; 3472 Window wdummy;
3473 dDisp;
3424 3474
3425 if (nargs == 0) 3475 if (nargs == 0)
3426 return; 3476 return;
3427 3477
3428 switch (args[0]) 3478 switch (args[0])
3429 { 3479 {
3430 /* 3480 /*
3431 * commands 3481 * commands
3432 */ 3482 */
3433 case 1: /* deiconify window */ 3483 case 1: /* deiconify window */
3434 XMapWindow (display->display, TermWin.parent[0]); 3484 XMapWindow (disp, TermWin.parent[0]);
3435 break; 3485 break;
3436 case 2: /* iconify window */ 3486 case 2: /* iconify window */
3437 XIconifyWindow (display->display, TermWin.parent[0], 3487 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3438 DefaultScreen (display->display));
3439 break; 3488 break;
3440 case 3: /* set position (pixels) */ 3489 case 3: /* set position (pixels) */
3441 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3490 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3442 break; 3491 break;
3443 case 4: /* set size (pixels) */ 3492 case 4: /* set size (pixels) */
3444 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3493 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3445 break; 3494 break;
3446 case 5: /* raise window */ 3495 case 5: /* raise window */
3447 XRaiseWindow (display->display, TermWin.parent[0]); 3496 XRaiseWindow (disp, TermWin.parent[0]);
3448 break; 3497 break;
3449 case 6: /* lower window */ 3498 case 6: /* lower window */
3450 XLowerWindow (display->display, TermWin.parent[0]); 3499 XLowerWindow (disp, TermWin.parent[0]);
3451 break; 3500 break;
3452 case 7: /* refresh window */ 3501 case 7: /* refresh window */
3453 scr_touch (true); 3502 scr_touch (true);
3454 break; 3503 break;
3455 case 8: /* set size (chars) */ 3504 case 8: /* set size (chars) */
… …
3467 3516
3468 /* 3517 /*
3469 * reports - some output format copied from XTerm 3518 * reports - some output format copied from XTerm
3470 */ 3519 */
3471 case 11: /* report window state */ 3520 case 11: /* report window state */
3472 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3521 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3473 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3522 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3474 break; 3523 break;
3475 case 13: /* report window position */ 3524 case 13: /* report window position */
3476 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3477 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3526 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3478 -wattr.border_width, -wattr.border_width, 3527 -wattr.border_width, -wattr.border_width,
3479 &x, &y, &wdummy); 3528 &x, &y, &wdummy);
3480 tt_printf ("\033[3;%d;%dt", x, y); 3529 tt_printf ("\033[3;%d;%dt", x, y);
3481 break; 3530 break;
3482 case 14: /* report window size (pixels) */ 3531 case 14: /* report window size (pixels) */
3483 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3532 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3484 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3533 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3485 break; 3534 break;
3486 case 18: /* report text area size (chars) */ 3535 case 18: /* report text area size (chars) */
3487 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3536 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3488 break; 3537 break;
… …
3490 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3539 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3491 break; 3540 break;
3492 case 20: /* report icon label */ 3541 case 20: /* report icon label */
3493 { 3542 {
3494 char *s; 3543 char *s;
3495 XGetIconName (display->display, TermWin.parent[0], &s); 3544 XGetIconName (disp, TermWin.parent[0], &s);
3496 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3545 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3497 XFree (s); 3546 XFree (s);
3498 } 3547 }
3499 break; 3548 break;
3500 case 21: /* report window title */ 3549 case 21: /* report window title */
3501 { 3550 {
3502 char *s; 3551 char *s;
3503 XFetchName (display->display, TermWin.parent[0], &s); 3552 XFetchName (disp, TermWin.parent[0], &s);
3504 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3553 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3505 XFree (s); 3554 XFree (s);
3506 } 3555 }
3507 break; 3556 break;
3508 } 3557 }
… …
3541 else if (ch < 0x20) 3590 else if (ch < 0x20)
3542 return NULL; /* other control character - exit */ 3591 return NULL; /* other control character - exit */
3543 3592
3544 seen_esc = false; 3593 seen_esc = false;
3545 3594
3546 if (n >= sizeof (string) - 1) 3595 if (n >= STRING_MAX - 1)
3547 // stop at some sane length 3596 // stop at some sane length
3548 return NULL; 3597 return NULL;
3549 3598
3550 if (ch == C0_SYN) 3599 if (ch == C0_SYN)
3551 string[n++] = cmd_get8 (); 3600 string[n++] = cmd_get8 ();
… …
3619 set_window_color (color, str); 3668 set_window_color (color, str);
3620} 3669}
3621 3670
3622/* 3671/*
3623 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3672 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3624 * 0 = change iconName/title
3625 * 1 = change iconName
3626 * 2 = change title
3627 * 4 = change color
3628 * 10 = change fg color
3629 * 11 = change bg color
3630 * 12 = change text color
3631 * 13 = change mouse foreground color
3632 * 17 = change highlight character colour
3633 * 18 = change bold character color
3634 * 19 = change underlined character color
3635 * 46 = change logfile (not implemented)
3636 * 50 = change font
3637 *
3638 * rxvt extensions:
3639 * 20 = bg pixmap
3640 * 39 = change default fg color
3641 * 49 = change default bg color
3642 * 55 = dump scrollback buffer and all of screen
3643 * 701 = change locale
3644 * 702 = find font
3645 * 703 = menu
3646 */ 3673 */
3647void 3674void
3648rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3675rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3649{ 3676{
3650 int changed = 0; 3677 int changed = 0;
3651 int color; 3678 int color;
3652 char *buf, *name; 3679 char *buf, *name;
3653 bool query = str[0] == '?' && !str[1]; 3680 bool query = str[0] == '?' && !str[1];
3654 int saveop = op; 3681 int saveop = op;
3682 dDisp;
3655 3683
3656 assert (str != NULL); 3684 assert (str != NULL);
3657 switch (op) 3685 switch (op)
3658 { 3686 {
3659 case XTerm_name: 3687 case XTerm_name:
… …
3675 unsigned long bytes_after; 3703 unsigned long bytes_after;
3676 unsigned char *value = 0; 3704 unsigned char *value = 0;
3677 const char *str = ""; 3705 const char *str = "";
3678 3706
3679 if (prop 3707 if (prop
3680 && XGetWindowProperty (display->display, TermWin.parent[0], 3708 && XGetWindowProperty (disp, TermWin.parent[0],
3681 prop, 0, 1<<16, 0, AnyPropertyType, 3709 prop, 0, 1<<16, 0, AnyPropertyType,
3682 &actual_type, &actual_format, 3710 &actual_type, &actual_format,
3683 &nitems, &bytes_after, &value) == Success 3711 &nitems, &bytes_after, &value) == Success
3684 && actual_type != None 3712 && actual_type != None
3685 && actual_format == 8) 3713 && actual_format == 8)
… …
3697 { 3725 {
3698 *eq = 0; 3726 *eq = 0;
3699 set_utf8_property (display->atom (str), eq + 1); 3727 set_utf8_property (display->atom (str), eq + 1);
3700 } 3728 }
3701 else 3729 else
3702 XDeleteProperty (display->display, TermWin.parent[0], 3730 XDeleteProperty (disp, TermWin.parent[0],
3703 display->atom (str)); 3731 display->atom (str));
3704 } 3732 }
3705 break; 3733 break;
3706 3734
3707 case XTerm_Color: 3735 case XTerm_Color:
… …
3748 break; 3776 break;
3749#ifndef NO_BOLD_UNDERLINE_REVERSE 3777#ifndef NO_BOLD_UNDERLINE_REVERSE
3750 case XTerm_Color_BD: 3778 case XTerm_Color_BD:
3751 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3779 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3752 break; 3780 break;
3753 case XTerm_Color_IT:
3754 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3755 break;
3756 case XTerm_Color_UL: 3781 case XTerm_Color_UL:
3757 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3782 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3758 break; 3783 break;
3759 case XTerm_Color_RV: 3784 case XTerm_Color_RV:
3760 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3785 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3761 break; 3786 break;
3787 case URxvt_Color_IT:
3788 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3789 break;
3762#endif 3790#endif
3763#if TRANSPARENT && TINTING 3791#if TRANSPARENT && TINTING
3764 case XTerm_Color_tint: 3792 case URxvt_Color_tint:
3765 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3793 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3766 check_our_parents (); 3794 check_our_parents ();
3767 if (am_transparent) 3795 if (am_transparent)
3768 want_full_refresh = want_refresh = 1; 3796 want_full_refresh = want_refresh = 1;
3769 break; 3797 break;
3770#endif 3798#endif
… …
3782 { 3810 {
3783 str++; 3811 str++;
3784#if XPM_BACKGROUND 3812#if XPM_BACKGROUND
3785 changed += scale_pixmap (str); 3813 changed += scale_pixmap (str);
3786#endif 3814#endif
3787
3788 } 3815 }
3816
3789 if (changed) 3817 if (changed)
3790 { 3818 {
3791#ifdef XPM_BACKGROUND 3819#ifdef XPM_BACKGROUND
3792 resize_pixmap (); 3820 resize_pixmap ();
3793#endif 3821#endif
… …
3804 3832
3805 case XTerm_logfile: 3833 case XTerm_logfile:
3806 // TODO, when secure mode? 3834 // TODO, when secure mode?
3807 break; 3835 break;
3808 3836
3837#ifdef MENUBAR
3838 case URxvt_Menu:
3839 if (options & Opt_insecure)
3840 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3841 break;
3842#endif
3843#if 0
3844 case XTerm_dumpscreen: /* no error notices */
3845 {
3846 int fd;
3847 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3848 {
3849 scr_dump (fd);
3850 close (fd);
3851 }
3852 }
3853 break;
3854#endif
3809 case XTerm_font: 3855 case XTerm_font:
3810 op = URxvt_font; 3856 op = URxvt_font;
3811 case URxvt_font: 3857 case URxvt_font:
3812#if ENABLE_STYLES 3858#if ENABLE_STYLES
3813 case URxvt_boldFont: 3859 case URxvt_boldFont:
… …
3828 set_fonts (); 3874 set_fonts ();
3829 } 3875 }
3830 break; 3876 break;
3831 3877
3832#if ENABLE_FRILLS 3878#if ENABLE_FRILLS
3833 case XTerm_locale: 3879 case URxvt_locale:
3834 if (query) 3880 if (query)
3835 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3881 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3836 else 3882 else
3837 { 3883 {
3838 set_locale (str); 3884 set_locale (str);
3839# ifdef USE_XIM 3885 pty.set_utf8_mode (enc_utf8);
3840 im_cb (); 3886 init_xlocale ();
3841# endif
3842 } 3887 }
3843 break; 3888 break;
3844#endif
3845 3889
3846#ifdef MENUBAR 3890 case URxvt_view_up:
3847 case XTerm_Menu: 3891 case URxvt_view_down:
3848 if (options & Opt_insecure) 3892 int lines = atoi (str);
3849 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3893
3850 break; 3894 if (lines)
3851#endif 3895 scr_page (op == URxvt_view_up ? UP : DN, lines);
3852#if 0
3853 case XTerm_dumpscreen: /* no error notices */
3854 { 3896 else
3855 int fd;
3856 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3857 { 3897 {
3858 scr_dump (fd); 3898 scr_erase_savelines ();
3859 close (fd);
3860 } 3899 }
3861 } 3900
3862 break; 3901 break;
3863#endif 3902#endif
3864 } 3903 }
3865} 3904}
3866/*----------------------------------------------------------------------*/ 3905/*----------------------------------------------------------------------*/

Diff Legend

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