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

Diff Legend

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