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.214 by root, Thu Dec 22 21:56:19 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)
125{ 136{
126 x = Pixel2Col (x); 137 x = Pixel2Col (x);
127 y = Pixel2Row (y); 138 y = Pixel2Row (y);
128 139
129 if (x < 0 || x >= TermWin.ncol 140 if (!IN_RANGE_EXC (x, 0, ncol)
130 || y < 0 || y >= TermWin.nrow) 141 || !IN_RANGE_EXC (y, 0, nrow))
131 return; 142 return;
132 143
133 for (;;) 144 for (;;)
134 { 145 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 146 const line_t &l = ROW(y - view_start);
147
148 text_t t = l.t[x];
136 149
137 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
138 { 151 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 152 iso14755_51 (l.t[x], l.r[x]);
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54; 153 iso14755buf = ISO_14755_54;
142 break; 154 break;
143 } 155 }
144 156
145 x--; 157 x--;
146 } 158 }
147
148} 159}
149#endif 160#endif
150 161
151#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
152void 163void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{ 165{
155 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
159 172
160#if ENABLE_COMBINING 173#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
162 { 175 {
163 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
… …
172 alloc = 0; 185 alloc = 0;
173 chr = &ch2; 186 chr = &ch2;
174 len = 1; 187 len = 1;
175 } 188 }
176 189
177 int width = strlen (f->name); 190 int width = wcswidth (fname, wcslen (fname));
178 191
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180 193
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 195
… …
195#endif 208#endif
196 scr_overlay_set (11, y, ch, r); 209 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r); 210 scr_overlay_set (12, y, NOCHAR, r);
198 } 211 }
199 212
200 scr_overlay_set (0, len, f->name); 213 scr_overlay_set (0, len, fname);
214
215 free (fname);
201 216
202#if ENABLE_COMBINING 217#if ENABLE_COMBINING
203 if (alloc) 218 if (alloc)
204 delete [] alloc; 219 delete [] alloc;
205#endif 220#endif
… …
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 289 * escape sequence to toggle the Keypad.
275 * 290 *
276 * Always permit `shift' to override the current setting 291 * Always permit `shift' to override the current setting
277 */ 292 */
278 shft = (ev.state & ShiftMask); 293 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 294 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 295 meta = ev.state & ModMetaMask;
281 296
282 if (numlock_state || (ev.state & ModNumLockMask)) 297 if (numlock_state || (ev.state & ModNumLockMask))
283 { 298 {
284 numlock_state = (ev.state & ModNumLockMask); 299 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 300 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
305 320
306 // the XOpenIM manpage lies about hardcoding the locale 321 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 322 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 323 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 324 SET_LOCALE (rs[Rs_imLocale]);
325
310 // assume wchar_t == unicode or better 326 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 327 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 328 KBUFSZ, &keysym, &status_return);
329
313 if (rs[Rs_imLocale]) 330 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 331 SET_LOCALE (locale);
315 332
316 if (status_return == XLookupChars 333 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 334 || status_return == XLookupBoth)
… …
344 valid_keysym = keysym != NoSymbol; 361 valid_keysym = keysym != NoSymbol;
345 } 362 }
346 363
347 if (valid_keysym) 364 if (valid_keysym)
348 { 365 {
366#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state))
368 return;
369#endif
370
349 if (TermWin.saveLines) 371 if (saveLines)
350 { 372 {
351#ifdef UNSHIFTED_SCROLLKEYS 373#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 374 if (!ctrl && !meta)
353#else 375#else
354 if (IS_SCROLL_MOD) 376 if (IS_SCROLL_MOD)
355#endif 377#endif
356 { 378 {
357 int lnsppg; 379 int lnsppg;
358 380
359#ifdef PAGING_CONTEXT_LINES 381#ifdef PAGING_CONTEXT_LINES
360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 382 lnsppg = nrow - PAGING_CONTEXT_LINES;
361#else 383#else
362 lnsppg = TermWin.nrow * 4 / 5; 384 lnsppg = nrow * 4 / 5;
363#endif 385#endif
364 if (keysym == XK_Prior) 386 if (keysym == XK_Prior)
365 { 387 {
366 scr_page (UP, lnsppg); 388 scr_page (UP, lnsppg);
367 return; 389 return;
… …
487 } 509 }
488#endif 510#endif
489 511
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 512 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 513 {
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 { 514 {
518 newlen = 1; 515 newlen = 1;
519 switch (keysym) 516 switch (keysym)
520 { 517 {
521#ifndef NO_BACKSPACE_KEY 518#ifndef NO_BACKSPACE_KEY
… …
529 else 526 else
530 strcpy (kbuf, key_backspace); 527 strcpy (kbuf, key_backspace);
531 break; 528 break;
532#endif 529#endif
533#ifndef NO_DELETE_KEY 530#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
534 case XK_Delete: 541 case XK_Delete:
535 strcpy (kbuf, key_delete); 542 strcpy (kbuf, key_delete);
536 break; 543 break;
537#endif 544#endif
538 case XK_Tab: 545 case XK_Tab:
… …
641#ifdef XK_KP_Begin 648#ifdef XK_KP_Begin
642 case XK_KP_Begin: 649 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 650 strcpy (kbuf, "\033Ou");
644 break; 651 break;
645 652
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 653#endif
654 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
… …
689 break; 689 break;
690 690
691 case XK_Find: 691 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
693 break; 693 break;
694
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
694 case XK_Insert: 705 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 706 strcpy (kbuf, "\033[2~");
696 break; 707 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 708#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 709 case DXK_Remove:
… …
788#undef FKEY 799#undef FKEY
789 default: 800 default:
790 newlen = 0; 801 newlen = 0;
791 break; 802 break;
792 } 803 }
804
793 if (newlen) 805 if (newlen)
794 len = strlen (kbuf); 806 len = strlen (kbuf);
795 } 807 }
796 808
797 /* 809 /*
… …
806 else if (ctrl && keysym == XK_minus) 818 else if (ctrl && keysym == XK_minus)
807 { 819 {
808 len = 1; 820 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 821 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810 } 822 }
823 else if (keysym == XK_ISO_Left_Tab)
824 {
825 strcpy (kbuf, "\033[Z");
826 len = 3;
827 }
811 else 828 else
812 { 829 {
813#ifdef META8_OPTION 830#ifdef META8_OPTION
814 /* set 8-bit on */ 831 /* set 8-bit on */
815 if (meta && (meta_char == 0x80)) 832 if (meta && (meta_char == 0x80))
… …
828 845
829 if (len <= 0) 846 if (len <= 0)
830 return; /* not mapped */ 847 return; /* not mapped */
831 848
832 if (options & Opt_scrollTtyKeypress) 849 if (options & Opt_scrollTtyKeypress)
833 if (TermWin.view_start) 850 if (view_start)
834 { 851 {
835 TermWin.view_start = 0; 852 view_start = 0;
836 want_refresh = 1; 853 want_refresh = 1;
837 } 854 }
838 855
839 /* 856 /*
840 * these modifications only affect the static keybuffer 857 * these modifications only affect the static keybuffer
… …
873#endif /* DEBUG_CMD */ 890#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 891 tt_write (kbuf, (unsigned int)len);
875} 892}
876/*}}} */ 893/*}}} */
877 894
878#if (MENUBAR_MAX) 895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */ 897/* attempt to `write' count to the input buffer */
881unsigned int 898unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 899rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883{ 900{
… …
906 923
907 cmd_parse (); 924 cmd_parse ();
908 925
909 return 0; 926 return 0;
910} 927}
911#endif /* MENUBAR_MAX */ 928#endif
912 929
913void 930void
914rxvt_term::flush () 931rxvt_term::flush ()
915{ 932{
916 flush_ev.stop (); 933 flush_ev.stop ();
… …
1017{ 1034{
1018 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1038 {
1039 if (view_start == nsaved ||
1040 view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
1022 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1044 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1046 }
1026} 1047}
… …
1046 if (n > 0) 1067 if (n > 0)
1047 { 1068 {
1048 cmdbuf_endp += n; 1069 cmdbuf_endp += n;
1049 return true; 1070 return true;
1050 } 1071 }
1051 else if (n < 0 && errno != EAGAIN) 1072 else if (n < 0 && errno != EAGAIN && errno != EINTR)
1052 destroy (); 1073 pty_ev.stop ();
1053 1074
1054 return false; 1075 return false;
1055} 1076}
1056 1077
1057void 1078void
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1079rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1080{
1060 SET_R (this); 1081 SET_R (this);
1061 SET_LOCALE (locale); 1082 SET_LOCALE (locale);
1062 1083
1063 if (revents & EVENT_WRITE)
1064 tt_write (0, 0);
1065 else if (revents & EVENT_READ) 1084 if (revents & EVENT_READ)
1066 // loop, but don't allow a single term to monopolize us 1085 // loop, but don't allow a single term to monopolize us
1067 while (pty_fill ()) 1086 while (pty_fill ())
1068 if (cmd_parse ()) 1087 if (cmd_parse ())
1069 break; 1088 break;
1089
1090 if (revents & EVENT_WRITE)
1091 pty_write ();
1070} 1092}
1071 1093
1072void 1094void
1073rxvt_term::pointer_unblank () 1095rxvt_term::pointer_unblank ()
1074{ 1096{
1075 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1097 XDefineCursor (display->display, vt, TermWin_cursor);
1076 recolour_cursor (); 1098 recolour_cursor ();
1077 1099
1078#ifdef POINTER_BLANK 1100#ifdef POINTER_BLANK
1079 hidden_pointer = 0; 1101 hidden_pointer = 0;
1080 1102
… …
1088rxvt_term::pointer_blank () 1110rxvt_term::pointer_blank ()
1089{ 1111{
1090 if (! (options & Opt_pointerBlank)) 1112 if (! (options & Opt_pointerBlank))
1091 return; 1113 return;
1092 1114
1093 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1115 XDefineCursor (display->display, vt, display->blank_cursor);
1094 XFlush (display->display); 1116 XFlush (display->display);
1095 1117
1096 hidden_pointer = 1; 1118 hidden_pointer = 1;
1097} 1119}
1098 1120
… …
1187 1209
1188/*{{{ process an X event */ 1210/*{{{ process an X event */
1189void 1211void
1190rxvt_term::x_cb (XEvent &ev) 1212rxvt_term::x_cb (XEvent &ev)
1191{ 1213{
1214 dDisp;
1215
1192 SET_R (this); 1216 SET_R (this);
1193 SET_LOCALE (locale); 1217 SET_LOCALE (locale);
1194 1218
1195#if defined(CURSOR_BLINK) 1219#if defined(CURSOR_BLINK)
1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1312 button_release (ev.xbutton); 1336 button_release (ev.xbutton);
1313 break; 1337 break;
1314 1338
1315 case ClientMessage: 1339 case ClientMessage:
1316 if (ev.xclient.format == 32 1340 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1342 {
1317 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1318 destroy (); 1344 destroy ();
1345#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev);
1350#endif
1351 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1319#ifdef OFFIX_DND 1361#ifdef OFFIX_DND
1320 /* OffiX Dnd (drag 'n' drop) protocol */ 1362 /* OffiX Dnd (drag 'n' drop) protocol */
1321 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1322 && (ev.xclient.data.l[0] == DndFile 1364 && (ev.xclient.data.l[0] == DndFile
1323 || ev.xclient.data.l[0] == DndDir 1365 || ev.xclient.data.l[0] == DndDir
1324 || ev.xclient.data.l[0] == DndLink)) 1366 || ev.xclient.data.l[0] == DndLink))
1325 { 1367 {
1326 /* Get Dnd data */ 1368 /* Get Dnd data */
1327 Atom ActualType; 1369 Atom ActualType;
1328 int ActualFormat; 1370 int ActualFormat;
1329 unsigned char *data; 1371 unsigned char *data;
1330 unsigned long Size, RemainingBytes; 1372 unsigned long Size, RemainingBytes;
1331 1373
1332 XGetWindowProperty (display->display, display->root, 1374 XGetWindowProperty (disp, display->root,
1333 xa[XA_DNDSELECTION], 1375 xa[XA_DNDSELECTION],
1334 0L, 1000000L, 1376 0L, 1000000L,
1335 False, AnyPropertyType, 1377 False, AnyPropertyType,
1336 &ActualType, &ActualFormat, 1378 &ActualType, &ActualFormat,
1337 &Size, &RemainingBytes, 1379 &Size, &RemainingBytes,
1338 &data); 1380 &data);
1339 set_string_property (XA_CUT_BUFFER0, data); 1381 set_string_property (XA_CUT_BUFFER0, data);
1340 XFree (data); 1382 XFree (data);
1341 selection_paste (display->root, XA_CUT_BUFFER0, true); 1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1343 } 1385 }
1344#endif /* OFFIX_DND */ 1386#endif /* OFFIX_DND */
1345 break; 1387 break;
1346 1388
1347 case MappingNotify: 1389 case MappingNotify:
… …
1372 break; 1414 break;
1373 } 1415 }
1374 break; 1416 break;
1375 1417
1376 case FocusIn: 1418 case FocusIn:
1377 if (!TermWin.focus) 1419 focus_in ();
1420 break;
1421
1422 case FocusOut:
1423 focus_out ();
1424 break;
1425
1426 case ConfigureNotify:
1427 if (ev.xconfigure.window == parent[0])
1378 { 1428 {
1379 TermWin.focus = 1;
1380 want_refresh = 1;
1381#ifdef USE_XIM
1382 if (Input_Context != NULL)
1383 {
1384 IMSetStatusPosition ();
1385 XSetICFocus (Input_Context);
1386 }
1387#endif
1388#ifdef CURSOR_BLINK
1389 if (options & Opt_cursorBlink)
1390 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1391#endif
1392#ifdef OFF_FOCUS_FADING
1393 if (rs[Rs_fade])
1394 {
1395 pix_colors = pix_colors_focused;
1396 scr_recolour ();
1397 }
1398#endif
1399
1400 }
1401 break;
1402
1403 case FocusOut:
1404 if (TermWin.focus)
1405 {
1406 TermWin.focus = 0;
1407 want_refresh = 1;
1408
1409#if ENABLE_FRILLS || ISO_14755
1410 iso14755buf = 0;
1411#endif
1412#if ENABLE_OVERLAY
1413 scr_overlay_off ();
1414#endif
1415#ifdef USE_XIM
1416 if (Input_Context != NULL)
1417 XUnsetICFocus (Input_Context);
1418#endif
1419#ifdef CURSOR_BLINK
1420 if (options & Opt_cursorBlink)
1421 cursor_blink_ev.stop ();
1422 hidden_cursor = 0;
1423#endif
1424#ifdef OFF_FOCUS_FADING
1425 if (rs[Rs_fade])
1426 {
1427 pix_colors = pix_colors_unfocused;
1428 scr_recolour ();
1429 }
1430#endif
1431 }
1432 break;
1433
1434 case ConfigureNotify:
1435 if (ev.xconfigure.window == TermWin.parent[0])
1436 {
1437 int height, width;
1438
1439 do
1440 { /* Wrap lots of configures into one */
1441 width = ev.xconfigure.width;
1442 height = ev.xconfigure.height;
1443 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1444 }
1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1430 ;
1446 1431
1447 if (szHint.width != width || szHint.height != height) 1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1448 { 1433 {
1449 seen_resize = 1; 1434 seen_resize = 1;
1450 resize_all_windows (width, height, 1); 1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1451 } 1436 }
1452 1437
1453#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1454 if (options & Opt_transparent) 1439 if (options & Opt_transparent)
1455 check_our_parents (); 1440 check_our_parents ();
… …
1476 case SelectionRequest: 1461 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1462 selection_send (ev.xselectionrequest);
1478 break; 1463 break;
1479 1464
1480 case UnmapNotify: 1465 case UnmapNotify:
1481 TermWin.mapped = 0; 1466 mapped = 0;
1482#ifdef TEXT_BLINK 1467#ifdef TEXT_BLINK
1483 text_blink_ev.stop (); 1468 text_blink_ev.stop ();
1484#endif 1469#endif
1485 break; 1470 break;
1486 1471
1487 case MapNotify: 1472 case MapNotify:
1488 TermWin.mapped = 1; 1473 mapped = 1;
1489#ifdef TEXT_BLINK 1474#ifdef TEXT_BLINK
1490 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1491#endif 1476#endif
1492 break; 1477 break;
1493 1478
… …
1497 break; 1482 break;
1498#endif /* TRANSPARENT */ 1483#endif /* TRANSPARENT */
1499 1484
1500 case GraphicsExpose: 1485 case GraphicsExpose:
1501 case Expose: 1486 case Expose:
1502 if (ev.xany.window == TermWin.vt) 1487 if (ev.xany.window == vt)
1503 { 1488 {
1504 do 1489 do
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1490 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1491 ev.xexpose.width, ev.xexpose.height, False);
1507 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1508 1493
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1495
1511 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1497 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1498 ev.xexpose.width, ev.xexpose.height, False);
1514 1499
1515 scr_refresh (refresh_type); 1500 scr_refresh (refresh_type);
1516 } 1501 }
1517 else 1502 else
1518 { 1503 {
1519 XEvent unused_event; 1504 XEvent unused_event;
1520 1505
1521 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1506 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1522 ; 1507 ;
1523 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1508 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1509 ;
1525 1510
1526 if (isScrollbarWindow (ev.xany.window)) 1511 if (isScrollbarWindow (ev.xany.window))
1527 { 1512 {
1528 scrollBar.setIdle (); 1513 scrollBar.setIdle ();
… …
1532 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1533 menubar_expose (); 1518 menubar_expose ();
1534#endif 1519#endif
1535 1520
1536#ifdef TRANSPARENT 1521#ifdef TRANSPARENT
1537 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1522 if (am_transparent && ev.xany.window == parent[0])
1538 XClearWindow (display->display, ev.xany.window); 1523 XClearWindow (disp, ev.xany.window);
1539#endif 1524#endif
1540 } 1525 }
1541 break; 1526 break;
1542 1527
1543 case MotionNotify: 1528 case MotionNotify:
… …
1553 } 1538 }
1554#endif 1539#endif
1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1556 break; 1541 break;
1557 1542
1558 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1559 { 1544 {
1560 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1545 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1561 { 1546 {
1562 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1563 ; 1548 ;
1564 1549
1565 XQueryPointer (display->display, TermWin.vt, 1550 XQueryPointer (disp, vt,
1566 &unused_root, &unused_child, 1551 &unused_root, &unused_child,
1567 &unused_root_x, &unused_root_y, 1552 &unused_root_x, &unused_root_y,
1568 &ev.xbutton.x, &ev.xbutton.y, 1553 &ev.xbutton.x, &ev.xbutton.y,
1569 &ev.xbutton.state); 1554 &ev.xbutton.state);
1570#ifdef MOUSE_THRESHOLD 1555#ifdef MOUSE_THRESHOLD
… …
1582#endif 1567#endif
1583 selection_extend (ev.xbutton.x, ev.xbutton.y, 1568 selection_extend (ev.xbutton.x, ev.xbutton.y,
1584 ev.xbutton.state & Button3Mask ? 2 : 0); 1569 ev.xbutton.state & Button3Mask ? 2 : 0);
1585 1570
1586#ifdef SELECTION_SCROLLING 1571#ifdef SELECTION_SCROLLING
1587 if (ev.xbutton.y < TermWin.int_bwidth 1572 if (ev.xbutton.y < int_bwidth
1588 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1573 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1589 { 1574 {
1590 int dist; 1575 int dist;
1591 1576
1592 /* don't clobber the current delay if we are 1577 /* don't clobber the current delay if we are
1593 * already in the middle of scrolling. 1578 * already in the middle of scrolling.
… …
1601 selection_save_x = ev.xbutton.x; 1586 selection_save_x = ev.xbutton.x;
1602 selection_save_y = ev.xbutton.y; 1587 selection_save_y = ev.xbutton.y;
1603 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1588 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1604 1589
1605 /* calc number of lines to scroll */ 1590 /* calc number of lines to scroll */
1606 if (ev.xbutton.y < TermWin.int_bwidth) 1591 if (ev.xbutton.y < int_bwidth)
1607 { 1592 {
1608 scroll_selection_dir = UP; 1593 scroll_selection_dir = UP;
1609 dist = TermWin.int_bwidth - ev.xbutton.y; 1594 dist = int_bwidth - ev.xbutton.y;
1610 } 1595 }
1611 else 1596 else
1612 { 1597 {
1613 scroll_selection_dir = DN; 1598 scroll_selection_dir = DN;
1614 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1599 dist = ev.xbutton.y - (int_bwidth + height);
1615 } 1600 }
1616 1601
1617 scroll_selection_lines = Pixel2Height (dist) 1602 scroll_selection_lines = Pixel2Height (dist)
1618 / SELECTION_SCROLL_LINE_SPEEDUP 1603 / SELECTION_SCROLL_LINE_SPEEDUP
1619 + 1; 1604 + 1;
1620 MIN_IT (scroll_selection_lines, 1605 min_it (scroll_selection_lines,
1621 SELECTION_SCROLL_MAX_LINES); 1606 SELECTION_SCROLL_MAX_LINES);
1622 } 1607 }
1623 else 1608 else
1624 { 1609 {
1625 /* we are within the text window, so we 1610 /* we are within the text window, so we
… …
1634#endif 1619#endif
1635 } 1620 }
1636 } 1621 }
1637 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1638 { 1623 {
1639 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1624 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1640 MotionNotify, &ev)) 1625 MotionNotify, &ev))
1641 ; 1626 ;
1642 1627
1643 XQueryPointer (display->display, scrollBar.win, 1628 XQueryPointer (disp, scrollBar.win,
1644 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1645 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1646 &ev.xbutton.x, &ev.xbutton.y, 1631 &ev.xbutton.x, &ev.xbutton.y,
1647 &unused_mask); 1632 &unused_mask);
1648 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1653 } 1638 }
1654 break; 1639 break;
1655 } 1640 }
1656} 1641}
1657 1642
1643void
1644rxvt_term::focus_in ()
1645{
1646 if (!focus)
1647 {
1648 focus = 1;
1649 want_refresh = 1;
1650#if USE_XIM
1651 if (Input_Context != NULL)
1652 {
1653 IMSetStatusPosition ();
1654 XSetICFocus (Input_Context);
1655 }
1656#endif
1657#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink)
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1660#endif
1661#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade])
1663 {
1664 pix_colors = pix_colors_focused;
1665 scr_recolour ();
1666 }
1667#endif
1668 }
1669}
1670
1671void
1672rxvt_term::focus_out ()
1673{
1674 if (focus)
1675 {
1676 focus = 0;
1677 want_refresh = 1;
1678
1679#if ENABLE_FRILLS || ISO_14755
1680 iso14755buf = 0;
1681#endif
1682#if ENABLE_OVERLAY
1683 scr_overlay_off ();
1684#endif
1685#if USE_XIM
1686 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context);
1688#endif
1689#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink)
1691 cursor_blink_ev.stop ();
1692 hidden_cursor = 0;
1693#endif
1694#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade])
1696 {
1697 pix_colors = pix_colors_unfocused;
1698 scr_recolour ();
1699 }
1700#endif
1701 }
1702}
1703
1658#if TRANSPARENT 1704#if TRANSPARENT
1659void 1705void
1660rxvt_term::rootwin_cb (XEvent &ev) 1706rxvt_term::rootwin_cb (XEvent &ev)
1661{ 1707{
1662 SET_R (this); 1708 SET_R (this);
… …
1667 case PropertyNotify: 1713 case PropertyNotify:
1668 /* 1714 /*
1669 * if user used some Esetroot compatible prog to set the root bg, 1715 * 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. 1716 * use the property to determine the pixmap. We use it later on.
1671 */ 1717 */
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]) 1718 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1676 return; 1720 return;
1677 1721
1678 /* FALLTHROUGH */ 1722 /* FALLTHROUGH */
1679 case ReparentNotify: 1723 case ReparentNotify:
1680 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
… …
1694 reportmode = !! (priv_modes & PrivMode_mouse_report); 1738 reportmode = !! (priv_modes & PrivMode_mouse_report);
1695 1739
1696 /* 1740 /*
1697 * VT window processing of button press 1741 * VT window processing of button press
1698 */ 1742 */
1699 if (ev.window == TermWin.vt) 1743 if (ev.window == vt)
1700 { 1744 {
1701#if ISO_14755 1745#if ISO_14755
1702 // 5.4 1746 // 5.4
1703 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1704 { 1748 {
… …
1752 { 1796 {
1753 case Button1: 1797 case Button1:
1754 /* allow meta + click to select rectangular areas */ 1798 /* allow meta + click to select rectangular areas */
1755 /* should be done in screen.C */ 1799 /* should be done in screen.C */
1756#if ENABLE_FRILLS 1800#if ENABLE_FRILLS
1757 selection.rect = !! (ev.state & ModMetaMask); 1801 selection.rect = !!(ev.state & ModMetaMask);
1758#else 1802#else
1759 selection.rect = false; 1803 selection.rect = false;
1760#endif 1804#endif
1761 1805
1762 /* allow shift+left click to extend selection */ 1806 /* allow shift+left click to extend selection */
… …
1909 case Button3: 1953 case Button3:
1910 if (scrollBar.style != R_SB_XTERM) 1954 if (scrollBar.style != R_SB_XTERM)
1911 { 1955 {
1912 if (scrollbar_above_slider (ev.y)) 1956 if (scrollbar_above_slider (ev.y))
1913# ifdef RXVT_SCROLL_FULL 1957# ifdef RXVT_SCROLL_FULL
1914 scr_page (UP, TermWin.nrow - 1); 1958 scr_page (UP, nrow - 1);
1915# else 1959# else
1916 scr_page (UP, TermWin.nrow / 4); 1960 scr_page (UP, nrow / 4);
1917# endif 1961# endif
1918 else if (scrollbar_below_slider (ev.y)) 1962 else if (scrollbar_below_slider (ev.y))
1919# ifdef RXVT_SCROLL_FULL 1963# ifdef RXVT_SCROLL_FULL
1920 scr_page (DN, TermWin.nrow - 1); 1964 scr_page (DN, nrow - 1);
1921# else 1965# else
1922 scr_page (DN, TermWin.nrow / 4); 1966 scr_page (DN, nrow / 4);
1923# endif 1967# endif
1924 else 1968 else
1925 scrollBar.setMotion (); 1969 scrollBar.setMotion ();
1926 } 1970 }
1927 else 1971 else
1928 { 1972 {
1929 scr_page ((ev.button == Button1 ? DN : UP), 1973 scr_page ((ev.button == Button1 ? DN : UP),
1930 (TermWin.nrow 1974 (nrow
1931 * scrollbar_position (ev.y) 1975 * scrollbar_position (ev.y)
1932 / scrollbar_size ())); 1976 / scrollbar_size ()));
1933 } 1977 }
1934 1978
1935 break; 1979 break;
… …
1967#ifdef SELECTION_SCROLLING 2011#ifdef SELECTION_SCROLLING
1968 if (sel_scroll_ev.active) 2012 if (sel_scroll_ev.active)
1969 sel_scroll_ev.stop(); 2013 sel_scroll_ev.stop();
1970#endif 2014#endif
1971 2015
1972 if (ev.window == TermWin.vt) 2016 if (ev.window == vt)
1973 { 2017 {
1974#if ISO_14755 2018#if ISO_14755
1975 // 5.4 2019 // 5.4
1976 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1977 return; 2021 return;
… …
2028 v = ev.button == Button4 ? UP : DN; 2072 v = ev.button == Button4 ? UP : DN;
2029 2073
2030 if (ev.state & ShiftMask) 2074 if (ev.state & ShiftMask)
2031 i = 1; 2075 i = 1;
2032 else if (options & Opt_mouseWheelScrollPage) 2076 else if (options & Opt_mouseWheelScrollPage)
2033 i = TermWin.nrow - 1; 2077 i = nrow - 1;
2034 else 2078 else
2035 i = 5; 2079 i = 5;
2036 2080
2037# ifdef MOUSE_SLIP_WHEELING 2081# ifdef MOUSE_SLIP_WHEELING
2038 if (ev.state & ControlMask) 2082 if (ev.state & ControlMask)
2039 { 2083 {
2040 mouse_slip_wheel_speed += v ? -1 : 1; 2084 mouse_slip_wheel_speed += v ? -1 : 1;
2041 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2085 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2042 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2086 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2043 2087
2044 if (slip_wheel_ev.at < NOW) 2088 if (slip_wheel_ev.at < NOW)
2045 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2089 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2046 2090
2047 slip_wheel_ev.start (); 2091 slip_wheel_ev.start ();
… …
2088 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2132 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2089 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2133 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2090 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2134 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2091 int i; 2135 int i;
2092 2136
2093 Visual* visual = display->visual; 2137 Visual *visual = display->visual;
2094 2138
2095 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2139 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2096 2140
2097 /* for convenience */ 2141 /* for convenience */
2098 mask_r = visual->red_mask; 2142 mask_r = visual->red_mask;
… …
2319 Atom atype; 2363 Atom atype;
2320 unsigned char *prop = NULL; 2364 unsigned char *prop = NULL;
2321 Window root, oldp, *list; 2365 Window root, oldp, *list;
2322 Pixmap rootpixmap = None; 2366 Pixmap rootpixmap = None;
2323 XWindowAttributes wattr, wrootattr; 2367 XWindowAttributes wattr, wrootattr;
2368 dDisp;
2324 2369
2325 pchanged = 0; 2370 pchanged = 0;
2326 2371
2327 if (!(options & Opt_transparent)) 2372 if (!(options & Opt_transparent))
2328 return pchanged; /* Don't try any more */ 2373 return pchanged; /* Don't try any more */
2329 2374
2330 XGetWindowAttributes (display->display, display->root, &wrootattr); 2375 XGetWindowAttributes (disp, display->root, &wrootattr);
2331 rootdepth = wrootattr.depth; 2376 rootdepth = wrootattr.depth;
2332 2377
2333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2378 XGetWindowAttributes (disp, parent[0], &wattr);
2334 2379
2335 if (rootdepth != wattr.depth) 2380 if (rootdepth != wattr.depth)
2336 { 2381 {
2337 if (am_transparent) 2382 if (am_transparent)
2338 { 2383 {
2339 pchanged = 1; 2384 pchanged = 1;
2340 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2341 am_transparent = am_pixmap_trans = 0; 2386 am_transparent = am_pixmap_trans = 0;
2342 } 2387 }
2343 2388
2344 return pchanged; /* Don't try any more */ 2389 return pchanged; /* Don't try any more */
2345 } 2390 }
2346 2391
2347 /* Get all X ops out of the queue so that our information is up-to-date. */ 2392 /* Get all X ops out of the queue so that our information is up-to-date. */
2348 XSync (display->display, False); 2393 XSync (disp, False);
2349 2394
2350 /* 2395 /*
2351 * Make the frame window set by the window manager have 2396 * Make the frame window set by the window manager have
2352 * the root background. Some window managers put multiple nested frame 2397 * the root background. Some window managers put multiple nested frame
2353 * windows for each client, so we have to take care about that. 2398 * windows for each client, so we have to take care about that.
2354 */ 2399 */
2355 i = (xa[XA_XROOTPMAPID] 2400 i = (xa[XA_XROOTPMAP_ID]
2356 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2401 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2357 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2358 &nitems, &bytes_after, &prop) == Success); 2403 &nitems, &bytes_after, &prop) == Success);
2359 2404
2360 if (!i || prop == NULL) 2405 if (!i || prop == NULL)
2361 i = (xa[XA_XSETROOTID] 2406 i = (xa[XA_ESETROOT_PMAP_ID]
2362 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2407 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2363 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2408 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2364 &nitems, &bytes_after, &prop) == Success); 2409 &nitems, &bytes_after, &prop) == Success);
2365 2410
2366 if (!i || prop == NULL 2411 if (!i || prop == NULL
2367#if TINTING 2412#if TINTING
… …
2386 Window cr; 2431 Window cr;
2387 XImage *image; 2432 XImage *image;
2388 GC gc; 2433 GC gc;
2389 XGCValues gcvalue; 2434 XGCValues gcvalue;
2390 2435
2391 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2436 XTranslateCoordinates (disp, parent[0], display->root,
2392 0, 0, &sx, &sy, &cr); 2437 0, 0, &sx, &sy, &cr);
2393 nw = (unsigned int)szHint.width; 2438 nw = (unsigned int)szHint.width;
2394 nh = (unsigned int)szHint.height; 2439 nh = (unsigned int)szHint.height;
2395 nx = ny = 0; 2440 nx = ny = 0;
2396 2441
… …
2406 nh += sy; 2451 nh += sy;
2407 ny = -sy; 2452 ny = -sy;
2408 sy = 0; 2453 sy = 0;
2409 } 2454 }
2410 2455
2411 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2456 min_it (nw, (unsigned int) (wrootattr.width - sx));
2412 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2457 min_it (nh, (unsigned int) (wrootattr.height - sy));
2413 2458
2414 XSync (display->display, False); 2459 XSync (disp, False);
2415 allowedxerror = -1; 2460 allowedxerror = -1;
2416 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2417 2462
2418 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2463 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2419 /* XXX: may need a delay here? */ 2464 /* XXX: may need a delay here? */
2420 allowedxerror = 0; 2465 allowedxerror = 0;
2421 2466
2422 if (image == NULL) 2467 if (image == NULL)
2423 { 2468 {
2424 if (am_transparent && am_pixmap_trans) 2469 if (am_transparent && am_pixmap_trans)
2425 { 2470 {
2426 pchanged = 1; 2471 pchanged = 1;
2427 if (TermWin.pixmap != None) 2472 if (pixmap != None)
2428 { 2473 {
2429 XFreePixmap (display->display, TermWin.pixmap); 2474 XFreePixmap (disp, pixmap);
2430 TermWin.pixmap = None; 2475 pixmap = None;
2431 } 2476 }
2432 } 2477 }
2433 2478
2434 am_pixmap_trans = 0; 2479 am_pixmap_trans = 0;
2435 } 2480 }
2436 else 2481 else
2437 { 2482 {
2438 if (TermWin.pixmap != None) 2483 if (pixmap != None)
2439 XFreePixmap (display->display, TermWin.pixmap); 2484 XFreePixmap (disp, pixmap);
2440 2485
2441#if TINTING 2486#if TINTING
2442 if (ISSET_PIXCOLOR (Color_tint)) 2487 if (ISSET_PIXCOLOR (Color_tint))
2443 { 2488 {
2444 unsigned short rm, gm, bm; 2489 unsigned short rm, gm, bm;
… …
2448 2493
2449 ShadeXImage (display, image, shade, rm, gm, bm); 2494 ShadeXImage (display, image, shade, rm, gm, bm);
2450 } 2495 }
2451#endif 2496#endif
2452 2497
2453 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2498 pixmap = XCreatePixmap (disp, vt,
2454 szHint.width, szHint.height, image->depth); 2499 szHint.width, szHint.height, image->depth);
2455 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2456 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2501 XPutImage (disp, pixmap, gc, image, 0, 0,
2457 nx, ny, image->width, image->height); 2502 nx, ny, image->width, image->height);
2458 XFreeGC (display->display, gc); 2503 XFreeGC (disp, gc);
2459 XDestroyImage (image); 2504 XDestroyImage (image);
2460 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2461 XClearWindow (display->display, TermWin.parent[0]); 2506 XClearWindow (disp, parent[0]);
2462 2507
2463 if (!am_transparent || !am_pixmap_trans) 2508 if (!am_transparent || !am_pixmap_trans)
2464 pchanged = 1; 2509 pchanged = 1;
2465 2510
2466 am_transparent = am_pixmap_trans = 1; 2511 am_transparent = am_pixmap_trans = 1;
2467 } 2512 }
2468 } 2513 }
2469 2514
2470 if (am_pixmap_trans) 2515 if (am_pixmap_trans)
2471 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2472 else 2517 else
2473 { 2518 {
2474 unsigned int n; 2519 unsigned int n;
2475 /* 2520 /*
2476 * InheritPixmap transparency 2521 * InheritPixmap transparency
2477 */ 2522 */
2478 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2479 { 2524 {
2480 oldp = TermWin.parent[i]; 2525 oldp = parent[i];
2481 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2526 XQueryTree (disp, parent[i - 1], &root,
2482 &TermWin.parent[i], &list, &n); 2527 &parent[i], &list, &n);
2483 XFree (list); 2528 XFree (list);
2484 2529
2485 if (TermWin.parent[i] == display->root) 2530 if (parent[i] == display->root)
2486 { 2531 {
2487 if (oldp != None) 2532 if (oldp != None)
2488 pchanged = 1; 2533 pchanged = 1;
2489 2534
2490 break; 2535 break;
2491 } 2536 }
2492 2537
2493 if (oldp != TermWin.parent[i]) 2538 if (oldp != parent[i])
2494 pchanged = 1; 2539 pchanged = 1;
2495 } 2540 }
2496 2541
2497 n = 0; 2542 n = 0;
2498 2543
2499 if (pchanged) 2544 if (pchanged)
2500 { 2545 {
2501 for (; n < (unsigned int)i; n++) 2546 for (; n < (unsigned int)i; n++)
2502 { 2547 {
2503 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2548 XGetWindowAttributes (disp, parent[n], &wattr);
2504 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2505 { 2550 {
2506 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2507 break; 2552 break;
2508 } 2553 }
2509 } 2554 }
2510 } 2555 }
2511 2556
2512 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2557 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2513 { 2558 {
2514 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2515 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2516 am_transparent = 0; 2561 am_transparent = 0;
2517 /* XXX: also turn off Opt_transparent? */ 2562 /* XXX: also turn off Opt_transparent? */
2518 } 2563 }
2519 else 2564 else
2520 { 2565 {
… …
2523 * needed for fvwm2.2.2 (and before?) */ 2568 * needed for fvwm2.2.2 (and before?) */
2524 sleep (1); 2569 sleep (1);
2525#endif 2570#endif
2526 for (n = 0; n < (unsigned int)i; n++) 2571 for (n = 0; n < (unsigned int)i; n++)
2527 { 2572 {
2528 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2529 XClearWindow (display->display, TermWin.parent[n]); 2574 XClearWindow (disp, parent[n]);
2530 } 2575 }
2531 2576
2532 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2533 am_transparent = 1; 2578 am_transparent = 1;
2534 } 2579 }
2535 2580
2536 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2537 TermWin.parent[i] = None; 2582 parent[i] = None;
2538 } 2583 }
2539 2584
2540 if (scrollBar.win) 2585 if (scrollBar.win)
2541 { 2586 {
2542 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2543 scrollBar.setIdle (); 2588 scrollBar.setIdle ();
2544 scrollbar_show (0); 2589 scrollbar_show (0);
2545 } 2590 }
2546 2591
2547 if (am_transparent) 2592 if (am_transparent)
… …
2585 // some window managers resize the window early, and these programs 2630 // some window managers resize the window early, and these programs
2586 // then sometimes get the size wrong. 2631 // then sometimes get the size wrong.
2587 // unfortunately other programs are even more buggy and dislike 2632 // unfortunately other programs are even more buggy and dislike
2588 // being sent SIGWINCH, so only do it when we were in fact being 2633 // being sent SIGWINCH, so only do it when we were in fact being
2589 // resized. 2634 // resized.
2590 if (seen_resize) 2635 if (seen_resize && cmd_pid)
2591 kill (-cmd_pid, SIGWINCH); 2636 kill (-cmd_pid, SIGWINCH);
2592 } 2637 }
2593 2638
2594 /* Read a text string from the input buffer */ 2639 /* Read a text string from the input buffer */
2595 unicode_t buf[UBUFSIZ]; 2640 unicode_t buf[UBUFSIZ];
2596 bool refreshnow = false; 2641 bool refreshnow = false;
2597 int nlines = 0; 2642 int nlines = 0;
2598 unicode_t *str = buf; 2643 unicode_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ);
2599 2645
2600 for (;;) 2646 for (;;)
2601 { 2647 {
2602 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2603 break; 2649 break;
2604 2650
2605 *str++ = ch; 2651 *str++ = ch;
2606 2652
2607 if (ch == C0_LF) 2653 if (ch == C0_LF || str >= eol)
2608 { 2654 {
2655 if (ch == C0_LF)
2609 nlines++; 2656 nlines++;
2657
2610 refresh_count++; 2658 refresh_count++;
2611 2659
2612 if (!(options & Opt_jumpScroll) 2660 if (!(options & Opt_jumpScroll)
2613 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2661 || (refresh_count >= refresh_limit * (nrow - 1)))
2614 { 2662 {
2615 refreshnow = true; 2663 refreshnow = true;
2616 ch = NOCHAR; 2664 ch = NOCHAR;
2617 break; 2665 break;
2618 } 2666 }
2619 2667
2620 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2668 // scr_add_lines only works for nlines <= nrow - 1.
2621 if (nlines >= TermWin.nrow - 1) 2669 if (nlines >= nrow - 1)
2622 { 2670 {
2623 scr_add_lines (buf, nlines, str - buf); 2671 scr_add_lines (buf, nlines, str - buf);
2624 nlines = 0; 2672 nlines = 0;
2625 str = buf; 2673 str = buf;
2674 eol = str + min (ncol, UBUFSIZ);
2626 } 2675 }
2627 }
2628 2676
2629 if (str >= buf + UBUFSIZ) 2677 if (str >= eol)
2630 { 2678 {
2679 if (eol >= buf + UBUFSIZ)
2680 {
2631 ch = NOCHAR; 2681 ch = NOCHAR;
2632 break; 2682 break;
2683 }
2684 else
2685 eol = min (eol + ncol, buf + UBUFSIZ);
2686 }
2687
2633 } 2688 }
2634 2689
2635 seq_begin = cmdbuf_ptr; 2690 seq_begin = cmdbuf_ptr;
2636 ch = next_char (); 2691 ch = next_char ();
2637 } 2692 }
… …
2708 if (len == (size_t)-1) 2763 if (len == (size_t)-1)
2709 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2764 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2710 2765
2711 // assume wchar == unicode 2766 // assume wchar == unicode
2712 cmdbuf_ptr += len; 2767 cmdbuf_ptr += len;
2713 return wc; 2768 return wc & UNICODE_MASK;
2714 } 2769 }
2715 2770
2716 return NOCHAR; 2771 return NOCHAR;
2717} 2772}
2718 2773
… …
3181 { 3236 {
3182 switch (priv) 3237 switch (priv)
3183 { 3238 {
3184 case '>': 3239 case '>':
3185 if (ch == CSI_DA) /* secondary device attributes */ 3240 if (ch == CSI_DA) /* secondary device attributes */
3186 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3241 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3187 break; 3242 break;
3188 case '?': 3243 case '?':
3189 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3244 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3190 process_terminal_mode (ch, priv, nargs, arg); 3245 process_terminal_mode (ch, priv, nargs, arg);
3191 break; 3246 break;
… …
3296 3351
3297 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3352 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3298 arg[0] = -arg[0]; 3353 arg[0] = -arg[0];
3299 /* FALLTHROUGH */ 3354 /* FALLTHROUGH */
3300 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3301 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3302 break; 3357 break;
3303 3358
3304 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3305 tt_write ((const unsigned char *)VT100_ANS, 3360 tt_write ((const unsigned char *)VT100_ANS,
3306 (unsigned int) (sizeof (VT100_ANS) - 1)); 3361 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3420rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3475rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3421{ 3476{
3422 int x, y; 3477 int x, y;
3423 XWindowAttributes wattr; 3478 XWindowAttributes wattr;
3424 Window wdummy; 3479 Window wdummy;
3480 dDisp;
3425 3481
3426 if (nargs == 0) 3482 if (nargs == 0)
3427 return; 3483 return;
3428 3484
3429 switch (args[0]) 3485 switch (args[0])
3430 { 3486 {
3431 /* 3487 /*
3432 * commands 3488 * commands
3433 */ 3489 */
3434 case 1: /* deiconify window */ 3490 case 1: /* deiconify window */
3435 XMapWindow (display->display, TermWin.parent[0]); 3491 XMapWindow (disp, parent[0]);
3436 break; 3492 break;
3437 case 2: /* iconify window */ 3493 case 2: /* iconify window */
3438 XIconifyWindow (display->display, TermWin.parent[0], 3494 XIconifyWindow (disp, parent[0], display->screen);
3439 DefaultScreen (display->display));
3440 break; 3495 break;
3441 case 3: /* set position (pixels) */ 3496 case 3: /* set position (pixels) */
3442 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3497 XMoveWindow (disp, parent[0], args[1], args[2]);
3443 break; 3498 break;
3444 case 4: /* set size (pixels) */ 3499 case 4: /* set size (pixels) */
3445 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3446 break; 3501 break;
3447 case 5: /* raise window */ 3502 case 5: /* raise window */
3448 XRaiseWindow (display->display, TermWin.parent[0]); 3503 XRaiseWindow (disp, parent[0]);
3449 break; 3504 break;
3450 case 6: /* lower window */ 3505 case 6: /* lower window */
3451 XLowerWindow (display->display, TermWin.parent[0]); 3506 XLowerWindow (disp, parent[0]);
3452 break; 3507 break;
3453 case 7: /* refresh window */ 3508 case 7: /* refresh window */
3454 scr_touch (true); 3509 scr_touch (true);
3455 break; 3510 break;
3456 case 8: /* set size (chars) */ 3511 case 8: /* set size (chars) */
3457 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3512 set_widthheight ((unsigned int) (args[2] * fwidth),
3458 (unsigned int) (args[1] * TermWin.fheight)); 3513 (unsigned int) (args[1] * fheight));
3459 break; 3514 break;
3460 3515
3461 //case 9: NYI, TODO, restore maximized window or maximize window 3516 //case 9: NYI, TODO, restore maximized window or maximize window
3462 default: 3517 default:
3463 if (args[0] >= 24) /* set height (chars) */ 3518 if (args[0] >= 24) /* set height (chars) */
3464 set_widthheight ((unsigned int)TermWin.width, 3519 set_widthheight ((unsigned int)width,
3465 (unsigned int) (args[1] * TermWin.fheight)); 3520 (unsigned int) (args[1] * fheight));
3466 break; 3521 break;
3467 3522
3468 3523
3469 /* 3524 /*
3470 * reports - some output format copied from XTerm 3525 * reports - some output format copied from XTerm
3471 */ 3526 */
3472 case 11: /* report window state */ 3527 case 11: /* report window state */
3473 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3528 XGetWindowAttributes (disp, parent[0], &wattr);
3474 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3475 break; 3530 break;
3476 case 13: /* report window position */ 3531 case 13: /* report window position */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3532 XGetWindowAttributes (disp, parent[0], &wattr);
3478 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3533 XTranslateCoordinates (disp, parent[0], wattr.root,
3479 -wattr.border_width, -wattr.border_width, 3534 -wattr.border_width, -wattr.border_width,
3480 &x, &y, &wdummy); 3535 &x, &y, &wdummy);
3481 tt_printf ("\033[3;%d;%dt", x, y); 3536 tt_printf ("\033[3;%d;%dt", x, y);
3482 break; 3537 break;
3483 case 14: /* report window size (pixels) */ 3538 case 14: /* report window size (pixels) */
3484 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3539 XGetWindowAttributes (disp, parent[0], &wattr);
3485 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3486 break; 3541 break;
3487 case 18: /* report text area size (chars) */ 3542 case 18: /* report text area size (chars) */
3488 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3543 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3489 break; 3544 break;
3490 case 19: /* report window size (chars) */ 3545 case 19: /* report window size (chars) */
3491 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3546 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3492 break; 3547 break;
3493 case 20: /* report icon label */ 3548 case 20: /* report icon label */
3494 { 3549 {
3495 char *s; 3550 char *s;
3496 XGetIconName (display->display, TermWin.parent[0], &s); 3551 XGetIconName (disp, parent[0], &s);
3497 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3498 XFree (s); 3553 XFree (s);
3499 } 3554 }
3500 break; 3555 break;
3501 case 21: /* report window title */ 3556 case 21: /* report window title */
3502 { 3557 {
3503 char *s; 3558 char *s;
3504 XFetchName (display->display, TermWin.parent[0], &s); 3559 XFetchName (disp, parent[0], &s);
3505 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3506 XFree (s); 3561 XFree (s);
3507 } 3562 }
3508 break; 3563 break;
3509 } 3564 }
… …
3542 else if (ch < 0x20) 3597 else if (ch < 0x20)
3543 return NULL; /* other control character - exit */ 3598 return NULL; /* other control character - exit */
3544 3599
3545 seen_esc = false; 3600 seen_esc = false;
3546 3601
3547 if (n >= sizeof (string) - 1) 3602 if (n >= STRING_MAX - 1)
3548 // stop at some sane length 3603 // stop at some sane length
3549 return NULL; 3604 return NULL;
3550 3605
3551 if (ch == C0_SYN) 3606 if (ch == C0_SYN)
3552 string[n++] = cmd_get8 (); 3607 string[n++] = cmd_get8 ();
… …
3620 set_window_color (color, str); 3675 set_window_color (color, str);
3621} 3676}
3622 3677
3623/* 3678/*
3624 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3679 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3625 * 0 = change iconName/title
3626 * 1 = change iconName
3627 * 2 = change title
3628 * 4 = change color
3629 * 10 = change fg color
3630 * 11 = change bg color
3631 * 12 = change text color
3632 * 13 = change mouse foreground color
3633 * 17 = change highlight character colour
3634 * 18 = change bold character color
3635 * 19 = change underlined character color
3636 * 46 = change logfile (not implemented)
3637 * 50 = change font
3638 *
3639 * rxvt extensions:
3640 * 20 = bg pixmap
3641 * 39 = change default fg color
3642 * 49 = change default bg color
3643 * 55 = dump scrollback buffer and all of screen
3644 * 701 = change locale
3645 * 702 = find font
3646 * 703 = menu
3647 */ 3680 */
3648void 3681void
3649rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3682rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3650{ 3683{
3651 int changed = 0; 3684 int changed = 0;
3652 int color; 3685 int color;
3653 char *buf, *name; 3686 char *buf, *name;
3654 bool query = str[0] == '?' && !str[1]; 3687 bool query = str[0] == '?' && !str[1];
3655 int saveop = op; 3688 int saveop = op;
3689 dDisp;
3656 3690
3657 assert (str != NULL); 3691 assert (str != NULL);
3658 switch (op) 3692 switch (op)
3659 { 3693 {
3660 case XTerm_name: 3694 case XTerm_name:
… …
3676 unsigned long bytes_after; 3710 unsigned long bytes_after;
3677 unsigned char *value = 0; 3711 unsigned char *value = 0;
3678 const char *str = ""; 3712 const char *str = "";
3679 3713
3680 if (prop 3714 if (prop
3681 && XGetWindowProperty (display->display, TermWin.parent[0], 3715 && XGetWindowProperty (disp, parent[0],
3682 prop, 0, 1<<16, 0, AnyPropertyType, 3716 prop, 0, 1<<16, 0, AnyPropertyType,
3683 &actual_type, &actual_format, 3717 &actual_type, &actual_format,
3684 &nitems, &bytes_after, &value) == Success 3718 &nitems, &bytes_after, &value) == Success
3685 && actual_type != None 3719 && actual_type != None
3686 && actual_format == 8) 3720 && actual_format == 8)
… …
3698 { 3732 {
3699 *eq = 0; 3733 *eq = 0;
3700 set_utf8_property (display->atom (str), eq + 1); 3734 set_utf8_property (display->atom (str), eq + 1);
3701 } 3735 }
3702 else 3736 else
3703 XDeleteProperty (display->display, TermWin.parent[0], 3737 XDeleteProperty (disp, parent[0],
3704 display->atom (str)); 3738 display->atom (str));
3705 } 3739 }
3706 break; 3740 break;
3707 3741
3708 case XTerm_Color: 3742 case XTerm_Color:
… …
3749 break; 3783 break;
3750#ifndef NO_BOLD_UNDERLINE_REVERSE 3784#ifndef NO_BOLD_UNDERLINE_REVERSE
3751 case XTerm_Color_BD: 3785 case XTerm_Color_BD:
3752 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3786 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3753 break; 3787 break;
3754 case XTerm_Color_IT:
3755 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3756 break;
3757 case XTerm_Color_UL: 3788 case XTerm_Color_UL:
3758 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3789 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3759 break; 3790 break;
3760 case XTerm_Color_RV: 3791 case XTerm_Color_RV:
3761 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3762 break; 3793 break;
3794 case URxvt_Color_IT:
3795 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3796 break;
3763#endif 3797#endif
3764#if TRANSPARENT && TINTING 3798#if TRANSPARENT && TINTING
3765 case XTerm_Color_tint: 3799 case URxvt_Color_tint:
3766 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3800 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3767 check_our_parents (); 3801 check_our_parents ();
3768 if (am_transparent) 3802 if (am_transparent)
3769 want_full_refresh = want_refresh = 1; 3803 want_full_refresh = want_refresh = 1;
3770 break; 3804 break;
3771#endif 3805#endif
… …
3783 { 3817 {
3784 str++; 3818 str++;
3785#if XPM_BACKGROUND 3819#if XPM_BACKGROUND
3786 changed += scale_pixmap (str); 3820 changed += scale_pixmap (str);
3787#endif 3821#endif
3788
3789 } 3822 }
3823
3790 if (changed) 3824 if (changed)
3791 { 3825 {
3792#ifdef XPM_BACKGROUND 3826#ifdef XPM_BACKGROUND
3793 resize_pixmap (); 3827 resize_pixmap ();
3794#endif 3828#endif
… …
3805 3839
3806 case XTerm_logfile: 3840 case XTerm_logfile:
3807 // TODO, when secure mode? 3841 // TODO, when secure mode?
3808 break; 3842 break;
3809 3843
3844#ifdef MENUBAR
3845 case URxvt_Menu:
3846 if (options & Opt_insecure)
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3848 break;
3849#endif
3850#if 0
3851 case XTerm_dumpscreen: /* no error notices */
3852 {
3853 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 {
3856 scr_dump (fd);
3857 close (fd);
3858 }
3859 }
3860 break;
3861#endif
3810 case XTerm_font: 3862 case XTerm_font:
3811 op = URxvt_font; 3863 op = URxvt_font;
3812 case URxvt_font: 3864 case URxvt_font:
3813#if ENABLE_STYLES 3865#if ENABLE_STYLES
3814 case URxvt_boldFont: 3866 case URxvt_boldFont:
3815 case URxvt_italicFont: 3867 case URxvt_italicFont:
3816 case URxvt_boldItalicFont: 3868 case URxvt_boldItalicFont:
3817#endif 3869#endif
3818 if (query) 3870 if (query)
3819 tt_printf ("\33]%d;%-.250s%c", saveop, 3871 tt_printf ("\33]%d;%-.250s%c", saveop,
3820 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3821 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3873 ? fontset[op - URxvt_font]->fontdesc : "",
3822 resp); 3874 resp);
3823 else 3875 else
3824 { 3876 {
3825 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3877 const char *&res = rs[Rs_font + (op - URxvt_font)];
3826 3878
… …
3829 set_fonts (); 3881 set_fonts ();
3830 } 3882 }
3831 break; 3883 break;
3832 3884
3833#if ENABLE_FRILLS 3885#if ENABLE_FRILLS
3834 case XTerm_locale: 3886 case URxvt_locale:
3835 if (query) 3887 if (query)
3836 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3837 else 3889 else
3838 { 3890 {
3839 set_locale (str); 3891 set_locale (str);
3840# ifdef USE_XIM 3892 pty.set_utf8_mode (enc_utf8);
3841 im_cb (); 3893 init_xlocale ();
3842# endif
3843 } 3894 }
3844 break; 3895 break;
3845#endif
3846 3896
3847#ifdef MENUBAR 3897 case URxvt_view_up:
3848 case XTerm_Menu: 3898 case URxvt_view_down:
3849 if (options & Opt_insecure) 3899 int lines = atoi (str);
3850 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3900
3851 break; 3901 if (lines)
3852#endif 3902 scr_page (op == URxvt_view_up ? UP : DN, lines);
3853#if 0
3854 case XTerm_dumpscreen: /* no error notices */
3855 { 3903 else
3856 int fd;
3857 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3858 { 3904 {
3859 scr_dump (fd); 3905 scr_erase_savelines ();
3860 close (fd);
3861 } 3906 }
3862 } 3907
3863 break; 3908 break;
3864#endif 3909#endif
3865 } 3910 }
3866} 3911}
3867/*----------------------------------------------------------------------*/ 3912/*----------------------------------------------------------------------*/
… …
4000 */ 4045 */
4001 PrivMode (1, PrivMode_vt52); 4046 PrivMode (1, PrivMode_vt52);
4002 break; 4047 break;
4003 case 3: /* 80/132 */ 4048 case 3: /* 80/132 */
4004 if (priv_modes & PrivMode_132OK) 4049 if (priv_modes & PrivMode_132OK)
4005 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4050 set_widthheight (((state ? 132 : 80) * fwidth), height);
4006 break; 4051 break;
4007 case 4: /* smooth scrolling */ 4052 case 4: /* smooth scrolling */
4008 if (state) 4053 if (state)
4009 options &= ~Opt_jumpScroll; 4054 options &= ~Opt_jumpScroll;
4010 else 4055 else
… …
4282 4327
4283/* ---------------------------------------------------------------------- */ 4328/* ---------------------------------------------------------------------- */
4284/* Write data to the pty as typed by the user, pasted with the mouse, 4329/* 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. 4330 * or generated by us in response to a query ESC sequence.
4286 */ 4331 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333
4287void 4334void
4288rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4335rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4289{ 4336{
4290 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4337 if (v_buflen == 0)
4338 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4291 4340
4292 if (len) 4341 if ((unsigned int)written == len)
4342 return;
4343
4344 data += written;
4345 len -= written;
4293 { 4346 }
4347
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4349
4350 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len;
4352
4353 pty_ev.set (EVENT_READ | EVENT_WRITE);
4354}
4355
4356void rxvt_term::pty_write ()
4357{
4358 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4359
4360 if (written > 0)
4361 {
4362 v_buflen -= written;
4363
4294 if (v_buflen == 0) 4364 if (v_buflen == 0)
4295 { 4365 {
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); 4366 free (v_buffer);
4323 v_buffer = 0; 4367 v_buffer = 0;
4324 v_buflen = 0; 4368 v_buflen = 0;
4325 4369
4326 pty_ev.set (EVENT_READ); 4370 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; 4371 return;
4339 } 4372 }
4373
4374 memmove (v_buffer, v_buffer + written, v_buflen);
4340 } 4375 }
4376 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4377 pty_ev.set (EVENT_READ);
4341} 4378}
4342 4379
4343/*----------------------- end-of-file (C source) -----------------------*/ 4380/*----------------------- end-of-file (C source) -----------------------*/
4344 4381

Diff Legend

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