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

Diff Legend

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