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.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC vs.
Revision 1.566 by sf-exg, Sat Sep 12 14:03:35 2015 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-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 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)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 267
267 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
268 { 269 {
269 char mb[16]; 270 char mb[MB_LEN_MAX];
270 int len; 271 int len;
271 272
272 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
275 else 276 else
276 { 277 {
277 mb[0] = ch[0]; 278 mb[0] = ch;
278 len = 1; 279 len = 1;
279 } 280 }
280 281
281 if (len > 0) 282 if (len > 0)
282 tt_write (mb, len); 283 tt_write (mb, len);
… …
285 } 286 }
286 287
287 iso14755buf = 0; 288 iso14755buf = 0;
288} 289}
289 290
290static int 291static int ecb_cold
291hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
292{ 293{
293 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
304 305
305 return -1; 306 return -1;
306} 307}
307#endif 308#endif
308 309
309static inline KeySym 310static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
311{ 312{
312#ifdef XK_KP_Home 313#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
328 }; 324 };
329 325
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
340# endif 336# endif
341#endif 337#endif
342 return keysym; 338 return keysym;
343} 339}
344 340
345static inline int 341static inline int ecb_cold
346map_function_key (KeySym keysym) 342map_function_key (KeySym keysym)
347{ 343{
348 int param = 0; 344 int param = 0;
349 345
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
375 param = 3; 371 param = 3;
376 break; 372 break;
377 case XK_Select: 373 case XK_Select:
378 param = 4; 374 param = 4;
379 break; 375 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior: 376 case XK_Prior:
382 param = 5; 377 param = 5;
383 break; 378 break;
384 case XK_Next: 379 case XK_Next:
385 param = 6; 380 param = 6;
… …
388 param = 7; 383 param = 7;
389 break; 384 break;
390 case XK_End: 385 case XK_End:
391 param = 8; 386 param = 8;
392 break; 387 break;
393#endif
394 case XK_Help: 388 case XK_Help:
395 param = 28; 389 param = 28;
396 break; 390 break;
397 case XK_Menu: 391 case XK_Menu:
398 param = 29; 392 param = 29;
399 break; 393 break;
400 } 394 }
401 return param; 395 return param;
402} 396}
403 397
404void 398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
406{ 409{
407 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
408 KeySym keysym; 411 KeySym keysym = NoSymbol;
409 int valid_keysym;
410 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
411 414
412#if ISO_14755 415#if ISO_14755
413 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
414 return; 417 return;
415#endif 418#endif
… …
424 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
426 429
427 kbuf[0] = 0; 430 kbuf[0] = 0;
428 431
429#ifdef USE_XIM 432#if USE_XIM
430 if (Input_Context) 433 if (Input_Context)
431 { 434 {
432 Status status_return; 435 Status status_return;
433 436
434#if 0 437#if 0
… …
472 } 475 }
473 } 476 }
474 else 477 else
475 len = 0; 478 len = 0;
476 } 479 }
477
478 valid_keysym = status_return == XLookupKeySym
479 || status_return == XLookupBoth;
480 } 480 }
481 else 481 else
482#endif 482#endif
483 { 483 {
484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
485 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
486 } 488 {
489 KeySym orig_keysym = keysym;
487 490
488 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
489 { 704 {
490#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 707 return;
493#endif 708#endif
494 709
495 if (saveLines) 710 if (saveLines)
496 { 711 {
… …
509#endif 724#endif
510 max_it (lnsppg, 1); 725 max_it (lnsppg, 1);
511 726
512 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
513 { 728 {
514 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
515 return; 730 return;
516 } 731 }
517 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
518 { 733 {
519 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
520 return; 735 return;
521 } 736 }
522 } 737 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
525 { 740 {
526 if (keysym == XK_Up) 741 if (keysym == XK_Up)
527 { 742 {
528 scr_page (UP, 1); 743 scr_page (1);
529 return; 744 return;
530 } 745 }
531 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
532 { 747 {
533 scr_page (DN, 1); 748 scr_page (-1);
534 return; 749 return;
535 } 750 }
536 } 751 }
537#endif 752#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
540 { 755 {
541 if (keysym == XK_Home) 756 if (keysym == XK_Home)
542 { 757 {
543 scr_move_to (0, 1); 758 scr_changeview (top_row);
544 return; 759 return;
545 } 760 }
546 else if (keysym == XK_End) 761 else if (keysym == XK_End)
547 { 762 {
548 scr_move_to (1, 1); 763 scr_changeview (0);
549 return; 764 return;
550 } 765 }
551 } 766 }
552#endif 767#endif
553 } 768 }
554 769
555 if (shft) 770 if (shft)
556 { 771 {
557 /* Shift + F1 - F10 generates F11 - F20 */
558 if (keysym >= XK_F1 && keysym <= XK_F10)
559 {
560 keysym += (XK_F11 - XK_F1);
561 shft = 0; /* turn off Shift */
562 }
563 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
564 { 773 {
565 switch (keysym) 774 switch (keysym)
566 { 775 {
567 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
568 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
569 selection_request (ev.time); 778 selection_request (ev.time);
570 return; 779 return;
571#if TODO 780#if TODO
572 /* rxvt extras */ 781 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 783 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 785 return;
579#endif 786#endif
580 } 787 }
581 } 788 }
789 }
790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
582 } 804 }
583 805
584#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
585 // ISO 14755 support 807 // ISO 14755 support
586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
641 { 863 {
642 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
643 return; 865 return;
644 } 866 }
645#endif 867#endif
646
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
689 newlen = 0;
690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
773 {
774 int param = map_function_key (keysym);
775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
779 }
780 break;
781 }
782
783 if (newlen)
784 len = strlen (kbuf);
785
786 /*
787 * Pass meta for all function keys, if 'meta' option set
788 */
789#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0)
791 kbuf[len - 1] |= 0x80;
792#endif
793
794 }
795 else if (ctrl && keysym == XK_minus)
796 {
797 len = 1;
798 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
799 }
800 else if (keysym == XK_ISO_Left_Tab)
801 {
802 strcpy (kbuf, "\033[Z");
803 len = 3;
804 }
805 else
806 {
807#ifdef META8_OPTION
808 /* set 8-bit on */
809 if (meta && (meta_char == 0x80))
810 {
811 char *ch;
812
813 for (ch = kbuf; ch < kbuf + len; ch++)
814 *ch |= 0x80;
815
816 meta = 0;
817 }
818#endif
819 /* nil */ ;
820 }
821 } 868 }
822
823 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
824 return;
825 869
826 if (len <= 0) 870 if (len <= 0)
827 return; /* not mapped */ 871 return; /* not mapped */
828 872
829 if (option (Opt_scrollTtyKeypress))
830 if (view_start)
831 {
832 view_start = 0;
833 want_refresh = 1;
834 }
835
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */
851 if (meta
852#ifdef META8_OPTION
853 && meta_char == C0_ESC
854#endif
855 )
856 {
857 const char ch = C0_ESC;
858 tt_write (&ch, 1);
859 }
860
861 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
862} 874}
863 875
864void 876void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
866{ 878{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 880 KeySym keysym;
869 881
… …
889 commit_iso14755 (); 901 commit_iso14755 ();
890 902
891 return; 903 return;
892 } 904 }
893 905
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 907 if (i[0] == keysym)
896 { 908 {
897 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 910 commit_iso14755 ();
899 911
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
938#endif 950#endif
939} 951}
940 952
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 953void
975rxvt_term::flush () 954rxvt_term::flush ()
976{ 955{
977 flush_ev.stop (); 956 flush_ev.stop ();
978 957
979#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 959 if (bg_flags & BG_NEEDS_REFRESH)
981 { 960 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 961 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 962 scr_touch (false);
985 } 963 }
986#endif 964#endif
987 965
988 if (want_refresh) 966 if (want_refresh)
… …
1025 while (row < end_row); 1003 while (row < end_row);
1026 } 1004 }
1027 1005
1028 scr_refresh (); 1006 scr_refresh ();
1029 scrollBar.show (1); 1007 scrollBar.show (1);
1030#ifdef USE_XIM 1008#if USE_XIM
1031 IMSendSpot (); 1009 im_send_spot ();
1032#endif 1010#endif
1033 } 1011 }
1034 1012
1035 display->flush (); 1013 display->flush ();
1036} 1014}
… …
1054 flush (); 1032 flush ();
1055} 1033}
1056 1034
1057#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1058void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1054void
1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1060{ 1056{
1061 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1062 want_refresh = 1; 1058 want_refresh = 1;
1063 refresh_check (); 1059 refresh_check ();
… …
1081 1077
1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083void 1079void
1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085{ 1081{
1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1088 { 1084 {
1089 want_refresh = 1; 1085 want_refresh = 1;
1090 refresh_check (); 1086 refresh_check ();
1091 } 1087 }
1092 else 1088 else
… …
1096 1092
1097#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1098void 1094void
1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1100{ 1096{
1101 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1102 { 1098 {
1103 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1104 want_refresh = 1; 1100 want_refresh = 1;
1105 refresh_check (); 1101 refresh_check ();
1106 } 1102 }
… …
1111 1107
1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1113void 1109void
1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1115{ 1111{
1116 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1117 { 1113 {
1118 want_refresh = 1; 1114 want_refresh = 1;
1119 refresh_check (); 1115 refresh_check ();
1120 } 1116 }
1121 1117
… …
1153 { 1149 {
1154 } 1150 }
1155} event_handler; 1151} event_handler;
1156#endif 1152#endif
1157 1153
1154/* make sure all the cmd data is at beginning of cmdbuf */
1155void
1156rxvt_term::cmdbuf_reify ()
1157{
1158 if (cmdbuf_ptr == cmdbuf_base)
1159 return;
1160
1161 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1162
1163 memmove (cmdbuf_base, cmdbuf_ptr, used);
1164 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + used;
1166
1167}
1168
1169#if defined (KEYSYM_RESOURCE)
1170void
1171rxvt_term::cmdbuf_append (const char *str, size_t count)
1172{
1173 cmdbuf_reify ();
1174
1175 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1176
1177 if (count > avail)
1178 return;
1179
1180 memcpy (cmdbuf_endp, str, count);
1181 cmdbuf_endp += count;
1182
1183 cmd_parse ();
1184}
1185#endif
1186
1158bool 1187bool
1159rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1160{ 1189{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1162 1191
1163 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1193
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1166 n = 0;
1167 } 1195 {
1168 1196 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1197 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1172 1201
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1203
1175 if (r > 0) 1204 if (r > 0)
1176 { 1205 {
1177 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1178 return true; 1207 return true;
… …
1209 pty_write (); 1238 pty_write ();
1210 1239
1211 refresh_check (); 1240 refresh_check ();
1212} 1241}
1213 1242
1214void 1243void ecb_cold
1215rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1216{ 1245{
1217 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1218 recolour_cursor (); 1247 recolor_cursor ();
1219 1248
1220#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1221 hidden_pointer = 0; 1250 hidden_pointer = 0;
1222 1251
1223 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1224 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1225#endif 1254#endif
1226} 1255}
1227 1256
1228#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1229void 1258void ecb_cold
1230rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1231{ 1260{
1232 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1233 return; 1262 return;
1234 1263
… …
1236 XFlush (dpy); 1265 XFlush (dpy);
1237 1266
1238 hidden_pointer = 1; 1267 hidden_pointer = 1;
1239} 1268}
1240 1269
1241void 1270void ecb_cold
1242rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1243{ 1272{
1244 make_current (); 1273 make_current ();
1245 1274
1246 pointer_blank (); 1275 pointer_blank ();
… …
1252{ 1281{
1253 int button_number, key_state = 0; 1282 int button_number, key_state = 0;
1254 int x, y; 1283 int x, y;
1255 int code = 32; 1284 int code = 32;
1256 1285
1257 x = Pixel2Col (ev.x); 1286 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1287 y = Pixel2Row (ev.y) + 1;
1288
1259 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
1260 { 1290 {
1261 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1262 return; 1292 return;
1293
1263 mouse_row = x; 1294 mouse_row = x;
1264 mouse_col = y; 1295 mouse_col = y;
1265 code += 32; 1296 code += 32;
1266 } 1297 }
1267 1298
… …
1270 else 1301 else
1271 { 1302 {
1272 button_number = MEvent.button - Button1; 1303 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1304 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1305 if (button_number >= 3)
1275 button_number += (64 - 3); 1306 button_number += 64 - 3;
1276 } 1307 }
1277 1308
1278 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1279 { 1310 {
1280 /* 1311 /*
… …
1312 fputc ('A', stderr); 1343 fputc ('A', stderr);
1313 if (key_state & 32) 1344 if (key_state & 32)
1314 fputc ('2', stderr); 1345 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1346 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1347 button_number,
1317 x + 1, 1348 x,
1318 y + 1); 1349 y);
1319#endif 1350#endif
1320 1351
1352#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight)
1354 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state,
1356 x,
1357 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse)
1359 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state,
1361 wint_t (32 + x),
1362 wint_t (32 + y));
1363 else
1364#endif
1321 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1366 code + button_number + key_state,
1323 (32 + x + 1), 1367 32 + x,
1324 (32 + y + 1)); 1368 32 + y);
1325} 1369}
1326 1370
1327/*{{{ process an X event */ 1371/*{{{ process an X event */
1328void 1372void ecb_hot
1329rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1330{ 1374{
1331 make_current (); 1375 make_current ();
1332 1376
1333 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
… …
1431 && ev.xfocus.mode != NotifyGrab) 1475 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1476 focus_out ();
1433 break; 1477 break;
1434 1478
1435 case ConfigureNotify: 1479 case ConfigureNotify:
1436 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent)
1437 { 1481 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1483 ;
1440 1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1441#ifdef HAVE_BG_PIXMAP 1488#ifdef HAVE_BG_PIXMAP
1442 bool moved = false;
1443 if (bgPixmap.window_position_sensitive ()) 1489 if (bg_window_position_sensitive ())
1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change)
1444 { 1498 {
1445 int x, y; 1499 int x, y;
1500
1446 if (ev.xconfigure.send_event) 1501 if (ev.xconfigure.send_event)
1447 { 1502 {
1448 x = ev.xconfigure.x; 1503 x = ev.xconfigure.x;
1449 y = ev.xconfigure.y; 1504 y = ev.xconfigure.y;
1450 } 1505 }
1451 else 1506 else
1452 get_window_origin (x, y); 1507 get_window_origin (x, y);
1453 1508
1454 if (bgPixmap.set_position (x, y) 1509 if (x != parent_x || y != parent_y)
1455 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1510 {
1511 parent_x = x;
1512 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1456 moved = true; 1514 moved = true;
1515 }
1457 } 1516 }
1458#endif
1459 1517
1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1461 { 1519 {
1462 seen_resize = 1; 1520 seen_resize = 1;
1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1464 } 1522 }
1465 else 1523 else
1466 { 1524 {
1467#ifdef HAVE_BG_PIXMAP 1525#ifdef HAVE_BG_PIXMAP
1468 if (moved) 1526 if (moved)
1469 {
1470 if (mapped)
1471 update_background (); 1527 update_background ();
1472 else
1473 bgPixmap.invalidate ();
1474 }
1475#endif 1528#endif
1476 } 1529 }
1477 1530
1478 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1479 } 1532 }
1480 break; 1533 break;
1481 1534
1482 case PropertyNotify: 1535 case PropertyNotify:
1483 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1536 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1485 && ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487
1488 break; 1537 break;
1489 1538
1490 case SelectionClear: 1539 case SelectionClear:
1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1540 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1492 break; 1541 break;
1493 1542
1494 case SelectionNotify:
1495 if (selection_wait == Sel_normal)
1496 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1497 break;
1498
1499 case SelectionRequest: 1543 case SelectionRequest:
1500 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1501 break; 1545 break;
1502 1546
1503 case MapNotify: 1547 case MapNotify:
1504#ifdef HAVE_BG_PIXMAP 1548#ifdef HAVE_BG_PIXMAP
1505 /* This is needed specifically to fix the case of no window manager or a 1549 // This is needed at startup for the case of no window manager
1506 * non-reparenting window manager. In those cases we never get first 1550 // or a non-reparenting window manager and also because we
1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1551 // defer bg image updates if the window is not mapped. The
1508 * care of multiplicity of ConfigureNotify events arriving while WM does 1552 // short delay is to optimize for multiple ConfigureNotify
1509 * reparenting. 1553 // events at startup when the window manager reparents the
1510 * We should not render background immediately, as there could be several 1554 // window, so as to perform the computation after we have
1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1555 // received all of them.
1512 * by scheduling background redraw as soon as we can, but giving a short 1556 if (bg_img == 0)
1513 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results.
1516 */
1517 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1518 update_background_ev.start (0.025); 1557 update_background_ev.start (0.025);
1519#endif 1558#endif
1520 mapped = 1; 1559 mapped = 1;
1521#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1522 text_blink_ev.start (); 1561 text_blink_ev.start ();
… …
1537 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1538 { 1577 {
1539 do 1578 do
1540 { 1579 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1580 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1581 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1582 }
1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1583 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1545 1584
1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1585 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1547 1586
1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1587 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549 { 1588 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1552 } 1591 }
1553 1592
1554 want_refresh = 1; 1593 want_refresh = 1;
1555 } 1594 }
1556 else 1595 else
… …
1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1602 ;
1564 1603
1565 if (scrollBar.state && ev.xany.window == scrollBar.win) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1605 {
1567 scrollBar.state = STATE_IDLE; 1606 scrollBar.state = SB_STATE_IDLE;
1568 scrollBar.show (0); 1607 scrollBar.show (0);
1569 } 1608 }
1570 } 1609 }
1571 break; 1610 break;
1572 1611
1573 case MotionNotify: 1612 case MotionNotify:
1574#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1614 if (hidden_pointer)
1576 pointer_unblank (); 1615 pointer_unblank ();
1577#endif 1616#endif
1617 if (!bypass_keystate
1578 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1579 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1580 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1581 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1582 break; 1622 break;
1583 1623
1584 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1596 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1597 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1598 &ev.xbutton.state); 1638 &ev.xbutton.state);
1599#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1600 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1601 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1602 { 1643 {
1603#endif
1604#if ISO_14755 1644#if ISO_14755
1605 // 5.4 1645 // 5.4
1606 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1607 { 1647 {
1608 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1614 1654
1615#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1616 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1617 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1618 { 1658 {
1659 page_dirn scroll_selection_dir;
1619 int dist; 1660 int dist;
1620 1661
1621 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1622 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1623 */ 1664 */
… …
1638 dist = int_bwidth - ev.xbutton.y; 1679 dist = int_bwidth - ev.xbutton.y;
1639 } 1680 }
1640 else 1681 else
1641 { 1682 {
1642 scroll_selection_dir = DN; 1683 scroll_selection_dir = DN;
1643 dist = ev.xbutton.y - (int_bwidth + height); 1684 dist = ev.xbutton.y - (int_bwidth + vt_height);
1644 } 1685 }
1645 1686
1646 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1647 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1; 1689 + 1;
1649 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1650 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1651 } 1693 }
1652 else 1694 else
1653 { 1695 {
1654 /* we are within the text window, so we 1696 /* we are within the text window, so we
1655 * shouldn't be scrolling 1697 * shouldn't be scrolling
1656 */ 1698 */
1657 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1658 } 1700 }
1659#endif 1701#endif
1660#ifdef MOUSE_THRESHOLD
1661 } 1702 }
1662#endif
1663 } 1703 }
1664 } 1704 }
1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1706 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1669 ; 1709 ;
1670 1710
1671 XQueryPointer (dpy, scrollBar.win, 1711 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1712 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1715 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollBar.size ()); 1717 scrollBar.size ());
1678 want_refresh = 1; 1718 want_refresh = 1;
1679 scrollBar.show (1); 1719 scrollBar.show (1);
1680 } 1720 }
1681 break; 1721 break;
1682 } 1722 }
1683 1723
1684#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1685 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1686 {
1687 if (hidden_cursor)
1688 {
1689 hidden_cursor = 0;
1690 want_refresh = 1;
1691 }
1692
1693 cursor_blink_ev.again (); 1726 cursor_blink_reset ();
1694 }
1695#endif 1727#endif
1696 1728
1697#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699 { 1731 {
… …
1710 1742
1711 refresh_check (); 1743 refresh_check ();
1712} 1744}
1713 1745
1714#if ENABLE_FRILLS 1746#if ENABLE_FRILLS
1715void 1747void ecb_cold
1716rxvt_term::set_urgency (bool enable) 1748rxvt_term::set_urgency (bool enable)
1717{ 1749{
1718 if (enable == urgency_hint) 1750 if (enable == urgency_hint)
1719 return; 1751 return;
1720 1752
1721 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1754 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent[0], h); 1756 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1757 urgency_hint = enable;
1758 XFree (h);
1726 } 1759 }
1727} 1760}
1728#endif 1761#endif
1729 1762
1730void 1763void ecb_cold
1731rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1732{ 1765{
1733 if (!focus) 1766 if (!focus)
1734 { 1767 {
1735 focus = 1; 1768 focus = 1;
1736 want_refresh = 1; 1769 want_refresh = 1;
1737 1770
1738#if USE_XIM 1771#if USE_XIM
1739 if (Input_Context != NULL) 1772 if (Input_Context != NULL)
1740 { 1773 {
1741 IMSetPosition (); 1774 im_set_position ();
1742 XSetICFocus (Input_Context); 1775 XSetICFocus (Input_Context);
1743 } 1776 }
1744#endif 1777#endif
1745#if CURSOR_BLINK 1778#if CURSOR_BLINK
1746 if (option (Opt_cursorBlink)) 1779 if (option (Opt_cursorBlink))
… …
1748#endif 1781#endif
1749#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1750 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1751 { 1784 {
1752 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1753 scr_recolour (); 1786 scr_recolor ();
1754 } 1787 }
1755#endif 1788#endif
1756#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1757 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1758 set_urgency (0); 1791 set_urgency (0);
… …
1760 1793
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1794 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 } 1795 }
1763} 1796}
1764 1797
1765void 1798void ecb_cold
1766rxvt_term::focus_out () 1799rxvt_term::focus_out ()
1767{ 1800{
1768 if (focus) 1801 if (focus)
1769 { 1802 {
1770 focus = 0; 1803 focus = 0;
… …
1795#endif 1828#endif
1796#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1798 { 1831 {
1799 pix_colors = pix_colors_unfocused; 1832 pix_colors = pix_colors_unfocused;
1800 scr_recolour (); 1833 scr_recolor ();
1801 } 1834 }
1802#endif 1835#endif
1803 1836
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1837 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 } 1838 }
1806} 1839}
1807 1840
1808void 1841void ecb_cold
1809rxvt_term::update_fade_color (unsigned int idx) 1842rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1810{ 1843{
1811#if OFF_FOCUS_FADING 1844#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1845 if (rs[Rs_fade])
1813 { 1846 {
1847 if (!first_time)
1848 pix_colors_focused [idx].free (this);
1849
1814 rgba c; 1850 rgba c;
1815 pix_colors [Color_fade].get (c); 1851 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1852 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 } 1853 }
1818#endif 1854#endif
1819} 1855}
1820 1856
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL 1857#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1822void 1858void ecb_hot
1823rxvt_term::rootwin_cb (XEvent &ev) 1859rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1860{
1825 make_current (); 1861 make_current ();
1826 1862
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1863 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1864 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return; 1865 return;
1830 1866
1831# if ENABLE_TRANSPARENCY
1832 switch (ev.type) 1867 switch (ev.type)
1833 { 1868 {
1834 case PropertyNotify: 1869 case PropertyNotify:
1835 /* 1870 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1871 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1872 * use the property to determine the pixmap. We use it later on.
1838 */ 1873 */
1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1874 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1875 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 { 1876 {
1842 bgPixmap.set_root_pixmap (); 1877#if BG_IMAGE_FROM_ROOT
1878 if (option (Opt_transparent))
1879 {
1880 rxvt_img::new_from_root (this)->replace (root_img);
1843 update_background (); 1881 update_background ();
1882 }
1883#endif
1884 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1844 } 1885 }
1845 1886
1846 break; 1887 break;
1847 } 1888 }
1848# endif
1849 1889
1850 refresh_check (); 1890 refresh_check ();
1851} 1891}
1852#endif 1892#endif
1853 1893
… …
1876 iso14755_54 (ev.x, ev.y); 1916 iso14755_54 (ev.x, ev.y);
1877 return; 1917 return;
1878 } 1918 }
1879#endif 1919#endif
1880 1920
1881 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1921 clickintime = ev.time - MEvent.time < multiClickTime;
1882 1922
1883 if (reportmode) 1923 if (reportmode)
1884 { 1924 {
1885 /* mouse report from vt window */ 1925 /* mouse report from vt window */
1886 /* save the xbutton state (for ButtonRelease) */ 1926 /* save the xbutton state (for ButtonRelease) */
… …
1977 if (scrollBar.upButton (ev.y)) 2017 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */ 2018 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y)) 2019 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */ 2020 direction = DN; /* down */
1981 2021
1982 scrollBar.state = STATE_IDLE; 2022 scrollBar.state = SB_STATE_IDLE;
1983 /* 2023 /*
1984 * Rxvt-style scrollbar: 2024 * Rxvt-style scrollbar:
1985 * move up if mouse is above slider 2025 * move up if mouse is above slider
1986 * move dn if mouse is below slider 2026 * move dn if mouse is below slider
1987 * 2027 *
… …
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2066 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 2067#endif
2028 if (scr_page (direction, 1)) 2068 if (scr_page (direction, 1))
2029 { 2069 {
2030 if (direction == UP) 2070 if (direction == UP)
2031 scrollBar.state = STATE_UP; 2071 scrollBar.state = SB_STATE_UP;
2032 else 2072 else
2033 scrollBar.state = STATE_DOWN; 2073 scrollBar.state = SB_STATE_DOWN;
2034 } 2074 }
2035 } 2075 }
2036 else 2076 else
2037 switch (ev.button) 2077 switch (ev.button)
2038 { 2078 {
2039 case Button2: 2079 case Button2:
2040 switch (scrollBar.align) 2080 switch (scrollBar.align)
2041 { 2081 {
2042 case R_SB_ALIGN_TOP: 2082 case SB_ALIGN_TOP:
2043 csrO = 0; 2083 csrO = 0;
2044 break; 2084 break;
2045 case R_SB_ALIGN_CENTRE: 2085 case SB_ALIGN_CENTRE:
2046 csrO = (scrollBar.bot - scrollBar.top) / 2; 2086 csrO = (scrollBar.bot - scrollBar.top) / 2;
2047 break; 2087 break;
2048 case R_SB_ALIGN_BOTTOM: 2088 case SB_ALIGN_BOTTOM:
2049 csrO = scrollBar.bot - scrollBar.top; 2089 csrO = scrollBar.bot - scrollBar.top;
2050 break; 2090 break;
2051 } 2091 }
2052 2092
2053 if (scrollBar.style == R_SB_XTERM 2093 if (scrollBar.style == SB_STYLE_XTERM
2054 || scrollbar_above_slider (ev.y) 2094 || scrollBar.above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2095 || scrollBar.below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2096 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057 2097
2058 scrollBar.state = STATE_MOTION; 2098 scrollBar.state = SB_STATE_MOTION;
2059 break; 2099 break;
2060 2100
2061 case Button1: 2101 case Button1:
2062 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2102 if (scrollBar.align == SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2103 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2104 /* FALLTHROUGH */
2065 2105
2066 case Button3: 2106 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2107 if (scrollBar.style != SB_STYLE_XTERM)
2068 { 2108 {
2069 if (scrollbar_above_slider (ev.y)) 2109 if (scrollBar.above_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2110# ifdef RXVT_SCROLL_FULL
2071 scr_page (UP, nrow - 1); 2111 scr_page (UP, nrow - 1);
2072# else 2112# else
2073 scr_page (UP, nrow / 4); 2113 scr_page (UP, nrow / 4);
2074# endif 2114# endif
2075 else if (scrollbar_below_slider (ev.y)) 2115 else if (scrollBar.below_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2116# ifdef RXVT_SCROLL_FULL
2077 scr_page (DN, nrow - 1); 2117 scr_page (DN, nrow - 1);
2078# else 2118# else
2079 scr_page (DN, nrow / 4); 2119 scr_page (DN, nrow / 4);
2080# endif 2120# endif
2081 else 2121 else
2082 scrollBar.state = STATE_MOTION; 2122 scrollBar.state = SB_STATE_MOTION;
2083 } 2123 }
2084 else 2124 else
2085 { 2125 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2126 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2127 (nrow
2088 * scrollbar_position (ev.y) 2128 * scrollBar.position (ev.y)
2089 / scrollBar.size ())); 2129 / scrollBar.size ()));
2090 } 2130 }
2091 2131
2092 break; 2132 break;
2093 } 2133 }
… …
2104 2144
2105 csrO = 0; /* reset csr Offset */ 2145 csrO = 0; /* reset csr Offset */
2106 if (!bypass_keystate) 2146 if (!bypass_keystate)
2107 reportmode = !! (priv_modes & PrivMode_mouse_report); 2147 reportmode = !! (priv_modes & PrivMode_mouse_report);
2108 2148
2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2149 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110 { 2150 {
2111 scrollBar.state = STATE_IDLE; 2151 scrollBar.state = SB_STATE_IDLE;
2112 scrollBar.show (0); 2152 scrollBar.show (0);
2113 } 2153 }
2114 2154
2115#ifdef SELECTION_SCROLLING 2155#ifdef SELECTION_SCROLLING
2116 sel_scroll_ev.stop(); 2156 sel_scroll_ev.stop();
… …
2136#ifdef MOUSE_REPORT_DOUBLECLICK 2176#ifdef MOUSE_REPORT_DOUBLECLICK
2137 /* only report the release of 'slow' single clicks */ 2177 /* only report the release of 'slow' single clicks */
2138 if (MEvent.button != AnyButton 2178 if (MEvent.button != AnyButton
2139 && (ev.button != MEvent.button 2179 && (ev.button != MEvent.button
2140 || (ev.time - MEvent.time 2180 || (ev.time - MEvent.time
2141 > MULTICLICK_TIME / 2))) 2181 > multiClickTime / 2)))
2142 { 2182 {
2143 MEvent.clicks = 0; 2183 MEvent.clicks = 0;
2144 MEvent.button = AnyButton; 2184 MEvent.button = AnyButton;
2145 mouse_report (ev); 2185 mouse_report (ev);
2146 } 2186 }
… …
2166 case Button3: 2206 case Button3:
2167 selection_make (ev.time); 2207 selection_make (ev.time);
2168 break; 2208 break;
2169 2209
2170 case Button2: 2210 case Button2:
2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2211 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2212 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173 break; 2213 break;
2174 2214
2175#ifdef MOUSE_WHEEL 2215#ifdef MOUSE_WHEEL
2176 case Button4: 2216 case Button4:
2177 case Button5: 2217 case Button5:
2178 { 2218 {
2179 int i; 2219 int lines;
2180 page_dirn v; 2220 page_dirn dirn;
2181 2221
2182 v = ev.button == Button4 ? UP : DN; 2222 dirn = ev.button == Button4 ? UP : DN;
2183 2223
2184 if (ev.state & ShiftMask) 2224 if (ev.state & ShiftMask)
2185 i = 1; 2225 lines = 1;
2186 else if (option (Opt_mouseWheelScrollPage)) 2226 else if (option (Opt_mouseWheelScrollPage))
2187 i = nrow - 1; 2227 lines = nrow - 1;
2188 else 2228 else
2189 i = 5; 2229 lines = 5;
2190 2230
2191# ifdef MOUSE_SLIP_WHEELING 2231# ifdef MOUSE_SLIP_WHEELING
2192 if (ev.state & ControlMask) 2232 if (ev.state & ControlMask)
2193 { 2233 {
2194 mouse_slip_wheel_speed += v ? -1 : 1; 2234 mouse_slip_wheel_speed += dirn;
2195 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2235 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2196 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2197 2236
2198 if (!slip_wheel_ev.is_active ()) 2237 if (!slip_wheel_ev.is_active ())
2199 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2238 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2200 } 2239 }
2201 else 2240 else
2202# endif 2241# endif
2203 { 2242 {
2204 scr_page (v, i); 2243 scr_page (dirn, lines);
2205 scrollBar.show (1); 2244 scrollBar.show (1);
2206 } 2245 }
2207 } 2246 }
2208 break; 2247 break;
2209#endif 2248#endif
… …
2211 } 2250 }
2212} 2251}
2213 2252
2214/*}}} */ 2253/*}}} */
2215 2254
2216void 2255void ecb_hot
2217rxvt_term::cmd_parse () 2256rxvt_term::cmd_parse ()
2218{ 2257{
2219 wchar_t ch = NOCHAR; 2258 wchar_t ch = NOCHAR;
2220 char *seq_begin; // remember start of esc-sequence here 2259 char *seq_begin; // remember start of esc-sequence here
2221 2260
2222 for (;;) 2261 for (;;)
2223 { 2262 {
2224 if (expect_false (ch == NOCHAR)) 2263 if (ecb_unlikely (ch == NOCHAR))
2225 { 2264 {
2226 seq_begin = cmdbuf_ptr; 2265 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2266 ch = next_char ();
2228 2267
2229 if (ch == NOCHAR) 2268 if (ch == NOCHAR)
2230 break; 2269 break;
2231 } 2270 }
2232 2271
2233 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2272 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2234 { 2273 {
2235 if (expect_false (!seen_input)) 2274 if (ecb_unlikely (!seen_input))
2236 { 2275 {
2237 seen_input = 1; 2276 seen_input = 1;
2238 // many badly-written programs (e.g. jed) contain a race condition: 2277 // many badly-written programs (e.g. jed) contain a race condition:
2239 // they first read the screensize and then install a SIGWINCH handler. 2278 // they first read the screensize and then install a SIGWINCH handler.
2240 // some window managers resize the window early, and these programs 2279 // some window managers resize the window early, and these programs
… …
2253 wchar_t *str = buf; 2292 wchar_t *str = buf;
2254 wchar_t *eol = str + min (ncol, UBUFSIZ); 2293 wchar_t *eol = str + min (ncol, UBUFSIZ);
2255 2294
2256 for (;;) 2295 for (;;)
2257 { 2296 {
2258 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2297 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259 break; 2298 break;
2260 2299
2261 *str++ = ch; 2300 *str++ = ch;
2262 2301
2263 if (expect_false (ch == C0_LF || str >= eol)) 2302 if (ecb_unlikely (ch == C0_LF || str >= eol))
2264 { 2303 {
2265 if (ch == C0_LF) 2304 if (ch == C0_LF)
2266 nlines++; 2305 nlines++;
2267 2306
2268 refresh_count++; 2307 refresh_count++;
… …
2340 } 2379 }
2341 } 2380 }
2342} 2381}
2343 2382
2344// read the next character 2383// read the next character
2345wchar_t 2384wchar_t ecb_hot
2346rxvt_term::next_char () NOTHROW 2385rxvt_term::next_char () NOTHROW
2347{ 2386{
2348 while (cmdbuf_ptr < cmdbuf_endp) 2387 while (cmdbuf_ptr < cmdbuf_endp)
2349 { 2388 {
2350 // assume 7-bit to be ascii ALWAYS 2389 // assume 7-bit to be ascii ALWAYS
2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2390 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2352 return *cmdbuf_ptr++; 2391 return *cmdbuf_ptr++;
2353 2392
2354 wchar_t wc; 2393 wchar_t wc;
2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2394 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2356 2395
… …
2362 } 2401 }
2363 2402
2364 if (len == (size_t)-1) 2403 if (len == (size_t)-1)
2365 { 2404 {
2366 mbstate.reset (); // reset now undefined conversion state 2405 mbstate.reset (); // reset now undefined conversion state
2406 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2407 // in which case we "erroneously" return the next byte which might be valid.
2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2408 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368 } 2409 }
2369 2410
2370 // assume wchar == unicode 2411 // assume wchar == unicode
2371 cmdbuf_ptr += len; 2412 cmdbuf_ptr += len;
… …
2374 2415
2375 return NOCHAR; 2416 return NOCHAR;
2376} 2417}
2377 2418
2378// read the next octet 2419// read the next octet
2379uint32_t 2420uint32_t ecb_hot
2380rxvt_term::next_octet () NOTHROW 2421rxvt_term::next_octet () NOTHROW
2381{ 2422{
2382 return cmdbuf_ptr < cmdbuf_endp 2423 return cmdbuf_ptr < cmdbuf_endp
2383 ? (unsigned char)*cmdbuf_ptr++ 2424 ? (unsigned char)*cmdbuf_ptr++
2384 : NOCHAR; 2425 : NOCHAR;
2385} 2426}
2386 2427
2387static class out_of_input out_of_input; 2428static class out_of_input out_of_input;
2388 2429
2389/* rxvt_cmd_getc () - Return next input character */ 2430wchar_t ecb_hot
2390/*
2391 * Return the next input character after first passing any keyboard input
2392 * to the command.
2393 */
2394wchar_t
2395rxvt_term::cmd_getc () THROW ((class out_of_input)) 2431rxvt_term::cmd_getc () THROW ((class out_of_input))
2396{ 2432{
2397 wchar_t c = next_char (); 2433 wchar_t c = next_char ();
2398 2434
2399 if (c == NOCHAR) 2435 if (c == NOCHAR)
2400 throw out_of_input; 2436 throw out_of_input;
2401 2437
2402 return c; 2438 return c;
2403} 2439}
2404 2440
2405uint32_t 2441uint32_t ecb_hot
2406rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2442rxvt_term::cmd_get8 () THROW ((class out_of_input))
2407{ 2443{
2408 uint32_t c = next_octet (); 2444 uint32_t c = next_octet ();
2409 2445
2410 if (c == NOCHAR) 2446 if (c == NOCHAR)
… …
2414} 2450}
2415 2451
2416/*{{{ print pipe */ 2452/*{{{ print pipe */
2417/*----------------------------------------------------------------------*/ 2453/*----------------------------------------------------------------------*/
2418#ifdef PRINTPIPE 2454#ifdef PRINTPIPE
2419FILE * 2455FILE * ecb_cold
2420rxvt_term::popen_printer () 2456rxvt_term::popen_printer ()
2421{ 2457{
2422 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2458 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2423 2459
2424 if (stream == NULL) 2460 if (stream == NULL)
2425 rxvt_warn ("can't open printer pipe, not printing.\n"); 2461 rxvt_warn ("can't open printer pipe, not printing.\n");
2426 2462
2427 return stream; 2463 return stream;
2428} 2464}
2429 2465
2430int 2466int ecb_cold
2431rxvt_term::pclose_printer (FILE *stream) 2467rxvt_term::pclose_printer (FILE *stream)
2432{ 2468{
2433 fflush (stream); 2469 fflush (stream);
2434 return pclose (stream); 2470 return pclose (stream);
2435} 2471}
2436 2472
2437/* 2473/*
2438 * simulate attached vt100 printer 2474 * simulate attached vt100 printer
2439 */ 2475 */
2440void 2476void ecb_cold
2441rxvt_term::process_print_pipe () 2477rxvt_term::process_print_pipe ()
2442{ 2478{
2443 FILE *fd = popen_printer (); 2479 FILE *fd = popen_printer ();
2444 2480
2445 if (!fd) 2481 if (!fd)
… …
2491 pclose_printer (fd); 2527 pclose_printer (fd);
2492} 2528}
2493#endif /* PRINTPIPE */ 2529#endif /* PRINTPIPE */
2494/*}}} */ 2530/*}}} */
2495 2531
2496/* *INDENT-OFF* */
2497enum { 2532enum {
2498 C1_40 = 0x40, 2533 C1_40 = 0x40,
2499 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2534 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2500 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2535 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2501 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2536 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2502 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2537 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2503}; 2538};
2504/* *INDENT-ON* */
2505 2539
2506/*{{{ process non-printing single characters */ 2540/*{{{ process non-printing single characters */
2507void 2541void ecb_hot
2508rxvt_term::process_nonprinting (unicode_t ch) 2542rxvt_term::process_nonprinting (unicode_t ch)
2509{ 2543{
2510 switch (ch) 2544 switch (ch)
2511 { 2545 {
2512 case C0_ESC: 2546 case C0_ESC:
… …
2542 scr_charset_choose (0); 2576 scr_charset_choose (0);
2543 break; 2577 break;
2544 2578
2545#ifdef EIGHT_BIT_CONTROLS 2579#ifdef EIGHT_BIT_CONTROLS
2546 // 8-bit controls 2580 // 8-bit controls
2547 case 0x90: /* DCS */ 2581 case 0x90: /* DCS */
2548 process_dcs_seq (); 2582 process_dcs_seq ();
2549 break; 2583 break;
2550 case 0x9b: /* CSI */ 2584 case 0x9b: /* CSI */
2551 process_csi_seq (); 2585 process_csi_seq ();
2552 break; 2586 break;
2553 case 0x9d: /* OSC */ 2587 case 0x9d: /* OSC */
2554 process_osc_seq (); 2588 process_osc_seq ();
2555 break; 2589 break;
2556#endif 2590#endif
2557 } 2591 }
2558} 2592}
2559/*}}} */ 2593/*}}} */
2560 2594
2561 2595
2562/*{{{ process VT52 escape sequences */ 2596/*{{{ process VT52 escape sequences */
2563void 2597void ecb_cold
2564rxvt_term::process_escape_vt52 (unicode_t ch) 2598rxvt_term::process_escape_vt52 (unicode_t ch)
2565{ 2599{
2566 int row, col; 2600 int row, col;
2567 2601
2568 switch (ch) 2602 switch (ch)
… …
2602 break; 2636 break;
2603 case 'Z': /* identify the terminal type */ 2637 case 'Z': /* identify the terminal type */
2604 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2638 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2605 break; 2639 break;
2606 case '<': /* turn off VT52 mode */ 2640 case '<': /* turn off VT52 mode */
2607 set_privmode (PrivMode_vt52, 0); 2641 priv_modes &= ~PrivMode_vt52;
2608 break; 2642 break;
2609 case 'F': /* use special graphics character set */ 2643 case 'F': /* use special graphics character set */
2610 case 'G': /* use regular character set */ 2644 case 'G': /* use regular character set */
2611 /* unimplemented */ 2645 /* unimplemented */
2612 break; 2646 break;
… …
2618} 2652}
2619/*}}} */ 2653/*}}} */
2620 2654
2621 2655
2622/*{{{ process escape sequences */ 2656/*{{{ process escape sequences */
2623void 2657void ecb_hot
2624rxvt_term::process_escape_seq () 2658rxvt_term::process_escape_seq ()
2625{ 2659{
2626 unicode_t ch = cmd_getc (); 2660 unicode_t ch = cmd_getc ();
2627 2661
2628 if (priv_modes & PrivMode_vt52) 2662 if (priv_modes & PrivMode_vt52)
… …
2631 return; 2665 return;
2632 } 2666 }
2633 2667
2634 switch (ch) 2668 switch (ch)
2635 { 2669 {
2636 /* case 1: do_tek_mode (); break; */
2637 case '#': 2670 case '#':
2638 if (cmd_getc () == '8') 2671 if (cmd_getc () == '8')
2639 scr_E (); 2672 scr_E ();
2640 break; 2673 break;
2641 case '(': 2674 case '(':
… …
2664#if !ENABLE_MINIMAL 2697#if !ENABLE_MINIMAL
2665 case '9': 2698 case '9':
2666 scr_forwardindex (); 2699 scr_forwardindex ();
2667 break; 2700 break;
2668#endif 2701#endif
2702 // DECPAM/DECPNM
2669 case '=': 2703 case '=':
2704 priv_modes |= PrivMode_aplKP;
2705 break;
2670 case '>': 2706 case '>':
2671 set_privmode (PrivMode_aplKP, ch == '='); 2707 priv_modes &= ~PrivMode_aplKP;
2672 break; 2708 break;
2673 2709
2674 case C1_40: 2710 case C1_40:
2675 cmd_getc (); 2711 cmd_getc ();
2676 break; 2712 break;
… …
2680 2716
2681 /* 8.3.87: NEXT LINE */ 2717 /* 8.3.87: NEXT LINE */
2682 case C1_NEL: /* ESC E */ 2718 case C1_NEL: /* ESC E */
2683 { 2719 {
2684 wchar_t nlcr[] = { C0_LF, C0_CR }; 2720 wchar_t nlcr[] = { C0_LF, C0_CR };
2685 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2721 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2686 } 2722 }
2687 break; 2723 break;
2688 2724
2689 /* kidnapped escape sequence: Should be 8.3.48 */ 2725 /* kidnapped escape sequence: Should be 8.3.48 */
2690 case C1_ESA: /* ESC G */ 2726 case C1_ESA: /* ESC G */
2691 process_graphics (); 2727 // used by original rxvt for rob nations own graphics mode
2728 if (cmd_getc () == 'Q')
2729 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2692 break; 2730 break;
2693 2731
2694 /* 8.3.63: CHARACTER TABULATION SET */ 2732 /* 8.3.63: CHARACTER TABULATION SET */
2695 case C1_HTS: /* ESC H */ 2733 case C1_HTS: /* ESC H */
2696 scr_set_tab (1); 2734 scr_set_tab (1);
… …
2700 case C1_RI: /* ESC M */ 2738 case C1_RI: /* ESC M */
2701 scr_index (DN); 2739 scr_index (DN);
2702 break; 2740 break;
2703 2741
2704 /* 8.3.142: SINGLE-SHIFT TWO */ 2742 /* 8.3.142: SINGLE-SHIFT TWO */
2705 /*case C1_SS2: scr_single_shift (2); break; */ 2743 /* case C1_SS2: break; */
2706 2744
2707 /* 8.3.143: SINGLE-SHIFT THREE */ 2745 /* 8.3.143: SINGLE-SHIFT THREE */
2708 /*case C1_SS3: scr_single_shift (3); break; */ 2746 /* case C1_SS3: break; */
2709 2747
2710 /* 8.3.27: DEVICE CONTROL STRING */ 2748 /* 8.3.27: DEVICE CONTROL STRING */
2711 case C1_DCS: /* ESC P */ 2749 case C1_DCS: /* ESC P */
2712 process_dcs_seq (); 2750 process_dcs_seq ();
2713 break; 2751 break;
… …
2746 } 2784 }
2747} 2785}
2748/*}}} */ 2786/*}}} */
2749 2787
2750/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2788/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2751/* *INDENT-OFF* */
2752enum { 2789enum {
2753 CSI_ICH = 0x40, 2790 CSI_ICH = 0x40,
2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2791 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2792 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2793 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2796 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2797 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2798 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2762}; 2799};
2763 2800
2764#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2801#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2802 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2803 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2767#define get_byte_array_bit(array, bit) \ 2804#define get_byte_array_bit(array, bit) \
2768 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2805 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2769 2806
2770const unsigned char csi_defaults[] = 2807static const unsigned char csi_defaults[] =
2771 { 2808 {
2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2809 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2810 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2811 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2812 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2813 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2814 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2815 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2816 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2780 }; 2817 };
2781/* *INDENT-ON* */
2782 2818
2783void 2819void ecb_hot
2784rxvt_term::process_csi_seq () 2820rxvt_term::process_csi_seq ()
2785{ 2821{
2786 unicode_t ch, priv, i; 2822 unicode_t ch, priv, prev_ch, i;
2787 unsigned int nargs, p; 2823 unsigned int nargs, p;
2788 int n, ndef; 2824 int n, ndef;
2789 int arg[ESC_ARGS] = { }; 2825 int arg[ESC_ARGS] = { };
2790 2826
2791 nargs = 0; 2827 nargs = 0;
… …
2797 /* '<' '=' '>' '?' '!' */ 2833 /* '<' '=' '>' '?' '!' */
2798 priv = ch; 2834 priv = ch;
2799 ch = cmd_getc (); 2835 ch = cmd_getc ();
2800 } 2836 }
2801 2837
2838 prev_ch = 0;
2802 /* read any numerical arguments */ 2839 /* read any numerical arguments */
2803 for (n = -1; ch < CSI_ICH; ) 2840 for (n = -1; ch < CSI_ICH; )
2804 { 2841 {
2805 if (isdigit (ch)) 2842 if (isdigit (ch))
2806 { 2843 {
… …
2816 n = -1; 2853 n = -1;
2817 } 2854 }
2818 else if (IS_CONTROL (ch)) 2855 else if (IS_CONTROL (ch))
2819 process_nonprinting (ch); 2856 process_nonprinting (ch);
2820 2857
2858 prev_ch = ch;
2821 ch = cmd_getc (); 2859 ch = cmd_getc ();
2822 } 2860 }
2823 2861
2824 if (ch > CSI_7F) 2862 if (ch > CSI_7F)
2825 return; 2863 return;
… …
2864 { 2902 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2903 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset (); 2904 scr_soft_reset ();
2867 2905
2868 static const int pm_h[] = { 7, 25 }; 2906 static const int pm_h[] = { 7, 25 };
2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2907 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2870 2908
2871 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2909 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2872 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2910 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2873 } 2911 }
2874 break; 2912 break;
2875 } 2913 }
2876 2914
2877 return; 2915 return;
… …
2895 } 2933 }
2896 break; 2934 break;
2897#endif 2935#endif
2898 2936
2899 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2937 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2900 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2938 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2901 arg[0] = -arg[0]; 2939 arg[0] = -arg[0];
2902 /* FALLTHROUGH */ 2940 /* FALLTHROUGH */
2903 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2941 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2904 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2942 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2905 scr_gotorc (arg[0], 0, RELATIVE); 2943 scr_gotorc (arg[0], 0, RELATIVE);
2906 break; 2944 break;
2907 2945
2908 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2946 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2909 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2947 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3059 scr_insert_mode (1); 3097 scr_insert_mode (1);
3060 else if (arg[0] == 20) 3098 else if (arg[0] == 20)
3061 priv_modes |= PrivMode_LFNL; 3099 priv_modes |= PrivMode_LFNL;
3062 break; 3100 break;
3063 3101
3102 case CSI_71: // DECSCUSR: set cursor style
3103 if (prev_ch == ' ')
3104 set_cursor_style (arg[0]);
3105 break;
3106
3064 /* 3107 /*
3065 * PRIVATE USE beyond this point. All CSI_7? sequences here 3108 * PRIVATE USE beyond this point. All CSI_7? sequences here
3066 */ 3109 */
3067 case CSI_72: /* DECSTBM: set top and bottom margins */ 3110 case CSI_72: /* DECSTBM: set top and bottom margins */
3068 if (nargs == 1) 3111 if (nargs == 1)
… …
3096 } 3139 }
3097} 3140}
3098/*}}} */ 3141/*}}} */
3099 3142
3100#if !ENABLE_MINIMAL 3143#if !ENABLE_MINIMAL
3101/* ARGSUSED */
3102void 3144void
3103rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3145rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3104{ 3146{
3105 int x, y; 3147 int x, y;
3106 XWindowAttributes wattr; 3148 XWindowAttributes wattr;
… …
3115 { 3157 {
3116 /* 3158 /*
3117 * commands 3159 * commands
3118 */ 3160 */
3119 case 1: /* deiconify window */ 3161 case 1: /* deiconify window */
3120 XMapWindow (dpy, parent[0]); 3162 XMapWindow (dpy, parent);
3121 break; 3163 break;
3122 case 2: /* iconify window */ 3164 case 2: /* iconify window */
3123 XIconifyWindow (dpy, parent[0], display->screen); 3165 XIconifyWindow (dpy, parent, display->screen);
3124 break; 3166 break;
3125 case 3: /* set position (pixels) */ 3167 case 3: /* set position (pixels) */
3126 XMoveWindow (dpy, parent[0], args[1], args[2]); 3168 XMoveWindow (dpy, parent, args[1], args[2]);
3127 break; 3169 break;
3128 case 4: /* set size (pixels) */ 3170 case 4: /* set size (pixels) */
3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3171 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3130 break; 3172 break;
3131 case 5: /* raise window */ 3173 case 5: /* raise window */
3132 XRaiseWindow (dpy, parent[0]); 3174 XRaiseWindow (dpy, parent);
3133 break; 3175 break;
3134 case 6: /* lower window */ 3176 case 6: /* lower window */
3135 XLowerWindow (dpy, parent[0]); 3177 XLowerWindow (dpy, parent);
3136 break; 3178 break;
3137 case 7: /* refresh window */ 3179 case 7: /* refresh window */
3138 scr_touch (true); 3180 scr_touch (true);
3139 break; 3181 break;
3140 case 8: /* set size (chars) */ 3182 case 8: /* set size (chars) */
… …
3143 break; 3185 break;
3144 3186
3145 //case 9: NYI, TODO, restore maximized window or maximize window 3187 //case 9: NYI, TODO, restore maximized window or maximize window
3146 default: 3188 default:
3147 if (args[0] >= 24) /* set height (chars) */ 3189 if (args[0] >= 24) /* set height (chars) */
3148 set_widthheight ((unsigned int)width, 3190 set_widthheight ((unsigned int)vt_width,
3149 (unsigned int) (args[1] * fheight)); 3191 (unsigned int) (args[1] * fheight));
3150 break; 3192 break;
3151 3193
3152 /* 3194 /*
3153 * reports - some output format copied from XTerm 3195 * reports - some output format copied from XTerm
3154 */ 3196 */
3155 case 11: /* report window state */ 3197 case 11: /* report window state */
3156 XGetWindowAttributes (dpy, parent[0], &wattr); 3198 XGetWindowAttributes (dpy, parent, &wattr);
3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3199 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3158 break; 3200 break;
3159 case 13: /* report window position */ 3201 case 13: /* report window position */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3161 XTranslateCoordinates (dpy, parent[0], wattr.root, 3203 XTranslateCoordinates (dpy, parent, wattr.root,
3162 -wattr.border_width, -wattr.border_width, 3204 -wattr.border_width, -wattr.border_width,
3163 &x, &y, &wdummy); 3205 &x, &y, &wdummy);
3164 tt_printf ("\033[3;%d;%dt", x, y); 3206 tt_printf ("\033[3;%d;%dt", x, y);
3165 break; 3207 break;
3166 case 14: /* report window size (pixels) */ 3208 case 14: /* report window size (pixels) */
3167 XGetWindowAttributes (dpy, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3210 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3169 break; 3211 break;
3170 case 18: /* report text area size (chars) */ 3212 case 18: /* report text area size (chars) */
3171 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3213 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3172 break; 3214 break;
… …
3174 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3216 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3175 break; 3217 break;
3176 case 20: /* report icon label */ 3218 case 20: /* report icon label */
3177 { 3219 {
3178 char *s; 3220 char *s;
3179 XGetIconName (dpy, parent[0], &s); 3221 XGetIconName (dpy, parent, &s);
3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3222 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3181 XFree (s); 3223 XFree (s);
3182 } 3224 }
3183 break; 3225 break;
3184 case 21: /* report window title */ 3226 case 21: /* report window title */
3185 { 3227 {
3186 char *s; 3228 char *s;
3187 XFetchName (dpy, parent[0], &s); 3229 XFetchName (dpy, parent, &s);
3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3230 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3189 XFree (s); 3231 XFree (s);
3190 } 3232 }
3191 break; 3233 break;
3192 } 3234 }
… …
3202rxvt_term::get_to_st (unicode_t &ends_how) 3244rxvt_term::get_to_st (unicode_t &ends_how)
3203{ 3245{
3204 unicode_t ch; 3246 unicode_t ch;
3205 bool seen_esc = false; 3247 bool seen_esc = false;
3206 unsigned int n = 0; 3248 unsigned int n = 0;
3207 wchar_t string[STRING_MAX]; 3249 wchar_t string[CBUFSIZ];
3208 3250
3209 while ((ch = cmd_getc ()) != NOCHAR) 3251 while ((ch = cmd_getc ()) != NOCHAR)
3210 { 3252 {
3211 if (seen_esc) 3253 if (seen_esc)
3212 { 3254 {
… …
3227 else if (ch < 0x20) 3269 else if (ch < 0x20)
3228 return NULL; /* other control character - exit */ 3270 return NULL; /* other control character - exit */
3229 3271
3230 seen_esc = false; 3272 seen_esc = false;
3231 3273
3232 if (n >= STRING_MAX - 1) 3274 if (n >= sizeof (string) - 1)
3233 // stop at some sane length 3275 // stop at some sane length
3234 return NULL; 3276 return NULL;
3235 3277
3236 string[n++] = ch; 3278 string[n++] = ch;
3237 } 3279 }
… …
3346 unsigned long bytes_after; 3388 unsigned long bytes_after;
3347 unsigned char *value = 0; 3389 unsigned char *value = 0;
3348 const char *str = ""; 3390 const char *str = "";
3349 3391
3350 if (prop 3392 if (prop
3351 && XGetWindowProperty (dpy, parent[0], 3393 && XGetWindowProperty (dpy, parent,
3352 prop, 0, 1<<16, 0, AnyPropertyType, 3394 prop, 0, 1<<16, 0, AnyPropertyType,
3353 &actual_type, &actual_format, 3395 &actual_type, &actual_format,
3354 &nitems, &bytes_after, &value) == Success 3396 &nitems, &bytes_after, &value) == Success
3355 && actual_type != None 3397 && actual_type != None
3356 && actual_format == 8) 3398 && actual_format == 8)
3357 str = (const char *)(value); 3399 str = (const char *)(value);
3358 3400
3359 tt_printf ("\033]%d;%s%c", op, str, resp); 3401 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3360 3402
3361 XFree (value); 3403 XFree (value);
3362 } 3404 }
3363 else 3405 else
3364 { 3406 {
… …
3368 { 3410 {
3369 *eq = 0; 3411 *eq = 0;
3370 set_utf8_property (display->atom (str), eq + 1); 3412 set_utf8_property (display->atom (str), eq + 1);
3371 } 3413 }
3372 else 3414 else
3373 XDeleteProperty (dpy, parent[0], 3415 XDeleteProperty (dpy, parent,
3374 display->atom (str)); 3416 display->atom (str));
3375 } 3417 }
3376 break; 3418 break;
3377 3419
3378 case XTerm_Color: 3420 case XTerm_Color:
… …
3432 break; 3474 break;
3433#endif 3475#endif
3434 case URxvt_Color_border: 3476 case URxvt_Color_border:
3435 process_color_seq (op, Color_border, str, resp); 3477 process_color_seq (op, Color_border, str, resp);
3436 break; 3478 break;
3437#if ENABLE_TRANSPARENCY 3479
3480#if BG_IMAGE_FROM_ROOT
3438 case URxvt_Color_tint: 3481 case URxvt_Color_tint:
3439 process_color_seq (op, Color_tint, str, resp); 3482 process_color_seq (op, Color_tint, str, resp);
3440 { 3483 {
3441 bool changed = false; 3484 bool changed = false;
3442 3485
3443 if (ISSET_PIXCOLOR (Color_tint)) 3486 if (ISSET_PIXCOLOR (Color_tint))
3444 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3487 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3445 else
3446 changed = bgPixmap.unset_tint ();
3447 3488
3448 if (changed) 3489 if (changed)
3449 update_background (); 3490 update_background ();
3450 } 3491 }
3451 3492
… …
3455#if BG_IMAGE_FROM_FILE 3496#if BG_IMAGE_FROM_FILE
3456 case Rxvt_Pixmap: 3497 case Rxvt_Pixmap:
3457 if (!strcmp (str, "?")) 3498 if (!strcmp (str, "?"))
3458 { 3499 {
3459 char str[256]; 3500 char str[256];
3501 int h_scale = fimage.h_scale;
3502 int v_scale = fimage.v_scale;
3503 int h_align = fimage.h_align;
3504 int v_align = fimage.v_align;
3460 3505
3461 sprintf (str, "[%dx%d+%d+%d]", 3506 sprintf (str, "[%dx%d+%d+%d]",
3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3507 h_scale, v_scale,
3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3508 h_align, v_align);
3464 process_xterm_seq (XTerm_title, str, CHAR_ST); 3509 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 } 3510 }
3466 else 3511 else
3467 { 3512 {
3468 int changed = 0; 3513 bool changed = false;
3469 3514
3470 if (*str != ';') 3515 if (*str != ';')
3471 { 3516 {
3472 if (bgPixmap.set_file (str)) /* change pixmap */ 3517 try
3473 { 3518 {
3519 fimage.set_file_geometry (this, str);
3474 changed++; 3520 changed = true;
3475 str = strchr (str, ';');
3476 if (str == NULL)
3477 bgPixmap.set_defaultGeometry ();
3478 else 3521 }
3479 bgPixmap.set_geometry (str+1); 3522 catch (const class rxvt_failure_exception &e)
3523 {
3480 } 3524 }
3481 } 3525 }
3482 else 3526 else
3483 { 3527 {
3484 str++; 3528 str++;
3485 if (bgPixmap.set_geometry (str, true)) 3529 if (fimage.set_geometry (str, true))
3486 changed++; 3530 changed = true;
3487 } 3531 }
3488 3532
3489 if (changed) 3533 if (changed)
3490 { 3534 {
3491 if (bgPixmap.window_position_sensitive ()) 3535 if (bg_window_position_sensitive ())
3492 { 3536 {
3493 int x, y; 3537 int x, y;
3494 get_window_origin (x, y); 3538 get_window_origin (x, y);
3495 bgPixmap.set_position (x, y); 3539 parent_x = x;
3540 parent_y = y;
3496 } 3541 }
3497 update_background (); 3542 update_background ();
3498 } 3543 }
3499 } 3544 }
3500 break; 3545 break;
… …
3590 * 's' = save 3635 * 's' = save
3591 * 'r' = restore 3636 * 'r' = restore
3592 * 't' = toggle 3637 * 't' = toggle
3593 * so no need for fancy checking 3638 * so no need for fancy checking
3594 */ 3639 */
3595int 3640int ecb_cold
3596rxvt_term::privcases (int mode, unsigned long bit) 3641rxvt_term::privcases (int mode, unsigned long bit)
3597{ 3642{
3598 int state; 3643 int state;
3599 3644
3600 if (mode == 's') 3645 if (mode == 's')
3601 { 3646 {
3602 SavedModes |= (priv_modes & bit); 3647 if (priv_modes & bit)
3648 SavedModes |= bit;
3649 else
3650 SavedModes &= ~bit;
3603 return -1; 3651 return -1;
3604 } 3652 }
3605 else 3653 else
3606 { 3654 {
3607 if (mode == 'r') 3655 if (mode == 'r')
3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3656 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3609 else 3657 else
3610 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3658 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611 3659
3612 set_privmode (bit, state); 3660 if (state)
3661 priv_modes |= bit;
3662 else
3663 priv_modes &= ~bit;
3613 } 3664 }
3614 3665
3615 return state; 3666 return state;
3616} 3667}
3617 3668
3618/* we're not using priv _yet_ */ 3669/* we're not using priv _yet_ */
3619void 3670void
3620rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3671rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3621{ 3672{
3622 unsigned int i, j; 3673 unsigned int i, j;
3623 int state; 3674 int state;
3624 3675
3625 static const struct 3676 static const struct
3626 { 3677 {
3627 const int argval; 3678 const int argval;
3628 const unsigned long bit; 3679 const unsigned long bit;
3629 } argtopriv[] = { 3680 } argtopriv[] = {
3630 { 1, PrivMode_aplCUR }, // DECCKM 3681 { 1, PrivMode_aplCUR }, // DECCKM
3631 { 2, PrivMode_vt52 }, 3682 { 2, PrivMode_vt52 }, // DECANM
3632 { 3, PrivMode_132 }, // DECCOLM 3683 { 3, PrivMode_132 }, // DECCOLM
3633 { 4, PrivMode_smoothScroll }, // DECSCLM 3684 { 4, PrivMode_smoothScroll }, // DECSCLM
3634 { 5, PrivMode_rVideo }, // DECSCNM 3685 { 5, PrivMode_rVideo }, // DECSCNM
3635 { 6, PrivMode_relOrigin }, // DECOM 3686 { 6, PrivMode_relOrigin }, // DECOM
3636 { 7, PrivMode_Autowrap }, // DECAWM 3687 { 7, PrivMode_Autowrap }, // DECAWM
3637 // 8, auto-repeat keys // DECARM 3688 // 8, auto-repeat keys // DECARM
3638 { 9, PrivMode_MouseX10 }, 3689 { 9, PrivMode_MouseX10 },
3690 { 12, PrivMode_BlinkingCursor },
3639 // 18 end FF to printer after print screen 3691 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region 3692 // 19 Print screen prints full screen/scroll region
3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3693 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3642#ifdef scrollBar_esc 3694#ifdef scrollBar_esc
3643 { scrollBar_esc, PrivMode_scrollBar }, 3695 { scrollBar_esc, PrivMode_scrollBar },
3644#endif 3696#endif
3645 { 35, PrivMode_ShiftKeys }, // rxvt extension 3697 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK 3698 // 38, tektronix mode // DECTEK
3647 { 40, PrivMode_132OK }, 3699 { 40, PrivMode_132OK },
3648 // 41 xterm more fixes NYI 3700 // 41 xterm more fixes NYI
3649 // 45 margin bell NYI 3701 // 45 margin bell NYI
3650 // 46 start logging 3702 // 46 start logging
3651 { 47, PrivMode_Screen }, 3703 { 47, PrivMode_Screen },
3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3704 { 66, PrivMode_aplKP }, // DECNKM
3653#ifndef NO_BACKSPACE_KEY 3705#ifndef NO_BACKSPACE_KEY
3654 { 67, PrivMode_BackSpace }, // DECBKM 3706 { 67, PrivMode_BackSpace }, // DECBKM
3655#endif 3707#endif
3656 { 1000, PrivMode_MouseX11 }, 3708 { 1000, PrivMode_MouseX11 },
3657 { 1002, PrivMode_MouseBtnEvent }, 3709 { 1002, PrivMode_MouseBtnEvent },
3658 { 1003, PrivMode_MouseAnyEvent }, 3710 { 1003, PrivMode_MouseAnyEvent },
3711#if ENABLE_FRILLS
3712 { 1005, PrivMode_ExtModeMouse },
3713#endif
3659 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3714 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3660 { 1011, PrivMode_Keypress }, // rxvt extension 3715 { 1011, PrivMode_Keypress }, // rxvt extension
3716#if ENABLE_FRILLS
3717 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3718#endif
3661 // 1035 enable modifiers for alt, numlock NYI 3719 // 1035 enable modifiers for alt, numlock NYI
3662 // 1036 send ESC for meta keys NYI 3720 // 1036 send ESC for meta keys NYI
3663 // 1037 send DEL for keypad delete NYI 3721 // 1037 send DEL for keypad delete NYI
3664 { 1047, PrivMode_Screen }, 3722 { 1047, PrivMode_Screen },
3665 // 1048 save and restore cursor 3723 // 1048 save and restore cursor, implemented in code
3666 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3724 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3667 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3725 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3668 { 2004, PrivMode_BracketPaste }, 3726 { 2004, PrivMode_BracketPaste },
3669 }; 3727 };
3670 3728
… …
3680 for (i = 0; i < nargs; i++) 3738 for (i = 0; i < nargs; i++)
3681 { 3739 {
3682 state = -1; 3740 state = -1;
3683 3741
3684 /* basic handling */ 3742 /* basic handling */
3685 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3743 for (j = 0; j < ecb_array_length (argtopriv); j++)
3686 if (argtopriv[j].argval == arg[i]) 3744 if (argtopriv[j].argval == arg[i])
3687 { 3745 {
3688 state = privcases (mode, argtopriv[j].bit); 3746 state = privcases (mode, argtopriv[j].bit);
3689 break; 3747 break;
3690 } 3748 }
… …
3716 case 2: /* VT52 mode */ 3774 case 2: /* VT52 mode */
3717 /* oddball mode. should be set regardless of set/reset 3775 /* oddball mode. should be set regardless of set/reset
3718 * parameter. Return from VT52 mode with an ESC < from 3776 * parameter. Return from VT52 mode with an ESC < from
3719 * within VT52 mode 3777 * within VT52 mode
3720 */ 3778 */
3721 set_privmode (PrivMode_vt52, 1); 3779 priv_modes |= PrivMode_vt52;
3722 break; 3780 break;
3723 case 3: /* 80/132 */ 3781 case 3: /* 80/132 */
3724 if (priv_modes & PrivMode_132OK) 3782 if (priv_modes & PrivMode_132OK)
3725 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3783 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3726 break; 3784 break;
… …
3741 if (state) /* orthogonal */ 3799 if (state) /* orthogonal */
3742 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3800 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3743 break; 3801 break;
3744#ifdef scrollBar_esc 3802#ifdef scrollBar_esc
3745 case scrollBar_esc: 3803 case scrollBar_esc:
3746 if (scrollBar.map (state)) 3804 scrollBar.map (state);
3747 {
3748 resize_all_windows (0, 0, 0); 3805 resize_all_windows (0, 0, 0);
3749 scr_touch (true); 3806 scr_touch (true);
3750 } 3807 break;
3808#endif
3809#ifdef CURSOR_BLINK
3810 case 12:
3811 cursor_blink_reset ();
3751 break; 3812 break;
3752#endif 3813#endif
3753 case 25: /* visible/invisible cursor */ 3814 case 25: /* visible/invisible cursor */
3754 scr_cursor_visible (state); 3815 scr_cursor_visible (state);
3755 break; 3816 break;
… …
3768 case 1003: 3829 case 1003:
3769 if (state) 3830 if (state)
3770 { 3831 {
3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3832 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3772 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3833 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3834 mouse_row = mouse_col = 0;
3773 vt_emask_mouse = PointerMotionMask; 3835 vt_emask_mouse = PointerMotionMask;
3774 } 3836 }
3775 else 3837 else
3776 vt_emask_mouse = NoEventMask; 3838 vt_emask_mouse = NoEventMask;
3777 3839
… …
3809 } 3871 }
3810} 3872}
3811/*}}} */ 3873/*}}} */
3812 3874
3813/*{{{ process sgr sequences */ 3875/*{{{ process sgr sequences */
3814void 3876void ecb_hot
3815rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3877rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3816{ 3878{
3817 unsigned int i; 3879 unsigned int i;
3818 short rendset; 3880 short rendset;
3819 int rendstyle; 3881 int rendstyle;
… …
3861 //case 19: // ninth alt font 3923 //case 19: // ninth alt font
3862 //case 20: // gothic 3924 //case 20: // gothic
3863 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3925 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3864 rendset = 0, rendstyle = RS_Bold; 3926 rendset = 0, rendstyle = RS_Bold;
3865 break; 3927 break;
3866 case 22: // normal intensity 3928 case 22: // bold off (vt220)
3867 rendset = 0, rendstyle = RS_Bold; 3929 rendset = 0, rendstyle = RS_Bold;
3868 break; 3930 break;
3869 case 23: // disable italic 3931 case 23: // disable italic
3870 rendset = 0, rendstyle = RS_Italic; 3932 rendset = 0, rendstyle = RS_Italic;
3871 break; 3933 break;
3872 case 24: 3934 case 24: // underline off (vt220)
3873 rendset = 0, rendstyle = RS_Uline; 3935 rendset = 0, rendstyle = RS_Uline;
3874 break; 3936 break;
3875 case 25: 3937 case 25: // blink off (vt220)
3876 rendset = 0, rendstyle = RS_Blink; 3938 rendset = 0, rendstyle = RS_Blink;
3877 break; 3939 break;
3878 case 26: // variable spacing (iso 8613) 3940 case 26: // variable spacing (iso 8613)
3879 rendset = 0, rendstyle = RS_Blink; 3941 rendset = 0, rendstyle = RS_Blink;
3880 break; 3942 break;
3881 case 27: 3943 case 27: // reverse off (vt220)
3882 rendset = 0, rendstyle = RS_RVid; 3944 rendset = 0, rendstyle = RS_RVid;
3883 break; 3945 break;
3884 //case 28: // visible. NYI 3946 //case 28: // visible. NYI
3885 //case 29: // not crossed-out 3947 //case 29: // not crossed-out
3886 } 3948 }
… …
3960 break; 4022 break;
3961#endif 4023#endif
3962 } 4024 }
3963 } 4025 }
3964} 4026}
4027
4028void
4029rxvt_term::set_cursor_style (int style)
4030{
4031 if (!IN_RANGE_INC (style, 0, 6))
4032 return;
4033
4034 if (style == 0)
4035 style = 1;
4036
4037 cursor_type = (style - 1) / 2;
4038 set_option (Opt_cursorUnderline, cursor_type == 1);
4039
4040#ifdef CURSOR_BLINK
4041 set_option (Opt_cursorBlink, style & 1);
4042 cursor_blink_reset ();
4043#endif
4044
4045 want_refresh = 1;
4046}
3965/*}}} */ 4047/*}}} */
3966 4048
3967/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3968void
3969rxvt_term::process_graphics ()
3970{
3971 unicode_t ch, cmd = cmd_getc ();
3972
3973 if (cmd == 'Q')
3974 {
3975 /* query graphics */
3976 tt_printf ("\033G0\012"); /* no graphics */
3977 return;
3978 }
3979 /* swallow other graphics sequences until terminating ':' */
3980 do
3981 ch = cmd_getc ();
3982 while (ch != ':');
3983}
3984/*}}} */
3985
3986/* ------------------------------------------------------------------------- */ 4049/* ---------------------------------------------------------------------- */
4050/* Write data to the pty as typed by the user, pasted with the mouse,
4051 * or generated by us in response to a query ESC sequence.
4052 */
3987 4053
3988/* 4054/*
3989 * Send printf () formatted output to the command. 4055 * Send printf () formatted output to the command.
3990 * Only use for small amounts of data. 4056 * Only use for small amounts of data.
3991 */ 4057 */
… …
3999 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4065 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4000 va_end (arg_ptr); 4066 va_end (arg_ptr);
4001 tt_write (buf, strlen (buf)); 4067 tt_write (buf, strlen (buf));
4002} 4068}
4003 4069
4004/* ---------------------------------------------------------------------- */
4005/* Write data to the pty as typed by the user, pasted with the mouse, 4070/* Write data to the pty as typed by the user. */
4006 * or generated by us in response to a query ESC sequence. 4071void
4007 */ 4072rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4008const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4073{
4074 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4075 return;
4076
4077 if (option (Opt_scrollTtyKeypress))
4078 if (view_start)
4079 {
4080 view_start = 0;
4081 want_refresh = 1;
4082 }
4083
4084 tt_write_ (data, len);
4085}
4009 4086
4010void 4087void
4011rxvt_term::tt_write (const char *data, unsigned int len) 4088rxvt_term::tt_write (const char *data, unsigned int len)
4012{ 4089{
4013 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4090 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4014 return; 4091 return;
4015 4092
4093 tt_write_ (data, len);
4094}
4095
4096static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4097
4098void
4099rxvt_term::tt_write_ (const char *data, unsigned int len)
4100{
4016 if (pty->pty < 0) 4101 if (pty->pty < 0)
4017 return; 4102 return;
4018 4103
4019 if (v_buflen == 0) 4104 if (v_buflen == 0)
4020 { 4105 {
4021 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4106 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4022 4107
4108 max_it (written, 0);
4109
4023 if ((unsigned int)written == len) 4110 if (written == len)
4024 return; 4111 return;
4025 4112
4026 data += written; 4113 data += written;
4027 len -= written; 4114 len -= written;
4028 } 4115 }
4029 4116
4030 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4117 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4031 4118
4032 memcpy (v_buffer + v_buflen, data, len); 4119 memcpy (v_buffer + v_buflen, data, len);
4033 v_buflen += len; 4120 v_buflen += len;
4034 4121
4035 pty_ev.set (ev::READ | ev::WRITE); 4122 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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