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.177 by root, Mon Dec 13 07:18:52 2004 UTC vs.
Revision 1.197 by root, Thu Feb 17 15:07:48 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);
… …
344 valid_keysym = keysym != NoSymbol; 355 valid_keysym = keysym != NoSymbol;
345 } 356 }
346 357
347 if (valid_keysym) 358 if (valid_keysym)
348 { 359 {
360#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state))
362 return;
363#endif
364
349 if (TermWin.saveLines) 365 if (TermWin.saveLines)
350 { 366 {
351#ifdef UNSHIFTED_SCROLLKEYS 367#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 368 if (!ctrl && !meta)
353#else 369#else
… …
487 } 503 }
488#endif 504#endif
489 505
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 506 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 507 {
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 { 508 {
518 newlen = 1; 509 newlen = 1;
519 switch (keysym) 510 switch (keysym)
520 { 511 {
521#ifndef NO_BACKSPACE_KEY 512#ifndef NO_BACKSPACE_KEY
… …
529 else 520 else
530 strcpy (kbuf, key_backspace); 521 strcpy (kbuf, key_backspace);
531 break; 522 break;
532#endif 523#endif
533#ifndef NO_DELETE_KEY 524#ifndef NO_DELETE_KEY
525# ifdef XK_KP_Prior
526 case XK_KP_Delete:
527 /* allow shift to override */
528 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
529 {
530 strcpy (kbuf, "\033On");
531 break;
532 }
533 /* FALLTHROUGH */
534# endif
534 case XK_Delete: 535 case XK_Delete:
535 strcpy (kbuf, key_delete); 536 strcpy (kbuf, key_delete);
536 break; 537 break;
537#endif 538#endif
538 case XK_Tab: 539 case XK_Tab:
… …
641#ifdef XK_KP_Begin 642#ifdef XK_KP_Begin
642 case XK_KP_Begin: 643 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 644 strcpy (kbuf, "\033Ou");
644 break; 645 break;
645 646
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 647#endif
654 case XK_KP_F1: /* "\033OP" */ 648 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 649 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 650 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 651 case XK_KP_F4: /* "\033OS" */
… …
689 break; 683 break;
690 684
691 case XK_Find: 685 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 686 strcpy (kbuf, "\033[1~");
693 break; 687 break;
688
689#ifdef XK_KP_End
690 case XK_KP_Insert:
691 /* allow shift to override */
692 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
693 {
694 strcpy (kbuf, "\033Op");
695 break;
696 }
697 /* FALLTHROUGH */
698#endif
694 case XK_Insert: 699 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 700 strcpy (kbuf, "\033[2~");
696 break; 701 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 702#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 703 case DXK_Remove:
… …
788#undef FKEY 793#undef FKEY
789 default: 794 default:
790 newlen = 0; 795 newlen = 0;
791 break; 796 break;
792 } 797 }
798
793 if (newlen) 799 if (newlen)
794 len = strlen (kbuf); 800 len = strlen (kbuf);
795 } 801 }
796 802
797 /* 803 /*
… …
805 } 811 }
806 else if (ctrl && keysym == XK_minus) 812 else if (ctrl && keysym == XK_minus)
807 { 813 {
808 len = 1; 814 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 815 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
816 }
817 else if (keysym == XK_ISO_Left_Tab)
818 {
819 strcpy (kbuf, "\033[Z");
820 len = 3;
810 } 821 }
811 else 822 else
812 { 823 {
813#ifdef META8_OPTION 824#ifdef META8_OPTION
814 /* set 8-bit on */ 825 /* set 8-bit on */
… …
873#endif /* DEBUG_CMD */ 884#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 885 tt_write (kbuf, (unsigned int)len);
875} 886}
876/*}}} */ 887/*}}} */
877 888
878#if (MENUBAR_MAX) 889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */ 891/* attempt to `write' count to the input buffer */
881unsigned int 892unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 893rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883{ 894{
… …
906 917
907 cmd_parse (); 918 cmd_parse ();
908 919
909 return 0; 920 return 0;
910} 921}
911#endif /* MENUBAR_MAX */ 922#endif
912 923
913void 924void
914rxvt_term::flush () 925rxvt_term::flush ()
915{ 926{
916 flush_ev.stop (); 927 flush_ev.stop ();
… …
1017{ 1028{
1018 if (mouse_slip_wheel_speed == 0 1029 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1031 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1032 {
1033 if (TermWin.view_start == TermWin.nscrolled ||
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0;
1036
1022 refresh_type |= SMOOTH_REFRESH; 1037 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1038 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1040 }
1026} 1041}
… …
1089rxvt_term::pointer_blank () 1104rxvt_term::pointer_blank ()
1090{ 1105{
1091 if (! (options & Opt_pointerBlank)) 1106 if (! (options & Opt_pointerBlank))
1092 return; 1107 return;
1093 1108
1094 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1095 XFlush (display->display); 1110 XFlush (display->display);
1096 1111
1097 hidden_pointer = 1; 1112 hidden_pointer = 1;
1098} 1113}
1099 1114
… …
1188 1203
1189/*{{{ process an X event */ 1204/*{{{ process an X event */
1190void 1205void
1191rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
1192{ 1207{
1208 dDisp;
1209
1193 SET_R (this); 1210 SET_R (this);
1194 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
1195 1212
1196#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1328 Atom ActualType; 1345 Atom ActualType;
1329 int ActualFormat; 1346 int ActualFormat;
1330 unsigned char *data; 1347 unsigned char *data;
1331 unsigned long Size, RemainingBytes; 1348 unsigned long Size, RemainingBytes;
1332 1349
1333 XGetWindowProperty (display->display, display->root, 1350 XGetWindowProperty (disp, display->root,
1334 xa[XA_DNDSELECTION], 1351 xa[XA_DNDSELECTION],
1335 0L, 1000000L, 1352 0L, 1000000L,
1336 False, AnyPropertyType, 1353 False, AnyPropertyType,
1337 &ActualType, &ActualFormat, 1354 &ActualType, &ActualFormat,
1338 &Size, &RemainingBytes, 1355 &Size, &RemainingBytes,
1339 &data); 1356 &data);
1340 set_string_property (XA_CUT_BUFFER0, data); 1357 set_string_property (XA_CUT_BUFFER0, data);
1341 XFree (data); 1358 XFree (data);
1342 selection_paste (display->root, XA_CUT_BUFFER0, true); 1359 selection_paste (display->root, XA_CUT_BUFFER0, true);
1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1360 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1344 } 1361 }
1345#endif /* OFFIX_DND */ 1362#endif /* OFFIX_DND */
1346 break; 1363 break;
1347 1364
1348 case MappingNotify: 1365 case MappingNotify:
… …
1441 { /* Wrap lots of configures into one */ 1458 { /* Wrap lots of configures into one */
1442 width = ev.xconfigure.width; 1459 width = ev.xconfigure.width;
1443 height = ev.xconfigure.height; 1460 height = ev.xconfigure.height;
1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1445 } 1462 }
1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1447 1464
1448 if (szHint.width != width || szHint.height != height) 1465 if (szHint.width != width || szHint.height != height)
1449 { 1466 {
1450 seen_resize = 1; 1467 seen_resize = 1;
1451 resize_all_windows (width, height, 1); 1468 resize_all_windows (width, height, 1);
… …
1503 if (ev.xany.window == TermWin.vt) 1520 if (ev.xany.window == TermWin.vt)
1504 { 1521 {
1505 do 1522 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1509 1526
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1528
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1515 1532
1516 scr_refresh (refresh_type); 1533 scr_refresh (refresh_type);
1517 } 1534 }
1518 else 1535 else
1519 { 1536 {
1520 XEvent unused_event; 1537 XEvent unused_event;
1521 1538
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523 ; 1540 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1542 ;
1526 1543
1527 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1528 { 1545 {
1529 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
… …
1534 menubar_expose (); 1551 menubar_expose ();
1535#endif 1552#endif
1536 1553
1537#ifdef TRANSPARENT 1554#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1555 if (am_transparent && ev.xany.window == TermWin.parent[0])
1539 XClearWindow (display->display, ev.xany.window); 1556 XClearWindow (disp, ev.xany.window);
1540#endif 1557#endif
1541 } 1558 }
1542 break; 1559 break;
1543 1560
1544 case MotionNotify: 1561 case MotionNotify:
… …
1558 1575
1559 if (ev.xany.window == TermWin.vt) 1576 if (ev.xany.window == TermWin.vt)
1560 { 1577 {
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1578 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1579 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1564 ; 1581 ;
1565 1582
1566 XQueryPointer (display->display, TermWin.vt, 1583 XQueryPointer (disp, TermWin.vt,
1567 &unused_root, &unused_child, 1584 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1585 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1586 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1587 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1588#ifdef MOUSE_THRESHOLD
… …
1635#endif 1652#endif
1636 } 1653 }
1637 } 1654 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1656 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1657 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641 MotionNotify, &ev)) 1658 MotionNotify, &ev))
1642 ; 1659 ;
1643 1660
1644 XQueryPointer (display->display, scrollBar.win, 1661 XQueryPointer (disp, scrollBar.win,
1645 &unused_root, &unused_child, 1662 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1663 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1664 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1665 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1668 case PropertyNotify: 1685 case PropertyNotify:
1669 /* 1686 /*
1670 * if user used some Esetroot compatible prog to set the root bg, 1687 * if user used some Esetroot compatible prog to set the root bg,
1671 * use the property to determine the pixmap. We use it later on. 1688 * use the property to determine the pixmap. We use it later on.
1672 */ 1689 */
1673 if (xa[XA_XROOTPMAPID] == 0)
1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1675
1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1690 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1677 return; 1692 return;
1678 1693
1679 /* FALLTHROUGH */ 1694 /* FALLTHROUGH */
1680 case ReparentNotify: 1695 case ReparentNotify:
1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
… …
1753 { 1768 {
1754 case Button1: 1769 case Button1:
1755 /* allow meta + click to select rectangular areas */ 1770 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */ 1771 /* should be done in screen.C */
1757#if ENABLE_FRILLS 1772#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask); 1773 selection.rect = !!(ev.state & ModMetaMask);
1759#else 1774#else
1760 selection.rect = false; 1775 selection.rect = false;
1761#endif 1776#endif
1762 1777
1763 /* allow shift+left click to extend selection */ 1778 /* allow shift+left click to extend selection */
… …
2089 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2104 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2090 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2105 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2091 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2106 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2092 int i; 2107 int i;
2093 2108
2094 Visual* visual = display->visual; 2109 Visual *visual = display->visual;
2095 2110
2096 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2111 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2097 2112
2098 /* for convenience */ 2113 /* for convenience */
2099 mask_r = visual->red_mask; 2114 mask_r = visual->red_mask;
… …
2320 Atom atype; 2335 Atom atype;
2321 unsigned char *prop = NULL; 2336 unsigned char *prop = NULL;
2322 Window root, oldp, *list; 2337 Window root, oldp, *list;
2323 Pixmap rootpixmap = None; 2338 Pixmap rootpixmap = None;
2324 XWindowAttributes wattr, wrootattr; 2339 XWindowAttributes wattr, wrootattr;
2340 dDisp;
2325 2341
2326 pchanged = 0; 2342 pchanged = 0;
2327 2343
2328 if (!(options & Opt_transparent)) 2344 if (!(options & Opt_transparent))
2329 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
2330 2346
2331 XGetWindowAttributes (display->display, display->root, &wrootattr); 2347 XGetWindowAttributes (disp, display->root, &wrootattr);
2332 rootdepth = wrootattr.depth; 2348 rootdepth = wrootattr.depth;
2333 2349
2334 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2335 2351
2336 if (rootdepth != wattr.depth) 2352 if (rootdepth != wattr.depth)
2337 { 2353 {
2338 if (am_transparent) 2354 if (am_transparent)
2339 { 2355 {
2340 pchanged = 1; 2356 pchanged = 1;
2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2342 am_transparent = am_pixmap_trans = 0; 2358 am_transparent = am_pixmap_trans = 0;
2343 } 2359 }
2344 2360
2345 return pchanged; /* Don't try any more */ 2361 return pchanged; /* Don't try any more */
2346 } 2362 }
2347 2363
2348 /* Get all X ops out of the queue so that our information is up-to-date. */ 2364 /* Get all X ops out of the queue so that our information is up-to-date. */
2349 XSync (display->display, False); 2365 XSync (disp, False);
2350 2366
2351 /* 2367 /*
2352 * Make the frame window set by the window manager have 2368 * Make the frame window set by the window manager have
2353 * the root background. Some window managers put multiple nested frame 2369 * the root background. Some window managers put multiple nested frame
2354 * windows for each client, so we have to take care about that. 2370 * windows for each client, so we have to take care about that.
2355 */ 2371 */
2356 i = (xa[XA_XROOTPMAPID] 2372 i = (xa[XA_XROOTPMAP_ID]
2357 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2373 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2374 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2359 &nitems, &bytes_after, &prop) == Success); 2375 &nitems, &bytes_after, &prop) == Success);
2360 2376
2361 if (!i || prop == NULL) 2377 if (!i || prop == NULL)
2362 i = (xa[XA_XSETROOTID] 2378 i = (xa[XA_ESETROOT_PMAP_ID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2379 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2380 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success); 2381 &nitems, &bytes_after, &prop) == Success);
2366 2382
2367 if (!i || prop == NULL 2383 if (!i || prop == NULL
2368#if TINTING 2384#if TINTING
… …
2387 Window cr; 2403 Window cr;
2388 XImage *image; 2404 XImage *image;
2389 GC gc; 2405 GC gc;
2390 XGCValues gcvalue; 2406 XGCValues gcvalue;
2391 2407
2392 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2393 0, 0, &sx, &sy, &cr); 2409 0, 0, &sx, &sy, &cr);
2394 nw = (unsigned int)szHint.width; 2410 nw = (unsigned int)szHint.width;
2395 nh = (unsigned int)szHint.height; 2411 nh = (unsigned int)szHint.height;
2396 nx = ny = 0; 2412 nx = ny = 0;
2397 2413
… …
2410 } 2426 }
2411 2427
2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2414 2430
2415 XSync (display->display, False); 2431 XSync (disp, False);
2416 allowedxerror = -1; 2432 allowedxerror = -1;
2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2418 2434
2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2435 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2420 /* XXX: may need a delay here? */ 2436 /* XXX: may need a delay here? */
2421 allowedxerror = 0; 2437 allowedxerror = 0;
2422 2438
… …
2425 if (am_transparent && am_pixmap_trans) 2441 if (am_transparent && am_pixmap_trans)
2426 { 2442 {
2427 pchanged = 1; 2443 pchanged = 1;
2428 if (TermWin.pixmap != None) 2444 if (TermWin.pixmap != None)
2429 { 2445 {
2430 XFreePixmap (display->display, TermWin.pixmap); 2446 XFreePixmap (disp, TermWin.pixmap);
2431 TermWin.pixmap = None; 2447 TermWin.pixmap = None;
2432 } 2448 }
2433 } 2449 }
2434 2450
2435 am_pixmap_trans = 0; 2451 am_pixmap_trans = 0;
2436 } 2452 }
2437 else 2453 else
2438 { 2454 {
2439 if (TermWin.pixmap != None) 2455 if (TermWin.pixmap != None)
2440 XFreePixmap (display->display, TermWin.pixmap); 2456 XFreePixmap (disp, TermWin.pixmap);
2441 2457
2442#if TINTING 2458#if TINTING
2443 if (ISSET_PIXCOLOR (Color_tint)) 2459 if (ISSET_PIXCOLOR (Color_tint))
2444 { 2460 {
2445 unsigned short rm, gm, bm; 2461 unsigned short rm, gm, bm;
… …
2449 2465
2450 ShadeXImage (display, image, shade, rm, gm, bm); 2466 ShadeXImage (display, image, shade, rm, gm, bm);
2451 } 2467 }
2452#endif 2468#endif
2453 2469
2454 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2455 szHint.width, szHint.height, image->depth); 2471 szHint.width, szHint.height, image->depth);
2456 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2457 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2458 nx, ny, image->width, image->height); 2474 nx, ny, image->width, image->height);
2459 XFreeGC (display->display, gc); 2475 XFreeGC (disp, gc);
2460 XDestroyImage (image); 2476 XDestroyImage (image);
2461 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2462 XClearWindow (display->display, TermWin.parent[0]); 2478 XClearWindow (disp, TermWin.parent[0]);
2463 2479
2464 if (!am_transparent || !am_pixmap_trans) 2480 if (!am_transparent || !am_pixmap_trans)
2465 pchanged = 1; 2481 pchanged = 1;
2466 2482
2467 am_transparent = am_pixmap_trans = 1; 2483 am_transparent = am_pixmap_trans = 1;
2468 } 2484 }
2469 } 2485 }
2470 2486
2471 if (am_pixmap_trans) 2487 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2473 else 2489 else
2474 { 2490 {
2475 unsigned int n; 2491 unsigned int n;
2476 /* 2492 /*
2477 * InheritPixmap transparency 2493 * InheritPixmap transparency
2478 */ 2494 */
2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2480 { 2496 {
2481 oldp = TermWin.parent[i]; 2497 oldp = TermWin.parent[i];
2482 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2498 XQueryTree (disp, TermWin.parent[i - 1], &root,
2483 &TermWin.parent[i], &list, &n); 2499 &TermWin.parent[i], &list, &n);
2484 XFree (list); 2500 XFree (list);
2485 2501
2486 if (TermWin.parent[i] == display->root) 2502 if (TermWin.parent[i] == display->root)
2487 { 2503 {
… …
2499 2515
2500 if (pchanged) 2516 if (pchanged)
2501 { 2517 {
2502 for (; n < (unsigned int)i; n++) 2518 for (; n < (unsigned int)i; n++)
2503 { 2519 {
2504 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2506 { 2522 {
2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2508 break; 2524 break;
2509 } 2525 }
2510 } 2526 }
2511 } 2527 }
2512 2528
2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2514 { 2530 {
2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2517 am_transparent = 0; 2533 am_transparent = 0;
2518 /* XXX: also turn off Opt_transparent? */ 2534 /* XXX: also turn off Opt_transparent? */
2519 } 2535 }
2520 else 2536 else
2521 { 2537 {
… …
2524 * needed for fvwm2.2.2 (and before?) */ 2540 * needed for fvwm2.2.2 (and before?) */
2525 sleep (1); 2541 sleep (1);
2526#endif 2542#endif
2527 for (n = 0; n < (unsigned int)i; n++) 2543 for (n = 0; n < (unsigned int)i; n++)
2528 { 2544 {
2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2530 XClearWindow (display->display, TermWin.parent[n]); 2546 XClearWindow (disp, TermWin.parent[n]);
2531 } 2547 }
2532 2548
2533 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2534 am_transparent = 1; 2550 am_transparent = 1;
2535 } 2551 }
2536 2552
2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2538 TermWin.parent[i] = None; 2554 TermWin.parent[i] = None;
2539 } 2555 }
2540 2556
2541 if (scrollBar.win) 2557 if (scrollBar.win)
2542 { 2558 {
2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2544 scrollBar.setIdle (); 2560 scrollBar.setIdle ();
2545 scrollbar_show (0); 2561 scrollbar_show (0);
2546 } 2562 }
2547 2563
2548 if (am_transparent) 2564 if (am_transparent)
… …
2586 // some window managers resize the window early, and these programs 2602 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong. 2603 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike 2604 // unfortunately other programs are even more buggy and dislike
2589 // being sent SIGWINCH, so only do it when we were in fact being 2605 // being sent SIGWINCH, so only do it when we were in fact being
2590 // resized. 2606 // resized.
2591 if (seen_resize) 2607 if (seen_resize && cmd_pid)
2592 kill (-cmd_pid, SIGWINCH); 2608 kill (-cmd_pid, SIGWINCH);
2593 } 2609 }
2594 2610
2595 /* Read a text string from the input buffer */ 2611 /* Read a text string from the input buffer */
2596 unicode_t buf[UBUFSIZ]; 2612 unicode_t buf[UBUFSIZ];
… …
2709 if (len == (size_t)-1) 2725 if (len == (size_t)-1)
2710 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2726 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2711 2727
2712 // assume wchar == unicode 2728 // assume wchar == unicode
2713 cmdbuf_ptr += len; 2729 cmdbuf_ptr += len;
2714 return wc; 2730 return wc & UNICODE_MASK;
2715 } 2731 }
2716 2732
2717 return NOCHAR; 2733 return NOCHAR;
2718} 2734}
2719 2735
… …
3182 { 3198 {
3183 switch (priv) 3199 switch (priv)
3184 { 3200 {
3185 case '>': 3201 case '>':
3186 if (ch == CSI_DA) /* secondary device attributes */ 3202 if (ch == CSI_DA) /* secondary device attributes */
3187 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3203 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3188 break; 3204 break;
3189 case '?': 3205 case '?':
3190 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3206 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3191 process_terminal_mode (ch, priv, nargs, arg); 3207 process_terminal_mode (ch, priv, nargs, arg);
3192 break; 3208 break;
… …
3421rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3437rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3422{ 3438{
3423 int x, y; 3439 int x, y;
3424 XWindowAttributes wattr; 3440 XWindowAttributes wattr;
3425 Window wdummy; 3441 Window wdummy;
3442 dDisp;
3426 3443
3427 if (nargs == 0) 3444 if (nargs == 0)
3428 return; 3445 return;
3429 3446
3430 switch (args[0]) 3447 switch (args[0])
3431 { 3448 {
3432 /* 3449 /*
3433 * commands 3450 * commands
3434 */ 3451 */
3435 case 1: /* deiconify window */ 3452 case 1: /* deiconify window */
3436 XMapWindow (display->display, TermWin.parent[0]); 3453 XMapWindow (disp, TermWin.parent[0]);
3437 break; 3454 break;
3438 case 2: /* iconify window */ 3455 case 2: /* iconify window */
3439 XIconifyWindow (display->display, TermWin.parent[0], 3456 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3440 DefaultScreen (display->display));
3441 break; 3457 break;
3442 case 3: /* set position (pixels) */ 3458 case 3: /* set position (pixels) */
3443 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3444 break; 3460 break;
3445 case 4: /* set size (pixels) */ 3461 case 4: /* set size (pixels) */
3446 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3447 break; 3463 break;
3448 case 5: /* raise window */ 3464 case 5: /* raise window */
3449 XRaiseWindow (display->display, TermWin.parent[0]); 3465 XRaiseWindow (disp, TermWin.parent[0]);
3450 break; 3466 break;
3451 case 6: /* lower window */ 3467 case 6: /* lower window */
3452 XLowerWindow (display->display, TermWin.parent[0]); 3468 XLowerWindow (disp, TermWin.parent[0]);
3453 break; 3469 break;
3454 case 7: /* refresh window */ 3470 case 7: /* refresh window */
3455 scr_touch (true); 3471 scr_touch (true);
3456 break; 3472 break;
3457 case 8: /* set size (chars) */ 3473 case 8: /* set size (chars) */
… …
3469 3485
3470 /* 3486 /*
3471 * reports - some output format copied from XTerm 3487 * reports - some output format copied from XTerm
3472 */ 3488 */
3473 case 11: /* report window state */ 3489 case 11: /* report window state */
3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3475 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3476 break; 3492 break;
3477 case 13: /* report window position */ 3493 case 13: /* report window position */
3478 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3479 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3480 -wattr.border_width, -wattr.border_width, 3496 -wattr.border_width, -wattr.border_width,
3481 &x, &y, &wdummy); 3497 &x, &y, &wdummy);
3482 tt_printf ("\033[3;%d;%dt", x, y); 3498 tt_printf ("\033[3;%d;%dt", x, y);
3483 break; 3499 break;
3484 case 14: /* report window size (pixels) */ 3500 case 14: /* report window size (pixels) */
3485 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3486 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3487 break; 3503 break;
3488 case 18: /* report text area size (chars) */ 3504 case 18: /* report text area size (chars) */
3489 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3490 break; 3506 break;
… …
3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3493 break; 3509 break;
3494 case 20: /* report icon label */ 3510 case 20: /* report icon label */
3495 { 3511 {
3496 char *s; 3512 char *s;
3497 XGetIconName (display->display, TermWin.parent[0], &s); 3513 XGetIconName (disp, TermWin.parent[0], &s);
3498 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3515 XFree (s);
3500 } 3516 }
3501 break; 3517 break;
3502 case 21: /* report window title */ 3518 case 21: /* report window title */
3503 { 3519 {
3504 char *s; 3520 char *s;
3505 XFetchName (display->display, TermWin.parent[0], &s); 3521 XFetchName (disp, TermWin.parent[0], &s);
3506 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3507 XFree (s); 3523 XFree (s);
3508 } 3524 }
3509 break; 3525 break;
3510 } 3526 }
… …
3652 int changed = 0; 3668 int changed = 0;
3653 int color; 3669 int color;
3654 char *buf, *name; 3670 char *buf, *name;
3655 bool query = str[0] == '?' && !str[1]; 3671 bool query = str[0] == '?' && !str[1];
3656 int saveop = op; 3672 int saveop = op;
3673 dDisp;
3657 3674
3658 assert (str != NULL); 3675 assert (str != NULL);
3659 switch (op) 3676 switch (op)
3660 { 3677 {
3661 case XTerm_name: 3678 case XTerm_name:
… …
3677 unsigned long bytes_after; 3694 unsigned long bytes_after;
3678 unsigned char *value = 0; 3695 unsigned char *value = 0;
3679 const char *str = ""; 3696 const char *str = "";
3680 3697
3681 if (prop 3698 if (prop
3682 && XGetWindowProperty (display->display, TermWin.parent[0], 3699 && XGetWindowProperty (disp, TermWin.parent[0],
3683 prop, 0, 1<<16, 0, AnyPropertyType, 3700 prop, 0, 1<<16, 0, AnyPropertyType,
3684 &actual_type, &actual_format, 3701 &actual_type, &actual_format,
3685 &nitems, &bytes_after, &value) == Success 3702 &nitems, &bytes_after, &value) == Success
3686 && actual_type != None 3703 && actual_type != None
3687 && actual_format == 8) 3704 && actual_format == 8)
… …
3699 { 3716 {
3700 *eq = 0; 3717 *eq = 0;
3701 set_utf8_property (display->atom (str), eq + 1); 3718 set_utf8_property (display->atom (str), eq + 1);
3702 } 3719 }
3703 else 3720 else
3704 XDeleteProperty (display->display, TermWin.parent[0], 3721 XDeleteProperty (disp, TermWin.parent[0],
3705 display->atom (str)); 3722 display->atom (str));
3706 } 3723 }
3707 break; 3724 break;
3708 3725
3709 case XTerm_Color: 3726 case XTerm_Color:
… …
3784 { 3801 {
3785 str++; 3802 str++;
3786#if XPM_BACKGROUND 3803#if XPM_BACKGROUND
3787 changed += scale_pixmap (str); 3804 changed += scale_pixmap (str);
3788#endif 3805#endif
3789
3790 } 3806 }
3807
3791 if (changed) 3808 if (changed)
3792 { 3809 {
3793#ifdef XPM_BACKGROUND 3810#ifdef XPM_BACKGROUND
3794 resize_pixmap (); 3811 resize_pixmap ();
3795#endif 3812#endif
… …
3836 if (query) 3853 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3838 else 3855 else
3839 { 3856 {
3840 set_locale (str); 3857 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8);
3841# ifdef USE_XIM 3859# ifdef USE_XIM
3842 im_cb (); 3860 im_cb ();
3843# endif 3861# endif
3844 } 3862 }
3845 break; 3863 break;

Diff Legend

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