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.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC vs.
Revision 1.603 by root, Mon Jun 5 13:39:34 2023 UTC

… …
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-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * 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,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
84 XK_Right, 0x2192, 84 XK_Right, 0x2192,
85 XK_KP_Right, 0x2192, 85 XK_KP_Right, 0x2192,
86 XK_Down, 0x2193, 86 XK_Down, 0x2193,
87 XK_KP_Down, 0x2193, 87 XK_KP_Down, 0x2193,
88 XK_Linefeed, 0x21b4, 88 XK_Linefeed, 0x21b4,
89 XK_Return, 0x21b5,
90 XK_KP_Enter, 0x21b5,
91 89
92 XK_Prior, 0x21de, 90 XK_Prior, 0x21de,
93 XK_Next, 0x21df, 91 XK_Next, 0x21df,
94 XK_Tab, 0x21e5, 92 XK_Tab, 0x21e5,
95 XK_ISO_Left_Tab, 0x21e6, 93 XK_ISO_Left_Tab, 0x21e6,
… …
110 XK_Begin, 0x2320, 108 XK_Begin, 0x2320,
111 XK_Delete, 0x2326, 109 XK_Delete, 0x2326,
112 XK_Clear, 0x2327, 110 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b, 111 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380, 112 XK_Insert, 0x2380,
113 XK_KP_Enter, 0x2386,
114 XK_Alt_L, 0x2387,
115 XK_Alt_R, 0x2387,
115 XK_Control_L, 0x2388, 116 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388, 117 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389, 118 XK_Pause, 0x2389,
118 XK_Break, 0x238a, 119 XK_Break, 0x238a,
119 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
120 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
121 XK_Print, 0x2399, 122 XK_Print, 0x2399,
123 XK_Return, 0x23ce,
122 124
123 XK_space, 0x2423, 125 XK_space, 0x2423,
124 126
125#ifdef XK_KP_Begin 127#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de, 128 XK_KP_Prior, 0x21de,
… …
131 XK_KP_Space, 0x2422, 133 XK_KP_Space, 0x2422,
132#endif 134#endif
133 0, 135 0,
134}; 136};
135 137
136void 138void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
138{ 140{
139 x = Pixel2Col (x); 141 x = Pixel2Col (x);
140 y = Pixel2Row (y); 142 y = Pixel2Row (y);
141 143
… …
149 151
150 text_t t = l.t[x]; 152 text_t t = l.t[x];
151 153
152 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
153 { 155 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 156 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 157 iso14755buf = ISO_14755_54;
156 break; 158 break;
157 } 159 }
158 160
159 x--; 161 x--;
160 } 162 }
161} 163}
162 164
163void 165void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 167{
166 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 169 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 170 int len;
169 171
170# if ENABLE_COMBINING 172# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
172 { 174 {
173 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch);
174 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
176 } 178 }
177 else 179 else
178# endif 180# endif
… …
181 183
182 alloc = 0; 184 alloc = 0;
183 chr = &ch2; 185 chr = &ch2;
184 len = 1; 186 len = 1;
185 } 187 }
188
189 char rowcol[40];
190 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 191
187 char attr[80]; // plenty 192 char attr[80]; // plenty
188 193
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 195 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 208 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 209 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 210 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 211 }
207 212
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 213 max_it (width, strlen (attr));
210 214
211 if (y >= 0) 215 if (y >= 0)
212 { 216 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 217 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
214 x = 0; 218 x = 0;
215 } 219 }
216 220
217 scr_overlay_new (x, y, width, len * 2 + 1); 221 scr_overlay_new (x, y, width, len * 2 + 2);
222
223 scr_overlay_set (0, 0, rowcol);
218 224
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 225 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 226
221 for (int y = 0; y < len; y++) 227 for (int y = 0; y < len; y++)
222 { 228 {
223 char buf[9]; 229 char buf[9];
224 230
225 ch = *chr++; 231 ch = *chr++;
226 232
227 sprintf (buf, "%8x", ch); 233 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 234 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 235 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 236# if !UNICODE_3
231 if (ch >= 0x10000) 237 if (ch >= 0x10000)
232 ch = 0xfffd; 238 ch = 0xfffd;
233# endif 239# endif
234 scr_overlay_set (11, y, ch, r); 240 scr_overlay_set (11, y + 1, ch, r);
235 241
236 if (WCWIDTH (ch) >= 2) 242 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 243 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 244 }
239 245
240// { 246// {
241// char buf[4+4+3+1]; 247// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 248// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 249// scr_overlay_set (0, 0, buf);
244// } 250// }
245 scr_overlay_set (0, len , attr); 251 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 252 for (int i = 0; i < len; i++)
247 { 253 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 254 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 255 free (fname[i]);
250 } 256 }
251 257
252# if ENABLE_COMBINING 258# if ENABLE_COMBINING
253 if (alloc) 259 if (alloc)
254 delete [] alloc; 260 delete [] alloc;
255# endif 261# endif
256} 262}
257#endif 263#endif
258 264
259void 265void ecb_cold
260rxvt_term::commit_iso14755 () 266rxvt_term::commit_iso14755 ()
261{ 267{
262 wchar_t ch = iso14755buf & ISO_14755_MASK; 268 wchar_t ch = iso14755buf & ISO_14755_MASK;
263 269
264 if (iso14755buf & ISO_14755_51) 270 if (iso14755buf & ISO_14755_51)
… …
282 } 288 }
283 289
284 iso14755buf = 0; 290 iso14755buf = 0;
285} 291}
286 292
287static int 293static int ecb_cold
288hex_keyval (XKeyEvent &ev) 294hex_keyval (XKeyEvent &ev)
289{ 295{
290 // check whether this event corresponds to a hex digit 296 // check whether this event corresponds to a hex digit
291 // if the modifiers had not been pressed. 297 // if the modifiers had not been pressed.
292 for (int index = 0; index < 8; index++) 298 for (int index = 0; index < 8; index++)
… …
301 307
302 return -1; 308 return -1;
303} 309}
304#endif 310#endif
305 311
306static inline KeySym 312static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp) 313translate_keypad (KeySym keysym, bool kp)
308{ 314{
309#ifdef XK_KP_Home 315#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = { 316 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home 317 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left 318 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up 319 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right 320 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down 321 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior 322 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next 323 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End 324 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin 325 XK_KP_5, // XK_KP_Begin
325 }; 326 };
326 327
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 328 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
337# endif 338# endif
338#endif 339#endif
339 return keysym; 340 return keysym;
340} 341}
341 342
342static inline int 343static inline int ecb_cold
343map_function_key (KeySym keysym) 344map_function_key (KeySym keysym)
344{ 345{
345 int param = 0; 346 int param = 0;
346 347
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 348 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
372 param = 3; 373 param = 3;
373 break; 374 break;
374 case XK_Select: 375 case XK_Select:
375 param = 4; 376 param = 4;
376 break; 377 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior: 378 case XK_Prior:
379 param = 5; 379 param = 5;
380 break; 380 break;
381 case XK_Next: 381 case XK_Next:
382 param = 6; 382 param = 6;
… …
385 param = 7; 385 param = 7;
386 break; 386 break;
387 case XK_End: 387 case XK_End:
388 param = 8; 388 param = 8;
389 break; 389 break;
390#endif
391 case XK_Help: 390 case XK_Help:
392 param = 28; 391 param = 28;
393 break; 392 break;
394 case XK_Menu: 393 case XK_Menu:
395 param = 29; 394 param = 29;
396 break; 395 break;
397 } 396 }
398 return param; 397 return param;
399} 398}
400 399
401void 400static inline wchar_t *
401rxvt_wcsdup (const wchar_t *str, int len)
402{
403 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
404 memcpy (r, str, len * sizeof (wchar_t));
405 r[len] = 0;
406 return r;
407}
408
409void ecb_cold
402rxvt_term::key_press (XKeyEvent &ev) 410rxvt_term::key_press (XKeyEvent &ev)
403{ 411{
404 int ctrl, meta, shft, len; 412 int ctrl, meta, shft, len;
405 KeySym keysym; 413 KeySym keysym = NoSymbol;
406 int valid_keysym;
407 char kbuf[KBUFSZ]; 414 char rkbuf[KBUFSZ + 1];
415 char *kbuf = rkbuf + 1;
408 416
409#if ISO_14755 417#if ISO_14755
410 if (iso14755buf & ISO_14755_52) 418 if (iso14755buf & ISO_14755_52)
411 return; 419 return;
412#endif 420#endif
… …
421 ctrl = ev.state & ControlMask; 429 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 430 meta = ev.state & ModMetaMask;
423 431
424 kbuf[0] = 0; 432 kbuf[0] = 0;
425 433
426#ifdef USE_XIM 434#if USE_XIM
427 if (Input_Context) 435 if (Input_Context)
428 { 436 {
429 Status status_return; 437 Status status_return;
430 438
431#if 0 439#if 0
… …
469 } 477 }
470 } 478 }
471 else 479 else
472 len = 0; 480 len = 0;
473 } 481 }
474
475 valid_keysym = status_return == XLookupKeySym
476 || status_return == XLookupBoth;
477 } 482 }
478 else 483 else
479#endif 484#endif
480 { 485 {
481 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 486 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
482 valid_keysym = keysym != NoSymbol; 487 }
488
489 if (keysym != NoSymbol)
483 } 490 {
491 KeySym orig_keysym = keysym;
484 492
485 if (valid_keysym) 493 /* Shift + F1 - F10 generates F11 - F20 */
494 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
495 {
496 keysym += (XK_F11 - XK_F1);
497 shft = 0; /* turn off Shift */
498 }
499
500 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
501 {
502 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
503 unsigned int newlen = 1;
504
505 if (ev.state & ModNumLockMask)
506 kp = false;
507
508 keysym = translate_keypad (keysym, kp);
509
510 switch (keysym)
511 {
512#ifndef NO_BACKSPACE_KEY
513 case XK_BackSpace:
514 if (priv_modes & PrivMode_HaveBackSpace)
515 {
516 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
517 ^ !!ctrl) ? '\b' : '\177';
518 kbuf[1] = '\0';
519 }
520 else
521 strcpy (kbuf, rs[Rs_backspace_key]);
522 break;
523#endif
524#ifndef NO_DELETE_KEY
525 case XK_Delete:
526 strcpy (kbuf, rs[Rs_delete_key]);
527 break;
528#endif
529 case XK_Tab:
530 if (shft)
531 strcpy (kbuf, "\033[Z");
532 else
533 {
534#ifdef CTRL_TAB_MAKES_META
535 if (ctrl)
536 meta = 1;
537#endif
538#ifdef MOD4_TAB_MAKES_META
539 if (ev.state & Mod4Mask)
540 meta = 1;
541#endif
542 newlen = 0;
543 }
544 break;
545
546 case XK_Up: /* "\033[A" */
547 case XK_Down: /* "\033[B" */
548 case XK_Right: /* "\033[C" */
549 case XK_Left: /* "\033[D" */
550 strcpy (kbuf, "\033[Z");
551 kbuf[2] = "DACB"[keysym - XK_Left];
552 /* do Shift first */
553 if (shft)
554 kbuf[2] = "dacb"[keysym - XK_Left];
555 else if (ctrl)
556 {
557 kbuf[1] = 'O';
558 kbuf[2] = "dacb"[keysym - XK_Left];
559 }
560 else if (priv_modes & PrivMode_aplCUR)
561 kbuf[1] = 'O';
562 break;
563
564 case XK_KP_Enter:
565 /* allow shift to override */
566 if (kp)
567 {
568 strcpy (kbuf, "\033OM");
569 break;
570 }
571
572 /* FALLTHROUGH */
573
574 case XK_Return:
575 if (priv_modes & PrivMode_LFNL)
576 {
577 kbuf[0] = '\015';
578 kbuf[1] = '\012';
579 kbuf[2] = '\0';
580 }
581 else
582 {
583 kbuf[0] = '\015';
584 kbuf[1] = '\0';
585 }
586 break;
587
588 case XK_KP_F1: /* "\033OP" */
589 case XK_KP_F2: /* "\033OQ" */
590 case XK_KP_F3: /* "\033OR" */
591 case XK_KP_F4: /* "\033OS" */
592 strcpy (kbuf, "\033OP");
593 kbuf[2] += (keysym - XK_KP_F1);
594 break;
595
596 case XK_KP_Multiply: /* "\033Oj" : "*" */
597 case XK_KP_Add: /* "\033Ok" : "+" */
598 case XK_KP_Separator: /* "\033Ol" : "," */
599 case XK_KP_Subtract: /* "\033Om" : "-" */
600 case XK_KP_Decimal: /* "\033On" : "." */
601 case XK_KP_Divide: /* "\033Oo" : "/" */
602 case XK_KP_0: /* "\033Op" : "0" */
603 case XK_KP_1: /* "\033Oq" : "1" */
604 case XK_KP_2: /* "\033Or" : "2" */
605 case XK_KP_3: /* "\033Os" : "3" */
606 case XK_KP_4: /* "\033Ot" : "4" */
607 case XK_KP_5: /* "\033Ou" : "5" */
608 case XK_KP_6: /* "\033Ov" : "6" */
609 case XK_KP_7: /* "\033Ow" : "7" */
610 case XK_KP_8: /* "\033Ox" : "8" */
611 case XK_KP_9: /* "\033Oy" : "9" */
612 /* allow shift to override */
613 if (kp)
614 {
615 strcpy (kbuf, "\033Oj");
616 kbuf[2] += (keysym - XK_KP_Multiply);
617 }
618 else
619 {
620 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
621 kbuf[1] = '\0';
622 }
623 break;
624
625 default:
626 {
627 int param = map_function_key (keysym);
628 if (param > 0)
629 sprintf (kbuf,"\033[%d~", param);
630 else
631 newlen = 0;
632 }
633 break;
634 }
635
636 if (newlen)
637 len = strlen (kbuf);
638
639 if (len > 0)
640 {
641 /*
642 * pass Shift/Control indicators for function keys ending with `~'
643 *
644 * eg,
645 * Prior = "ESC[5~"
646 * Shift+Prior = "ESC[5$"
647 * Ctrl+Prior = "ESC[5^"
648 * Ctrl+Shift+Prior = "ESC[5@"
649 */
650 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
651 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
652
653 /*
654 * Pass meta for all function keys, if 'meta' option set
655 */
656#ifdef META8_OPTION
657 if (meta && (meta_char == 0x80))
658 kbuf[len - 1] |= 0x80;
659#endif
660 }
661
662 }
663 else if (ctrl && keysym == XK_minus)
664 {
665 len = 1;
666 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
667 }
668 else if (keysym == XK_ISO_Left_Tab)
669 {
670 strcpy (kbuf, "\033[Z");
671 len = 3;
672 }
673 else
674 {
675#ifdef META8_OPTION
676 /* set 8-bit on */
677 if (meta && (meta_char == 0x80))
678 {
679 char *ch;
680
681 for (ch = kbuf; ch < kbuf + len; ch++)
682 *ch |= 0x80;
683 }
684#endif
685 /* nil */ ;
686 }
687
688 keysym = orig_keysym;
689 }
690
691 /* escape prefix */
692 if (len && meta
693#ifdef META8_OPTION
694 && meta_char == C0_ESC
695#endif
696 )
697 {
698 *--kbuf = C0_ESC;
699 len++;
700 }
701
702 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
703 return;
704
705 if (keysym != NoSymbol)
486 { 706 {
487#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
488 if (keyboard->dispatch (this, keysym, ev.state)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
489 return; 709 return;
490#endif 710#endif
491 711
492 if (saveLines) 712 if (saveLines)
493 { 713 {
… …
506#endif 726#endif
507 max_it (lnsppg, 1); 727 max_it (lnsppg, 1);
508 728
509 if (keysym == XK_Prior) 729 if (keysym == XK_Prior)
510 { 730 {
511 scr_page (UP, lnsppg); 731 scr_page (lnsppg);
512 return; 732 return;
513 } 733 }
514 else if (keysym == XK_Next) 734 else if (keysym == XK_Next)
515 { 735 {
516 scr_page (DN, lnsppg); 736 scr_page (-lnsppg);
517 return; 737 return;
518 } 738 }
519 } 739 }
520#ifdef SCROLL_ON_UPDOWN_KEYS 740#ifdef SCROLL_ON_UPDOWN_KEYS
521 if (IS_SCROLL_MOD) 741 if (IS_SCROLL_MOD)
522 { 742 {
523 if (keysym == XK_Up) 743 if (keysym == XK_Up)
524 { 744 {
525 scr_page (UP, 1); 745 scr_page (1);
526 return; 746 return;
527 } 747 }
528 else if (keysym == XK_Down) 748 else if (keysym == XK_Down)
529 { 749 {
530 scr_page (DN, 1); 750 scr_page (-1);
531 return; 751 return;
532 } 752 }
533 } 753 }
534#endif 754#endif
535#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
536 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
537 { 757 {
538 if (keysym == XK_Home) 758 if (keysym == XK_Home)
539 { 759 {
540 scr_move_to (0, 1); 760 scr_changeview (top_row);
541 return; 761 return;
542 } 762 }
543 else if (keysym == XK_End) 763 else if (keysym == XK_End)
544 { 764 {
545 scr_move_to (1, 1); 765 scr_changeview (0);
546 return; 766 return;
547 } 767 }
548 } 768 }
549#endif 769#endif
550 } 770 }
551 771
552 if (shft) 772 if (shft)
553 { 773 {
554 /* Shift + F1 - F10 generates F11 - F20 */
555 if (keysym >= XK_F1 && keysym <= XK_F10)
556 {
557 keysym += (XK_F11 - XK_F1);
558 shft = 0; /* turn off Shift */
559 }
560 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
561 { 775 {
562 switch (keysym) 776 switch (keysym)
563 { 777 {
564 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
565 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573 return; 787 return;
574#endif 788#endif
575 } 789 }
576 } 790 }
791 }
792
793 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
794 {
795 if (keysym == XK_v)
796 selection_request (ev.time, Sel_Clipboard);
797 else if (selection.len > 0)
798 {
799 free (selection.clip_text);
800 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
801 selection.clip_len = selection.len;
802 selection_grab (CurrentTime, true);
803 }
804
805 return;
577 } 806 }
578 807
579#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
580 // ISO 14755 support 809 // ISO 14755 support
581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
636 { 865 {
637 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
638 return; 867 return;
639 } 868 }
640#endif 869#endif
641
642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
684 newlen = 0;
685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
768 {
769 int param = map_function_key (keysym);
770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
774 }
775 break;
776 }
777
778 if (newlen)
779 len = strlen (kbuf);
780
781 /*
782 * Pass meta for all function keys, if 'meta' option set
783 */
784#ifdef META8_OPTION
785 if (meta && (meta_char == 0x80) && len > 0)
786 kbuf[len - 1] |= 0x80;
787#endif
788
789 }
790 else if (ctrl && keysym == XK_minus)
791 {
792 len = 1;
793 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
794 }
795 else if (keysym == XK_ISO_Left_Tab)
796 {
797 strcpy (kbuf, "\033[Z");
798 len = 3;
799 }
800 else
801 {
802#ifdef META8_OPTION
803 /* set 8-bit on */
804 if (meta && (meta_char == 0x80))
805 {
806 char *ch;
807
808 for (ch = kbuf; ch < kbuf + len; ch++)
809 *ch |= 0x80;
810
811 meta = 0;
812 }
813#endif
814 /* nil */ ;
815 }
816 } 870 }
817
818 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
819 return;
820 871
821 if (len <= 0) 872 if (len <= 0)
822 return; /* not mapped */ 873 return; /* not mapped */
823 874
824 if (option (Opt_scrollTtyKeypress))
825 if (view_start)
826 {
827 view_start = 0;
828 want_refresh = 1;
829 }
830
831 /*
832 * these modifications only affect the static keybuffer
833 * pass Shift/Control indicators for function keys ending with `~'
834 *
835 * eg,
836 * Prior = "ESC[5~"
837 * Shift+Prior = "ESC[5$"
838 * Ctrl+Prior = "ESC[5^"
839 * Ctrl+Shift+Prior = "ESC[5@"
840 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841 */
842 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845 /* escape prefix */
846 if (meta
847#ifdef META8_OPTION
848 && meta_char == C0_ESC
849#endif
850 )
851 {
852 const char ch = C0_ESC;
853 tt_write (&ch, 1);
854 }
855
856 tt_write (kbuf, (unsigned int)len); 875 tt_write_user_input (kbuf, (unsigned int)len);
857} 876}
858 877
859void 878void ecb_cold
860rxvt_term::key_release (XKeyEvent &ev) 879rxvt_term::key_release (XKeyEvent &ev)
861{ 880{
862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym; 882 KeySym keysym;
864 883
… …
936void 955void
937rxvt_term::flush () 956rxvt_term::flush ()
938{ 957{
939 flush_ev.stop (); 958 flush_ev.stop ();
940 959
941#ifdef HAVE_BG_PIXMAP 960#ifdef HAVE_IMG
942 if (bg_flags & BG_NEEDS_REFRESH) 961 if (bg_flags & BG_NEEDS_REFRESH)
943 { 962 {
944 bg_flags &= ~BG_NEEDS_REFRESH; 963 bg_flags &= ~BG_NEEDS_REFRESH;
945 scr_touch (false); 964 scr_touch (false);
946 } 965 }
… …
986 while (row < end_row); 1005 while (row < end_row);
987 } 1006 }
988 1007
989 scr_refresh (); 1008 scr_refresh ();
990 scrollBar.show (1); 1009 scrollBar.show (1);
991#ifdef USE_XIM 1010#if USE_XIM
992 im_send_spot (); 1011 im_send_spot ();
993#endif 1012#endif
994 } 1013 }
995 1014
996 display->flush (); 1015 display->flush ();
… …
999/* checks whether a refresh is requested and starts the refresh timer */ 1018/* checks whether a refresh is requested and starts the refresh timer */
1000void 1019void
1001rxvt_term::refresh_check () 1020rxvt_term::refresh_check ()
1002{ 1021{
1003 if (want_refresh && !flush_ev.is_active ()) 1022 if (want_refresh && !flush_ev.is_active ())
1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1023 flush_ev.start ();
1005 1024
1006 display->flush (); 1025 display->flush ();
1007} 1026}
1008 1027
1009void 1028void
… …
1014 refresh_count = 0; 1033 refresh_count = 0;
1015 flush (); 1034 flush ();
1016} 1035}
1017 1036
1018#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
1038void
1039rxvt_term::cursor_blink_reset ()
1040{
1041 if (!focus)
1042 return;
1043
1044 if (hidden_cursor)
1045 {
1046 hidden_cursor = 0;
1047 want_refresh = 1;
1048 }
1049
1050 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1051 cursor_blink_ev.again ();
1052 else
1053 cursor_blink_ev.stop ();
1054}
1055
1019void 1056void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1057rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1058{
1022 hidden_cursor = !hidden_cursor; 1059 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1060 want_refresh = 1;
… …
1042 1079
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1080#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1081void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1082rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1083{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1084 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1085 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1086 {
1050 want_refresh = 1; 1087 want_refresh = 1;
1051 refresh_check (); 1088 refresh_check ();
1052 } 1089 }
1053 else 1090 else
… …
1057 1094
1058#ifdef SELECTION_SCROLLING 1095#ifdef SELECTION_SCROLLING
1059void 1096void
1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1097rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1061{ 1098{
1062 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1099 if (scr_page (scroll_selection_lines))
1063 { 1100 {
1064 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1101 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1065 want_refresh = 1; 1102 want_refresh = 1;
1066 refresh_check (); 1103 refresh_check ();
1067 } 1104 }
… …
1072 1109
1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1110#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1074void 1111void
1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1112rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1076{ 1113{
1077 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1114 if (scr_page (mouse_slip_wheel_speed))
1078 { 1115 {
1079 want_refresh = 1; 1116 want_refresh = 1;
1080 refresh_check (); 1117 refresh_check ();
1081 } 1118 }
1082 1119
… …
1203 pty_write (); 1240 pty_write ();
1204 1241
1205 refresh_check (); 1242 refresh_check ();
1206} 1243}
1207 1244
1208void 1245void ecb_cold
1209rxvt_term::pointer_unblank () 1246rxvt_term::pointer_unblank ()
1210{ 1247{
1211 XDefineCursor (dpy, vt, TermWin_cursor); 1248 XDefineCursor (dpy, vt, TermWin_cursor);
1212 recolour_cursor (); 1249 recolor_cursor ();
1213 1250
1214#ifdef POINTER_BLANK 1251#ifdef POINTER_BLANK
1215 hidden_pointer = 0; 1252 hidden_pointer = 0;
1216 1253
1217 if (option (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
1218 pointer_ev.start (pointerBlankDelay); 1255 pointer_ev.start (pointerBlankDelay);
1219#endif 1256#endif
1220} 1257}
1221 1258
1222#ifdef POINTER_BLANK 1259#ifdef POINTER_BLANK
1223void 1260void ecb_cold
1224rxvt_term::pointer_blank () 1261rxvt_term::pointer_blank ()
1225{ 1262{
1226 if (!option (Opt_pointerBlank)) 1263 if (!option (Opt_pointerBlank))
1227 return; 1264 return;
1228 1265
… …
1230 XFlush (dpy); 1267 XFlush (dpy);
1231 1268
1232 hidden_pointer = 1; 1269 hidden_pointer = 1;
1233} 1270}
1234 1271
1235void 1272void ecb_cold
1236rxvt_term::pointer_cb (ev::timer &w, int revents) 1273rxvt_term::pointer_cb (ev::timer &w, int revents)
1237{ 1274{
1238 make_current (); 1275 make_current ();
1239 1276
1240 pointer_blank (); 1277 pointer_blank ();
… …
1242#endif 1279#endif
1243 1280
1244void 1281void
1245rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1246{ 1283{
1247 int button_number, key_state = 0; 1284 int button_number, state = 0;
1248 int x, y; 1285 int x, y;
1249 int code = 32; 1286 bool release = ev.type == ButtonRelease;
1250 1287
1251 x = Pixel2Col (ev.x) + 1; 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1252 y = Pixel2Row (ev.y) + 1; 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1253 1290
1254 if (ev.type == MotionNotify) 1291 if (ev.type == MotionNotify)
1255 { 1292 {
1256 if (x == mouse_row && y == mouse_col) 1293 if (x == mouse_row && y == mouse_col)
1257 return; 1294 return;
1258 1295
1259 mouse_row = x; 1296 mouse_row = x;
1260 mouse_col = y; 1297 mouse_col = y;
1261 code += 32; 1298 state += 32;
1262 }
1263
1264 if (MEvent.button == AnyButton)
1265 button_number = 3;
1266 else
1267 { 1299 }
1300
1268 button_number = MEvent.button - Button1; 1301 button_number = MEvent.button - Button1;
1269 /* add 0x3D for wheel events, like xterm does */ 1302 if (button_number > 10)
1303 return;
1304 else if (button_number >= 7)
1305 button_number += 128 - 7;
1270 if (button_number >= 3) 1306 else if (button_number >= 3)
1271 button_number += 64 - 3; 1307 button_number += 64 - 3;
1272 }
1273 1308
1274 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1275 { 1310 {
1276 /* 1311 /*
1277 * do not report ButtonRelease 1312 * do not report ButtonRelease
1278 * no state info allowed 1313 * no state info allowed
1279 */ 1314 */
1280 key_state = 0; 1315 if (release)
1281 if (button_number == 3)
1282 return; 1316 return;
1283 } 1317 }
1284 else 1318 else
1285 { 1319 {
1286 /* XTerm mouse reporting needs these values: 1320 /* XTerm mouse reporting needs these values:
… …
1288 * 8 = Meta 1322 * 8 = Meta
1289 * 16 = Control 1323 * 16 = Control
1290 * plus will add in our own Double-Click reporting 1324 * plus will add in our own Double-Click reporting
1291 * 32 = Double Click 1325 * 32 = Double Click
1292 */ 1326 */
1293 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1327 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1294 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1328 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1295 + ((MEvent.state & ControlMask) ? 16 : 0); 1329 + ((MEvent.state & ControlMask) ? 16 : 0);
1296#ifdef MOUSE_REPORT_DOUBLECLICK 1330#ifdef MOUSE_REPORT_DOUBLECLICK
1297 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1331 state += ((MEvent.clicks > 1) ? 32 : 0);
1298#endif 1332#endif
1299 } 1333 }
1334
1335 int code = 32 + (release ? 3 : button_number) + state;
1300 1336
1301#if DEBUG_MOUSEREPORT 1337#if DEBUG_MOUSEREPORT
1302 fprintf (stderr, "Mouse ["); 1338 fprintf (stderr, "Mouse [");
1303 if (key_state & 16) 1339 if (state & 16)
1304 fputc ('C', stderr); 1340 fputc ('C', stderr);
1305 if (key_state & 4) 1341 if (state & 4)
1306 fputc ('S', stderr); 1342 fputc ('S', stderr);
1307 if (key_state & 8) 1343 if (state & 8)
1308 fputc ('A', stderr); 1344 fputc ('A', stderr);
1309 if (key_state & 32) 1345 if (state & 32)
1310 fputc ('2', stderr); 1346 fputc ('2', stderr);
1311 fprintf (stderr, "]: <%d>, %d/%d\n", 1347 fprintf (stderr, "]: <%d>, %d/%d\n",
1312 button_number, 1348 button_number,
1313 x, 1349 x,
1314 y); 1350 y);
1315#endif 1351#endif
1316 1352
1317#if ENABLE_FRILLS 1353#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight) 1354 if (priv_modes & PrivMode_ExtMouseSGR)
1355 tt_printf ("\033[<%d;%d;%d%c",
1356 button_number + state,
1357 x,
1358 y,
1359 release ? 'm' : 'M');
1360 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1319 tt_printf ("\033[%d;%d;%dM", 1361 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state, 1362 code,
1321 x, 1363 x,
1322 y); 1364 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse) 1365 else if (priv_modes & PrivMode_ExtMouseUTF8)
1366 if (code < 128)
1324 tt_printf ("\033[M%c%lc%lc", 1367 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state, 1368 code,
1326 wint_t (32 + x), 1369 wint_t (32 + x),
1327 wint_t (32 + y)); 1370 wint_t (32 + y));
1371 else
1372 tt_printf ("\033[M%c%c%lc%lc",
1373 0xc0 + (code >> 6),
1374 0x80 + (code & 0x3f),
1375 wint_t (32 + x),
1376 wint_t (32 + y));
1328 else 1377 else
1329#endif 1378#endif
1330 tt_printf ("\033[M%c%c%c", 1379 tt_printf ("\033[M%c%c%c",
1331 code + button_number + key_state, 1380 code,
1332 32 + x, 1381 32 + x,
1333 32 + y); 1382 32 + y);
1334} 1383}
1335 1384
1336/*{{{ process an X event */ 1385/*{{{ process an X event */
1337void 1386void ecb_hot
1338rxvt_term::x_cb (XEvent &ev) 1387rxvt_term::x_cb (XEvent &ev)
1339{ 1388{
1340 make_current (); 1389 make_current ();
1341 1390
1342 dLocal (Display *, dpy); 1391 dLocal (Display *, dpy);
… …
1445 if (ev.xconfigure.window == parent) 1494 if (ev.xconfigure.window == parent)
1446 { 1495 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1496 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1497 ;
1449 1498
1450#ifdef HAVE_BG_PIXMAP 1499 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1451 bool moved = false; 1500
1452 if (bg_window_position_sensitive ()) 1501 if (want_position_change)
1453 { 1502 {
1454 int x, y; 1503 int x, y;
1504
1455 if (ev.xconfigure.send_event) 1505 if (ev.xconfigure.send_event)
1456 { 1506 {
1457 x = ev.xconfigure.x; 1507 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y; 1508 y = ev.xconfigure.y;
1459 } 1509 }
1460 else 1510 else
1461 get_window_origin (x, y); 1511 get_window_origin (x, y);
1462 1512
1463 if (bg_set_position (x, y) 1513 if (x != parent_x || y != parent_y)
1464 || !(bg_flags & BG_IS_VALID)) 1514 {
1465 moved = true; 1515 parent_x = x;
1516 parent_y = y;
1517 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1518 }
1466 } 1519 }
1467#endif
1468 1520
1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1521 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1470 { 1522 {
1471 seen_resize = 1; 1523 seen_resize = 1;
1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1524 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1473 } 1525 }
1474 else
1475 {
1476#ifdef HAVE_BG_PIXMAP
1477 if (moved)
1478 update_background ();
1479#endif
1480 }
1481 1526
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483 } 1528 }
1484 break; 1529 break;
1485 1530
… …
1494 case SelectionRequest: 1539 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1496 break; 1541 break;
1497 1542
1498 case MapNotify: 1543 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP
1500 /* This is needed specifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1504 * reparenting.
1505 * We should not render background immediately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025);
1514#endif
1515 mapped = 1; 1544 mapped = 1;
1516#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1517 text_blink_ev.start (); 1546 text_blink_ev.start ();
1518#endif 1547#endif
1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1587 ;
1559 1588
1560 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1590 {
1562 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1563 scrollBar.show (0); 1592 scrollBar.show (0);
1564 } 1593 }
1565 } 1594 }
1566 break; 1595 break;
1567 1596
1568 case MotionNotify: 1597 case MotionNotify:
1569#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1570 if (hidden_pointer) 1599 if (hidden_pointer)
1571 pointer_unblank (); 1600 pointer_unblank ();
1572#endif 1601#endif
1602 if (!bypass_keystate
1573 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1603 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1574 || priv_modes & PrivMode_MouseAnyEvent) 1604 || priv_modes & PrivMode_MouseAnyEvent))
1575 mouse_report (ev.xbutton); 1605 mouse_report (ev.xbutton);
1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1577 break; 1607 break;
1578 1608
1579 if (ev.xany.window == vt) 1609 if (ev.xany.window == vt)
… …
1591 &unused_root_x, &unused_root_y, 1621 &unused_root_x, &unused_root_y,
1592 &ev.xbutton.x, &ev.xbutton.y, 1622 &ev.xbutton.x, &ev.xbutton.y,
1593 &ev.xbutton.state); 1623 &ev.xbutton.state);
1594#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1595 /* deal with a `jumpy' mouse */ 1625 /* deal with a `jumpy' mouse */
1596 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1626 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1627#endif
1597 { 1628 {
1598#endif
1599#if ISO_14755 1629#if ISO_14755
1600 // 5.4 1630 // 5.4
1601 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1631 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1602 { 1632 {
1603 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1633 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1609 1639
1610#ifdef SELECTION_SCROLLING 1640#ifdef SELECTION_SCROLLING
1611 if (ev.xbutton.y < int_bwidth 1641 if (ev.xbutton.y < int_bwidth
1612 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1642 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1613 { 1643 {
1644 page_dirn scroll_selection_dir;
1614 int dist; 1645 int dist;
1615 1646
1616 /* don't clobber the current delay if we are 1647 /* don't clobber the current delay if we are
1617 * already in the middle of scrolling. 1648 * already in the middle of scrolling.
1618 */ 1649 */
… …
1633 dist = int_bwidth - ev.xbutton.y; 1664 dist = int_bwidth - ev.xbutton.y;
1634 } 1665 }
1635 else 1666 else
1636 { 1667 {
1637 scroll_selection_dir = DN; 1668 scroll_selection_dir = DN;
1638 dist = ev.xbutton.y - (int_bwidth + height); 1669 dist = ev.xbutton.y - (int_bwidth + vt_height);
1639 } 1670 }
1640 1671
1641 scroll_selection_lines = Pixel2Height (dist) 1672 scroll_selection_lines = Pixel2Height (dist)
1642 / SELECTION_SCROLL_LINE_SPEEDUP 1673 / SELECTION_SCROLL_LINE_SPEEDUP
1643 + 1; 1674 + 1;
1644 min_it (scroll_selection_lines, 1675 min_it (scroll_selection_lines,
1645 SELECTION_SCROLL_MAX_LINES); 1676 SELECTION_SCROLL_MAX_LINES);
1677 scroll_selection_lines *= scroll_selection_dir;
1646 } 1678 }
1647 else 1679 else
1648 { 1680 {
1649 /* we are within the text window, so we 1681 /* we are within the text window, so we
1650 * shouldn't be scrolling 1682 * shouldn't be scrolling
1651 */ 1683 */
1652 sel_scroll_ev.stop(); 1684 sel_scroll_ev.stop();
1653 } 1685 }
1654#endif 1686#endif
1655#ifdef MOUSE_THRESHOLD
1656 } 1687 }
1657#endif
1658 } 1688 }
1659 } 1689 }
1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1661 { 1691 {
1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1663 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1664 ; 1694 ;
1665 1695
… …
1675 } 1705 }
1676 break; 1706 break;
1677 } 1707 }
1678 1708
1679#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1680 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.again (); 1711 cursor_blink_reset ();
1689 }
1690#endif 1712#endif
1691 1713
1692#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1716 {
… …
1705 1727
1706 refresh_check (); 1728 refresh_check ();
1707} 1729}
1708 1730
1709#if ENABLE_FRILLS 1731#if ENABLE_FRILLS
1710void 1732void ecb_cold
1711rxvt_term::set_urgency (bool enable) 1733rxvt_term::set_urgency (bool enable)
1712{ 1734{
1713 if (enable == urgency_hint) 1735 if (enable == urgency_hint)
1714 return; 1736 return;
1715 1737
1716 if (XWMHints *h = XGetWMHints (dpy, parent)) 1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 { 1739 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h); 1741 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable; 1742 urgency_hint = enable;
1743 XFree (h);
1721 } 1744 }
1722} 1745}
1723#endif 1746#endif
1724 1747
1725void 1748void ecb_cold
1726rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1727{ 1750{
1728 if (!focus) 1751 if (!focus)
1729 { 1752 {
1730 focus = 1; 1753 focus = 1;
… …
1743#endif 1766#endif
1744#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1745 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1746 { 1769 {
1747 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1748 scr_recolour (); 1771 scr_recolor ();
1749 } 1772 }
1750#endif 1773#endif
1751#if ENABLE_FRILLS 1774#if ENABLE_FRILLS
1752 if (option (Opt_urgentOnBell)) 1775 if (option (Opt_urgentOnBell))
1753 set_urgency (0); 1776 set_urgency (0);
1777
1778 if (priv_modes & PrivMode_FocusEvent)
1779 tt_printf ("\x1b[I");
1754#endif 1780#endif
1755 1781
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1782 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1757 } 1783 }
1758} 1784}
1759 1785
1760void 1786void ecb_cold
1761rxvt_term::focus_out () 1787rxvt_term::focus_out ()
1762{ 1788{
1763 if (focus) 1789 if (focus)
1764 { 1790 {
1765 focus = 0; 1791 focus = 0;
1766 want_refresh = 1; 1792 want_refresh = 1;
1767 1793
1768#if ENABLE_FRILLS 1794#if ENABLE_FRILLS
1769 if (option (Opt_urgentOnBell)) 1795 if (option (Opt_urgentOnBell))
1770 set_urgency (0); 1796 set_urgency (0);
1797
1798 if (priv_modes & PrivMode_FocusEvent)
1799 tt_printf ("\x1b[O");
1771#endif 1800#endif
1772#if ENABLE_FRILLS || ISO_14755 1801#if ENABLE_FRILLS || ISO_14755
1773 if (iso14755buf) 1802 if (iso14755buf)
1774 { 1803 {
1775 iso14755buf = 0; 1804 iso14755buf = 0;
… …
1790#endif 1819#endif
1791#if OFF_FOCUS_FADING 1820#if OFF_FOCUS_FADING
1792 if (rs[Rs_fade]) 1821 if (rs[Rs_fade])
1793 { 1822 {
1794 pix_colors = pix_colors_unfocused; 1823 pix_colors = pix_colors_unfocused;
1795 scr_recolour (); 1824 scr_recolor ();
1796 } 1825 }
1797#endif 1826#endif
1798 1827
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1828 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1800 } 1829 }
1801} 1830}
1802 1831
1803void 1832void ecb_cold
1804rxvt_term::update_fade_color (unsigned int idx) 1833rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1805{ 1834{
1806#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1808 { 1837 {
1838 if (!first_time)
1839 pix_colors_focused [idx].free (this);
1840
1809 rgba c; 1841 rgba c;
1810 pix_colors [Color_fade].get (c); 1842 pix_colors [Color_fade].get (c);
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1843 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 } 1844 }
1813#endif 1845#endif
1814} 1846}
1815 1847
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL 1848#if ENABLE_PERL
1817void 1849void ecb_hot
1818rxvt_term::rootwin_cb (XEvent &ev) 1850rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1851{
1820 make_current (); 1852 make_current ();
1821 1853
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1854 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1855 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return; 1856 return;
1825 1857
1826# if ENABLE_TRANSPARENCY
1827 switch (ev.type) 1858 switch (ev.type)
1828 { 1859 {
1829 case PropertyNotify: 1860 case PropertyNotify:
1830 /* 1861 /*
1831 * if user used some Esetroot compatible prog to set the root bg, 1862 * if user used some Esetroot compatible prog to set the root bg,
1832 * use the property to determine the pixmap. We use it later on. 1863 * use the property to determine the pixmap. We use it later on.
1833 */ 1864 */
1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1865 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1866 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836 { 1867 {
1837 bg_set_root_pixmap (); 1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1838 update_background ();
1839 } 1869 }
1840 1870
1841 break; 1871 break;
1842 } 1872 }
1843# endif
1844 1873
1845 refresh_check (); 1874 refresh_check ();
1846} 1875}
1847#endif 1876#endif
1848 1877
… …
1871 iso14755_54 (ev.x, ev.y); 1900 iso14755_54 (ev.x, ev.y);
1872 return; 1901 return;
1873 } 1902 }
1874#endif 1903#endif
1875 1904
1876 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1905 clickintime = ev.time - MEvent.time < multiClickTime;
1877 1906
1878 if (reportmode) 1907 if (reportmode)
1879 { 1908 {
1880 /* mouse report from vt window */ 1909 /* mouse report from vt window */
1881 /* save the xbutton state (for ButtonRelease) */ 1910 /* save the xbutton state (for ButtonRelease) */
… …
1972 if (scrollBar.upButton (ev.y)) 2001 if (scrollBar.upButton (ev.y))
1973 direction = UP; /* up */ 2002 direction = UP; /* up */
1974 else if (scrollBar.dnButton (ev.y)) 2003 else if (scrollBar.dnButton (ev.y))
1975 direction = DN; /* down */ 2004 direction = DN; /* down */
1976 2005
1977 scrollBar.state = STATE_IDLE; 2006 scrollBar.state = SB_STATE_IDLE;
1978 /* 2007 /*
1979 * Rxvt-style scrollbar: 2008 * Rxvt-style scrollbar:
1980 * move up if mouse is above slider 2009 * move up if mouse is above slider
1981 * move dn if mouse is below slider 2010 * move dn if mouse is below slider
1982 * 2011 *
… …
2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2050 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2022#endif 2051#endif
2023 if (scr_page (direction, 1)) 2052 if (scr_page (direction, 1))
2024 { 2053 {
2025 if (direction == UP) 2054 if (direction == UP)
2026 scrollBar.state = STATE_UP; 2055 scrollBar.state = SB_STATE_UP;
2027 else 2056 else
2028 scrollBar.state = STATE_DOWN; 2057 scrollBar.state = SB_STATE_DOWN;
2029 } 2058 }
2030 } 2059 }
2031 else 2060 else
2032 switch (ev.button) 2061 switch (ev.button)
2033 { 2062 {
2034 case Button2: 2063 case Button2:
2035 switch (scrollBar.align) 2064 switch (scrollBar.align)
2036 { 2065 {
2037 case R_SB_ALIGN_TOP: 2066 case SB_ALIGN_TOP:
2038 csrO = 0; 2067 csrO = 0;
2039 break; 2068 break;
2040 case R_SB_ALIGN_CENTRE: 2069 case SB_ALIGN_CENTRE:
2041 csrO = (scrollBar.bot - scrollBar.top) / 2; 2070 csrO = (scrollBar.bot - scrollBar.top) / 2;
2042 break; 2071 break;
2043 case R_SB_ALIGN_BOTTOM: 2072 case SB_ALIGN_BOTTOM:
2044 csrO = scrollBar.bot - scrollBar.top; 2073 csrO = scrollBar.bot - scrollBar.top;
2045 break; 2074 break;
2046 } 2075 }
2047 2076
2048 if (scrollBar.style == R_SB_XTERM 2077 if (scrollBar.style == SB_STYLE_XTERM
2049 || scrollBar.above_slider (ev.y) 2078 || scrollBar.above_slider (ev.y)
2050 || scrollBar.below_slider (ev.y)) 2079 || scrollBar.below_slider (ev.y))
2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ()); 2080 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2052 2081
2053 scrollBar.state = STATE_MOTION; 2082 scrollBar.state = SB_STATE_MOTION;
2054 break; 2083 break;
2055 2084
2056 case Button1: 2085 case Button1:
2057 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2086 if (scrollBar.align == SB_ALIGN_CENTRE)
2058 csrO = ev.y - scrollBar.top; 2087 csrO = ev.y - scrollBar.top;
2059 /* FALLTHROUGH */ 2088 /* FALLTHROUGH */
2060 2089
2061 case Button3: 2090 case Button3:
2062 if (scrollBar.style != R_SB_XTERM) 2091 if (scrollBar.style != SB_STYLE_XTERM)
2063 { 2092 {
2064 if (scrollBar.above_slider (ev.y)) 2093 if (scrollBar.above_slider (ev.y))
2065# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
2066 scr_page (UP, nrow - 1); 2095 scr_page (UP, nrow - 1);
2067# else 2096# else
… …
2072 scr_page (DN, nrow - 1); 2101 scr_page (DN, nrow - 1);
2073# else 2102# else
2074 scr_page (DN, nrow / 4); 2103 scr_page (DN, nrow / 4);
2075# endif 2104# endif
2076 else 2105 else
2077 scrollBar.state = STATE_MOTION; 2106 scrollBar.state = SB_STATE_MOTION;
2078 } 2107 }
2079 else 2108 else
2080 { 2109 {
2081 scr_page ((ev.button == Button1 ? DN : UP), 2110 scr_page ((ev.button == Button1 ? DN : UP),
2082 (nrow 2111 (nrow
… …
2099 2128
2100 csrO = 0; /* reset csr Offset */ 2129 csrO = 0; /* reset csr Offset */
2101 if (!bypass_keystate) 2130 if (!bypass_keystate)
2102 reportmode = !! (priv_modes & PrivMode_mouse_report); 2131 reportmode = !! (priv_modes & PrivMode_mouse_report);
2103 2132
2104 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2133 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2105 { 2134 {
2106 scrollBar.state = STATE_IDLE; 2135 scrollBar.state = SB_STATE_IDLE;
2107 scrollBar.show (0); 2136 scrollBar.show (0);
2108 } 2137 }
2109 2138
2110#ifdef SELECTION_SCROLLING 2139#ifdef SELECTION_SCROLLING
2111 sel_scroll_ev.stop(); 2140 sel_scroll_ev.stop();
… …
2124 2153
2125 if (reportmode) 2154 if (reportmode)
2126 { 2155 {
2127 /* mouse report from vt window */ 2156 /* mouse report from vt window */
2128 /* don't report release of wheel "buttons" */ 2157 /* don't report release of wheel "buttons" */
2129 if (ev.button >= 4) 2158 if (ev.button >= 4 && ev.button <= 7)
2130 return; 2159 return;
2131#ifdef MOUSE_REPORT_DOUBLECLICK 2160#ifdef MOUSE_REPORT_DOUBLECLICK
2132 /* only report the release of 'slow' single clicks */ 2161 /* only report the release of 'slow' single clicks */
2133 if (MEvent.button != AnyButton 2162 if (MEvent.button != AnyButton
2134 && (ev.button != MEvent.button 2163 && (ev.button != MEvent.button
2135 || (ev.time - MEvent.time 2164 || (ev.time - MEvent.time
2136 > MULTICLICK_TIME / 2))) 2165 > multiClickTime / 2)))
2137 { 2166 {
2138 MEvent.clicks = 0; 2167 MEvent.clicks = 0;
2139 MEvent.button = AnyButton; 2168 MEvent.button = ev.button;
2140 mouse_report (ev); 2169 mouse_report (ev);
2141 } 2170 }
2142#else /* MOUSE_REPORT_DOUBLECLICK */ 2171#else /* MOUSE_REPORT_DOUBLECLICK */
2143 MEvent.button = AnyButton; 2172 MEvent.button = ev.button;
2144 mouse_report (ev); 2173 mouse_report (ev);
2145#endif /* MOUSE_REPORT_DOUBLECLICK */ 2174#endif /* MOUSE_REPORT_DOUBLECLICK */
2146 return; 2175 return;
2147 } 2176 }
2148 2177
… …
2161 case Button3: 2190 case Button3:
2162 selection_make (ev.time); 2191 selection_make (ev.time);
2163 break; 2192 break;
2164 2193
2165 case Button2: 2194 case Button2:
2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2195 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2196 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2168 break; 2197 break;
2169 2198
2170#ifdef MOUSE_WHEEL 2199#ifdef MOUSE_WHEEL
2171 case Button4: 2200 case Button4:
2172 case Button5: 2201 case Button5:
2173 { 2202 {
2174 int i; 2203 int lines;
2175 page_dirn v; 2204 page_dirn dirn;
2176 2205
2177 v = ev.button == Button4 ? UP : DN; 2206 dirn = ev.button == Button4 ? UP : DN;
2178 2207
2179 if (ev.state & ShiftMask) 2208 if (ev.state & ShiftMask)
2180 i = 1; 2209 lines = 1;
2181 else if (option (Opt_mouseWheelScrollPage)) 2210 else if (option (Opt_mouseWheelScrollPage))
2182 i = nrow - 1; 2211 lines = nrow - 1;
2183 else 2212 else
2184 i = 5; 2213 lines = 5;
2185 2214
2186# ifdef MOUSE_SLIP_WHEELING 2215# ifdef MOUSE_SLIP_WHEELING
2187 if (ev.state & ControlMask) 2216 if (ev.state & ControlMask)
2188 { 2217 {
2189 mouse_slip_wheel_speed += v ? -1 : 1; 2218 mouse_slip_wheel_speed += dirn;
2190 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2219 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2192 2220
2193 if (!slip_wheel_ev.is_active ()) 2221 if (!slip_wheel_ev.is_active ())
2194 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2222 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2195 } 2223 }
2196 else 2224 else
2197# endif 2225# endif
2198 { 2226 {
2199 scr_page (v, i); 2227 scr_page (dirn, lines);
2200 scrollBar.show (1); 2228 scrollBar.show (1);
2201 } 2229 }
2202 } 2230 }
2203 break; 2231 break;
2204#endif 2232#endif
… …
2206 } 2234 }
2207} 2235}
2208 2236
2209/*}}} */ 2237/*}}} */
2210 2238
2211void 2239void ecb_hot
2212rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2213{ 2241{
2214 wchar_t ch = NOCHAR; 2242 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2243 char *seq_begin; // remember start of esc-sequence here
2216 2244
… …
2335 } 2363 }
2336 } 2364 }
2337} 2365}
2338 2366
2339// read the next character 2367// read the next character
2340wchar_t 2368wchar_t ecb_hot
2341rxvt_term::next_char () NOTHROW 2369rxvt_term::next_char () noexcept
2342{ 2370{
2343 while (cmdbuf_ptr < cmdbuf_endp) 2371 while (cmdbuf_ptr < cmdbuf_endp)
2344 { 2372 {
2345 // assume 7-bit to be ascii ALWAYS 2373 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2374 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2347 return *cmdbuf_ptr++; 2375 return *cmdbuf_ptr++;
2348 2376
2349 wchar_t wc; 2377 wchar_t wc;
2350 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2378 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2351 2379
… …
2357 } 2385 }
2358 2386
2359 if (len == (size_t)-1) 2387 if (len == (size_t)-1)
2360 { 2388 {
2361 mbstate.reset (); // reset now undefined conversion state 2389 mbstate.reset (); // reset now undefined conversion state
2390 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2391 // in which case we "erroneously" return the next byte which might be valid.
2362 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2392 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363 } 2393 }
2364 2394
2365 // assume wchar == unicode 2395 // assume wchar == unicode
2366 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
… …
2369 2399
2370 return NOCHAR; 2400 return NOCHAR;
2371} 2401}
2372 2402
2373// read the next octet 2403// read the next octet
2374uint32_t 2404uint32_t ecb_hot
2375rxvt_term::next_octet () NOTHROW 2405rxvt_term::next_octet () noexcept
2376{ 2406{
2377 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2378 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2379 : NOCHAR; 2409 : NOCHAR;
2380} 2410}
2381 2411
2382static class out_of_input out_of_input; 2412static class out_of_input out_of_input;
2383 2413
2384wchar_t 2414wchar_t ecb_hot
2385rxvt_term::cmd_getc () THROW ((class out_of_input)) 2415rxvt_term::cmd_getc ()
2386{ 2416{
2387 wchar_t c = next_char (); 2417 wchar_t c = next_char ();
2388 2418
2389 if (c == NOCHAR) 2419 if (c == NOCHAR)
2390 throw out_of_input; 2420 throw out_of_input;
2391 2421
2392 return c; 2422 return c;
2393} 2423}
2394 2424
2395uint32_t 2425uint32_t ecb_hot
2396rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2426rxvt_term::cmd_get8 ()
2397{ 2427{
2398 uint32_t c = next_octet (); 2428 uint32_t c = next_octet ();
2399 2429
2400 if (c == NOCHAR) 2430 if (c == NOCHAR)
2401 throw out_of_input; 2431 throw out_of_input;
… …
2404} 2434}
2405 2435
2406/*{{{ print pipe */ 2436/*{{{ print pipe */
2407/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2408#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2409FILE * 2439FILE * ecb_cold
2410rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2411{ 2441{
2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2413 2443
2414 if (stream == NULL) 2444 if (stream == NULL)
2415 rxvt_warn ("can't open printer pipe, not printing.\n"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2416 2446
2417 return stream; 2447 return stream;
2418} 2448}
2419 2449
2420int 2450int ecb_cold
2421rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2422{ 2452{
2423 fflush (stream); 2453 fflush (stream);
2424 return pclose (stream); 2454 return pclose (stream);
2425} 2455}
2426 2456
2427/* 2457/*
2428 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2429 */ 2459 */
2430void 2460void ecb_cold
2431rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2432{ 2462{
2433 FILE *fd = popen_printer (); 2463 FILE *fd = popen_printer ();
2434 2464
2435 if (!fd) 2465 if (!fd)
… …
2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2520 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2521 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2492}; 2522};
2493 2523
2494/*{{{ process non-printing single characters */ 2524/*{{{ process non-printing single characters */
2495void 2525void ecb_hot
2496rxvt_term::process_nonprinting (unicode_t ch) 2526rxvt_term::process_nonprinting (unicode_t ch)
2497{ 2527{
2498 switch (ch) 2528 switch (ch)
2499 { 2529 {
2500 case C0_ESC: 2530 case C0_ESC:
… …
2530 scr_charset_choose (0); 2560 scr_charset_choose (0);
2531 break; 2561 break;
2532 2562
2533#ifdef EIGHT_BIT_CONTROLS 2563#ifdef EIGHT_BIT_CONTROLS
2534 // 8-bit controls 2564 // 8-bit controls
2535 case 0x90: /* DCS */ 2565 case 0x90: /* DCS */
2536 process_dcs_seq (); 2566 process_dcs_seq ();
2537 break; 2567 break;
2538 case 0x9b: /* CSI */ 2568 case 0x9b: /* CSI */
2539 process_csi_seq (); 2569 process_csi_seq ();
2540 break; 2570 break;
2541 case 0x9d: /* OSC */ 2571 case 0x9d: /* OSC */
2542 process_osc_seq (); 2572 process_osc_seq ();
2543 break; 2573 break;
2544#endif 2574#endif
2545 } 2575 }
2546} 2576}
2547/*}}} */ 2577/*}}} */
2548 2578
2549 2579
2550/*{{{ process VT52 escape sequences */ 2580/*{{{ process VT52 escape sequences */
2551void 2581void ecb_cold
2552rxvt_term::process_escape_vt52 (unicode_t ch) 2582rxvt_term::process_escape_vt52 (unicode_t ch)
2553{ 2583{
2554 int row, col; 2584 int row, col;
2555 2585
2556 switch (ch) 2586 switch (ch)
… …
2606} 2636}
2607/*}}} */ 2637/*}}} */
2608 2638
2609 2639
2610/*{{{ process escape sequences */ 2640/*{{{ process escape sequences */
2611void 2641void ecb_hot
2612rxvt_term::process_escape_seq () 2642rxvt_term::process_escape_seq ()
2613{ 2643{
2614 unicode_t ch = cmd_getc (); 2644 unicode_t ch = cmd_getc ();
2615 2645
2616 if (priv_modes & PrivMode_vt52) 2646 if (priv_modes & PrivMode_vt52)
… …
2674 wchar_t nlcr[] = { C0_LF, C0_CR }; 2704 wchar_t nlcr[] = { C0_LF, C0_CR };
2675 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2705 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2676 } 2706 }
2677 break; 2707 break;
2678 2708
2709#if 0 // disabled because embedded newlines can make exploits easier
2679 /* kidnapped escape sequence: Should be 8.3.48 */ 2710 /* kidnapped escape sequence: Should be 8.3.48 */
2680 case C1_ESA: /* ESC G */ 2711 case C1_ESA: /* ESC G */
2681 // used by original rxvt for rob nations own graphics mode 2712 // used by original rxvt for rob nations own graphics mode
2682 if (cmd_getc () == 'Q') 2713 if (cmd_getc () == 'Q' && option (Opt_insecure))
2683 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2714 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2684 break; 2715 break;
2716#endif
2685 2717
2686 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
2687 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
2688 scr_set_tab (1); 2720 scr_set_tab (1);
2689 break; 2721 break;
… …
2768 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2800 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2769 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2801 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2770 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2771 }; 2803 };
2772 2804
2773void 2805void ecb_hot
2774rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
2775{ 2807{
2776 unicode_t ch, priv, i; 2808 unicode_t ch, priv, prev_ch, i;
2777 unsigned int nargs, p; 2809 unsigned int nargs, p;
2778 int n, ndef; 2810 int n, ndef;
2779 int arg[ESC_ARGS] = { }; 2811 int arg[ESC_ARGS] = { };
2780 2812
2781 nargs = 0; 2813 nargs = 0;
… …
2787 /* '<' '=' '>' '?' '!' */ 2819 /* '<' '=' '>' '?' '!' */
2788 priv = ch; 2820 priv = ch;
2789 ch = cmd_getc (); 2821 ch = cmd_getc ();
2790 } 2822 }
2791 2823
2824 prev_ch = 0;
2792 /* read any numerical arguments */ 2825 /* read any numerical arguments */
2793 for (n = -1; ch < CSI_ICH; ) 2826 for (n = -1; ch < CSI_ICH; )
2794 { 2827 {
2795 if (isdigit (ch)) 2828 if (isdigit (ch))
2796 { 2829 {
… …
2806 n = -1; 2839 n = -1;
2807 } 2840 }
2808 else if (IS_CONTROL (ch)) 2841 else if (IS_CONTROL (ch))
2809 process_nonprinting (ch); 2842 process_nonprinting (ch);
2810 2843
2844 prev_ch = ch;
2811 ch = cmd_getc (); 2845 ch = cmd_getc ();
2812 } 2846 }
2813 2847
2814 if (ch > CSI_7F) 2848 if (ch > CSI_7F)
2815 return; 2849 return;
… …
2845 break; 2879 break;
2846 2880
2847 case '?': 2881 case '?':
2848 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2882 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2849 process_terminal_mode (ch, priv, nargs, arg); 2883 process_terminal_mode (ch, priv, nargs, arg);
2884 if (prev_ch == '$' && ch == 'p')
2885 process_terminal_mode (ch, priv, nargs, arg);
2850 break; 2886 break;
2851 2887
2852 case '!': 2888 case '!':
2853 if (ch == CSI_70) 2889 if (ch == CSI_70)
2854 { 2890 {
2855 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2891 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2856 scr_soft_reset (); 2892 scr_soft_reset ();
2857 2893
2858 static const int pm_h[] = { 7, 25 }; 2894 static const int pm_h[] = { 7, 25 };
2859 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2895 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2860 2896
2861 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2897 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2862 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); 2898 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2863 } 2899 }
2864 break; 2900 break;
… …
2885 } 2921 }
2886 break; 2922 break;
2887#endif 2923#endif
2888 2924
2889 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2925 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2890 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2926 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2891 arg[0] = -arg[0]; 2927 arg[0] = -arg[0];
2892 /* FALLTHROUGH */ 2928 /* FALLTHROUGH */
2893 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2929 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2894 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2930 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2895 scr_gotorc (arg[0], 0, RELATIVE); 2931 scr_gotorc (arg[0], 0, RELATIVE);
2896 break; 2932 break;
2897 2933
2898 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2934 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2899 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2935 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2900#ifdef ISO6429 2936#ifdef ISO6429
2901 arg[0] = -arg[0]; 2937 arg[0] = -arg[0];
2902#else /* emulate common DEC VTs */ 2938#else /* emulate common DEC VTs */
2903 arg[0] = arg[0] ? -arg[0] : -1; 2939 arg[0] = arg[0] ? -arg[0] : -1;
2904#endif 2940#endif
… …
2995 case 7: /* unofficial extension */ 3031 case 7: /* unofficial extension */
2996 if (option (Opt_insecure)) 3032 if (option (Opt_insecure))
2997 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3033 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2998 break; 3034 break;
2999 case 8: /* unofficial extension */ 3035 case 8: /* unofficial extension */
3036 {
3037 string_term st;
3038 st.v[0] = CHAR_ST;
3039 st.v[1] = '\0';
3000 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3040 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3001 break; 3041 break;
3042 }
3002 } 3043 }
3003 break; 3044 break;
3004 3045
3005 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3046 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3006 switch (arg[0]) 3047 switch (arg[0])
… …
3049 scr_insert_mode (1); 3090 scr_insert_mode (1);
3050 else if (arg[0] == 20) 3091 else if (arg[0] == 20)
3051 priv_modes |= PrivMode_LFNL; 3092 priv_modes |= PrivMode_LFNL;
3052 break; 3093 break;
3053 3094
3095 case CSI_71: // DECSCUSR: set cursor style
3096 if (prev_ch == ' ')
3097 set_cursor_style (arg[0]);
3098 break;
3099
3054 /* 3100 /*
3055 * PRIVATE USE beyond this point. All CSI_7? sequences here 3101 * PRIVATE USE beyond this point. All CSI_7? sequences here
3056 */ 3102 */
3057 case CSI_72: /* DECSTBM: set top and bottom margins */ 3103 case CSI_72: /* DECSTBM: set top and bottom margins */
3058 if (nargs == 1) 3104 if (nargs == 1)
… …
3132 break; 3178 break;
3133 3179
3134 //case 9: NYI, TODO, restore maximized window or maximize window 3180 //case 9: NYI, TODO, restore maximized window or maximize window
3135 default: 3181 default:
3136 if (args[0] >= 24) /* set height (chars) */ 3182 if (args[0] >= 24) /* set height (chars) */
3137 set_widthheight ((unsigned int)width, 3183 set_widthheight ((unsigned int)vt_width,
3138 (unsigned int) (args[1] * fheight)); 3184 (unsigned int) (args[1] * fheight));
3139 break; 3185 break;
3140 3186
3141 /* 3187 /*
3142 * reports - some output format copied from XTerm 3188 * reports - some output format copied from XTerm
… …
3186/* 3232/*
3187 * get input up until STRING TERMINATOR (or BEL) 3233 * get input up until STRING TERMINATOR (or BEL)
3188 * ends_how is terminator used. returned input must be free()'d 3234 * ends_how is terminator used. returned input must be free()'d
3189 */ 3235 */
3190char * 3236char *
3191rxvt_term::get_to_st (unicode_t &ends_how) 3237rxvt_term::get_to_st (string_term &st)
3192{ 3238{
3193 unicode_t ch; 3239 unicode_t ch;
3194 bool seen_esc = false; 3240 bool seen_esc = false;
3195 unsigned int n = 0; 3241 unsigned int n = 0;
3196 wchar_t string[STRING_MAX]; 3242 wchar_t string[CBUFSIZ];
3197 3243
3198 while ((ch = cmd_getc ()) != NOCHAR) 3244 while ((ch = cmd_getc ()) != NOCHAR)
3199 { 3245 {
3200 if (seen_esc) 3246 if (seen_esc)
3201 { 3247 {
… …
3216 else if (ch < 0x20) 3262 else if (ch < 0x20)
3217 return NULL; /* other control character - exit */ 3263 return NULL; /* other control character - exit */
3218 3264
3219 seen_esc = false; 3265 seen_esc = false;
3220 3266
3221 if (n >= STRING_MAX - 1) 3267 if (n >= sizeof (string) - 1)
3222 // stop at some sane length 3268 // stop at some sane length
3223 return NULL; 3269 return NULL;
3224 3270
3225 string[n++] = ch; 3271 string[n++] = ch;
3226 } 3272 }
3227 3273
3228 string[n++] = '\0'; 3274 string[n++] = '\0';
3229 3275
3230 ends_how = (ch == 0x5c ? C0_ESC : ch); 3276 n = 0;
3277 if (ch == 0x5c)
3278 st.v[n++] = C0_ESC;
3279 st.v[n++] = ch;
3280 st.v[n] = '\0';
3231 3281
3232 return rxvt_wcstombs (string); 3282 return rxvt_wcstombs (string);
3233} 3283}
3234 3284
3235/*----------------------------------------------------------------------*/ 3285/*----------------------------------------------------------------------*/
… …
3241{ 3291{
3242 /* 3292 /*
3243 * Not handled yet 3293 * Not handled yet
3244 */ 3294 */
3245 3295
3246 unicode_t eh; 3296 string_term st;
3247 char *s = get_to_st (eh); 3297 char *s = get_to_st (st);
3248 if (s) 3298 if (s)
3249 free (s); 3299 free (s);
3250 3300
3251 return; 3301 return;
3252} 3302}
… …
3264 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3314 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3265 arg = arg * 10 + (ch - '0'); 3315 arg = arg * 10 + (ch - '0');
3266 3316
3267 if (ch == ';') 3317 if (ch == ';')
3268 { 3318 {
3269 unicode_t eh; 3319 string_term st;
3270 char *s = get_to_st (eh); 3320 char *s = get_to_st (st);
3271 3321
3272 if (s) 3322 if (s)
3273 { 3323 {
3274 process_xterm_seq (arg, s, eh); 3324 process_xterm_seq (arg, s, st);
3275 free (s); 3325 free (s);
3276 } 3326 }
3277 } 3327 }
3278} 3328}
3279 3329
3330static unsigned int
3331colorcube_index (unsigned int idx_r,
3332 unsigned int idx_g,
3333 unsigned int idx_b)
3334{
3335 assert (idx_r < Red_levels);
3336 assert (idx_g < Green_levels);
3337 assert (idx_b < Blue_levels);
3338
3339 return idx_r * Blue_levels * Green_levels +
3340 idx_g * Blue_levels +
3341 idx_b;
3342}
3343
3344/*
3345 * Find the nearest color slot in the hidden color cube,
3346 * adapt its value to the 32bit RGBA color.
3347 */
3348unsigned int
3349rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3350{
3351 r &= 0xff;
3352 g &= 0xff;
3353 b &= 0xff;
3354 a &= 0xff;
3355
3356 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3357
3358 /* we allow one of the 6 closest neighbouring colours */
3359 /* to replace the current color, if they not used recently */
3360 #if 0
3361 static const unsigned char dxyz[][3] = {
3362 0, 0, 0,
3363 0, 0, 4,
3364 0, 4, 4,
3365 4, 4, 0,
3366 4, 0, 4,
3367 0, 4, 0,
3368 4, 0, 0,
3369 };
3370 #else
3371 // silly compressed verlapping triplets version of above
3372 static const unsigned char dxyz[] = {
3373 0, 0, 0, 4, 4, 0, 4, 0, 0,
3374 };
3375 #endif
3376
3377 static const unsigned char color_level[8][32] = {
3378 // neighbour index
3379 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3380 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3381 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3382 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3383 // Red_levels/Green_levels/Blue_levels index
3384 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3385 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3386 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3387 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3388 };
3389
3390 unsigned int idx;
3391
3392 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3393 {
3394 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3395 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3396 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3397 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3398
3399 if (n == 0)
3400 idx = index;
3401
3402 if (rgb24_color[index] == color)
3403 {
3404 rgb24_seqno[index] = ++rgb24_sequence;
3405 return index + minTermCOLOR24;
3406 }
3407
3408 // minor issue: could update index 0 few more times
3409 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3410 {
3411 idx = index;
3412 goto update;
3413 }
3414
3415 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3416 // but also handles wrap around values well enough
3417 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3418 idx = index;
3419 }
3420
3421update:
3422 rgb24_color[idx] = color;
3423 rgb24_seqno[idx] = ++rgb24_sequence;
3424
3425 idx += minTermCOLOR24;
3426 pix_colors_focused [idx].free (this);
3427 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3428 update_fade_color (idx, false);
3429
3430 return idx;
3431}
3432
3280void 3433void
3281rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3434rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3282{ 3435{
3283 if (str[0] == '?' && !str[1]) 3436 if (str[0] == '?' && !str[1])
3284 { 3437 {
3285 rgba c; 3438 rgba c;
3286 pix_colors_focused[color].get (c); 3439 pix_colors_focused[color].get (c);
3440 char rgba_str[32];
3287 3441
3288#if XFT 3442#if XFT
3289 if (c.a != rgba::MAX_CC) 3443 if (c.a != rgba::MAX_CC)
3290 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3444 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3291 else 3445 else
3292#endif 3446#endif
3293 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3447 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3448
3449 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3450 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3451 else
3452 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3294 } 3453 }
3295 else 3454 else
3296 set_window_color (color, str); 3455 set_window_color (color, str);
3297} 3456}
3298 3457
3299/* 3458/*
3300 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3459 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3301 */ 3460 */
3302void 3461void
3303rxvt_term::process_xterm_seq (int op, char *str, char resp) 3462rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3304{ 3463{
3305 int color; 3464 int color;
3306 char *buf, *name; 3465 char *buf, *name;
3307 bool query = str[0] == '?' && !str[1]; 3466 bool query = str[0] == '?' && !str[1];
3308 int saveop = op; 3467 int saveop = op;
… …
3343 &nitems, &bytes_after, &value) == Success 3502 &nitems, &bytes_after, &value) == Success
3344 && actual_type != None 3503 && actual_type != None
3345 && actual_format == 8) 3504 && actual_format == 8)
3346 str = (const char *)(value); 3505 str = (const char *)(value);
3347 3506
3348 tt_printf ("\033]%d;%s%c", op, str, resp); 3507 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3349 3508
3350 XFree (value); 3509 XFree (value);
3351 } 3510 }
3352 else 3511 else
3353 { 3512 {
… …
3377 break; 3536 break;
3378 3537
3379 if ((buf = strchr (name, ';')) != NULL) 3538 if ((buf = strchr (name, ';')) != NULL)
3380 *buf++ = '\0'; 3539 *buf++ = '\0';
3381 3540
3382 process_color_seq (op, color, name, resp); 3541 process_color_seq (op, color, name, st);
3383 } 3542 }
3384 break; 3543 break;
3385 case Rxvt_restoreFG: 3544 case Rxvt_restoreFG:
3386 case XTerm_Color00: 3545 case XTerm_Color00:
3387 process_color_seq (op, Color_fg, str, resp); 3546 process_color_seq (op, Color_fg, str, st);
3388 break; 3547 break;
3389 case Rxvt_restoreBG: 3548 case Rxvt_restoreBG:
3390 case XTerm_Color01: 3549 case XTerm_Color01:
3391 process_color_seq (op, Color_bg, str, resp); 3550 process_color_seq (op, Color_bg, str, st);
3392 break; 3551 break;
3393#ifndef NO_CURSORCOLOR 3552#ifndef NO_CURSORCOLOR
3394 case XTerm_Color_cursor: 3553 case XTerm_Color_cursor:
3395 process_color_seq (op, Color_cursor, str, resp); 3554 process_color_seq (op, Color_cursor, str, st);
3396 break; 3555 break;
3397#endif 3556#endif
3398 case XTerm_Color_pointer_fg: 3557 case XTerm_Color_pointer_fg:
3399 process_color_seq (op, Color_pointer_fg, str, resp); 3558 process_color_seq (op, Color_pointer_fg, str, st);
3400 break; 3559 break;
3401 case XTerm_Color_pointer_bg: 3560 case XTerm_Color_pointer_bg:
3402 process_color_seq (op, Color_pointer_bg, str, resp); 3561 process_color_seq (op, Color_pointer_bg, str, st);
3403 break; 3562 break;
3404#ifdef OPTION_HC 3563#ifdef OPTION_HC
3405 case XTerm_Color_HC: 3564 case XTerm_Color_HC:
3406 process_color_seq (op, Color_HC, str, resp); 3565 process_color_seq (op, Color_HC, str, st);
3407 break; 3566 break;
3408 case XTerm_Color_HTC: 3567 case XTerm_Color_HTC:
3409 process_color_seq (op, Color_HTC, str, resp); 3568 process_color_seq (op, Color_HTC, str, st);
3410 break; 3569 break;
3411#endif 3570#endif
3412#ifndef NO_BOLD_UNDERLINE_REVERSE 3571#ifndef NO_BOLD_UNDERLINE_REVERSE
3413 case URxvt_Color_BD: 3572 case URxvt_Color_BD:
3414 process_color_seq (op, Color_BD, str, resp); 3573 process_color_seq (op, Color_BD, str, st);
3415 break; 3574 break;
3416 case URxvt_Color_UL: 3575 case URxvt_Color_UL:
3417 process_color_seq (op, Color_UL, str, resp); 3576 process_color_seq (op, Color_UL, str, st);
3418 break; 3577 break;
3419 case URxvt_Color_IT: 3578 case URxvt_Color_IT:
3420 process_color_seq (op, Color_IT, str, resp); 3579 process_color_seq (op, Color_IT, str, st);
3421 break; 3580 break;
3422#endif 3581#endif
3423 case URxvt_Color_border: 3582 case URxvt_Color_border:
3424 process_color_seq (op, Color_border, str, resp); 3583 process_color_seq (op, Color_border, str, st);
3425 break; 3584 break;
3426#if ENABLE_TRANSPARENCY
3427 case URxvt_Color_tint:
3428 process_color_seq (op, Color_tint, str, resp);
3429 {
3430 bool changed = false;
3431
3432 if (ISSET_PIXCOLOR (Color_tint))
3433 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3434
3435 if (changed)
3436 update_background ();
3437 }
3438
3439 break;
3440#endif
3441
3442#if BG_IMAGE_FROM_FILE
3443 case Rxvt_Pixmap:
3444 if (!strcmp (str, "?"))
3445 {
3446 char str[256];
3447
3448 sprintf (str, "[%dx%d+%d+%d]",
3449 min (h_scale, 32767), min (v_scale, 32767),
3450 min (h_align, 32767), min (v_align, 32767));
3451 process_xterm_seq (XTerm_title, str, CHAR_ST);
3452 }
3453 else
3454 {
3455 bool changed = false;
3456
3457 if (*str != ';')
3458 {
3459 if (bg_set_file (str)) /* change pixmap */
3460 changed = true;
3461 }
3462 else
3463 {
3464 str++;
3465 if (bg_set_geometry (str, true))
3466 changed = true;
3467 }
3468
3469 if (changed)
3470 {
3471 if (bg_window_position_sensitive ())
3472 {
3473 int x, y;
3474 get_window_origin (x, y);
3475 bg_set_position (x, y);
3476 }
3477 update_background ();
3478 }
3479 }
3480 break;
3481#endif
3482 3585
3483 case XTerm_logfile: 3586 case XTerm_logfile:
3484 // TODO, when secure mode? 3587 // TODO, when secure mode?
3485 break; 3588 break;
3486 3589
… …
3503 case URxvt_boldFont: 3606 case URxvt_boldFont:
3504 case URxvt_italicFont: 3607 case URxvt_italicFont:
3505 case URxvt_boldItalicFont: 3608 case URxvt_boldItalicFont:
3506#endif 3609#endif
3507 if (query) 3610 if (query)
3508 tt_printf ("\33]%d;%-.250s%c", saveop, 3611 tt_printf ("\33]%d;%-.250s%s", saveop,
3509 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3612 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3510 ? fontset[op - URxvt_font]->fontdesc : "", 3613 ? fontset[op - URxvt_font]->fontdesc : "",
3511 resp); 3614 st.v);
3512 else 3615 else
3513 { 3616 {
3514 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3617 const char *&res = rs[Rs_font + (op - URxvt_font)];
3515 3618
3516 res = strdup (str); 3619 res = strdup (str);
… …
3519 } 3622 }
3520 break; 3623 break;
3521 3624
3522 case URxvt_version: 3625 case URxvt_version:
3523 if (query) 3626 if (query)
3524 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3627 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3525 op, 3628 op,
3526 rs[Rs_name], VERSION[0], VERSION[2], 3629 rs[Rs_name], VERSION[0], VERSION[2],
3527 resp); 3630 st.v);
3528 break; 3631 break;
3529 3632
3530#if !ENABLE_MINIMAL 3633#if !ENABLE_MINIMAL
3634 case URxvt_cellinfo:
3635 if (query)
3636 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3637 fwidth, fheight, fbase,
3638 st.v);
3639 break;
3640
3531 case URxvt_locale: 3641 case URxvt_locale:
3532 if (query) 3642 if (query)
3533 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3643 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3534 else 3644 else
3535 { 3645 {
3536 set_locale (str); 3646 set_locale (str);
3537 pty->set_utf8_mode (enc_utf8); 3647 pty->set_utf8_mode (enc_utf8);
3538 init_xlocale (); 3648 init_xlocale ();
… …
3553 break; 3663 break;
3554#endif 3664#endif
3555 3665
3556#if ENABLE_PERL 3666#if ENABLE_PERL
3557 case URxvt_perl: 3667 case URxvt_perl:
3558 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3668 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3559 break; 3669 break;
3560#endif 3670#endif
3561 } 3671 }
3562} 3672}
3563/*----------------------------------------------------------------------*/ 3673/*----------------------------------------------------------------------*/
… …
3570 * 's' = save 3680 * 's' = save
3571 * 'r' = restore 3681 * 'r' = restore
3572 * 't' = toggle 3682 * 't' = toggle
3573 * so no need for fancy checking 3683 * so no need for fancy checking
3574 */ 3684 */
3575int 3685int ecb_cold
3576rxvt_term::privcases (int mode, unsigned long bit) 3686rxvt_term::privcases (int mode, unsigned long bit)
3577{ 3687{
3578 int state; 3688 int state;
3579 3689
3580 if (mode == 's') 3690 if (mode == 's')
3581 { 3691 {
3582 SavedModes |= (priv_modes & bit); 3692 if (priv_modes & bit)
3693 SavedModes |= bit;
3694 else
3695 SavedModes &= ~bit;
3583 return -1; 3696 return -1;
3584 } 3697 }
3585 else 3698 else
3586 { 3699 {
3587 if (mode == 'r') 3700 if (mode == 'r')
… …
3617 { 5, PrivMode_rVideo }, // DECSCNM 3730 { 5, PrivMode_rVideo }, // DECSCNM
3618 { 6, PrivMode_relOrigin }, // DECOM 3731 { 6, PrivMode_relOrigin }, // DECOM
3619 { 7, PrivMode_Autowrap }, // DECAWM 3732 { 7, PrivMode_Autowrap }, // DECAWM
3620 // 8, auto-repeat keys // DECARM 3733 // 8, auto-repeat keys // DECARM
3621 { 9, PrivMode_MouseX10 }, 3734 { 9, PrivMode_MouseX10 },
3735 { 12, PrivMode_BlinkingCursor },
3622 // 18 end FF to printer after print screen 3736 // 18 end FF to printer after print screen
3623 // 19 Print screen prints full screen/scroll region 3737 // 19 Print screen prints full screen/scroll region
3624 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3738 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3625#ifdef scrollBar_esc 3739#ifdef scrollBar_esc
3626 { scrollBar_esc, PrivMode_scrollBar }, 3740 { scrollBar_esc, PrivMode_scrollBar },
… …
3638#endif 3752#endif
3639 { 1000, PrivMode_MouseX11 }, 3753 { 1000, PrivMode_MouseX11 },
3640 { 1002, PrivMode_MouseBtnEvent }, 3754 { 1002, PrivMode_MouseBtnEvent },
3641 { 1003, PrivMode_MouseAnyEvent }, 3755 { 1003, PrivMode_MouseAnyEvent },
3642#if ENABLE_FRILLS 3756#if ENABLE_FRILLS
3757 { 1004, PrivMode_FocusEvent },
3643 { 1005, PrivMode_ExtModeMouse }, 3758 { 1005, PrivMode_ExtMouseUTF8 },
3759 { 1006, PrivMode_ExtMouseSGR },
3644#endif 3760#endif
3645 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3761 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3646 { 1011, PrivMode_Keypress }, // rxvt extension 3762 { 1011, PrivMode_Keypress }, // rxvt extension
3647#if ENABLE_FRILLS 3763#if ENABLE_FRILLS
3648 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3764 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3649#endif 3765#endif
3650 // 1035 enable modifiers for alt, numlock NYI 3766 // 1035 enable modifiers for alt, numlock NYI
3651 // 1036 send ESC for meta keys NYI 3767 // 1036 send ESC for meta keys NYI
3652 // 1037 send DEL for keypad delete NYI 3768 // 1037 send DEL for keypad delete NYI
3653 { 1047, PrivMode_Screen }, 3769 { 1047, PrivMode_Screen },
3654 // 1048 save and restore cursor, implemented in code 3770 // 1048 save and restore cursor, implemented in code
3655 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3771 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3656 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3772 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3773#if ENABLE_FRILLS
3657 { 2004, PrivMode_BracketPaste }, 3774 { 2004, PrivMode_BracketPaste },
3775#endif
3658 }; 3776 };
3659 3777
3660 if (nargs == 0) 3778 if (nargs == 0)
3661 return; 3779 return;
3780
3781 // DECRQM
3782 if (mode == 'p')
3783 {
3784 int status = 0;
3785 if (nargs != 1)
3786 return;
3787
3788 for (j = 0; j < ecb_array_length (argtopriv); j++)
3789 if (argtopriv[j].argval == arg[0])
3790 {
3791 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3792 break;
3793 }
3794
3795 tt_printf ("\33[?%d;%d$y", arg[0], status);
3796 return;
3797 }
3662 3798
3663 /* make lo/hi boolean */ 3799 /* make lo/hi boolean */
3664 if (mode == 'l') 3800 if (mode == 'l')
3665 mode = 0; /* reset */ 3801 mode = 0; /* reset */
3666 else if (mode == 'h') 3802 else if (mode == 'h')
… …
3735 scrollBar.map (state); 3871 scrollBar.map (state);
3736 resize_all_windows (0, 0, 0); 3872 resize_all_windows (0, 0, 0);
3737 scr_touch (true); 3873 scr_touch (true);
3738 break; 3874 break;
3739#endif 3875#endif
3876#ifdef CURSOR_BLINK
3877 case 12:
3878 cursor_blink_reset ();
3879 break;
3880#endif
3740 case 25: /* visible/invisible cursor */ 3881 case 25: /* visible/invisible cursor */
3741 scr_cursor_visible (state); 3882 scr_cursor_visible (state);
3742 break; 3883 break;
3743 /* case 35: - shift keys */ 3884 /* case 35: - shift keys */
3744 /* case 40: - 80 <--> 132 mode */ 3885 /* case 40: - 80 <--> 132 mode */
… …
3797 } 3938 }
3798} 3939}
3799/*}}} */ 3940/*}}} */
3800 3941
3801/*{{{ process sgr sequences */ 3942/*{{{ process sgr sequences */
3802void 3943void ecb_hot
3803rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3944rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3804{ 3945{
3805 unsigned int i; 3946 unsigned int i;
3806 short rendset; 3947 short rendset;
3807 int rendstyle; 3948 int rendstyle;
… …
3849 //case 19: // ninth alt font 3990 //case 19: // ninth alt font
3850 //case 20: // gothic 3991 //case 20: // gothic
3851 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3992 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3852 rendset = 0, rendstyle = RS_Bold; 3993 rendset = 0, rendstyle = RS_Bold;
3853 break; 3994 break;
3854 case 22: // normal intensity 3995 case 22: // bold off (vt220)
3855 rendset = 0, rendstyle = RS_Bold; 3996 rendset = 0, rendstyle = RS_Bold;
3856 break; 3997 break;
3857 case 23: // disable italic 3998 case 23: // disable italic
3858 rendset = 0, rendstyle = RS_Italic; 3999 rendset = 0, rendstyle = RS_Italic;
3859 break; 4000 break;
3860 case 24: 4001 case 24: // underline off (vt220)
3861 rendset = 0, rendstyle = RS_Uline; 4002 rendset = 0, rendstyle = RS_Uline;
3862 break; 4003 break;
3863 case 25: 4004 case 25: // blink off (vt220)
3864 rendset = 0, rendstyle = RS_Blink; 4005 rendset = 0, rendstyle = RS_Blink;
3865 break; 4006 break;
3866 case 26: // variable spacing (iso 8613) 4007 case 26: // variable spacing (iso 8613)
3867 rendset = 0, rendstyle = RS_Blink; 4008 rendset = 0, rendstyle = RS_Blink;
3868 break; 4009 break;
3869 case 27: 4010 case 27: // reverse off (vt220)
3870 rendset = 0, rendstyle = RS_RVid; 4011 rendset = 0, rendstyle = RS_RVid;
3871 break; 4012 break;
3872 //case 28: // visible. NYI 4013 //case 28: // visible. NYI
3873 //case 29: // not crossed-out 4014 //case 29: // not crossed-out
3874 } 4015 }
… …
3889 case 35: 4030 case 35:
3890 case 36: 4031 case 36:
3891 case 37: 4032 case 37:
3892 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4033 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3893 break; 4034 break;
3894 case 38: // set fg color, ISO 8613-6
3895 if (nargs > i + 2 && arg[i + 1] == 5)
3896 {
3897 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3898 i += 2;
3899 }
3900 break;
3901 case 39: /* default fg */ 4035 case 39: /* default fg */
3902 scr_color (Color_fg, Color_fg); 4036 scr_color (Color_fg, Color_fg);
3903 break; 4037 break;
3904 4038
3905 case 40: 4039 case 40:
… …
3910 case 45: 4044 case 45:
3911 case 46: 4045 case 46:
3912 case 47: 4046 case 47:
3913 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4047 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3914 break; 4048 break;
3915 case 48: // set bg color, ISO 8613-6
3916 if (nargs > i + 2 && arg[i + 1] == 5)
3917 {
3918 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3919 i += 2;
3920 }
3921 break;
3922 case 49: /* default bg */ 4049 case 49: /* default bg */
3923 scr_color (Color_bg, Color_bg); 4050 scr_color (Color_bg, Color_bg);
4051 break;
4052
4053 case 38: // set fg color, ISO 8613-6
4054 case 48: // set bg color, ISO 8613-6
4055 {
4056 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4057 unsigned int idx;
4058
4059 if (nargs > i + 2 && arg[i + 1] == 5)
4060 {
4061 idx = minCOLOR + arg[i + 2];
4062 i += 2;
4063
4064 scr_color (idx, fgbg);
4065 }
4066 else if (nargs > i + 4 && arg[i + 1] == 2)
4067 {
4068 unsigned int r = arg[i + 2];
4069 unsigned int g = arg[i + 3];
4070 unsigned int b = arg[i + 4];
4071 unsigned int a = 0xff;
4072
4073 idx = map_rgb24_color (r, g, b, a);
4074
4075 i += 4;
4076
4077 scr_color (idx, fgbg);
4078 }
4079 }
3924 break; 4080 break;
3925 4081
3926 //case 50: // not variable spacing 4082 //case 50: // not variable spacing
3927 4083
3928#if !ENABLE_MINIMAL 4084#if !ENABLE_MINIMAL
… …
3948 break; 4104 break;
3949#endif 4105#endif
3950 } 4106 }
3951 } 4107 }
3952} 4108}
4109
4110void
4111rxvt_term::set_cursor_style (int style)
4112{
4113 if (!IN_RANGE_INC (style, 0, 6))
4114 return;
4115
4116 if (style == 0)
4117 style = 1;
4118
4119 cursor_type = (style - 1) / 2;
4120 set_option (Opt_cursorUnderline, cursor_type == 1);
4121
4122#ifdef CURSOR_BLINK
4123 set_option (Opt_cursorBlink, style & 1);
4124 cursor_blink_reset ();
4125#endif
4126
4127 want_refresh = 1;
4128}
3953/*}}} */ 4129/*}}} */
3954 4130
3955/* ------------------------------------------------------------------------- */ 4131/* ---------------------------------------------------------------------- */
4132/* Write data to the pty as typed by the user, pasted with the mouse,
4133 * or generated by us in response to a query ESC sequence.
4134 */
3956 4135
3957/* 4136/*
3958 * Send printf () formatted output to the command. 4137 * Send printf () formatted output to the command.
3959 * Only use for small amounts of data. 4138 * Only use for small amounts of data.
3960 */ 4139 */
… …
3968 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4147 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3969 va_end (arg_ptr); 4148 va_end (arg_ptr);
3970 tt_write (buf, strlen (buf)); 4149 tt_write (buf, strlen (buf));
3971} 4150}
3972 4151
3973/* ---------------------------------------------------------------------- */
3974/* Write data to the pty as typed by the user, pasted with the mouse, 4152/* Write data to the pty as typed by the user. */
3975 * or generated by us in response to a query ESC sequence. 4153void
3976 */ 4154rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3977static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4155{
4156 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4157 return;
4158
4159 if (option (Opt_scrollTtyKeypress))
4160 if (view_start)
4161 {
4162 view_start = 0;
4163 want_refresh = 1;
4164 }
4165
4166 tt_write_ (data, len);
4167}
3978 4168
3979void 4169void
3980rxvt_term::tt_write (const char *data, unsigned int len) 4170rxvt_term::tt_write (const char *data, unsigned int len)
3981{ 4171{
3982 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4172 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3983 return; 4173 return;
3984 4174
4175 tt_write_ (data, len);
4176}
4177
4178static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4179
4180void
4181rxvt_term::tt_write_ (const char *data, unsigned int len)
4182{
3985 if (pty->pty < 0) 4183 if (pty->pty < 0)
3986 return; 4184 return;
3987 4185
3988 if (v_buflen == 0) 4186 if (v_buflen == 0)
3989 { 4187 {

Diff Legend

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