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.68 by pcg, Sun Mar 14 17:33:07 2004 UTC vs.
Revision 1.269 by root, Tue Jan 17 12:22:59 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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-2006 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.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
63#include <csignal>
54 64
55/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755
73
74#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
77#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
78#define ISO_14755_MASK 0x0fffffffUL
79
80#if ISO_14755
81static unsigned short iso14755_symtab[] = {
82 // keysym, unicode
83 XK_Left, 0x2190,
84 XK_KP_Left, 0x2190,
85 XK_Up, 0x2191,
86 XK_KP_Up, 0x2191,
87 XK_Right, 0x2192,
88 XK_KP_Right, 0x2192,
89 XK_Down, 0x2193,
90 XK_KP_Down, 0x2193,
91 XK_Linefeed, 0x21b4,
92 XK_Return, 0x21b5,
93 XK_KP_Enter, 0x21b5,
94
95 XK_Prior, 0x21de,
96 XK_Next, 0x21df,
97 XK_Tab, 0x21e5,
98 XK_ISO_Left_Tab, 0x21e6,
99 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7,
101
102 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0,
110 XK_Home, 0x21f1,
111 XK_End, 0x21f2,
112
113 XK_Execute, 0x2318,
114 XK_Begin, 0x2320,
115 XK_Delete, 0x2326,
116 XK_Clear, 0x2327,
117 XK_BackSpace, 0x232b,
118 XK_Insert, 0x2380,
119 XK_Control_L, 0x2388,
120 XK_Control_R, 0x2388,
121 XK_Pause, 0x2389,
122 XK_Break, 0x238a,
123 XK_Escape, 0x238b,
124 XK_Undo, 0x238c,
125 XK_Print, 0x2399,
126
127 XK_space, 0x2423,
128
129#ifdef XK_KP_Begin
130 XK_KP_Prior, 0x21de,
131 XK_KP_Next, 0x21df,
132 XK_KP_Begin, 0x2320,
133 XK_KP_Insert, 0x2380,
134 XK_KP_Delete, 0x2326,
135 XK_KP_Space, 0x2422,
136#endif
137 0,
138};
139
140void
141rxvt_term::iso14755_54 (int x, int y)
142{
143 x = Pixel2Col (x);
144 y = Pixel2Row (y);
145
146 if (!IN_RANGE_EXC (x, 0, ncol)
147 || !IN_RANGE_EXC (y, 0, nrow))
148 return;
149
150 for (;;)
151 {
152 const line_t &l = ROW(y + view_start);
153
154 text_t t = l.t[x];
155
156 if (t != NOCHAR || !x)
157 {
158 iso14755_51 (l.t[x], l.r[x], x, y);
159 iso14755buf = ISO_14755_54;
160 break;
161 }
162
163 x--;
164 }
165}
166
167void
168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
169{
170 rxvt_fontset *fs = FONTSET (r);
171 rxvt_font *f = (*fs)[fs->find_font (ch)];
172 wchar_t *chr, *alloc, ch2, *fname;
173 int len;
174
175 fname = rxvt_utf8towcs (f->name);
176
177# if ENABLE_COMBINING
178 if (IS_COMPOSE (ch))
179 {
180 len = rxvt_composite.expand (ch, 0);
181 alloc = chr = new wchar_t[len];
182 rxvt_composite.expand (ch, chr);
183 }
184 else
185# endif
186 {
187 ch2 = ch;
188
189 alloc = 0;
190 chr = &ch2;
191 len = 1;
192 }
193
194 char attr[80]; // plenty
195
196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
218
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220
221 for (int y = 0; y < len; y++)
222 {
223 char buf[9];
224
225 ch = *chr++;
226
227 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf);
229 scr_overlay_set (9, y, '=');
230# if !UNICODE3
231 if (ch >= 0x10000)
232 ch = 0xfffd;
233# endif
234 scr_overlay_set (11, y, ch, r);
235 scr_overlay_set (12, y, NOCHAR, r);
236 }
237
238 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname);
240
241 free (fname);
242
243# if ENABLE_COMBINING
244 if (alloc)
245 delete [] alloc;
246# endif
247}
248#endif
249
250void
251rxvt_term::commit_iso14755 ()
252{
253 wchar_t ch[2];
254
255 ch[0] = iso14755buf & ISO_14755_MASK;
256 ch[1] = 0;
257
258 if (iso14755buf & ISO_14755_51)
259 {
260 char mb[16];
261 int len;
262
263 // allow verbatim 0-bytes and control-bytes to be entered
264 if (ch[0] >= 0x20)
265 len = wcstombs (mb, ch, 16);
266 else
267 {
268 mb[0] = ch[0];
269 len = 1;
270 }
271
272 if (len > 0)
273 tt_write (mb, len);
274 else
275 scr_bell ();
276 }
277
278 iso14755buf = 0;
279}
280
281int
282rxvt_term::hex_keyval (XKeyEvent &ev)
283{
284 // check wether this event corresponds to a hex digit
285 // if the modifiers had not been pressed.
286 for (int index = 0; index < 8; index++)
287 {
288 KeySym k = XLookupKeysym (&ev, index);
289
290 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
291 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
292 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
293 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
294 }
295
296 return -1;
297}
298#endif
56 299
57/*{{{ Convert the keypress event into a string */ 300/*{{{ Convert the keypress event into a string */
58void 301void
59rxvt_term::lookup_key (XKeyEvent &ev) 302rxvt_term::lookup_key (XKeyEvent &ev)
60{ 303{
… …
63 KeySym keysym; 306 KeySym keysym;
64#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
65 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
66#endif 309#endif
67 int valid_keysym; 310 int valid_keysym;
68 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
69 312
70 /* 313 /*
71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
72 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
73 * 316 *
74 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
75 */ 318 */
76 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
77 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
78 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
79 322
80 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
81 { 324 {
82 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
83 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
88#ifdef USE_XIM 331#ifdef USE_XIM
89 if (Input_Context) 332 if (Input_Context)
90 { 333 {
91 Status status_return; 334 Status status_return;
92 335
336#if 0
93#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
96 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
97 else 341 else
342#endif
98#endif 343#endif
99 { 344 {
100 wchar_t wkbuf[KBUFSZ + 1]; 345 wchar_t wkbuf[KBUFSZ + 1];
101 346
102 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
106 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
109 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 357 SET_LOCALE (locale);
111 358
112 if (status_return == XLookupChars 359 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
134 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
135 } 382 }
136 else 383 else
137#endif 384#endif
138 { 385 {
139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
140 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
141 } 388 }
142 389
143 if (valid_keysym) 390 if (valid_keysym)
144 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
145 if (TermWin.saveLines) 397 if (saveLines)
146 { 398 {
147#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
148 if (!ctrl && !meta) 400 if (!ctrl && !meta)
149 {
150#else 401#else
151 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
403#endif
152 { 404 {
153#endif
154 int lnsppg; 405 int lnsppg;
155 406
156#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
157 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
158#else 409#else
159 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
160#endif 411#endif
161 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
162 { 413 {
163 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
164 return; 415 return;
… …
192 scr_move_to (0, 1); 443 scr_move_to (0, 1);
193 return; 444 return;
194 } 445 }
195 else if (keysym == XK_End) 446 else if (keysym == XK_End)
196 { 447 {
197 scr_move_to (1, 0); 448 scr_move_to (1, 1);
198 return; 449 return;
199 } 450 }
200 } 451 }
201#endif 452#endif
202 } 453 }
… …
207 if (keysym >= XK_F1 && keysym <= XK_F10) 458 if (keysym >= XK_F1 && keysym <= XK_F10)
208 { 459 {
209 keysym += (XK_F11 - XK_F1); 460 keysym += (XK_F11 - XK_F1);
210 shft = 0; /* turn off Shift */ 461 shft = 0; /* turn off Shift */
211 } 462 }
212 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 463 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
213 { 464 {
214 switch (keysym) 465 switch (keysym)
215 { 466 {
216 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
217 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
218 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, 0, 0);
219 return; 470 return;
471#if TODO
220 /* rxvt extras */ 472 /* rxvt extras */
221 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
222 change_font (FONT_UP); 474 change_font (FONT_UP);
223 return; 475 return;
224 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
225 change_font (FONT_DN); 477 change_font (FONT_DN);
226 return; 478 return;
479#endif
227 } 480 }
228 } 481 }
229 } 482 }
230#ifdef PRINTPIPE 483
231 if (keysym == XK_Print) 484#if ENABLE_FRILLS || ISO_14755
232 { 485 // ISO 14755 support
233 scr_printscreen (ctrl | shft); 486 if (shft && ctrl)
234 return;
235 } 487 {
236#endif 488 int hv;
237 489
238 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 490 if (iso14755buf & ISO_14755_51
239 { 491 && (keysym == XK_space || keysym == XK_KP_Space
240#ifdef KEYSYM_RESOURCE 492 || keysym == XK_Return || keysym == XK_KP_Enter))
241 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
242 { 493 {
243 unsigned int l; 494 commit_iso14755 ();
244 const unsigned char *kbuf0; 495 iso14755buf = ISO_14755_51;
245 496# if ISO_14755
246 kbuf0 = (Keysym_map[keysym & 0xFF]); 497 iso14755_51 (0);
247 l = (unsigned int)*kbuf0++;
248
249 /* escape prefix */
250 if (meta
251# ifdef META8_OPTION
252 && meta_char == C0_ESC
253# endif 498# endif
254 ) 499 return;
255 {
256 const unsigned char ch = C0_ESC;
257 tt_write (&ch, 1);
258 } 500 }
259 501 else if ((hv = hex_keyval (ev)) >= 0)
260 tt_write (kbuf0, l); 502 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51;
505# if ISO_14755
506 iso14755_51 (iso14755buf & ISO_14755_MASK);
507# endif
261 return; 508 return;
262 } 509 }
263 else 510 else
511 {
512# if ENABLE_OVERLAY
513 scr_overlay_off ();
264#endif 514# endif
515 iso14755buf = 0;
516 }
517 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED))
521 {
522 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif
527 }
528#endif
529
530#ifdef PRINTPIPE
531 if (keysym == XK_Print)
532 {
533 scr_printscreen (ctrl | shft);
534 return;
535 }
536#endif
537
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 {
265 { 540 {
266 newlen = 1; 541 newlen = 1;
267 switch (keysym) 542 switch (keysym)
268 { 543 {
269#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
270 case XK_BackSpace: 545 case XK_BackSpace:
271 if (PrivateModes & PrivMode_HaveBackSpace) 546 if (priv_modes & PrivMode_HaveBackSpace)
272 { 547 {
273 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
274 ^ !!ctrl) ? '\b' : '\177'; 549 ^ !!ctrl) ? '\b' : '\177';
275 kbuf[1] = '\0'; 550 kbuf[1] = '\0';
276 } 551 }
277 else 552 else
278 STRCPY (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
279 break; 554 break;
280#endif 555#endif
281#ifndef NO_DELETE_KEY 556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
282 case XK_Delete: 567 case XK_Delete:
283 STRCPY (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
284 break; 569 break;
285#endif 570#endif
286 case XK_Tab: 571 case XK_Tab:
287 if (shft) 572 if (shft)
288 STRCPY (kbuf, "\033[Z"); 573 strcpy (kbuf, "\033[Z");
289 else 574 else
290 { 575 {
291#ifdef CTRL_TAB_MAKES_META 576#ifdef CTRL_TAB_MAKES_META
292 if (ctrl) 577 if (ctrl)
293 meta = 1; 578 meta = 1;
… …
299 newlen = 0; 584 newlen = 0;
300 } 585 }
301 break; 586 break;
302 587
303#ifdef XK_KP_Left 588#ifdef XK_KP_Left
304 case XK_KP_Up: /* \033Ox or standard */ 589 case XK_KP_Up: /* \033Ox or standard */
305 case XK_KP_Down: /* \033Or or standard */ 590 case XK_KP_Down: /* \033Or or standard */
306 case XK_KP_Right: /* \033Ov or standard */ 591 case XK_KP_Right: /* \033Ov or standard */
307 case XK_KP_Left: /* \033Ot or standard */ 592 case XK_KP_Left: /* \033Ot or standard */
308 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
309 { 594 {
310 STRCPY (kbuf, "\033OZ"); 595 strcpy (kbuf, "\033OZ");
311 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
312 break; 597 break;
313 } 598 }
314 else 599 else
315 /* translate to std. cursor key */ 600 /* translate to std. cursor key */
… …
318#endif 603#endif
319 case XK_Up: /* "\033[A" */ 604 case XK_Up: /* "\033[A" */
320 case XK_Down: /* "\033[B" */ 605 case XK_Down: /* "\033[B" */
321 case XK_Right: /* "\033[C" */ 606 case XK_Right: /* "\033[C" */
322 case XK_Left: /* "\033[D" */ 607 case XK_Left: /* "\033[D" */
323 STRCPY (kbuf, "\033[Z"); 608 strcpy (kbuf, "\033[Z");
324 kbuf[2] = "DACB"[keysym - XK_Left]; 609 kbuf[2] = "DACB"[keysym - XK_Left];
325 /* do Shift first */ 610 /* do Shift first */
326 if (shft) 611 if (shft)
327 kbuf[2] = "dacb"[keysym - XK_Left]; 612 kbuf[2] = "dacb"[keysym - XK_Left];
328 else if (ctrl) 613 else if (ctrl)
329 { 614 {
330 kbuf[1] = 'O'; 615 kbuf[1] = 'O';
331 kbuf[2] = "dacb"[keysym - XK_Left]; 616 kbuf[2] = "dacb"[keysym - XK_Left];
332 } 617 }
333 else if (PrivateModes & PrivMode_aplCUR) 618 else if (priv_modes & PrivMode_aplCUR)
334 kbuf[1] = 'O'; 619 kbuf[1] = 'O';
335 break; 620 break;
336 621
337#ifndef UNSHIFTED_SCROLLKEYS 622#ifndef UNSHIFTED_SCROLLKEYS
338# ifdef XK_KP_Prior 623# ifdef XK_KP_Prior
339 case XK_KP_Prior: 624 case XK_KP_Prior:
340 /* allow shift to override */ 625 /* allow shift to override */
341 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
342 { 627 {
343 STRCPY (kbuf, "\033Oy"); 628 strcpy (kbuf, "\033Oy");
344 break; 629 break;
345 } 630 }
346 /* FALLTHROUGH */ 631 /* FALLTHROUGH */
347# endif 632# endif
348 case XK_Prior: 633 case XK_Prior:
349 STRCPY (kbuf, "\033[5~"); 634 strcpy (kbuf, "\033[5~");
350 break; 635 break;
351# ifdef XK_KP_Next 636# ifdef XK_KP_Next
352 case XK_KP_Next: 637 case XK_KP_Next:
353 /* allow shift to override */ 638 /* allow shift to override */
354 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
355 { 640 {
356 STRCPY (kbuf, "\033Os"); 641 strcpy (kbuf, "\033Os");
357 break; 642 break;
358 } 643 }
359 /* FALLTHROUGH */ 644 /* FALLTHROUGH */
360# endif 645# endif
361 case XK_Next: 646 case XK_Next:
362 STRCPY (kbuf, "\033[6~"); 647 strcpy (kbuf, "\033[6~");
363 break; 648 break;
364#endif 649#endif
365 case XK_KP_Enter: 650 case XK_KP_Enter:
366 /* allow shift to override */ 651 /* allow shift to override */
367 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
368 { 653 {
369 STRCPY (kbuf, "\033OM"); 654 strcpy (kbuf, "\033OM");
655 break;
656 }
657
658 /* FALLTHROUGH */
659
660 case XK_Return:
661 if (priv_modes & PrivMode_LFNL)
662 {
663 kbuf[0] = '\015';
664 kbuf[1] = '\012';
665 kbuf[2] = '\0';
370 } 666 }
371 else 667 else
372 { 668 {
373 kbuf[0] = '\r'; 669 kbuf[0] = '\015';
374 kbuf[1] = '\0'; 670 kbuf[1] = '\0';
375 } 671 }
376 break; 672 break;
377 673
378#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
379 case XK_KP_Begin: 675 case XK_KP_Begin:
380 STRCPY (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
381 break; 677 break;
382 678
383 case XK_KP_Insert:
384 STRCPY (kbuf, "\033Op");
385 break;
386
387 case XK_KP_Delete:
388 STRCPY (kbuf, "\033On");
389 break;
390#endif 679#endif
391 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
392 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
393 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
394 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
395 STRCPY (kbuf, "\033OP"); 684 strcpy (kbuf, "\033OP");
396 kbuf[2] += (keysym - XK_KP_F1); 685 kbuf[2] += (keysym - XK_KP_F1);
397 break; 686 break;
398 687
399 case XK_KP_Multiply: /* "\033Oj" : "*" */ 688 case XK_KP_Multiply: /* "\033Oj" : "*" */
400 case XK_KP_Add: /* "\033Ok" : "+" */ 689 case XK_KP_Add: /* "\033Ok" : "+" */
… …
411 case XK_KP_6: /* "\033Ov" : "6" */ 700 case XK_KP_6: /* "\033Ov" : "6" */
412 case XK_KP_7: /* "\033Ow" : "7" */ 701 case XK_KP_7: /* "\033Ow" : "7" */
413 case XK_KP_8: /* "\033Ox" : "8" */ 702 case XK_KP_8: /* "\033Ox" : "8" */
414 case XK_KP_9: /* "\033Oy" : "9" */ 703 case XK_KP_9: /* "\033Oy" : "9" */
415 /* allow shift to override */ 704 /* allow shift to override */
416 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
417 { 706 {
418 STRCPY (kbuf, "\033Oj"); 707 strcpy (kbuf, "\033Oj");
419 kbuf[2] += (keysym - XK_KP_Multiply); 708 kbuf[2] += (keysym - XK_KP_Multiply);
420 } 709 }
421 else 710 else
422 { 711 {
423 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
424 kbuf[1] = '\0'; 713 kbuf[1] = '\0';
425 } 714 }
426 break; 715 break;
427 716
428 case XK_Find: 717 case XK_Find:
429 STRCPY (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
430 break; 719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
431 case XK_Insert: 731 case XK_Insert:
432 STRCPY (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
433 break; 733 break;
434#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
435 case DXK_Remove: 735 case DXK_Remove:
436 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
437#endif 737#endif
438 case XK_Execute: 738 case XK_Execute:
439 STRCPY (kbuf, "\033[3~"); 739 strcpy (kbuf, "\033[3~");
440 break; 740 break;
441 case XK_Select: 741 case XK_Select:
442 STRCPY (kbuf, "\033[4~"); 742 strcpy (kbuf, "\033[4~");
443 break; 743 break;
444#ifdef XK_KP_End 744#ifdef XK_KP_End
445 case XK_KP_End: 745 case XK_KP_End:
446 /* allow shift to override */ 746 /* allow shift to override */
447 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
448 { 748 {
449 STRCPY (kbuf, "\033Oq"); 749 strcpy (kbuf, "\033Oq");
450 break; 750 break;
451 } 751 }
452 /* FALLTHROUGH */ 752 /* FALLTHROUGH */
453#endif 753#endif
454 case XK_End: 754 case XK_End:
455 STRCPY (kbuf, KS_END); 755 strcpy (kbuf, KS_END);
456 break; 756 break;
457#ifdef XK_KP_Home 757#ifdef XK_KP_Home
458 case XK_KP_Home: 758 case XK_KP_Home:
459 /* allow shift to override */ 759 /* allow shift to override */
460 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
461 { 761 {
462 STRCPY (kbuf, "\033Ow"); 762 strcpy (kbuf, "\033Ow");
463 break; 763 break;
464 } 764 }
465 /* FALLTHROUGH */ 765 /* FALLTHROUGH */
466#endif 766#endif
467 case XK_Home: 767 case XK_Home:
468 STRCPY (kbuf, KS_HOME); 768 strcpy (kbuf, KS_HOME);
469 break; 769 break;
470 770
471#define FKEY(n, fkey) \ 771#define FKEY(n, fkey) \
472 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
473 773
… …
525#undef FKEY 825#undef FKEY
526 default: 826 default:
527 newlen = 0; 827 newlen = 0;
528 break; 828 break;
529 } 829 }
830
530 if (newlen) 831 if (newlen)
531 len = STRLEN (kbuf); 832 len = strlen (kbuf);
532 } 833 }
533 834
534 /* 835 /*
535 * Pass meta for all function keys, if 'meta' option set 836 * Pass meta for all function keys, if 'meta' option set
536 */ 837 */
… …
543 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
544 { 845 {
545 len = 1; 846 len = 1;
546 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
547 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
548 else 854 else
549 { 855 {
550#ifdef META8_OPTION 856#ifdef META8_OPTION
551 /* set 8-bit on */ 857 /* set 8-bit on */
552 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
553 { 859 {
554 unsigned char *ch; 860 char *ch;
555 861
556 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
557 *ch |= 0x80; 863 *ch |= 0x80;
558 864
559 meta = 0; 865 meta = 0;
… …
561#endif 867#endif
562 /* nil */ ; 868 /* nil */ ;
563 } 869 }
564 } 870 }
565 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
566 if (len <= 0) 875 if (len <= 0)
567 return; /* not mapped */ 876 return; /* not mapped */
568 877
569 if (Options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
570 if (TermWin.view_start) 879 if (view_start)
571 { 880 {
572 TermWin.view_start = 0; 881 view_start = 0;
573 want_refresh = 1; 882 want_refresh = 1;
574 } 883 }
575 884
576 /* 885 /*
577 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
592#ifdef META8_OPTION 901#ifdef META8_OPTION
593 && meta_char == C0_ESC 902 && meta_char == C0_ESC
594#endif 903#endif
595 ) 904 )
596 { 905 {
597 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
598 tt_write (&ch, 1); 907 tt_write (&ch, 1);
599 } 908 }
600 909
601#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
602 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
610#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
611 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
612} 921}
613/*}}} */ 922/*}}} */
614 923
615#if (MENUBAR_MAX) 924#if defined (KEYSYM_RESOURCE)
616/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
617/* attempt to `write' count to the input buffer */
618unsigned int 925unsigned int
619rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
620{ 927{
621 unsigned int n, s; 928 unsigned int n, s;
622 929
623 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
624 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
625 932
626 if (n > 0 && s < count) 933 if (n > 0 && s < count)
627 { 934 {
628 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 935 memmove (cmdbuf_base, cmdbuf_ptr,
629 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 936 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
630 cmdbuf_ptr = cmdbuf_base; 937 cmdbuf_ptr = cmdbuf_base;
631 cmdbuf_endp -= n; 938 cmdbuf_endp -= n;
632 s += n; 939 s += n;
633 } 940 }
634 941
635 if (count > s) 942 if (count > s)
636 { 943 {
637 rxvt_print_error ("data loss: cmd_write too large"); 944 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
638 count = s; 945 count = s;
639 } 946 }
640 947
641 for (; count--;) 948 for (; count--;)
642 *cmdbuf_endp++ = *str++; 949 *cmdbuf_endp++ = *str++;
643 950
644 cmd_parse (); 951 cmd_parse ();
645 952
646 return 0; 953 return 0;
647} 954}
648#endif /* MENUBAR_MAX */ 955#endif
649 956
650void 957void
651rxvt_term::flush () 958rxvt_term::flush ()
652{ 959{
960 flush_ev.stop ();
961
653#ifdef TRANSPARENT 962#ifdef TRANSPARENT
654 if (want_full_refresh) 963 if (want_full_refresh)
655 { 964 {
656 want_full_refresh = 0; 965 want_full_refresh = 0;
657 scr_clear (); 966 scr_clear ();
658 scr_touch (false); 967 scr_touch (false);
659 want_refresh = 1;
660 } 968 }
661#endif 969#endif
662 970
663 if (want_refresh) 971 if (want_refresh)
664 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
665 scr_refresh (refresh_type); 1011 scr_refresh ();
666 scrollbar_show (1); 1012 scrollbar_show (1);
667#ifdef USE_XIM 1013#ifdef USE_XIM
668 IMSendSpot (); 1014 IMSendSpot ();
669#endif 1015#endif
670
671 } 1016 }
672 1017
673 display->flush (); 1018 display->flush ();
674} 1019}
675 1020
676void 1021void
677rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
678{ 1023{
679 SET_R (this); 1024 make_current ();
680 SET_LOCALE (locale);
681 1025
1026 display->flush ();
1027
1028 if (want_refresh && !flush_ev.active)
1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1030}
1031
1032void
1033rxvt_term::flush_cb (time_watcher &w)
1034{
1035 make_current ();
1036
1037 refresh_limit = 1;
1038 refresh_count = 0;
682 flush (); 1039 flush ();
683} 1040}
684 1041
685#ifdef CURSOR_BLINK 1042#ifdef CURSOR_BLINK
686void 1043void
… …
704 w.start (w.at + TEXT_BLINK_INTERVAL); 1061 w.start (w.at + TEXT_BLINK_INTERVAL);
705 } 1062 }
706} 1063}
707#endif 1064#endif
708 1065
1066#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1067void
1068rxvt_term::cont_scroll_cb (time_watcher &w)
1069{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1072 {
1073 want_refresh = 1;
1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1075 }
1076}
1077#endif
1078
1079#ifdef SELECTION_SCROLLING
1080void
1081rxvt_term::sel_scroll_cb (time_watcher &w)
1082{
1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1084 {
1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1086 want_refresh = 1;
1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1088 }
1089}
1090#endif
1091
1092#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1093void
1094rxvt_term::slip_wheel_cb (time_watcher &w)
1095{
1096 if (mouse_slip_wheel_speed == 0
1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1098 : scr_page (UP, mouse_slip_wheel_speed))
1099 {
1100 if (view_start == top_row || view_start == 0)
1101 mouse_slip_wheel_speed = 0;
1102
1103 want_refresh = 1;
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 }
1106}
1107#endif
1108
1109#if HAVE_SCHED_YIELD
1110static struct event_handler
1111{
1112 check_watcher cw_yield;
1113
1114 void yield (check_watcher &w)
1115 {
1116 sched_yield ();
1117 w.stop ();
1118 }
1119
1120 event_handler ()
1121 : cw_yield (this, &event_handler::yield)
1122 {
1123 }
1124} event_handler;
1125#endif
1126
709bool 1127bool
710rxvt_term::pty_fill () 1128rxvt_term::pty_fill ()
711{ 1129{
712 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1130 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1131
1132 if (CBUFSIZ == n)
1133 {
1134 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1135 n = 0;
1136 }
713 1137
714 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
715 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
716 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
717 1141
718 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
719 1143
720 if (n > 0) 1144 if (r > 0)
721 { 1145 {
722 cmdbuf_endp += n; 1146 cmdbuf_endp += r;
723 return true; 1147 return true;
724 } 1148 }
725 else if (n < 0 && errno != EAGAIN) 1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 {
1151#if HAVE_SCHED_YIELD
1152 if (display->is_local)
1153 event_handler.cw_yield.start ();
1154#endif
1155 }
1156 else
1157 {
1158 pty_ev.stop ();
1159
1160 if (!OPTION (Opt_hold))
726 destroy (); 1161 destroy ();
1162 }
727 1163
728 return false; 1164 return false;
729} 1165}
730 1166
731void 1167void
732rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
733{ 1169{
734 SET_R (this); 1170 make_current ();
735 SET_LOCALE (locale); 1171
1172 if (revents & EVENT_READ)
1173 // loop, but don't allow a single term to monopolize us
1174 while (pty_fill ())
1175 if (cmd_parse ())
1176 break;
736 1177
737 if (revents & EVENT_WRITE) 1178 if (revents & EVENT_WRITE)
738 tt_write (0, 0); 1179 pty_write ();
739 else if (revents & EVENT_READ)
740 {
741 bool flag = true;
742
743 // loop, but don't allow a single term to monopolize us
744 // the number of loops is fully arbitrary, and thus wrong
745 while (flag && pty_fill ())
746 {
747 if (!seen_input)
748 {
749 seen_input = 1;
750 /* once we know the shell is running, send the screen size. Again! */
751 tt_winch ();
752 }
753
754 if (cmd_parse ())
755 break;
756 }
757 }
758} 1180}
759 1181
760bool 1182void
761rxvt_term::cmd_parse () 1183rxvt_term::pointer_unblank ()
762{ 1184{
763 bool flag = false; 1185 XDefineCursor (display->display, vt, TermWin_cursor);
764 uint32_t ch = NOCHAR; 1186 recolour_cursor ();
765 1187
766 for (;;) 1188#ifdef POINTER_BLANK
767 { 1189 hidden_pointer = 0;
768 if (ch == NOCHAR)
769 ch = next_char ();
770 1190
771 if (ch == NOCHAR) // TODO: improve 1191 if (OPTION (Opt_pointerBlank))
772 break; 1192 pointer_ev.start (NOW + pointerBlankDelay);
773 1193#endif
774 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
775 {
776 /* Read a text string from the input buffer */
777 uint32_t buf[BUFSIZ];
778 bool refreshnow = false;
779 int nlines = 0;
780 uint32_t *str = buf;
781
782 *str++ = ch;
783
784 for (;;)
785 {
786 ch = next_char ();
787
788 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
789 break;
790 else
791 {
792 *str++ = ch;
793
794 if (ch == '\n')
795 {
796 nlines++;
797 refresh_count++;
798
799 if (! (Options & Opt_jumpScroll)
800 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
801 {
802 refreshnow = true;
803 flag = false;
804 ch = NOCHAR;
805 break;
806 }
807
808 // scr_add_lines only works for nlines < TermWin.nrow - 1.
809 if (nlines >= TermWin.nrow - 1)
810 {
811 scr_add_lines (buf, nlines, str - buf);
812 nlines = 0;
813 str = buf;
814 }
815 }
816
817 if (str >= buf + BUFSIZ)
818 {
819 ch = NOCHAR;
820 break;
821 }
822 }
823 }
824
825 scr_add_lines (buf, nlines, str - buf);
826
827 /*
828 * If there have been a lot of new lines, then update the screen
829 * What the heck I'll cheat and only refresh less than every page-full.
830 * the number of pages between refreshes is refresh_limit, which
831 * is incremented here because we must be doing flat-out scrolling.
832 *
833 * refreshing should be correct for small scrolls, because of the
834 * time-out
835 */
836 if (refreshnow)
837 {
838 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
839 refresh_limit++;
840
841 scr_refresh (refresh_type);
842 }
843
844 }
845 else
846 {
847 switch (ch)
848 {
849 default:
850 process_nonprinting (ch);
851 break;
852 case C0_ESC: /* escape char */
853 process_escape_seq ();
854 break;
855 /*case 0x9b: */ /* CSI */
856 /* process_csi_seq (); */
857 }
858
859 ch = NOCHAR;
860 }
861 }
862
863 return flag;
864}
865
866// read the next character, currently handles UTF-8
867// will probably handle all sorts of other stuff in the future
868uint32_t
869rxvt_term::next_char ()
870{
871 while (cmdbuf_ptr < cmdbuf_endp)
872 {
873 // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
874 if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
875 || !*cmdbuf_ptr)
876 return *cmdbuf_ptr++;
877
878 wchar_t wc;
879 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
880
881 if (len == (size_t)-2)
882 {
883 // the mbstate stores incomplete sequences. didn't know this :/
884 cmdbuf_ptr = cmdbuf_endp;
885 break;
886 }
887
888 if (len == (size_t)-1)
889 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
890
891 // assume wchar == unicode
892 cmdbuf_ptr += len;
893 return wc;
894 }
895
896 return NOCHAR;
897}
898
899/* rxvt_cmd_getc () - Return next input character */
900/*
901 * Return the next input character after first passing any keyboard input
902 * to the command.
903 */
904uint32_t
905rxvt_term::cmd_getc ()
906{
907 for (;;)
908 {
909 uint32_t c = next_char ();
910 if (c != NOCHAR)
911 return c;
912
913 // incomplete sequences should occur rarely, still, a better solution
914 // would be preferred. either setjmp/longjmp or better design.
915 fcntl (cmd_fd, F_SETFL, 0);
916 pty_fill ();
917 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
918 }
919} 1194}
920 1195
921#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
922void 1197void
923rxvt_term::pointer_unblank ()
924{
925 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
926 recolour_cursor ();
927
928 hidden_pointer = 0;
929
930 if (Options & Opt_pointerBlank)
931 pointer_ev.start (NOW + pointerBlankDelay);
932}
933
934void
935rxvt_term::pointer_blank () 1198rxvt_term::pointer_blank ()
936{ 1199{
937 if (! (Options & Opt_pointerBlank)) 1200 if (!OPTION (Opt_pointerBlank))
938 return; 1201 return;
939 1202
940 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1203 XDefineCursor (display->display, vt, display->blank_cursor);
941 XFlush (display->display); 1204 XFlush (display->display);
942 1205
943 hidden_pointer = 1; 1206 hidden_pointer = 1;
944} 1207}
945 1208
946void 1209void
947rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
948{ 1211{
949 SET_R (this); 1212 make_current ();
950 SET_LOCALE (locale);
951 1213
952 pointer_blank (); 1214 pointer_blank ();
953} 1215}
954#endif 1216#endif
955 1217
… …
962 x = ev.x; 1224 x = ev.x;
963 y = ev.y; 1225 y = ev.y;
964 pixel_position (&x, &y); 1226 pixel_position (&x, &y);
965 1227
966 if (MEvent.button == AnyButton) 1228 if (MEvent.button == AnyButton)
967 {
968 button_number = 3; 1229 button_number = 3;
969 }
970 else 1230 else
971 { 1231 {
972 button_number = MEvent.button - Button1; 1232 button_number = MEvent.button - Button1;
973 /* add 0x3D for wheel events, like xterm does */ 1233 /* add 0x3D for wheel events, like xterm does */
974 if (button_number >= 3) 1234 if (button_number >= 3)
975 button_number += (64 - 3); 1235 button_number += (64 - 3);
976 } 1236 }
977 1237
978 if (PrivateModes & PrivMode_MouseX10) 1238 if (priv_modes & PrivMode_MouseX10)
979 { 1239 {
980 /* 1240 /*
981 * do not report ButtonRelease 1241 * do not report ButtonRelease
982 * no state info allowed 1242 * no state info allowed
983 */ 1243 */
… …
998 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1258 + ((MEvent.state & ModMetaMask) ? 8 : 0)
999 + ((MEvent.state & ControlMask) ? 16 : 0); 1259 + ((MEvent.state & ControlMask) ? 16 : 0);
1000#ifdef MOUSE_REPORT_DOUBLECLICK 1260#ifdef MOUSE_REPORT_DOUBLECLICK
1001 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1261 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1002#endif 1262#endif
1003
1004 } 1263 }
1005 1264
1006#ifdef DEBUG_MOUSEREPORT 1265#if DEBUG_MOUSEREPORT
1007 fprintf (stderr, "Mouse ["); 1266 fprintf (stderr, "Mouse [");
1008 if (key_state & 16) 1267 if (key_state & 16)
1009 fputc ('C', stderr); 1268 fputc ('C', stderr);
1010 if (key_state & 4) 1269 if (key_state & 4)
1011 fputc ('S', stderr); 1270 fputc ('S', stderr);
… …
1015 fputc ('2', stderr); 1274 fputc ('2', stderr);
1016 fprintf (stderr, "]: <%d>, %d/%d\n", 1275 fprintf (stderr, "]: <%d>, %d/%d\n",
1017 button_number, 1276 button_number,
1018 x + 1, 1277 x + 1,
1019 y + 1); 1278 y + 1);
1020#else 1279#endif
1280
1021 tt_printf ("\033[M%c%c%c", 1281 tt_printf ("\033[M%c%c%c",
1022 (32 + button_number + key_state), 1282 (32 + button_number + key_state),
1023 (32 + x + 1), 1283 (32 + x + 1),
1024 (32 + y + 1)); 1284 (32 + y + 1));
1025#endif
1026} 1285}
1027 1286
1028#ifdef USING_W11LIB 1287#ifdef USING_W11LIB
1029void 1288void
1030rxvt_W11_process_x_event (XEvent *ev) 1289rxvt_W11_process_x_event (XEvent *ev)
… …
1037 1296
1038/*{{{ process an X event */ 1297/*{{{ process an X event */
1039void 1298void
1040rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1041{ 1300{
1042 SET_R (this); 1301 make_current ();
1043 SET_LOCALE (locale);
1044 1302
1045#if defined(CURSOR_BLINK) 1303 dDisp;
1046 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1047 {
1048 if (hidden_cursor)
1049 {
1050 hidden_cursor = 0;
1051 want_refresh = 1;
1052 }
1053 1304
1054 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1305 if (ev.xany.window == vt
1055 } 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1056#endif 1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1057
1058#if defined(POINTER_BLANK)
1059 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1060 {
1061 if (ev.type == MotionNotify
1062 || ev.type == ButtonPress
1063 || ev.type == ButtonRelease)
1064 if (hidden_pointer)
1065 pointer_unblank ();
1066
1067 if (ev.type == KeyPress && hidden_pointer == 0)
1068 pointer_blank ();
1069 }
1070#endif
1071
1072#ifdef USE_XIM
1073 if (XFilterEvent (&ev, None))
1074 return; 1308 return;
1075#endif
1076 1309
1310 // for XQueryPointer
1077 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1078 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1079 unsigned int unused_mask; 1313 unsigned int unused_mask;
1080
1081#ifdef DEBUG_X
1082 const char *const eventnames[] =
1083 { /* mason - this matches my system */
1084 "",
1085 "",
1086 "KeyPress",
1087 "KeyRelease",
1088 "ButtonPress",
1089 "ButtonRelease",
1090 "MotionNotify",
1091 "EnterNotify",
1092 "LeaveNotify",
1093 "FocusIn",
1094 "FocusOut",
1095 "KeymapNotify",
1096 "Expose",
1097 "GraphicsExpose",
1098 "NoExpose",
1099 "VisibilityNotify",
1100 "CreateNotify",
1101 "DestroyNotify",
1102 "UnmapNotify",
1103 "MapNotify",
1104 "MapRequest",
1105 "ReparentNotify",
1106 "ConfigureNotify",
1107 "ConfigureRequest",
1108 "GravityNotify",
1109 "ResizeRequest",
1110 "CirculateNotify",
1111 "CirculateRequest",
1112 "PropertyNotify",
1113 "SelectionClear",
1114 "SelectionRequest",
1115 "SelectionNotify",
1116 "ColormapNotify",
1117 "ClientMessage",
1118 "MappingNotify"
1119 };
1120#endif
1121
1122#ifdef DEBUG_X
1123 struct timeval tp;
1124 struct tm *ltt;
1125 (void)gettimeofday (&tp, NULL);
1126 ltt = localtime (& (tp.tv_sec));
1127 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1128#endif
1129 1314
1130 switch (ev.type) 1315 switch (ev.type)
1131 { 1316 {
1132 case KeyPress: 1317 case KeyPress:
1318#if ISO_14755
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1133 lookup_key (ev.xkey); 1321 lookup_key (ev.xkey);
1322
1323 break;
1324
1325 case KeyRelease:
1326 {
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1134 break; 1389 break;
1135 1390
1136#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1137 case KeyRelease:
1138 {
1139 if (! (ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1140 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1141 else 1396#endif
1142 {
1143 KeySym ks;
1144
1145 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1146 if (ks == XK_Control_L || ks == XK_Control_R)
1147 mouse_slip_wheel_speed = 0;
1148 }
1149 break; 1397 break;
1150 } 1398 }
1151#endif
1152 1399
1153 case ButtonPress: 1400 case ButtonPress:
1154 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1155 break; 1402 break;
1156 1403
… …
1158 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1159 break; 1406 break;
1160 1407
1161 case ClientMessage: 1408 case ClientMessage:
1162 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1411 {
1163 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1164 destroy (); 1413 destroy ();
1414#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev);
1419#endif
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1165#ifdef OFFIX_DND 1430#ifdef OFFIX_DND
1166 /* OffiX Dnd (drag 'n' drop) protocol */ 1431 /* OffiX Dnd (drag 'n' drop) protocol */
1167 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1168 && (ev.xclient.data.l[0] == DndFile 1433 && (ev.xclient.data.l[0] == DndFile
1169 || ev.xclient.data.l[0] == DndDir 1434 || ev.xclient.data.l[0] == DndDir
1170 || ev.xclient.data.l[0] == DndLink)) 1435 || ev.xclient.data.l[0] == DndLink))
1171 { 1436 {
1172 /* Get Dnd data */ 1437 /* Get Dnd data */
1173 Atom ActualType; 1438 Atom ActualType;
1174 int ActualFormat; 1439 int ActualFormat;
1175 unsigned char *data; 1440 unsigned char *data;
1176 unsigned long Size, RemainingBytes; 1441 unsigned long Size, RemainingBytes;
1177 1442
1178 XGetWindowProperty (display->display, display->root, 1443 XGetWindowProperty (disp, display->root,
1179 xa[XA_DNDSELECTION], 1444 xa[XA_DNDSELECTION],
1180 0L, 1000000L, 1445 0L, 1000000L,
1181 False, AnyPropertyType, 1446 False, AnyPropertyType,
1182 &ActualType, &ActualFormat, 1447 &ActualType, &ActualFormat,
1183 &Size, &RemainingBytes, 1448 &Size, &RemainingBytes,
1184 &data); 1449 &data);
1185 XChangeProperty (display->display, display->root, 1450 set_string_property (XA_CUT_BUFFER0, data);
1186 XA_CUT_BUFFER0, XA_STRING, 1451 XFree (data);
1187 8, PropModeReplace,
1188 data, STRLEN (data));
1189 selection_paste (display->root, XA_CUT_BUFFER0, True); 1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1190 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1191 } 1454 }
1192#endif /* OFFIX_DND */ 1455#endif /* OFFIX_DND */
1193 break; 1456 break;
1194 1457
1195 case MappingNotify: 1458 case MappingNotify:
1196 XRefreshKeyboardMapping (& (ev.xmapping)); 1459 XRefreshKeyboardMapping (&ev.xmapping);
1197 break; 1460 break;
1198 1461
1199 /* 1462 /*
1200 * XXX: this is not the _current_ arrangement 1463 * XXX: this is not the _current_ arrangement
1201 * Here's my conclusion: 1464 * Here's my conclusion:
… …
1220 break; 1483 break;
1221 } 1484 }
1222 break; 1485 break;
1223 1486
1224 case FocusIn: 1487 case FocusIn:
1225 if (!TermWin.focus) 1488 focus_in ();
1489 break;
1490
1491 case FocusOut:
1492 focus_out ();
1493 break;
1494
1495 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0])
1226 { 1497 {
1227 TermWin.focus = 1; 1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1228 want_refresh = 1; 1499 ;
1229#ifdef USE_XIM
1230 if (Input_Context != NULL)
1231 XSetICFocus (Input_Context);
1232#endif
1233#ifdef CURSOR_BLINK
1234 if (Options & Opt_cursorBlink)
1235 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1236#endif
1237 1500
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 {
1503 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 }
1506
1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1508 if (OPTION (Opt_transparent))
1509 check_our_parents ();
1510#endif
1238 } 1511 }
1239 break; 1512 break;
1240 1513
1241 case FocusOut:
1242 if (TermWin.focus)
1243 {
1244 TermWin.focus = 0;
1245 want_refresh = 1;
1246#ifdef USE_XIM
1247 if (Input_Context != NULL)
1248 XUnsetICFocus (Input_Context);
1249#endif
1250#ifdef CURSOR_BLINK
1251 if (Options & Opt_cursorBlink)
1252 cursor_blink_ev.stop ();
1253 hidden_cursor = 0;
1254#endif
1255
1256 }
1257 break;
1258
1259 case ConfigureNotify: 1514 case PropertyNotify:
1260 if (ev.xconfigure.window == TermWin.parent[0]) 1515 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1261 { 1516 && ev.xproperty.state == PropertyNewValue)
1262 int height, width; 1517 selection_property (ev.xproperty.window, ev.xproperty.atom);
1263 1518
1264 do
1265 { /* Wrap lots of configures into one */
1266 width = ev.xconfigure.width;
1267 height = ev.xconfigure.height;
1268 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1269 }
1270 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1271
1272 if (szHint.width != width || szHint.height != height)
1273 {
1274 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1275 resize_all_windows (width, height, 1);
1276 }
1277#ifdef DEBUG_SIZE
1278 else
1279 {
1280 D_SIZE ((stderr, "Size: Not resizing"));
1281 }
1282#endif
1283#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1284 if (Options & Opt_transparent)
1285 {
1286 check_our_parents ();
1287 if (am_transparent)
1288 want_full_refresh = 1;
1289 }
1290#endif
1291
1292 }
1293 break; 1519 break;
1294 1520
1295 case SelectionClear: 1521 case SelectionClear:
1296 display->set_selection_owner (0); 1522 selection_clear ();
1297 break; 1523 break;
1298 1524
1299 case SelectionNotify: 1525 case SelectionNotify:
1300 if (selection_wait == Sel_normal) 1526 if (selection_wait == Sel_normal)
1301 selection_paste (ev.xselection.requestor, 1527 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1302 ev.xselection.property, True);
1303 break; 1528 break;
1304 1529
1305 case SelectionRequest: 1530 case SelectionRequest:
1306 selection_send (ev.xselectionrequest); 1531 selection_send (ev.xselectionrequest);
1307 break; 1532 break;
1308 1533
1534 case MapNotify:
1535 mapped = 1;
1536#ifdef TEXT_BLINK
1537 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1538#endif
1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1540 break;
1541
1309 case UnmapNotify: 1542 case UnmapNotify:
1310 TermWin.mapped = 0; 1543 mapped = 0;
1311#ifdef TEXT_BLINK 1544#ifdef TEXT_BLINK
1312 text_blink_ev.stop (); 1545 text_blink_ev.stop ();
1313#endif 1546#endif
1314 break; 1547 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1315
1316 case MapNotify:
1317 TermWin.mapped = 1;
1318#ifdef TEXT_BLINK
1319 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1320#endif
1321 break; 1548 break;
1322 1549
1323#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1324 case ReparentNotify: 1551 case ReparentNotify:
1325 rootwin_cb (ev); 1552 rootwin_cb (ev);
1326 break; 1553 break;
1327#endif /* TRANSPARENT */ 1554#endif /* TRANSPARENT */
1328 1555
1329 case GraphicsExpose: 1556 case GraphicsExpose:
1330 case Expose: 1557 case Expose:
1331 if (ev.xany.window == TermWin.vt) 1558 if (ev.xany.window == vt)
1332 { 1559 {
1333#ifdef NO_SLOW_LINK_SUPPORT 1560 do
1334 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1335 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, False);
1336#else 1563 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1337 // don't understand this, so commented it out 1564
1565 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1566
1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1338 scr_expose (ev.xexpose.x, ev.xexpose.y, 1568 scr_expose (ev.xexpose.x, ev.xexpose.y,
1339 ev.xexpose.width, ev.xexpose.height, False); 1569 ev.xexpose.width, ev.xexpose.height, False);
1340 //scr_expose (ev.xexpose.x, 0, 1570
1341 // ev.xexpose.width, TermWin.height, False);
1342#endif
1343 want_refresh = 1; 1571 want_refresh = 1;
1344 } 1572 }
1345 else 1573 else
1346 { 1574 {
1347 XEvent unused_event; 1575 XEvent unused_event;
1348 1576
1349 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1577 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1350 Expose, 1578 ;
1351 &unused_event)) ; 1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1352 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1580 ;
1353 GraphicsExpose, 1581
1354 &unused_event)) ;
1355 if (isScrollbarWindow (ev.xany.window)) 1582 if (isScrollbarWindow (ev.xany.window))
1356 { 1583 {
1357 scrollBar.setIdle (); 1584 scrollBar.setIdle ();
1358 scrollbar_show (0); 1585 scrollbar_show (0);
1359 } 1586 }
1360#ifdef MENUBAR 1587
1361 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1588#ifdef TRANSPARENT
1362 menubar_expose (); 1589 if (am_transparent && ev.xany.window == parent[0])
1590 XClearWindow (disp, ev.xany.window);
1363#endif 1591#endif
1364 } 1592 }
1365 break; 1593 break;
1366 1594
1367 case MotionNotify: 1595 case MotionNotify:
1368#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1369 if (hidden_pointer) 1597 if (hidden_pointer)
1370 pointer_unblank (); 1598 pointer_unblank ();
1371#endif 1599#endif
1372#if MENUBAR 1600 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1373 if (isMenuBarWindow (ev.xany.window)) 1601 break;
1602
1603 if (ev.xany.window == vt)
1374 { 1604 {
1375 menubar_control (ev.xbutton); 1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1376 break; 1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1377 } 1607 ; // nop
1378#endif
1379 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1380 break;
1381
1382 if (ev.xany.window == TermWin.vt)
1383 {
1384 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1385 { 1609 {
1386 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1387 ; 1611 ;
1388 1612
1389 XQueryPointer (display->display, TermWin.vt, 1613 XQueryPointer (disp, vt,
1390 &unused_root, &unused_child, 1614 &unused_root, &unused_child,
1391 &unused_root_x, &unused_root_y, 1615 &unused_root_x, &unused_root_y,
1392 & (ev.xbutton.x), & (ev.xbutton.y), 1616 &ev.xbutton.x, &ev.xbutton.y,
1393 &unused_mask); 1617 &ev.xbutton.state);
1394#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
1395 /* deal with a `jumpy' mouse */ 1619 /* deal with a `jumpy' mouse */
1396 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1620 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1397 { 1621 {
1398#endif 1622#endif
1623#if ISO_14755
1624 // 5.4
1625 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1626 {
1627 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1628 break;
1629 }
1630#endif
1399 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1631 selection_extend (ev.xbutton.x, ev.xbutton.y,
1400 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1632 ev.xbutton.state & Button3Mask ? 2 : 0);
1633
1401#ifdef SELECTION_SCROLLING 1634#ifdef SELECTION_SCROLLING
1402 if (ev.xbutton.y < TermWin.int_bwidth 1635 if (ev.xbutton.y < int_bwidth
1403 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1636 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1404 { 1637 {
1405 int dist; 1638 int dist;
1406
1407 pending_scroll_selection=1;
1408 1639
1409 /* don't clobber the current delay if we are 1640 /* don't clobber the current delay if we are
1410 * already in the middle of scrolling. 1641 * already in the middle of scrolling.
1411 */ 1642 */
1412 if (scroll_selection_delay<=0) 1643 if (!sel_scroll_ev.active)
1413 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1644 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1414 1645
1415 /* save the event params so we can highlight 1646 /* save the event params so we can highlight
1416 * the selection in the pending-scroll loop 1647 * the selection in the pending-scroll loop
1417 */ 1648 */
1418 selection_save_x=ev.xbutton.x; 1649 selection_save_x = ev.xbutton.x;
1419 selection_save_y=ev.xbutton.y; 1650 selection_save_y = ev.xbutton.y;
1420 selection_save_state=
1421 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1651 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1422 1652
1423 /* calc number of lines to scroll */ 1653 /* calc number of lines to scroll */
1424 if (ev.xbutton.y<TermWin.int_bwidth) 1654 if (ev.xbutton.y < int_bwidth)
1425 { 1655 {
1426 scroll_selection_dir = UP; 1656 scroll_selection_dir = UP;
1427 dist = TermWin.int_bwidth - ev.xbutton.y; 1657 dist = int_bwidth - ev.xbutton.y;
1428 } 1658 }
1429 else 1659 else
1430 { 1660 {
1431 scroll_selection_dir = DN; 1661 scroll_selection_dir = DN;
1432 dist = ev.xbutton.y - 1662 dist = ev.xbutton.y - (int_bwidth + height);
1433 (TermWin.int_bwidth + TermWin.height);
1434 } 1663 }
1664
1435 scroll_selection_lines= (Pixel2Height (dist)/ 1665 scroll_selection_lines = Pixel2Height (dist)
1436 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1666 / SELECTION_SCROLL_LINE_SPEEDUP
1667 + 1;
1437 MIN_IT (scroll_selection_lines, 1668 min_it (scroll_selection_lines,
1438 SELECTION_SCROLL_MAX_LINES); 1669 SELECTION_SCROLL_MAX_LINES);
1439 } 1670 }
1440 else 1671 else
1441 { 1672 {
1442 /* we are within the text window, so we 1673 /* we are within the text window, so we
1443 * shouldn't be scrolling 1674 * shouldn't be scrolling
1444 */ 1675 */
1445 pending_scroll_selection = 0; 1676 if (sel_scroll_ev.active)
1677 sel_scroll_ev.stop();
1446 } 1678 }
1447#endif 1679#endif
1448#ifdef MOUSE_THRESHOLD 1680#ifdef MOUSE_THRESHOLD
1449
1450 } 1681 }
1451#endif 1682#endif
1452
1453 } 1683 }
1454 } 1684 }
1455 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1685 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1456 { 1686 {
1457 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1687 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1458 MotionNotify, &ev)) ; 1688 MotionNotify, &ev))
1689 ;
1690
1459 XQueryPointer (display->display, scrollBar.win, 1691 XQueryPointer (disp, scrollBar.win,
1460 &unused_root, &unused_child, 1692 &unused_root, &unused_child,
1461 &unused_root_x, &unused_root_y, 1693 &unused_root_x, &unused_root_y,
1462 & (ev.xbutton.x), & (ev.xbutton.y), 1694 &ev.xbutton.x, &ev.xbutton.y,
1463 &unused_mask); 1695 &unused_mask);
1464 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1696 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1465 scrollbar_size ()); 1697 scrollbar_size ());
1466 scr_refresh (refresh_type); 1698 want_refresh = 1;
1467 refresh_limit = 0; 1699 refresh_limit = 0;
1468 scrollbar_show (1); 1700 scrollbar_show (1);
1469 } 1701 }
1470 break; 1702 break;
1471 } 1703 }
1472}
1473 1704
1705skip_switch: ;
1706
1707#if defined(CURSOR_BLINK)
1708 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1709 {
1710 if (hidden_cursor)
1711 {
1712 hidden_cursor = 0;
1713 want_refresh = 1;
1714 }
1715
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1717 }
1718#endif
1719
1720#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1722 {
1723 if (ev.type == MotionNotify
1724 || ev.type == ButtonPress
1725 || ev.type == ButtonRelease)
1726 if (hidden_pointer)
1727 pointer_unblank ();
1728
1729 if (ev.type == KeyPress && hidden_pointer == 0)
1730 pointer_blank ();
1731 }
1732#endif
1733}
1734
1735void
1736rxvt_term::focus_in ()
1737{
1738 if (!focus)
1739 {
1740 focus = 1;
1741 want_refresh = 1;
1742
1743 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1744
1745#if USE_XIM
1746 if (Input_Context != NULL)
1747 {
1748 IMSetStatusPosition ();
1749 XSetICFocus (Input_Context);
1750 }
1751#endif
1752#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink))
1754 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1755#endif
1756#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade])
1758 {
1759 pix_colors = pix_colors_focused;
1760 scr_recolour ();
1761 }
1762#endif
1763 }
1764}
1765
1766void
1767rxvt_term::focus_out ()
1768{
1769 if (focus)
1770 {
1771 focus = 0;
1772 want_refresh = 1;
1773
1774 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1775
1776#if ENABLE_FRILLS || ISO_14755
1777 if (iso14755buf)
1778 {
1779 iso14755buf = 0;
1780# if ENABLE_OVERLAY
1781 scr_overlay_off ();
1782# endif
1783 }
1784#endif
1785#if USE_XIM
1786 if (Input_Context != NULL)
1787 XUnsetICFocus (Input_Context);
1788#endif
1789#if CURSOR_BLINK
1790 if (OPTION (Opt_cursorBlink))
1791 cursor_blink_ev.stop ();
1792 hidden_cursor = 0;
1793#endif
1794#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade])
1796 {
1797 pix_colors = pix_colors_unfocused;
1798 scr_recolour ();
1799 }
1800#endif
1801 }
1802}
1803
1804#if TRANSPARENT
1474void 1805void
1475rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1476{ 1807{
1477 SET_R (this); 1808 make_current ();
1478 SET_LOCALE (locale);
1479 1809
1480 switch (ev.type) 1810 switch (ev.type)
1481 { 1811 {
1482 case PropertyNotify: 1812 case PropertyNotify:
1483 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1484 {
1485 if (ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487 break;
1488 }
1489#ifdef TRANSPARENT
1490 else
1491 {
1492 /* 1813 /*
1493 * if user used some Esetroot compatible prog to set the root bg, 1814 * if user used some Esetroot compatible prog to set the root bg,
1494 * use the property to determine the pixmap. We use it later on. 1815 * use the property to determine the pixmap. We use it later on.
1495 */ 1816 */
1496 if (xa[XA_XROOTPMAPID] == 0)
1497 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1498
1499 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1817 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1500 return; 1819 return;
1501 }
1502 1820
1503 /* FALLTHROUGH */ 1821 /* FALLTHROUGH */
1504 case ReparentNotify: 1822 case ReparentNotify:
1505 if ((Options & Opt_transparent) && check_our_parents ()) 1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1506 if (am_transparent)
1507 want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1508 break; 1825 break;
1509#endif
1510 } 1826 }
1511} 1827}
1828#endif
1512 1829
1513void 1830void
1514rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
1515{ 1832{
1516 int reportmode = 0, clickintime; 1833 int reportmode = 0, clickintime;
1517 1834
1518 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1835 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1836
1519 if (!bypass_keystate) 1837 if (!bypass_keystate)
1520 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1838 reportmode = !! (priv_modes & PrivMode_mouse_report);
1839
1521 /* 1840 /*
1522 * VT window processing of button press 1841 * VT window processing of button press
1523 */ 1842 */
1524 if (ev.window == TermWin.vt) 1843 if (ev.window == vt)
1525 { 1844 {
1845#if ISO_14755
1846 // 5.4
1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848 {
1849 iso14755_54 (ev.x, ev.y);
1850 return;
1851 }
1852#endif
1853
1526 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1854 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1855
1527 if (reportmode) 1856 if (reportmode)
1528 { 1857 {
1529 /* mouse report from vt window */ 1858 /* mouse report from vt window */
1530 /* save the xbutton state (for ButtonRelease) */ 1859 /* save the xbutton state (for ButtonRelease) */
1531 MEvent.state = ev.state; 1860 MEvent.state = ev.state;
1532#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1533 if (ev.button == MEvent.button && clickintime) 1862 if (ev.button == MEvent.button && clickintime)
1534 { 1863 {
1535 /* same button, within alloted time */ 1864 /* same button, within alloted time */
1536 MEvent.clicks++; 1865 MEvent.clicks++;
1866
1537 if (MEvent.clicks > 1) 1867 if (MEvent.clicks > 1)
1538 { 1868 {
1539 /* only report double clicks */ 1869 /* only report double clicks */
1540 MEvent.clicks = 2; 1870 MEvent.clicks = 2;
1541 mouse_report (ev); 1871 mouse_report (ev);
… …
1560 } 1890 }
1561 else 1891 else
1562 { 1892 {
1563 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1564 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1895
1896 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1565 switch (ev.button) 1897 switch (ev.button)
1566 { 1898 {
1567 case Button1: 1899 case Button1:
1900 /* allow meta + click to select rectangular areas */
1901 /* should be done in screen.C */
1902#if ENABLE_FRILLS
1903 selection.rect = !!(ev.state & ModMetaMask);
1904#else
1905 selection.rect = false;
1906#endif
1907
1568 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1569 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1570 { 1910 {
1571 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1572 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1573 else 1913 else
1574 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
1575 } 1915 }
1576 else 1916 else
1577 { 1917 {
1578 if (MEvent.button == Button1 && clickintime) 1918 if (MEvent.button == Button1 && clickintime)
1579 MEvent.clicks++; 1919 MEvent.clicks++;
1580 else 1920 else
1581 MEvent.clicks = 1; 1921 MEvent.clicks = 1;
1582 1922
1583 selection_click (MEvent.clicks, ev.x, ev.y); 1923 selection_click (MEvent.clicks, ev.x, ev.y);
1584 } 1924 }
1585 1925
1586 MEvent.button = Button1; 1926 MEvent.button = Button1;
1587 break; 1927 break;
1588 1928
1589 case Button3: 1929 case Button3:
1590 if (MEvent.button == Button3 && clickintime) 1930 if (MEvent.button == Button3 && clickintime)
1591 selection_rotate (ev.x, ev.y); 1931 selection_rotate (ev.x, ev.y);
1592 else 1932 else
1593 selection_extend (ev.x, ev.y, 1); 1933 selection_extend (ev.x, ev.y, 1);
1934
1594 MEvent.button = Button3; 1935 MEvent.button = Button3;
1595 break; 1936 break;
1596 } 1937 }
1597 } 1938 }
1939
1598 MEvent.time = ev.time; 1940 MEvent.time = ev.time;
1599 return; 1941 return;
1600 } 1942 }
1601 1943
1602 /* 1944 /*
… …
1668 upordown = 1; /* down */ 2010 upordown = 1; /* down */
1669 } 2011 }
1670 if (upordown) 2012 if (upordown)
1671 { 2013 {
1672#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2014#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1673 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2015 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1674#endif 2016#endif
1675 if (scr_page (upordown < 0 ? UP : DN, 1)) 2017 if (scr_page (upordown < 0 ? UP : DN, 1))
1676 { 2018 {
1677 if (upordown < 0) 2019 if (upordown < 0)
1678 scrollBar.setUp (); 2020 scrollBar.setUp ();
… …
1694 break; 2036 break;
1695 case R_SB_ALIGN_BOTTOM: 2037 case R_SB_ALIGN_BOTTOM:
1696 csrO = scrollBar.bot - scrollBar.top; 2038 csrO = scrollBar.bot - scrollBar.top;
1697 break; 2039 break;
1698 } 2040 }
2041
1699 if (scrollBar.style == R_SB_XTERM 2042 if (scrollBar.style == R_SB_XTERM
1700 || scrollbar_above_slider (ev.y) 2043 || scrollbar_above_slider (ev.y)
1701 || scrollbar_below_slider (ev.y)) 2044 || scrollbar_below_slider (ev.y))
1702 scr_move_to ( scrollbar_position (ev.y) - csrO, 2045 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1703 scrollbar_size ()); 2046
1704 scrollBar.setMotion (); 2047 scrollBar.setMotion ();
1705 break; 2048 break;
1706 2049
1707 case Button1: 2050 case Button1:
1708 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2051 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1712 case Button3: 2055 case Button3:
1713 if (scrollBar.style != R_SB_XTERM) 2056 if (scrollBar.style != R_SB_XTERM)
1714 { 2057 {
1715 if (scrollbar_above_slider (ev.y)) 2058 if (scrollbar_above_slider (ev.y))
1716# ifdef RXVT_SCROLL_FULL 2059# ifdef RXVT_SCROLL_FULL
1717 scr_page (UP, TermWin.nrow - 1); 2060 scr_page (UP, nrow - 1);
1718# else 2061# else
1719 scr_page (UP, TermWin.nrow / 4); 2062 scr_page (UP, nrow / 4);
1720# endif 2063# endif
1721 else if (scrollbar_below_slider (ev.y)) 2064 else if (scrollbar_below_slider (ev.y))
1722# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
1723 scr_page (DN, TermWin.nrow - 1); 2066 scr_page (DN, nrow - 1);
1724# else 2067# else
1725 scr_page (DN, TermWin.nrow / 4); 2068 scr_page (DN, nrow / 4);
1726# endif 2069# endif
1727 else 2070 else
1728 scrollBar.setMotion (); 2071 scrollBar.setMotion ();
1729 } 2072 }
1730 else 2073 else
1731 { 2074 {
1732 scr_page ((ev.button == Button1 ? DN : UP), 2075 scr_page ((ev.button == Button1 ? DN : UP),
1733 (TermWin.nrow 2076 (nrow
1734 * scrollbar_position (ev.y) 2077 * scrollbar_position (ev.y)
1735 / scrollbar_size ())); 2078 / scrollbar_size ()));
1736 } 2079 }
2080
1737 break; 2081 break;
1738 } 2082 }
1739 } 2083 }
2084
1740 return; 2085 return;
1741 } 2086 }
1742#if MENUBAR
1743 /*
1744 * Menubar window processing of button press
1745 */
1746 if (isMenuBarWindow (ev.window))
1747 menubar_control (ev);
1748#endif
1749} 2087}
1750 2088
1751void 2089void
1752rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
1753{ 2091{
1754 int reportmode = 0; 2092 int reportmode = 0;
1755 2093
1756 csrO = 0; /* reset csr Offset */ 2094 csrO = 0; /* reset csr Offset */
1757 if (!bypass_keystate) 2095 if (!bypass_keystate)
1758 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2096 reportmode = !! (priv_modes & PrivMode_mouse_report);
1759 2097
1760 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
1761 { 2099 {
1762 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
1763 scrollbar_show (0); 2101 scrollbar_show (0);
1764#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1765 refresh_type &= ~SMOOTH_REFRESH;
1766#endif
1767
1768 } 2102 }
2103
1769#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
1770 pending_scroll_selection=0; 2105 if (sel_scroll_ev.active)
2106 sel_scroll_ev.stop();
1771#endif 2107#endif
2108
1772 if (ev.window == TermWin.vt) 2109 if (ev.window == vt)
1773 { 2110 {
2111#if ISO_14755
2112 // 5.4
2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2114 return;
2115#endif
1774 if (reportmode) 2116 if (reportmode)
1775 { 2117 {
1776 /* mouse report from vt window */ 2118 /* mouse report from vt window */
1777 /* don't report release of wheel "buttons" */ 2119 /* don't report release of wheel "buttons" */
1778 if (ev.button >= 4) 2120 if (ev.button >= 4)
… …
1792 MEvent.button = AnyButton; 2134 MEvent.button = AnyButton;
1793 mouse_report (ev); 2135 mouse_report (ev);
1794#endif /* MOUSE_REPORT_DOUBLECLICK */ 2136#endif /* MOUSE_REPORT_DOUBLECLICK */
1795 return; 2137 return;
1796 } 2138 }
2139
1797 /* 2140 /*
1798 * dumb hack to compensate for the failure of click-and-drag 2141 * dumb hack to compensate for the failure of click-and-drag
1799 * when overriding mouse reporting 2142 * when overriding mouse reporting
1800 */ 2143 */
1801 if (PrivateModes & PrivMode_mouse_report 2144 if (priv_modes & PrivMode_mouse_report
1802 && bypass_keystate 2145 && bypass_keystate
1803 && ev.button == Button1 && MEvent.clicks <= 1) 2146 && ev.button == Button1 && MEvent.clicks <= 1)
1804 selection_extend (ev.x, ev.y, 0); 2147 selection_extend (ev.x, ev.y, 0);
2148
2149 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150 return;
1805 2151
1806 switch (ev.button) 2152 switch (ev.button)
1807 { 2153 {
1808 case Button1: 2154 case Button1:
1809 case Button3: 2155 case Button3:
… …
1817 case Button5: 2163 case Button5:
1818 { 2164 {
1819 int i; 2165 int i;
1820 page_dirn v; 2166 page_dirn v;
1821 2167
1822 v = (ev.button == Button4) ? UP : DN; 2168 v = ev.button == Button4 ? UP : DN;
2169
1823 if (ev.state & ShiftMask) 2170 if (ev.state & ShiftMask)
1824 i = 1; 2171 i = 1;
1825 else if ((Options & Opt_mouseWheelScrollPage)) 2172 else if (OPTION (Opt_mouseWheelScrollPage))
1826 i = TermWin.nrow - 1; 2173 i = nrow - 1;
1827 else 2174 else
1828 i = 5; 2175 i = 5;
2176
1829# ifdef MOUSE_SLIP_WHEELING 2177# ifdef MOUSE_SLIP_WHEELING
1830 if (ev.state & ControlMask) 2178 if (ev.state & ControlMask)
1831 { 2179 {
1832 mouse_slip_wheel_speed += (v ? -1 : 1); 2180 mouse_slip_wheel_speed += v ? -1 : 1;
2181 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2182 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2183
2184 if (slip_wheel_ev.at < NOW)
1833 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2185 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2186
2187 slip_wheel_ev.start ();
2188 }
2189 else
2190 {
2191# endif
2192 scr_page (v, i);
2193 scrollbar_show (1);
2194# ifdef MOUSE_SLIP_WHEELING
1834 } 2195 }
1835# endif 2196# endif
1836# ifdef JUMP_MOUSE_WHEEL
1837 scr_page (v, i);
1838 scr_refresh (SMOOTH_REFRESH);
1839 scrollbar_show (1);
1840# else
1841 while (i--)
1842 {
1843 scr_page (v, 1);
1844 scr_refresh (SMOOTH_REFRESH);
1845 scrollbar_show (1);
1846 }
1847# endif
1848
1849 } 2197 }
1850 break; 2198 break;
1851#endif 2199#endif
1852
1853 } 2200 }
1854 } 2201 }
1855#ifdef MENUBAR
1856 else if (isMenuBarWindow (ev.window))
1857 menubar_control (ev);
1858#endif
1859} 2202}
1860
1861 2203
1862#ifdef TRANSPARENT 2204#ifdef TRANSPARENT
2205#if TINTING
2206/* taken from aterm-0.4.2 */
2207
2208typedef uint32_t RUINT32T;
2209
2210void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2211{
2212 int sh_r, sh_g, sh_b;
2213 RUINT32T mask_r, mask_g, mask_b;
2214 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2215 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2216 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2217 int i;
2218
2219 Visual *visual = display->visual;
2220
2221 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2222
2223 /* for convenience */
2224 mask_r = visual->red_mask;
2225 mask_g = visual->green_mask;
2226 mask_b = visual->blue_mask;
2227
2228 /* boring lookup table pre-initialization */
2229 switch (srcImage->bits_per_pixel) {
2230 case 15:
2231 if ((mask_r != 0x7c00) ||
2232 (mask_g != 0x03e0) ||
2233 (mask_b != 0x001f))
2234 return;
2235 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2236 lookup_r = lookup;
2237 lookup_g = lookup+32;
2238 lookup_b = lookup+32+32;
2239 sh_r = 10;
2240 sh_g = 5;
2241 sh_b = 0;
2242 break;
2243 case 16:
2244 if ((mask_r != 0xf800) ||
2245 (mask_g != 0x07e0) ||
2246 (mask_b != 0x001f))
2247 return;
2248 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2249 lookup_r = lookup;
2250 lookup_g = lookup+32;
2251 lookup_b = lookup+32+64;
2252 sh_r = 11;
2253 sh_g = 5;
2254 sh_b = 0;
2255 break;
2256 case 24:
2257 if ((mask_r != 0xff0000) ||
2258 (mask_g != 0x00ff00) ||
2259 (mask_b != 0x0000ff))
2260 return;
2261 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2262 lookup_r = lookup;
2263 lookup_g = lookup+256;
2264 lookup_b = lookup+256+256;
2265 sh_r = 16;
2266 sh_g = 8;
2267 sh_b = 0;
2268 break;
2269 case 32:
2270 if ((mask_r != 0xff0000) ||
2271 (mask_g != 0x00ff00) ||
2272 (mask_b != 0x0000ff))
2273 return;
2274 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2275 lookup_r = lookup;
2276 lookup_g = lookup+256;
2277 lookup_b = lookup+256+256;
2278 sh_r = 16;
2279 sh_g = 8;
2280 sh_b = 0;
2281 break;
2282 default:
2283 return; /* we do not support this color depth */
2284 }
2285
2286 /* prepare limits for color transformation (each channel is handled separately) */
2287 if (shade < 0) {
2288 shade = -shade;
2289 if (shade < 0) shade = 0;
2290 if (shade > 100) shade = 100;
2291
2292 lower_lim_r = 65535-rm;
2293 lower_lim_g = 65535-gm;
2294 lower_lim_b = 65535-bm;
2295
2296 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2297 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2298 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2299
2300 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2301 } else {
2302 if (shade < 0) shade = 0;
2303 if (shade > 100) shade = 100;
2304
2305 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2306
2307 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2308 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2309 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2310 }
2311
2312 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2313 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2314 {
2315 unsigned int tmp;
2316
2317 tmp = lower_lim_r;
2318 lower_lim_r = lower_lim_b;
2319 lower_lim_b = tmp;
2320
2321 tmp = upper_lim_r;
2322 upper_lim_r = upper_lim_b;
2323 upper_lim_b = tmp;
2324 }
2325
2326 /* fill our lookup tables */
2327 for (i = 0; i <= mask_r>>sh_r; i++)
2328 {
2329 RUINT32T tmp;
2330 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2331 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2332 lookup_r[i] = (tmp/65535)<<sh_r;
2333 }
2334 for (i = 0; i <= mask_g>>sh_g; i++)
2335 {
2336 RUINT32T tmp;
2337 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2338 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2339 lookup_g[i] = (tmp/65535)<<sh_g;
2340 }
2341 for (i = 0; i <= mask_b>>sh_b; i++)
2342 {
2343 RUINT32T tmp;
2344 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2345 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2346 lookup_b[i] = (tmp/65535)<<sh_b;
2347 }
2348
2349 /* apply table to input image (replacing colors by newly calculated ones) */
2350 switch (srcImage->bits_per_pixel)
2351 {
2352 case 15:
2353 {
2354 unsigned short *p1, *pf, *p, *pl;
2355 p1 = (unsigned short *) srcImage->data;
2356 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2357 while (p1 < pf)
2358 {
2359 p = p1;
2360 pl = p1 + srcImage->width;
2361 for (; p < pl; p++)
2362 {
2363 *p = lookup_r[(*p & 0x7c00)>>10] |
2364 lookup_g[(*p & 0x03e0)>> 5] |
2365 lookup_b[(*p & 0x001f)];
2366 }
2367 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2368 }
2369 break;
2370 }
2371 case 16:
2372 {
2373 unsigned short *p1, *pf, *p, *pl;
2374 p1 = (unsigned short *) srcImage->data;
2375 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2376 while (p1 < pf)
2377 {
2378 p = p1;
2379 pl = p1 + srcImage->width;
2380 for (; p < pl; p++)
2381 {
2382 *p = lookup_r[(*p & 0xf800)>>11] |
2383 lookup_g[(*p & 0x07e0)>> 5] |
2384 lookup_b[(*p & 0x001f)];
2385 }
2386 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2387 }
2388 break;
2389 }
2390 case 24:
2391 {
2392 unsigned char *p1, *pf, *p, *pl;
2393 p1 = (unsigned char *) srcImage->data;
2394 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395 while (p1 < pf)
2396 {
2397 p = p1;
2398 pl = p1 + srcImage->width * 3;
2399 for (; p < pl; p += 3)
2400 {
2401 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2402 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2403 p[2] = lookup_r[(p[2] & 0x0000ff)];
2404 }
2405 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2406 }
2407 break;
2408 }
2409 case 32:
2410 {
2411 RUINT32T *p1, *pf, *p, *pl;
2412 p1 = (RUINT32T *) srcImage->data;
2413 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2414
2415 while (p1 < pf)
2416 {
2417 p = p1;
2418 pl = p1 + srcImage->width;
2419 for (; p < pl; p++)
2420 {
2421 *p = lookup_r[(*p & 0xff0000)>>16] |
2422 lookup_g[(*p & 0x00ff00)>> 8] |
2423 lookup_b[(*p & 0x0000ff)] |
2424 (*p & ~0xffffff);
2425 }
2426 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2427 }
2428 break;
2429 }
2430 }
2431
2432 free (lookup);
2433}
2434#endif
2435
1863/* 2436/*
1864 * Check our parents are still who we think they are. 2437 * Check our parents are still who we think they are.
1865 * Do transparency updates if required 2438 * Do transparency updates if required
1866 */ 2439 */
1867int 2440int
1868rxvt_term::check_our_parents () 2441rxvt_term::check_our_parents ()
1869{ 2442{
1870 int i, pchanged, aformat, have_pixmap, rootdepth; 2443 int i, pchanged, aformat, have_pixmap, rootdepth;
1871 unsigned long nitems, bytes_after; 2444 unsigned long nitems, bytes_after;
1872 Atom atype; 2445 Atom atype;
1873 unsigned char *prop = NULL; 2446 unsigned char *prop = NULL;
1874 Window root, oldp, *list; 2447 Window root, oldp, *list;
1875 Pixmap rootpixmap = None; 2448 Pixmap rootpixmap = None;
1876 XWindowAttributes wattr, wrootattr; 2449 XWindowAttributes wattr, wrootattr;
2450 dDisp;
1877 2451
1878 pchanged = 0; 2452 pchanged = 0;
1879 2453
1880 if (! (Options & Opt_transparent)) 2454 if (!OPTION (Opt_transparent))
1881 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
1882 2456
1883 XGetWindowAttributes (display->display, display->root, &wrootattr); 2457 XGetWindowAttributes (disp, display->root, &wrootattr);
1884 rootdepth = wrootattr.depth; 2458 rootdepth = wrootattr.depth;
1885 2459
1886 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2460 XGetWindowAttributes (disp, parent[0], &wattr);
2461
1887 if (rootdepth != wattr.depth) 2462 if (rootdepth != wattr.depth)
1888 { 2463 {
1889 if (am_transparent) 2464 if (am_transparent)
1890 { 2465 {
1891 pchanged = 1; 2466 pchanged = 1;
1892 XSetWindowBackground (display->display, TermWin.vt, 2467 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1893 PixColors[Color_bg]);
1894 am_transparent = am_pixmap_trans = 0; 2468 am_transparent = am_pixmap_trans = 0;
1895 } 2469 }
2470
1896 return pchanged; /* Don't try any more */ 2471 return pchanged; /* Don't try any more */
1897 } 2472 }
1898 2473
1899 /* Get all X ops out of the queue so that our information is up-to-date. */ 2474 /* Get all X ops out of the queue so that our information is up-to-date. */
1900 XSync (display->display, False); 2475 XSync (disp, False);
1901 2476
1902 /* 2477 /*
1903 * Make the frame window set by the window manager have 2478 * Make the frame window set by the window manager have
1904 * the root background. Some window managers put multiple nested frame 2479 * the root background. Some window managers put multiple nested frame
1905 * windows for each client, so we have to take care about that. 2480 * windows for each client, so we have to take care about that.
1906 */ 2481 */
1907 i = (xa[XA_XROOTPMAPID] != 0 2482 i = (xa[XA_XROOTPMAP_ID]
1908 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2483 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1909 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1910 &nitems, &bytes_after, &prop) == Success)); 2485 &nitems, &bytes_after, &prop) == Success);
2486
1911 if (!i || prop == NULL) 2487 if (!i || prop == NULL)
2488 i = (xa[XA_ESETROOT_PMAP_ID]
2489 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL
2494#if TINTING
2495 || !rs[Rs_color + Color_tint]
2496#endif
2497 )
1912 have_pixmap = 0; 2498 have_pixmap = 0;
1913 else 2499 else
1914 { 2500 {
1915 have_pixmap = 1; 2501 have_pixmap = 1;
1916 rootpixmap = * ((Pixmap *)prop); 2502 rootpixmap = *(Pixmap *)prop;
1917 XFree (prop); 2503 XFree (prop);
1918 } 2504 }
2505
1919 if (have_pixmap) 2506 if (have_pixmap)
1920 { 2507 {
1921 /* 2508 /*
1922 * Copy display->root pixmap transparency 2509 * Copy display->root pixmap transparency
1923 */ 2510 */
… …
1926 Window cr; 2513 Window cr;
1927 XImage *image; 2514 XImage *image;
1928 GC gc; 2515 GC gc;
1929 XGCValues gcvalue; 2516 XGCValues gcvalue;
1930 2517
1931 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2518 XTranslateCoordinates (disp, parent[0], display->root,
1932 0, 0, &sx, &sy, &cr); 2519 0, 0, &sx, &sy, &cr);
1933 nw = (unsigned int)szHint.width; 2520 nw = (unsigned int)szHint.width;
1934 nh = (unsigned int)szHint.height; 2521 nh = (unsigned int)szHint.height;
1935 nx = ny = 0; 2522 nx = ny = 0;
1936 2523
1937 if (sx < 0) 2524 if (sx < 0)
… …
1946 nh += sy; 2533 nh += sy;
1947 ny = -sy; 2534 ny = -sy;
1948 sy = 0; 2535 sy = 0;
1949 } 2536 }
1950 2537
1951 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
1952 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540
2541 XSync (disp, False);
1953 allowedxerror = -1; 2542 allowedxerror = -1;
1954 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2543 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1955 ZPixmap); 2544
1956 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1957 /* XXX: may need a delay here? */ 2546 /* XXX: may need a delay here? */
1958 allowedxerror = 0; 2547 allowedxerror = 0;
2548
1959 if (image == NULL) 2549 if (image == NULL)
1960 { 2550 {
1961 if (am_transparent && am_pixmap_trans) 2551 if (am_transparent && am_pixmap_trans)
1962 { 2552 {
1963 pchanged = 1; 2553 pchanged = 1;
1964 if (TermWin.pixmap != None) 2554 if (pixmap != None)
1965 { 2555 {
1966 XFreePixmap (display->display, TermWin.pixmap); 2556 XFreePixmap (disp, pixmap);
1967 TermWin.pixmap = None; 2557 pixmap = None;
1968 } 2558 }
1969 } 2559 }
2560
1970 am_pixmap_trans = 0; 2561 am_pixmap_trans = 0;
1971 } 2562 }
1972 else 2563 else
1973 { 2564 {
1974 if (TermWin.pixmap != None) 2565 if (pixmap != None)
1975 XFreePixmap (display->display, TermWin.pixmap); 2566 XFreePixmap (disp, pixmap);
2567
2568#if TINTING
2569 if (ISSET_PIXCOLOR (Color_tint))
2570 {
2571 unsigned short rm, gm, bm;
2572 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2573
2574 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2575
2576 ShadeXImage (display, image, shade, rm, gm, bm);
2577 }
2578#endif
2579
1976 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2580 pixmap = XCreatePixmap (disp, vt,
1977 (unsigned int)szHint.width,
1978 (unsigned int)szHint.height, 2581 szHint.width, szHint.height, image->depth);
1979 (unsigned int)image->depth);
1980 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2582 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
1981 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2583 XPutImage (disp, pixmap, gc, image, 0, 0,
1982 nx, ny, (unsigned int)image->width,
1983 (unsigned int)image->height); 2584 nx, ny, image->width, image->height);
1984 XFreeGC (display->display, gc); 2585 XFreeGC (disp, gc);
1985 XDestroyImage (image); 2586 XDestroyImage (image);
1986 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2587 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
1987 TermWin.pixmap); 2588 XClearWindow (disp, parent[0]);
2589
1988 if (!am_transparent || !am_pixmap_trans) 2590 if (!am_transparent || !am_pixmap_trans)
1989 pchanged = 1; 2591 pchanged = 1;
2592
1990 am_transparent = am_pixmap_trans = 1; 2593 am_transparent = am_pixmap_trans = 1;
1991 } 2594 }
1992 } 2595 }
1993 2596
1994 if (!am_pixmap_trans) 2597 if (am_pixmap_trans)
2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2599 else
1995 { 2600 {
1996 unsigned int n; 2601 unsigned int n;
1997 /* 2602 /*
1998 * InheritPixmap transparency 2603 * InheritPixmap transparency
1999 */ 2604 */
2000 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2001 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2605 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2002 i++)
2003 { 2606 {
2004 oldp = TermWin.parent[i]; 2607 oldp = parent[i];
2005 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2608 XQueryTree (disp, parent[i - 1], &root,
2006 &TermWin.parent[i], &list, &n); 2609 &parent[i], &list, &n);
2007 XFree (list); 2610 XFree (list);
2008 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2611
2009 if (TermWin.parent[i] == display->root) 2612 if (parent[i] == display->root)
2010 { 2613 {
2011 if (oldp != None) 2614 if (oldp != None)
2012 pchanged = 1; 2615 pchanged = 1;
2616
2013 break; 2617 break;
2014 } 2618 }
2619
2015 if (oldp != TermWin.parent[i]) 2620 if (oldp != parent[i])
2016 pchanged = 1; 2621 pchanged = 1;
2017 } 2622 }
2018 2623
2019 n = 0; 2624 n = 0;
2020 2625
2021 if (pchanged) 2626 if (pchanged)
2022 { 2627 {
2023 for (; n < (unsigned int)i; n++) 2628 for (; n < (unsigned int)i; n++)
2024 { 2629 {
2025 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2630 XGetWindowAttributes (disp, parent[n], &wattr);
2026 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2027 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2028 { 2632 {
2029 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2030 break; 2634 break;
2031 } 2635 }
2032 } 2636 }
2033 } 2637 }
2034 2638
2035 if (n > (int) (sizeof (TermWin.parent) 2639 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2036 / sizeof (TermWin.parent[0])))
2037 { 2640 {
2038 D_X ((stderr, "InheritPixmap Turning off")); 2641 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2039 XSetWindowBackground (display->display, TermWin.parent[0], 2642 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2040 PixColors[Color_fg]);
2041 XSetWindowBackground (display->display, TermWin.vt,
2042 PixColors[Color_bg]);
2043 am_transparent = 0; 2643 am_transparent = 0;
2044 /* XXX: also turn off Opt_transparent? */ 2644 /* XXX: also turn off Opt_transparent? */
2045 } 2645 }
2046 else 2646 else
2047 { 2647 {
2648#if WAIT_FOR_WM
2048 /* wait (an arbitrary period) for the WM to do its thing 2649 /* wait (an arbitrary period) for the WM to do its thing
2049 * needed for fvwm2.2.2 (and before?) */ 2650 * needed for fvwm2.2.2 (and before?) */
2050# ifdef HAVE_NANOSLEEP
2051 struct timespec rqt;
2052
2053 rqt.tv_sec = 1;
2054 rqt.tv_nsec = 0;
2055 nanosleep (&rqt, NULL);
2056# else
2057 sleep (1); 2651 sleep (1);
2058# endif 2652#endif
2059 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2060 for (n = 0; n < (unsigned int)i; n++) 2653 for (n = 0; n < (unsigned int)i; n++)
2061 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2654 {
2062 ParentRelative); 2655 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2063 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2656 XClearWindow (disp, parent[n]);
2064 ParentRelative); 2657 }
2658
2659 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2065 am_transparent = 1; 2660 am_transparent = 1;
2066 } 2661 }
2067 2662
2068 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2663 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2069 TermWin.parent[i] = None; 2664 parent[i] = None;
2665 }
2666
2667 if (scrollBar.win)
2070 } 2668 {
2669 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2670 scrollBar.setIdle ();
2671 scrollbar_show (0);
2672 }
2673
2674 if (am_transparent)
2675 {
2676 want_refresh = want_full_refresh = 1;
2677 if (am_pixmap_trans)
2678 flush ();
2679 }
2680
2071 return pchanged; 2681 return pchanged;
2072} 2682}
2073#endif 2683#endif
2074 2684
2075/*}}} */ 2685/*}}} */
2686
2687bool
2688rxvt_term::cmd_parse ()
2689{
2690 bool flag = false;
2691 wchar_t ch = NOCHAR;
2692 char *seq_begin; // remember start of esc-sequence here
2693
2694 for (;;)
2695 {
2696 if (ch == NOCHAR)
2697 {
2698 seq_begin = cmdbuf_ptr;
2699 ch = next_char ();
2700
2701 if (ch == NOCHAR)
2702 break;
2703 }
2704
2705 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2706 {
2707 if (!seen_input)
2708 {
2709 seen_input = 1;
2710 // many badly-written programs (e.g. jed) contain a race condition:
2711 // they first read the screensize and then install a SIGWINCH handler.
2712 // some window managers resize the window early, and these programs
2713 // then sometimes get the size wrong.
2714 // unfortunately other programs are even more buggy and dislike
2715 // being sent SIGWINCH, so only do it when we were in fact being
2716 // resized.
2717 if (seen_resize && cmd_pid)
2718 kill (-cmd_pid, SIGWINCH);
2719 }
2720
2721 /* Read a text string from the input buffer */
2722 wchar_t buf[UBUFSIZ];
2723 bool refreshnow = false;
2724 int nlines = 0;
2725 wchar_t *str = buf;
2726 wchar_t *eol = str + min (ncol, UBUFSIZ);
2727
2728 for (;;)
2729 {
2730 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2731 break;
2732
2733 *str++ = ch;
2734
2735 if (ch == C0_LF || str >= eol)
2736 {
2737 if (ch == C0_LF)
2738 nlines++;
2739
2740 refresh_count++;
2741
2742 if (!OPTION (Opt_jumpScroll)
2743 || (refresh_count >= refresh_limit * (nrow - 1)))
2744 {
2745 refreshnow = true;
2746 refresh_count = 0;
2747 ch = NOCHAR;
2748 break;
2749 }
2750
2751 // scr_add_lines only works for nlines <= nrow - 1.
2752 if (nlines >= nrow - 1)
2753 {
2754 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2755 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2756 scr_add_lines (buf, str - buf, nlines);
2757
2758 nlines = 0;
2759 str = buf;
2760 eol = str + min (ncol, UBUFSIZ);
2761 }
2762
2763 if (str >= eol)
2764 {
2765 if (eol >= buf + UBUFSIZ)
2766 {
2767 ch = NOCHAR;
2768 break;
2769 }
2770 else
2771 eol = min (eol + ncol, buf + UBUFSIZ);
2772 }
2773
2774 }
2775
2776 seq_begin = cmdbuf_ptr;
2777 ch = next_char ();
2778 }
2779
2780 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2781 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2782 scr_add_lines (buf, str - buf, nlines);
2783
2784 /*
2785 * If there have been a lot of new lines, then update the screen
2786 * What the heck I'll cheat and only refresh less than every page-full.
2787 * the number of pages between refreshes is refresh_limit, which
2788 * is incremented here because we must be doing flat-out scrolling.
2789 */
2790 if (refreshnow)
2791 {
2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2793 refresh_limit++;
2794 else
2795 {
2796 flag = true;
2797 scr_refresh ();
2798 want_refresh = 1;
2799 }
2800 }
2801
2802 }
2803 else
2804 {
2805 try
2806 {
2807 process_nonprinting (ch);
2808 }
2809 catch (const class out_of_input &o)
2810 {
2811 // we ran out of input, retry later
2812 cmdbuf_ptr = seq_begin;
2813 break;
2814 }
2815
2816 ch = NOCHAR;
2817 }
2818 }
2819
2820 return flag;
2821}
2822
2823// read the next character
2824wchar_t
2825rxvt_term::next_char ()
2826{
2827 while (cmdbuf_ptr < cmdbuf_endp)
2828 {
2829 // assume 7-bit to be ascii ALWAYS
2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2831 return *cmdbuf_ptr++;
2832
2833 wchar_t wc;
2834 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2835
2836 if (len == (size_t)-2)
2837 {
2838 // the mbstate stores incomplete sequences. didn't know this :/
2839 cmdbuf_ptr = cmdbuf_endp;
2840 break;
2841 }
2842
2843 if (len == (size_t)-1)
2844 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2845
2846 // assume wchar == unicode
2847 cmdbuf_ptr += len;
2848 return wc & UNICODE_MASK;
2849 }
2850
2851 return NOCHAR;
2852}
2853
2854// read the next octet
2855uint32_t
2856rxvt_term::next_octet ()
2857{
2858 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR;
2861}
2862
2863/* rxvt_cmd_getc () - Return next input character */
2864/*
2865 * Return the next input character after first passing any keyboard input
2866 * to the command.
2867 */
2868wchar_t
2869rxvt_term::cmd_getc ()
2870{
2871 wchar_t c = next_char ();
2872
2873 if (c == NOCHAR)
2874 throw out_of_input;
2875
2876 return c;
2877}
2878
2879uint32_t
2880rxvt_term::cmd_get8 ()
2881{
2882 uint32_t c = next_octet ();
2883
2884 if (c == NOCHAR)
2885 throw out_of_input;
2886
2887 return c;
2888}
2076 2889
2077/*{{{ print pipe */ 2890/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2891/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2892#ifdef PRINTPIPE
2080FILE * 2893FILE *
2081rxvt_term::popen_printer () 2894rxvt_term::popen_printer ()
2082{ 2895{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2896 FILE *stream = popen (rs[Rs_print_pipe], "w");
2084 2897
2085 if (stream == NULL) 2898 if (stream == NULL)
2086 rxvt_print_error ("can't open printer pipe"); 2899 rxvt_warn ("can't open printer pipe, not printing.\n");
2900
2087 return stream; 2901 return stream;
2088} 2902}
2089 2903
2090int 2904int
2091rxvt_term::pclose_printer (FILE *stream) 2905rxvt_term::pclose_printer (FILE *stream)
2092{ 2906{
2093 fflush (stream); 2907 fflush (stream);
2094 /* pclose () reported not to work on SunOS 4.1.3 */
2095# if defined (__sun__) /* TODO: RESOLVE THIS */
2096 /* pclose works provided SIGCHLD handler uses waitpid */
2097 return pclose (stream); /* return fclose (stream); */
2098# else
2099 return pclose (stream); 2908 return pclose (stream);
2100# endif
2101} 2909}
2102 2910
2103/* 2911/*
2104 * simulate attached vt100 printer 2912 * simulate attached vt100 printer
2105 */ 2913 */
2106void 2914void
2107rxvt_term::process_print_pipe () 2915rxvt_term::process_print_pipe ()
2108{ 2916{
2109 int done; 2917 int done;
2110 FILE *fd; 2918 FILE *fd;
2111 2919
2112 if ((fd = popen_printer ()) == NULL) 2920 if ((fd = popen_printer ()) == NULL)
2113 return; 2921 return;
2114 2922
2115 /* 2923 /*
2116 * Send all input to the printer until either ESC[4i or ESC[?4i 2924 * Send all input to the printer until either ESC[4i or ESC[?4i
2117 * is received. 2925 * is received.
2118 */ 2926 */
2119 for (done = 0; !done;) 2927 for (done = 0; !done;)
2120 { 2928 {
2121 unsigned char buf[8]; 2929 unsigned char buf[8];
2122 unsigned char ch; 2930 unicode_t ch;
2123 unsigned int i, len; 2931 unsigned int i, len;
2124 2932
2125 if ((ch = cmd_getc ()) != C0_ESC) 2933 if ((ch = cmd_getc ()) != C0_ESC)
2126 { 2934 {
2127 if (putc (ch, fd) == EOF) 2935 if (putc (ch, fd) == EOF)
2128 break; /* done = 1 */ 2936 break; /* done = 1 */
… …
2143 { 2951 {
2144 if ((buf[len++] = cmd_getc ()) == 'i') 2952 if ((buf[len++] = cmd_getc ()) == 'i')
2145 break; /* done = 1 */ 2953 break; /* done = 1 */
2146 } 2954 }
2147 } 2955 }
2956
2148 for (i = 0; i < len; i++) 2957 for (i = 0; i < len; i++)
2149 if (putc (buf[i], fd) == EOF) 2958 if (putc (buf[i], fd) == EOF)
2150 { 2959 {
2151 done = 1; 2960 done = 1;
2152 break; 2961 break;
2153 } 2962 }
2154 } 2963 }
2155 } 2964 }
2965
2156 pclose_printer (fd); 2966 pclose_printer (fd);
2157} 2967}
2158#endif /* PRINTPIPE */ 2968#endif /* PRINTPIPE */
2159/*}}} */ 2969/*}}} */
2160 2970
2161/* *INDENT-OFF* */ 2971/* *INDENT-OFF* */
2162enum { 2972enum {
2163 C1_40 = 0x40, 2973 C1_40 = 0x40,
2164 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2974 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2165 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2975 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2166 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2976 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2167 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2977 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2168}; 2978};
2169/* *INDENT-ON* */ 2979/* *INDENT-ON* */
2170 2980
2171/*{{{ process non-printing single characters */ 2981/*{{{ process non-printing single characters */
2172void 2982void
2173rxvt_term::process_nonprinting (unsigned char ch) 2983rxvt_term::process_nonprinting (unicode_t ch)
2174{ 2984{
2175 switch (ch) 2985 switch (ch)
2176 { 2986 {
2987 case C0_ESC:
2988 process_escape_seq ();
2989 break;
2177 case C0_ENQ: /* terminal Status */ 2990 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2991 if (rs[Rs_answerbackstring])
2179 tt_write ( 2992 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2180 (const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2993 else
2183 tt_write ((unsigned char *)VT100_ANS, 2994 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2995 break;
2186 case C0_BEL: /* bell */ 2996 case C0_BEL: /* bell */
2187 scr_bell (); 2997 scr_bell ();
2188 break; 2998 break;
2189 case C0_BS: /* backspace */ 2999 case C0_BS: /* backspace */
… …
2204 scr_charset_choose (1); 3014 scr_charset_choose (1);
2205 break; 3015 break;
2206 case C0_SI: /* shift in - acs */ 3016 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 3017 scr_charset_choose (0);
2208 break; 3018 break;
3019
3020#ifdef EIGHT_BIT_CONTROLS
3021 // 8-bit controls
3022 case 0x90: /* DCS */
3023 process_dcs_seq ();
3024 break;
3025 case 0x9b: /* CSI */
3026 process_csi_seq ();
3027 break;
3028 case 0x9d: /* CSI */
3029 process_osc_seq ();
3030 break;
3031#endif
2209 } 3032 }
2210} 3033}
2211/*}}} */ 3034/*}}} */
2212 3035
2213 3036
2214/*{{{ process VT52 escape sequences */ 3037/*{{{ process VT52 escape sequences */
2215void 3038void
2216rxvt_term::process_escape_vt52 (unsigned char ch) 3039rxvt_term::process_escape_vt52 (unicode_t ch)
2217{ 3040{
2218 int row, col; 3041 int row, col;
2219 3042
2220 switch (ch) 3043 switch (ch)
2221 { 3044 {
… …
2273 3096
2274/*{{{ process escape sequences */ 3097/*{{{ process escape sequences */
2275void 3098void
2276rxvt_term::process_escape_seq () 3099rxvt_term::process_escape_seq ()
2277{ 3100{
2278 unsigned char ch = cmd_getc (); 3101 unicode_t ch = cmd_getc ();
2279 3102
2280 if (PrivateModes & PrivMode_vt52) 3103 if (priv_modes & PrivMode_vt52)
2281 { 3104 {
2282 process_escape_vt52 (ch); 3105 process_escape_vt52 (ch);
2283 return; 3106 return;
2284 } 3107 }
2285 3108
… …
2300 scr_charset_set (2, (unsigned int)cmd_getc ()); 3123 scr_charset_set (2, (unsigned int)cmd_getc ());
2301 break; 3124 break;
2302 case '+': 3125 case '+':
2303 scr_charset_set (3, (unsigned int)cmd_getc ()); 3126 scr_charset_set (3, (unsigned int)cmd_getc ());
2304 break; 3127 break;
2305#ifndef NO_FRILLS 3128#if ENABLE_FRILLS
2306 case '6': 3129 case '6':
2307 scr_backindex (); 3130 scr_backindex ();
2308 break; 3131 break;
2309#endif 3132#endif
2310 case '7': 3133 case '7':
2311 scr_cursor (SAVE); 3134 scr_cursor (SAVE);
2312 break; 3135 break;
2313 case '8': 3136 case '8':
2314 scr_cursor (RESTORE); 3137 scr_cursor (RESTORE);
2315 break; 3138 break;
2316#ifndef NO_FRILLS 3139#if ENABLE_FRILLS
2317 case '9': 3140 case '9':
2318 scr_forwardindex (); 3141 scr_forwardindex ();
2319 break; 3142 break;
2320#endif 3143#endif
2321 case '=': 3144 case '=':
… …
2331 break; 3154 break;
2332 3155
2333 /* 8.3.87: NEXT LINE */ 3156 /* 8.3.87: NEXT LINE */
2334 case C1_NEL: /* ESC E */ 3157 case C1_NEL: /* ESC E */
2335 { 3158 {
2336 uint32_t nlcr[] = { '\n', '\r' }; 3159 wchar_t nlcr[] = { C0_LF, C0_CR };
2337 scr_add_lines (nlcr, 1, 2); 3160 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2338 } 3161 }
2339 break; 3162 break;
2340 3163
2341 /* kidnapped escape sequence: Should be 8.3.48 */ 3164 /* kidnapped escape sequence: Should be 8.3.48 */
2342 case C1_ESA: /* ESC G */ 3165 case C1_ESA: /* ESC G */
… …
2352 case C1_RI: /* ESC M */ 3175 case C1_RI: /* ESC M */
2353 scr_index (DN); 3176 scr_index (DN);
2354 break; 3177 break;
2355 3178
2356 /* 8.3.142: SINGLE-SHIFT TWO */ 3179 /* 8.3.142: SINGLE-SHIFT TWO */
2357 /*case C1_SS2: scr_single_shift (2); break; */ 3180 /*case C1_SS2: scr_single_shift (2); break; */
2358 3181
2359 /* 8.3.143: SINGLE-SHIFT THREE */ 3182 /* 8.3.143: SINGLE-SHIFT THREE */
2360 /*case C1_SS3: scr_single_shift (3); break; */ 3183 /*case C1_SS3: scr_single_shift (3); break; */
2361 3184
2362 /* 8.3.27: DEVICE CONTROL STRING */ 3185 /* 8.3.27: DEVICE CONTROL STRING */
2363 case C1_DCS: /* ESC P */ 3186 case C1_DCS: /* ESC P */
2364 process_dcs_seq (); 3187 process_dcs_seq ();
2365 break; 3188 break;
2366 3189
2367 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3190 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2368 case C1_SCI: /* ESC Z */ 3191 case C1_SCI: /* ESC Z */
2369 tt_write ((const unsigned char *)ESCZ_ANSWER, 3192 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2370 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2371 break; /* steal obsolete ESC [ c */ 3193 break; /* steal obsolete ESC [ c */
2372 3194
2373 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3195 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2374 case C1_CSI: /* ESC [ */ 3196 case C1_CSI: /* ESC [ */
2375 process_csi_seq (); 3197 process_csi_seq ();
… …
2380 process_osc_seq (); 3202 process_osc_seq ();
2381 break; 3203 break;
2382 3204
2383 /* 8.3.106: RESET TO INITIAL STATE */ 3205 /* 8.3.106: RESET TO INITIAL STATE */
2384 case 'c': 3206 case 'c':
3207 mbstate.reset ();
2385 scr_poweron (); 3208 scr_poweron ();
2386 scrollbar_show (1); 3209 scrollbar_show (1);
2387 break; 3210 break;
2388 3211
2389 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3212 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2401 3224
2402/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3225/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2403/* *INDENT-OFF* */ 3226/* *INDENT-OFF* */
2404enum { 3227enum {
2405 CSI_ICH = 0x40, 3228 CSI_ICH = 0x40,
2406 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3229 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2407 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3230 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2408 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3231 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2409 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3232 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2410 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3233 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2411 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3234 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2426 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3249 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2427 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3250 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2428 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3251 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2429 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3252 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2430 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3253 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2431 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3254 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2432 }; 3255 };
2433/* *INDENT-ON* */ 3256/* *INDENT-ON* */
2434 3257
2435void 3258void
2436rxvt_term::process_csi_seq () 3259rxvt_term::process_csi_seq ()
2437{ 3260{
2438 unsigned char ch, priv, i; 3261 unicode_t ch, priv, i;
2439 unsigned int nargs, p; 3262 unsigned int nargs, p;
2440 int n, ndef; 3263 int n, ndef;
2441 int arg[ESC_ARGS]; 3264 int arg[ESC_ARGS];
2442 3265
2443 for (nargs = ESC_ARGS; nargs > 0;) 3266 for (nargs = ESC_ARGS; nargs > 0;)
2444 arg[--nargs] = 0; 3267 arg[--nargs] = 0;
2445 3268
2446 priv = 0; 3269 priv = 0;
… …
2448 if (ch >= '<' && ch <= '?') 3271 if (ch >= '<' && ch <= '?')
2449 { /* '<' '=' '>' '?' */ 3272 { /* '<' '=' '>' '?' */
2450 priv = ch; 3273 priv = ch;
2451 ch = cmd_getc (); 3274 ch = cmd_getc ();
2452 } 3275 }
3276
2453 /* read any numerical arguments */ 3277 /* read any numerical arguments */
2454 for (n = -1; ch < CSI_ICH; ) 3278 for (n = -1; ch < CSI_ICH; )
2455 { 3279 {
2456 if (isdigit (ch)) 3280 if (isdigit (ch))
2457 { 3281 {
… …
2464 { 3288 {
2465 if (nargs < ESC_ARGS) 3289 if (nargs < ESC_ARGS)
2466 arg[nargs++] = n; 3290 arg[nargs++] = n;
2467 n = -1; 3291 n = -1;
2468 } 3292 }
2469 else if (ch == '\b') 3293 else if (IS_CONTROL (ch))
2470 {
2471 scr_backspace ();
2472 }
2473 else if (ch == C0_ESC)
2474 {
2475 process_escape_seq ();
2476 return;
2477 }
2478 else if (ch < ' ')
2479 {
2480 process_nonprinting (ch); 3294 process_nonprinting (ch);
2481 } 3295
2482 ch = cmd_getc (); 3296 ch = cmd_getc ();
2483 } 3297 }
2484 3298
2485 if (ch > CSI_7F) 3299 if (ch > CSI_7F)
2486 return; 3300 return;
… …
2508 { 3322 {
2509 switch (priv) 3323 switch (priv)
2510 { 3324 {
2511 case '>': 3325 case '>':
2512 if (ch == CSI_DA) /* secondary device attributes */ 3326 if (ch == CSI_DA) /* secondary device attributes */
2513 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3327 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2514 break; 3328 break;
2515 case '?': 3329 case '?':
2516 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3330 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2517 process_terminal_mode (ch, priv, nargs, arg); 3331 process_terminal_mode (ch, priv, nargs, arg);
2518 break; 3332 break;
… …
2623 3437
2624 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3438 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2625 arg[0] = -arg[0]; 3439 arg[0] = -arg[0];
2626 /* FALLTHROUGH */ 3440 /* FALLTHROUGH */
2627 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3441 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2628 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3442 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2629 break; 3443 break;
2630 3444
2631 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3445 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2632 tt_write ((const unsigned char *)VT100_ANS, 3446 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2633 (unsigned int) (sizeof (VT100_ANS) - 1));
2634 break; 3447 break;
2635 3448
2636 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3449 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2637 process_sgr_mode (nargs, arg); 3450 process_sgr_mode (nargs, arg);
2638 break; 3451 break;
… …
2644 tt_printf ("\033[0n"); 3457 tt_printf ("\033[0n");
2645 break; 3458 break;
2646 case 6: /* CPR requested */ 3459 case 6: /* CPR requested */
2647 scr_report_position (); 3460 scr_report_position ();
2648 break; 3461 break;
2649#if defined (ENABLE_DISPLAY_ANSWER)
2650 case 7: /* unofficial extension */ 3462 case 7: /* unofficial extension */
3463 if (OPTION (Opt_insecure))
2651 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3464 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2652 break; 3465 break;
2653#endif
2654 case 8: /* unofficial extension */ 3466 case 8: /* unofficial extension */
2655 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3467 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2656 break; 3468 break;
2657 } 3469 }
2658 break; 3470 break;
2659 3471
2660 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3472 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2693 break; 3505 break;
2694 3506
2695 case CSI_RM: /* 8.3.107: RESET MODE */ 3507 case CSI_RM: /* 8.3.107: RESET MODE */
2696 if (arg[0] == 4) 3508 if (arg[0] == 4)
2697 scr_insert_mode (0); 3509 scr_insert_mode (0);
3510 else if (arg[0] == 20)
3511 priv_modes &= ~PrivMode_LFNL;
2698 break; 3512 break;
2699 3513
2700 case CSI_SM: /* 8.3.126: SET MODE */ 3514 case CSI_SM: /* 8.3.126: SET MODE */
2701 if (arg[0] == 4) 3515 if (arg[0] == 4)
2702 scr_insert_mode (1); 3516 scr_insert_mode (1);
3517 else if (arg[0] == 20)
3518 priv_modes |= PrivMode_LFNL;
2703 break; 3519 break;
2704 3520
2705 /* 3521 /*
2706 * PRIVATE USE beyond this point. All CSI_7? sequences here 3522 * PRIVATE USE beyond this point. All CSI_7? sequences here
2707 */ 3523 */
… …
2719 break; 3535 break;
2720 case CSI_75: 3536 case CSI_75:
2721 scr_cursor (RESTORE); 3537 scr_cursor (RESTORE);
2722 break; 3538 break;
2723 3539
2724#ifndef NO_FRILLS 3540#if ENABLE_FRILLS
2725 case CSI_74: 3541 case CSI_74:
2726 process_window_ops (arg, nargs); 3542 process_window_ops (arg, nargs);
2727 break; 3543 break;
2728#endif 3544#endif
2729 3545
2730 case CSI_78: /* DECREQTPARM */ 3546 case CSI_78: /* DECREQTPARM */
2731 if (arg[0] == 0 || arg[0] == 1) 3547 if (arg[0] == 0 || arg[0] == 1)
2732 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3548 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2733 /* FALLTHROUGH */ 3549 break;
2734 3550
2735 default: 3551 default:
2736 break; 3552 break;
2737 } 3553 }
2738} 3554}
2739/*}}} */ 3555/*}}} */
2740 3556
2741#ifndef NO_FRILLS 3557#if ENABLE_FRILLS
2742/* ARGSUSED */ 3558/* ARGSUSED */
2743void 3559void
2744rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3560rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2745{ 3561{
2746 int x, y; 3562 int x, y;
2747#if 0
2748 char *s;
2749#endif
2750 XWindowAttributes wattr; 3563 XWindowAttributes wattr;
2751 Window wdummy; 3564 Window wdummy;
3565 dDisp;
2752 3566
2753 if (nargs == 0) 3567 if (nargs == 0)
2754 return; 3568 return;
3569
2755 switch (args[0]) 3570 switch (args[0])
2756 { 3571 {
2757 /* 3572 /*
2758 * commands 3573 * commands
2759 */ 3574 */
2760 case 1: /* deiconify window */ 3575 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3576 XMapWindow (disp, parent[0]);
2762 break; 3577 break;
2763 case 2: /* iconify window */ 3578 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3579 XIconifyWindow (disp, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3580 break;
2767 case 3: /* set position (pixels) */ 3581 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3582 XMoveWindow (disp, parent[0], args[1], args[2]);
2769 break; 3583 break;
2770 case 4: /* set size (pixels) */ 3584 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3586 break;
2773 case 5: /* raise window */ 3587 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3588 XRaiseWindow (disp, parent[0]);
2775 break; 3589 break;
2776 case 6: /* lower window */ 3590 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3591 XLowerWindow (disp, parent[0]);
2778 break; 3592 break;
2779 case 7: /* refresh window */ 3593 case 7: /* refresh window */
2780 scr_touch (true); 3594 scr_touch (true);
2781 break; 3595 break;
2782 case 8: /* set size (chars) */ 3596 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3597 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3598 (unsigned int) (args[1] * fheight));
2785 break; 3599 break;
3600
3601 //case 9: NYI, TODO, restore maximized window or maximize window
2786 default: 3602 default:
2787 if (args[0] >= 24) /* set height (chars) */ 3603 if (args[0] >= 24) /* set height (chars) */
2788 set_widthheight ((unsigned int)TermWin.width, 3604 set_widthheight ((unsigned int)width,
2789 (unsigned int) (args[1] * TermWin.fheight)); 3605 (unsigned int) (args[1] * fheight));
2790 break; 3606 break;
3607
3608
2791 /* 3609 /*
2792 * reports - some output format copied from XTerm 3610 * reports - some output format copied from XTerm
2793 */ 3611 */
2794 case 11: /* report window state */ 3612 case 11: /* report window state */
2795 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3613 XGetWindowAttributes (disp, parent[0], &wattr);
2796 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3614 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2797 break; 3615 break;
2798 case 13: /* report window position */ 3616 case 13: /* report window position */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3617 XGetWindowAttributes (disp, parent[0], &wattr);
2800 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3618 XTranslateCoordinates (disp, parent[0], wattr.root,
2801 -wattr.border_width, -wattr.border_width, 3619 -wattr.border_width, -wattr.border_width,
2802 &x, &y, &wdummy); 3620 &x, &y, &wdummy);
2803 tt_printf ("\033[3;%d;%dt", x, y); 3621 tt_printf ("\033[3;%d;%dt", x, y);
2804 break; 3622 break;
2805 case 14: /* report window size (pixels) */ 3623 case 14: /* report window size (pixels) */
2806 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3624 XGetWindowAttributes (disp, parent[0], &wattr);
2807 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3625 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2808 break; 3626 break;
3627 case 18: /* report text area size (chars) */
3628 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3629 break;
2809 case 18: /* report window size (chars) */ 3630 case 19: /* report window size (chars) */
2810 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3631 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2811 break; 3632 break;
2812#if 0 /* XXX: currently disabled due to security concerns */
2813 case 20: /* report icon label */ 3633 case 20: /* report icon label */
3634 {
3635 char *s;
2814 XGetIconName (display->display, TermWin.parent[0], &s); 3636 XGetIconName (disp, parent[0], &s);
2815 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3637 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3638 XFree (s);
3639 }
2816 break; 3640 break;
2817 case 21: /* report window title */ 3641 case 21: /* report window title */
3642 {
3643 char *s;
2818 XFetchName (display->display, TermWin.parent[0], &s); 3644 XFetchName (disp, parent[0], &s);
2819 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3645 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3646 XFree (s);
3647 }
2820 break; 3648 break;
2821#endif
2822
2823 } 3649 }
2824} 3650}
2825#endif 3651#endif
2826 3652
2827/*----------------------------------------------------------------------*/ 3653/*----------------------------------------------------------------------*/
2828/* 3654/*
2829 * get input up until STRING TERMINATOR (or BEL) 3655 * get input up until STRING TERMINATOR (or BEL)
2830 * ends_how is terminator used. returned input must be free ()d 3656 * ends_how is terminator used. returned input must be free()'d
2831 */ 3657 */
2832unsigned char * 3658char *
2833rxvt_term::get_to_st (unsigned char *ends_how) 3659rxvt_term::get_to_st (unicode_t &ends_how)
2834{ 3660{
2835 int seen_esc = 0; /* seen escape? */ 3661 unicode_t ch;
3662 bool seen_esc = false;
2836 unsigned int n = 0; 3663 unsigned int n = 0;
2837 unsigned char *s; 3664 wchar_t string[STRING_MAX];
2838 unsigned char ch, string[STRING_MAX];
2839 3665
2840 for (; (ch = cmd_getc ());) 3666 while ((ch = cmd_getc ()) != NOCHAR)
2841 { 3667 {
2842 if (ch == C0_BEL 3668 if (seen_esc)
2843 || ch == CHAR_ST 3669 {
2844 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3670 if (ch == 0x5c) /* 7bit ST */
2845 break; 3671 break;
3672 else
3673 return NULL;
3674 }
2846 if (ch == C0_ESC) 3675 else if (ch == C0_ESC)
2847 { 3676 {
2848 seen_esc = 1; 3677 seen_esc = true;
2849 continue; 3678 continue;
2850 } 3679 }
2851 else if (ch == '\t') 3680 else if (ch == C0_BEL || ch == CHAR_ST)
2852 ch = ' '; /* translate '\t' to space */ 3681 break;
2853 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3682 else if (ch < 0x20)
2854 return NULL; /* other control character - exit */ 3683 return NULL; /* other control character - exit */
2855 if (n < sizeof (string) - 1) 3684
3685 seen_esc = false;
3686
3687 if (n >= STRING_MAX - 1)
3688 // stop at some sane length
3689 return NULL;
3690
3691 if (ch == C0_SYN)
3692 string[n++] = cmd_get8 ();
3693 else
2856 string[n++] = ch; 3694 string[n++] = ch;
2857 seen_esc = 0;
2858 } 3695 }
3696
2859 string[n++] = '\0'; 3697 string[n++] = '\0';
2860 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3698
2861 return NULL;
2862 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3699 ends_how = (ch == 0x5c ? C0_ESC : ch);
2863 STRNCPY (s, string, n); 3700
2864 return s; 3701 return rxvt_wcstombs (string);
2865} 3702}
2866 3703
2867/*----------------------------------------------------------------------*/ 3704/*----------------------------------------------------------------------*/
2868/* 3705/*
2869 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3706 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2870 */ 3707 */
2871void 3708void
2872rxvt_term::process_dcs_seq () 3709rxvt_term::process_dcs_seq ()
2873{ 3710{
2874 unsigned char eh, *s; 3711 char *s;
3712 unicode_t eh;
3713
2875 /* 3714 /*
2876 * Not handled yet 3715 * Not handled yet
2877 */ 3716 */
2878 s = get_to_st (&eh); 3717 s = get_to_st (eh);
2879 if (s) 3718 if (s)
2880 free (s); 3719 free (s);
3720
2881 return; 3721 return;
2882} 3722}
2883 3723
2884/*----------------------------------------------------------------------*/ 3724/*----------------------------------------------------------------------*/
2885/* 3725/*
2886 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3726 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2887 */ 3727 */
2888void 3728void
2889rxvt_term::process_osc_seq () 3729rxvt_term::process_osc_seq ()
2890{ 3730{
2891 unsigned char ch, eh, *s; 3731 unicode_t ch, eh;
2892 int arg; 3732 int arg;
2893 3733
2894 ch = cmd_getc (); 3734 ch = cmd_getc ();
2895 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3735 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2896 arg = arg * 10 + (ch - '0'); 3736 arg = arg * 10 + (ch - '0');
2897 3737
2898 if (ch == ';') 3738 if (ch == ';')
2899 { 3739 {
2900 s = get_to_st (&eh); 3740 char *s = get_to_st (eh);
3741
2901 if (s) 3742 if (s)
2902 { 3743 {
2903 /*
2904 * rxvt_menubar_dispatch () violates the constness of the string,
2905 * so do it here
2906 */
2907 if (arg == XTerm_Menu)
2908#if 0 /* XXX: currently disabled due to security concerns */
2909 menubar_dispatch ((char *)s);
2910#else
2911 (void)0;
2912#endif
2913 else
2914 xterm_seq (arg, (char *)s, eh); 3744 process_xterm_seq (arg, s, eh);
2915 free (s); 3745 free (s);
2916 } 3746 }
2917 } 3747 }
2918} 3748}
3749
3750void
3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3752{
3753 if (str[0] == '?' && !str[1])
3754 {
3755 unsigned short r, g, b;
3756 pix_colors_focused[color].get (display, r, g, b);
3757 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3758 }
3759 else
3760 set_window_color (color, str);
3761}
3762
2919/* 3763/*
2920 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2921 * 0 = change iconName/title
2922 * 1 = change iconName
2923 * 2 = change title
2924 * 4 = change color
2925 * 12 = change text color
2926 * 13 = change mouse foreground color
2927 * 17 = change highlight character colour
2928 * 18 = change bold character color
2929 * 19 = change underlined character color
2930 * 46 = change logfile (not implemented)
2931 * 50 = change font
2932 *
2933 * rxvt extensions:
2934 * 10 = menu (may change in future)
2935 * 20 = bg pixmap
2936 * 39 = change default fg color
2937 * 49 = change default bg color
2938 * 55 = dump scrollback buffer and all of screen
2939 * 701 = change locale
2940 * 702 = find font
2941 */ 3765 */
2942void 3766void
2943rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3767rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2944{ 3768{
2945 int changed = 0; 3769 int changed = 0;
2946 int color; 3770 int color;
2947 char *buf, *name; 3771 char *buf, *name;
3772 bool query = str[0] == '?' && !str[1];
3773 int saveop = op;
3774 dDisp;
2948 3775
2949 assert (str != NULL); 3776 assert (str != NULL);
2950 switch (op) 3777 switch (op)
2951 { 3778 {
2952 case XTerm_name: 3779 case XTerm_name:
2953 set_title (str); 3780 set_title (str);
2954 /* FALLTHROUGH */ 3781 /* FALLTHROUGH */
2955 case XTerm_iconName: 3782 case XTerm_iconName:
2956 set_iconName (str); 3783 set_icon_name (str);
2957 break; 3784 break;
2958 case XTerm_title: 3785 case XTerm_title:
2959 set_title (str); 3786 set_title (str);
2960 break; 3787 break;
3788 case XTerm_property:
3789 if (str[0] == '?')
3790 {
3791 Atom prop = display->atom (str + 1);
3792 Atom actual_type;
3793 int actual_format;
3794 unsigned long nitems;
3795 unsigned long bytes_after;
3796 unsigned char *value = 0;
3797 const char *str = "";
3798
3799 if (prop
3800 && XGetWindowProperty (disp, parent[0],
3801 prop, 0, 1<<16, 0, AnyPropertyType,
3802 &actual_type, &actual_format,
3803 &nitems, &bytes_after, &value) == Success
3804 && actual_type != None
3805 && actual_format == 8)
3806 str = (const char *)(value);
3807
3808 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3809
3810 XFree (value);
3811 }
3812 else
3813 {
3814 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3815
3816 if (eq)
3817 {
3818 *eq = 0;
3819 set_utf8_property (display->atom (str), eq + 1);
3820 }
3821 else
3822 XDeleteProperty (disp, parent[0],
3823 display->atom (str));
3824 }
3825 break;
3826
2961 case XTerm_Color: 3827 case XTerm_Color:
2962 for (buf = (char *)str; buf && *buf;) 3828 for (buf = (char *)str; buf && *buf;)
2963 { 3829 {
2964 if ((name = STRCHR (buf, ';')) == NULL) 3830 if ((name = strchr (buf, ';')) == NULL)
2965 break; 3831 break;
3832
2966 *name++ = '\0'; 3833 *name++ = '\0';
2967 color = atoi (buf); 3834 color = atoi (buf) + minCOLOR;
2968 if (color < 0 || color >= TOTAL_COLORS) 3835
3836 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2969 break; 3837 break;
3838
2970 if ((buf = STRCHR (name, ';')) != NULL) 3839 if ((buf = strchr (name, ';')) != NULL)
2971 *buf++ = '\0'; 3840 *buf++ = '\0';
3841
3842 if (name[0] == '?' && !name[1])
3843 {
3844 unsigned short r, g, b;
3845 pix_colors_focused[color].get (display, r, g, b);
3846 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3847 }
3848 else
2972 set_window_color (color + minCOLOR, name); 3849 set_window_color (color, name);
2973 } 3850 }
3851 break;
3852 case XTerm_Color00:
3853 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3854 break;
3855 case XTerm_Color01:
3856 process_color_seq (XTerm_Color01, Color_bg, str, resp);
2974 break; 3857 break;
2975#ifndef NO_CURSORCOLOR 3858#ifndef NO_CURSORCOLOR
2976 case XTerm_Color_cursor: 3859 case XTerm_Color_cursor:
2977 set_window_color (Color_cursor, str); 3860 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
2978 break; 3861 break;
2979#endif 3862#endif
2980 case XTerm_Color_pointer: 3863 case XTerm_Color_pointer_fg:
2981 set_window_color (Color_pointer, str); 3864 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3865 break;
3866 case XTerm_Color_pointer_bg:
3867 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
2982 break; 3868 break;
2983#ifndef NO_BOLD_UNDERLINE_REVERSE 3869#ifndef NO_BOLD_UNDERLINE_REVERSE
2984 case XTerm_Color_BD:
2985 set_window_color (Color_BD, str);
2986 break;
2987 case XTerm_Color_UL:
2988 set_window_color (Color_UL, str);
2989 break;
2990 case XTerm_Color_RV: 3870 case XTerm_Color_RV:
2991 set_window_color (Color_RV, str); 3871 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
2992 break; 3872 break;
2993#endif 3873 case Rxvt_Color_BD:
2994 3874 case URxvt_Color_BD:
2995 case XTerm_Menu: 3875 process_color_seq (op, Color_BD, str, resp);
2996 /*
2997 * rxvt_menubar_dispatch () violates the constness of the string,
2998 * so DON'T do it here
2999 */
3000 break; 3876 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp);
3880 break;
3881 case URxvt_Color_IT:
3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3883 break;
3884#endif
3885#if TRANSPARENT && TINTING
3886 case URxvt_Color_tint:
3887 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3888 check_our_parents ();
3889 if (am_transparent)
3890 want_full_refresh = want_refresh = 1;
3891 break;
3892#endif
3893
3001 case XTerm_Pixmap: 3894 case Rxvt_Pixmap:
3002 if (*str != ';') 3895 if (*str != ';')
3003 { 3896 {
3004#if XPM_BACKGROUND 3897#if XPM_BACKGROUND
3005 scale_pixmap (""); /* reset to default scaling */ 3898 scale_pixmap (""); /* reset to default scaling */
3006 set_bgPixmap (str); /* change pixmap */ 3899 set_bgPixmap (str); /* change pixmap */
3007#endif
3008 scr_touch (true); 3900 scr_touch (true);
3901#endif
3009 } 3902 }
3903
3010 while ((str = STRCHR (str, ';')) != NULL) 3904 while ((str = strchr (str, ';')) != NULL)
3011 { 3905 {
3012 str++; 3906 str++;
3013#if XPM_BACKGROUND 3907#if XPM_BACKGROUND
3014 changed += scale_pixmap (str); 3908 changed += scale_pixmap (str);
3015#endif 3909#endif
3016
3017 } 3910 }
3911
3018 if (changed) 3912 if (changed)
3019 { 3913 {
3020#ifdef XPM_BACKGROUND 3914#ifdef XPM_BACKGROUND
3021 resize_pixmap (); 3915 resize_pixmap ();
3022#endif
3023 scr_touch (true); 3916 scr_touch (true);
3917#endif
3024 } 3918 }
3025 break; 3919 break;
3026 3920
3027 case XTerm_restoreFG: 3921 case Rxvt_restoreFG:
3028 set_window_color (Color_fg, str); 3922 set_window_color (Color_fg, str);
3029 break; 3923 break;
3030 case XTerm_restoreBG: 3924 case Rxvt_restoreBG:
3031 set_window_color (Color_bg, str); 3925 set_window_color (Color_bg, str);
3032 break; 3926 break;
3927
3033 case XTerm_logfile: 3928 case XTerm_logfile:
3929 // TODO, when secure mode?
3034 break; 3930 break;
3035 case XTerm_font: 3931
3036 change_font (str);
3037 break;
3038#ifndef NO_FRILLS
3039 case XTerm_locale:
3040 if (str[0] == '?' && !str[1])
3041 tt_printf ("%-.250s\n", locale);
3042 else
3043 {
3044 set_locale (str);
3045# ifdef USE_XIM
3046 im_cb ();
3047# endif
3048 }
3049 break;
3050 case XTerm_findfont:
3051 {
3052 int fid = TermWin.fontset->find_font (atoi (str));
3053 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3054 }
3055 break;
3056#endif
3057#if 0 3932#if 0
3058 case XTerm_dumpscreen: /* no error notices */ 3933 case Rxvt_dumpscreen: /* no error notices */
3059 { 3934 {
3060 int fd; 3935 int fd;
3061 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3936 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3062 { 3937 {
3063 scr_dump (fd); 3938 scr_dump (fd);
3064 close (fd); 3939 close (fd);
3065 } 3940 }
3066 } 3941 }
3067 break; 3942 break;
3068#endif 3943#endif
3944 case XTerm_font:
3945 op = URxvt_font;
3946 case URxvt_font:
3947#if ENABLE_STYLES
3948 case URxvt_boldFont:
3949 case URxvt_italicFont:
3950 case URxvt_boldItalicFont:
3951#endif
3952 if (query)
3953 tt_printf ("\33]%d;%-.250s%c", saveop,
3954 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3955 ? fontset[op - URxvt_font]->fontdesc : "",
3956 resp);
3957 else
3958 {
3959 const char *&res = rs[Rs_font + (op - URxvt_font)];
3069 3960
3961 res = strdup (str);
3962 allocated.push_back ((void *)res);
3963 set_fonts ();
3964 }
3965 break;
3966
3967#if ENABLE_FRILLS
3968 case URxvt_locale:
3969 if (query)
3970 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3971 else
3972 {
3973 set_locale (str);
3974 pty->set_utf8_mode (enc_utf8);
3975 init_xlocale ();
3976 }
3977 break;
3978
3979 case URxvt_view_up:
3980 case URxvt_view_down:
3981 {
3982 int lines = atoi (str);
3983
3984 if (lines)
3985 scr_page (op == URxvt_view_up ? UP : DN, lines);
3986 else
3987 scr_erase_savelines ();
3988 }
3989
3990 break;
3991#endif
3992
3993#if ENABLE_PERL
3994 case URxvt_perl:
3995 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3996 ; // no responses yet
3997 break;
3998#endif
3070 } 3999 }
3071} 4000}
3072/*----------------------------------------------------------------------*/ 4001/*----------------------------------------------------------------------*/
3073 4002
3074/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 4003/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3082 * so no need for fancy checking 4011 * so no need for fancy checking
3083 */ 4012 */
3084int 4013int
3085rxvt_term::privcases (int mode, unsigned long bit) 4014rxvt_term::privcases (int mode, unsigned long bit)
3086{ 4015{
3087 int state; 4016 int state;
3088 4017
3089 if (mode == 's') 4018 if (mode == 's')
3090 { 4019 {
3091 SavedModes |= (PrivateModes & bit); 4020 SavedModes |= (priv_modes & bit);
3092 return -1; 4021 return -1;
3093 } 4022 }
3094 else 4023 else
3095 { 4024 {
3096 if (mode == 'r') 4025 if (mode == 'r')
3097 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4026 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3098 else 4027 else
3099 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4028 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3100 PrivMode (state, bit); 4029 PrivMode (state, bit);
3101 } 4030 }
4031
3102 return state; 4032 return state;
3103} 4033}
3104 4034
3105/* we're not using priv _yet_ */ 4035/* we're not using priv _yet_ */
3106void 4036void
3107rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4037rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3108{ 4038{
3109 unsigned int i, j; 4039 unsigned int i, j;
3110 int state; 4040 int state;
4041
3111 static const struct 4042 static const struct
3112 { 4043 {
3113 const int argval; 4044 const int argval;
3114 const unsigned long bit; 4045 const unsigned long bit;
3115 } 4046 }
4047
3116 argtopriv[] = { 4048 argtopriv[] = {
3117 { 1, PrivMode_aplCUR }, 4049 { 1, PrivMode_aplCUR },
3118 { 2, PrivMode_vt52 }, 4050 { 2, PrivMode_vt52 },
3119 { 3, PrivMode_132 }, 4051 { 3, PrivMode_132 },
3120 { 4, PrivMode_smoothScroll }, 4052 { 4, PrivMode_smoothScroll },
3121 { 5, PrivMode_rVideo }, 4053 { 5, PrivMode_rVideo },
3122 { 6, PrivMode_relOrigin }, 4054 { 6, PrivMode_relOrigin },
3123 { 7, PrivMode_Autowrap }, 4055 { 7, PrivMode_Autowrap },
4056 // 8, bi-directional support mode
3124 { 9, PrivMode_MouseX10 }, 4057 { 9, PrivMode_MouseX10 },
3125#ifdef menuBar_esc 4058 // 18, 19 printing-related
3126 { menuBar_esc, PrivMode_menuBar }, 4059 { 25, PrivMode_VisibleCursor },
3127#endif
3128#ifdef scrollBar_esc 4060#ifdef scrollBar_esc
3129 { scrollBar_esc, PrivMode_scrollBar }, 4061 { scrollBar_esc, PrivMode_scrollBar },
3130#endif 4062#endif
3131 { 25, PrivMode_VisibleCursor },
3132 { 35, PrivMode_ShiftKeys }, 4063 { 35, PrivMode_ShiftKeys }, // rxvt extension
3133 { 40, PrivMode_132OK }, 4064 { 40, PrivMode_132OK },
4065 // 41 xterm more fixes NYI
4066 // 45 margin bell NYI
4067 // 46 start logging
3134 { 47, PrivMode_Screen }, 4068 { 47, PrivMode_Screen },
3135 { 66, PrivMode_aplKP }, 4069 { 66, PrivMode_aplKP },
3136#ifndef NO_BACKSPACE_KEY 4070#ifndef NO_BACKSPACE_KEY
3137 { 67, PrivMode_BackSpace }, 4071 { 67, PrivMode_BackSpace },
3138#endif 4072#endif
3139 { 1000, PrivMode_MouseX11 }, 4073 { 1000, PrivMode_MouseX11 },
4074 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4075 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4076 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3140 { 1010, PrivMode_TtyOutputInh }, 4077 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3141 { 1011, PrivMode_Keypress }, 4078 { 1011, PrivMode_Keypress }, // rxvt extension
4079 // 1035 enable modifiers for alt, numlock NYI
4080 // 1036 send ESC for meta keys NYI
4081 // 1037 send DEL for keypad delete NYI
3142 { 1047, PrivMode_Screen }, 4082 { 1047, PrivMode_Screen },
4083 // 1048 save and restore cursor
3143 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4084 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4085 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3144 }; 4086 };
3145 4087
3146 if (nargs == 0) 4088 if (nargs == 0)
3147 return; 4089 return;
3148 4090
… …
3163 state = privcases (mode, argtopriv[j].bit); 4105 state = privcases (mode, argtopriv[j].bit);
3164 break; 4106 break;
3165 } 4107 }
3166 4108
3167 /* extra handling for values with state unkept */ 4109 /* extra handling for values with state unkept */
3168 if (state == -1)
3169 switch (arg[i]) 4110 switch (arg[i])
3170 { 4111 {
4112#if ENABLE_STYLES
4113 case 1021:
4114 set_option (Opt_intensityStyles, mode);
4115
4116 scr_touch (true);
4117 break;
4118#endif
3171 case 1048: /* alternative cursor save */ 4119 case 1048: /* alternative cursor save */
4120 case 1049:
4121 if (OPTION (Opt_secondaryScreen))
3172 if (mode == 0) 4122 if (mode == 0)
3173 scr_cursor (RESTORE); 4123 scr_cursor (RESTORE);
3174 else if (mode == 1) 4124 else if (mode == 1)
3175 scr_cursor (SAVE); 4125 scr_cursor (SAVE);
3176 /* FALLTHROUGH */
3177 default:
3178 continue; /* for (;i;) */
3179 }
3180
3181 /* extra handling for values with valid 0 or 1 state */
3182 switch (arg[i])
3183 {
3184 /* case 1: - application cursor keys */
3185 case 2: /* VT52 mode */
3186 /* oddball mode. should be set regardless of set/reset
3187 * parameter. Return from VT52 mode with an ESC < from
3188 * within VT52 mode
3189 */
3190 PrivMode (1, PrivMode_vt52);
3191 break; 4126 break;
4127 }
4128
4129 if (state >= 0)
4130 /* extra handling for values with valid 0 or 1 state */
4131 switch (arg[i])
4132 {
4133 /* case 1: - application cursor keys */
4134 case 2: /* VT52 mode */
4135 /* oddball mode. should be set regardless of set/reset
4136 * parameter. Return from VT52 mode with an ESC < from
4137 * within VT52 mode
4138 */
4139 PrivMode (1, PrivMode_vt52);
4140 break;
3192 case 3: /* 80/132 */ 4141 case 3: /* 80/132 */
3193 if (PrivateModes & PrivMode_132OK) 4142 if (priv_modes & PrivMode_132OK)
3194 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4143 set_widthheight (((state ? 132 : 80) * fwidth), height);
3195 break; 4144 break;
3196 case 4: /* smooth scrolling */ 4145 case 4: /* smooth scrolling */
3197 if (state)
3198 Options &= ~Opt_jumpScroll;
3199 else
3200 Options |= Opt_jumpScroll; 4146 set_option (Opt_jumpScroll, !state);
3201 break; 4147 break;
3202 case 5: /* reverse video */ 4148 case 5: /* reverse video */
3203 scr_rvideo_mode (state); 4149 scr_rvideo_mode (state);
3204 break; 4150 break;
3205 case 6: /* relative/absolute origins */ 4151 case 6: /* relative/absolute origins */
3206 scr_relative_origin (state); 4152 scr_relative_origin (state);
3207 break; 4153 break;
3208 case 7: /* autowrap */ 4154 case 7: /* autowrap */
3209 scr_autowrap (state); 4155 scr_autowrap (state);
3210 break; 4156 break;
3211 /* case 8: - auto repeat, can't do on a per window basis */ 4157 /* case 8: - auto repeat, can't do on a per window basis */
3212 case 9: /* X10 mouse reporting */ 4158 case 9: /* X10 mouse reporting */
3213 if (state) /* orthogonal */ 4159 if (state) /* orthogonal */
3214 PrivateModes &= ~ (PrivMode_MouseX11); 4160 priv_modes &= ~PrivMode_MouseX11;
3215 break; 4161 break;
3216#ifdef menuBar_esc
3217 case menuBar_esc:
3218#ifdef MENUBAR
3219 map_menuBar (state);
3220#endif
3221 break;
3222#endif
3223#ifdef scrollBar_esc 4162#ifdef scrollBar_esc
3224 case scrollBar_esc: 4163 case scrollBar_esc:
3225 if (scrollbar_mapping (state)) 4164 if (scrollbar_mapping (state))
3226 { 4165 {
3227 resize_all_windows (0, 0, 0); 4166 resize_all_windows (0, 0, 0);
3228 scr_touch (true); 4167 scr_touch (true);
3229 } 4168 }
3230 break; 4169 break;
3231#endif 4170#endif
3232 case 25: /* visible/invisible cursor */ 4171 case 25: /* visible/invisible cursor */
3233 scr_cursor_visible (state); 4172 scr_cursor_visible (state);
3234 break; 4173 break;
3235 /* case 35: - shift keys */ 4174 /* case 35: - shift keys */
3236 /* case 40: - 80 <--> 132 mode */ 4175 /* case 40: - 80 <--> 132 mode */
3237 case 47: /* secondary screen */ 4176 case 47: /* secondary screen */
3238 scr_change_screen (state); 4177 scr_change_screen (state);
3239 break; 4178 break;
3240 /* case 66: - application key pad */ 4179 /* case 66: - application key pad */
3241 /* case 67: - backspace key */ 4180 /* case 67: - backspace key */
3242 case 1000: /* X11 mouse reporting */ 4181 case 1000: /* X11 mouse reporting */
3243 if (state) /* orthogonal */ 4182 if (state) /* orthogonal */
3244 PrivateModes &= ~ (PrivMode_MouseX10); 4183 priv_modes &= ~PrivMode_MouseX10;
3245 break; 4184 break;
3246#if 0 4185#if 0
3247 case 1001: 4186 case 1001:
3248 break; /* X11 mouse highlighting */ 4187 break; /* X11 mouse highlighting */
3249#endif 4188#endif
3250 case 1010: /* scroll to bottom on TTY output inhibit */ 4189 case 1010: /* scroll to bottom on TTY output inhibit */
3251 if (state)
3252 Options &= ~Opt_scrollTtyOutput;
3253 else
3254 Options |= Opt_scrollTtyOutput; 4190 set_option (Opt_scrollTtyOutput, !state);
3255 break; 4191 break;
3256 case 1011: /* scroll to bottom on key press */ 4192 case 1011: /* scroll to bottom on key press */
3257 if (state)
3258 Options |= Opt_scrollTtyKeypress; 4193 set_option (Opt_scrollTtyKeypress, state);
3259 else
3260 Options &= ~Opt_scrollTtyKeypress;
3261 break; 4194 break;
3262 case 1047: /* secondary screen w/ clearing */ 4195 case 1047: /* secondary screen w/ clearing last */
3263 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4196 if (OPTION (Opt_secondaryScreen))
3264 if (current_screen != PRIMARY) 4197 if (current_screen != PRIMARY)
3265 scr_erase_screen (2); 4198 scr_erase_screen (2);
3266 scr_change_screen (state); 4199 scr_change_screen (state);
3267 /* FALLTHROUGH */
3268 default:
3269 break; 4200 break;
4201 case 1049: /* secondary screen w/ clearing first */
4202 scr_change_screen (state);
4203 if (OPTION (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY)
4205 scr_erase_screen (2);
4206 break;
4207 default:
4208 break;
3270 } 4209 }
3271 } 4210 }
3272} 4211}
3273/*}}} */ 4212/*}}} */
3274 4213
3275/*{{{ process sgr sequences */ 4214/*{{{ process sgr sequences */
3276void 4215void
3277rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4216rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3278{ 4217{
3279 unsigned int i; 4218 unsigned int i;
3280 short rendset; 4219 short rendset;
3281 int rendstyle; 4220 int rendstyle;
3282 4221
3283 if (nargs == 0) 4222 if (nargs == 0)
3284 { 4223 {
3285 scr_rendition (0, ~RS_None); 4224 scr_rendition (0, ~RS_None);
3286 return; 4225 return;
3287 } 4226 }
4227
3288 for (i = 0; i < nargs; i++) 4228 for (i = 0; i < nargs; i++)
3289 { 4229 {
3290 rendset = -1; 4230 rendset = -1;
3291 switch (arg[i]) 4231 switch (arg[i])
3292 { 4232 {
… …
3294 rendset = 0, rendstyle = ~RS_None; 4234 rendset = 0, rendstyle = ~RS_None;
3295 break; 4235 break;
3296 case 1: 4236 case 1:
3297 rendset = 1, rendstyle = RS_Bold; 4237 rendset = 1, rendstyle = RS_Bold;
3298 break; 4238 break;
4239 //case 2: // low intensity
4240 case 3:
4241 rendset = 1, rendstyle = RS_Italic;
4242 break;
3299 case 4: 4243 case 4:
3300 rendset = 1, rendstyle = RS_Uline; 4244 rendset = 1, rendstyle = RS_Uline;
3301 break; 4245 break;
3302 case 5: 4246 case 5: // slowly blinking
4247 case 6: // rapidly blinking
3303 rendset = 1, rendstyle = RS_Blink; 4248 rendset = 1, rendstyle = RS_Blink;
3304 break; 4249 break;
4250 //case 6: // scoansi light background
3305 case 7: 4251 case 7:
3306 rendset = 1, rendstyle = RS_RVid; 4252 rendset = 1, rendstyle = RS_RVid;
3307 break; 4253 break;
3308 case 22: 4254 case 8:
4255 // invisible. NYI
4256 break;
4257 //case 9: // crossed out
4258 //case 10: // scoansi acs off, primary font
4259 //case 11: // scoansi acs on, first alt font
4260 //case 12: // scoansi acs on, |0x80, second alt font
4261 //...
4262 //case 19: // ninth alt font
4263 //case 20: // gothic
4264 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3309 rendset = 0, rendstyle = RS_Bold; 4265 rendset = 0, rendstyle = RS_Bold;
4266 break;
4267 case 22: // normal intensity
4268 rendset = 0, rendstyle = RS_Bold;
4269 break;
4270 case 23: // disable italic
4271 rendset = 0, rendstyle = RS_Italic;
3310 break; 4272 break;
3311 case 24: 4273 case 24:
3312 rendset = 0, rendstyle = RS_Uline; 4274 rendset = 0, rendstyle = RS_Uline;
3313 break; 4275 break;
3314 case 25: 4276 case 25:
3315 rendset = 0, rendstyle = RS_Blink; 4277 rendset = 0, rendstyle = RS_Blink;
3316 break; 4278 break;
4279 case 26: // variable spacing (iso 8613)
4280 rendset = 0, rendstyle = RS_Blink;
4281 break;
3317 case 27: 4282 case 27:
3318 rendset = 0, rendstyle = RS_RVid; 4283 rendset = 0, rendstyle = RS_RVid;
3319 break; 4284 break;
4285 //case 28: // visible. NYI
4286 //case 29: // not crossed-out
3320 } 4287 }
4288
3321 if (rendset != -1) 4289 if (rendset != -1)
3322 { 4290 {
3323 scr_rendition (rendset, rendstyle); 4291 scr_rendition (rendset, rendstyle);
3324 continue; /* for (;i;) */ 4292 continue; /* for (;i;) */
3325 } 4293 }
… …
3332 case 33: 4300 case 33:
3333 case 34: 4301 case 34:
3334 case 35: 4302 case 35:
3335 case 36: 4303 case 36:
3336 case 37: 4304 case 37:
3337 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4305 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3338 Color_fg);
3339 break; 4306 break;
3340#ifdef TTY_256COLOR 4307 case 38: // set fg color, ISO 8613-6
3341 case 38:
3342 if (nargs > i + 2 && arg[i + 1] == 5) 4308 if (nargs > i + 2 && arg[i + 1] == 5)
3343 { 4309 {
3344 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4310 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3345 Color_fg);
3346 i += 2; 4311 i += 2;
3347 } 4312 }
3348 break; 4313 break;
3349#endif
3350 case 39: /* default fg */ 4314 case 39: /* default fg */
3351 scr_color (Color_fg, Color_fg); 4315 scr_color (Color_fg, Color_fg);
3352 break; 4316 break;
3353 4317
3354 case 40: 4318 case 40:
… …
3357 case 43: 4321 case 43:
3358 case 44: 4322 case 44:
3359 case 45: 4323 case 45:
3360 case 46: 4324 case 46:
3361 case 47: 4325 case 47:
3362 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4326 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3363 Color_bg);
3364 break; 4327 break;
3365#ifdef TTY_256COLOR 4328 case 48: // set bg color, ISO 8613-6
3366 case 48:
3367 if (nargs > i + 2 && arg[i + 1] == 5) 4329 if (nargs > i + 2 && arg[i + 1] == 5)
3368 { 4330 {
3369 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4331 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3370 Color_bg);
3371 i += 2; 4332 i += 2;
3372 } 4333 }
3373 break; 4334 break;
3374#endif
3375 case 49: /* default bg */ 4335 case 49: /* default bg */
3376 scr_color (Color_bg, Color_bg); 4336 scr_color (Color_bg, Color_bg);
3377 break; 4337 break;
3378 4338
3379#ifndef NO_BRIGHTCOLOR 4339 //case 50: // not variable spacing
4340
4341#if ENABLE_FRILLS
3380 case 90: 4342 case 90:
3381 case 91: /* set bright fg color */ 4343 case 91: /* set bright fg color */
3382 case 92: 4344 case 92:
3383 case 93: 4345 case 93:
3384 case 94: 4346 case 94:
3385 case 95: 4347 case 95:
3386 case 96: 4348 case 96:
3387 case 97: 4349 case 97:
3388 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4350 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3389 Color_fg);
3390 break; 4351 break;
3391 case 100: 4352 case 100:
3392 case 101: /* set bright bg color */ 4353 case 101: /* set bright bg color */
3393 case 102: 4354 case 102:
3394 case 103: 4355 case 103:
3395 case 104: 4356 case 104:
3396 case 105: 4357 case 105:
3397 case 106: 4358 case 106:
3398 case 107: 4359 case 107:
3399 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4360 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3400 Color_bg);
3401 break; 4361 break;
3402#endif 4362#endif
3403
3404 } 4363 }
3405 } 4364 }
3406} 4365}
3407/*}}} */ 4366/*}}} */
3408 4367
3409/*{{{ process Rob Nation's own graphics mode sequences */ 4368/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3410void 4369void
3411rxvt_term::process_graphics () 4370rxvt_term::process_graphics ()
3412{ 4371{
3413 unsigned char ch, cmd = cmd_getc (); 4372 unicode_t ch, cmd = cmd_getc ();
3414 4373
3415 if (cmd == 'Q') 4374 if (cmd == 'Q')
3416 { /* query graphics */ 4375 { /* query graphics */
3417 tt_printf ("\033G0\n"); /* no graphics */ 4376 tt_printf ("\033G0\012"); /* no graphics */
3418 return; 4377 return;
3419 } 4378 }
3420 /* swallow other graphics sequences until terminating ':' */ 4379 /* swallow other graphics sequences until terminating ':' */
3421 do 4380 do
3422 ch = cmd_getc (); 4381 ch = cmd_getc ();
… …
3432 */ 4391 */
3433void 4392void
3434rxvt_term::tt_printf (const char *fmt,...) 4393rxvt_term::tt_printf (const char *fmt,...)
3435{ 4394{
3436 va_list arg_ptr; 4395 va_list arg_ptr;
3437 unsigned char buf[256]; 4396 char buf[256];
3438 4397
3439 va_start (arg_ptr, fmt); 4398 va_start (arg_ptr, fmt);
3440 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4399 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3441 va_end (arg_ptr); 4400 va_end (arg_ptr);
3442 tt_write (buf, STRLEN (buf)); 4401 tt_write (buf, strlen (buf));
3443} 4402}
3444 4403
3445/* ---------------------------------------------------------------------- */ 4404/* ---------------------------------------------------------------------- */
3446/* Write data to the pty as typed by the user, pasted with the mouse, 4405/* Write data to the pty as typed by the user, pasted with the mouse,
3447 * or generated by us in response to a query ESC sequence. 4406 * or generated by us in response to a query ESC sequence.
3448 */ 4407 */
4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4409
3449void 4410void
3450rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4411rxvt_term::tt_write (const char *data, unsigned int len)
3451{ 4412{
3452 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4413 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414 return;
3453 4415
3454 if (len) 4416 if (pty->pty < 0)
4417 return;
4418
4419 if (v_buflen == 0)
4420 {
4421 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4422
4423 if ((unsigned int)written == len)
4424 return;
4425
4426 data += written;
4427 len -= written;
3455 { 4428 }
4429
4430 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4431
4432 memcpy (v_buffer + v_buflen, data, len);
4433 v_buflen += len;
4434
4435 pty_ev.set (EVENT_READ | EVENT_WRITE);
4436}
4437
4438void rxvt_term::pty_write ()
4439{
4440 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4441
4442 if (written > 0)
4443 {
4444 v_buflen -= written;
4445
3456 if (v_buflen == 0) 4446 if (v_buflen == 0)
3457 { 4447 {
3458 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3459
3460 if ((unsigned int)written == len)
3461 return;
3462
3463 data += written;
3464 len -= written;
3465 }
3466
3467
3468 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3469
3470 memcpy (v_buffer + v_buflen, data, len);
3471 v_buflen += len;
3472 }
3473
3474 for (;;)
3475 {
3476 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3477
3478 if (written > 0)
3479 {
3480 v_buflen -= written;
3481
3482 if (v_buflen == 0)
3483 {
3484 free (v_buffer); 4448 free (v_buffer);
3485 v_buffer = 0; 4449 v_buffer = 0;
3486 v_buflen = 0; 4450 v_buflen = 0;
3487 4451
3488 pty_ev.set (EVENT_READ); 4452 pty_ev.set (EVENT_READ);
3489 return;
3490 }
3491
3492 memmove (v_buffer, v_buffer + written, v_buflen);
3493 }
3494 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3495 // original code just ignores this...
3496 destroy ();
3497 else
3498 {
3499 pty_ev.set (EVENT_READ | EVENT_WRITE);
3500 return; 4453 return;
3501 } 4454 }
4455
4456 memmove (v_buffer, v_buffer + written, v_buflen);
3502 } 4457 }
4458 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4459 pty_ev.set (EVENT_READ);
3503} 4460}
3504 4461
3505/*----------------------- end-of-file (C source) -----------------------*/ 4462/*----------------------- end-of-file (C source) -----------------------*/
3506 4463

Diff Legend

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