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

Diff Legend

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