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.551 by sf-exg, Wed Jul 16 14:29:23 2014 UTC

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

Diff Legend

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