ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.276 by root, Fri Jan 20 11:02:46 2006 UTC vs.
Revision 1.594 by root, Sat Jul 3 04:04:12 2021 UTC

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

Diff Legend

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