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

Diff Legend

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