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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.568 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

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

Diff Legend

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