ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.177 by root, Mon Dec 13 07:18:52 2004 UTC vs.
Revision 1.213 by root, Thu Dec 22 16:44:10 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(-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
… …
1071} 1092}
1072 1093
1073void 1094void
1074rxvt_term::pointer_unblank () 1095rxvt_term::pointer_unblank ()
1075{ 1096{
1076 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1097 XDefineCursor (display->display, vt, TermWin_cursor);
1077 recolour_cursor (); 1098 recolour_cursor ();
1078 1099
1079#ifdef POINTER_BLANK 1100#ifdef POINTER_BLANK
1080 hidden_pointer = 0; 1101 hidden_pointer = 0;
1081 1102
… …
1089rxvt_term::pointer_blank () 1110rxvt_term::pointer_blank ()
1090{ 1111{
1091 if (! (options & Opt_pointerBlank)) 1112 if (! (options & Opt_pointerBlank))
1092 return; 1113 return;
1093 1114
1094 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1115 XDefineCursor (display->display, vt, display->blank_cursor);
1095 XFlush (display->display); 1116 XFlush (display->display);
1096 1117
1097 hidden_pointer = 1; 1118 hidden_pointer = 1;
1098} 1119}
1099 1120
… …
1188 1209
1189/*{{{ process an X event */ 1210/*{{{ process an X event */
1190void 1211void
1191rxvt_term::x_cb (XEvent &ev) 1212rxvt_term::x_cb (XEvent &ev)
1192{ 1213{
1214 dDisp;
1215
1193 SET_R (this); 1216 SET_R (this);
1194 SET_LOCALE (locale); 1217 SET_LOCALE (locale);
1195 1218
1196#if defined(CURSOR_BLINK) 1219#if defined(CURSOR_BLINK)
1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1313 button_release (ev.xbutton); 1336 button_release (ev.xbutton);
1314 break; 1337 break;
1315 1338
1316 case ClientMessage: 1339 case ClientMessage:
1317 if (ev.xclient.format == 32 1340 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1342 {
1318 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1319 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
1320#ifdef OFFIX_DND 1361#ifdef OFFIX_DND
1321 /* OffiX Dnd (drag 'n' drop) protocol */ 1362 /* OffiX Dnd (drag 'n' drop) protocol */
1322 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1323 && (ev.xclient.data.l[0] == DndFile 1364 && (ev.xclient.data.l[0] == DndFile
1324 || ev.xclient.data.l[0] == DndDir 1365 || ev.xclient.data.l[0] == DndDir
1325 || ev.xclient.data.l[0] == DndLink)) 1366 || ev.xclient.data.l[0] == DndLink))
1326 { 1367 {
1327 /* Get Dnd data */ 1368 /* Get Dnd data */
1328 Atom ActualType; 1369 Atom ActualType;
1329 int ActualFormat; 1370 int ActualFormat;
1330 unsigned char *data; 1371 unsigned char *data;
1331 unsigned long Size, RemainingBytes; 1372 unsigned long Size, RemainingBytes;
1332 1373
1333 XGetWindowProperty (display->display, display->root, 1374 XGetWindowProperty (disp, display->root,
1334 xa[XA_DNDSELECTION], 1375 xa[XA_DNDSELECTION],
1335 0L, 1000000L, 1376 0L, 1000000L,
1336 False, AnyPropertyType, 1377 False, AnyPropertyType,
1337 &ActualType, &ActualFormat, 1378 &ActualType, &ActualFormat,
1338 &Size, &RemainingBytes, 1379 &Size, &RemainingBytes,
1339 &data); 1380 &data);
1340 set_string_property (XA_CUT_BUFFER0, data); 1381 set_string_property (XA_CUT_BUFFER0, data);
1341 XFree (data); 1382 XFree (data);
1342 selection_paste (display->root, XA_CUT_BUFFER0, true); 1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1344 } 1385 }
1345#endif /* OFFIX_DND */ 1386#endif /* OFFIX_DND */
1346 break; 1387 break;
1347 1388
1348 case MappingNotify: 1389 case MappingNotify:
… …
1373 break; 1414 break;
1374 } 1415 }
1375 break; 1416 break;
1376 1417
1377 case FocusIn: 1418 case FocusIn:
1378 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])
1379 { 1428 {
1380 TermWin.focus = 1;
1381 want_refresh = 1;
1382#ifdef USE_XIM
1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1386 XSetICFocus (Input_Context);
1387 }
1388#endif
1389#ifdef CURSOR_BLINK
1390 if (options & Opt_cursorBlink)
1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392#endif
1393#ifdef OFF_FOCUS_FADING
1394 if (rs[Rs_fade])
1395 {
1396 pix_colors = pix_colors_focused;
1397 scr_recolour ();
1398 }
1399#endif
1400
1401 }
1402 break;
1403
1404 case FocusOut:
1405 if (TermWin.focus)
1406 {
1407 TermWin.focus = 0;
1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1416#ifdef USE_XIM
1417 if (Input_Context != NULL)
1418 XUnsetICFocus (Input_Context);
1419#endif
1420#ifdef CURSOR_BLINK
1421 if (options & Opt_cursorBlink)
1422 cursor_blink_ev.stop ();
1423 hidden_cursor = 0;
1424#endif
1425#ifdef OFF_FOCUS_FADING
1426 if (rs[Rs_fade])
1427 {
1428 pix_colors = pix_colors_unfocused;
1429 scr_recolour ();
1430 }
1431#endif
1432 }
1433 break;
1434
1435 case ConfigureNotify:
1436 if (ev.xconfigure.window == TermWin.parent[0])
1437 {
1438 int height, width;
1439
1440 do
1441 { /* Wrap lots of configures into one */
1442 width = ev.xconfigure.width;
1443 height = ev.xconfigure.height;
1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1445 }
1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1430 ;
1447 1431
1448 if (szHint.width != width || szHint.height != height) 1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1433 {
1450 seen_resize = 1; 1434 seen_resize = 1;
1451 resize_all_windows (width, height, 1); 1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452 } 1436 }
1453 1437
1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1455 if (options & Opt_transparent) 1439 if (options & Opt_transparent)
1456 check_our_parents (); 1440 check_our_parents ();
… …
1477 case SelectionRequest: 1461 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1462 selection_send (ev.xselectionrequest);
1479 break; 1463 break;
1480 1464
1481 case UnmapNotify: 1465 case UnmapNotify:
1482 TermWin.mapped = 0; 1466 mapped = 0;
1483#ifdef TEXT_BLINK 1467#ifdef TEXT_BLINK
1484 text_blink_ev.stop (); 1468 text_blink_ev.stop ();
1485#endif 1469#endif
1486 break; 1470 break;
1487 1471
1488 case MapNotify: 1472 case MapNotify:
1489 TermWin.mapped = 1; 1473 mapped = 1;
1490#ifdef TEXT_BLINK 1474#ifdef TEXT_BLINK
1491 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1492#endif 1476#endif
1493 break; 1477 break;
1494 1478
… …
1498 break; 1482 break;
1499#endif /* TRANSPARENT */ 1483#endif /* TRANSPARENT */
1500 1484
1501 case GraphicsExpose: 1485 case GraphicsExpose:
1502 case Expose: 1486 case Expose:
1503 if (ev.xany.window == TermWin.vt) 1487 if (ev.xany.window == vt)
1504 { 1488 {
1505 do 1489 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1490 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1491 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1509 1493
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1495
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1497 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1498 ev.xexpose.width, ev.xexpose.height, False);
1515 1499
1516 scr_refresh (refresh_type); 1500 scr_refresh (refresh_type);
1517 } 1501 }
1518 else 1502 else
1519 { 1503 {
1520 XEvent unused_event; 1504 XEvent unused_event;
1521 1505
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1506 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523 ; 1507 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1508 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1509 ;
1526 1510
1527 if (isScrollbarWindow (ev.xany.window)) 1511 if (isScrollbarWindow (ev.xany.window))
1528 { 1512 {
1529 scrollBar.setIdle (); 1513 scrollBar.setIdle ();
… …
1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1534 menubar_expose (); 1518 menubar_expose ();
1535#endif 1519#endif
1536 1520
1537#ifdef TRANSPARENT 1521#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1522 if (am_transparent && ev.xany.window == parent[0])
1539 XClearWindow (display->display, ev.xany.window); 1523 XClearWindow (disp, ev.xany.window);
1540#endif 1524#endif
1541 } 1525 }
1542 break; 1526 break;
1543 1527
1544 case MotionNotify: 1528 case MotionNotify:
… …
1554 } 1538 }
1555#endif 1539#endif
1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557 break; 1541 break;
1558 1542
1559 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1560 { 1544 {
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1545 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1546 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1564 ; 1548 ;
1565 1549
1566 XQueryPointer (display->display, TermWin.vt, 1550 XQueryPointer (disp, vt,
1567 &unused_root, &unused_child, 1551 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1552 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1553 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1554 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1555#ifdef MOUSE_THRESHOLD
… …
1583#endif 1567#endif
1584 selection_extend (ev.xbutton.x, ev.xbutton.y, 1568 selection_extend (ev.xbutton.x, ev.xbutton.y,
1585 ev.xbutton.state & Button3Mask ? 2 : 0); 1569 ev.xbutton.state & Button3Mask ? 2 : 0);
1586 1570
1587#ifdef SELECTION_SCROLLING 1571#ifdef SELECTION_SCROLLING
1588 if (ev.xbutton.y < TermWin.int_bwidth 1572 if (ev.xbutton.y < int_bwidth
1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1573 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1590 { 1574 {
1591 int dist; 1575 int dist;
1592 1576
1593 /* don't clobber the current delay if we are 1577 /* don't clobber the current delay if we are
1594 * already in the middle of scrolling. 1578 * already in the middle of scrolling.
… …
1602 selection_save_x = ev.xbutton.x; 1586 selection_save_x = ev.xbutton.x;
1603 selection_save_y = ev.xbutton.y; 1587 selection_save_y = ev.xbutton.y;
1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1588 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1605 1589
1606 /* calc number of lines to scroll */ 1590 /* calc number of lines to scroll */
1607 if (ev.xbutton.y < TermWin.int_bwidth) 1591 if (ev.xbutton.y < int_bwidth)
1608 { 1592 {
1609 scroll_selection_dir = UP; 1593 scroll_selection_dir = UP;
1610 dist = TermWin.int_bwidth - ev.xbutton.y; 1594 dist = int_bwidth - ev.xbutton.y;
1611 } 1595 }
1612 else 1596 else
1613 { 1597 {
1614 scroll_selection_dir = DN; 1598 scroll_selection_dir = DN;
1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1599 dist = ev.xbutton.y - (int_bwidth + height);
1616 } 1600 }
1617 1601
1618 scroll_selection_lines = Pixel2Height (dist) 1602 scroll_selection_lines = Pixel2Height (dist)
1619 / SELECTION_SCROLL_LINE_SPEEDUP 1603 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1; 1604 + 1;
1621 MIN_IT (scroll_selection_lines, 1605 min_it (scroll_selection_lines,
1622 SELECTION_SCROLL_MAX_LINES); 1606 SELECTION_SCROLL_MAX_LINES);
1623 } 1607 }
1624 else 1608 else
1625 { 1609 {
1626 /* we are within the text window, so we 1610 /* we are within the text window, so we
… …
1635#endif 1619#endif
1636 } 1620 }
1637 } 1621 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1623 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1624 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641 MotionNotify, &ev)) 1625 MotionNotify, &ev))
1642 ; 1626 ;
1643 1627
1644 XQueryPointer (display->display, scrollBar.win, 1628 XQueryPointer (disp, scrollBar.win,
1645 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1631 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1632 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1654 } 1638 }
1655 break; 1639 break;
1656 } 1640 }
1657} 1641}
1658 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
1659#if TRANSPARENT 1704#if TRANSPARENT
1660void 1705void
1661rxvt_term::rootwin_cb (XEvent &ev) 1706rxvt_term::rootwin_cb (XEvent &ev)
1662{ 1707{
1663 SET_R (this); 1708 SET_R (this);
… …
1668 case PropertyNotify: 1713 case PropertyNotify:
1669 /* 1714 /*
1670 * 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,
1671 * 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.
1672 */ 1717 */
1673 if (xa[XA_XROOTPMAPID] == 0)
1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1675
1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1718 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1677 return; 1720 return;
1678 1721
1679 /* FALLTHROUGH */ 1722 /* FALLTHROUGH */
1680 case ReparentNotify: 1723 case ReparentNotify:
1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
… …
1695 reportmode = !! (priv_modes & PrivMode_mouse_report); 1738 reportmode = !! (priv_modes & PrivMode_mouse_report);
1696 1739
1697 /* 1740 /*
1698 * VT window processing of button press 1741 * VT window processing of button press
1699 */ 1742 */
1700 if (ev.window == TermWin.vt) 1743 if (ev.window == vt)
1701 { 1744 {
1702#if ISO_14755 1745#if ISO_14755
1703 // 5.4 1746 // 5.4
1704 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1705 { 1748 {
… …
1753 { 1796 {
1754 case Button1: 1797 case Button1:
1755 /* allow meta + click to select rectangular areas */ 1798 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */ 1799 /* should be done in screen.C */
1757#if ENABLE_FRILLS 1800#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask); 1801 selection.rect = !!(ev.state & ModMetaMask);
1759#else 1802#else
1760 selection.rect = false; 1803 selection.rect = false;
1761#endif 1804#endif
1762 1805
1763 /* allow shift+left click to extend selection */ 1806 /* allow shift+left click to extend selection */
… …
1910 case Button3: 1953 case Button3:
1911 if (scrollBar.style != R_SB_XTERM) 1954 if (scrollBar.style != R_SB_XTERM)
1912 { 1955 {
1913 if (scrollbar_above_slider (ev.y)) 1956 if (scrollbar_above_slider (ev.y))
1914# ifdef RXVT_SCROLL_FULL 1957# ifdef RXVT_SCROLL_FULL
1915 scr_page (UP, TermWin.nrow - 1); 1958 scr_page (UP, nrow - 1);
1916# else 1959# else
1917 scr_page (UP, TermWin.nrow / 4); 1960 scr_page (UP, nrow / 4);
1918# endif 1961# endif
1919 else if (scrollbar_below_slider (ev.y)) 1962 else if (scrollbar_below_slider (ev.y))
1920# ifdef RXVT_SCROLL_FULL 1963# ifdef RXVT_SCROLL_FULL
1921 scr_page (DN, TermWin.nrow - 1); 1964 scr_page (DN, nrow - 1);
1922# else 1965# else
1923 scr_page (DN, TermWin.nrow / 4); 1966 scr_page (DN, nrow / 4);
1924# endif 1967# endif
1925 else 1968 else
1926 scrollBar.setMotion (); 1969 scrollBar.setMotion ();
1927 } 1970 }
1928 else 1971 else
1929 { 1972 {
1930 scr_page ((ev.button == Button1 ? DN : UP), 1973 scr_page ((ev.button == Button1 ? DN : UP),
1931 (TermWin.nrow 1974 (nrow
1932 * scrollbar_position (ev.y) 1975 * scrollbar_position (ev.y)
1933 / scrollbar_size ())); 1976 / scrollbar_size ()));
1934 } 1977 }
1935 1978
1936 break; 1979 break;
… …
1968#ifdef SELECTION_SCROLLING 2011#ifdef SELECTION_SCROLLING
1969 if (sel_scroll_ev.active) 2012 if (sel_scroll_ev.active)
1970 sel_scroll_ev.stop(); 2013 sel_scroll_ev.stop();
1971#endif 2014#endif
1972 2015
1973 if (ev.window == TermWin.vt) 2016 if (ev.window == vt)
1974 { 2017 {
1975#if ISO_14755 2018#if ISO_14755
1976 // 5.4 2019 // 5.4
1977 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1978 return; 2021 return;
… …
2029 v = ev.button == Button4 ? UP : DN; 2072 v = ev.button == Button4 ? UP : DN;
2030 2073
2031 if (ev.state & ShiftMask) 2074 if (ev.state & ShiftMask)
2032 i = 1; 2075 i = 1;
2033 else if (options & Opt_mouseWheelScrollPage) 2076 else if (options & Opt_mouseWheelScrollPage)
2034 i = TermWin.nrow - 1; 2077 i = nrow - 1;
2035 else 2078 else
2036 i = 5; 2079 i = 5;
2037 2080
2038# ifdef MOUSE_SLIP_WHEELING 2081# ifdef MOUSE_SLIP_WHEELING
2039 if (ev.state & ControlMask) 2082 if (ev.state & ControlMask)
2040 { 2083 {
2041 mouse_slip_wheel_speed += v ? -1 : 1; 2084 mouse_slip_wheel_speed += v ? -1 : 1;
2042 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;
2043 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;
2044 2087
2045 if (slip_wheel_ev.at < NOW) 2088 if (slip_wheel_ev.at < NOW)
2046 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2089 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2047 2090
2048 slip_wheel_ev.start (); 2091 slip_wheel_ev.start ();
… …
2089 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2132 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2090 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2133 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2091 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2134 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2092 int i; 2135 int i;
2093 2136
2094 Visual* visual = display->visual; 2137 Visual *visual = display->visual;
2095 2138
2096 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2139 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2097 2140
2098 /* for convenience */ 2141 /* for convenience */
2099 mask_r = visual->red_mask; 2142 mask_r = visual->red_mask;
… …
2320 Atom atype; 2363 Atom atype;
2321 unsigned char *prop = NULL; 2364 unsigned char *prop = NULL;
2322 Window root, oldp, *list; 2365 Window root, oldp, *list;
2323 Pixmap rootpixmap = None; 2366 Pixmap rootpixmap = None;
2324 XWindowAttributes wattr, wrootattr; 2367 XWindowAttributes wattr, wrootattr;
2368 dDisp;
2325 2369
2326 pchanged = 0; 2370 pchanged = 0;
2327 2371
2328 if (!(options & Opt_transparent)) 2372 if (!(options & Opt_transparent))
2329 return pchanged; /* Don't try any more */ 2373 return pchanged; /* Don't try any more */
2330 2374
2331 XGetWindowAttributes (display->display, display->root, &wrootattr); 2375 XGetWindowAttributes (disp, display->root, &wrootattr);
2332 rootdepth = wrootattr.depth; 2376 rootdepth = wrootattr.depth;
2333 2377
2334 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2378 XGetWindowAttributes (disp, parent[0], &wattr);
2335 2379
2336 if (rootdepth != wattr.depth) 2380 if (rootdepth != wattr.depth)
2337 { 2381 {
2338 if (am_transparent) 2382 if (am_transparent)
2339 { 2383 {
2340 pchanged = 1; 2384 pchanged = 1;
2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2342 am_transparent = am_pixmap_trans = 0; 2386 am_transparent = am_pixmap_trans = 0;
2343 } 2387 }
2344 2388
2345 return pchanged; /* Don't try any more */ 2389 return pchanged; /* Don't try any more */
2346 } 2390 }
2347 2391
2348 /* 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. */
2349 XSync (display->display, False); 2393 XSync (disp, False);
2350 2394
2351 /* 2395 /*
2352 * Make the frame window set by the window manager have 2396 * Make the frame window set by the window manager have
2353 * the root background. Some window managers put multiple nested frame 2397 * the root background. Some window managers put multiple nested frame
2354 * 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.
2355 */ 2399 */
2356 i = (xa[XA_XROOTPMAPID] 2400 i = (xa[XA_XROOTPMAP_ID]
2357 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2401 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2359 &nitems, &bytes_after, &prop) == Success); 2403 &nitems, &bytes_after, &prop) == Success);
2360 2404
2361 if (!i || prop == NULL) 2405 if (!i || prop == NULL)
2362 i = (xa[XA_XSETROOTID] 2406 i = (xa[XA_ESETROOT_PMAP_ID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2407 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2408 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success); 2409 &nitems, &bytes_after, &prop) == Success);
2366 2410
2367 if (!i || prop == NULL 2411 if (!i || prop == NULL
2368#if TINTING 2412#if TINTING
… …
2387 Window cr; 2431 Window cr;
2388 XImage *image; 2432 XImage *image;
2389 GC gc; 2433 GC gc;
2390 XGCValues gcvalue; 2434 XGCValues gcvalue;
2391 2435
2392 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2436 XTranslateCoordinates (disp, parent[0], display->root,
2393 0, 0, &sx, &sy, &cr); 2437 0, 0, &sx, &sy, &cr);
2394 nw = (unsigned int)szHint.width; 2438 nw = (unsigned int)szHint.width;
2395 nh = (unsigned int)szHint.height; 2439 nh = (unsigned int)szHint.height;
2396 nx = ny = 0; 2440 nx = ny = 0;
2397 2441
… …
2407 nh += sy; 2451 nh += sy;
2408 ny = -sy; 2452 ny = -sy;
2409 sy = 0; 2453 sy = 0;
2410 } 2454 }
2411 2455
2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2456 min_it (nw, (unsigned int) (wrootattr.width - sx));
2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2457 min_it (nh, (unsigned int) (wrootattr.height - sy));
2414 2458
2415 XSync (display->display, False); 2459 XSync (disp, False);
2416 allowedxerror = -1; 2460 allowedxerror = -1;
2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2418 2462
2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2463 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2420 /* XXX: may need a delay here? */ 2464 /* XXX: may need a delay here? */
2421 allowedxerror = 0; 2465 allowedxerror = 0;
2422 2466
2423 if (image == NULL) 2467 if (image == NULL)
2424 { 2468 {
2425 if (am_transparent && am_pixmap_trans) 2469 if (am_transparent && am_pixmap_trans)
2426 { 2470 {
2427 pchanged = 1; 2471 pchanged = 1;
2428 if (TermWin.pixmap != None) 2472 if (pixmap != None)
2429 { 2473 {
2430 XFreePixmap (display->display, TermWin.pixmap); 2474 XFreePixmap (disp, pixmap);
2431 TermWin.pixmap = None; 2475 pixmap = None;
2432 } 2476 }
2433 } 2477 }
2434 2478
2435 am_pixmap_trans = 0; 2479 am_pixmap_trans = 0;
2436 } 2480 }
2437 else 2481 else
2438 { 2482 {
2439 if (TermWin.pixmap != None) 2483 if (pixmap != None)
2440 XFreePixmap (display->display, TermWin.pixmap); 2484 XFreePixmap (disp, pixmap);
2441 2485
2442#if TINTING 2486#if TINTING
2443 if (ISSET_PIXCOLOR (Color_tint)) 2487 if (ISSET_PIXCOLOR (Color_tint))
2444 { 2488 {
2445 unsigned short rm, gm, bm; 2489 unsigned short rm, gm, bm;
… …
2449 2493
2450 ShadeXImage (display, image, shade, rm, gm, bm); 2494 ShadeXImage (display, image, shade, rm, gm, bm);
2451 } 2495 }
2452#endif 2496#endif
2453 2497
2454 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2498 pixmap = XCreatePixmap (disp, vt,
2455 szHint.width, szHint.height, image->depth); 2499 szHint.width, szHint.height, image->depth);
2456 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2457 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2501 XPutImage (disp, pixmap, gc, image, 0, 0,
2458 nx, ny, image->width, image->height); 2502 nx, ny, image->width, image->height);
2459 XFreeGC (display->display, gc); 2503 XFreeGC (disp, gc);
2460 XDestroyImage (image); 2504 XDestroyImage (image);
2461 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2462 XClearWindow (display->display, TermWin.parent[0]); 2506 XClearWindow (disp, parent[0]);
2463 2507
2464 if (!am_transparent || !am_pixmap_trans) 2508 if (!am_transparent || !am_pixmap_trans)
2465 pchanged = 1; 2509 pchanged = 1;
2466 2510
2467 am_transparent = am_pixmap_trans = 1; 2511 am_transparent = am_pixmap_trans = 1;
2468 } 2512 }
2469 } 2513 }
2470 2514
2471 if (am_pixmap_trans) 2515 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2473 else 2517 else
2474 { 2518 {
2475 unsigned int n; 2519 unsigned int n;
2476 /* 2520 /*
2477 * InheritPixmap transparency 2521 * InheritPixmap transparency
2478 */ 2522 */
2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2480 { 2524 {
2481 oldp = TermWin.parent[i]; 2525 oldp = parent[i];
2482 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2526 XQueryTree (disp, parent[i - 1], &root,
2483 &TermWin.parent[i], &list, &n); 2527 &parent[i], &list, &n);
2484 XFree (list); 2528 XFree (list);
2485 2529
2486 if (TermWin.parent[i] == display->root) 2530 if (parent[i] == display->root)
2487 { 2531 {
2488 if (oldp != None) 2532 if (oldp != None)
2489 pchanged = 1; 2533 pchanged = 1;
2490 2534
2491 break; 2535 break;
2492 } 2536 }
2493 2537
2494 if (oldp != TermWin.parent[i]) 2538 if (oldp != parent[i])
2495 pchanged = 1; 2539 pchanged = 1;
2496 } 2540 }
2497 2541
2498 n = 0; 2542 n = 0;
2499 2543
2500 if (pchanged) 2544 if (pchanged)
2501 { 2545 {
2502 for (; n < (unsigned int)i; n++) 2546 for (; n < (unsigned int)i; n++)
2503 { 2547 {
2504 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2548 XGetWindowAttributes (disp, parent[n], &wattr);
2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2506 { 2550 {
2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2508 break; 2552 break;
2509 } 2553 }
2510 } 2554 }
2511 } 2555 }
2512 2556
2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2557 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2514 { 2558 {
2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2517 am_transparent = 0; 2561 am_transparent = 0;
2518 /* XXX: also turn off Opt_transparent? */ 2562 /* XXX: also turn off Opt_transparent? */
2519 } 2563 }
2520 else 2564 else
2521 { 2565 {
… …
2524 * needed for fvwm2.2.2 (and before?) */ 2568 * needed for fvwm2.2.2 (and before?) */
2525 sleep (1); 2569 sleep (1);
2526#endif 2570#endif
2527 for (n = 0; n < (unsigned int)i; n++) 2571 for (n = 0; n < (unsigned int)i; n++)
2528 { 2572 {
2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2530 XClearWindow (display->display, TermWin.parent[n]); 2574 XClearWindow (disp, parent[n]);
2531 } 2575 }
2532 2576
2533 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2534 am_transparent = 1; 2578 am_transparent = 1;
2535 } 2579 }
2536 2580
2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2538 TermWin.parent[i] = None; 2582 parent[i] = None;
2539 } 2583 }
2540 2584
2541 if (scrollBar.win) 2585 if (scrollBar.win)
2542 { 2586 {
2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2544 scrollBar.setIdle (); 2588 scrollBar.setIdle ();
2545 scrollbar_show (0); 2589 scrollbar_show (0);
2546 } 2590 }
2547 2591
2548 if (am_transparent) 2592 if (am_transparent)
… …
2586 // some window managers resize the window early, and these programs 2630 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong. 2631 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike 2632 // unfortunately other programs are even more buggy and dislike
2589 // 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
2590 // resized. 2634 // resized.
2591 if (seen_resize) 2635 if (seen_resize && cmd_pid)
2592 kill (-cmd_pid, SIGWINCH); 2636 kill (-cmd_pid, SIGWINCH);
2593 } 2637 }
2594 2638
2595 /* Read a text string from the input buffer */ 2639 /* Read a text string from the input buffer */
2596 unicode_t buf[UBUFSIZ]; 2640 unicode_t buf[UBUFSIZ];
2597 bool refreshnow = false; 2641 bool refreshnow = false;
2598 int nlines = 0; 2642 int nlines = 0;
2599 unicode_t *str = buf; 2643 unicode_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ);
2600 2645
2601 for (;;) 2646 for (;;)
2602 { 2647 {
2603 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))
2604 break; 2649 break;
2605 2650
2606 *str++ = ch; 2651 *str++ = ch;
2607 2652
2608 if (ch == C0_LF) 2653 if (ch == C0_LF || str >= eol)
2609 { 2654 {
2655 if (ch == C0_LF)
2610 nlines++; 2656 nlines++;
2657
2611 refresh_count++; 2658 refresh_count++;
2612 2659
2613 if (!(options & Opt_jumpScroll) 2660 if (!(options & Opt_jumpScroll)
2614 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2661 || (refresh_count >= refresh_limit * (nrow - 1)))
2615 { 2662 {
2616 refreshnow = true; 2663 refreshnow = true;
2617 ch = NOCHAR; 2664 ch = NOCHAR;
2618 break; 2665 break;
2619 } 2666 }
2620 2667
2621 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2668 // scr_add_lines only works for nlines <= nrow - 1.
2622 if (nlines >= TermWin.nrow - 1) 2669 if (nlines >= nrow - 1)
2623 { 2670 {
2624 scr_add_lines (buf, nlines, str - buf); 2671 scr_add_lines (buf, nlines, str - buf);
2625 nlines = 0; 2672 nlines = 0;
2626 str = buf; 2673 str = buf;
2674 eol = str + min (ncol, UBUFSIZ);
2627 } 2675 }
2628 }
2629 2676
2630 if (str >= buf + UBUFSIZ) 2677 if (str >= eol)
2631 { 2678 {
2679 if (eol >= buf + UBUFSIZ)
2680 {
2632 ch = NOCHAR; 2681 ch = NOCHAR;
2633 break; 2682 break;
2683 }
2684 else
2685 eol = min (eol + ncol, buf + UBUFSIZ);
2686 }
2687
2634 } 2688 }
2635 2689
2636 seq_begin = cmdbuf_ptr; 2690 seq_begin = cmdbuf_ptr;
2637 ch = next_char (); 2691 ch = next_char ();
2638 } 2692 }
… …
2709 if (len == (size_t)-1) 2763 if (len == (size_t)-1)
2710 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
2711 2765
2712 // assume wchar == unicode 2766 // assume wchar == unicode
2713 cmdbuf_ptr += len; 2767 cmdbuf_ptr += len;
2714 return wc; 2768 return wc & UNICODE_MASK;
2715 } 2769 }
2716 2770
2717 return NOCHAR; 2771 return NOCHAR;
2718} 2772}
2719 2773
… …
3182 { 3236 {
3183 switch (priv) 3237 switch (priv)
3184 { 3238 {
3185 case '>': 3239 case '>':
3186 if (ch == CSI_DA) /* secondary device attributes */ 3240 if (ch == CSI_DA) /* secondary device attributes */
3187 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3241 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3188 break; 3242 break;
3189 case '?': 3243 case '?':
3190 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3244 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3191 process_terminal_mode (ch, priv, nargs, arg); 3245 process_terminal_mode (ch, priv, nargs, arg);
3192 break; 3246 break;
… …
3297 3351
3298 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3352 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3299 arg[0] = -arg[0]; 3353 arg[0] = -arg[0];
3300 /* FALLTHROUGH */ 3354 /* FALLTHROUGH */
3301 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3302 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3303 break; 3357 break;
3304 3358
3305 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3306 tt_write ((const unsigned char *)VT100_ANS, 3360 tt_write ((const unsigned char *)VT100_ANS,
3307 (unsigned int) (sizeof (VT100_ANS) - 1)); 3361 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3421rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3475rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3422{ 3476{
3423 int x, y; 3477 int x, y;
3424 XWindowAttributes wattr; 3478 XWindowAttributes wattr;
3425 Window wdummy; 3479 Window wdummy;
3480 dDisp;
3426 3481
3427 if (nargs == 0) 3482 if (nargs == 0)
3428 return; 3483 return;
3429 3484
3430 switch (args[0]) 3485 switch (args[0])
3431 { 3486 {
3432 /* 3487 /*
3433 * commands 3488 * commands
3434 */ 3489 */
3435 case 1: /* deiconify window */ 3490 case 1: /* deiconify window */
3436 XMapWindow (display->display, TermWin.parent[0]); 3491 XMapWindow (disp, parent[0]);
3437 break; 3492 break;
3438 case 2: /* iconify window */ 3493 case 2: /* iconify window */
3439 XIconifyWindow (display->display, TermWin.parent[0], 3494 XIconifyWindow (disp, parent[0], display->screen);
3440 DefaultScreen (display->display));
3441 break; 3495 break;
3442 case 3: /* set position (pixels) */ 3496 case 3: /* set position (pixels) */
3443 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3497 XMoveWindow (disp, parent[0], args[1], args[2]);
3444 break; 3498 break;
3445 case 4: /* set size (pixels) */ 3499 case 4: /* set size (pixels) */
3446 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3447 break; 3501 break;
3448 case 5: /* raise window */ 3502 case 5: /* raise window */
3449 XRaiseWindow (display->display, TermWin.parent[0]); 3503 XRaiseWindow (disp, parent[0]);
3450 break; 3504 break;
3451 case 6: /* lower window */ 3505 case 6: /* lower window */
3452 XLowerWindow (display->display, TermWin.parent[0]); 3506 XLowerWindow (disp, parent[0]);
3453 break; 3507 break;
3454 case 7: /* refresh window */ 3508 case 7: /* refresh window */
3455 scr_touch (true); 3509 scr_touch (true);
3456 break; 3510 break;
3457 case 8: /* set size (chars) */ 3511 case 8: /* set size (chars) */
3458 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3512 set_widthheight ((unsigned int) (args[2] * fwidth),
3459 (unsigned int) (args[1] * TermWin.fheight)); 3513 (unsigned int) (args[1] * fheight));
3460 break; 3514 break;
3461 3515
3462 //case 9: NYI, TODO, restore maximized window or maximize window 3516 //case 9: NYI, TODO, restore maximized window or maximize window
3463 default: 3517 default:
3464 if (args[0] >= 24) /* set height (chars) */ 3518 if (args[0] >= 24) /* set height (chars) */
3465 set_widthheight ((unsigned int)TermWin.width, 3519 set_widthheight ((unsigned int)width,
3466 (unsigned int) (args[1] * TermWin.fheight)); 3520 (unsigned int) (args[1] * fheight));
3467 break; 3521 break;
3468 3522
3469 3523
3470 /* 3524 /*
3471 * reports - some output format copied from XTerm 3525 * reports - some output format copied from XTerm
3472 */ 3526 */
3473 case 11: /* report window state */ 3527 case 11: /* report window state */
3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3528 XGetWindowAttributes (disp, parent[0], &wattr);
3475 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3476 break; 3530 break;
3477 case 13: /* report window position */ 3531 case 13: /* report window position */
3478 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3532 XGetWindowAttributes (disp, parent[0], &wattr);
3479 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3533 XTranslateCoordinates (disp, parent[0], wattr.root,
3480 -wattr.border_width, -wattr.border_width, 3534 -wattr.border_width, -wattr.border_width,
3481 &x, &y, &wdummy); 3535 &x, &y, &wdummy);
3482 tt_printf ("\033[3;%d;%dt", x, y); 3536 tt_printf ("\033[3;%d;%dt", x, y);
3483 break; 3537 break;
3484 case 14: /* report window size (pixels) */ 3538 case 14: /* report window size (pixels) */
3485 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3539 XGetWindowAttributes (disp, parent[0], &wattr);
3486 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3487 break; 3541 break;
3488 case 18: /* report text area size (chars) */ 3542 case 18: /* report text area size (chars) */
3489 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3543 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3490 break; 3544 break;
3491 case 19: /* report window size (chars) */ 3545 case 19: /* report window size (chars) */
3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3546 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3493 break; 3547 break;
3494 case 20: /* report icon label */ 3548 case 20: /* report icon label */
3495 { 3549 {
3496 char *s; 3550 char *s;
3497 XGetIconName (display->display, TermWin.parent[0], &s); 3551 XGetIconName (disp, parent[0], &s);
3498 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 */
3499 XFree (s); 3553 XFree (s);
3500 } 3554 }
3501 break; 3555 break;
3502 case 21: /* report window title */ 3556 case 21: /* report window title */
3503 { 3557 {
3504 char *s; 3558 char *s;
3505 XFetchName (display->display, TermWin.parent[0], &s); 3559 XFetchName (disp, parent[0], &s);
3506 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 */
3507 XFree (s); 3561 XFree (s);
3508 } 3562 }
3509 break; 3563 break;
3510 } 3564 }
… …
3543 else if (ch < 0x20) 3597 else if (ch < 0x20)
3544 return NULL; /* other control character - exit */ 3598 return NULL; /* other control character - exit */
3545 3599
3546 seen_esc = false; 3600 seen_esc = false;
3547 3601
3548 if (n >= sizeof (string) - 1) 3602 if (n >= STRING_MAX - 1)
3549 // stop at some sane length 3603 // stop at some sane length
3550 return NULL; 3604 return NULL;
3551 3605
3552 if (ch == C0_SYN) 3606 if (ch == C0_SYN)
3553 string[n++] = cmd_get8 (); 3607 string[n++] = cmd_get8 ();
… …
3621 set_window_color (color, str); 3675 set_window_color (color, str);
3622} 3676}
3623 3677
3624/* 3678/*
3625 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3679 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3626 * 0 = change iconName/title
3627 * 1 = change iconName
3628 * 2 = change title
3629 * 4 = change color
3630 * 10 = change fg color
3631 * 11 = change bg color
3632 * 12 = change text color
3633 * 13 = change mouse foreground color
3634 * 17 = change highlight character colour
3635 * 18 = change bold character color
3636 * 19 = change underlined character color
3637 * 46 = change logfile (not implemented)
3638 * 50 = change font
3639 *
3640 * rxvt extensions:
3641 * 20 = bg pixmap
3642 * 39 = change default fg color
3643 * 49 = change default bg color
3644 * 55 = dump scrollback buffer and all of screen
3645 * 701 = change locale
3646 * 702 = find font
3647 * 703 = menu
3648 */ 3680 */
3649void 3681void
3650rxvt_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)
3651{ 3683{
3652 int changed = 0; 3684 int changed = 0;
3653 int color; 3685 int color;
3654 char *buf, *name; 3686 char *buf, *name;
3655 bool query = str[0] == '?' && !str[1]; 3687 bool query = str[0] == '?' && !str[1];
3656 int saveop = op; 3688 int saveop = op;
3689 dDisp;
3657 3690
3658 assert (str != NULL); 3691 assert (str != NULL);
3659 switch (op) 3692 switch (op)
3660 { 3693 {
3661 case XTerm_name: 3694 case XTerm_name:
… …
3677 unsigned long bytes_after; 3710 unsigned long bytes_after;
3678 unsigned char *value = 0; 3711 unsigned char *value = 0;
3679 const char *str = ""; 3712 const char *str = "";
3680 3713
3681 if (prop 3714 if (prop
3682 && XGetWindowProperty (display->display, TermWin.parent[0], 3715 && XGetWindowProperty (disp, parent[0],
3683 prop, 0, 1<<16, 0, AnyPropertyType, 3716 prop, 0, 1<<16, 0, AnyPropertyType,
3684 &actual_type, &actual_format, 3717 &actual_type, &actual_format,
3685 &nitems, &bytes_after, &value) == Success 3718 &nitems, &bytes_after, &value) == Success
3686 && actual_type != None 3719 && actual_type != None
3687 && actual_format == 8) 3720 && actual_format == 8)
… …
3699 { 3732 {
3700 *eq = 0; 3733 *eq = 0;
3701 set_utf8_property (display->atom (str), eq + 1); 3734 set_utf8_property (display->atom (str), eq + 1);
3702 } 3735 }
3703 else 3736 else
3704 XDeleteProperty (display->display, TermWin.parent[0], 3737 XDeleteProperty (disp, parent[0],
3705 display->atom (str)); 3738 display->atom (str));
3706 } 3739 }
3707 break; 3740 break;
3708 3741
3709 case XTerm_Color: 3742 case XTerm_Color:
… …
3750 break; 3783 break;
3751#ifndef NO_BOLD_UNDERLINE_REVERSE 3784#ifndef NO_BOLD_UNDERLINE_REVERSE
3752 case XTerm_Color_BD: 3785 case XTerm_Color_BD:
3753 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3786 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3754 break; 3787 break;
3755 case XTerm_Color_IT:
3756 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3757 break;
3758 case XTerm_Color_UL: 3788 case XTerm_Color_UL:
3759 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3789 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3760 break; 3790 break;
3761 case XTerm_Color_RV: 3791 case XTerm_Color_RV:
3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3763 break; 3793 break;
3794 case URxvt_Color_IT:
3795 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3796 break;
3764#endif 3797#endif
3765#if TRANSPARENT && TINTING 3798#if TRANSPARENT && TINTING
3766 case XTerm_Color_tint: 3799 case URxvt_Color_tint:
3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3800 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3768 check_our_parents (); 3801 check_our_parents ();
3769 if (am_transparent) 3802 if (am_transparent)
3770 want_full_refresh = want_refresh = 1; 3803 want_full_refresh = want_refresh = 1;
3771 break; 3804 break;
3772#endif 3805#endif
… …
3784 { 3817 {
3785 str++; 3818 str++;
3786#if XPM_BACKGROUND 3819#if XPM_BACKGROUND
3787 changed += scale_pixmap (str); 3820 changed += scale_pixmap (str);
3788#endif 3821#endif
3789
3790 } 3822 }
3823
3791 if (changed) 3824 if (changed)
3792 { 3825 {
3793#ifdef XPM_BACKGROUND 3826#ifdef XPM_BACKGROUND
3794 resize_pixmap (); 3827 resize_pixmap ();
3795#endif 3828#endif
… …
3806 3839
3807 case XTerm_logfile: 3840 case XTerm_logfile:
3808 // TODO, when secure mode? 3841 // TODO, when secure mode?
3809 break; 3842 break;
3810 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
3811 case XTerm_font: 3862 case XTerm_font:
3812 op = URxvt_font; 3863 op = URxvt_font;
3813 case URxvt_font: 3864 case URxvt_font:
3814#if ENABLE_STYLES 3865#if ENABLE_STYLES
3815 case URxvt_boldFont: 3866 case URxvt_boldFont:
3816 case URxvt_italicFont: 3867 case URxvt_italicFont:
3817 case URxvt_boldItalicFont: 3868 case URxvt_boldItalicFont:
3818#endif 3869#endif
3819 if (query) 3870 if (query)
3820 tt_printf ("\33]%d;%-.250s%c", saveop, 3871 tt_printf ("\33]%d;%-.250s%c", saveop,
3821 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3822 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3873 ? fontset[op - URxvt_font]->fontdesc : "",
3823 resp); 3874 resp);
3824 else 3875 else
3825 { 3876 {
3826 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3877 const char *&res = rs[Rs_font + (op - URxvt_font)];
3827 3878
… …
3830 set_fonts (); 3881 set_fonts ();
3831 } 3882 }
3832 break; 3883 break;
3833 3884
3834#if ENABLE_FRILLS 3885#if ENABLE_FRILLS
3835 case XTerm_locale: 3886 case URxvt_locale:
3836 if (query) 3887 if (query)
3837 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);
3838 else 3889 else
3839 { 3890 {
3840 set_locale (str); 3891 set_locale (str);
3841# ifdef USE_XIM 3892 pty.set_utf8_mode (enc_utf8);
3842 im_cb (); 3893 init_xlocale ();
3843# endif
3844 } 3894 }
3845 break; 3895 break;
3846#endif
3847 3896
3848#ifdef MENUBAR 3897 case URxvt_view_up:
3849 case XTerm_Menu: 3898 case URxvt_view_down:
3850 if (options & Opt_insecure) 3899 int lines = atoi (str);
3851 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3900
3852 break; 3901 if (lines)
3853#endif 3902 scr_page (op == URxvt_view_up ? UP : DN, lines);
3854#if 0
3855 case XTerm_dumpscreen: /* no error notices */
3856 { 3903 else
3857 int fd;
3858 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3859 { 3904 {
3860 scr_dump (fd); 3905 scr_erase_savelines ();
3861 close (fd);
3862 } 3906 }
3863 } 3907
3864 break; 3908 break;
3865#endif 3909#endif
3866 } 3910 }
3867} 3911}
3868/*----------------------------------------------------------------------*/ 3912/*----------------------------------------------------------------------*/
… …
4001 */ 4045 */
4002 PrivMode (1, PrivMode_vt52); 4046 PrivMode (1, PrivMode_vt52);
4003 break; 4047 break;
4004 case 3: /* 80/132 */ 4048 case 3: /* 80/132 */
4005 if (priv_modes & PrivMode_132OK) 4049 if (priv_modes & PrivMode_132OK)
4006 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4050 set_widthheight (((state ? 132 : 80) * fwidth), height);
4007 break; 4051 break;
4008 case 4: /* smooth scrolling */ 4052 case 4: /* smooth scrolling */
4009 if (state) 4053 if (state)
4010 options &= ~Opt_jumpScroll; 4054 options &= ~Opt_jumpScroll;
4011 else 4055 else
… …
4328 } 4372 }
4329 4373
4330 memmove (v_buffer, v_buffer + written, v_buflen); 4374 memmove (v_buffer, v_buffer + written, v_buflen);
4331 } 4375 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4376 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this... 4377 pty_ev.set (EVENT_READ);
4334 destroy ();
4335} 4378}
4336 4379
4337/*----------------------- end-of-file (C source) -----------------------*/ 4380/*----------------------- end-of-file (C source) -----------------------*/
4338 4381

Diff Legend

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