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

Diff Legend

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