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

Diff Legend

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