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.163 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.196 by root, Thu Feb 17 12:23:39 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
57#include <csignal>
54 58
55/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
56 60
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 62
… …
113 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 119 XK_Print, 0x2399,
116 120
117 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,
118 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
119 0, 131 0,
120}; 132};
121 133
122void 134void
123rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
… …
272 * 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
273 * escape sequence to toggle the Keypad. 285 * escape sequence to toggle the Keypad.
274 * 286 *
275 * Always permit `shift' to override the current setting 287 * Always permit `shift' to override the current setting
276 */ 288 */
277 shft = (ev.state & ShiftMask); 289 shft = ev.state & ShiftMask;
278 ctrl = (ev.state & ControlMask); 290 ctrl = ev.state & ControlMask;
279 meta = (ev.state & ModMetaMask); 291 meta = ev.state & ModMetaMask;
280 292
281 if (numlock_state || (ev.state & ModNumLockMask)) 293 if (numlock_state || (ev.state & ModNumLockMask))
282 { 294 {
283 numlock_state = (ev.state & ModNumLockMask); 295 numlock_state = (ev.state & ModNumLockMask);
284 PrivMode ((!numlock_state), PrivMode_aplKP); 296 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
343 valid_keysym = keysym != NoSymbol; 355 valid_keysym = keysym != NoSymbol;
344 } 356 }
345 357
346 if (valid_keysym) 358 if (valid_keysym)
347 { 359 {
360#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state))
362 return;
363#endif
364
348 if (TermWin.saveLines) 365 if (TermWin.saveLines)
349 { 366 {
350#ifdef UNSHIFTED_SCROLLKEYS 367#ifdef UNSHIFTED_SCROLLKEYS
351 if (!ctrl && !meta) 368 if (!ctrl && !meta)
352#else 369#else
… …
417 { 434 {
418 /* normal XTerm key bindings */ 435 /* normal XTerm key bindings */
419 case XK_Insert: /* Shift+Insert = paste mouse selection */ 436 case XK_Insert: /* Shift+Insert = paste mouse selection */
420 selection_request (ev.time, 0, 0); 437 selection_request (ev.time, 0, 0);
421 return; 438 return;
422#if TODO // TODO 439#if TODO
423 /* rxvt extras */ 440 /* rxvt extras */
424 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 441 case XK_KP_Add: /* Shift+KP_Add = bigger font */
425 change_font (FONT_UP); 442 change_font (FONT_UP);
426 return; 443 return;
427 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 444 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
486 } 503 }
487#endif 504#endif
488 505
489 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 506 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490 { 507 {
491#ifdef KEYSYM_RESOURCE
492 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
493 {
494 unsigned int l;
495 const unsigned char *kbuf0;
496
497 kbuf0 = (Keysym_map[keysym & 0xFF]);
498 l = (unsigned int)*kbuf0++;
499
500 /* escape prefix */
501 if (meta
502# ifdef META8_OPTION
503 && meta_char == C0_ESC
504# endif
505 )
506 {
507 const unsigned char ch = C0_ESC;
508 tt_write (&ch, 1);
509 }
510
511 tt_write (kbuf0, l);
512 return;
513 }
514 else
515#endif
516 { 508 {
517 newlen = 1; 509 newlen = 1;
518 switch (keysym) 510 switch (keysym)
519 { 511 {
520#ifndef NO_BACKSPACE_KEY 512#ifndef NO_BACKSPACE_KEY
… …
528 else 520 else
529 strcpy (kbuf, key_backspace); 521 strcpy (kbuf, key_backspace);
530 break; 522 break;
531#endif 523#endif
532#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
533 case XK_Delete: 535 case XK_Delete:
534 strcpy (kbuf, key_delete); 536 strcpy (kbuf, key_delete);
535 break; 537 break;
536#endif 538#endif
537 case XK_Tab: 539 case XK_Tab:
… …
640#ifdef XK_KP_Begin 642#ifdef XK_KP_Begin
641 case XK_KP_Begin: 643 case XK_KP_Begin:
642 strcpy (kbuf, "\033Ou"); 644 strcpy (kbuf, "\033Ou");
643 break; 645 break;
644 646
645 case XK_KP_Insert:
646 strcpy (kbuf, "\033Op");
647 break;
648
649 case XK_KP_Delete:
650 strcpy (kbuf, "\033On");
651 break;
652#endif 647#endif
653 case XK_KP_F1: /* "\033OP" */ 648 case XK_KP_F1: /* "\033OP" */
654 case XK_KP_F2: /* "\033OQ" */ 649 case XK_KP_F2: /* "\033OQ" */
655 case XK_KP_F3: /* "\033OR" */ 650 case XK_KP_F3: /* "\033OR" */
656 case XK_KP_F4: /* "\033OS" */ 651 case XK_KP_F4: /* "\033OS" */
… …
688 break; 683 break;
689 684
690 case XK_Find: 685 case XK_Find:
691 strcpy (kbuf, "\033[1~"); 686 strcpy (kbuf, "\033[1~");
692 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
693 case XK_Insert: 699 case XK_Insert:
694 strcpy (kbuf, "\033[2~"); 700 strcpy (kbuf, "\033[2~");
695 break; 701 break;
696#ifdef DXK_Remove /* support for DEC remove like key */ 702#ifdef DXK_Remove /* support for DEC remove like key */
697 case DXK_Remove: 703 case DXK_Remove:
… …
787#undef FKEY 793#undef FKEY
788 default: 794 default:
789 newlen = 0; 795 newlen = 0;
790 break; 796 break;
791 } 797 }
798
792 if (newlen) 799 if (newlen)
793 len = strlen (kbuf); 800 len = strlen (kbuf);
794 } 801 }
795 802
796 /* 803 /*
… …
804 } 811 }
805 else if (ctrl && keysym == XK_minus) 812 else if (ctrl && keysym == XK_minus)
806 { 813 {
807 len = 1; 814 len = 1;
808 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;
809 } 821 }
810 else 822 else
811 { 823 {
812#ifdef META8_OPTION 824#ifdef META8_OPTION
813 /* set 8-bit on */ 825 /* set 8-bit on */
… …
872#endif /* DEBUG_CMD */ 884#endif /* DEBUG_CMD */
873 tt_write (kbuf, (unsigned int)len); 885 tt_write (kbuf, (unsigned int)len);
874} 886}
875/*}}} */ 887/*}}} */
876 888
877#if (MENUBAR_MAX) 889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
878/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
879/* attempt to `write' count to the input buffer */ 891/* attempt to `write' count to the input buffer */
880unsigned int 892unsigned int
881rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 893rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
882{ 894{
… …
905 917
906 cmd_parse (); 918 cmd_parse ();
907 919
908 return 0; 920 return 0;
909} 921}
910#endif /* MENUBAR_MAX */ 922#endif
911 923
912void 924void
913rxvt_term::flush () 925rxvt_term::flush ()
914{ 926{
927 flush_ev.stop ();
928
915#ifdef TRANSPARENT 929#ifdef TRANSPARENT
916 if (want_full_refresh) 930 if (want_full_refresh)
917 { 931 {
918 want_full_refresh = 0; 932 want_full_refresh = 0;
919 scr_clear (); 933 scr_clear ();
… …
929 IMSendSpot (); 943 IMSendSpot ();
930#endif 944#endif
931 } 945 }
932 946
933 display->flush (); 947 display->flush ();
934
935 flush_ev.stop ();
936} 948}
937 949
938void 950void
939rxvt_term::check_cb (check_watcher &w) 951rxvt_term::check_cb (check_watcher &w)
940{ 952{
… …
1016{ 1028{
1017 if (mouse_slip_wheel_speed == 0 1029 if (mouse_slip_wheel_speed == 0
1018 || 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)
1019 : scr_page (UP, mouse_slip_wheel_speed)) 1031 : scr_page (UP, mouse_slip_wheel_speed))
1020 { 1032 {
1033 if (TermWin.view_start == TermWin.nscrolled ||
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0;
1036
1021 refresh_type |= SMOOTH_REFRESH; 1037 refresh_type |= SMOOTH_REFRESH;
1022 want_refresh = 1; 1038 want_refresh = 1;
1023 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024 } 1040 }
1025} 1041}
… …
1057rxvt_term::pty_cb (io_watcher &w, short revents) 1073rxvt_term::pty_cb (io_watcher &w, short revents)
1058{ 1074{
1059 SET_R (this); 1075 SET_R (this);
1060 SET_LOCALE (locale); 1076 SET_LOCALE (locale);
1061 1077
1062 if (revents & EVENT_WRITE)
1063 tt_write (0, 0);
1064 else if (revents & EVENT_READ) 1078 if (revents & EVENT_READ)
1065 // loop, but don't allow a single term to monopolize us 1079 // loop, but don't allow a single term to monopolize us
1066 while (pty_fill ()) 1080 while (pty_fill ())
1067 if (cmd_parse ()) 1081 if (cmd_parse ())
1068 break; 1082 break;
1083
1084 if (revents & EVENT_WRITE)
1085 pty_write ();
1069} 1086}
1070 1087
1071void 1088void
1072rxvt_term::pointer_unblank () 1089rxvt_term::pointer_unblank ()
1073{ 1090{
… …
1087rxvt_term::pointer_blank () 1104rxvt_term::pointer_blank ()
1088{ 1105{
1089 if (! (options & Opt_pointerBlank)) 1106 if (! (options & Opt_pointerBlank))
1090 return; 1107 return;
1091 1108
1092 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1093 XFlush (display->display); 1110 XFlush (display->display);
1094 1111
1095 hidden_pointer = 1; 1112 hidden_pointer = 1;
1096} 1113}
1097 1114
… …
1186 1203
1187/*{{{ process an X event */ 1204/*{{{ process an X event */
1188void 1205void
1189rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
1190{ 1207{
1208 dDisp;
1209
1191 SET_R (this); 1210 SET_R (this);
1192 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
1193 1212
1194#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
1195 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1216 if (ev.type == KeyPress && hidden_pointer == 0) 1235 if (ev.type == KeyPress && hidden_pointer == 0)
1217 pointer_blank (); 1236 pointer_blank ();
1218 } 1237 }
1219#endif 1238#endif
1220 1239
1221#ifdef USE_XIM
1222 if (XFilterEvent (&ev, None))
1223 return;
1224#endif
1225
1226 Window unused_root, unused_child; 1240 Window unused_root, unused_child;
1227 int unused_root_x, unused_root_y; 1241 int unused_root_x, unused_root_y;
1228 unsigned int unused_mask; 1242 unsigned int unused_mask;
1229 1243
1230 switch (ev.type) 1244 switch (ev.type)
1231 { 1245 {
1232 case KeyPress: 1246 case KeyPress:
1233#if ISO_14755 1247#if ISO_14755
… …
1331 Atom ActualType; 1345 Atom ActualType;
1332 int ActualFormat; 1346 int ActualFormat;
1333 unsigned char *data; 1347 unsigned char *data;
1334 unsigned long Size, RemainingBytes; 1348 unsigned long Size, RemainingBytes;
1335 1349
1336 XGetWindowProperty (display->display, display->root, 1350 XGetWindowProperty (disp, display->root,
1337 xa[XA_DNDSELECTION], 1351 xa[XA_DNDSELECTION],
1338 0L, 1000000L, 1352 0L, 1000000L,
1339 False, AnyPropertyType, 1353 False, AnyPropertyType,
1340 &ActualType, &ActualFormat, 1354 &ActualType, &ActualFormat,
1341 &Size, &RemainingBytes, 1355 &Size, &RemainingBytes,
1342 &data); 1356 &data);
1343 XChangeProperty (display->display, display->root, 1357 set_string_property (XA_CUT_BUFFER0, data);
1344 XA_CUT_BUFFER0, XA_STRING,
1345 8, PropModeReplace,
1346 data, strlen (data));
1347 XFree (data); 1358 XFree (data);
1348 selection_paste (display->root, XA_CUT_BUFFER0, True); 1359 selection_paste (display->root, XA_CUT_BUFFER0, true);
1349 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1360 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1350 } 1361 }
1351#endif /* OFFIX_DND */ 1362#endif /* OFFIX_DND */
1352 break; 1363 break;
1353 1364
1354 case MappingNotify: 1365 case MappingNotify:
… …
1447 { /* Wrap lots of configures into one */ 1458 { /* Wrap lots of configures into one */
1448 width = ev.xconfigure.width; 1459 width = ev.xconfigure.width;
1449 height = ev.xconfigure.height; 1460 height = ev.xconfigure.height;
1450 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1451 } 1462 }
1452 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1453 1464
1454 if (szHint.width != width || szHint.height != height) 1465 if (szHint.width != width || szHint.height != height)
1455 { 1466 {
1456 seen_resize = 1; 1467 seen_resize = 1;
1457 resize_all_windows (width, height, 1); 1468 resize_all_windows (width, height, 1);
1458 } 1469 }
1459 1470
1460#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1461 if (options & Opt_transparent) 1472 if (options & Opt_transparent)
1462 {
1463 check_our_parents (); 1473 check_our_parents ();
1464 if (am_transparent)
1465 want_refresh = want_full_refresh = 1;
1466 }
1467#endif 1474#endif
1468 } 1475 }
1469 break; 1476 break;
1470 1477
1471 case PropertyNotify: 1478 case PropertyNotify:
… …
1479 selection_clear (); 1486 selection_clear ();
1480 break; 1487 break;
1481 1488
1482 case SelectionNotify: 1489 case SelectionNotify:
1483 if (selection_wait == Sel_normal) 1490 if (selection_wait == Sel_normal)
1484 selection_paste (ev.xselection.requestor, 1491 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1485 ev.xselection.property, True);
1486 break; 1492 break;
1487 1493
1488 case SelectionRequest: 1494 case SelectionRequest:
1489 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1490 break; 1496 break;
… …
1514 if (ev.xany.window == TermWin.vt) 1520 if (ev.xany.window == TermWin.vt)
1515 { 1521 {
1516 do 1522 do
1517 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1518 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1520 1526
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1528
1523 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1526 1532
1527 scr_refresh (refresh_type); 1533 scr_refresh (refresh_type);
1528 } 1534 }
1529 else 1535 else
1530 { 1536 {
1531 XEvent unused_event; 1537 XEvent unused_event;
1532 1538
1533 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1534 ; 1540 ;
1535 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1542 ;
1537 1543
1538 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1539 { 1545 {
1540 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
… …
1545 menubar_expose (); 1551 menubar_expose ();
1546#endif 1552#endif
1547 1553
1548#ifdef TRANSPARENT 1554#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1555 if (am_transparent && ev.xany.window == TermWin.parent[0])
1550 XClearWindow (display->display, ev.xany.window); 1556 XClearWindow (disp, ev.xany.window);
1551#endif 1557#endif
1552 } 1558 }
1553 break; 1559 break;
1554 1560
1555 case MotionNotify: 1561 case MotionNotify:
… …
1562 { 1568 {
1563 menubar_control (ev.xbutton); 1569 menubar_control (ev.xbutton);
1564 break; 1570 break;
1565 } 1571 }
1566#endif 1572#endif
1567 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate)) 1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1574 break;
1569 1575
1570 if (ev.xany.window == TermWin.vt) 1576 if (ev.xany.window == TermWin.vt)
1571 { 1577 {
1572 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1578 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1573 { 1579 {
1574 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1575 ; 1581 ;
1576 1582
1577 XQueryPointer (display->display, TermWin.vt, 1583 XQueryPointer (disp, TermWin.vt,
1578 &unused_root, &unused_child, 1584 &unused_root, &unused_child,
1579 &unused_root_x, &unused_root_y, 1585 &unused_root_x, &unused_root_y,
1580 & (ev.xbutton.x), & (ev.xbutton.y), 1586 &ev.xbutton.x, &ev.xbutton.y,
1581 &unused_mask); 1587 &ev.xbutton.state);
1582#ifdef MOUSE_THRESHOLD 1588#ifdef MOUSE_THRESHOLD
1583 /* deal with a `jumpy' mouse */ 1589 /* deal with a `jumpy' mouse */
1584 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1590 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1585 { 1591 {
1586#endif 1592#endif
… …
1591 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1597 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1592 break; 1598 break;
1593 } 1599 }
1594#endif 1600#endif
1595 selection_extend (ev.xbutton.x, ev.xbutton.y, 1601 selection_extend (ev.xbutton.x, ev.xbutton.y,
1596 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1602 ev.xbutton.state & Button3Mask ? 2 : 0);
1603
1597#ifdef SELECTION_SCROLLING 1604#ifdef SELECTION_SCROLLING
1598 if (ev.xbutton.y < TermWin.int_bwidth 1605 if (ev.xbutton.y < TermWin.int_bwidth
1599 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1600 { 1607 {
1601 int dist; 1608 int dist;
… …
1612 selection_save_x = ev.xbutton.x; 1619 selection_save_x = ev.xbutton.x;
1613 selection_save_y = ev.xbutton.y; 1620 selection_save_y = ev.xbutton.y;
1614 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1615 1622
1616 /* calc number of lines to scroll */ 1623 /* calc number of lines to scroll */
1617 if (ev.xbutton.y<TermWin.int_bwidth) 1624 if (ev.xbutton.y < TermWin.int_bwidth)
1618 { 1625 {
1619 scroll_selection_dir = UP; 1626 scroll_selection_dir = UP;
1620 dist = TermWin.int_bwidth - ev.xbutton.y; 1627 dist = TermWin.int_bwidth - ev.xbutton.y;
1621 } 1628 }
1622 else 1629 else
… …
1645#endif 1652#endif
1646 } 1653 }
1647 } 1654 }
1648 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1649 { 1656 {
1650 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1657 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1651 MotionNotify, &ev)) ; 1658 MotionNotify, &ev))
1659 ;
1660
1652 XQueryPointer (display->display, scrollBar.win, 1661 XQueryPointer (disp, scrollBar.win,
1653 &unused_root, &unused_child, 1662 &unused_root, &unused_child,
1654 &unused_root_x, &unused_root_y, 1663 &unused_root_x, &unused_root_y,
1655 & (ev.xbutton.x), & (ev.xbutton.y), 1664 &ev.xbutton.x, &ev.xbutton.y,
1656 &unused_mask); 1665 &unused_mask);
1657 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1658 scrollbar_size ()); 1667 scrollbar_size ());
1659 scr_refresh (refresh_type); 1668 scr_refresh (refresh_type);
1660 refresh_limit = 0; 1669 refresh_limit = 0;
… …
1676 case PropertyNotify: 1685 case PropertyNotify:
1677 /* 1686 /*
1678 * 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,
1679 * 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.
1680 */ 1689 */
1681 if (xa[XA_XROOTPMAPID] == 0)
1682 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1683
1684 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])
1685 return; 1692 return;
1686 1693
1687 /* FALLTHROUGH */ 1694 /* FALLTHROUGH */
1688 case ReparentNotify: 1695 case ReparentNotify:
1689 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
… …
1715 return; 1722 return;
1716 } 1723 }
1717#endif 1724#endif
1718 1725
1719 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1726 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1727
1720 if (reportmode) 1728 if (reportmode)
1721 { 1729 {
1722 /* mouse report from vt window */ 1730 /* mouse report from vt window */
1723 /* save the xbutton state (for ButtonRelease) */ 1731 /* save the xbutton state (for ButtonRelease) */
1724 MEvent.state = ev.state; 1732 MEvent.state = ev.state;
… …
1753 } 1761 }
1754 else 1762 else
1755 { 1763 {
1756 if (ev.button != MEvent.button) 1764 if (ev.button != MEvent.button)
1757 MEvent.clicks = 0; 1765 MEvent.clicks = 0;
1766
1758 switch (ev.button) 1767 switch (ev.button)
1759 { 1768 {
1760 case Button1: 1769 case Button1:
1770 /* allow meta + click to select rectangular areas */
1771 /* should be done in screen.C */
1772#if ENABLE_FRILLS
1773 selection.rect = !!(ev.state & ModMetaMask);
1774#else
1775 selection.rect = false;
1776#endif
1777
1761 /* allow shift+left click to extend selection */ 1778 /* allow shift+left click to extend selection */
1762 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1763 { 1780 {
1764 if (MEvent.button == Button1 && clickintime) 1781 if (MEvent.button == Button1 && clickintime)
1765 selection_rotate (ev.x, ev.y); 1782 selection_rotate (ev.x, ev.y);
… …
2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2104 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2105 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2106 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090 int i; 2107 int i;
2091 2108
2092 Visual* visual = display->visual; 2109 Visual *visual = display->visual;
2093 2110
2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2111 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095 2112
2096 /* for convenience */ 2113 /* for convenience */
2097 mask_r = visual->red_mask; 2114 mask_r = visual->red_mask;
… …
2318 Atom atype; 2335 Atom atype;
2319 unsigned char *prop = NULL; 2336 unsigned char *prop = NULL;
2320 Window root, oldp, *list; 2337 Window root, oldp, *list;
2321 Pixmap rootpixmap = None; 2338 Pixmap rootpixmap = None;
2322 XWindowAttributes wattr, wrootattr; 2339 XWindowAttributes wattr, wrootattr;
2340 dDisp;
2323 2341
2324 pchanged = 0; 2342 pchanged = 0;
2325 2343
2326 if (!(options & Opt_transparent)) 2344 if (!(options & Opt_transparent))
2327 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
2328 2346
2329 XGetWindowAttributes (display->display, display->root, &wrootattr); 2347 XGetWindowAttributes (disp, display->root, &wrootattr);
2330 rootdepth = wrootattr.depth; 2348 rootdepth = wrootattr.depth;
2331 2349
2332 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2333 2351
2334 if (rootdepth != wattr.depth) 2352 if (rootdepth != wattr.depth)
2335 { 2353 {
2336 if (am_transparent) 2354 if (am_transparent)
2337 { 2355 {
2338 pchanged = 1; 2356 pchanged = 1;
2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2340 am_transparent = am_pixmap_trans = 0; 2358 am_transparent = am_pixmap_trans = 0;
2341 } 2359 }
2342 2360
2343 return pchanged; /* Don't try any more */ 2361 return pchanged; /* Don't try any more */
2344 } 2362 }
2345 2363
2346 /* 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. */
2347 XSync (display->display, False); 2365 XSync (disp, False);
2348 2366
2349 /* 2367 /*
2350 * Make the frame window set by the window manager have 2368 * Make the frame window set by the window manager have
2351 * the root background. Some window managers put multiple nested frame 2369 * the root background. Some window managers put multiple nested frame
2352 * 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.
2353 */ 2371 */
2354 i = (xa[XA_XROOTPMAPID] 2372 i = (xa[XA_XROOTPMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2373 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2374 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2375 &nitems, &bytes_after, &prop) == Success);
2358 2376
2359 if (!i || prop == NULL) 2377 if (!i || prop == NULL)
2360 i = (xa[XA_XSETROOTID] 2378 i = (xa[XA_ESETROOT_PMAP_ID]
2361 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2379 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2380 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363 &nitems, &bytes_after, &prop) == Success); 2381 &nitems, &bytes_after, &prop) == Success);
2364 2382
2365 if (!i || prop == NULL 2383 if (!i || prop == NULL
2366#if TINTING 2384#if TINTING
… …
2385 Window cr; 2403 Window cr;
2386 XImage *image; 2404 XImage *image;
2387 GC gc; 2405 GC gc;
2388 XGCValues gcvalue; 2406 XGCValues gcvalue;
2389 2407
2390 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2391 0, 0, &sx, &sy, &cr); 2409 0, 0, &sx, &sy, &cr);
2392 nw = (unsigned int)szHint.width; 2410 nw = (unsigned int)szHint.width;
2393 nh = (unsigned int)szHint.height; 2411 nh = (unsigned int)szHint.height;
2394 nx = ny = 0; 2412 nx = ny = 0;
2395 2413
… …
2407 sy = 0; 2425 sy = 0;
2408 } 2426 }
2409 2427
2410 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2411 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2430
2431 XSync (disp, False);
2412 allowedxerror = -1; 2432 allowedxerror = -1;
2413 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2414 2434
2415 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2435 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2416 /* XXX: may need a delay here? */ 2436 /* XXX: may need a delay here? */
2417 allowedxerror = 0; 2437 allowedxerror = 0;
2418 2438
… …
2421 if (am_transparent && am_pixmap_trans) 2441 if (am_transparent && am_pixmap_trans)
2422 { 2442 {
2423 pchanged = 1; 2443 pchanged = 1;
2424 if (TermWin.pixmap != None) 2444 if (TermWin.pixmap != None)
2425 { 2445 {
2426 XFreePixmap (display->display, TermWin.pixmap); 2446 XFreePixmap (disp, TermWin.pixmap);
2427 TermWin.pixmap = None; 2447 TermWin.pixmap = None;
2428 } 2448 }
2429 } 2449 }
2430 2450
2431 am_pixmap_trans = 0; 2451 am_pixmap_trans = 0;
2432 } 2452 }
2433 else 2453 else
2434 { 2454 {
2435 if (TermWin.pixmap != None) 2455 if (TermWin.pixmap != None)
2436 XFreePixmap (display->display, TermWin.pixmap); 2456 XFreePixmap (disp, TermWin.pixmap);
2437 2457
2438#if TINTING 2458#if TINTING
2439 if (ISSET_PIXCOLOR (Color_tint)) 2459 if (ISSET_PIXCOLOR (Color_tint))
2440 { 2460 {
2441 unsigned short rm, gm, bm; 2461 unsigned short rm, gm, bm;
… …
2445 2465
2446 ShadeXImage (display, image, shade, rm, gm, bm); 2466 ShadeXImage (display, image, shade, rm, gm, bm);
2447 } 2467 }
2448#endif 2468#endif
2449 2469
2450 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2451 szHint.width, szHint.height, image->depth); 2471 szHint.width, szHint.height, image->depth);
2452 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2453 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2454 nx, ny, image->width, image->height); 2474 nx, ny, image->width, image->height);
2455 XFreeGC (display->display, gc); 2475 XFreeGC (disp, gc);
2456 XDestroyImage (image); 2476 XDestroyImage (image);
2457 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2458 XClearWindow (display->display, TermWin.parent[0]); 2478 XClearWindow (disp, TermWin.parent[0]);
2459 2479
2460 if (!am_transparent || !am_pixmap_trans) 2480 if (!am_transparent || !am_pixmap_trans)
2461 pchanged = 1; 2481 pchanged = 1;
2462 2482
2463 am_transparent = am_pixmap_trans = 1; 2483 am_transparent = am_pixmap_trans = 1;
2464 } 2484 }
2465 } 2485 }
2466 2486
2467 if (!am_pixmap_trans) 2487 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2489 else
2468 { 2490 {
2469 unsigned int n; 2491 unsigned int n;
2470 /* 2492 /*
2471 * InheritPixmap transparency 2493 * InheritPixmap transparency
2472 */ 2494 */
2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2474 { 2496 {
2475 oldp = TermWin.parent[i]; 2497 oldp = TermWin.parent[i];
2476 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2498 XQueryTree (disp, TermWin.parent[i - 1], &root,
2477 &TermWin.parent[i], &list, &n); 2499 &TermWin.parent[i], &list, &n);
2478 XFree (list); 2500 XFree (list);
2479 2501
2480 if (TermWin.parent[i] == display->root) 2502 if (TermWin.parent[i] == display->root)
2481 { 2503 {
… …
2493 2515
2494 if (pchanged) 2516 if (pchanged)
2495 { 2517 {
2496 for (; n < (unsigned int)i; n++) 2518 for (; n < (unsigned int)i; n++)
2497 { 2519 {
2498 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2500 { 2522 {
2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2502 break; 2524 break;
2503 } 2525 }
2504 } 2526 }
2505 } 2527 }
2506 2528
2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2508 { 2530 {
2509 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2510 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2511 am_transparent = 0; 2533 am_transparent = 0;
2512 /* XXX: also turn off Opt_transparent? */ 2534 /* XXX: also turn off Opt_transparent? */
2513 } 2535 }
2514 else 2536 else
2515 { 2537 {
… …
2518 * needed for fvwm2.2.2 (and before?) */ 2540 * needed for fvwm2.2.2 (and before?) */
2519 sleep (1); 2541 sleep (1);
2520#endif 2542#endif
2521 for (n = 0; n < (unsigned int)i; n++) 2543 for (n = 0; n < (unsigned int)i; n++)
2522 { 2544 {
2523 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2524 XClearWindow (display->display, TermWin.parent[n]); 2546 XClearWindow (disp, TermWin.parent[n]);
2525 } 2547 }
2526 2548
2527 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2528 am_transparent = 1; 2550 am_transparent = 1;
2529 } 2551 }
2530 2552
2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2532 TermWin.parent[i] = None; 2554 TermWin.parent[i] = None;
2533 } 2555 }
2534 2556
2535 if (scrollBar.win) 2557 if (scrollBar.win)
2536 { 2558 {
2537 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2538 scrollBar.setIdle (); 2560 scrollBar.setIdle ();
2539 scrollbar_show (0); 2561 scrollbar_show (0);
2562 }
2563
2564 if (am_transparent)
2565 {
2566 want_refresh = want_full_refresh = 1;
2567 if (am_pixmap_trans)
2568 flush ();
2540 } 2569 }
2541 2570
2542 return pchanged; 2571 return pchanged;
2543} 2572}
2544#endif 2573#endif
… …
2696 if (len == (size_t)-1) 2725 if (len == (size_t)-1)
2697 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
2698 2727
2699 // assume wchar == unicode 2728 // assume wchar == unicode
2700 cmdbuf_ptr += len; 2729 cmdbuf_ptr += len;
2701 return wc; 2730 return wc & UNICODE_MASK;
2702 } 2731 }
2703 2732
2704 return NOCHAR; 2733 return NOCHAR;
2705} 2734}
2706 2735
… …
3169 { 3198 {
3170 switch (priv) 3199 switch (priv)
3171 { 3200 {
3172 case '>': 3201 case '>':
3173 if (ch == CSI_DA) /* secondary device attributes */ 3202 if (ch == CSI_DA) /* secondary device attributes */
3174 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3203 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3175 break; 3204 break;
3176 case '?': 3205 case '?':
3177 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3206 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3178 process_terminal_mode (ch, priv, nargs, arg); 3207 process_terminal_mode (ch, priv, nargs, arg);
3179 break; 3208 break;
… …
3408rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3437rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3409{ 3438{
3410 int x, y; 3439 int x, y;
3411 XWindowAttributes wattr; 3440 XWindowAttributes wattr;
3412 Window wdummy; 3441 Window wdummy;
3442 dDisp;
3413 3443
3414 if (nargs == 0) 3444 if (nargs == 0)
3415 return; 3445 return;
3416 3446
3417 switch (args[0]) 3447 switch (args[0])
3418 { 3448 {
3419 /* 3449 /*
3420 * commands 3450 * commands
3421 */ 3451 */
3422 case 1: /* deiconify window */ 3452 case 1: /* deiconify window */
3423 XMapWindow (display->display, TermWin.parent[0]); 3453 XMapWindow (disp, TermWin.parent[0]);
3424 break; 3454 break;
3425 case 2: /* iconify window */ 3455 case 2: /* iconify window */
3426 XIconifyWindow (display->display, TermWin.parent[0], 3456 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3427 DefaultScreen (display->display));
3428 break; 3457 break;
3429 case 3: /* set position (pixels) */ 3458 case 3: /* set position (pixels) */
3430 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3431 break; 3460 break;
3432 case 4: /* set size (pixels) */ 3461 case 4: /* set size (pixels) */
3433 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3434 break; 3463 break;
3435 case 5: /* raise window */ 3464 case 5: /* raise window */
3436 XRaiseWindow (display->display, TermWin.parent[0]); 3465 XRaiseWindow (disp, TermWin.parent[0]);
3437 break; 3466 break;
3438 case 6: /* lower window */ 3467 case 6: /* lower window */
3439 XLowerWindow (display->display, TermWin.parent[0]); 3468 XLowerWindow (disp, TermWin.parent[0]);
3440 break; 3469 break;
3441 case 7: /* refresh window */ 3470 case 7: /* refresh window */
3442 scr_touch (true); 3471 scr_touch (true);
3443 break; 3472 break;
3444 case 8: /* set size (chars) */ 3473 case 8: /* set size (chars) */
… …
3456 3485
3457 /* 3486 /*
3458 * reports - some output format copied from XTerm 3487 * reports - some output format copied from XTerm
3459 */ 3488 */
3460 case 11: /* report window state */ 3489 case 11: /* report window state */
3461 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3462 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3463 break; 3492 break;
3464 case 13: /* report window position */ 3493 case 13: /* report window position */
3465 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3466 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3467 -wattr.border_width, -wattr.border_width, 3496 -wattr.border_width, -wattr.border_width,
3468 &x, &y, &wdummy); 3497 &x, &y, &wdummy);
3469 tt_printf ("\033[3;%d;%dt", x, y); 3498 tt_printf ("\033[3;%d;%dt", x, y);
3470 break; 3499 break;
3471 case 14: /* report window size (pixels) */ 3500 case 14: /* report window size (pixels) */
3472 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3473 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3474 break; 3503 break;
3475 case 18: /* report text area size (chars) */ 3504 case 18: /* report text area size (chars) */
3476 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3477 break; 3506 break;
… …
3479 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3480 break; 3509 break;
3481 case 20: /* report icon label */ 3510 case 20: /* report icon label */
3482 { 3511 {
3483 char *s; 3512 char *s;
3484 XGetIconName (display->display, TermWin.parent[0], &s); 3513 XGetIconName (disp, TermWin.parent[0], &s);
3485 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 */
3486 XFree (s); 3515 XFree (s);
3487 } 3516 }
3488 break; 3517 break;
3489 case 21: /* report window title */ 3518 case 21: /* report window title */
3490 { 3519 {
3491 char *s; 3520 char *s;
3492 XFetchName (display->display, TermWin.parent[0], &s); 3521 XFetchName (disp, TermWin.parent[0], &s);
3493 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 */
3494 XFree (s); 3523 XFree (s);
3495 } 3524 }
3496 break; 3525 break;
3497 } 3526 }
… …
3504 * ends_how is terminator used. returned input must be free()'d 3533 * ends_how is terminator used. returned input must be free()'d
3505 */ 3534 */
3506unsigned char * 3535unsigned char *
3507rxvt_term::get_to_st (unicode_t &ends_how) 3536rxvt_term::get_to_st (unicode_t &ends_how)
3508{ 3537{
3509 unicode_t seen_esc = 0, ch; 3538 unicode_t ch;
3539 bool seen_esc = false;
3510 unsigned int n = 0; 3540 unsigned int n = 0;
3511 unsigned char *s;
3512 unsigned char string[STRING_MAX]; 3541 wchar_t string[STRING_MAX];
3513 3542
3514 while ((ch = cmd_getc ()) != NOCHAR) 3543 while ((ch = cmd_getc ()) != NOCHAR)
3515 { 3544 {
3516 if (seen_esc) 3545 if (seen_esc)
3517 { 3546 {
… …
3520 else 3549 else
3521 return NULL; 3550 return NULL;
3522 } 3551 }
3523 else if (ch == C0_ESC) 3552 else if (ch == C0_ESC)
3524 { 3553 {
3525 seen_esc = 1; 3554 seen_esc = true;
3526 continue; 3555 continue;
3527 } 3556 }
3528 else if (ch == C0_BEL || ch == CHAR_ST) 3557 else if (ch == C0_BEL || ch == CHAR_ST)
3529 break; 3558 break;
3530 else if (ch < 0x20) 3559 else if (ch < 0x20)
3531 return NULL; /* other control character - exit */ 3560 return NULL; /* other control character - exit */
3532 3561
3533 seen_esc = 0; 3562 seen_esc = false;
3534 3563
3535 if (n >= sizeof (string) - 1) 3564 if (n >= sizeof (string) - 1)
3536 // stop at some sane length 3565 // stop at some sane length
3537 return NULL; 3566 return NULL;
3538 3567
… …
3542 string[n++] = ch; 3571 string[n++] = ch;
3543 } 3572 }
3544 3573
3545 string[n++] = '\0'; 3574 string[n++] = '\0';
3546 3575
3547 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3548 return NULL;
3549
3550 ends_how = (ch == 0x5c ? C0_ESC : ch); 3576 ends_how = (ch == 0x5c ? C0_ESC : ch);
3551 strncpy (s, string, n); 3577
3552 return s; 3578 return (unsigned char *)rxvt_wcstombs (string);
3553} 3579}
3554 3580
3555/*----------------------------------------------------------------------*/ 3581/*----------------------------------------------------------------------*/
3556/* 3582/*
3557 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3583 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3642 int changed = 0; 3668 int changed = 0;
3643 int color; 3669 int color;
3644 char *buf, *name; 3670 char *buf, *name;
3645 bool query = str[0] == '?' && !str[1]; 3671 bool query = str[0] == '?' && !str[1];
3646 int saveop = op; 3672 int saveop = op;
3673 dDisp;
3647 3674
3648 assert (str != NULL); 3675 assert (str != NULL);
3649 switch (op) 3676 switch (op)
3650 { 3677 {
3651 case XTerm_name: 3678 case XTerm_name:
… …
3658 set_title (str); 3685 set_title (str);
3659 break; 3686 break;
3660 case XTerm_property: 3687 case XTerm_property:
3661 if (str[0] == '?') 3688 if (str[0] == '?')
3662 { 3689 {
3663 Atom prop = XInternAtom (display->display, str + 1, True); 3690 Atom prop = display->atom (str + 1);
3664 Atom actual_type; 3691 Atom actual_type;
3665 int actual_format; 3692 int actual_format;
3666 unsigned long nitems; 3693 unsigned long nitems;
3667 unsigned long bytes_after; 3694 unsigned long bytes_after;
3668 unsigned char *value = 0; 3695 unsigned char *value = 0;
3669 const char *str = ""; 3696 const char *str = "";
3670 3697
3671 if (prop 3698 if (prop
3672 && XGetWindowProperty (display->display, TermWin.parent[0], 3699 && XGetWindowProperty (disp, TermWin.parent[0],
3673 prop, 0, 1<<16, 0, AnyPropertyType, 3700 prop, 0, 1<<16, 0, AnyPropertyType,
3674 &actual_type, &actual_format, 3701 &actual_type, &actual_format,
3675 &nitems, &bytes_after, &value) == Success 3702 &nitems, &bytes_after, &value) == Success
3676 && actual_type != None 3703 && actual_type != None
3677 && actual_format == 8) 3704 && actual_format == 8)
… …
3686 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3713 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3687 3714
3688 if (eq) 3715 if (eq)
3689 { 3716 {
3690 *eq = 0; 3717 *eq = 0;
3691 XChangeProperty (display->display, TermWin.parent[0], 3718 set_utf8_property (display->atom (str), eq + 1);
3692 display->atom (str), XA_STRING, 8,
3693 PropModeReplace, (unsigned char *)eq + 1,
3694 strlen (eq + 1));
3695 } 3719 }
3696 else 3720 else
3697 XDeleteProperty (display->display, TermWin.parent[0], 3721 XDeleteProperty (disp, TermWin.parent[0],
3698 display->atom (str)); 3722 display->atom (str));
3699 } 3723 }
3700 break; 3724 break;
3701 3725
3702 case XTerm_Color: 3726 case XTerm_Color:
… …
3753 break; 3777 break;
3754 case XTerm_Color_RV: 3778 case XTerm_Color_RV:
3755 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3756 break; 3780 break;
3757#endif 3781#endif
3758#if TRANSPARENT || TINTING 3782#if TRANSPARENT && TINTING
3759 case XTerm_Color_tint: 3783 case XTerm_Color_tint:
3760 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3761 check_our_parents (); 3785 check_our_parents ();
3762 if (am_transparent) 3786 if (am_transparent)
3763 want_full_refresh = want_refresh = 1; 3787 want_full_refresh = want_refresh = 1;
… …
3777 { 3801 {
3778 str++; 3802 str++;
3779#if XPM_BACKGROUND 3803#if XPM_BACKGROUND
3780 changed += scale_pixmap (str); 3804 changed += scale_pixmap (str);
3781#endif 3805#endif
3782
3783 } 3806 }
3807
3784 if (changed) 3808 if (changed)
3785 { 3809 {
3786#ifdef XPM_BACKGROUND 3810#ifdef XPM_BACKGROUND
3787 resize_pixmap (); 3811 resize_pixmap ();
3788#endif 3812#endif
… …
3829 if (query) 3853 if (query)
3830 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);
3831 else 3855 else
3832 { 3856 {
3833 set_locale (str); 3857 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8);
3834# ifdef USE_XIM 3859# ifdef USE_XIM
3835 im_cb (); 3860 im_cb ();
3836# endif 3861# endif
3837 } 3862 }
3838 break; 3863 break;
… …
4276 4301
4277/* ---------------------------------------------------------------------- */ 4302/* ---------------------------------------------------------------------- */
4278/* Write data to the pty as typed by the user, pasted with the mouse, 4303/* Write data to the pty as typed by the user, pasted with the mouse,
4279 * or generated by us in response to a query ESC sequence. 4304 * or generated by us in response to a query ESC sequence.
4280 */ 4305 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307
4281void 4308void
4282rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4309rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4283{ 4310{
4284 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4311 if (v_buflen == 0)
4312 {
4313 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4285 4314
4286 if (len) 4315 if ((unsigned int)written == len)
4316 return;
4317
4318 data += written;
4319 len -= written;
4287 { 4320 }
4321
4322 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4323
4324 memcpy (v_buffer + v_buflen, data, len);
4325 v_buflen += len;
4326
4327 pty_ev.set (EVENT_READ | EVENT_WRITE);
4328}
4329
4330void rxvt_term::pty_write ()
4331{
4332 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4333
4334 if (written > 0)
4335 {
4336 v_buflen -= written;
4337
4288 if (v_buflen == 0) 4338 if (v_buflen == 0)
4289 { 4339 {
4290 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4291
4292 if ((unsigned int)written == len)
4293 return;
4294
4295 data += written;
4296 len -= written;
4297 }
4298
4299
4300 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4301
4302 memcpy (v_buffer + v_buflen, data, len);
4303 v_buflen += len;
4304 }
4305
4306 for (;;)
4307 {
4308 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4309
4310 if (written > 0)
4311 {
4312 v_buflen -= written;
4313
4314 if (v_buflen == 0)
4315 {
4316 free (v_buffer); 4340 free (v_buffer);
4317 v_buffer = 0; 4341 v_buffer = 0;
4318 v_buflen = 0; 4342 v_buflen = 0;
4319 4343
4320 pty_ev.set (EVENT_READ); 4344 pty_ev.set (EVENT_READ);
4321 return;
4322 }
4323
4324 memmove (v_buffer, v_buffer + written, v_buflen);
4325 }
4326 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4327 // original code just ignores this...
4328 destroy ();
4329 else
4330 {
4331 pty_ev.set (EVENT_READ | EVENT_WRITE);
4332 return; 4345 return;
4333 } 4346 }
4347
4348 memmove (v_buffer, v_buffer + written, v_buflen);
4334 } 4349 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this...
4352 destroy ();
4335} 4353}
4336 4354
4337/*----------------------- end-of-file (C source) -----------------------*/ 4355/*----------------------- end-of-file (C source) -----------------------*/
4338 4356

Diff Legend

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