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.278 by root, Fri Jan 20 18:50:49 2006 UTC vs.
Revision 1.602 by sf-exg, Sat May 6 08:01:35 2023 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <signal.h>
60
61#if LINUX_YIELD_HACK
62# include <time.h>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
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 ();
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 = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1222 y = ev.y; 1287 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 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 if (button_number > 10)
1301 return;
1302 else if (button_number >= 7)
1303 button_number += 128 - 7;
1231 if (button_number >= 3) 1304 else if (button_number >= 3)
1232 button_number += (64 - 3); 1305 button_number += 64 - 3;
1233 }
1234 1306
1235 if (priv_modes & PrivMode_MouseX10) 1307 if (priv_modes & PrivMode_MouseX10)
1236 { 1308 {
1237 /* 1309 /*
1238 * do not report ButtonRelease 1310 * do not report ButtonRelease
1239 * no state info allowed 1311 * no state info allowed
1240 */ 1312 */
1241 key_state = 0; 1313 if (release)
1242 if (button_number == 3)
1243 return; 1314 return;
1244 } 1315 }
1245 else 1316 else
1246 { 1317 {
1247 /* XTerm mouse reporting needs these values: 1318 /* XTerm mouse reporting needs these values:
… …
1249 * 8 = Meta 1320 * 8 = Meta
1250 * 16 = Control 1321 * 16 = Control
1251 * plus will add in our own Double-Click reporting 1322 * plus will add in our own Double-Click reporting
1252 * 32 = Double Click 1323 * 32 = Double Click
1253 */ 1324 */
1254 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1325 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1255 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1326 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1256 + ((MEvent.state & ControlMask) ? 16 : 0); 1327 + ((MEvent.state & ControlMask) ? 16 : 0);
1257#ifdef MOUSE_REPORT_DOUBLECLICK 1328#ifdef MOUSE_REPORT_DOUBLECLICK
1258 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1329 state += ((MEvent.clicks > 1) ? 32 : 0);
1259#endif 1330#endif
1260 } 1331 }
1332
1333 int code = 32 + (release ? 3 : button_number) + state;
1261 1334
1262#if DEBUG_MOUSEREPORT 1335#if DEBUG_MOUSEREPORT
1263 fprintf (stderr, "Mouse ["); 1336 fprintf (stderr, "Mouse [");
1264 if (key_state & 16) 1337 if (state & 16)
1265 fputc ('C', stderr); 1338 fputc ('C', stderr);
1266 if (key_state & 4) 1339 if (state & 4)
1267 fputc ('S', stderr); 1340 fputc ('S', stderr);
1268 if (key_state & 8) 1341 if (state & 8)
1269 fputc ('A', stderr); 1342 fputc ('A', stderr);
1270 if (key_state & 32) 1343 if (state & 32)
1271 fputc ('2', stderr); 1344 fputc ('2', stderr);
1272 fprintf (stderr, "]: <%d>, %d/%d\n", 1345 fprintf (stderr, "]: <%d>, %d/%d\n",
1273 button_number, 1346 button_number,
1274 x + 1, 1347 x,
1275 y + 1); 1348 y);
1276#endif 1349#endif
1277 1350
1351#if ENABLE_FRILLS
1352 if (priv_modes & PrivMode_ExtMouseSGR)
1353 tt_printf ("\033[<%d;%d;%d%c",
1354 button_number + state,
1355 x,
1356 y,
1357 release ? 'm' : 'M');
1358 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1359 tt_printf ("\033[%d;%d;%dM",
1360 code,
1361 x,
1362 y);
1363 else if (priv_modes & PrivMode_ExtMouseUTF8)
1364 if (code < 128)
1365 tt_printf ("\033[M%c%lc%lc",
1366 code,
1367 wint_t (32 + x),
1368 wint_t (32 + y));
1369 else
1370 tt_printf ("\033[M%c%c%lc%lc",
1371 0xc0 + (code >> 6),
1372 0x80 + (code & 0x3f),
1373 wint_t (32 + x),
1374 wint_t (32 + y));
1375 else
1376#endif
1278 tt_printf ("\033[M%c%c%c", 1377 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1378 code,
1280 (32 + x + 1), 1379 32 + x,
1281 (32 + y + 1)); 1380 32 + y);
1282} 1381}
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 1382
1294/*{{{ process an X event */ 1383/*{{{ process an X event */
1295void 1384void ecb_hot
1296rxvt_term::x_cb (XEvent &ev) 1385rxvt_term::x_cb (XEvent &ev)
1297{ 1386{
1298 make_current (); 1387 make_current ();
1299 1388
1300 dDisp; 1389 dLocal (Display *, dpy);
1301 1390
1302 if (ev.xany.window == vt 1391 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1392 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1393 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1394 return;
… …
1310 unsigned int unused_mask; 1399 unsigned int unused_mask;
1311 1400
1312 switch (ev.type) 1401 switch (ev.type)
1313 { 1402 {
1314 case KeyPress: 1403 case KeyPress:
1315#if ISO_14755 1404 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1405 break;
1321 1406
1322 case KeyRelease: 1407 case KeyRelease:
1323 { 1408 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; 1409 break;
1395 }
1396 1410
1397 case ButtonPress: 1411 case ButtonPress:
1398 button_press (ev.xbutton); 1412 button_press (ev.xbutton);
1399 break; 1413 break;
1400 1414
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1429 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1430 destroy ();
1417 } 1431 }
1418#if ENABLE_EWMH 1432#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1433 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1434 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1435 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1436 &ev);
1423#endif 1437#endif
1424 } 1438 }
1425 } 1439 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1445 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1446 focus_out ();
1433 } 1447 }
1434#endif 1448#endif
1435 } 1449 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1450 break;
1441 1451
1442 /* 1452 /*
1443 * XXX: this is not the _current_ arrangement 1453 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1454 * Here's my conclusion:
… …
1463 break; 1473 break;
1464 } 1474 }
1465 break; 1475 break;
1466 1476
1467 case FocusIn: 1477 case FocusIn:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1481 focus_in ();
1469 break; 1482 break;
1470 1483
1471 case FocusOut: 1484 case FocusOut:
1485 if (ev.xfocus.detail != NotifyInferior
1486 && ev.xfocus.detail != NotifyPointer
1487 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1488 focus_out ();
1473 break; 1489 break;
1474 1490
1475 case ConfigureNotify: 1491 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0]) 1492 if (ev.xconfigure.window == parent)
1477 { 1493 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1494 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1495 ;
1496
1497 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1498
1499 if (want_position_change)
1500 {
1501 int x, y;
1502
1503 if (ev.xconfigure.send_event)
1504 {
1505 x = ev.xconfigure.x;
1506 y = ev.xconfigure.y;
1507 }
1508 else
1509 get_window_origin (x, y);
1510
1511 if (x != parent_x || y != parent_y)
1512 {
1513 parent_x = x;
1514 parent_y = y;
1515 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1516 }
1517 }
1480 1518
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1519 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1520 {
1483 seen_resize = 1; 1521 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1522 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1523 }
1486 1524
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1525 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1490 if (OPTION (Opt_transparent))
1491 check_our_parents ();
1492#endif
1493 } 1526 }
1494 break; 1527 break;
1495 1528
1496 case PropertyNotify: 1529 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1530 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1499 && ev.xproperty.state == PropertyNewValue)
1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1501
1502 break; 1531 break;
1503 1532
1504 case SelectionClear: 1533 case SelectionClear:
1505 selection_clear (); 1534 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1506 break;
1507
1508 case SelectionNotify:
1509 if (selection_wait == Sel_normal)
1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1511 break; 1535 break;
1512 1536
1513 case SelectionRequest: 1537 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1515 break; 1539 break;
1516 1540
1517 case MapNotify: 1541 case MapNotify:
1518 mapped = 1; 1542 mapped = 1;
1519#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1544 text_blink_ev.start ();
1521#endif 1545#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break; 1547 break;
1524 1548
1525 case UnmapNotify: 1549 case UnmapNotify:
… …
1527#ifdef TEXT_BLINK 1551#ifdef TEXT_BLINK
1528 text_blink_ev.stop (); 1552 text_blink_ev.stop ();
1529#endif 1553#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1554 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1555 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1556
1539 case GraphicsExpose: 1557 case GraphicsExpose:
1540 case Expose: 1558 case Expose:
1541 if (ev.xany.window == vt) 1559 if (ev.xany.window == vt)
1542 { 1560 {
1543 do 1561 do
1562 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, false);
1565 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1567
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1568 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1569
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1570 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1571 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1572 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1573 ev.xexpose.width, ev.xexpose.height, false);
1574 }
1553 1575
1554 want_refresh = 1; 1576 want_refresh = 1;
1555 } 1577 }
1556 else 1578 else
1557 { 1579 {
1558 XEvent unused_event; 1580 XEvent unused_event;
1559 1581
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1582 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1583 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1584 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1585 ;
1564 1586
1565 if (isScrollbarWindow (ev.xany.window)) 1587 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1588 {
1567 scrollBar.setIdle (); 1589 scrollBar.state = SB_STATE_IDLE;
1568 scrollbar_show (0); 1590 scrollBar.show (0);
1569 } 1591 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1592 }
1576 break; 1593 break;
1577 1594
1578 case MotionNotify: 1595 case MotionNotify:
1579#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1597 if (hidden_pointer)
1581 pointer_unblank (); 1598 pointer_unblank ();
1582#endif 1599#endif
1600 if (!bypass_keystate
1601 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1602 || priv_modes & PrivMode_MouseAnyEvent))
1603 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1604 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1605 break;
1585 1606
1586 if (ev.xany.window == vt) 1607 if (ev.xany.window == vt)
1587 { 1608 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1609 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1610 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1611 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1612 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1613 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1614 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1615 ;
1595 1616
1596 XQueryPointer (disp, vt, 1617 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1618 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1619 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1620 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1621 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1622#ifdef MOUSE_THRESHOLD
1602 /* deal with a `jumpy' mouse */ 1623 /* deal with a `jumpy' mouse */
1603 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1624 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1625#endif
1604 { 1626 {
1605#endif
1606#if ISO_14755 1627#if ISO_14755
1607 // 5.4 1628 // 5.4
1608 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1629 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1609 { 1630 {
1610 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1631 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1616 1637
1617#ifdef SELECTION_SCROLLING 1638#ifdef SELECTION_SCROLLING
1618 if (ev.xbutton.y < int_bwidth 1639 if (ev.xbutton.y < int_bwidth
1619 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1640 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1620 { 1641 {
1642 page_dirn scroll_selection_dir;
1621 int dist; 1643 int dist;
1622 1644
1623 /* don't clobber the current delay if we are 1645 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1646 * already in the middle of scrolling.
1625 */ 1647 */
1626 if (!sel_scroll_ev.active) 1648 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1649 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1650
1629 /* save the event params so we can highlight 1651 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1652 * the selection in the pending-scroll loop
1631 */ 1653 */
1632 selection_save_x = ev.xbutton.x; 1654 selection_save_x = ev.xbutton.x;
… …
1640 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1641 } 1663 }
1642 else 1664 else
1643 { 1665 {
1644 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1645 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1646 } 1668 }
1647 1669
1648 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1649 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1650 + 1; 1672 + 1;
1651 min_it (scroll_selection_lines, 1673 min_it (scroll_selection_lines,
1652 SELECTION_SCROLL_MAX_LINES); 1674 SELECTION_SCROLL_MAX_LINES);
1675 scroll_selection_lines *= scroll_selection_dir;
1653 } 1676 }
1654 else 1677 else
1655 { 1678 {
1656 /* we are within the text window, so we 1679 /* we are within the text window, so we
1657 * shouldn't be scrolling 1680 * shouldn't be scrolling
1658 */ 1681 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1661 } 1683 }
1662#endif 1684#endif
1663#ifdef MOUSE_THRESHOLD
1664 } 1685 }
1665#endif
1666 } 1686 }
1667 } 1687 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1688 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1689 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1690 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1691 MotionNotify, &ev))
1672 ; 1692 ;
1673 1693
1674 XQueryPointer (disp, scrollBar.win, 1694 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1695 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1696 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1697 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1698 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1699 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1700 scrollBar.size ());
1681 want_refresh = 1; 1701 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1702 scrollBar.show (1);
1684 } 1703 }
1685 break; 1704 break;
1686 } 1705 }
1687 1706
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1707#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1708 if (ev.type == KeyPress)
1692 { 1709 cursor_blink_reset ();
1693 if (hidden_cursor)
1694 {
1695 hidden_cursor = 0;
1696 want_refresh = 1;
1697 }
1698
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700 }
1701#endif 1710#endif
1702 1711
1703#if defined(POINTER_BLANK) 1712#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1714 {
1706 if (ev.type == MotionNotify 1715 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1716 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1717 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1718 if (hidden_pointer)
… …
1711 1720
1712 if (ev.type == KeyPress && hidden_pointer == 0) 1721 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank (); 1722 pointer_blank ();
1714 } 1723 }
1715#endif 1724#endif
1716}
1717 1725
1718void 1726 refresh_check ();
1727}
1728
1729#if ENABLE_FRILLS
1730void ecb_cold
1731rxvt_term::set_urgency (bool enable)
1732{
1733 if (enable == urgency_hint)
1734 return;
1735
1736 if (XWMHints *h = XGetWMHints (dpy, parent))
1737 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent, h);
1740 urgency_hint = enable;
1741 XFree (h);
1742 }
1743}
1744#endif
1745
1746void ecb_cold
1719rxvt_term::focus_in () 1747rxvt_term::focus_in ()
1720{ 1748{
1721 if (!focus) 1749 if (!focus)
1722 { 1750 {
1723 focus = 1; 1751 focus = 1;
1724 want_refresh = 1; 1752 want_refresh = 1;
1725 1753
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1727
1728#if USE_XIM 1754#if USE_XIM
1729 if (Input_Context != NULL) 1755 if (Input_Context != NULL)
1730 { 1756 {
1731 IMSetStatusPosition (); 1757 im_set_position ();
1732 XSetICFocus (Input_Context); 1758 XSetICFocus (Input_Context);
1733 } 1759 }
1734#endif 1760#endif
1735#if CURSOR_BLINK 1761#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1762 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1763 cursor_blink_ev.again ();
1738#endif 1764#endif
1739#if OFF_FOCUS_FADING 1765#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1766 if (rs[Rs_fade])
1741 { 1767 {
1742 pix_colors = pix_colors_focused; 1768 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1769 scr_recolor ();
1744 } 1770 }
1745#endif 1771#endif
1746 } 1772#if ENABLE_FRILLS
1747} 1773 if (option (Opt_urgentOnBell))
1774 set_urgency (0);
1748 1775
1749void 1776 if (priv_modes & PrivMode_FocusEvent)
1777 tt_printf ("\x1b[I");
1778#endif
1779
1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1781 }
1782}
1783
1784void ecb_cold
1750rxvt_term::focus_out () 1785rxvt_term::focus_out ()
1751{ 1786{
1752 if (focus) 1787 if (focus)
1753 { 1788 {
1754 focus = 0; 1789 focus = 0;
1755 want_refresh = 1; 1790 want_refresh = 1;
1756 1791
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1792#if ENABLE_FRILLS
1793 if (option (Opt_urgentOnBell))
1794 set_urgency (0);
1758 1795
1796 if (priv_modes & PrivMode_FocusEvent)
1797 tt_printf ("\x1b[O");
1798#endif
1759#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1800 if (iso14755buf)
1761 { 1801 {
1762 iso14755buf = 0; 1802 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1803# if ISO_14755
1764 scr_overlay_off (); 1804 scr_overlay_off ();
1765# endif 1805# endif
1766 } 1806 }
1767#endif 1807#endif
1768#if USE_XIM 1808#if USE_XIM
1769 if (Input_Context != NULL) 1809 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1810 XUnsetICFocus (Input_Context);
1771#endif 1811#endif
1772#if CURSOR_BLINK 1812#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1813 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1814 cursor_blink_ev.stop ();
1815
1775 hidden_cursor = 0; 1816 hidden_cursor = 0;
1776#endif 1817#endif
1777#if OFF_FOCUS_FADING 1818#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1819 if (rs[Rs_fade])
1779 { 1820 {
1780 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1781 scr_recolour (); 1822 scr_recolor ();
1782 } 1823 }
1783#endif 1824#endif
1825
1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1827 }
1828}
1829
1830void ecb_cold
1831rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1832{
1833#if OFF_FOCUS_FADING
1834 if (rs[Rs_fade])
1784 } 1835 {
1785} 1836 if (!first_time)
1837 pix_colors_focused [idx].free (this);
1786 1838
1787#if TRANSPARENT 1839 rgba c;
1788void 1840 pix_colors [Color_fade].get (c);
1841 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1842 }
1843#endif
1844}
1845
1846#if ENABLE_PERL
1847void ecb_hot
1789rxvt_term::rootwin_cb (XEvent &ev) 1848rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1849{
1791 make_current (); 1850 make_current ();
1851
1852 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1853 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1854 return;
1792 1855
1793 switch (ev.type) 1856 switch (ev.type)
1794 { 1857 {
1795 case PropertyNotify: 1858 case PropertyNotify:
1796 /* 1859 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1860 * if user used some Esetroot compatible prog to set the root bg,
1798 * use the property to determine the pixmap. We use it later on. 1861 * use the property to determine the pixmap. We use it later on.
1799 */ 1862 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1863 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1864 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1865 {
1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1867 }
1803 1868
1804 /* FALLTHROUGH */
1805 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1869 break;
1809 } 1870 }
1871
1872 refresh_check ();
1810} 1873}
1811#endif 1874#endif
1812 1875
1813void 1876void
1814rxvt_term::button_press (XButtonEvent &ev) 1877rxvt_term::button_press (XButtonEvent &ev)
… …
1823 /* 1886 /*
1824 * VT window processing of button press 1887 * VT window processing of button press
1825 */ 1888 */
1826 if (ev.window == vt) 1889 if (ev.window == vt)
1827 { 1890 {
1891 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1892 return;
1893
1828#if ISO_14755 1894#if ISO_14755
1829 // 5.4 1895 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1896 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1897 {
1832 iso14755_54 (ev.x, ev.y); 1898 iso14755_54 (ev.x, ev.y);
1833 return; 1899 return;
1834 } 1900 }
1835#endif 1901#endif
1836 1902
1837 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1903 clickintime = ev.time - MEvent.time < multiClickTime;
1838 1904
1839 if (reportmode) 1905 if (reportmode)
1840 { 1906 {
1841 /* mouse report from vt window */ 1907 /* mouse report from vt window */
1842 /* save the xbutton state (for ButtonRelease) */ 1908 /* save the xbutton state (for ButtonRelease) */
1843 MEvent.state = ev.state; 1909 MEvent.state = ev.state;
1844#ifdef MOUSE_REPORT_DOUBLECLICK 1910#ifdef MOUSE_REPORT_DOUBLECLICK
1845 if (ev.button == MEvent.button && clickintime) 1911 if (ev.button == MEvent.button && clickintime)
1846 { 1912 {
1847 /* same button, within alloted time */ 1913 /* same button, within allowed time */
1848 MEvent.clicks++; 1914 MEvent.clicks++;
1849 1915
1850 if (MEvent.clicks > 1) 1916 if (MEvent.clicks > 1)
1851 { 1917 {
1852 /* only report double clicks */ 1918 /* only report double clicks */
… …
1866 mouse_report (ev); 1932 mouse_report (ev);
1867 } 1933 }
1868#else 1934#else
1869 MEvent.button = ev.button; 1935 MEvent.button = ev.button;
1870 mouse_report (ev); 1936 mouse_report (ev);
1871#endif /* MOUSE_REPORT_DOUBLECLICK */ 1937#endif /* MOUSE_REPORT_DOUBLECLICK */
1872 1938
1873 } 1939 }
1874 else 1940 else
1875 { 1941 {
1876 if (ev.button != MEvent.button) 1942 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1943 MEvent.clicks = 0;
1878 1944
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1945 switch (ev.button)
1881 { 1946 {
1882 case Button1: 1947 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1948 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1949 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1950#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1951 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1952#else
1888 selection.rect = false; 1953 selection.rect = false;
1889#endif 1954#endif
1890 1955
1891 /* allow shift+left click to extend selection */ 1956 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1957 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1958 {
1894 if (MEvent.button == Button1 && clickintime) 1959 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1960 selection_rotate (ev.x, ev.y);
1896 else 1961 else
1897 selection_extend (ev.x, ev.y, 1); 1962 selection_extend (ev.x, ev.y, 1);
1898 } 1963 }
1899 else 1964 else
1900 { 1965 {
1901 if (MEvent.button == Button1 && clickintime) 1966 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1967 MEvent.clicks++;
1903 else 1968 else
1904 MEvent.clicks = 1; 1969 MEvent.clicks = 1;
1905 1970
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1971 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1972 }
1908 1973
1909 MEvent.button = Button1; 1974 MEvent.button = Button1;
1910 break; 1975 break;
1911 1976
1912 case Button3: 1977 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 1978 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1979 selection_rotate (ev.x, ev.y);
1915 else 1980 else
1916 selection_extend (ev.x, ev.y, 1); 1981 selection_extend (ev.x, ev.y, 1);
1917 1982
1918 MEvent.button = Button3; 1983 MEvent.button = Button3;
1919 break; 1984 break;
1920 } 1985 }
1921 } 1986 }
1922 1987
1923 MEvent.time = ev.time; 1988 MEvent.time = ev.time;
1924 return; 1989 return;
1925 } 1990 }
1926 1991
1927 /* 1992 /*
1928 * Scrollbar window processing of button press 1993 * Scrollbar window processing of button press
1929 */ 1994 */
1930 if (isScrollbarWindow (ev.window)) 1995 if (scrollBar.state && ev.window == scrollBar.win)
1931 { 1996 {
1932 scrollBar.setIdle (); 1997 page_dirn direction = NO_DIR;
1998
1999 if (scrollBar.upButton (ev.y))
2000 direction = UP; /* up */
2001 else if (scrollBar.dnButton (ev.y))
2002 direction = DN; /* down */
2003
2004 scrollBar.state = SB_STATE_IDLE;
1933 /* 2005 /*
1934 * Rxvt-style scrollbar: 2006 * Rxvt-style scrollbar:
1935 * move up if mouse is above slider 2007 * move up if mouse is above slider
1936 * move dn if mouse is below slider 2008 * move dn if mouse is below slider
1937 * 2009 *
… …
1946 /* 2018 /*
1947 * Mouse report disabled scrollbar: 2019 * Mouse report disabled scrollbar:
1948 * arrow buttons - send up/down 2020 * arrow buttons - send up/down
1949 * click on scrollbar - send pageup/down 2021 * click on scrollbar - send pageup/down
1950 */ 2022 */
1951 if ((scrollBar.style == R_SB_NEXT 2023 if (direction == UP)
1952 && scrollbarnext_upButton (ev.y))
1953 || (scrollBar.style == R_SB_RXVT
1954 && scrollbarrxvt_upButton (ev.y)))
1955 tt_printf ("\033[A"); 2024 tt_printf ("\033[A");
1956 else if ((scrollBar.style == R_SB_NEXT 2025 else if (direction == DN)
1957 && scrollbarnext_dnButton (ev.y))
1958 || (scrollBar.style == R_SB_RXVT
1959 && scrollbarrxvt_dnButton (ev.y)))
1960 tt_printf ("\033[B"); 2026 tt_printf ("\033[B");
1961 else 2027 else
1962 switch (ev.button) 2028 switch (ev.button)
1963 { 2029 {
1964 case Button2: 2030 case Button2:
… …
1971 tt_printf ("\033[5~"); 2037 tt_printf ("\033[5~");
1972 break; 2038 break;
1973 } 2039 }
1974 } 2040 }
1975 else 2041 else
1976#endif /* NO_SCROLLBAR_REPORT */ 2042#endif /* NO_SCROLLBAR_REPORT */
1977
1978 {
1979 char upordown = 0;
1980
1981 if (scrollBar.style == R_SB_NEXT)
1982 { 2043 {
1983 if (scrollbarnext_upButton (ev.y)) 2044 if (direction != NO_DIR)
1984 upordown = -1; /* up */
1985 else if (scrollbarnext_dnButton (ev.y))
1986 upordown = 1; /* down */
1987 }
1988 else if (scrollBar.style == R_SB_RXVT)
1989 {
1990 if (scrollbarrxvt_upButton (ev.y))
1991 upordown = -1; /* up */
1992 else if (scrollbarrxvt_dnButton (ev.y))
1993 upordown = 1; /* down */
1994 }
1995 if (upordown)
1996 { 2045 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2047 if (!cont_scroll_ev.is_active ())
1998 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2048 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1999#endif 2049#endif
2000 if (scr_page (upordown < 0 ? UP : DN, 1)) 2050 if (scr_page (direction, 1))
2001 { 2051 {
2002 if (upordown < 0) 2052 if (direction == UP)
2003 scrollBar.setUp (); 2053 scrollBar.state = SB_STATE_UP;
2004 else 2054 else
2005 scrollBar.setDn (); 2055 scrollBar.state = SB_STATE_DOWN;
2006 } 2056 }
2007 } 2057 }
2008 else 2058 else
2009 switch (ev.button) 2059 switch (ev.button)
2010 { 2060 {
2011 case Button2: 2061 case Button2:
2012 switch (scrollbar_align) 2062 switch (scrollBar.align)
2013 { 2063 {
2014 case R_SB_ALIGN_TOP: 2064 case SB_ALIGN_TOP:
2015 csrO = 0; 2065 csrO = 0;
2016 break; 2066 break;
2017 case R_SB_ALIGN_CENTRE: 2067 case SB_ALIGN_CENTRE:
2018 csrO = (scrollBar.bot - scrollBar.top) / 2; 2068 csrO = (scrollBar.bot - scrollBar.top) / 2;
2019 break; 2069 break;
2020 case R_SB_ALIGN_BOTTOM: 2070 case SB_ALIGN_BOTTOM:
2021 csrO = scrollBar.bot - scrollBar.top; 2071 csrO = scrollBar.bot - scrollBar.top;
2022 break; 2072 break;
2023 } 2073 }
2024 2074
2025 if (scrollBar.style == R_SB_XTERM 2075 if (scrollBar.style == SB_STYLE_XTERM
2026 || scrollbar_above_slider (ev.y) 2076 || scrollBar.above_slider (ev.y)
2027 || scrollbar_below_slider (ev.y)) 2077 || scrollBar.below_slider (ev.y))
2028 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2078 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2029 2079
2030 scrollBar.setMotion (); 2080 scrollBar.state = SB_STATE_MOTION;
2031 break; 2081 break;
2032 2082
2033 case Button1: 2083 case Button1:
2034 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2084 if (scrollBar.align == SB_ALIGN_CENTRE)
2035 csrO = ev.y - scrollBar.top; 2085 csrO = ev.y - scrollBar.top;
2036 /* FALLTHROUGH */ 2086 /* FALLTHROUGH */
2037 2087
2038 case Button3: 2088 case Button3:
2039 if (scrollBar.style != R_SB_XTERM) 2089 if (scrollBar.style != SB_STYLE_XTERM)
2040 { 2090 {
2041 if (scrollbar_above_slider (ev.y)) 2091 if (scrollBar.above_slider (ev.y))
2042# ifdef RXVT_SCROLL_FULL 2092# ifdef RXVT_SCROLL_FULL
2043 scr_page (UP, nrow - 1); 2093 scr_page (UP, nrow - 1);
2044# else 2094# else
2045 scr_page (UP, nrow / 4); 2095 scr_page (UP, nrow / 4);
2046# endif 2096# endif
2047 else if (scrollbar_below_slider (ev.y)) 2097 else if (scrollBar.below_slider (ev.y))
2048# ifdef RXVT_SCROLL_FULL 2098# ifdef RXVT_SCROLL_FULL
2049 scr_page (DN, nrow - 1); 2099 scr_page (DN, nrow - 1);
2050# else 2100# else
2051 scr_page (DN, nrow / 4); 2101 scr_page (DN, nrow / 4);
2052# endif 2102# endif
2053 else 2103 else
2054 scrollBar.setMotion (); 2104 scrollBar.state = SB_STATE_MOTION;
2055 } 2105 }
2056 else 2106 else
2057 { 2107 {
2058 scr_page ((ev.button == Button1 ? DN : UP), 2108 scr_page ((ev.button == Button1 ? DN : UP),
2059 (nrow 2109 (nrow
2060 * scrollbar_position (ev.y) 2110 * scrollBar.position (ev.y)
2061 / scrollbar_size ())); 2111 / scrollBar.size ()));
2062 } 2112 }
2063 2113
2064 break; 2114 break;
2065 } 2115 }
2066 } 2116 }
… …
2076 2126
2077 csrO = 0; /* reset csr Offset */ 2127 csrO = 0; /* reset csr Offset */
2078 if (!bypass_keystate) 2128 if (!bypass_keystate)
2079 reportmode = !! (priv_modes & PrivMode_mouse_report); 2129 reportmode = !! (priv_modes & PrivMode_mouse_report);
2080 2130
2081 if (scrollbar_isUpDn ()) 2131 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2082 { 2132 {
2083 scrollBar.setIdle (); 2133 scrollBar.state = SB_STATE_IDLE;
2084 scrollbar_show (0); 2134 scrollBar.show (0);
2085 } 2135 }
2086 2136
2087#ifdef SELECTION_SCROLLING 2137#ifdef SELECTION_SCROLLING
2088 if (sel_scroll_ev.active)
2089 sel_scroll_ev.stop(); 2138 sel_scroll_ev.stop();
2090#endif 2139#endif
2091 2140
2092 if (ev.window == vt) 2141 if (ev.window == vt)
2093 { 2142 {
2143 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2144 return;
2145
2094#if ISO_14755 2146#if ISO_14755
2095 // 5.4 2147 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2148 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2149 return;
2098#endif 2150#endif
2151
2099 if (reportmode) 2152 if (reportmode)
2100 { 2153 {
2101 /* mouse report from vt window */ 2154 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2155 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2156 if (ev.button >= 4 && ev.button <= 7)
2104 return; 2157 return;
2105#ifdef MOUSE_REPORT_DOUBLECLICK 2158#ifdef MOUSE_REPORT_DOUBLECLICK
2106 /* only report the release of 'slow' single clicks */ 2159 /* only report the release of 'slow' single clicks */
2107 if (MEvent.button != AnyButton 2160 if (MEvent.button != AnyButton
2108 && (ev.button != MEvent.button 2161 && (ev.button != MEvent.button
2109 || (ev.time - MEvent.time 2162 || (ev.time - MEvent.time
2110 > MULTICLICK_TIME / 2))) 2163 > multiClickTime / 2)))
2111 { 2164 {
2112 MEvent.clicks = 0; 2165 MEvent.clicks = 0;
2113 MEvent.button = AnyButton; 2166 MEvent.button = ev.button;
2114 mouse_report (ev); 2167 mouse_report (ev);
2115 } 2168 }
2116#else /* MOUSE_REPORT_DOUBLECLICK */ 2169#else /* MOUSE_REPORT_DOUBLECLICK */
2117 MEvent.button = AnyButton; 2170 MEvent.button = ev.button;
2118 mouse_report (ev); 2171 mouse_report (ev);
2119#endif /* MOUSE_REPORT_DOUBLECLICK */ 2172#endif /* MOUSE_REPORT_DOUBLECLICK */
2120 return; 2173 return;
2121 } 2174 }
2122 2175
2123 /* 2176 /*
2124 * dumb hack to compensate for the failure of click-and-drag 2177 * dumb hack to compensate for the failure of click-and-drag
… …
2127 if (priv_modes & PrivMode_mouse_report 2180 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2181 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2182 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2183 selection_extend (ev.x, ev.y, 0);
2131 2184
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2185 switch (ev.button)
2136 { 2186 {
2137 case Button1: 2187 case Button1:
2138 case Button3: 2188 case Button3:
2139 selection_make (ev.time); 2189 selection_make (ev.time);
2140 break; 2190 break;
2141 2191
2142 case Button2: 2192 case Button2:
2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2193 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2194 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2145 break; 2195 break;
2146 2196
2147#ifdef MOUSE_WHEEL 2197#ifdef MOUSE_WHEEL
2148 case Button4: 2198 case Button4:
2149 case Button5: 2199 case Button5:
2150 { 2200 {
2151 int i; 2201 int lines;
2152 page_dirn v; 2202 page_dirn dirn;
2153 2203
2154 v = ev.button == Button4 ? UP : DN; 2204 dirn = ev.button == Button4 ? UP : DN;
2155 2205
2156 if (ev.state & ShiftMask) 2206 if (ev.state & ShiftMask)
2157 i = 1; 2207 lines = 1;
2158 else if (OPTION (Opt_mouseWheelScrollPage)) 2208 else if (option (Opt_mouseWheelScrollPage))
2159 i = nrow - 1; 2209 lines = nrow - 1;
2160 else 2210 else
2161 i = 5; 2211 lines = 5;
2162 2212
2163# ifdef MOUSE_SLIP_WHEELING 2213# ifdef MOUSE_SLIP_WHEELING
2164 if (ev.state & ControlMask) 2214 if (ev.state & ControlMask)
2165 { 2215 {
2166 mouse_slip_wheel_speed += v ? -1 : 1; 2216 mouse_slip_wheel_speed += dirn;
2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2217 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2169 2218
2170 if (slip_wheel_ev.at < NOW) 2219 if (!slip_wheel_ev.is_active ())
2171 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2172
2173 slip_wheel_ev.start ();
2174 } 2221 }
2175 else 2222 else
2223# endif
2176 { 2224 {
2177# endif
2178 scr_page (v, i); 2225 scr_page (dirn, lines);
2179 scrollbar_show (1); 2226 scrollBar.show (1);
2180# ifdef MOUSE_SLIP_WHEELING
2181 } 2227 }
2182# endif
2183 } 2228 }
2184 break; 2229 break;
2185#endif 2230#endif
2186 } 2231 }
2187 } 2232 }
2188} 2233}
2189 2234
2190#ifdef TRANSPARENT
2191#if TINTING
2192/* taken from aterm-0.4.2 */
2193
2194typedef uint32_t RUINT32T;
2195
2196void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2197{
2198 int sh_r, sh_g, sh_b;
2199 RUINT32T mask_r, mask_g, mask_b;
2200 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2201 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2202 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2203 int i;
2204
2205 Visual *visual = display->visual;
2206
2207 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2208
2209 /* for convenience */
2210 mask_r = visual->red_mask;
2211 mask_g = visual->green_mask;
2212 mask_b = visual->blue_mask;
2213
2214 /* boring lookup table pre-initialization */
2215 switch (srcImage->bits_per_pixel) {
2216 case 15:
2217 if ((mask_r != 0x7c00) ||
2218 (mask_g != 0x03e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+32;
2225 sh_r = 10;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 16:
2230 if ((mask_r != 0xf800) ||
2231 (mask_g != 0x07e0) ||
2232 (mask_b != 0x001f))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2235 lookup_r = lookup;
2236 lookup_g = lookup+32;
2237 lookup_b = lookup+32+64;
2238 sh_r = 11;
2239 sh_g = 5;
2240 sh_b = 0;
2241 break;
2242 case 24:
2243 if ((mask_r != 0xff0000) ||
2244 (mask_g != 0x00ff00) ||
2245 (mask_b != 0x0000ff))
2246 return;
2247 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2248 lookup_r = lookup;
2249 lookup_g = lookup+256;
2250 lookup_b = lookup+256+256;
2251 sh_r = 16;
2252 sh_g = 8;
2253 sh_b = 0;
2254 break;
2255 case 32:
2256 if ((mask_r != 0xff0000) ||
2257 (mask_g != 0x00ff00) ||
2258 (mask_b != 0x0000ff))
2259 return;
2260 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2261 lookup_r = lookup;
2262 lookup_g = lookup+256;
2263 lookup_b = lookup+256+256;
2264 sh_r = 16;
2265 sh_g = 8;
2266 sh_b = 0;
2267 break;
2268 default:
2269 return; /* we do not support this color depth */
2270 }
2271
2272 /* prepare limits for color transformation (each channel is handled separately) */
2273 if (shade < 0) {
2274 shade = -shade;
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = 65535-rm;
2279 lower_lim_g = 65535-gm;
2280 lower_lim_b = 65535-bm;
2281
2282 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2283 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2284 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2285
2286 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2287 } else {
2288 if (shade < 0) shade = 0;
2289 if (shade > 100) shade = 100;
2290
2291 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2292
2293 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2294 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2295 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2296 }
2297
2298 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2299 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2300 {
2301 unsigned int tmp;
2302
2303 tmp = lower_lim_r;
2304 lower_lim_r = lower_lim_b;
2305 lower_lim_b = tmp;
2306
2307 tmp = upper_lim_r;
2308 upper_lim_r = upper_lim_b;
2309 upper_lim_b = tmp;
2310 }
2311
2312 /* fill our lookup tables */
2313 for (i = 0; i <= mask_r>>sh_r; i++)
2314 {
2315 RUINT32T tmp;
2316 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2317 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2318 lookup_r[i] = (tmp/65535)<<sh_r;
2319 }
2320 for (i = 0; i <= mask_g>>sh_g; i++)
2321 {
2322 RUINT32T tmp;
2323 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2324 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2325 lookup_g[i] = (tmp/65535)<<sh_g;
2326 }
2327 for (i = 0; i <= mask_b>>sh_b; i++)
2328 {
2329 RUINT32T tmp;
2330 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2331 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2332 lookup_b[i] = (tmp/65535)<<sh_b;
2333 }
2334
2335 /* apply table to input image (replacing colors by newly calculated ones) */
2336 switch (srcImage->bits_per_pixel)
2337 {
2338 case 15:
2339 {
2340 unsigned short *p1, *pf, *p, *pl;
2341 p1 = (unsigned short *) srcImage->data;
2342 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2343 while (p1 < pf)
2344 {
2345 p = p1;
2346 pl = p1 + srcImage->width;
2347 for (; p < pl; p++)
2348 {
2349 *p = lookup_r[(*p & 0x7c00)>>10] |
2350 lookup_g[(*p & 0x03e0)>> 5] |
2351 lookup_b[(*p & 0x001f)];
2352 }
2353 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2354 }
2355 break;
2356 }
2357 case 16:
2358 {
2359 unsigned short *p1, *pf, *p, *pl;
2360 p1 = (unsigned short *) srcImage->data;
2361 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2362 while (p1 < pf)
2363 {
2364 p = p1;
2365 pl = p1 + srcImage->width;
2366 for (; p < pl; p++)
2367 {
2368 *p = lookup_r[(*p & 0xf800)>>11] |
2369 lookup_g[(*p & 0x07e0)>> 5] |
2370 lookup_b[(*p & 0x001f)];
2371 }
2372 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2373 }
2374 break;
2375 }
2376 case 24:
2377 {
2378 unsigned char *p1, *pf, *p, *pl;
2379 p1 = (unsigned char *) srcImage->data;
2380 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width * 3;
2385 for (; p < pl; p += 3)
2386 {
2387 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2388 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2389 p[2] = lookup_r[(p[2] & 0x0000ff)];
2390 }
2391 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2392 }
2393 break;
2394 }
2395 case 32:
2396 {
2397 RUINT32T *p1, *pf, *p, *pl;
2398 p1 = (RUINT32T *) srcImage->data;
2399 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400
2401 while (p1 < pf)
2402 {
2403 p = p1;
2404 pl = p1 + srcImage->width;
2405 for (; p < pl; p++)
2406 {
2407 *p = lookup_r[(*p & 0xff0000)>>16] |
2408 lookup_g[(*p & 0x00ff00)>> 8] |
2409 lookup_b[(*p & 0x0000ff)] |
2410 (*p & ~0xffffff);
2411 }
2412 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 }
2417
2418 free (lookup);
2419}
2420#endif
2421
2422/*
2423 * Check our parents are still who we think they are.
2424 * Do transparency updates if required
2425 */
2426int
2427rxvt_term::check_our_parents ()
2428{
2429 int i, pchanged, aformat, have_pixmap, rootdepth;
2430 unsigned long nitems, bytes_after;
2431 Atom atype;
2432 unsigned char *prop = NULL;
2433 Window root, oldp, *list;
2434 Pixmap rootpixmap = None;
2435 XWindowAttributes wattr, wrootattr;
2436 dDisp;
2437
2438 pchanged = 0;
2439
2440 if (!OPTION (Opt_transparent))
2441 return pchanged; /* Don't try any more */
2442
2443 XGetWindowAttributes (disp, display->root, &wrootattr);
2444 rootdepth = wrootattr.depth;
2445
2446 XGetWindowAttributes (disp, parent[0], &wattr);
2447
2448 if (rootdepth != wattr.depth)
2449 {
2450 if (am_transparent)
2451 {
2452 pchanged = 1;
2453 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2454 am_transparent = am_pixmap_trans = 0;
2455 }
2456
2457 return pchanged; /* Don't try any more */
2458 }
2459
2460 /* Get all X ops out of the queue so that our information is up-to-date. */
2461 XSync (disp, False);
2462
2463 /*
2464 * Make the frame window set by the window manager have
2465 * the root background. Some window managers put multiple nested frame
2466 * windows for each client, so we have to take care about that.
2467 */
2468 i = (xa[XA_XROOTPMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success);
2472
2473 if (!i || prop == NULL)
2474 i = (xa[XA_ESETROOT_PMAP_ID]
2475 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2476 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2477 &nitems, &bytes_after, &prop) == Success);
2478
2479 if (!i || prop == NULL
2480#if TINTING
2481 || !rs[Rs_color + Color_tint]
2482#endif
2483 )
2484 have_pixmap = 0;
2485 else
2486 {
2487 have_pixmap = 1;
2488 rootpixmap = *(Pixmap *)prop;
2489 XFree (prop);
2490 }
2491
2492 if (have_pixmap)
2493 {
2494 /*
2495 * Copy display->root pixmap transparency
2496 */
2497 int sx, sy, nx, ny;
2498 unsigned int nw, nh;
2499 Window cr;
2500 XImage *image;
2501 GC gc;
2502 XGCValues gcvalue;
2503
2504 XTranslateCoordinates (disp, parent[0], display->root,
2505 0, 0, &sx, &sy, &cr);
2506 nw = (unsigned int)szHint.width;
2507 nh = (unsigned int)szHint.height;
2508 nx = ny = 0;
2509
2510 if (sx < 0)
2511 {
2512 nw += sx;
2513 nx = -sx;
2514 sx = 0;
2515 }
2516
2517 if (sy < 0)
2518 {
2519 nh += sy;
2520 ny = -sy;
2521 sy = 0;
2522 }
2523
2524 min_it (nw, (unsigned int) (wrootattr.width - sx));
2525 min_it (nh, (unsigned int) (wrootattr.height - sy));
2526
2527 XSync (disp, False);
2528 allowedxerror = -1;
2529 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2530
2531 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2532 /* XXX: may need a delay here? */
2533 allowedxerror = 0;
2534
2535 if (image == NULL)
2536 {
2537 if (am_transparent && am_pixmap_trans)
2538 {
2539 pchanged = 1;
2540 if (pixmap != None)
2541 {
2542 XFreePixmap (disp, pixmap);
2543 pixmap = None;
2544 }
2545 }
2546
2547 am_pixmap_trans = 0;
2548 }
2549 else
2550 {
2551 if (pixmap != None)
2552 XFreePixmap (disp, pixmap);
2553
2554#if TINTING
2555 if (ISSET_PIXCOLOR (Color_tint))
2556 {
2557 unsigned short rm, gm, bm;
2558 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2559
2560 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2561
2562 ShadeXImage (display, image, shade, rm, gm, bm);
2563 }
2564#endif
2565
2566 pixmap = XCreatePixmap (disp, vt,
2567 szHint.width, szHint.height, image->depth);
2568 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2569 XPutImage (disp, pixmap, gc, image, 0, 0,
2570 nx, ny, image->width, image->height);
2571 XFreeGC (disp, gc);
2572 XDestroyImage (image);
2573 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2574 XClearWindow (disp, parent[0]);
2575
2576 if (!am_transparent || !am_pixmap_trans)
2577 pchanged = 1;
2578
2579 am_transparent = am_pixmap_trans = 1;
2580 }
2581 }
2582
2583 if (am_pixmap_trans)
2584 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 else
2586 {
2587 unsigned int n;
2588 /*
2589 * InheritPixmap transparency
2590 */
2591 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2592 {
2593 oldp = parent[i];
2594 XQueryTree (disp, parent[i - 1], &root,
2595 &parent[i], &list, &n);
2596 XFree (list);
2597
2598 if (parent[i] == display->root)
2599 {
2600 if (oldp != None)
2601 pchanged = 1;
2602
2603 break;
2604 }
2605
2606 if (oldp != parent[i])
2607 pchanged = 1;
2608 }
2609
2610 n = 0;
2611
2612 if (pchanged)
2613 {
2614 for (; n < (unsigned int)i; n++)
2615 {
2616 XGetWindowAttributes (disp, parent[n], &wattr);
2617 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2618 {
2619 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2620 break;
2621 }
2622 }
2623 }
2624
2625 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2626 {
2627 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2628 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2629 am_transparent = 0;
2630 /* XXX: also turn off Opt_transparent? */
2631 }
2632 else
2633 {
2634#if WAIT_FOR_WM
2635 /* wait (an arbitrary period) for the WM to do its thing
2636 * needed for fvwm2.2.2 (and before?) */
2637 sleep (1);
2638#endif
2639 for (n = 0; n < (unsigned int)i; n++)
2640 {
2641 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2642 XClearWindow (disp, parent[n]);
2643 }
2644
2645 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2646 am_transparent = 1;
2647 }
2648
2649 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2650 parent[i] = None;
2651 }
2652
2653 if (scrollBar.win)
2654 {
2655 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2656 scrollBar.setIdle ();
2657 scrollbar_show (0);
2658 }
2659
2660 if (am_transparent)
2661 {
2662 want_refresh = want_full_refresh = 1;
2663 if (am_pixmap_trans)
2664 flush ();
2665 }
2666
2667 return pchanged;
2668}
2669#endif
2670
2671/*}}} */ 2235/*}}} */
2672 2236
2673bool 2237void ecb_hot
2674rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2675{ 2239{
2676 bool flag = false;
2677 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2678 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2679 2242
2680 for (;;) 2243 for (;;)
2681 { 2244 {
2682 if (ch == NOCHAR) 2245 if (ecb_unlikely (ch == NOCHAR))
2683 { 2246 {
2684 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2685 ch = next_char (); 2248 ch = next_char ();
2686 2249
2687 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2688 break; 2251 break;
2689 } 2252 }
2690 2253
2691 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2692 { 2255 {
2693 if (!seen_input) 2256 if (ecb_unlikely (!seen_input))
2694 { 2257 {
2695 seen_input = 1; 2258 seen_input = 1;
2696 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2697 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2698 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2711 wchar_t *str = buf; 2274 wchar_t *str = buf;
2712 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2713 2276
2714 for (;;) 2277 for (;;)
2715 { 2278 {
2716 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2717 break; 2280 break;
2718 2281
2719 *str++ = ch; 2282 *str++ = ch;
2720 2283
2721 if (ch == C0_LF || str >= eol) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2722 { 2285 {
2723 if (ch == C0_LF) 2286 if (ch == C0_LF)
2724 nlines++; 2287 nlines++;
2725 2288
2726 refresh_count++; 2289 refresh_count++;
2727 2290
2728 if (!OPTION (Opt_jumpScroll) 2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2729 || (refresh_count >= refresh_limit * (nrow - 1)))
2730 { 2292 {
2731 refreshnow = true;
2732 refresh_count = 0; 2293 refresh_count = 0;
2294
2295 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2296 {
2297 refreshnow = true;
2733 ch = NOCHAR; 2298 ch = NOCHAR;
2734 break; 2299 break;
2300 }
2735 } 2301 }
2736 2302
2737 // scr_add_lines only works for nlines <= nrow - 1. 2303 // scr_add_lines only works for nlines <= nrow - 1.
2738 if (nlines >= nrow - 1) 2304 if (nlines >= nrow - 1)
2739 { 2305 {
… …
2767 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2333 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2768 scr_add_lines (buf, str - buf, nlines); 2334 scr_add_lines (buf, str - buf, nlines);
2769 2335
2770 /* 2336 /*
2771 * If there have been a lot of new lines, then update the screen 2337 * If there have been a lot of new lines, then update the screen
2772 * What the heck I'll cheat and only refresh less than every page-full. 2338 * What the heck we'll cheat and only refresh less than every page-full.
2773 * the number of pages between refreshes is refresh_limit, which 2339 * if skipScroll is enabled.
2774 * is incremented here because we must be doing flat-out scrolling.
2775 */ 2340 */
2776 if (refreshnow) 2341 if (refreshnow)
2777 { 2342 {
2778 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2779 refresh_limit++;
2780 else
2781 {
2782 flag = true;
2783 scr_refresh (); 2343 scr_refresh ();
2784 want_refresh = 1; 2344 want_refresh = 1;
2785 }
2786 } 2345 }
2787
2788 } 2346 }
2789 else 2347 else
2790 { 2348 {
2791 try 2349 try
2792 { 2350 {
… …
2800 } 2358 }
2801 2359
2802 ch = NOCHAR; 2360 ch = NOCHAR;
2803 } 2361 }
2804 } 2362 }
2805
2806 return flag;
2807} 2363}
2808 2364
2809// read the next character 2365// read the next character
2810wchar_t 2366wchar_t ecb_hot
2811rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () noexcept
2812{ 2368{
2813 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2814 { 2370 {
2815 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2816 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2817 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2818 2374
2819 wchar_t wc; 2375 wchar_t wc;
2820 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2821 2377
… …
2825 cmdbuf_ptr = cmdbuf_endp; 2381 cmdbuf_ptr = cmdbuf_endp;
2826 break; 2382 break;
2827 } 2383 }
2828 2384
2829 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2386 {
2387 mbstate.reset (); // reset now undefined conversion state
2388 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2389 // in which case we "erroneously" return the next byte which might be valid.
2830 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2391 }
2831 2392
2832 // assume wchar == unicode 2393 // assume wchar == unicode
2833 cmdbuf_ptr += len; 2394 cmdbuf_ptr += len;
2834 return wc & UNICODE_MASK; 2395 return wc & UNICODE_MASK;
2835 } 2396 }
2836 2397
2837 return NOCHAR; 2398 return NOCHAR;
2838} 2399}
2839 2400
2840// read the next octet 2401// read the next octet
2841uint32_t 2402uint32_t ecb_hot
2842rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () noexcept
2843{ 2404{
2844 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2845 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2846 : NOCHAR; 2407 : NOCHAR;
2847} 2408}
2848 2409
2849static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2850 2411
2851/* rxvt_cmd_getc () - Return next input character */ 2412wchar_t ecb_hot
2852/* 2413rxvt_term::cmd_getc ()
2853 * Return the next input character after first passing any keyboard input
2854 * to the command.
2855 */
2856wchar_t
2857rxvt_term::cmd_getc () THROW ((class out_of_input))
2858{ 2414{
2859 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2860 2416
2861 if (c == NOCHAR) 2417 if (c == NOCHAR)
2862 throw out_of_input; 2418 throw out_of_input;
2863 2419
2864 return c; 2420 return c;
2865} 2421}
2866 2422
2867uint32_t 2423uint32_t ecb_hot
2868rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 ()
2869{ 2425{
2870 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2871 2427
2872 if (c == NOCHAR) 2428 if (c == NOCHAR)
2873 throw out_of_input; 2429 throw out_of_input;
… …
2876} 2432}
2877 2433
2878/*{{{ print pipe */ 2434/*{{{ print pipe */
2879/*----------------------------------------------------------------------*/ 2435/*----------------------------------------------------------------------*/
2880#ifdef PRINTPIPE 2436#ifdef PRINTPIPE
2881FILE * 2437FILE * ecb_cold
2882rxvt_term::popen_printer () 2438rxvt_term::popen_printer ()
2883{ 2439{
2884 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2440 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2885 2441
2886 if (stream == NULL) 2442 if (stream == NULL)
2887 rxvt_warn ("can't open printer pipe, not printing.\n"); 2443 rxvt_warn ("can't open printer pipe, not printing.\n");
2888 2444
2889 return stream; 2445 return stream;
2890} 2446}
2891 2447
2892int 2448int ecb_cold
2893rxvt_term::pclose_printer (FILE *stream) 2449rxvt_term::pclose_printer (FILE *stream)
2894{ 2450{
2895 fflush (stream); 2451 fflush (stream);
2896 return pclose (stream); 2452 return pclose (stream);
2897} 2453}
2898 2454
2899/* 2455/*
2900 * simulate attached vt100 printer 2456 * simulate attached vt100 printer
2901 */ 2457 */
2902void 2458void ecb_cold
2903rxvt_term::process_print_pipe () 2459rxvt_term::process_print_pipe ()
2904{ 2460{
2905 int done; 2461 FILE *fd = popen_printer ();
2906 FILE *fd;
2907 2462
2908 if ((fd = popen_printer ()) == NULL) 2463 if (!fd)
2909 return; 2464 return;
2910 2465
2911 /* 2466 /*
2912 * Send all input to the printer until either ESC[4i or ESC[?4i 2467 * Send all input to the printer until either ESC[4i or ESC[?4i
2913 * is received. 2468 * is received.
2914 */ 2469 */
2915 for (done = 0; !done;) 2470 for (int done = 0; !done; )
2916 { 2471 {
2917 unsigned char buf[8]; 2472 unsigned char buf[8];
2918 unicode_t ch; 2473 unicode_t ch;
2919 unsigned int i, len; 2474 unsigned int i, len;
2920 2475
… …
2939 { 2494 {
2940 if ((buf[len++] = cmd_getc ()) == 'i') 2495 if ((buf[len++] = cmd_getc ()) == 'i')
2941 break; /* done = 1 */ 2496 break; /* done = 1 */
2942 } 2497 }
2943 } 2498 }
2944 2499
2945 for (i = 0; i < len; i++) 2500 for (i = 0; i < len; i++)
2946 if (putc (buf[i], fd) == EOF) 2501 if (putc (buf[i], fd) == EOF)
2947 { 2502 {
2948 done = 1; 2503 done = 1;
2949 break; 2504 break;
… …
2951 } 2506 }
2952 } 2507 }
2953 2508
2954 pclose_printer (fd); 2509 pclose_printer (fd);
2955} 2510}
2956#endif /* PRINTPIPE */ 2511#endif /* PRINTPIPE */
2957/*}}} */ 2512/*}}} */
2958 2513
2959/* *INDENT-OFF* */
2960enum { 2514enum {
2961 C1_40 = 0x40, 2515 C1_40 = 0x40,
2962 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2516 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2963 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2517 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2964 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2518 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2965 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2519 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2966}; 2520};
2967/* *INDENT-ON* */
2968 2521
2969/*{{{ process non-printing single characters */ 2522/*{{{ process non-printing single characters */
2970void 2523void ecb_hot
2971rxvt_term::process_nonprinting (unicode_t ch) 2524rxvt_term::process_nonprinting (unicode_t ch)
2972{ 2525{
2973 switch (ch) 2526 switch (ch)
2974 { 2527 {
2975 case C0_ESC: 2528 case C0_ESC:
… …
3005 scr_charset_choose (0); 2558 scr_charset_choose (0);
3006 break; 2559 break;
3007 2560
3008#ifdef EIGHT_BIT_CONTROLS 2561#ifdef EIGHT_BIT_CONTROLS
3009 // 8-bit controls 2562 // 8-bit controls
3010 case 0x90: /* DCS */ 2563 case 0x90: /* DCS */
3011 process_dcs_seq (); 2564 process_dcs_seq ();
3012 break; 2565 break;
3013 case 0x9b: /* CSI */ 2566 case 0x9b: /* CSI */
3014 process_csi_seq (); 2567 process_csi_seq ();
3015 break; 2568 break;
3016 case 0x9d: /* CSI */ 2569 case 0x9d: /* OSC */
3017 process_osc_seq (); 2570 process_osc_seq ();
3018 break; 2571 break;
3019#endif 2572#endif
3020 } 2573 }
3021} 2574}
3022/*}}} */ 2575/*}}} */
3023 2576
3024 2577
3025/*{{{ process VT52 escape sequences */ 2578/*{{{ process VT52 escape sequences */
3026void 2579void ecb_cold
3027rxvt_term::process_escape_vt52 (unicode_t ch) 2580rxvt_term::process_escape_vt52 (unicode_t ch)
3028{ 2581{
3029 int row, col; 2582 int row, col;
3030 2583
3031 switch (ch) 2584 switch (ch)
… …
3065 break; 2618 break;
3066 case 'Z': /* identify the terminal type */ 2619 case 'Z': /* identify the terminal type */
3067 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2620 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3068 break; 2621 break;
3069 case '<': /* turn off VT52 mode */ 2622 case '<': /* turn off VT52 mode */
3070 PrivMode (0, PrivMode_vt52); 2623 priv_modes &= ~PrivMode_vt52;
3071 break; 2624 break;
3072 case 'F': /* use special graphics character set */ 2625 case 'F': /* use special graphics character set */
3073 case 'G': /* use regular character set */ 2626 case 'G': /* use regular character set */
3074 /* unimplemented */ 2627 /* unimplemented */
3075 break; 2628 break;
… …
3081} 2634}
3082/*}}} */ 2635/*}}} */
3083 2636
3084 2637
3085/*{{{ process escape sequences */ 2638/*{{{ process escape sequences */
3086void 2639void ecb_hot
3087rxvt_term::process_escape_seq () 2640rxvt_term::process_escape_seq ()
3088{ 2641{
3089 unicode_t ch = cmd_getc (); 2642 unicode_t ch = cmd_getc ();
3090 2643
3091 if (priv_modes & PrivMode_vt52) 2644 if (priv_modes & PrivMode_vt52)
… …
3094 return; 2647 return;
3095 } 2648 }
3096 2649
3097 switch (ch) 2650 switch (ch)
3098 { 2651 {
3099 /* case 1: do_tek_mode (); break; */
3100 case '#': 2652 case '#':
3101 if (cmd_getc () == '8') 2653 if (cmd_getc () == '8')
3102 scr_E (); 2654 scr_E ();
3103 break; 2655 break;
3104 case '(': 2656 case '(':
… …
3111 scr_charset_set (2, (unsigned int)cmd_getc ()); 2663 scr_charset_set (2, (unsigned int)cmd_getc ());
3112 break; 2664 break;
3113 case '+': 2665 case '+':
3114 scr_charset_set (3, (unsigned int)cmd_getc ()); 2666 scr_charset_set (3, (unsigned int)cmd_getc ());
3115 break; 2667 break;
3116#if ENABLE_FRILLS 2668#if !ENABLE_MINIMAL
3117 case '6': 2669 case '6':
3118 scr_backindex (); 2670 scr_backindex ();
3119 break; 2671 break;
3120#endif 2672#endif
3121 case '7': 2673 case '7':
3122 scr_cursor (SAVE); 2674 scr_cursor (SAVE);
3123 break; 2675 break;
3124 case '8': 2676 case '8':
3125 scr_cursor (RESTORE); 2677 scr_cursor (RESTORE);
3126 break; 2678 break;
3127#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3128 case '9': 2680 case '9':
3129 scr_forwardindex (); 2681 scr_forwardindex ();
3130 break; 2682 break;
3131#endif 2683#endif
2684 // DECPAM/DECPNM
3132 case '=': 2685 case '=':
2686 priv_modes |= PrivMode_aplKP;
2687 break;
3133 case '>': 2688 case '>':
3134 PrivMode ((ch == '='), PrivMode_aplKP); 2689 priv_modes &= ~PrivMode_aplKP;
3135 break; 2690 break;
3136 2691
3137 case C1_40: 2692 case C1_40:
3138 cmd_getc (); 2693 cmd_getc ();
3139 break; 2694 break;
… …
3143 2698
3144 /* 8.3.87: NEXT LINE */ 2699 /* 8.3.87: NEXT LINE */
3145 case C1_NEL: /* ESC E */ 2700 case C1_NEL: /* ESC E */
3146 { 2701 {
3147 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
3148 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3149 } 2704 }
3150 break; 2705 break;
3151 2706
2707#if 0 // disabled because embedded newlines can make exploits easier
3152 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
3153 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
3154 process_graphics (); 2710 // used by original rxvt for rob nations own graphics mode
2711 if (cmd_getc () == 'Q' && option (Opt_insecure))
2712 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3155 break; 2713 break;
2714#endif
3156 2715
3157 /* 8.3.63: CHARACTER TABULATION SET */ 2716 /* 8.3.63: CHARACTER TABULATION SET */
3158 case C1_HTS: /* ESC H */ 2717 case C1_HTS: /* ESC H */
3159 scr_set_tab (1); 2718 scr_set_tab (1);
3160 break; 2719 break;
… …
3163 case C1_RI: /* ESC M */ 2722 case C1_RI: /* ESC M */
3164 scr_index (DN); 2723 scr_index (DN);
3165 break; 2724 break;
3166 2725
3167 /* 8.3.142: SINGLE-SHIFT TWO */ 2726 /* 8.3.142: SINGLE-SHIFT TWO */
3168 /*case C1_SS2: scr_single_shift (2); break; */ 2727 /* case C1_SS2: break; */
3169 2728
3170 /* 8.3.143: SINGLE-SHIFT THREE */ 2729 /* 8.3.143: SINGLE-SHIFT THREE */
3171 /*case C1_SS3: scr_single_shift (3); break; */ 2730 /* case C1_SS3: break; */
3172 2731
3173 /* 8.3.27: DEVICE CONTROL STRING */ 2732 /* 8.3.27: DEVICE CONTROL STRING */
3174 case C1_DCS: /* ESC P */ 2733 case C1_DCS: /* ESC P */
3175 process_dcs_seq (); 2734 process_dcs_seq ();
3176 break; 2735 break;
… …
3178 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3179 case C1_SCI: /* ESC Z */ 2738 case C1_SCI: /* ESC Z */
3180 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3181 break; /* steal obsolete ESC [ c */ 2740 break; /* steal obsolete ESC [ c */
3182 2741
3183 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3184 case C1_CSI: /* ESC [ */ 2743 case C1_CSI: /* ESC [ */
3185 process_csi_seq (); 2744 process_csi_seq ();
3186 break; 2745 break;
3187 2746
3188 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2747 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3189 case C1_OSC: /* ESC ] */ 2748 case C1_OSC: /* ESC ] */
3190 process_osc_seq (); 2749 process_osc_seq ();
3191 break; 2750 break;
3192 2751
3193 /* 8.3.106: RESET TO INITIAL STATE */ 2752 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3194 case 'c': 2753 case 'c':
3195 mbstate.reset (); 2754 mbstate.reset ();
3196 scr_poweron (); 2755 scr_poweron ();
3197 scrollbar_show (1); 2756 scrollBar.show (1);
3198 break; 2757 break;
3199 2758
3200 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2759 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3201 case 'n': 2760 case 'n':
3202 scr_charset_choose (2); 2761 scr_charset_choose (2);
… …
3209 } 2768 }
3210} 2769}
3211/*}}} */ 2770/*}}} */
3212 2771
3213/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2772/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3214/* *INDENT-OFF* */
3215enum { 2773enum {
3216 CSI_ICH = 0x40, 2774 CSI_ICH = 0x40,
3217 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2775 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3218 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2776 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3219 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2777 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3222 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2780 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3223 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2781 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3224 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2782 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3225}; 2783};
3226 2784
3227#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2785#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3228 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2786 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3229 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2787 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3230#define get_byte_array_bit(array, bit) \ 2788#define get_byte_array_bit(array, bit) \
3231 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2789 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3232 2790
3233const unsigned char csi_defaults[] = 2791static const unsigned char csi_defaults[] =
3234 { 2792 {
3235 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2793 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3236 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2794 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3237 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2795 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3238 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2796 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3239 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2797 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3240 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2798 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3241 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2799 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3242 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2800 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3243 }; 2801 };
3244/* *INDENT-ON* */
3245 2802
3246void 2803void ecb_hot
3247rxvt_term::process_csi_seq () 2804rxvt_term::process_csi_seq ()
3248{ 2805{
3249 unicode_t ch, priv, i; 2806 unicode_t ch, priv, prev_ch, i;
3250 unsigned int nargs, p; 2807 unsigned int nargs, p;
3251 int n, ndef; 2808 int n, ndef;
3252 int arg[ESC_ARGS]; 2809 int arg[ESC_ARGS] = { };
3253 2810
3254 for (nargs = ESC_ARGS; nargs > 0;) 2811 nargs = 0;
3255 arg[--nargs] = 0;
3256 2812
3257 priv = 0; 2813 priv = 0;
3258 ch = cmd_getc (); 2814 ch = cmd_getc ();
3259 if (ch >= '<' && ch <= '?') 2815 if ((ch >= '<' && ch <= '?') || ch == '!')
2816 {
3260 { /* '<' '=' '>' '?' */ 2817 /* '<' '=' '>' '?' '!' */
3261 priv = ch; 2818 priv = ch;
3262 ch = cmd_getc (); 2819 ch = cmd_getc ();
3263 } 2820 }
3264 2821
2822 prev_ch = 0;
3265 /* read any numerical arguments */ 2823 /* read any numerical arguments */
3266 for (n = -1; ch < CSI_ICH; ) 2824 for (n = -1; ch < CSI_ICH; )
3267 { 2825 {
3268 if (isdigit (ch)) 2826 if (isdigit (ch))
3269 { 2827 {
… …
3279 n = -1; 2837 n = -1;
3280 } 2838 }
3281 else if (IS_CONTROL (ch)) 2839 else if (IS_CONTROL (ch))
3282 process_nonprinting (ch); 2840 process_nonprinting (ch);
3283 2841
2842 prev_ch = ch;
3284 ch = cmd_getc (); 2843 ch = cmd_getc ();
3285 } 2844 }
3286 2845
3287 if (ch > CSI_7F) 2846 if (ch > CSI_7F)
3288 return; 2847 return;
… …
3294 ndef = get_byte_array_bit (csi_defaults, i); 2853 ndef = get_byte_array_bit (csi_defaults, i);
3295 for (p = 0; p < nargs; p++) 2854 for (p = 0; p < nargs; p++)
3296 if (arg[p] == -1) 2855 if (arg[p] == -1)
3297 arg[p] = ndef; 2856 arg[p] = ndef;
3298 2857
3299#ifdef DEBUG_CMD
3300 fprintf (stderr, "CSI ");
3301 for (p = 0; p < nargs; p++)
3302 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3303 fprintf (stderr, "%c\n", ch);
3304#endif
3305
3306 /* 2858 /*
3307 * private mode handling 2859 * private mode handling
3308 */ 2860 */
3309 if (priv) 2861 if (priv)
3310 { 2862 {
3311 switch (priv) 2863 switch (priv)
3312 { 2864 {
3313 case '>': 2865 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 2866 if (ch == CSI_DA) /* secondary device attributes */
3315 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2867 {
2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870 //
2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2873 // versions.
2874 //
2875 tt_printf ("\033[>%d;95;0c", 'U');
2876 }
3316 break; 2877 break;
2878
3317 case '?': 2879 case '?':
3318 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3319 process_terminal_mode (ch, priv, nargs, arg); 2881 process_terminal_mode (ch, priv, nargs, arg);
2882 if (prev_ch == '$' && ch == 'p')
2883 process_terminal_mode (ch, priv, nargs, arg);
3320 break; 2884 break;
2885
2886 case '!':
2887 if (ch == CSI_70)
2888 {
2889 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2890 scr_soft_reset ();
2891
2892 static const int pm_h[] = { 7, 25 };
2893 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2894
2895 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2896 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3321 } 2897 }
2898 break;
2899 }
2900
3322 return; 2901 return;
3323 } 2902 }
3324 2903
3325 switch (ch) 2904 switch (ch)
3326 { 2905 {
… …
3340 } 2919 }
3341 break; 2920 break;
3342#endif 2921#endif
3343 2922
3344 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2923 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3345 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2924 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3346 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
3347 /* FALLTHROUGH */ 2926 /* FALLTHROUGH */
3348 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2927 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3349 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2928 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3350 scr_gotorc (arg[0], 0, RELATIVE); 2929 scr_gotorc (arg[0], 0, RELATIVE);
3351 break; 2930 break;
3352 2931
3353 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2932 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3354 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2933 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
3355#ifdef ISO6429 2934#ifdef ISO6429
3356 arg[0] = -arg[0]; 2935 arg[0] = -arg[0];
3357#else /* emulate common DEC VTs */ 2936#else /* emulate common DEC VTs */
3358 arg[0] = arg[0] ? -arg[0] : -1; 2937 arg[0] = arg[0] ? -arg[0] : -1;
3359#endif 2938#endif
… …
3446 break; 3025 break;
3447 case 6: /* CPR requested */ 3026 case 6: /* CPR requested */
3448 scr_report_position (); 3027 scr_report_position ();
3449 break; 3028 break;
3450 case 7: /* unofficial extension */ 3029 case 7: /* unofficial extension */
3451 if (OPTION (Opt_insecure)) 3030 if (option (Opt_insecure))
3452 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3031 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3453 break; 3032 break;
3454 case 8: /* unofficial extension */ 3033 case 8: /* unofficial extension */
3034 {
3035 string_term st;
3036 st.v[0] = CHAR_ST;
3037 st.v[1] = '\0';
3455 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3038 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3456 break; 3039 break;
3040 }
3457 } 3041 }
3458 break; 3042 break;
3459 3043
3460 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3044 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3461 switch (arg[0]) 3045 switch (arg[0])
… …
3504 scr_insert_mode (1); 3088 scr_insert_mode (1);
3505 else if (arg[0] == 20) 3089 else if (arg[0] == 20)
3506 priv_modes |= PrivMode_LFNL; 3090 priv_modes |= PrivMode_LFNL;
3507 break; 3091 break;
3508 3092
3093 case CSI_71: // DECSCUSR: set cursor style
3094 if (prev_ch == ' ')
3095 set_cursor_style (arg[0]);
3096 break;
3097
3509 /* 3098 /*
3510 * PRIVATE USE beyond this point. All CSI_7? sequences here 3099 * PRIVATE USE beyond this point. All CSI_7? sequences here
3511 */ 3100 */
3512 case CSI_72: /* DECSTBM: set top and bottom margins */ 3101 case CSI_72: /* DECSTBM: set top and bottom margins */
3513 if (nargs == 1) 3102 if (nargs == 1)
… …
3523 break; 3112 break;
3524 case CSI_75: 3113 case CSI_75:
3525 scr_cursor (RESTORE); 3114 scr_cursor (RESTORE);
3526 break; 3115 break;
3527 3116
3528#if ENABLE_FRILLS 3117#if !ENABLE_MINIMAL
3529 case CSI_74: 3118 case CSI_74:
3530 process_window_ops (arg, nargs); 3119 process_window_ops (arg, nargs);
3531 break; 3120 break;
3532#endif 3121#endif
3533 3122
… …
3540 break; 3129 break;
3541 } 3130 }
3542} 3131}
3543/*}}} */ 3132/*}}} */
3544 3133
3545#if ENABLE_FRILLS 3134#if !ENABLE_MINIMAL
3546/* ARGSUSED */
3547void 3135void
3548rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3136rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3549{ 3137{
3550 int x, y; 3138 int x, y;
3551 XWindowAttributes wattr; 3139 XWindowAttributes wattr;
3552 Window wdummy; 3140 Window wdummy;
3553 dDisp; 3141
3142 dLocal (Display *, dpy);
3554 3143
3555 if (nargs == 0) 3144 if (nargs == 0)
3556 return; 3145 return;
3557 3146
3558 switch (args[0]) 3147 switch (args[0])
3559 { 3148 {
3560 /* 3149 /*
3561 * commands 3150 * commands
3562 */ 3151 */
3563 case 1: /* deiconify window */ 3152 case 1: /* deiconify window */
3564 XMapWindow (disp, parent[0]); 3153 XMapWindow (dpy, parent);
3565 break; 3154 break;
3566 case 2: /* iconify window */ 3155 case 2: /* iconify window */
3567 XIconifyWindow (disp, parent[0], display->screen); 3156 XIconifyWindow (dpy, parent, display->screen);
3568 break; 3157 break;
3569 case 3: /* set position (pixels) */ 3158 case 3: /* set position (pixels) */
3570 XMoveWindow (disp, parent[0], args[1], args[2]); 3159 XMoveWindow (dpy, parent, args[1], args[2]);
3571 break; 3160 break;
3572 case 4: /* set size (pixels) */ 3161 case 4: /* set size (pixels) */
3573 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3162 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3574 break; 3163 break;
3575 case 5: /* raise window */ 3164 case 5: /* raise window */
3576 XRaiseWindow (disp, parent[0]); 3165 XRaiseWindow (dpy, parent);
3577 break; 3166 break;
3578 case 6: /* lower window */ 3167 case 6: /* lower window */
3579 XLowerWindow (disp, parent[0]); 3168 XLowerWindow (dpy, parent);
3580 break; 3169 break;
3581 case 7: /* refresh window */ 3170 case 7: /* refresh window */
3582 scr_touch (true); 3171 scr_touch (true);
3583 break; 3172 break;
3584 case 8: /* set size (chars) */ 3173 case 8: /* set size (chars) */
… …
3587 break; 3176 break;
3588 3177
3589 //case 9: NYI, TODO, restore maximized window or maximize window 3178 //case 9: NYI, TODO, restore maximized window or maximize window
3590 default: 3179 default:
3591 if (args[0] >= 24) /* set height (chars) */ 3180 if (args[0] >= 24) /* set height (chars) */
3592 set_widthheight ((unsigned int)width, 3181 set_widthheight ((unsigned int)vt_width,
3593 (unsigned int) (args[1] * fheight)); 3182 (unsigned int) (args[1] * fheight));
3594 break; 3183 break;
3595
3596 3184
3597 /* 3185 /*
3598 * reports - some output format copied from XTerm 3186 * reports - some output format copied from XTerm
3599 */ 3187 */
3600 case 11: /* report window state */ 3188 case 11: /* report window state */
3601 XGetWindowAttributes (disp, parent[0], &wattr); 3189 XGetWindowAttributes (dpy, parent, &wattr);
3602 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3190 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3603 break; 3191 break;
3604 case 13: /* report window position */ 3192 case 13: /* report window position */
3605 XGetWindowAttributes (disp, parent[0], &wattr); 3193 XGetWindowAttributes (dpy, parent, &wattr);
3606 XTranslateCoordinates (disp, parent[0], wattr.root, 3194 XTranslateCoordinates (dpy, parent, wattr.root,
3607 -wattr.border_width, -wattr.border_width, 3195 -wattr.border_width, -wattr.border_width,
3608 &x, &y, &wdummy); 3196 &x, &y, &wdummy);
3609 tt_printf ("\033[3;%d;%dt", x, y); 3197 tt_printf ("\033[3;%d;%dt", x, y);
3610 break; 3198 break;
3611 case 14: /* report window size (pixels) */ 3199 case 14: /* report window size (pixels) */
3612 XGetWindowAttributes (disp, parent[0], &wattr); 3200 XGetWindowAttributes (dpy, parent, &wattr);
3613 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3201 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3614 break; 3202 break;
3615 case 18: /* report text area size (chars) */ 3203 case 18: /* report text area size (chars) */
3616 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3204 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3617 break; 3205 break;
… …
3619 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3207 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3620 break; 3208 break;
3621 case 20: /* report icon label */ 3209 case 20: /* report icon label */
3622 { 3210 {
3623 char *s; 3211 char *s;
3624 XGetIconName (disp, parent[0], &s); 3212 XGetIconName (dpy, parent, &s);
3625 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3213 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3626 XFree (s); 3214 XFree (s);
3627 } 3215 }
3628 break; 3216 break;
3629 case 21: /* report window title */ 3217 case 21: /* report window title */
3630 { 3218 {
3631 char *s; 3219 char *s;
3632 XFetchName (disp, parent[0], &s); 3220 XFetchName (dpy, parent, &s);
3633 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3221 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3634 XFree (s); 3222 XFree (s);
3635 } 3223 }
3636 break; 3224 break;
3637 } 3225 }
3638} 3226}
… …
3642/* 3230/*
3643 * get input up until STRING TERMINATOR (or BEL) 3231 * get input up until STRING TERMINATOR (or BEL)
3644 * ends_how is terminator used. returned input must be free()'d 3232 * ends_how is terminator used. returned input must be free()'d
3645 */ 3233 */
3646char * 3234char *
3647rxvt_term::get_to_st (unicode_t &ends_how) 3235rxvt_term::get_to_st (string_term &st)
3648{ 3236{
3649 unicode_t ch; 3237 unicode_t ch;
3650 bool seen_esc = false; 3238 bool seen_esc = false;
3651 unsigned int n = 0; 3239 unsigned int n = 0;
3652 wchar_t string[STRING_MAX]; 3240 wchar_t string[CBUFSIZ];
3653 3241
3654 while ((ch = cmd_getc ()) != NOCHAR) 3242 while ((ch = cmd_getc ()) != NOCHAR)
3655 { 3243 {
3656 if (seen_esc) 3244 if (seen_esc)
3657 { 3245 {
… …
3665 seen_esc = true; 3253 seen_esc = true;
3666 continue; 3254 continue;
3667 } 3255 }
3668 else if (ch == C0_BEL || ch == CHAR_ST) 3256 else if (ch == C0_BEL || ch == CHAR_ST)
3669 break; 3257 break;
3258 else if (ch == C0_SYN)
3259 ch = cmd_get8 ();
3670 else if (ch < 0x20) 3260 else if (ch < 0x20)
3671 return NULL; /* other control character - exit */ 3261 return NULL; /* other control character - exit */
3672 3262
3673 seen_esc = false; 3263 seen_esc = false;
3674 3264
3675 if (n >= STRING_MAX - 1) 3265 if (n >= sizeof (string) - 1)
3676 // stop at some sane length 3266 // stop at some sane length
3677 return NULL; 3267 return NULL;
3678 3268
3679 if (ch == C0_SYN)
3680 string[n++] = cmd_get8 ();
3681 else
3682 string[n++] = ch; 3269 string[n++] = ch;
3683 } 3270 }
3684 3271
3685 string[n++] = '\0'; 3272 string[n++] = '\0';
3686 3273
3687 ends_how = (ch == 0x5c ? C0_ESC : ch); 3274 n = 0;
3275 if (ch == 0x5c)
3276 st.v[n++] = C0_ESC;
3277 st.v[n++] = ch;
3278 st.v[n] = '\0';
3688 3279
3689 return rxvt_wcstombs (string); 3280 return rxvt_wcstombs (string);
3690} 3281}
3691 3282
3692/*----------------------------------------------------------------------*/ 3283/*----------------------------------------------------------------------*/
… …
3694 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3285 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3695 */ 3286 */
3696void 3287void
3697rxvt_term::process_dcs_seq () 3288rxvt_term::process_dcs_seq ()
3698{ 3289{
3699 char *s;
3700 unicode_t eh;
3701
3702 /* 3290 /*
3703 * Not handled yet 3291 * Not handled yet
3704 */ 3292 */
3293
3294 string_term st;
3705 s = get_to_st (eh); 3295 char *s = get_to_st (st);
3706 if (s) 3296 if (s)
3707 free (s); 3297 free (s);
3708 3298
3709 return; 3299 return;
3710} 3300}
… …
3714 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3304 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3715 */ 3305 */
3716void 3306void
3717rxvt_term::process_osc_seq () 3307rxvt_term::process_osc_seq ()
3718{ 3308{
3719 unicode_t ch, eh;
3720 int arg; 3309 int arg;
3721 3310
3722 ch = cmd_getc (); 3311 unicode_t ch = cmd_getc ();
3723 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3312 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3724 arg = arg * 10 + (ch - '0'); 3313 arg = arg * 10 + (ch - '0');
3725 3314
3726 if (ch == ';') 3315 if (ch == ';')
3727 { 3316 {
3317 string_term st;
3728 char *s = get_to_st (eh); 3318 char *s = get_to_st (st);
3729 3319
3730 if (s) 3320 if (s)
3731 { 3321 {
3732 process_xterm_seq (arg, s, eh); 3322 process_xterm_seq (arg, s, st);
3733 free (s); 3323 free (s);
3734 } 3324 }
3735 } 3325 }
3736} 3326}
3737 3327
3328static unsigned int
3329colorcube_index (unsigned int idx_r,
3330 unsigned int idx_g,
3331 unsigned int idx_b)
3332{
3333 assert (idx_r < Red_levels);
3334 assert (idx_g < Green_levels);
3335 assert (idx_b < Blue_levels);
3336
3337 return idx_r * Blue_levels * Green_levels +
3338 idx_g * Blue_levels +
3339 idx_b;
3340}
3341
3342/*
3343 * Find the nearest color slot in the hidden color cube,
3344 * adapt its value to the 32bit RGBA color.
3345 */
3346unsigned int
3347rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3348{
3349 r &= 0xff;
3350 g &= 0xff;
3351 b &= 0xff;
3352 a &= 0xff;
3353
3354 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3355
3356 /* we allow one of the 6 closest neighbouring colours */
3357 /* to replace the current color, if they not used recently */
3358 #if 0
3359 static const unsigned char dxyz[][3] = {
3360 0, 0, 0,
3361 0, 0, 4,
3362 0, 4, 4,
3363 4, 4, 0,
3364 4, 0, 4,
3365 0, 4, 0,
3366 4, 0, 0,
3367 };
3368 #else
3369 // silly compressed verlapping triplets version of above
3370 static const unsigned char dxyz[] = {
3371 0, 0, 0, 4, 4, 0, 4, 0, 0,
3372 };
3373 #endif
3374
3375 static const unsigned char color_level[8][32] = {
3376 // neighbour index
3377 {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},
3378 {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},
3379 {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},
3380 {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},
3381 // Red_levels/Green_levels/Blue_levels index
3382 {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},
3383 {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},
3384 {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},
3385 {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},
3386 };
3387
3388 unsigned int idx;
3389
3390 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3391 {
3392 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3393 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3394 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3395 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3396
3397 if (n == 0)
3398 idx = index;
3399
3400 if (rgb24_color[index] == color)
3401 {
3402 rgb24_seqno[index] = ++rgb24_sequence;
3403 return index + minTermCOLOR24;
3404 }
3405
3406 // minor issue: could update index 0 few more times
3407 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3408 {
3409 idx = index;
3410 goto update;
3411 }
3412
3413 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3414 // but also handles wrap around values well enough
3415 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3416 idx = index;
3417 }
3418
3419update:
3420 rgb24_color[idx] = color;
3421 rgb24_seqno[idx] = ++rgb24_sequence;
3422
3423 idx += minTermCOLOR24;
3424 pix_colors_focused [idx].free (this);
3425 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3426 update_fade_color (idx, false);
3427
3428 return idx;
3429}
3430
3738void 3431void
3739rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3432rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3740{ 3433{
3741 if (str[0] == '?' && !str[1]) 3434 if (str[0] == '?' && !str[1])
3742 { 3435 {
3743 unsigned short r, g, b; 3436 rgba c;
3744 pix_colors_focused[color].get (display, r, g, b); 3437 pix_colors_focused[color].get (c);
3745 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3438 char rgba_str[32];
3439
3440#if XFT
3441 if (c.a != rgba::MAX_CC)
3442 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3443 else
3444#endif
3445 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3446
3447 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3448 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3449 else
3450 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3746 } 3451 }
3747 else 3452 else
3748 set_window_color (color, str); 3453 set_window_color (color, str);
3749} 3454}
3750 3455
3751/* 3456/*
3752 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3457 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3753 */ 3458 */
3754void 3459void
3755rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3460rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3756{ 3461{
3757 int color; 3462 int color;
3758 char *buf, *name; 3463 char *buf, *name;
3759 bool query = str[0] == '?' && !str[1]; 3464 bool query = str[0] == '?' && !str[1];
3760 int saveop = op; 3465 int saveop = op;
3761 dDisp; 3466
3467 dLocal (Display *, dpy);
3762 3468
3763 assert (str != NULL); 3469 assert (str != NULL);
3470
3471 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3472 return;
3473
3764 switch (op) 3474 switch (op)
3765 { 3475 {
3766 case XTerm_name: 3476 case XTerm_name:
3767 set_title (str); 3477 set_title (str);
3768 /* FALLTHROUGH */ 3478 /* FALLTHROUGH */
… …
3782 unsigned long bytes_after; 3492 unsigned long bytes_after;
3783 unsigned char *value = 0; 3493 unsigned char *value = 0;
3784 const char *str = ""; 3494 const char *str = "";
3785 3495
3786 if (prop 3496 if (prop
3787 && XGetWindowProperty (disp, parent[0], 3497 && XGetWindowProperty (dpy, parent,
3788 prop, 0, 1<<16, 0, AnyPropertyType, 3498 prop, 0, 1<<16, 0, AnyPropertyType,
3789 &actual_type, &actual_format, 3499 &actual_type, &actual_format,
3790 &nitems, &bytes_after, &value) == Success 3500 &nitems, &bytes_after, &value) == Success
3791 && actual_type != None 3501 && actual_type != None
3792 && actual_format == 8) 3502 && actual_format == 8)
3793 str = (const char *)(value); 3503 str = (const char *)(value);
3794 3504
3795 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3505 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3796 3506
3797 XFree (value); 3507 XFree (value);
3798 } 3508 }
3799 else 3509 else
3800 { 3510 {
3801 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3511 char *eq = strchr (str, '=');
3802 3512
3803 if (eq) 3513 if (eq)
3804 { 3514 {
3805 *eq = 0; 3515 *eq = 0;
3806 set_utf8_property (display->atom (str), eq + 1); 3516 set_utf8_property (display->atom (str), eq + 1);
3807 } 3517 }
3808 else 3518 else
3809 XDeleteProperty (disp, parent[0], 3519 XDeleteProperty (dpy, parent,
3810 display->atom (str)); 3520 display->atom (str));
3811 } 3521 }
3812 break; 3522 break;
3813 3523
3814 case XTerm_Color: 3524 case XTerm_Color:
… …
3824 break; 3534 break;
3825 3535
3826 if ((buf = strchr (name, ';')) != NULL) 3536 if ((buf = strchr (name, ';')) != NULL)
3827 *buf++ = '\0'; 3537 *buf++ = '\0';
3828 3538
3829 if (name[0] == '?' && !name[1]) 3539 process_color_seq (op, color, name, st);
3830 {
3831 unsigned short r, g, b;
3832 pix_colors_focused[color].get (display, r, g, b);
3833 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3834 }
3835 else
3836 set_window_color (color, name);
3837 } 3540 }
3838 break; 3541 break;
3542 case Rxvt_restoreFG:
3839 case XTerm_Color00: 3543 case XTerm_Color00:
3840 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3544 process_color_seq (op, Color_fg, str, st);
3841 break; 3545 break;
3546 case Rxvt_restoreBG:
3842 case XTerm_Color01: 3547 case XTerm_Color01:
3843 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3548 process_color_seq (op, Color_bg, str, st);
3844 break; 3549 break;
3845#ifndef NO_CURSORCOLOR 3550#ifndef NO_CURSORCOLOR
3846 case XTerm_Color_cursor: 3551 case XTerm_Color_cursor:
3847 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3552 process_color_seq (op, Color_cursor, str, st);
3848 break; 3553 break;
3849#endif 3554#endif
3850 case XTerm_Color_pointer_fg: 3555 case XTerm_Color_pointer_fg:
3851 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3556 process_color_seq (op, Color_pointer_fg, str, st);
3852 break; 3557 break;
3853 case XTerm_Color_pointer_bg: 3558 case XTerm_Color_pointer_bg:
3854 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3559 process_color_seq (op, Color_pointer_bg, str, st);
3855 break; 3560 break;
3561#ifdef OPTION_HC
3562 case XTerm_Color_HC:
3563 process_color_seq (op, Color_HC, str, st);
3564 break;
3565 case XTerm_Color_HTC:
3566 process_color_seq (op, Color_HTC, str, st);
3567 break;
3568#endif
3856#ifndef NO_BOLD_UNDERLINE_REVERSE 3569#ifndef NO_BOLD_UNDERLINE_REVERSE
3857 case XTerm_Color_RV:
3858 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3859 break;
3860 case Rxvt_Color_BD:
3861 case URxvt_Color_BD: 3570 case URxvt_Color_BD:
3862 process_color_seq (op, Color_BD, str, resp); 3571 process_color_seq (op, Color_BD, str, st);
3863 break; 3572 break;
3864 case Rxvt_Color_UL:
3865 case URxvt_Color_UL: 3573 case URxvt_Color_UL:
3866 process_color_seq (op, Color_UL, str, resp); 3574 process_color_seq (op, Color_UL, str, st);
3867 break; 3575 break;
3868 case URxvt_Color_IT: 3576 case URxvt_Color_IT:
3869 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3577 process_color_seq (op, Color_IT, str, st);
3870 break; 3578 break;
3871#endif 3579#endif
3872#if TRANSPARENT && TINTING
3873 case URxvt_Color_tint: 3580 case URxvt_Color_border:
3874 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3581 process_color_seq (op, Color_border, str, st);
3875 check_our_parents ();
3876 if (am_transparent)
3877 want_full_refresh = want_refresh = 1;
3878 break;
3879#endif
3880
3881 case Rxvt_Pixmap:
3882 {
3883 if (*str != ';')
3884 {
3885#if XPM_BACKGROUND
3886 scale_pixmap (""); /* reset to default scaling */
3887 set_bgPixmap (str); /* change pixmap */
3888 scr_touch (true);
3889#endif
3890 }
3891
3892 int changed = 0;
3893
3894 while ((str = strchr (str, ';')) != NULL)
3895 {
3896 str++;
3897#if XPM_BACKGROUND
3898 changed += scale_pixmap (str);
3899#endif
3900 }
3901
3902 if (changed)
3903 {
3904#ifdef XPM_BACKGROUND
3905 resize_pixmap ();
3906 scr_touch (true);
3907#endif
3908 }
3909 }
3910 break;
3911
3912 case Rxvt_restoreFG:
3913 set_window_color (Color_fg, str);
3914 break;
3915 case Rxvt_restoreBG:
3916 set_window_color (Color_bg, str);
3917 break; 3582 break;
3918 3583
3919 case XTerm_logfile: 3584 case XTerm_logfile:
3920 // TODO, when secure mode? 3585 // TODO, when secure mode?
3921 break; 3586 break;
… …
3939 case URxvt_boldFont: 3604 case URxvt_boldFont:
3940 case URxvt_italicFont: 3605 case URxvt_italicFont:
3941 case URxvt_boldItalicFont: 3606 case URxvt_boldItalicFont:
3942#endif 3607#endif
3943 if (query) 3608 if (query)
3944 tt_printf ("\33]%d;%-.250s%c", saveop, 3609 tt_printf ("\33]%d;%-.250s%s", saveop,
3945 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3610 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3946 ? fontset[op - URxvt_font]->fontdesc : "", 3611 ? fontset[op - URxvt_font]->fontdesc : "",
3947 resp); 3612 st.v);
3948 else 3613 else
3949 { 3614 {
3950 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3615 const char *&res = rs[Rs_font + (op - URxvt_font)];
3951 3616
3952 res = strdup (str); 3617 res = strdup (str);
3953 allocated.push_back ((void *)res); 3618 allocated.push_back ((void *)res);
3954 set_fonts (); 3619 set_fonts ();
3955 } 3620 }
3956 break; 3621 break;
3957 3622
3958#if ENABLE_FRILLS 3623 case URxvt_version:
3624 if (query)
3625 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3626 op,
3627 rs[Rs_name], VERSION[0], VERSION[2],
3628 st.v);
3629 break;
3630
3631#if !ENABLE_MINIMAL
3632 case URxvt_cellinfo:
3633 if (query)
3634 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3635 fwidth, fheight, fbase,
3636 st.v);
3637 break;
3638
3959 case URxvt_locale: 3639 case URxvt_locale:
3960 if (query) 3640 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3641 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3962 else 3642 else
3963 { 3643 {
3964 set_locale (str); 3644 set_locale (str);
3965 pty->set_utf8_mode (enc_utf8); 3645 pty->set_utf8_mode (enc_utf8);
3966 init_xlocale (); 3646 init_xlocale ();
… …
3981 break; 3661 break;
3982#endif 3662#endif
3983 3663
3984#if ENABLE_PERL 3664#if ENABLE_PERL
3985 case URxvt_perl: 3665 case URxvt_perl:
3986 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3666 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3987 ; // no responses yet
3988 break; 3667 break;
3989#endif 3668#endif
3990 } 3669 }
3991} 3670}
3992/*----------------------------------------------------------------------*/ 3671/*----------------------------------------------------------------------*/
… …
3999 * 's' = save 3678 * 's' = save
4000 * 'r' = restore 3679 * 'r' = restore
4001 * 't' = toggle 3680 * 't' = toggle
4002 * so no need for fancy checking 3681 * so no need for fancy checking
4003 */ 3682 */
4004int 3683int ecb_cold
4005rxvt_term::privcases (int mode, unsigned long bit) 3684rxvt_term::privcases (int mode, unsigned long bit)
4006{ 3685{
4007 int state; 3686 int state;
4008 3687
4009 if (mode == 's') 3688 if (mode == 's')
4010 { 3689 {
4011 SavedModes |= (priv_modes & bit); 3690 if (priv_modes & bit)
3691 SavedModes |= bit;
3692 else
3693 SavedModes &= ~bit;
4012 return -1; 3694 return -1;
4013 } 3695 }
4014 else 3696 else
4015 { 3697 {
4016 if (mode == 'r') 3698 if (mode == 'r')
4017 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3699 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4018 else 3700 else
4019 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3701 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4020 PrivMode (state, bit); 3702
3703 if (state)
3704 priv_modes |= bit;
3705 else
3706 priv_modes &= ~bit;
4021 } 3707 }
4022 3708
4023 return state; 3709 return state;
4024} 3710}
4025 3711
4026/* we're not using priv _yet_ */ 3712/* we're not using priv _yet_ */
4027void 3713void
4028rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3714rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4029{ 3715{
4030 unsigned int i, j; 3716 unsigned int i, j;
4031 int state; 3717 int state;
4032 3718
4033 static const struct 3719 static const struct
4034 { 3720 {
4035 const int argval; 3721 const int argval;
4036 const unsigned long bit; 3722 const unsigned long bit;
4037 }
4038
4039 argtopriv[] = { 3723 } argtopriv[] = {
4040 { 1, PrivMode_aplCUR }, 3724 { 1, PrivMode_aplCUR }, // DECCKM
4041 { 2, PrivMode_vt52 }, 3725 { 2, PrivMode_vt52 }, // DECANM
4042 { 3, PrivMode_132 }, 3726 { 3, PrivMode_132 }, // DECCOLM
4043 { 4, PrivMode_smoothScroll }, 3727 { 4, PrivMode_smoothScroll }, // DECSCLM
4044 { 5, PrivMode_rVideo }, 3728 { 5, PrivMode_rVideo }, // DECSCNM
4045 { 6, PrivMode_relOrigin }, 3729 { 6, PrivMode_relOrigin }, // DECOM
4046 { 7, PrivMode_Autowrap }, 3730 { 7, PrivMode_Autowrap }, // DECAWM
4047 // 8, bi-directional support mode 3731 // 8, auto-repeat keys // DECARM
4048 { 9, PrivMode_MouseX10 }, 3732 { 9, PrivMode_MouseX10 },
4049 // 18, 19 printing-related
4050 { 25, PrivMode_VisibleCursor }, 3733 { 12, PrivMode_BlinkingCursor },
3734 // 18 end FF to printer after print screen
3735 // 19 Print screen prints full screen/scroll region
3736 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4051#ifdef scrollBar_esc 3737#ifdef scrollBar_esc
4052 { scrollBar_esc, PrivMode_scrollBar }, 3738 { scrollBar_esc, PrivMode_scrollBar },
4053#endif 3739#endif
4054 { 35, PrivMode_ShiftKeys }, // rxvt extension 3740 { 35, PrivMode_ShiftKeys }, // rxvt extension
3741 // 38, tektronix mode // DECTEK
4055 { 40, PrivMode_132OK }, 3742 { 40, PrivMode_132OK },
4056 // 41 xterm more fixes NYI 3743 // 41 xterm more fixes NYI
4057 // 45 margin bell NYI 3744 // 45 margin bell NYI
4058 // 46 start logging 3745 // 46 start logging
4059 { 47, PrivMode_Screen }, 3746 { 47, PrivMode_Screen },
4060 { 66, PrivMode_aplKP }, 3747 { 66, PrivMode_aplKP }, // DECNKM
4061#ifndef NO_BACKSPACE_KEY 3748#ifndef NO_BACKSPACE_KEY
4062 { 67, PrivMode_BackSpace }, 3749 { 67, PrivMode_BackSpace }, // DECBKM
4063#endif 3750#endif
4064 { 1000, PrivMode_MouseX11 }, 3751 { 1000, PrivMode_MouseX11 },
4065 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3752 { 1002, PrivMode_MouseBtnEvent },
4066 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3753 { 1003, PrivMode_MouseAnyEvent },
4067 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3754#if ENABLE_FRILLS
3755 { 1004, PrivMode_FocusEvent },
3756 { 1005, PrivMode_ExtMouseUTF8 },
3757 { 1006, PrivMode_ExtMouseSGR },
3758#endif
4068 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3759 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4069 { 1011, PrivMode_Keypress }, // rxvt extension 3760 { 1011, PrivMode_Keypress }, // rxvt extension
3761#if ENABLE_FRILLS
3762 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3763#endif
4070 // 1035 enable modifiers for alt, numlock NYI 3764 // 1035 enable modifiers for alt, numlock NYI
4071 // 1036 send ESC for meta keys NYI 3765 // 1036 send ESC for meta keys NYI
4072 // 1037 send DEL for keypad delete NYI 3766 // 1037 send DEL for keypad delete NYI
4073 { 1047, PrivMode_Screen }, 3767 { 1047, PrivMode_Screen },
4074 // 1048 save and restore cursor 3768 // 1048 save and restore cursor, implemented in code
4075 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3769 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4076 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3770 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3771#if ENABLE_FRILLS
3772 { 2004, PrivMode_BracketPaste },
3773#endif
4077 }; 3774 };
4078 3775
4079 if (nargs == 0) 3776 if (nargs == 0)
4080 return; 3777 return;
3778
3779 // DECRQM
3780 if (mode == 'p')
3781 {
3782 int status = 0;
3783 if (nargs != 1)
3784 return;
3785
3786 for (j = 0; j < ecb_array_length (argtopriv); j++)
3787 if (argtopriv[j].argval == arg[0])
3788 {
3789 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3790 break;
3791 }
3792
3793 tt_printf ("\33[?%d;%d$y", arg[0], status);
3794 return;
3795 }
4081 3796
4082 /* make lo/hi boolean */ 3797 /* make lo/hi boolean */
4083 if (mode == 'l') 3798 if (mode == 'l')
4084 mode = 0; /* reset */ 3799 mode = 0; /* reset */
4085 else if (mode == 'h') 3800 else if (mode == 'h')
… …
4088 for (i = 0; i < nargs; i++) 3803 for (i = 0; i < nargs; i++)
4089 { 3804 {
4090 state = -1; 3805 state = -1;
4091 3806
4092 /* basic handling */ 3807 /* basic handling */
4093 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3808 for (j = 0; j < ecb_array_length (argtopriv); j++)
4094 if (argtopriv[j].argval == arg[i]) 3809 if (argtopriv[j].argval == arg[i])
4095 { 3810 {
4096 state = privcases (mode, argtopriv[j].bit); 3811 state = privcases (mode, argtopriv[j].bit);
4097 break; 3812 break;
4098 } 3813 }
… …
4106 3821
4107 scr_touch (true); 3822 scr_touch (true);
4108 break; 3823 break;
4109#endif 3824#endif
4110 case 1048: /* alternative cursor save */ 3825 case 1048: /* alternative cursor save */
4111 case 1049:
4112 if (OPTION (Opt_secondaryScreen)) 3826 if (option (Opt_secondaryScreen))
4113 if (mode == 0) 3827 if (mode == 0)
4114 scr_cursor (RESTORE); 3828 scr_cursor (RESTORE);
4115 else if (mode == 1) 3829 else if (mode == 1)
4116 scr_cursor (SAVE); 3830 scr_cursor (SAVE);
4117 break; 3831 break;
… …
4125 case 2: /* VT52 mode */ 3839 case 2: /* VT52 mode */
4126 /* oddball mode. should be set regardless of set/reset 3840 /* oddball mode. should be set regardless of set/reset
4127 * parameter. Return from VT52 mode with an ESC < from 3841 * parameter. Return from VT52 mode with an ESC < from
4128 * within VT52 mode 3842 * within VT52 mode
4129 */ 3843 */
4130 PrivMode (1, PrivMode_vt52); 3844 priv_modes |= PrivMode_vt52;
4131 break; 3845 break;
4132 case 3: /* 80/132 */ 3846 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 3847 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 3848 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4135 break; 3849 break;
4136 case 4: /* smooth scrolling */ 3850 case 4: /* smooth scrolling */
4137 set_option (Opt_jumpScroll, !state); 3851 set_option (Opt_jumpScroll, !state);
4138 break; 3852 break;
4139 case 5: /* reverse video */ 3853 case 5: /* reverse video */
… …
4146 scr_autowrap (state); 3860 scr_autowrap (state);
4147 break; 3861 break;
4148 /* case 8: - auto repeat, can't do on a per window basis */ 3862 /* case 8: - auto repeat, can't do on a per window basis */
4149 case 9: /* X10 mouse reporting */ 3863 case 9: /* X10 mouse reporting */
4150 if (state) /* orthogonal */ 3864 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX11; 3865 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4152 break; 3866 break;
4153#ifdef scrollBar_esc 3867#ifdef scrollBar_esc
4154 case scrollBar_esc: 3868 case scrollBar_esc:
4155 if (scrollbar_mapping (state)) 3869 scrollBar.map (state);
4156 {
4157 resize_all_windows (0, 0, 0); 3870 resize_all_windows (0, 0, 0);
4158 scr_touch (true); 3871 scr_touch (true);
4159 } 3872 break;
3873#endif
3874#ifdef CURSOR_BLINK
3875 case 12:
3876 cursor_blink_reset ();
4160 break; 3877 break;
4161#endif 3878#endif
4162 case 25: /* visible/invisible cursor */ 3879 case 25: /* visible/invisible cursor */
4163 scr_cursor_visible (state); 3880 scr_cursor_visible (state);
4164 break; 3881 break;
… …
4169 break; 3886 break;
4170 /* case 66: - application key pad */ 3887 /* case 66: - application key pad */
4171 /* case 67: - backspace key */ 3888 /* case 67: - backspace key */
4172 case 1000: /* X11 mouse reporting */ 3889 case 1000: /* X11 mouse reporting */
4173 if (state) /* orthogonal */ 3890 if (state) /* orthogonal */
4174 priv_modes &= ~PrivMode_MouseX10; 3891 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4175 break; 3892 break;
4176#if 0
4177 case 1001: 3893 case 1002:
4178 break; /* X11 mouse highlighting */ 3894 case 1003:
4179#endif 3895 if (state)
3896 {
3897 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3898 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3899 mouse_row = mouse_col = 0;
3900 vt_emask_mouse = PointerMotionMask;
3901 }
3902 else
3903 vt_emask_mouse = NoEventMask;
3904
3905 vt_select_input ();
3906 break;
4180 case 1010: /* scroll to bottom on TTY output inhibit */ 3907 case 1010: /* scroll to bottom on TTY output inhibit */
4181 set_option (Opt_scrollTtyOutput, !state); 3908 set_option (Opt_scrollTtyOutput, !state);
4182 break; 3909 break;
4183 case 1011: /* scroll to bottom on key press */ 3910 case 1011: /* scroll to bottom on key press */
4184 set_option (Opt_scrollTtyKeypress, state); 3911 set_option (Opt_scrollTtyKeypress, state);
4185 break; 3912 break;
4186 case 1047: /* secondary screen w/ clearing last */ 3913 case 1047: /* secondary screen w/ clearing last */
4187 if (OPTION (Opt_secondaryScreen)) 3914 if (option (Opt_secondaryScreen))
4188 if (current_screen != PRIMARY) 3915 if (!state)
4189 scr_erase_screen (2); 3916 scr_erase_screen (2);
3917
4190 scr_change_screen (state); 3918 scr_change_screen (state);
4191 break; 3919 break;
4192 case 1049: /* secondary screen w/ clearing first */ 3920 case 1049: /* secondary screen w/ clearing first */
3921 if (option (Opt_secondaryScreen))
3922 if (state)
3923 scr_cursor (SAVE);
3924
4193 scr_change_screen (state); 3925 scr_change_screen (state);
3926
4194 if (OPTION (Opt_secondaryScreen)) 3927 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 3928 if (state)
4196 scr_erase_screen (2); 3929 scr_erase_screen (2);
3930 else
3931 scr_cursor (RESTORE);
4197 break; 3932 break;
4198 default: 3933 default:
4199 break; 3934 break;
4200 } 3935 }
4201 } 3936 }
4202} 3937}
4203/*}}} */ 3938/*}}} */
4204 3939
4205/*{{{ process sgr sequences */ 3940/*{{{ process sgr sequences */
4206void 3941void ecb_hot
4207rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3942rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4208{ 3943{
4209 unsigned int i; 3944 unsigned int i;
4210 short rendset; 3945 short rendset;
4211 int rendstyle; 3946 int rendstyle;
… …
4253 //case 19: // ninth alt font 3988 //case 19: // ninth alt font
4254 //case 20: // gothic 3989 //case 20: // gothic
4255 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3990 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4256 rendset = 0, rendstyle = RS_Bold; 3991 rendset = 0, rendstyle = RS_Bold;
4257 break; 3992 break;
4258 case 22: // normal intensity 3993 case 22: // bold off (vt220)
4259 rendset = 0, rendstyle = RS_Bold; 3994 rendset = 0, rendstyle = RS_Bold;
4260 break; 3995 break;
4261 case 23: // disable italic 3996 case 23: // disable italic
4262 rendset = 0, rendstyle = RS_Italic; 3997 rendset = 0, rendstyle = RS_Italic;
4263 break; 3998 break;
4264 case 24: 3999 case 24: // underline off (vt220)
4265 rendset = 0, rendstyle = RS_Uline; 4000 rendset = 0, rendstyle = RS_Uline;
4266 break; 4001 break;
4267 case 25: 4002 case 25: // blink off (vt220)
4268 rendset = 0, rendstyle = RS_Blink; 4003 rendset = 0, rendstyle = RS_Blink;
4269 break; 4004 break;
4270 case 26: // variable spacing (iso 8613) 4005 case 26: // variable spacing (iso 8613)
4271 rendset = 0, rendstyle = RS_Blink; 4006 rendset = 0, rendstyle = RS_Blink;
4272 break; 4007 break;
4273 case 27: 4008 case 27: // reverse off (vt220)
4274 rendset = 0, rendstyle = RS_RVid; 4009 rendset = 0, rendstyle = RS_RVid;
4275 break; 4010 break;
4276 //case 28: // visible. NYI 4011 //case 28: // visible. NYI
4277 //case 29: // not crossed-out 4012 //case 29: // not crossed-out
4278 } 4013 }
… …
4293 case 35: 4028 case 35:
4294 case 36: 4029 case 36:
4295 case 37: 4030 case 37:
4296 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4031 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4297 break; 4032 break;
4298 case 38: // set fg color, ISO 8613-6
4299 if (nargs > i + 2 && arg[i + 1] == 5)
4300 {
4301 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4302 i += 2;
4303 }
4304 break;
4305 case 39: /* default fg */ 4033 case 39: /* default fg */
4306 scr_color (Color_fg, Color_fg); 4034 scr_color (Color_fg, Color_fg);
4307 break; 4035 break;
4308 4036
4309 case 40: 4037 case 40:
… …
4314 case 45: 4042 case 45:
4315 case 46: 4043 case 46:
4316 case 47: 4044 case 47:
4317 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4045 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4318 break; 4046 break;
4319 case 48: // set bg color, ISO 8613-6
4320 if (nargs > i + 2 && arg[i + 1] == 5)
4321 {
4322 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4323 i += 2;
4324 }
4325 break;
4326 case 49: /* default bg */ 4047 case 49: /* default bg */
4327 scr_color (Color_bg, Color_bg); 4048 scr_color (Color_bg, Color_bg);
4328 break; 4049 break;
4329 4050
4051 case 38: // set fg color, ISO 8613-6
4052 case 48: // set bg color, ISO 8613-6
4053 {
4054 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4055 unsigned int idx;
4056
4057 if (nargs > i + 2 && arg[i + 1] == 5)
4058 {
4059 idx = minCOLOR + arg[i + 2];
4060 i += 2;
4061
4062 scr_color (idx, fgbg);
4063 }
4064 else if (nargs > i + 4 && arg[i + 1] == 2)
4065 {
4066 unsigned int r = arg[i + 2];
4067 unsigned int g = arg[i + 3];
4068 unsigned int b = arg[i + 4];
4069 unsigned int a = 0xff;
4070
4071 idx = map_rgb24_color (r, g, b, a);
4072
4073 i += 4;
4074
4075 scr_color (idx, fgbg);
4076 }
4077 }
4078 break;
4079
4330 //case 50: // not variable spacing 4080 //case 50: // not variable spacing
4331 4081
4332#if ENABLE_FRILLS 4082#if !ENABLE_MINIMAL
4333 case 90: 4083 case 90:
4334 case 91: /* set bright fg color */ 4084 case 91: /* set bright fg color */
4335 case 92: 4085 case 92:
4336 case 93: 4086 case 93:
4337 case 94: 4087 case 94:
… …
4352 break; 4102 break;
4353#endif 4103#endif
4354 } 4104 }
4355 } 4105 }
4356} 4106}
4107
4108void
4109rxvt_term::set_cursor_style (int style)
4110{
4111 if (!IN_RANGE_INC (style, 0, 6))
4112 return;
4113
4114 if (style == 0)
4115 style = 1;
4116
4117 cursor_type = (style - 1) / 2;
4118 set_option (Opt_cursorUnderline, cursor_type == 1);
4119
4120#ifdef CURSOR_BLINK
4121 set_option (Opt_cursorBlink, style & 1);
4122 cursor_blink_reset ();
4123#endif
4124
4125 want_refresh = 1;
4126}
4357/*}}} */ 4127/*}}} */
4358 4128
4359/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4360void
4361rxvt_term::process_graphics ()
4362{
4363 unicode_t ch, cmd = cmd_getc ();
4364
4365 if (cmd == 'Q')
4366 { /* query graphics */
4367 tt_printf ("\033G0\012"); /* no graphics */
4368 return;
4369 }
4370 /* swallow other graphics sequences until terminating ':' */
4371 do
4372 ch = cmd_getc ();
4373 while (ch != ':');
4374}
4375/*}}} */
4376
4377/* ------------------------------------------------------------------------- */ 4129/* ---------------------------------------------------------------------- */
4130/* Write data to the pty as typed by the user, pasted with the mouse,
4131 * or generated by us in response to a query ESC sequence.
4132 */
4378 4133
4379/* 4134/*
4380 * Send printf () formatted output to the command. 4135 * Send printf () formatted output to the command.
4381 * Only use for small amounts of data. 4136 * Only use for small amounts of data.
4382 */ 4137 */
… …
4390 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4145 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4391 va_end (arg_ptr); 4146 va_end (arg_ptr);
4392 tt_write (buf, strlen (buf)); 4147 tt_write (buf, strlen (buf));
4393} 4148}
4394 4149
4395/* ---------------------------------------------------------------------- */
4396/* Write data to the pty as typed by the user, pasted with the mouse, 4150/* Write data to the pty as typed by the user. */
4397 * or generated by us in response to a query ESC sequence. 4151void
4398 */ 4152rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4399const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4153{
4154 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4155 return;
4156
4157 if (option (Opt_scrollTtyKeypress))
4158 if (view_start)
4159 {
4160 view_start = 0;
4161 want_refresh = 1;
4162 }
4163
4164 tt_write_ (data, len);
4165}
4400 4166
4401void 4167void
4402rxvt_term::tt_write (const char *data, unsigned int len) 4168rxvt_term::tt_write (const char *data, unsigned int len)
4403{ 4169{
4404 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4170 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4405 return; 4171 return;
4406 4172
4173 tt_write_ (data, len);
4174}
4175
4176static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4177
4178void
4179rxvt_term::tt_write_ (const char *data, unsigned int len)
4180{
4407 if (pty->pty < 0) 4181 if (pty->pty < 0)
4408 return; 4182 return;
4409 4183
4410 if (v_buflen == 0) 4184 if (v_buflen == 0)
4411 { 4185 {
4412 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4186 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4413 4187
4188 max_it (written, 0);
4189
4414 if ((unsigned int)written == len) 4190 if (written == len)
4415 return; 4191 return;
4416 4192
4417 data += written; 4193 data += written;
4418 len -= written; 4194 len -= written;
4419 } 4195 }
4420 4196
4421 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4197 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4422 4198
4423 memcpy (v_buffer + v_buflen, data, len); 4199 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len; 4200 v_buflen += len;
4425 4201
4426 pty_ev.set (EVENT_READ | EVENT_WRITE); 4202 pty_ev.set (ev::READ | ev::WRITE);
4427} 4203}
4428 4204
4429void rxvt_term::pty_write () 4205void rxvt_term::pty_write ()
4430{ 4206{
4431 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4207 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4436 4212
4437 if (v_buflen == 0) 4213 if (v_buflen == 0)
4438 { 4214 {
4439 free (v_buffer); 4215 free (v_buffer);
4440 v_buffer = 0; 4216 v_buffer = 0;
4441 v_buflen = 0;
4442 4217
4443 pty_ev.set (EVENT_READ); 4218 pty_ev.set (ev::READ);
4444 return; 4219 return;
4445 } 4220 }
4446 4221
4447 memmove (v_buffer, v_buffer + written, v_buflen); 4222 memmove (v_buffer, v_buffer + written, v_buflen);
4448 } 4223 }
4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4224 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4450 pty_ev.set (EVENT_READ); 4225 pty_ev.set (ev::READ);
4451} 4226}
4452 4227
4453/*----------------------- end-of-file (C source) -----------------------*/ 4228/*----------------------- end-of-file (C source) -----------------------*/
4454 4229

Diff Legend

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