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

Diff Legend

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