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

Diff Legend

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