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.176 by root, Mon Dec 13 01:29:03 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}
… …
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1073rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1074{
1060 SET_R (this); 1075 SET_R (this);
1061 SET_LOCALE (locale); 1076 SET_LOCALE (locale);
1062 1077
1063 if (revents & EVENT_WRITE)
1064 tt_write (0, 0);
1065 else if (revents & EVENT_READ) 1078 if (revents & EVENT_READ)
1066 // loop, but don't allow a single term to monopolize us 1079 // loop, but don't allow a single term to monopolize us
1067 while (pty_fill ()) 1080 while (pty_fill ())
1068 if (cmd_parse ()) 1081 if (cmd_parse ())
1069 break; 1082 break;
1083
1084 if (revents & EVENT_WRITE)
1085 pty_write ();
1070} 1086}
1071 1087
1072void 1088void
1073rxvt_term::pointer_unblank () 1089rxvt_term::pointer_unblank ()
1074{ 1090{
… …
1088rxvt_term::pointer_blank () 1104rxvt_term::pointer_blank ()
1089{ 1105{
1090 if (! (options & Opt_pointerBlank)) 1106 if (! (options & Opt_pointerBlank))
1091 return; 1107 return;
1092 1108
1093 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1094 XFlush (display->display); 1110 XFlush (display->display);
1095 1111
1096 hidden_pointer = 1; 1112 hidden_pointer = 1;
1097} 1113}
1098 1114
… …
1187 1203
1188/*{{{ process an X event */ 1204/*{{{ process an X event */
1189void 1205void
1190rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
1191{ 1207{
1208 dDisp;
1209
1192 SET_R (this); 1210 SET_R (this);
1193 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
1194 1212
1195#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1327 Atom ActualType; 1345 Atom ActualType;
1328 int ActualFormat; 1346 int ActualFormat;
1329 unsigned char *data; 1347 unsigned char *data;
1330 unsigned long Size, RemainingBytes; 1348 unsigned long Size, RemainingBytes;
1331 1349
1332 XGetWindowProperty (display->display, display->root, 1350 XGetWindowProperty (disp, display->root,
1333 xa[XA_DNDSELECTION], 1351 xa[XA_DNDSELECTION],
1334 0L, 1000000L, 1352 0L, 1000000L,
1335 False, AnyPropertyType, 1353 False, AnyPropertyType,
1336 &ActualType, &ActualFormat, 1354 &ActualType, &ActualFormat,
1337 &Size, &RemainingBytes, 1355 &Size, &RemainingBytes,
1338 &data); 1356 &data);
1339 set_string_property (XA_CUT_BUFFER0, data); 1357 set_string_property (XA_CUT_BUFFER0, data);
1340 XFree (data); 1358 XFree (data);
1341 selection_paste (display->root, XA_CUT_BUFFER0, true); 1359 selection_paste (display->root, XA_CUT_BUFFER0, true);
1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1360 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1343 } 1361 }
1344#endif /* OFFIX_DND */ 1362#endif /* OFFIX_DND */
1345 break; 1363 break;
1346 1364
1347 case MappingNotify: 1365 case MappingNotify:
… …
1440 { /* Wrap lots of configures into one */ 1458 { /* Wrap lots of configures into one */
1441 width = ev.xconfigure.width; 1459 width = ev.xconfigure.width;
1442 height = ev.xconfigure.height; 1460 height = ev.xconfigure.height;
1443 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1444 } 1462 }
1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1446 1464
1447 if (szHint.width != width || szHint.height != height) 1465 if (szHint.width != width || szHint.height != height)
1448 { 1466 {
1449 seen_resize = 1; 1467 seen_resize = 1;
1450 resize_all_windows (width, height, 1); 1468 resize_all_windows (width, height, 1);
… …
1502 if (ev.xany.window == TermWin.vt) 1520 if (ev.xany.window == TermWin.vt)
1503 { 1521 {
1504 do 1522 do
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1507 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1508 1526
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1528
1511 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1514 1532
1515 scr_refresh (refresh_type); 1533 scr_refresh (refresh_type);
1516 } 1534 }
1517 else 1535 else
1518 { 1536 {
1519 XEvent unused_event; 1537 XEvent unused_event;
1520 1538
1521 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1522 ; 1540 ;
1523 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1542 ;
1525 1543
1526 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1527 { 1545 {
1528 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
… …
1533 menubar_expose (); 1551 menubar_expose ();
1534#endif 1552#endif
1535 1553
1536#ifdef TRANSPARENT 1554#ifdef TRANSPARENT
1537 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1555 if (am_transparent && ev.xany.window == TermWin.parent[0])
1538 XClearWindow (display->display, ev.xany.window); 1556 XClearWindow (disp, ev.xany.window);
1539#endif 1557#endif
1540 } 1558 }
1541 break; 1559 break;
1542 1560
1543 case MotionNotify: 1561 case MotionNotify:
… …
1557 1575
1558 if (ev.xany.window == TermWin.vt) 1576 if (ev.xany.window == TermWin.vt)
1559 { 1577 {
1560 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1578 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1561 { 1579 {
1562 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1563 ; 1581 ;
1564 1582
1565 XQueryPointer (display->display, TermWin.vt, 1583 XQueryPointer (disp, TermWin.vt,
1566 &unused_root, &unused_child, 1584 &unused_root, &unused_child,
1567 &unused_root_x, &unused_root_y, 1585 &unused_root_x, &unused_root_y,
1568 &ev.xbutton.x, &ev.xbutton.y, 1586 &ev.xbutton.x, &ev.xbutton.y,
1569 &ev.xbutton.state); 1587 &ev.xbutton.state);
1570#ifdef MOUSE_THRESHOLD 1588#ifdef MOUSE_THRESHOLD
… …
1634#endif 1652#endif
1635 } 1653 }
1636 } 1654 }
1637 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1638 { 1656 {
1639 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1657 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1640 MotionNotify, &ev)) 1658 MotionNotify, &ev))
1641 ; 1659 ;
1642 1660
1643 XQueryPointer (display->display, scrollBar.win, 1661 XQueryPointer (disp, scrollBar.win,
1644 &unused_root, &unused_child, 1662 &unused_root, &unused_child,
1645 &unused_root_x, &unused_root_y, 1663 &unused_root_x, &unused_root_y,
1646 &ev.xbutton.x, &ev.xbutton.y, 1664 &ev.xbutton.x, &ev.xbutton.y,
1647 &unused_mask); 1665 &unused_mask);
1648 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1667 case PropertyNotify: 1685 case PropertyNotify:
1668 /* 1686 /*
1669 * 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,
1670 * 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.
1671 */ 1689 */
1672 if (xa[XA_XROOTPMAPID] == 0)
1673 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1674
1675 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])
1676 return; 1692 return;
1677 1693
1678 /* FALLTHROUGH */ 1694 /* FALLTHROUGH */
1679 case ReparentNotify: 1695 case ReparentNotify:
1680 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
… …
1752 { 1768 {
1753 case Button1: 1769 case Button1:
1754 /* allow meta + click to select rectangular areas */ 1770 /* allow meta + click to select rectangular areas */
1755 /* should be done in screen.C */ 1771 /* should be done in screen.C */
1756#if ENABLE_FRILLS 1772#if ENABLE_FRILLS
1757 selection.rect = !! (ev.state & ModMetaMask); 1773 selection.rect = !!(ev.state & ModMetaMask);
1758#else 1774#else
1759 selection.rect = false; 1775 selection.rect = false;
1760#endif 1776#endif
1761 1777
1762 /* allow shift+left click to extend selection */ 1778 /* allow shift+left click to extend selection */
… …
2088 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2104 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2089 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2105 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2090 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2106 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2091 int i; 2107 int i;
2092 2108
2093 Visual* visual = display->visual; 2109 Visual *visual = display->visual;
2094 2110
2095 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2111 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2096 2112
2097 /* for convenience */ 2113 /* for convenience */
2098 mask_r = visual->red_mask; 2114 mask_r = visual->red_mask;
… …
2319 Atom atype; 2335 Atom atype;
2320 unsigned char *prop = NULL; 2336 unsigned char *prop = NULL;
2321 Window root, oldp, *list; 2337 Window root, oldp, *list;
2322 Pixmap rootpixmap = None; 2338 Pixmap rootpixmap = None;
2323 XWindowAttributes wattr, wrootattr; 2339 XWindowAttributes wattr, wrootattr;
2340 dDisp;
2324 2341
2325 pchanged = 0; 2342 pchanged = 0;
2326 2343
2327 if (!(options & Opt_transparent)) 2344 if (!(options & Opt_transparent))
2328 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
2329 2346
2330 XGetWindowAttributes (display->display, display->root, &wrootattr); 2347 XGetWindowAttributes (disp, display->root, &wrootattr);
2331 rootdepth = wrootattr.depth; 2348 rootdepth = wrootattr.depth;
2332 2349
2333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2334 2351
2335 if (rootdepth != wattr.depth) 2352 if (rootdepth != wattr.depth)
2336 { 2353 {
2337 if (am_transparent) 2354 if (am_transparent)
2338 { 2355 {
2339 pchanged = 1; 2356 pchanged = 1;
2340 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2341 am_transparent = am_pixmap_trans = 0; 2358 am_transparent = am_pixmap_trans = 0;
2342 } 2359 }
2343 2360
2344 return pchanged; /* Don't try any more */ 2361 return pchanged; /* Don't try any more */
2345 } 2362 }
2346 2363
2347 /* 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. */
2348 XSync (display->display, False); 2365 XSync (disp, False);
2349 2366
2350 /* 2367 /*
2351 * Make the frame window set by the window manager have 2368 * Make the frame window set by the window manager have
2352 * the root background. Some window managers put multiple nested frame 2369 * the root background. Some window managers put multiple nested frame
2353 * 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.
2354 */ 2371 */
2355 i = (xa[XA_XROOTPMAPID] 2372 i = (xa[XA_XROOTPMAP_ID]
2356 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2373 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2357 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2374 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2358 &nitems, &bytes_after, &prop) == Success); 2375 &nitems, &bytes_after, &prop) == Success);
2359 2376
2360 if (!i || prop == NULL) 2377 if (!i || prop == NULL)
2361 i = (xa[XA_XSETROOTID] 2378 i = (xa[XA_ESETROOT_PMAP_ID]
2362 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2379 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2363 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2380 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2364 &nitems, &bytes_after, &prop) == Success); 2381 &nitems, &bytes_after, &prop) == Success);
2365 2382
2366 if (!i || prop == NULL 2383 if (!i || prop == NULL
2367#if TINTING 2384#if TINTING
… …
2386 Window cr; 2403 Window cr;
2387 XImage *image; 2404 XImage *image;
2388 GC gc; 2405 GC gc;
2389 XGCValues gcvalue; 2406 XGCValues gcvalue;
2390 2407
2391 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2392 0, 0, &sx, &sy, &cr); 2409 0, 0, &sx, &sy, &cr);
2393 nw = (unsigned int)szHint.width; 2410 nw = (unsigned int)szHint.width;
2394 nh = (unsigned int)szHint.height; 2411 nh = (unsigned int)szHint.height;
2395 nx = ny = 0; 2412 nx = ny = 0;
2396 2413
… …
2409 } 2426 }
2410 2427
2411 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2412 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2413 2430
2414 XSync (display->display, False); 2431 XSync (disp, False);
2415 allowedxerror = -1; 2432 allowedxerror = -1;
2416 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2417 2434
2418 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2435 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2419 /* XXX: may need a delay here? */ 2436 /* XXX: may need a delay here? */
2420 allowedxerror = 0; 2437 allowedxerror = 0;
2421 2438
… …
2424 if (am_transparent && am_pixmap_trans) 2441 if (am_transparent && am_pixmap_trans)
2425 { 2442 {
2426 pchanged = 1; 2443 pchanged = 1;
2427 if (TermWin.pixmap != None) 2444 if (TermWin.pixmap != None)
2428 { 2445 {
2429 XFreePixmap (display->display, TermWin.pixmap); 2446 XFreePixmap (disp, TermWin.pixmap);
2430 TermWin.pixmap = None; 2447 TermWin.pixmap = None;
2431 } 2448 }
2432 } 2449 }
2433 2450
2434 am_pixmap_trans = 0; 2451 am_pixmap_trans = 0;
2435 } 2452 }
2436 else 2453 else
2437 { 2454 {
2438 if (TermWin.pixmap != None) 2455 if (TermWin.pixmap != None)
2439 XFreePixmap (display->display, TermWin.pixmap); 2456 XFreePixmap (disp, TermWin.pixmap);
2440 2457
2441#if TINTING 2458#if TINTING
2442 if (ISSET_PIXCOLOR (Color_tint)) 2459 if (ISSET_PIXCOLOR (Color_tint))
2443 { 2460 {
2444 unsigned short rm, gm, bm; 2461 unsigned short rm, gm, bm;
… …
2448 2465
2449 ShadeXImage (display, image, shade, rm, gm, bm); 2466 ShadeXImage (display, image, shade, rm, gm, bm);
2450 } 2467 }
2451#endif 2468#endif
2452 2469
2453 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2454 szHint.width, szHint.height, image->depth); 2471 szHint.width, szHint.height, image->depth);
2455 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2456 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2457 nx, ny, image->width, image->height); 2474 nx, ny, image->width, image->height);
2458 XFreeGC (display->display, gc); 2475 XFreeGC (disp, gc);
2459 XDestroyImage (image); 2476 XDestroyImage (image);
2460 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2461 XClearWindow (display->display, TermWin.parent[0]); 2478 XClearWindow (disp, TermWin.parent[0]);
2462 2479
2463 if (!am_transparent || !am_pixmap_trans) 2480 if (!am_transparent || !am_pixmap_trans)
2464 pchanged = 1; 2481 pchanged = 1;
2465 2482
2466 am_transparent = am_pixmap_trans = 1; 2483 am_transparent = am_pixmap_trans = 1;
2467 } 2484 }
2468 } 2485 }
2469 2486
2470 if (am_pixmap_trans) 2487 if (am_pixmap_trans)
2471 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2472 else 2489 else
2473 { 2490 {
2474 unsigned int n; 2491 unsigned int n;
2475 /* 2492 /*
2476 * InheritPixmap transparency 2493 * InheritPixmap transparency
2477 */ 2494 */
2478 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2479 { 2496 {
2480 oldp = TermWin.parent[i]; 2497 oldp = TermWin.parent[i];
2481 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2498 XQueryTree (disp, TermWin.parent[i - 1], &root,
2482 &TermWin.parent[i], &list, &n); 2499 &TermWin.parent[i], &list, &n);
2483 XFree (list); 2500 XFree (list);
2484 2501
2485 if (TermWin.parent[i] == display->root) 2502 if (TermWin.parent[i] == display->root)
2486 { 2503 {
… …
2498 2515
2499 if (pchanged) 2516 if (pchanged)
2500 { 2517 {
2501 for (; n < (unsigned int)i; n++) 2518 for (; n < (unsigned int)i; n++)
2502 { 2519 {
2503 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2504 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2505 { 2522 {
2506 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2507 break; 2524 break;
2508 } 2525 }
2509 } 2526 }
2510 } 2527 }
2511 2528
2512 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2513 { 2530 {
2514 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2515 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2516 am_transparent = 0; 2533 am_transparent = 0;
2517 /* XXX: also turn off Opt_transparent? */ 2534 /* XXX: also turn off Opt_transparent? */
2518 } 2535 }
2519 else 2536 else
2520 { 2537 {
… …
2523 * needed for fvwm2.2.2 (and before?) */ 2540 * needed for fvwm2.2.2 (and before?) */
2524 sleep (1); 2541 sleep (1);
2525#endif 2542#endif
2526 for (n = 0; n < (unsigned int)i; n++) 2543 for (n = 0; n < (unsigned int)i; n++)
2527 { 2544 {
2528 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2529 XClearWindow (display->display, TermWin.parent[n]); 2546 XClearWindow (disp, TermWin.parent[n]);
2530 } 2547 }
2531 2548
2532 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2533 am_transparent = 1; 2550 am_transparent = 1;
2534 } 2551 }
2535 2552
2536 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2537 TermWin.parent[i] = None; 2554 TermWin.parent[i] = None;
2538 } 2555 }
2539 2556
2540 if (scrollBar.win) 2557 if (scrollBar.win)
2541 { 2558 {
2542 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2543 scrollBar.setIdle (); 2560 scrollBar.setIdle ();
2544 scrollbar_show (0); 2561 scrollbar_show (0);
2545 } 2562 }
2546 2563
2547 if (am_transparent) 2564 if (am_transparent)
… …
2585 // some window managers resize the window early, and these programs 2602 // some window managers resize the window early, and these programs
2586 // then sometimes get the size wrong. 2603 // then sometimes get the size wrong.
2587 // unfortunately other programs are even more buggy and dislike 2604 // unfortunately other programs are even more buggy and dislike
2588 // 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
2589 // resized. 2606 // resized.
2590 if (seen_resize) 2607 if (seen_resize && cmd_pid)
2591 kill (-cmd_pid, SIGWINCH); 2608 kill (-cmd_pid, SIGWINCH);
2592 } 2609 }
2593 2610
2594 /* Read a text string from the input buffer */ 2611 /* Read a text string from the input buffer */
2595 unicode_t buf[UBUFSIZ]; 2612 unicode_t buf[UBUFSIZ];
… …
2708 if (len == (size_t)-1) 2725 if (len == (size_t)-1)
2709 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
2710 2727
2711 // assume wchar == unicode 2728 // assume wchar == unicode
2712 cmdbuf_ptr += len; 2729 cmdbuf_ptr += len;
2713 return wc; 2730 return wc & UNICODE_MASK;
2714 } 2731 }
2715 2732
2716 return NOCHAR; 2733 return NOCHAR;
2717} 2734}
2718 2735
… …
3181 { 3198 {
3182 switch (priv) 3199 switch (priv)
3183 { 3200 {
3184 case '>': 3201 case '>':
3185 if (ch == CSI_DA) /* secondary device attributes */ 3202 if (ch == CSI_DA) /* secondary device attributes */
3186 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3203 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3187 break; 3204 break;
3188 case '?': 3205 case '?':
3189 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3206 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3190 process_terminal_mode (ch, priv, nargs, arg); 3207 process_terminal_mode (ch, priv, nargs, arg);
3191 break; 3208 break;
… …
3420rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3437rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3421{ 3438{
3422 int x, y; 3439 int x, y;
3423 XWindowAttributes wattr; 3440 XWindowAttributes wattr;
3424 Window wdummy; 3441 Window wdummy;
3442 dDisp;
3425 3443
3426 if (nargs == 0) 3444 if (nargs == 0)
3427 return; 3445 return;
3428 3446
3429 switch (args[0]) 3447 switch (args[0])
3430 { 3448 {
3431 /* 3449 /*
3432 * commands 3450 * commands
3433 */ 3451 */
3434 case 1: /* deiconify window */ 3452 case 1: /* deiconify window */
3435 XMapWindow (display->display, TermWin.parent[0]); 3453 XMapWindow (disp, TermWin.parent[0]);
3436 break; 3454 break;
3437 case 2: /* iconify window */ 3455 case 2: /* iconify window */
3438 XIconifyWindow (display->display, TermWin.parent[0], 3456 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3439 DefaultScreen (display->display));
3440 break; 3457 break;
3441 case 3: /* set position (pixels) */ 3458 case 3: /* set position (pixels) */
3442 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3443 break; 3460 break;
3444 case 4: /* set size (pixels) */ 3461 case 4: /* set size (pixels) */
3445 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3446 break; 3463 break;
3447 case 5: /* raise window */ 3464 case 5: /* raise window */
3448 XRaiseWindow (display->display, TermWin.parent[0]); 3465 XRaiseWindow (disp, TermWin.parent[0]);
3449 break; 3466 break;
3450 case 6: /* lower window */ 3467 case 6: /* lower window */
3451 XLowerWindow (display->display, TermWin.parent[0]); 3468 XLowerWindow (disp, TermWin.parent[0]);
3452 break; 3469 break;
3453 case 7: /* refresh window */ 3470 case 7: /* refresh window */
3454 scr_touch (true); 3471 scr_touch (true);
3455 break; 3472 break;
3456 case 8: /* set size (chars) */ 3473 case 8: /* set size (chars) */
… …
3468 3485
3469 /* 3486 /*
3470 * reports - some output format copied from XTerm 3487 * reports - some output format copied from XTerm
3471 */ 3488 */
3472 case 11: /* report window state */ 3489 case 11: /* report window state */
3473 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3474 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3475 break; 3492 break;
3476 case 13: /* report window position */ 3493 case 13: /* report window position */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3478 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3479 -wattr.border_width, -wattr.border_width, 3496 -wattr.border_width, -wattr.border_width,
3480 &x, &y, &wdummy); 3497 &x, &y, &wdummy);
3481 tt_printf ("\033[3;%d;%dt", x, y); 3498 tt_printf ("\033[3;%d;%dt", x, y);
3482 break; 3499 break;
3483 case 14: /* report window size (pixels) */ 3500 case 14: /* report window size (pixels) */
3484 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3485 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3486 break; 3503 break;
3487 case 18: /* report text area size (chars) */ 3504 case 18: /* report text area size (chars) */
3488 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3489 break; 3506 break;
… …
3491 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3492 break; 3509 break;
3493 case 20: /* report icon label */ 3510 case 20: /* report icon label */
3494 { 3511 {
3495 char *s; 3512 char *s;
3496 XGetIconName (display->display, TermWin.parent[0], &s); 3513 XGetIconName (disp, TermWin.parent[0], &s);
3497 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 */
3498 XFree (s); 3515 XFree (s);
3499 } 3516 }
3500 break; 3517 break;
3501 case 21: /* report window title */ 3518 case 21: /* report window title */
3502 { 3519 {
3503 char *s; 3520 char *s;
3504 XFetchName (display->display, TermWin.parent[0], &s); 3521 XFetchName (disp, TermWin.parent[0], &s);
3505 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 */
3506 XFree (s); 3523 XFree (s);
3507 } 3524 }
3508 break; 3525 break;
3509 } 3526 }
… …
3651 int changed = 0; 3668 int changed = 0;
3652 int color; 3669 int color;
3653 char *buf, *name; 3670 char *buf, *name;
3654 bool query = str[0] == '?' && !str[1]; 3671 bool query = str[0] == '?' && !str[1];
3655 int saveop = op; 3672 int saveop = op;
3673 dDisp;
3656 3674
3657 assert (str != NULL); 3675 assert (str != NULL);
3658 switch (op) 3676 switch (op)
3659 { 3677 {
3660 case XTerm_name: 3678 case XTerm_name:
… …
3676 unsigned long bytes_after; 3694 unsigned long bytes_after;
3677 unsigned char *value = 0; 3695 unsigned char *value = 0;
3678 const char *str = ""; 3696 const char *str = "";
3679 3697
3680 if (prop 3698 if (prop
3681 && XGetWindowProperty (display->display, TermWin.parent[0], 3699 && XGetWindowProperty (disp, TermWin.parent[0],
3682 prop, 0, 1<<16, 0, AnyPropertyType, 3700 prop, 0, 1<<16, 0, AnyPropertyType,
3683 &actual_type, &actual_format, 3701 &actual_type, &actual_format,
3684 &nitems, &bytes_after, &value) == Success 3702 &nitems, &bytes_after, &value) == Success
3685 && actual_type != None 3703 && actual_type != None
3686 && actual_format == 8) 3704 && actual_format == 8)
… …
3698 { 3716 {
3699 *eq = 0; 3717 *eq = 0;
3700 set_utf8_property (display->atom (str), eq + 1); 3718 set_utf8_property (display->atom (str), eq + 1);
3701 } 3719 }
3702 else 3720 else
3703 XDeleteProperty (display->display, TermWin.parent[0], 3721 XDeleteProperty (disp, TermWin.parent[0],
3704 display->atom (str)); 3722 display->atom (str));
3705 } 3723 }
3706 break; 3724 break;
3707 3725
3708 case XTerm_Color: 3726 case XTerm_Color:
… …
3783 { 3801 {
3784 str++; 3802 str++;
3785#if XPM_BACKGROUND 3803#if XPM_BACKGROUND
3786 changed += scale_pixmap (str); 3804 changed += scale_pixmap (str);
3787#endif 3805#endif
3788
3789 } 3806 }
3807
3790 if (changed) 3808 if (changed)
3791 { 3809 {
3792#ifdef XPM_BACKGROUND 3810#ifdef XPM_BACKGROUND
3793 resize_pixmap (); 3811 resize_pixmap ();
3794#endif 3812#endif
… …
3835 if (query) 3853 if (query)
3836 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);
3837 else 3855 else
3838 { 3856 {
3839 set_locale (str); 3857 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8);
3840# ifdef USE_XIM 3859# ifdef USE_XIM
3841 im_cb (); 3860 im_cb ();
3842# endif 3861# endif
3843 } 3862 }
3844 break; 3863 break;
… …
4282 4301
4283/* ---------------------------------------------------------------------- */ 4302/* ---------------------------------------------------------------------- */
4284/* 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,
4285 * or generated by us in response to a query ESC sequence. 4304 * or generated by us in response to a query ESC sequence.
4286 */ 4305 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307
4287void 4308void
4288rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4309rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4289{ 4310{
4290 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));
4291 4314
4292 if (len) 4315 if ((unsigned int)written == len)
4316 return;
4317
4318 data += written;
4319 len -= written;
4293 { 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
4294 if (v_buflen == 0) 4338 if (v_buflen == 0)
4295 { 4339 {
4296 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4297
4298 if ((unsigned int)written == len)
4299 return;
4300
4301 data += written;
4302 len -= written;
4303 }
4304
4305
4306 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4307
4308 memcpy (v_buffer + v_buflen, data, len);
4309 v_buflen += len;
4310 }
4311
4312 for (;;)
4313 {
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315
4316 if (written > 0)
4317 {
4318 v_buflen -= written;
4319
4320 if (v_buflen == 0)
4321 {
4322 free (v_buffer); 4340 free (v_buffer);
4323 v_buffer = 0; 4341 v_buffer = 0;
4324 v_buflen = 0; 4342 v_buflen = 0;
4325 4343
4326 pty_ev.set (EVENT_READ); 4344 pty_ev.set (EVENT_READ);
4327 return;
4328 }
4329
4330 memmove (v_buffer, v_buffer + written, v_buflen);
4331 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this...
4334 destroy ();
4335 else
4336 {
4337 pty_ev.set (EVENT_READ | EVENT_WRITE);
4338 return; 4345 return;
4339 } 4346 }
4347
4348 memmove (v_buffer, v_buffer + written, v_buflen);
4340 } 4349 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this...
4352 destroy ();
4341} 4353}
4342 4354
4343/*----------------------- end-of-file (C source) -----------------------*/ 4355/*----------------------- end-of-file (C source) -----------------------*/
4344 4356

Diff Legend

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