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.564 by sf-exg, Fri Mar 27 15:06:09 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 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 ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1218 if (isMenuBarWindow (ev.xany.window)) 1618 || priv_modes & PrivMode_MouseAnyEvent)
1619 mouse_report (ev.xbutton);
1620 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1621 break;
1622
1623 if (ev.xany.window == vt)
1219 { 1624 {
1220 menubar_control (ev.xbutton); 1625 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1221 break; 1626 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1222 } 1627 ; // 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))) 1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1629 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1630 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1232 ; 1631 ;
1233 1632
1234 XQueryPointer (display->display, TermWin.vt, 1633 XQueryPointer (dpy, vt,
1235 &unused_root, &unused_child, 1634 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1635 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1636 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1637 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1638#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1639 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1640 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1641 {
1243#endif 1642#endif
1643#if ISO_14755
1644 // 5.4
1645 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1646 {
1647 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1648 break;
1649 }
1650#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1651 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1652 ev.xbutton.state & Button3Mask ? 2 : 0);
1653
1246#ifdef SELECTION_SCROLLING 1654#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1655 if (ev.xbutton.y < int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1656 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1249 { 1657 {
1658 page_dirn scroll_selection_dir;
1250 int dist; 1659 int dist;
1251
1252 pending_scroll_selection=1;
1253 1660
1254 /* don't clobber the current delay if we are 1661 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1662 * already in the middle of scrolling.
1256 */ 1663 */
1257 if (scroll_selection_delay<=0) 1664 if (!sel_scroll_ev.is_active ())
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1665 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1259 1666
1260 /* save the event params so we can highlight 1667 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1668 * the selection in the pending-scroll loop
1262 */ 1669 */
1263 selection_save_x=ev.xbutton.x; 1670 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1671 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1672 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1673
1268 /* calc number of lines to scroll */ 1674 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1675 if (ev.xbutton.y < int_bwidth)
1270 { 1676 {
1271 scroll_selection_dir = UP; 1677 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1678 dist = int_bwidth - ev.xbutton.y;
1273 } 1679 }
1274 else 1680 else
1275 { 1681 {
1276 scroll_selection_dir = DN; 1682 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y - 1683 dist = ev.xbutton.y - (int_bwidth + vt_height);
1278 (TermWin.int_bwidth + TermWin.height);
1279 } 1684 }
1685
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1686 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1687 / SELECTION_SCROLL_LINE_SPEEDUP
1688 + 1;
1282 MIN_IT (scroll_selection_lines, 1689 min_it (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1690 SELECTION_SCROLL_MAX_LINES);
1691 scroll_selection_lines *= scroll_selection_dir;
1284 } 1692 }
1285 else 1693 else
1286 { 1694 {
1287 /* we are within the text window, so we 1695 /* we are within the text window, so we
1288 * shouldn't be scrolling 1696 * shouldn't be scrolling
1289 */ 1697 */
1290 pending_scroll_selection = 0; 1698 sel_scroll_ev.stop();
1291 } 1699 }
1292#endif 1700#endif
1293#ifdef MOUSE_THRESHOLD 1701#ifdef MOUSE_THRESHOLD
1294
1295 } 1702 }
1296#endif 1703#endif
1297
1298 } 1704 }
1299 } 1705 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1706 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1301 { 1707 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1708 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1303 MotionNotify, &ev)) ; 1709 MotionNotify, &ev))
1710 ;
1711
1304 XQueryPointer (display->display, scrollBar.win, 1712 XQueryPointer (dpy, scrollBar.win,
1305 &unused_root, &unused_child, 1713 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1714 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1715 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1716 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1717 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1718 scrollBar.size ());
1311 scr_refresh (refresh_type);
1312 refresh_limit = 0; 1719 want_refresh = 1;
1313 scrollbar_show (1); 1720 scrollBar.show (1);
1314 } 1721 }
1315 break; 1722 break;
1316 } 1723 }
1317}
1318 1724
1319void 1725#if defined(CURSOR_BLINK)
1726 if (ev.type == KeyPress)
1727 cursor_blink_reset ();
1728#endif
1729
1730#if defined(POINTER_BLANK)
1731 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1732 {
1733 if (ev.type == MotionNotify
1734 || ev.type == ButtonPress
1735 || ev.type == ButtonRelease)
1736 if (hidden_pointer)
1737 pointer_unblank ();
1738
1739 if (ev.type == KeyPress && hidden_pointer == 0)
1740 pointer_blank ();
1741 }
1742#endif
1743
1744 refresh_check ();
1745}
1746
1747#if ENABLE_FRILLS
1748void ecb_cold
1749rxvt_term::set_urgency (bool enable)
1750{
1751 if (enable == urgency_hint)
1752 return;
1753
1754 if (XWMHints *h = XGetWMHints (dpy, parent))
1755 {
1756 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1757 XSetWMHints (dpy, parent, h);
1758 urgency_hint = enable;
1759 XFree (h);
1760 }
1761}
1762#endif
1763
1764void ecb_cold
1765rxvt_term::focus_in ()
1766{
1767 if (!focus)
1768 {
1769 focus = 1;
1770 want_refresh = 1;
1771
1772#if USE_XIM
1773 if (Input_Context != NULL)
1774 {
1775 im_set_position ();
1776 XSetICFocus (Input_Context);
1777 }
1778#endif
1779#if CURSOR_BLINK
1780 if (option (Opt_cursorBlink))
1781 cursor_blink_ev.again ();
1782#endif
1783#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade])
1785 {
1786 pix_colors = pix_colors_focused;
1787 scr_recolor ();
1788 }
1789#endif
1790#if ENABLE_FRILLS
1791 if (option (Opt_urgentOnBell))
1792 set_urgency (0);
1793#endif
1794
1795 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1796 }
1797}
1798
1799void ecb_cold
1800rxvt_term::focus_out ()
1801{
1802 if (focus)
1803 {
1804 focus = 0;
1805 want_refresh = 1;
1806
1807#if ENABLE_FRILLS
1808 if (option (Opt_urgentOnBell))
1809 set_urgency (0);
1810#endif
1811#if ENABLE_FRILLS || ISO_14755
1812 if (iso14755buf)
1813 {
1814 iso14755buf = 0;
1815# if ISO_14755
1816 scr_overlay_off ();
1817# endif
1818 }
1819#endif
1820#if USE_XIM
1821 if (Input_Context != NULL)
1822 XUnsetICFocus (Input_Context);
1823#endif
1824#if CURSOR_BLINK
1825 if (option (Opt_cursorBlink))
1826 cursor_blink_ev.stop ();
1827
1828 hidden_cursor = 0;
1829#endif
1830#if OFF_FOCUS_FADING
1831 if (rs[Rs_fade])
1832 {
1833 pix_colors = pix_colors_unfocused;
1834 scr_recolor ();
1835 }
1836#endif
1837
1838 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1839 }
1840}
1841
1842void ecb_cold
1843rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1844{
1845#if OFF_FOCUS_FADING
1846 if (rs[Rs_fade])
1847 {
1848 if (!first_time)
1849 pix_colors_focused [idx].free (this);
1850
1851 rgba c;
1852 pix_colors [Color_fade].get (c);
1853 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1854 }
1855#endif
1856}
1857
1858#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1859void ecb_hot
1320rxvt_term::rootwin_cb (XEvent &ev) 1860rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1861{
1322 SET_R (this); 1862 make_current ();
1323 SET_LOCALE (locale); 1863
1864 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1865 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1866 return;
1324 1867
1325 switch (ev.type) 1868 switch (ev.type)
1326 { 1869 {
1327 case PropertyNotify: 1870 case PropertyNotify:
1871 /*
1872 * if user used some Esetroot compatible prog to set the root bg,
1873 * use the property to determine the pixmap. We use it later on.
1874 */
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1875 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1876 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1329 { 1877 {
1330 if (ev.xproperty.state == PropertyNewValue) 1878#if BG_IMAGE_FROM_ROOT
1331 selection_property (ev.xproperty.window, ev.xproperty.atom); 1879 if (option (Opt_transparent))
1332 break; 1880 {
1881 rxvt_img::new_from_root (this)->replace (root_img);
1882 update_background ();
1883 }
1884#endif
1885 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1333 } 1886 }
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 1887
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; 1888 break;
1354#endif
1355 } 1889 }
1890
1891 refresh_check ();
1356} 1892}
1893#endif
1357 1894
1358void 1895void
1359rxvt_term::button_press (XButtonEvent &ev) 1896rxvt_term::button_press (XButtonEvent &ev)
1360{ 1897{
1361 int reportmode = 0, clickintime; 1898 int reportmode = 0, clickintime;
1362 1899
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1900 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1901
1364 if (!bypass_keystate) 1902 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1903 reportmode = !! (priv_modes & PrivMode_mouse_report);
1904
1366 /* 1905 /*
1367 * VT window processing of button press 1906 * VT window processing of button press
1368 */ 1907 */
1369 if (ev.window == TermWin.vt) 1908 if (ev.window == vt)
1370 { 1909 {
1910 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1911 return;
1912
1913#if ISO_14755
1914 // 5.4
1915 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1916 {
1917 iso14755_54 (ev.x, ev.y);
1918 return;
1919 }
1920#endif
1921
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1922 clickintime = ev.time - MEvent.time < multiClickTime;
1923
1372 if (reportmode) 1924 if (reportmode)
1373 { 1925 {
1374 /* mouse report from vt window */ 1926 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1927 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1928 MEvent.state = ev.state;
1377#ifdef MOUSE_REPORT_DOUBLECLICK 1929#ifdef MOUSE_REPORT_DOUBLECLICK
1378 if (ev.button == MEvent.button && clickintime) 1930 if (ev.button == MEvent.button && clickintime)
1379 { 1931 {
1380 /* same button, within alloted time */ 1932 /* same button, within allowed time */
1381 MEvent.clicks++; 1933 MEvent.clicks++;
1934
1382 if (MEvent.clicks > 1) 1935 if (MEvent.clicks > 1)
1383 { 1936 {
1384 /* only report double clicks */ 1937 /* only report double clicks */
1385 MEvent.clicks = 2; 1938 MEvent.clicks = 2;
1386 mouse_report (ev); 1939 mouse_report (ev);
… …
1398 mouse_report (ev); 1951 mouse_report (ev);
1399 } 1952 }
1400#else 1953#else
1401 MEvent.button = ev.button; 1954 MEvent.button = ev.button;
1402 mouse_report (ev); 1955 mouse_report (ev);
1403#endif /* MOUSE_REPORT_DOUBLECLICK */ 1956#endif /* MOUSE_REPORT_DOUBLECLICK */
1404 1957
1405 } 1958 }
1406 else 1959 else
1407 { 1960 {
1408 if (ev.button != MEvent.button) 1961 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1962 MEvent.clicks = 0;
1963
1410 switch (ev.button) 1964 switch (ev.button)
1411 { 1965 {
1412 case Button1: 1966 case Button1:
1967 /* allow meta + click to select rectangular areas */
1968 /* should be done in screen.C */
1969#if ENABLE_FRILLS
1970 selection.rect = !!(ev.state & ModMetaMask);
1971#else
1972 selection.rect = false;
1973#endif
1974
1413 /* allow shift+left click to extend selection */ 1975 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1976 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1415 { 1977 {
1416 if (MEvent.button == Button1 && clickintime) 1978 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1979 selection_rotate (ev.x, ev.y);
1418 else 1980 else
1419 selection_extend (ev.x, ev.y, 1); 1981 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1996 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1997 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1998 selection_rotate (ev.x, ev.y);
1437 else 1999 else
1438 selection_extend (ev.x, ev.y, 1); 2000 selection_extend (ev.x, ev.y, 1);
2001
1439 MEvent.button = Button3; 2002 MEvent.button = Button3;
1440 break; 2003 break;
1441 } 2004 }
1442 } 2005 }
2006
1443 MEvent.time = ev.time; 2007 MEvent.time = ev.time;
1444 return; 2008 return;
1445 } 2009 }
1446 2010
1447 /* 2011 /*
1448 * Scrollbar window processing of button press 2012 * Scrollbar window processing of button press
1449 */ 2013 */
1450 if (isScrollbarWindow (ev.window)) 2014 if (scrollBar.state && ev.window == scrollBar.win)
1451 { 2015 {
1452 scrollBar.setIdle (); 2016 page_dirn direction = NO_DIR;
2017
2018 if (scrollBar.upButton (ev.y))
2019 direction = UP; /* up */
2020 else if (scrollBar.dnButton (ev.y))
2021 direction = DN; /* down */
2022
2023 scrollBar.state = SB_STATE_IDLE;
1453 /* 2024 /*
1454 * Rxvt-style scrollbar: 2025 * Rxvt-style scrollbar:
1455 * move up if mouse is above slider 2026 * move up if mouse is above slider
1456 * move dn if mouse is below slider 2027 * move dn if mouse is below slider
1457 * 2028 *
… …
1466 /* 2037 /*
1467 * Mouse report disabled scrollbar: 2038 * Mouse report disabled scrollbar:
1468 * arrow buttons - send up/down 2039 * arrow buttons - send up/down
1469 * click on scrollbar - send pageup/down 2040 * click on scrollbar - send pageup/down
1470 */ 2041 */
1471 if ((scrollBar.style == R_SB_NEXT 2042 if (direction == UP)
1472 && scrollbarnext_upButton (ev.y))
1473 || (scrollBar.style == R_SB_RXVT
1474 && scrollbarrxvt_upButton (ev.y)))
1475 tt_printf ("\033[A"); 2043 tt_printf ("\033[A");
1476 else if ((scrollBar.style == R_SB_NEXT 2044 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"); 2045 tt_printf ("\033[B");
1481 else 2046 else
1482 switch (ev.button) 2047 switch (ev.button)
1483 { 2048 {
1484 case Button2: 2049 case Button2:
… …
1491 tt_printf ("\033[5~"); 2056 tt_printf ("\033[5~");
1492 break; 2057 break;
1493 } 2058 }
1494 } 2059 }
1495 else 2060 else
1496#endif /* NO_SCROLLBAR_REPORT */ 2061#endif /* NO_SCROLLBAR_REPORT */
1497
1498 {
1499 char upordown = 0;
1500
1501 if (scrollBar.style == R_SB_NEXT)
1502 { 2062 {
1503 if (scrollbarnext_upButton (ev.y)) 2063 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 { 2064 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2065#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2066 if (!cont_scroll_ev.is_active ())
2067 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1519#endif 2068#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 2069 if (scr_page (direction, 1))
1521 { 2070 {
1522 if (upordown < 0) 2071 if (direction == UP)
1523 scrollBar.setUp (); 2072 scrollBar.state = SB_STATE_UP;
1524 else 2073 else
1525 scrollBar.setDn (); 2074 scrollBar.state = SB_STATE_DOWN;
1526 } 2075 }
1527 } 2076 }
1528 else 2077 else
1529 switch (ev.button) 2078 switch (ev.button)
1530 { 2079 {
1531 case Button2: 2080 case Button2:
1532 switch (scrollbar_align) 2081 switch (scrollBar.align)
1533 { 2082 {
1534 case R_SB_ALIGN_TOP: 2083 case SB_ALIGN_TOP:
1535 csrO = 0; 2084 csrO = 0;
1536 break; 2085 break;
1537 case R_SB_ALIGN_CENTRE: 2086 case SB_ALIGN_CENTRE:
1538 csrO = (scrollBar.bot - scrollBar.top) / 2; 2087 csrO = (scrollBar.bot - scrollBar.top) / 2;
1539 break; 2088 break;
1540 case R_SB_ALIGN_BOTTOM: 2089 case SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 2090 csrO = scrollBar.bot - scrollBar.top;
1542 break; 2091 break;
1543 } 2092 }
2093
1544 if (scrollBar.style == R_SB_XTERM 2094 if (scrollBar.style == SB_STYLE_XTERM
1545 || scrollbar_above_slider (ev.y) 2095 || scrollBar.above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 2096 || scrollBar.below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 2097 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
1548 scrollbar_size ()); 2098
1549 scrollBar.setMotion (); 2099 scrollBar.state = SB_STATE_MOTION;
1550 break; 2100 break;
1551 2101
1552 case Button1: 2102 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2103 if (scrollBar.align == SB_ALIGN_CENTRE)
1554 csrO = ev.y - scrollBar.top; 2104 csrO = ev.y - scrollBar.top;
1555 /* FALLTHROUGH */ 2105 /* FALLTHROUGH */
1556 2106
1557 case Button3: 2107 case Button3:
1558 if (scrollBar.style != R_SB_XTERM) 2108 if (scrollBar.style != SB_STYLE_XTERM)
1559 { 2109 {
1560 if (scrollbar_above_slider (ev.y)) 2110 if (scrollBar.above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL 2111# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1); 2112 scr_page (UP, nrow - 1);
1563# else 2113# else
1564 scr_page (UP, TermWin.nrow / 4); 2114 scr_page (UP, nrow / 4);
1565# endif 2115# endif
1566 else if (scrollbar_below_slider (ev.y)) 2116 else if (scrollBar.below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL 2117# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1); 2118 scr_page (DN, nrow - 1);
1569# else 2119# else
1570 scr_page (DN, TermWin.nrow / 4); 2120 scr_page (DN, nrow / 4);
1571# endif 2121# endif
1572 else 2122 else
1573 scrollBar.setMotion (); 2123 scrollBar.state = SB_STATE_MOTION;
1574 } 2124 }
1575 else 2125 else
1576 { 2126 {
1577 scr_page ((ev.button == Button1 ? DN : UP), 2127 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 2128 (nrow
1579 * scrollbar_position (ev.y) 2129 * scrollBar.position (ev.y)
1580 / scrollbar_size ())); 2130 / scrollBar.size ()));
1581 } 2131 }
2132
1582 break; 2133 break;
1583 } 2134 }
1584 } 2135 }
2136
1585 return; 2137 return;
1586 } 2138 }
1587#if MENUBAR
1588 /*
1589 * Menubar window processing of button press
1590 */
1591 if (isMenuBarWindow (ev.window))
1592 menubar_control (ev);
1593#endif
1594} 2139}
1595 2140
1596void 2141void
1597rxvt_term::button_release (XButtonEvent &ev) 2142rxvt_term::button_release (XButtonEvent &ev)
1598{ 2143{
1599 int reportmode = 0; 2144 int reportmode = 0;
1600 2145
1601 csrO = 0; /* reset csr Offset */ 2146 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2147 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2148 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2149
1605 if (scrollbar_isUpDn ()) 2150 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1606 { 2151 {
1607 scrollBar.setIdle (); 2152 scrollBar.state = SB_STATE_IDLE;
1608 scrollbar_show (0); 2153 scrollBar.show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH;
1611#endif
1612
1613 } 2154 }
2155
1614#ifdef SELECTION_SCROLLING 2156#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2157 sel_scroll_ev.stop();
1616#endif 2158#endif
2159
1617 if (ev.window == TermWin.vt) 2160 if (ev.window == vt)
1618 { 2161 {
2162 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2163 return;
2164
2165#if ISO_14755
2166 // 5.4
2167 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2168 return;
2169#endif
2170
1619 if (reportmode) 2171 if (reportmode)
1620 { 2172 {
1621 /* mouse report from vt window */ 2173 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2174 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2175 if (ev.button >= 4)
… …
1625#ifdef MOUSE_REPORT_DOUBLECLICK 2177#ifdef MOUSE_REPORT_DOUBLECLICK
1626 /* only report the release of 'slow' single clicks */ 2178 /* only report the release of 'slow' single clicks */
1627 if (MEvent.button != AnyButton 2179 if (MEvent.button != AnyButton
1628 && (ev.button != MEvent.button 2180 && (ev.button != MEvent.button
1629 || (ev.time - MEvent.time 2181 || (ev.time - MEvent.time
1630 > MULTICLICK_TIME / 2))) 2182 > multiClickTime / 2)))
1631 { 2183 {
1632 MEvent.clicks = 0; 2184 MEvent.clicks = 0;
1633 MEvent.button = AnyButton; 2185 MEvent.button = AnyButton;
1634 mouse_report (ev); 2186 mouse_report (ev);
1635 } 2187 }
1636#else /* MOUSE_REPORT_DOUBLECLICK */ 2188#else /* MOUSE_REPORT_DOUBLECLICK */
1637 MEvent.button = AnyButton; 2189 MEvent.button = AnyButton;
1638 mouse_report (ev); 2190 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2191#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2192 return;
1641 } 2193 }
2194
1642 /* 2195 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2196 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2197 * when overriding mouse reporting
1645 */ 2198 */
1646 if (PrivateModes & PrivMode_mouse_report 2199 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2200 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2201 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2202 selection_extend (ev.x, ev.y, 0);
1650 2203
1651 switch (ev.button) 2204 switch (ev.button)
1652 { 2205 {
1653 case Button1: 2206 case Button1:
1654 case Button3: 2207 case Button3:
1655 selection_make (ev.time); 2208 selection_make (ev.time);
1656 break; 2209 break;
2210
1657 case Button2: 2211 case Button2:
1658 selection_request (ev.time, ev.x, ev.y); 2212 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2213 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1659 break; 2214 break;
2215
1660#ifdef MOUSE_WHEEL 2216#ifdef MOUSE_WHEEL
1661 case Button4: 2217 case Button4:
1662 case Button5: 2218 case Button5:
1663 { 2219 {
1664 int i; 2220 int lines;
1665 page_dirn v; 2221 page_dirn dirn;
1666 2222
1667 v = (ev.button == Button4) ? UP : DN; 2223 dirn = ev.button == Button4 ? UP : DN;
2224
1668 if (ev.state & ShiftMask) 2225 if (ev.state & ShiftMask)
1669 i = 1; 2226 lines = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2227 else if (option (Opt_mouseWheelScrollPage))
1671 i = TermWin.nrow - 1; 2228 lines = nrow - 1;
1672 else 2229 else
1673 i = 5; 2230 lines = 5;
2231
1674# ifdef MOUSE_SLIP_WHEELING 2232# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2233 if (ev.state & ControlMask)
1676 { 2234 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2235 mouse_slip_wheel_speed += dirn;
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2236 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2237
2238 if (!slip_wheel_ev.is_active ())
2239 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1679 } 2240 }
2241 else
1680# endif 2242# 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 { 2243 {
1688 scr_page (v, 1); 2244 scr_page (dirn, lines);
1689 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 2245 scrollBar.show (1);
1691 } 2246 }
1692# endif
1693
1694 } 2247 }
1695 break; 2248 break;
1696#endif 2249#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 { 2250 }
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 { 2251 }
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} 2252}
1918#endif
1919 2253
1920/*}}} */ 2254/*}}} */
1921 2255
1922bool 2256void ecb_hot
1923rxvt_term::cmd_parse () 2257rxvt_term::cmd_parse ()
1924{ 2258{
1925 bool flag = false;
1926 unicode_t ch = NOCHAR; 2259 wchar_t ch = NOCHAR;
1927 unsigned char *seq_begin; // remember start of esc-sequence here 2260 char *seq_begin; // remember start of esc-sequence here
1928 2261
1929 for (;;) 2262 for (;;)
1930 { 2263 {
1931 if (ch == NOCHAR) 2264 if (ecb_unlikely (ch == NOCHAR))
1932 { 2265 {
1933 seq_begin = cmdbuf_ptr; 2266 seq_begin = cmdbuf_ptr;
1934 ch = next_char (); 2267 ch = next_char ();
1935 }
1936 2268
1937 if (ch == NOCHAR) // TODO: improve 2269 if (ch == NOCHAR)
1938 break; 2270 break;
1939
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
1941 { 2271 }
2272
2273 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2274 {
2275 if (ecb_unlikely (!seen_input))
2276 {
2277 seen_input = 1;
2278 // many badly-written programs (e.g. jed) contain a race condition:
2279 // they first read the screensize and then install a SIGWINCH handler.
2280 // some window managers resize the window early, and these programs
2281 // then sometimes get the size wrong.
2282 // unfortunately other programs are even more buggy and dislike
2283 // being sent SIGWINCH, so only do it when we were in fact being
2284 // resized.
2285 if (seen_resize && cmd_pid)
2286 kill (-cmd_pid, SIGWINCH);
2287 }
2288
1942 /* Read a text string from the input buffer */ 2289 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2290 wchar_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2291 bool refreshnow = false;
1945 int nlines = 0; 2292 int nlines = 0;
1946 unicode_t *str = buf; 2293 wchar_t *str = buf;
1947 2294 wchar_t *eol = str + min (ncol, UBUFSIZ);
1948 *str++ = ch;
1949 2295
1950 for (;;) 2296 for (;;)
1951 { 2297 {
2298 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2299 break;
2300
2301 *str++ = ch;
2302
2303 if (ecb_unlikely (ch == C0_LF || str >= eol))
2304 {
2305 if (ch == C0_LF)
2306 nlines++;
2307
2308 refresh_count++;
2309
2310 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2311 {
2312 refresh_count = 0;
2313
2314 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2315 {
2316 refreshnow = true;
2317 ch = NOCHAR;
2318 break;
2319 }
2320 }
2321
2322 // scr_add_lines only works for nlines <= nrow - 1.
2323 if (nlines >= nrow - 1)
2324 {
2325 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2326 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2327 scr_add_lines (buf, str - buf, nlines);
2328
2329 nlines = 0;
2330 str = buf;
2331 eol = str + min (ncol, UBUFSIZ);
2332 }
2333
2334 if (str >= eol)
2335 {
2336 if (eol >= buf + UBUFSIZ)
2337 {
2338 ch = NOCHAR;
2339 break;
2340 }
2341 else
2342 eol = min (eol + ncol, buf + UBUFSIZ);
2343 }
2344
2345 }
2346
1952 seq_begin = cmdbuf_ptr; 2347 seq_begin = cmdbuf_ptr;
1953 ch = next_char (); 2348 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 } 2349 }
1989 2350
2351 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2352 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1990 scr_add_lines (buf, nlines, str - buf); 2353 scr_add_lines (buf, str - buf, nlines);
1991 2354
1992 /* 2355 /*
1993 * If there have been a lot of new lines, then update the screen 2356 * 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. 2357 * 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 2358 * 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 */ 2359 */
2001 if (refreshnow) 2360 if (refreshnow)
2002 { 2361 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++;
2005
2006 scr_refresh (refresh_type); 2362 scr_refresh ();
2363 want_refresh = 1;
2007 } 2364 }
2008
2009 } 2365 }
2010 else 2366 else
2011 { 2367 {
2012 try 2368 try
2013 { 2369 {
… …
2021 } 2377 }
2022 2378
2023 ch = NOCHAR; 2379 ch = NOCHAR;
2024 } 2380 }
2025 } 2381 }
2026
2027 return flag;
2028} 2382}
2029 2383
2030// read the next character 2384// read the next character
2031unicode_t 2385wchar_t ecb_hot
2032rxvt_term::next_char () 2386rxvt_term::next_char () NOTHROW
2033{ 2387{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2388 while (cmdbuf_ptr < cmdbuf_endp)
2035 { 2389 {
2036 // assume 7-bit to be ascii ALWAYS 2390 // assume 7-bit to be ascii ALWAYS
2037 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2391 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2038 return *cmdbuf_ptr++; 2392 return *cmdbuf_ptr++;
2039 2393
2040 wchar_t wc; 2394 wchar_t wc;
2041 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2395 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2042 2396
2043 if (len == (size_t)-2) 2397 if (len == (size_t)-2)
2044 { 2398 {
2045 // the mbstate stores incomplete sequences. didn't know this :/ 2399 // the mbstate stores incomplete sequences. didn't know this :/
2046 cmdbuf_ptr = cmdbuf_endp; 2400 cmdbuf_ptr = cmdbuf_endp;
2047 break; 2401 break;
2048 } 2402 }
2049 2403
2050 if (len == (size_t)-1) 2404 if (len == (size_t)-1)
2405 {
2406 mbstate.reset (); // reset now undefined conversion state
2407 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2408 // 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 2409 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2410 }
2052 2411
2053 // assume wchar == unicode 2412 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2413 cmdbuf_ptr += len;
2055 return wc; 2414 return wc & UNICODE_MASK;
2056 } 2415 }
2057 2416
2058 return NOCHAR; 2417 return NOCHAR;
2059} 2418}
2060 2419
2061/* rxvt_cmd_getc () - Return next input character */ 2420// read the next octet
2062/* 2421uint32_t ecb_hot
2063 * Return the next input character after first passing any keyboard input 2422rxvt_term::next_octet () NOTHROW
2064 * to the command.
2065 */
2066unicode_t
2067rxvt_term::cmd_getc ()
2068{ 2423{
2424 return cmdbuf_ptr < cmdbuf_endp
2425 ? (unsigned char)*cmdbuf_ptr++
2426 : NOCHAR;
2427}
2428
2429static class out_of_input out_of_input;
2430
2431wchar_t ecb_hot
2432rxvt_term::cmd_getc () THROW ((class out_of_input))
2433{
2069 unicode_t c = next_char (); 2434 wchar_t c = next_char ();
2435
2436 if (c == NOCHAR)
2437 throw out_of_input;
2438
2439 return c;
2440}
2441
2442uint32_t ecb_hot
2443rxvt_term::cmd_get8 () THROW ((class out_of_input))
2444{
2445 uint32_t c = next_octet ();
2070 2446
2071 if (c == NOCHAR) 2447 if (c == NOCHAR)
2072 throw out_of_input; 2448 throw out_of_input;
2073 2449
2074 return c; 2450 return c;
2075} 2451}
2076 2452
2077/*{{{ print pipe */ 2453/*{{{ print pipe */
2078/*----------------------------------------------------------------------*/ 2454/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2455#ifdef PRINTPIPE
2080FILE * 2456FILE * ecb_cold
2081rxvt_term::popen_printer () 2457rxvt_term::popen_printer ()
2082{ 2458{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2459 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2084 2460
2085 if (stream == NULL) 2461 if (stream == NULL)
2086 rxvt_warn ("can't open printer pipe, not printing.\n"); 2462 rxvt_warn ("can't open printer pipe, not printing.\n");
2087 2463
2088 return stream; 2464 return stream;
2089} 2465}
2090 2466
2091int 2467int ecb_cold
2092rxvt_term::pclose_printer (FILE *stream) 2468rxvt_term::pclose_printer (FILE *stream)
2093{ 2469{
2094 fflush (stream); 2470 fflush (stream);
2095 return pclose (stream); 2471 return pclose (stream);
2096} 2472}
2097 2473
2098/* 2474/*
2099 * simulate attached vt100 printer 2475 * simulate attached vt100 printer
2100 */ 2476 */
2101void 2477void ecb_cold
2102rxvt_term::process_print_pipe () 2478rxvt_term::process_print_pipe ()
2103{ 2479{
2104 int done; 2480 FILE *fd = popen_printer ();
2105 FILE *fd;
2106 2481
2107 if ((fd = popen_printer ()) == NULL) 2482 if (!fd)
2108 return; 2483 return;
2109 2484
2110 /* 2485 /*
2111 * Send all input to the printer until either ESC[4i or ESC[?4i 2486 * Send all input to the printer until either ESC[4i or ESC[?4i
2112 * is received. 2487 * is received.
2113 */ 2488 */
2114 for (done = 0; !done;) 2489 for (int done = 0; !done; )
2115 { 2490 {
2116 unsigned char buf[8]; 2491 unsigned char buf[8];
2117 unicode_t ch; 2492 unicode_t ch;
2118 unsigned int i, len; 2493 unsigned int i, len;
2119 2494
… …
2138 { 2513 {
2139 if ((buf[len++] = cmd_getc ()) == 'i') 2514 if ((buf[len++] = cmd_getc ()) == 'i')
2140 break; /* done = 1 */ 2515 break; /* done = 1 */
2141 } 2516 }
2142 } 2517 }
2143 2518
2144 for (i = 0; i < len; i++) 2519 for (i = 0; i < len; i++)
2145 if (putc (buf[i], fd) == EOF) 2520 if (putc (buf[i], fd) == EOF)
2146 { 2521 {
2147 done = 1; 2522 done = 1;
2148 break; 2523 break;
… …
2150 } 2525 }
2151 } 2526 }
2152 2527
2153 pclose_printer (fd); 2528 pclose_printer (fd);
2154} 2529}
2155#endif /* PRINTPIPE */ 2530#endif /* PRINTPIPE */
2156/*}}} */ 2531/*}}} */
2157 2532
2158/* *INDENT-OFF* */
2159enum { 2533enum {
2160 C1_40 = 0x40, 2534 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2535 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, 2536 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, 2537 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 2538 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2539};
2166/* *INDENT-ON* */
2167 2540
2168/*{{{ process non-printing single characters */ 2541/*{{{ process non-printing single characters */
2169void 2542void ecb_hot
2170rxvt_term::process_nonprinting (unicode_t ch) 2543rxvt_term::process_nonprinting (unicode_t ch)
2171{ 2544{
2172 switch (ch) 2545 switch (ch)
2173 { 2546 {
2174 case C0_ESC: 2547 case C0_ESC:
2175 process_escape_seq (); 2548 process_escape_seq ();
2176 break; 2549 break;
2177 case C0_ENQ: /* terminal Status */ 2550 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2551 if (rs[Rs_answerbackstring])
2179 tt_write ( 2552 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 2553 else
2183 tt_write ((unsigned char *)VT100_ANS, 2554 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2555 break;
2186 case C0_BEL: /* bell */ 2556 case C0_BEL: /* bell */
2187 scr_bell (); 2557 scr_bell ();
2188 break; 2558 break;
2189 case C0_BS: /* backspace */ 2559 case C0_BS: /* backspace */
… …
2205 break; 2575 break;
2206 case C0_SI: /* shift in - acs */ 2576 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2577 scr_charset_choose (0);
2208 break; 2578 break;
2209 2579
2580#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2581 // 8-bit controls
2211 case 0x90: /* DCS */ 2582 case 0x90: /* DCS */
2212 process_dcs_seq (); 2583 process_dcs_seq ();
2213 break; 2584 break;
2214 case 0x9b: /* CSI */ 2585 case 0x9b: /* CSI */
2215 process_csi_seq (); 2586 process_csi_seq ();
2216 break; 2587 break;
2217 case 0x9d: /* CSI */ 2588 case 0x9d: /* OSC */
2218 process_osc_seq (); 2589 process_osc_seq ();
2219 break; 2590 break;
2591#endif
2220 } 2592 }
2221} 2593}
2222/*}}} */ 2594/*}}} */
2223 2595
2224 2596
2225/*{{{ process VT52 escape sequences */ 2597/*{{{ process VT52 escape sequences */
2226void 2598void ecb_cold
2227rxvt_term::process_escape_vt52 (unicode_t ch) 2599rxvt_term::process_escape_vt52 (unicode_t ch)
2228{ 2600{
2229 int row, col; 2601 int row, col;
2230 2602
2231 switch (ch) 2603 switch (ch)
… …
2265 break; 2637 break;
2266 case 'Z': /* identify the terminal type */ 2638 case 'Z': /* identify the terminal type */
2267 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2639 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2268 break; 2640 break;
2269 case '<': /* turn off VT52 mode */ 2641 case '<': /* turn off VT52 mode */
2270 PrivMode (0, PrivMode_vt52); 2642 priv_modes &= ~PrivMode_vt52;
2271 break; 2643 break;
2272 case 'F': /* use special graphics character set */ 2644 case 'F': /* use special graphics character set */
2273 case 'G': /* use regular character set */ 2645 case 'G': /* use regular character set */
2274 /* unimplemented */ 2646 /* unimplemented */
2275 break; 2647 break;
… …
2281} 2653}
2282/*}}} */ 2654/*}}} */
2283 2655
2284 2656
2285/*{{{ process escape sequences */ 2657/*{{{ process escape sequences */
2286void 2658void ecb_hot
2287rxvt_term::process_escape_seq () 2659rxvt_term::process_escape_seq ()
2288{ 2660{
2289 unicode_t ch = cmd_getc (); 2661 unicode_t ch = cmd_getc ();
2290 2662
2291 if (PrivateModes & PrivMode_vt52) 2663 if (priv_modes & PrivMode_vt52)
2292 { 2664 {
2293 process_escape_vt52 (ch); 2665 process_escape_vt52 (ch);
2294 return; 2666 return;
2295 } 2667 }
2296 2668
2297 switch (ch) 2669 switch (ch)
2298 { 2670 {
2299 /* case 1: do_tek_mode (); break; */
2300 case '#': 2671 case '#':
2301 if (cmd_getc () == '8') 2672 if (cmd_getc () == '8')
2302 scr_E (); 2673 scr_E ();
2303 break; 2674 break;
2304 case '(': 2675 case '(':
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 2682 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 2683 break;
2313 case '+': 2684 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 2685 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 2686 break;
2316#ifndef NO_FRILLS 2687#if !ENABLE_MINIMAL
2317 case '6': 2688 case '6':
2318 scr_backindex (); 2689 scr_backindex ();
2319 break; 2690 break;
2320#endif 2691#endif
2321 case '7': 2692 case '7':
2322 scr_cursor (SAVE); 2693 scr_cursor (SAVE);
2323 break; 2694 break;
2324 case '8': 2695 case '8':
2325 scr_cursor (RESTORE); 2696 scr_cursor (RESTORE);
2326 break; 2697 break;
2327#ifndef NO_FRILLS 2698#if !ENABLE_MINIMAL
2328 case '9': 2699 case '9':
2329 scr_forwardindex (); 2700 scr_forwardindex ();
2330 break; 2701 break;
2331#endif 2702#endif
2703 // DECPAM/DECPNM
2332 case '=': 2704 case '=':
2705 priv_modes |= PrivMode_aplKP;
2706 break;
2333 case '>': 2707 case '>':
2334 PrivMode ((ch == '='), PrivMode_aplKP); 2708 priv_modes &= ~PrivMode_aplKP;
2335 break; 2709 break;
2336 2710
2337 case C1_40: 2711 case C1_40:
2338 cmd_getc (); 2712 cmd_getc ();
2339 break; 2713 break;
… …
2342 break; 2716 break;
2343 2717
2344 /* 8.3.87: NEXT LINE */ 2718 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 2719 case C1_NEL: /* ESC E */
2346 { 2720 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 2721 wchar_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 2722 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2349 } 2723 }
2350 break; 2724 break;
2351 2725
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 2726 /* kidnapped escape sequence: Should be 8.3.48 */
2353 case C1_ESA: /* ESC G */ 2727 case C1_ESA: /* ESC G */
2354 process_graphics (); 2728 // used by original rxvt for rob nations own graphics mode
2729 if (cmd_getc () == 'Q')
2730 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2355 break; 2731 break;
2356 2732
2357 /* 8.3.63: CHARACTER TABULATION SET */ 2733 /* 8.3.63: CHARACTER TABULATION SET */
2358 case C1_HTS: /* ESC H */ 2734 case C1_HTS: /* ESC H */
2359 scr_set_tab (1); 2735 scr_set_tab (1);
… …
2363 case C1_RI: /* ESC M */ 2739 case C1_RI: /* ESC M */
2364 scr_index (DN); 2740 scr_index (DN);
2365 break; 2741 break;
2366 2742
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 2743 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 2744 /* case C1_SS2: break; */
2369 2745
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 2746 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 2747 /* case C1_SS3: break; */
2372 2748
2373 /* 8.3.27: DEVICE CONTROL STRING */ 2749 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 2750 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 2751 process_dcs_seq ();
2376 break; 2752 break;
2377 2753
2378 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2754 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2379 case C1_SCI: /* ESC Z */ 2755 case C1_SCI: /* ESC Z */
2380 tt_write ((const unsigned char *)ESCZ_ANSWER, 2756 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2381 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2382 break; /* steal obsolete ESC [ c */ 2757 break; /* steal obsolete ESC [ c */
2383 2758
2384 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2759 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2385 case C1_CSI: /* ESC [ */ 2760 case C1_CSI: /* ESC [ */
2386 process_csi_seq (); 2761 process_csi_seq ();
2387 break; 2762 break;
2388 2763
2389 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2764 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2390 case C1_OSC: /* ESC ] */ 2765 case C1_OSC: /* ESC ] */
2391 process_osc_seq (); 2766 process_osc_seq ();
2392 break; 2767 break;
2393 2768
2394 /* 8.3.106: RESET TO INITIAL STATE */ 2769 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2395 case 'c': 2770 case 'c':
2771 mbstate.reset ();
2396 scr_poweron (); 2772 scr_poweron ();
2397 scrollbar_show (1); 2773 scrollBar.show (1);
2398 break; 2774 break;
2399 2775
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2776 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2401 case 'n': 2777 case 'n':
2402 scr_charset_choose (2); 2778 scr_charset_choose (2);
… …
2409 } 2785 }
2410} 2786}
2411/*}}} */ 2787/*}}} */
2412 2788
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2789/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */
2415enum { 2790enum {
2416 CSI_ICH = 0x40, 2791 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2792 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 , 2793 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, 2794 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, 2795 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, 2796 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, 2797 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 , 2798 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 2799 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2425}; 2800};
2426 2801
2427#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2802#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2428 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2803 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2429 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2804 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2430#define get_byte_array_bit(array, bit) \ 2805#define get_byte_array_bit(array, bit) \
2431 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2806 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2432 2807
2433const unsigned char csi_defaults[] = 2808static const unsigned char csi_defaults[] =
2434 { 2809 {
2435 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2810 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, */ 2811 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, */ 2812 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, [, \, ], ^, _, */ 2813 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, */ 2814 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, */ 2815 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, */ 2816 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, {, |, }, ~, */ 2817 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 2818 };
2444/* *INDENT-ON* */
2445 2819
2446void 2820void ecb_hot
2447rxvt_term::process_csi_seq () 2821rxvt_term::process_csi_seq ()
2448{ 2822{
2449 unicode_t ch, priv, i; 2823 unicode_t ch, priv, prev_ch, i;
2450 unsigned int nargs, p; 2824 unsigned int nargs, p;
2451 int n, ndef; 2825 int n, ndef;
2452 int arg[ESC_ARGS]; 2826 int arg[ESC_ARGS] = { };
2453 2827
2454 for (nargs = ESC_ARGS; nargs > 0;) 2828 nargs = 0;
2455 arg[--nargs] = 0;
2456 2829
2457 priv = 0; 2830 priv = 0;
2458 ch = cmd_getc (); 2831 ch = cmd_getc ();
2459 if (ch >= '<' && ch <= '?') 2832 if ((ch >= '<' && ch <= '?') || ch == '!')
2833 {
2460 { /* '<' '=' '>' '?' */ 2834 /* '<' '=' '>' '?' '!' */
2461 priv = ch; 2835 priv = ch;
2462 ch = cmd_getc (); 2836 ch = cmd_getc ();
2463 } 2837 }
2464 2838
2839 prev_ch = 0;
2465 /* read any numerical arguments */ 2840 /* read any numerical arguments */
2466 for (n = -1; ch < CSI_ICH; ) 2841 for (n = -1; ch < CSI_ICH; )
2467 { 2842 {
2468 if (isdigit (ch)) 2843 if (isdigit (ch))
2469 { 2844 {
… …
2479 n = -1; 2854 n = -1;
2480 } 2855 }
2481 else if (IS_CONTROL (ch)) 2856 else if (IS_CONTROL (ch))
2482 process_nonprinting (ch); 2857 process_nonprinting (ch);
2483 2858
2859 prev_ch = ch;
2484 ch = cmd_getc (); 2860 ch = cmd_getc ();
2485 } 2861 }
2486 2862
2487 if (ch > CSI_7F) 2863 if (ch > CSI_7F)
2488 return; 2864 return;
… …
2494 ndef = get_byte_array_bit (csi_defaults, i); 2870 ndef = get_byte_array_bit (csi_defaults, i);
2495 for (p = 0; p < nargs; p++) 2871 for (p = 0; p < nargs; p++)
2496 if (arg[p] == -1) 2872 if (arg[p] == -1)
2497 arg[p] = ndef; 2873 arg[p] = ndef;
2498 2874
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 /* 2875 /*
2507 * private mode handling 2876 * private mode handling
2508 */ 2877 */
2509 if (priv) 2878 if (priv)
2510 { 2879 {
2511 switch (priv) 2880 switch (priv)
2512 { 2881 {
2513 case '>': 2882 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 2883 if (ch == CSI_DA) /* secondary device attributes */
2884 {
2885 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2886 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2887 //
2888 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2889 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2890 // versions.
2891 //
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2892 tt_printf ("\033[>%d;95;0c", 'U');
2893 }
2516 break; 2894 break;
2895
2517 case '?': 2896 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2897 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 2898 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 2899 break;
2900
2901 case '!':
2902 if (ch == CSI_70)
2903 {
2904 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2905 scr_soft_reset ();
2906
2907 static const int pm_h[] = { 7, 25 };
2908 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2909
2910 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2911 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2521 } 2912 }
2913 break;
2914 }
2915
2522 return; 2916 return;
2523 } 2917 }
2524 2918
2525 switch (ch) 2919 switch (ch)
2526 { 2920 {
… …
2540 } 2934 }
2541 break; 2935 break;
2542#endif 2936#endif
2543 2937
2544 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2938 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2545 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2939 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2546 arg[0] = -arg[0]; 2940 arg[0] = -arg[0];
2547 /* FALLTHROUGH */ 2941 /* FALLTHROUGH */
2548 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2942 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2549 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2943 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2550 scr_gotorc (arg[0], 0, RELATIVE); 2944 scr_gotorc (arg[0], 0, RELATIVE);
2551 break; 2945 break;
2552 2946
2553 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2947 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2554 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2948 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
2625 3019
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3020 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 3021 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 3022 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3023 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3024 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2631 break; 3025 break;
2632 3026
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3027 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3028 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2635 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3029 break;
2637 3030
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3031 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3032 process_sgr_mode (nargs, arg);
2640 break; 3033 break;
… …
2646 tt_printf ("\033[0n"); 3039 tt_printf ("\033[0n");
2647 break; 3040 break;
2648 case 6: /* CPR requested */ 3041 case 6: /* CPR requested */
2649 scr_report_position (); 3042 scr_report_position ();
2650 break; 3043 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3044 case 7: /* unofficial extension */
3045 if (option (Opt_insecure))
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3046 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3047 break;
2655#endif
2656 case 8: /* unofficial extension */ 3048 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3049 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3050 break;
2659 } 3051 }
2660 break; 3052 break;
2661 3053
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3054 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3087 break;
2696 3088
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3089 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3090 if (arg[0] == 4)
2699 scr_insert_mode (0); 3091 scr_insert_mode (0);
3092 else if (arg[0] == 20)
3093 priv_modes &= ~PrivMode_LFNL;
2700 break; 3094 break;
2701 3095
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3096 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3097 if (arg[0] == 4)
2704 scr_insert_mode (1); 3098 scr_insert_mode (1);
3099 else if (arg[0] == 20)
3100 priv_modes |= PrivMode_LFNL;
3101 break;
3102
3103 case CSI_71: // DECSCUSR: set cursor style
3104 if (prev_ch == ' ')
3105 set_cursor_style (arg[0]);
2705 break; 3106 break;
2706 3107
2707 /* 3108 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3109 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3110 */
… …
2721 break; 3122 break;
2722 case CSI_75: 3123 case CSI_75:
2723 scr_cursor (RESTORE); 3124 scr_cursor (RESTORE);
2724 break; 3125 break;
2725 3126
2726#ifndef NO_FRILLS 3127#if !ENABLE_MINIMAL
2727 case CSI_74: 3128 case CSI_74:
2728 process_window_ops (arg, nargs); 3129 process_window_ops (arg, nargs);
2729 break; 3130 break;
2730#endif 3131#endif
2731 3132
… …
2738 break; 3139 break;
2739 } 3140 }
2740} 3141}
2741/*}}} */ 3142/*}}} */
2742 3143
2743#ifndef NO_FRILLS 3144#if !ENABLE_MINIMAL
2744/* ARGSUSED */
2745void 3145void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3146rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3147{
2748 int x, y; 3148 int x, y;
2749 XWindowAttributes wattr; 3149 XWindowAttributes wattr;
2750 Window wdummy; 3150 Window wdummy;
3151
3152 dLocal (Display *, dpy);
2751 3153
2752 if (nargs == 0) 3154 if (nargs == 0)
2753 return; 3155 return;
2754 3156
2755 switch (args[0]) 3157 switch (args[0])
2756 { 3158 {
2757 /* 3159 /*
2758 * commands 3160 * commands
2759 */ 3161 */
2760 case 1: /* deiconify window */ 3162 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3163 XMapWindow (dpy, parent);
2762 break; 3164 break;
2763 case 2: /* iconify window */ 3165 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3166 XIconifyWindow (dpy, parent, display->screen);
2765 DefaultScreen (display->display));
2766 break; 3167 break;
2767 case 3: /* set position (pixels) */ 3168 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3169 XMoveWindow (dpy, parent, args[1], args[2]);
2769 break; 3170 break;
2770 case 4: /* set size (pixels) */ 3171 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3172 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3173 break;
2773 case 5: /* raise window */ 3174 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3175 XRaiseWindow (dpy, parent);
2775 break; 3176 break;
2776 case 6: /* lower window */ 3177 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3178 XLowerWindow (dpy, parent);
2778 break; 3179 break;
2779 case 7: /* refresh window */ 3180 case 7: /* refresh window */
2780 scr_touch (true); 3181 scr_touch (true);
2781 break; 3182 break;
2782 case 8: /* set size (chars) */ 3183 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3184 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3185 (unsigned int) (args[1] * fheight));
2785 break; 3186 break;
2786 3187
2787 //case 9: NYI, TODO, restore maximized window or maximize window 3188 //case 9: NYI, TODO, restore maximized window or maximize window
2788 default: 3189 default:
2789 if (args[0] >= 24) /* set height (chars) */ 3190 if (args[0] >= 24) /* set height (chars) */
2790 set_widthheight ((unsigned int)TermWin.width, 3191 set_widthheight ((unsigned int)vt_width,
2791 (unsigned int) (args[1] * TermWin.fheight)); 3192 (unsigned int) (args[1] * fheight));
2792 break; 3193 break;
2793
2794 3194
2795 /* 3195 /*
2796 * reports - some output format copied from XTerm 3196 * reports - some output format copied from XTerm
2797 */ 3197 */
2798 case 11: /* report window state */ 3198 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3199 XGetWindowAttributes (dpy, parent, &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3200 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3201 break;
2802 case 13: /* report window position */ 3202 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3203 XGetWindowAttributes (dpy, parent, &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3204 XTranslateCoordinates (dpy, parent, wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3205 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3206 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3207 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3208 break;
2809 case 14: /* report window size (pixels) */ 3209 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3210 XGetWindowAttributes (dpy, parent, &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3211 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3212 break;
2813 case 18: /* report text area size (chars) */ 3213 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3214 tt_printf ("\033[8;%d;%dt", nrow, ncol);
2815 break; 3215 break;
2816 case 19: /* report window size (chars) */ 3216 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3217 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3218 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3219 case 20: /* report icon label */
3220 {
3221 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3222 XGetIconName (dpy, parent, &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3223 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3224 XFree (s);
3225 }
2823 break; 3226 break;
2824 case 21: /* report window title */ 3227 case 21: /* report window title */
2825 XFetchName (display->display, TermWin.parent[0], &s); 3228 {
3229 char *s;
3230 XFetchName (dpy, parent, &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3231 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3232 XFree (s);
3233 }
2827 break; 3234 break;
2828#endif
2829 } 3235 }
2830} 3236}
2831#endif 3237#endif
2832 3238
2833/*----------------------------------------------------------------------*/ 3239/*----------------------------------------------------------------------*/
2834/* 3240/*
2835 * get input up until STRING TERMINATOR (or BEL) 3241 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3242 * ends_how is terminator used. returned input must be free()'d
2837 */ 3243 */
2838unsigned char * 3244char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3245rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3246{
2841 int seen_esc = 0; /* seen escape? */ 3247 unicode_t ch;
3248 bool seen_esc = false;
2842 unsigned int n = 0; 3249 unsigned int n = 0;
2843 unsigned char *s; 3250 wchar_t string[CBUFSIZ];
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX];
2846 3251
2847 while ((ch = cmd_getc ())) 3252 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3253 {
2849 if (ch == C0_BEL 3254 if (seen_esc)
2850 || ch == CHAR_ST 3255 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3256 if (ch == 0x5c) /* 7bit ST */
2852 break; 3257 break;
2853 3258 else
3259 return NULL;
3260 }
2854 if (ch == C0_ESC) 3261 else if (ch == C0_ESC)
2855 { 3262 {
2856 seen_esc = 1; 3263 seen_esc = true;
2857 continue; 3264 continue;
2858 } 3265 }
3266 else if (ch == C0_BEL || ch == CHAR_ST)
3267 break;
2859 else if (ch == '\t') 3268 else if (ch == C0_SYN)
2860 ch = ' '; /* translate '\t' to space */ 3269 ch = cmd_get8 ();
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3270 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3271 return NULL; /* other control character - exit */
2863 3272
3273 seen_esc = false;
3274
2864 if (n < sizeof (string) - 1) 3275 if (n >= sizeof (string) - 1)
3276 // stop at some sane length
3277 return NULL;
3278
2865 string[n++] = ch; 3279 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3280 }
2869 3281
2870 string[n++] = '\0'; 3282 string[n++] = '\0';
2871 3283
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3284 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3285
2877 return s; 3286 return rxvt_wcstombs (string);
2878} 3287}
2879 3288
2880/*----------------------------------------------------------------------*/ 3289/*----------------------------------------------------------------------*/
2881/* 3290/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3291 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2883 */ 3292 */
2884void 3293void
2885rxvt_term::process_dcs_seq () 3294rxvt_term::process_dcs_seq ()
2886{ 3295{
2887 unsigned char *s;
2888 unicode_t eh;
2889
2890 /* 3296 /*
2891 * Not handled yet 3297 * Not handled yet
2892 */ 3298 */
3299
3300 unicode_t eh;
2893 s = get_to_st (eh); 3301 char *s = get_to_st (eh);
2894 if (s) 3302 if (s)
2895 free (s); 3303 free (s);
2896 3304
2897 return; 3305 return;
2898} 3306}
… …
2902 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3310 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2903 */ 3311 */
2904void 3312void
2905rxvt_term::process_osc_seq () 3313rxvt_term::process_osc_seq ()
2906{ 3314{
2907 unicode_t ch, eh;
2908 int arg; 3315 int arg;
2909 3316
2910 ch = cmd_getc (); 3317 unicode_t ch = cmd_getc ();
2911 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3318 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2912 arg = arg * 10 + (ch - '0'); 3319 arg = arg * 10 + (ch - '0');
2913 3320
2914 if (ch == ';') 3321 if (ch == ';')
2915 { 3322 {
3323 unicode_t eh;
2916 unsigned char *s = get_to_st (eh); 3324 char *s = get_to_st (eh);
2917 3325
2918 if (s) 3326 if (s)
2919 { 3327 {
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); 3328 process_xterm_seq (arg, s, eh);
2932
2933 free (s); 3329 free (s);
2934 } 3330 }
2935 } 3331 }
2936} 3332}
3333
3334void
3335rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3336{
3337 if (str[0] == '?' && !str[1])
3338 {
3339 rgba c;
3340 pix_colors_focused[color].get (c);
3341
3342#if XFT
3343 if (c.a != rgba::MAX_CC)
3344 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3345 else
3346#endif
3347 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3348 }
3349 else
3350 set_window_color (color, str);
3351}
3352
2937/* 3353/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3354 * 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 */ 3355 */
2960void 3356void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3357rxvt_term::process_xterm_seq (int op, char *str, char resp)
2962{ 3358{
2963 int changed = 0;
2964 int color; 3359 int color;
2965 char *buf, *name; 3360 char *buf, *name;
3361 bool query = str[0] == '?' && !str[1];
3362 int saveop = op;
3363
3364 dLocal (Display *, dpy);
2966 3365
2967 assert (str != NULL); 3366 assert (str != NULL);
3367
3368 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3369 return;
3370
2968 switch (op) 3371 switch (op)
2969 { 3372 {
2970 case XTerm_name: 3373 case XTerm_name:
2971 set_title (str); 3374 set_title (str);
2972 /* FALLTHROUGH */ 3375 /* FALLTHROUGH */
… …
2974 set_icon_name (str); 3377 set_icon_name (str);
2975 break; 3378 break;
2976 case XTerm_title: 3379 case XTerm_title:
2977 set_title (str); 3380 set_title (str);
2978 break; 3381 break;
3382 case XTerm_property:
3383 if (str[0] == '?')
3384 {
3385 Atom prop = display->atom (str + 1);
3386 Atom actual_type;
3387 int actual_format;
3388 unsigned long nitems;
3389 unsigned long bytes_after;
3390 unsigned char *value = 0;
3391 const char *str = "";
3392
3393 if (prop
3394 && XGetWindowProperty (dpy, parent,
3395 prop, 0, 1<<16, 0, AnyPropertyType,
3396 &actual_type, &actual_format,
3397 &nitems, &bytes_after, &value) == Success
3398 && actual_type != None
3399 && actual_format == 8)
3400 str = (const char *)(value);
3401
3402 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3403
3404 XFree (value);
3405 }
3406 else
3407 {
3408 char *eq = strchr (str, '=');
3409
3410 if (eq)
3411 {
3412 *eq = 0;
3413 set_utf8_property (display->atom (str), eq + 1);
3414 }
3415 else
3416 XDeleteProperty (dpy, parent,
3417 display->atom (str));
3418 }
3419 break;
3420
2979 case XTerm_Color: 3421 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3422 for (buf = (char *)str; buf && *buf;)
2981 { 3423 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3424 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3425 break;
2984 3426
2985 *name++ = '\0'; 3427 *name++ = '\0';
2986 color = atoi (buf); 3428 color = atoi (buf) + minCOLOR;
2987 3429
2988 if (color < 0 || color >= TOTAL_COLORS) 3430 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2989 break; 3431 break;
2990 3432
2991 if ((buf = STRCHR (name, ';')) != NULL) 3433 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3434 *buf++ = '\0';
2993 3435
2994 set_window_color (color + minCOLOR, name); 3436 process_color_seq (op, color, name, resp);
2995 } 3437 }
3438 break;
3439 case Rxvt_restoreFG:
3440 case XTerm_Color00:
3441 process_color_seq (op, Color_fg, str, resp);
3442 break;
3443 case Rxvt_restoreBG:
3444 case XTerm_Color01:
3445 process_color_seq (op, Color_bg, str, resp);
2996 break; 3446 break;
2997#ifndef NO_CURSORCOLOR 3447#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3448 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3449 process_color_seq (op, Color_cursor, str, resp);
3000 break; 3450 break;
3001#endif 3451#endif
3002 case XTerm_Color_pointer: 3452 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3453 process_color_seq (op, Color_pointer_fg, str, resp);
3004 break; 3454 break;
3455 case XTerm_Color_pointer_bg:
3456 process_color_seq (op, Color_pointer_bg, str, resp);
3457 break;
3458#ifdef OPTION_HC
3459 case XTerm_Color_HC:
3460 process_color_seq (op, Color_HC, str, resp);
3461 break;
3462 case XTerm_Color_HTC:
3463 process_color_seq (op, Color_HTC, str, resp);
3464 break;
3465#endif
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3466#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3467 case URxvt_Color_BD:
3007 set_window_color (Color_BD, str); 3468 process_color_seq (op, Color_BD, str, resp);
3008 break; 3469 break;
3009 case XTerm_Color_UL: 3470 case URxvt_Color_UL:
3010 set_window_color (Color_UL, str); 3471 process_color_seq (op, Color_UL, str, resp);
3011 break; 3472 break;
3012 case XTerm_Color_RV: 3473 case URxvt_Color_IT:
3013 set_window_color (Color_RV, str); 3474 process_color_seq (op, Color_IT, str, resp);
3014 break; 3475 break;
3015#endif 3476#endif
3477 case URxvt_Color_border:
3478 process_color_seq (op, Color_border, str, resp);
3479 break;
3016 3480
3017 case XTerm_Menu: 3481#if BG_IMAGE_FROM_ROOT
3482 case URxvt_Color_tint:
3483 process_color_seq (op, Color_tint, str, resp);
3018 /* 3484 {
3019 * rxvt_menubar_dispatch () violates the constness of the string, 3485 bool changed = false;
3020 * so DON'T do it here 3486
3487 if (ISSET_PIXCOLOR (Color_tint))
3488 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3489
3490 if (changed)
3491 update_background ();
3021 */ 3492 }
3493
3022 break; 3494 break;
3495#endif
3496
3497#if BG_IMAGE_FROM_FILE
3023 case XTerm_Pixmap: 3498 case Rxvt_Pixmap:
3024 if (*str != ';') 3499 if (!strcmp (str, "?"))
3025 { 3500 {
3026#if XPM_BACKGROUND 3501 char str[256];
3027 scale_pixmap (""); /* reset to default scaling */ 3502 int h_scale = fimage.h_scale;
3028 set_bgPixmap (str); /* change pixmap */ 3503 int v_scale = fimage.v_scale;
3029#endif 3504 int h_align = fimage.h_align;
3030 scr_touch (true); 3505 int v_align = fimage.v_align;
3506
3507 sprintf (str, "[%dx%d+%d+%d]",
3508 h_scale, v_scale,
3509 h_align, v_align);
3510 process_xterm_seq (XTerm_title, str, CHAR_ST);
3031 } 3511 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3512 else
3033 { 3513 {
3514 bool changed = false;
3515
3516 if (*str != ';')
3517 {
3518 try
3519 {
3520 fimage.set_file_geometry (this, str);
3521 changed = true;
3522 }
3523 catch (const class rxvt_failure_exception &e)
3524 {
3525 }
3526 }
3527 else
3528 {
3034 str++; 3529 str++;
3035#if XPM_BACKGROUND 3530 if (fimage.set_geometry (str, true))
3036 changed += scale_pixmap (str); 3531 changed = true;
3037#endif 3532 }
3038 3533
3534 if (changed)
3535 {
3536 if (bg_window_position_sensitive ())
3537 {
3538 int x, y;
3539 get_window_origin (x, y);
3540 parent_x = x;
3541 parent_y = y;
3542 }
3543 update_background ();
3544 }
3039 } 3545 }
3040 if (changed)
3041 {
3042#ifdef XPM_BACKGROUND
3043 resize_pixmap ();
3044#endif
3045 scr_touch (true);
3046 }
3047 break; 3546 break;
3547#endif
3048 3548
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: 3549 case XTerm_logfile:
3056 // TODO, when secure mode? 3550 // TODO, when secure mode?
3057 break; 3551 break;
3058 case XTerm_font: 3552
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 3553#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3554 case Rxvt_dumpscreen: /* no error notices */
3082 { 3555 {
3083 int fd; 3556 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3557 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3558 {
3086 scr_dump (fd); 3559 scr_dump (fd);
3087 close (fd); 3560 close (fd);
3088 } 3561 }
3089 } 3562 }
3563 break;
3564#endif
3565 case XTerm_font:
3566 op = URxvt_font;
3567 case URxvt_font:
3568#if ENABLE_STYLES
3569 case URxvt_boldFont:
3570 case URxvt_italicFont:
3571 case URxvt_boldItalicFont:
3572#endif
3573 if (query)
3574 tt_printf ("\33]%d;%-.250s%c", saveop,
3575 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3576 ? fontset[op - URxvt_font]->fontdesc : "",
3577 resp);
3578 else
3579 {
3580 const char *&res = rs[Rs_font + (op - URxvt_font)];
3581
3582 res = strdup (str);
3583 allocated.push_back ((void *)res);
3584 set_fonts ();
3585 }
3586 break;
3587
3588 case URxvt_version:
3589 if (query)
3590 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3591 op,
3592 rs[Rs_name], VERSION[0], VERSION[2],
3593 resp);
3594 break;
3595
3596#if !ENABLE_MINIMAL
3597 case URxvt_locale:
3598 if (query)
3599 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3600 else
3601 {
3602 set_locale (str);
3603 pty->set_utf8_mode (enc_utf8);
3604 init_xlocale ();
3605 }
3606 break;
3607
3608 case URxvt_view_up:
3609 case URxvt_view_down:
3610 {
3611 int lines = atoi (str);
3612
3613 if (lines)
3614 scr_page (op == URxvt_view_up ? UP : DN, lines);
3615 else
3616 scr_erase_savelines ();
3617 }
3618
3619 break;
3620#endif
3621
3622#if ENABLE_PERL
3623 case URxvt_perl:
3624 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3090 break; 3625 break;
3091#endif 3626#endif
3092 } 3627 }
3093} 3628}
3094/*----------------------------------------------------------------------*/ 3629/*----------------------------------------------------------------------*/
… …
3101 * 's' = save 3636 * 's' = save
3102 * 'r' = restore 3637 * 'r' = restore
3103 * 't' = toggle 3638 * 't' = toggle
3104 * so no need for fancy checking 3639 * so no need for fancy checking
3105 */ 3640 */
3106int 3641int ecb_cold
3107rxvt_term::privcases (int mode, unsigned long bit) 3642rxvt_term::privcases (int mode, unsigned long bit)
3108{ 3643{
3109 int state; 3644 int state;
3110 3645
3111 if (mode == 's') 3646 if (mode == 's')
3112 { 3647 {
3113 SavedModes |= (PrivateModes & bit); 3648 if (priv_modes & bit)
3649 SavedModes |= bit;
3650 else
3651 SavedModes &= ~bit;
3114 return -1; 3652 return -1;
3115 } 3653 }
3116 else 3654 else
3117 { 3655 {
3118 if (mode == 'r') 3656 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3657 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3658 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3659 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3660
3661 if (state)
3662 priv_modes |= bit;
3663 else
3664 priv_modes &= ~bit;
3123 } 3665 }
3124 3666
3125 return state; 3667 return state;
3126} 3668}
3127 3669
3128/* we're not using priv _yet_ */ 3670/* we're not using priv _yet_ */
3129void 3671void
3130rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3672rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3131{ 3673{
3132 unsigned int i, j; 3674 unsigned int i, j;
3133 int state; 3675 int state;
3134 3676
3135 static const struct 3677 static const struct
3136 { 3678 {
3137 const int argval; 3679 const int argval;
3138 const unsigned long bit; 3680 const unsigned long bit;
3139 }
3140
3141 argtopriv[] = { 3681 } argtopriv[] = {
3142 { 1, PrivMode_aplCUR }, 3682 { 1, PrivMode_aplCUR }, // DECCKM
3143 { 2, PrivMode_vt52 }, 3683 { 2, PrivMode_vt52 }, // DECANM
3144 { 3, PrivMode_132 }, 3684 { 3, PrivMode_132 }, // DECCOLM
3145 { 4, PrivMode_smoothScroll }, 3685 { 4, PrivMode_smoothScroll }, // DECSCLM
3146 { 5, PrivMode_rVideo }, 3686 { 5, PrivMode_rVideo }, // DECSCNM
3147 { 6, PrivMode_relOrigin }, 3687 { 6, PrivMode_relOrigin }, // DECOM
3148 { 7, PrivMode_Autowrap }, 3688 { 7, PrivMode_Autowrap }, // DECAWM
3689 // 8, auto-repeat keys // DECARM
3149 { 9, PrivMode_MouseX10 }, 3690 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3691 { 12, PrivMode_BlinkingCursor },
3151 { menuBar_esc, PrivMode_menuBar }, 3692 // 18 end FF to printer after print screen
3152#endif 3693 // 19 Print screen prints full screen/scroll region
3694 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3153#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3696 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3697#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3698 { 35, PrivMode_ShiftKeys }, // rxvt extension
3699 // 38, tektronix mode // DECTEK
3160 { 40, PrivMode_132OK }, 3700 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3701 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3702 // 45 margin bell NYI
3163 // 46 start logging 3703 // 46 start logging
3164 { 47, PrivMode_Screen }, 3704 { 47, PrivMode_Screen },
3165 { 66, PrivMode_aplKP }, 3705 { 66, PrivMode_aplKP }, // DECNKM
3166#ifndef NO_BACKSPACE_KEY 3706#ifndef NO_BACKSPACE_KEY
3167 { 67, PrivMode_BackSpace }, 3707 { 67, PrivMode_BackSpace }, // DECBKM
3168#endif 3708#endif
3169 { 1000, PrivMode_MouseX11 }, 3709 { 1000, PrivMode_MouseX11 },
3170 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3710 { 1002, PrivMode_MouseBtnEvent },
3171 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3711 { 1003, PrivMode_MouseAnyEvent },
3172 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3712#if ENABLE_FRILLS
3713 { 1005, PrivMode_ExtModeMouse },
3714#endif
3173 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3715 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3174 { 1011, PrivMode_Keypress }, // rxvt extension 3716 { 1011, PrivMode_Keypress }, // rxvt extension
3717#if ENABLE_FRILLS
3718 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3719#endif
3175 // 1035 enable modifiers for alt, numlock NYI 3720 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3721 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3722 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3723 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3724 // 1048 save and restore cursor, implemented in code
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3725 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3726 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3727 { 2004, PrivMode_BracketPaste },
3182 }; 3728 };
3183 3729
3184 if (nargs == 0) 3730 if (nargs == 0)
3185 return; 3731 return;
3186 3732
… …
3193 for (i = 0; i < nargs; i++) 3739 for (i = 0; i < nargs; i++)
3194 { 3740 {
3195 state = -1; 3741 state = -1;
3196 3742
3197 /* basic handling */ 3743 /* basic handling */
3198 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3744 for (j = 0; j < ecb_array_length (argtopriv); j++)
3199 if (argtopriv[j].argval == arg[i]) 3745 if (argtopriv[j].argval == arg[i])
3200 { 3746 {
3201 state = privcases (mode, argtopriv[j].bit); 3747 state = privcases (mode, argtopriv[j].bit);
3202 break; 3748 break;
3203 } 3749 }
3204 3750
3205 /* extra handling for values with state unkept */ 3751 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3752 switch (arg[i])
3207 { 3753 {
3754#if ENABLE_STYLES
3755 case 1021:
3756 set_option (Opt_intensityStyles, mode);
3757
3758 scr_touch (true);
3759 break;
3760#endif
3208 case 1048: /* alternative cursor save */ 3761 case 1048: /* alternative cursor save */
3209 case 1049: 3762 if (option (Opt_secondaryScreen))
3210 if (mode == 0) 3763 if (mode == 0)
3211 scr_cursor (RESTORE); 3764 scr_cursor (RESTORE);
3212 else if (mode == 1) 3765 else if (mode == 1)
3213 scr_cursor (SAVE); 3766 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3767 break;
3215 } 3768 }
3216 3769
3217 if (state >= 0) 3770 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3771 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3772 switch (arg[i])
… …
3222 case 2: /* VT52 mode */ 3775 case 2: /* VT52 mode */
3223 /* oddball mode. should be set regardless of set/reset 3776 /* oddball mode. should be set regardless of set/reset
3224 * parameter. Return from VT52 mode with an ESC < from 3777 * parameter. Return from VT52 mode with an ESC < from
3225 * within VT52 mode 3778 * within VT52 mode
3226 */ 3779 */
3227 PrivMode (1, PrivMode_vt52); 3780 priv_modes |= PrivMode_vt52;
3228 break; 3781 break;
3229 case 3: /* 80/132 */ 3782 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 3783 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3784 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3232 break; 3785 break;
3233 case 4: /* smooth scrolling */ 3786 case 4: /* smooth scrolling */
3234 if (state) 3787 set_option (Opt_jumpScroll, !state);
3235 Options &= ~Opt_jumpScroll;
3236 else
3237 Options |= Opt_jumpScroll;
3238 break; 3788 break;
3239 case 5: /* reverse video */ 3789 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 3790 scr_rvideo_mode (state);
3241 break; 3791 break;
3242 case 6: /* relative/absolute origins */ 3792 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 3793 scr_relative_origin (state);
3244 break; 3794 break;
3245 case 7: /* autowrap */ 3795 case 7: /* autowrap */
3246 scr_autowrap (state); 3796 scr_autowrap (state);
3247 break; 3797 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 3798 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 3799 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 3800 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 3801 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3252 break; 3802 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 3803#ifdef scrollBar_esc
3261 case scrollBar_esc: 3804 case scrollBar_esc:
3262 if (scrollbar_mapping (state)) 3805 scrollBar.map (state);
3263 {
3264 resize_all_windows (0, 0, 0); 3806 resize_all_windows (0, 0, 0);
3265 scr_touch (true); 3807 scr_touch (true);
3266 } 3808 break;
3809#endif
3810#ifdef CURSOR_BLINK
3811 case 12:
3812 cursor_blink_reset ();
3267 break; 3813 break;
3268#endif 3814#endif
3269 case 25: /* visible/invisible cursor */ 3815 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 3816 scr_cursor_visible (state);
3271 break; 3817 break;
3272 /* case 35: - shift keys */ 3818 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 3819 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 3820 case 47: /* secondary screen */
3275 scr_change_screen (state); 3821 scr_change_screen (state);
3276 break; 3822 break;
3277 /* case 66: - application key pad */ 3823 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 3824 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 3825 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 3826 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 3827 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3282 break; 3828 break;
3283#if 0
3284 case 1001: 3829 case 1002:
3285 break; /* X11 mouse highlighting */ 3830 case 1003:
3286#endif 3831 if (state)
3832 {
3833 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3834 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3835 mouse_row = mouse_col = 0;
3836 vt_emask_mouse = PointerMotionMask;
3837 }
3838 else
3839 vt_emask_mouse = NoEventMask;
3840
3841 vt_select_input ();
3842 break;
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 3843 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state)
3289 Options &= ~Opt_scrollTtyOutput;
3290 else
3291 Options |= Opt_scrollTtyOutput; 3844 set_option (Opt_scrollTtyOutput, !state);
3292 break; 3845 break;
3293 case 1011: /* scroll to bottom on key press */ 3846 case 1011: /* scroll to bottom on key press */
3294 if (state)
3295 Options |= Opt_scrollTtyKeypress; 3847 set_option (Opt_scrollTtyKeypress, state);
3296 else
3297 Options &= ~Opt_scrollTtyKeypress;
3298 break; 3848 break;
3299 case 1047: /* secondary screen w/ clearing */ 3849 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3850 if (option (Opt_secondaryScreen))
3301 if (current_screen != PRIMARY) 3851 if (!state)
3302 scr_erase_screen (2); 3852 scr_erase_screen (2);
3303 3853
3304 scr_change_screen (state); 3854 scr_change_screen (state);
3305 /* FALLTHROUGH */ 3855 break;
3856 case 1049: /* secondary screen w/ clearing first */
3857 if (option (Opt_secondaryScreen))
3858 if (state)
3859 scr_cursor (SAVE);
3860
3861 scr_change_screen (state);
3862
3863 if (option (Opt_secondaryScreen))
3864 if (state)
3865 scr_erase_screen (2);
3866 else
3867 scr_cursor (RESTORE);
3868 break;
3306 default: 3869 default:
3307 break; 3870 break;
3308 } 3871 }
3309 } 3872 }
3310} 3873}
3311/*}}} */ 3874/*}}} */
3312 3875
3313/*{{{ process sgr sequences */ 3876/*{{{ process sgr sequences */
3314void 3877void ecb_hot
3315rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3878rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3316{ 3879{
3317 unsigned int i; 3880 unsigned int i;
3318 short rendset; 3881 short rendset;
3319 int rendstyle; 3882 int rendstyle;
… …
3333 rendset = 0, rendstyle = ~RS_None; 3896 rendset = 0, rendstyle = ~RS_None;
3334 break; 3897 break;
3335 case 1: 3898 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 3899 rendset = 1, rendstyle = RS_Bold;
3337 break; 3900 break;
3901 //case 2: // low intensity
3902 case 3:
3903 rendset = 1, rendstyle = RS_Italic;
3904 break;
3338 case 4: 3905 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 3906 rendset = 1, rendstyle = RS_Uline;
3340 break; 3907 break;
3341 case 5: 3908 case 5: // slowly blinking
3909 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 3910 rendset = 1, rendstyle = RS_Blink;
3343 break; 3911 break;
3912 //case 6: // scoansi light background
3344 case 7: 3913 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 3914 rendset = 1, rendstyle = RS_RVid;
3346 break; 3915 break;
3347 case 8: 3916 case 8:
3348 // invisible. NYI 3917 // invisible. NYI
3349 break; 3918 break;
3350 case 22: 3919 //case 9: // crossed out
3920 //case 10: // scoansi acs off, primary font
3921 //case 11: // scoansi acs on, first alt font
3922 //case 12: // scoansi acs on, |0x80, second alt font
3923 //...
3924 //case 19: // ninth alt font
3925 //case 20: // gothic
3926 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 3927 rendset = 0, rendstyle = RS_Bold;
3352 break; 3928 break;
3353 case 24: 3929 case 22: // bold off (vt220)
3930 rendset = 0, rendstyle = RS_Bold;
3931 break;
3932 case 23: // disable italic
3933 rendset = 0, rendstyle = RS_Italic;
3934 break;
3935 case 24: // underline off (vt220)
3354 rendset = 0, rendstyle = RS_Uline; 3936 rendset = 0, rendstyle = RS_Uline;
3355 break; 3937 break;
3356 case 25: 3938 case 25: // blink off (vt220)
3357 rendset = 0, rendstyle = RS_Blink; 3939 rendset = 0, rendstyle = RS_Blink;
3358 break; 3940 break;
3359 case 27: 3941 case 26: // variable spacing (iso 8613)
3942 rendset = 0, rendstyle = RS_Blink;
3943 break;
3944 case 27: // reverse off (vt220)
3360 rendset = 0, rendstyle = RS_RVid; 3945 rendset = 0, rendstyle = RS_RVid;
3361 break; 3946 break;
3362 case 28:
3363 // visible. NYI 3947 //case 28: // visible. NYI
3364 break; 3948 //case 29: // not crossed-out
3365 } 3949 }
3366 3950
3367 if (rendset != -1) 3951 if (rendset != -1)
3368 { 3952 {
3369 scr_rendition (rendset, rendstyle); 3953 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 3964 case 35:
3381 case 36: 3965 case 36:
3382 case 37: 3966 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3967 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 3968 break;
3385#ifdef TTY_256COLOR 3969 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 3970 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 3971 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3972 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 3973 i += 2;
3391 } 3974 }
3392 break; 3975 break;
3393#endif
3394 case 39: /* default fg */ 3976 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 3977 scr_color (Color_fg, Color_fg);
3396 break; 3978 break;
3397 3979
3398 case 40: 3980 case 40:
… …
3403 case 45: 3985 case 45:
3404 case 46: 3986 case 46:
3405 case 47: 3987 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3988 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 3989 break;
3408#ifdef TTY_256COLOR 3990 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 3991 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 3992 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3993 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 3994 i += 2;
3414 } 3995 }
3415 break; 3996 break;
3416#endif
3417 case 49: /* default bg */ 3997 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 3998 scr_color (Color_bg, Color_bg);
3419 break; 3999 break;
3420 4000
3421#ifndef NO_BRIGHTCOLOR 4001 //case 50: // not variable spacing
4002
4003#if !ENABLE_MINIMAL
3422 case 90: 4004 case 90:
3423 case 91: /* set bright fg color */ 4005 case 91: /* set bright fg color */
3424 case 92: 4006 case 92:
3425 case 93: 4007 case 93:
3426 case 94: 4008 case 94:
3427 case 95: 4009 case 95:
3428 case 96: 4010 case 96:
3429 case 97: 4011 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4012 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4013 break;
3433 case 100: 4014 case 100:
3434 case 101: /* set bright bg color */ 4015 case 101: /* set bright bg color */
3435 case 102: 4016 case 102:
3436 case 103: 4017 case 103:
3437 case 104: 4018 case 104:
3438 case 105: 4019 case 105:
3439 case 106: 4020 case 106:
3440 case 107: 4021 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4022 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4023 break;
3444#endif 4024#endif
3445
3446 } 4025 }
3447 } 4026 }
4027}
4028
4029void
4030rxvt_term::set_cursor_style (int style)
4031{
4032 if (!IN_RANGE_INC (style, 0, 6))
4033 return;
4034
4035 if (style == 0)
4036 style = 1;
4037
4038 cursor_type = (style - 1) / 2;
4039 set_option (Opt_cursorUnderline, cursor_type == 1);
4040
4041#ifdef CURSOR_BLINK
4042 set_option (Opt_cursorBlink, style & 1);
4043 cursor_blink_reset ();
4044#endif
4045
4046 want_refresh = 1;
3448} 4047}
3449/*}}} */ 4048/*}}} */
3450 4049
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/* ------------------------------------------------------------------------- */ 4050/* ---------------------------------------------------------------------- */
4051/* Write data to the pty as typed by the user, pasted with the mouse,
4052 * or generated by us in response to a query ESC sequence.
4053 */
3470 4054
3471/* 4055/*
3472 * Send printf () formatted output to the command. 4056 * Send printf () formatted output to the command.
3473 * Only use for small amounts of data. 4057 * Only use for small amounts of data.
3474 */ 4058 */
3475void 4059void
3476rxvt_term::tt_printf (const char *fmt,...) 4060rxvt_term::tt_printf (const char *fmt,...)
3477{ 4061{
3478 va_list arg_ptr; 4062 va_list arg_ptr;
3479 unsigned char buf[256]; 4063 char buf[256];
3480 4064
3481 va_start (arg_ptr, fmt); 4065 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4066 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4067 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4068 tt_write (buf, strlen (buf));
3485} 4069}
3486 4070
3487/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4071/* Write data to the pty as typed by the user. */
3489 * or generated by us in response to a query ESC sequence.
3490 */
3491void 4072void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4073rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3493{ 4074{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4075 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4076 return;
3495 4077
3496 if (len) 4078 if (option (Opt_scrollTtyKeypress))
4079 if (view_start)
3497 { 4080 {
4081 view_start = 0;
4082 want_refresh = 1;
4083 }
4084
4085 tt_write_ (data, len);
4086}
4087
4088void
4089rxvt_term::tt_write (const char *data, unsigned int len)
4090{
4091 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4092 return;
4093
4094 tt_write_ (data, len);
4095}
4096
4097static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4098
4099void
4100rxvt_term::tt_write_ (const char *data, unsigned int len)
4101{
4102 if (pty->pty < 0)
4103 return;
4104
4105 if (v_buflen == 0)
4106 {
4107 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4108
4109 max_it (written, 0);
4110
4111 if (written == len)
4112 return;
4113
4114 data += written;
4115 len -= written;
4116 }
4117
4118 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4119
4120 memcpy (v_buffer + v_buflen, data, len);
4121 v_buflen += len;
4122
4123 pty_ev.set (ev::READ | ev::WRITE);
4124}
4125
4126void rxvt_term::pty_write ()
4127{
4128 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4129
4130 if (written > 0)
4131 {
4132 v_buflen -= written;
4133
3498 if (v_buflen == 0) 4134 if (v_buflen == 0)
3499 { 4135 {
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); 4136 free (v_buffer);
3527 v_buffer = 0; 4137 v_buffer = 0;
3528 v_buflen = 0;
3529 4138
3530 pty_ev.set (EVENT_READ); 4139 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; 4140 return;
3543 } 4141 }
4142
4143 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4144 }
4145 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4146 pty_ev.set (ev::READ);
3545} 4147}
3546 4148
3547/*----------------------- end-of-file (C source) -----------------------*/ 4149/*----------------------- end-of-file (C source) -----------------------*/
3548 4150

Diff Legend

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