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.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC vs.
Revision 1.579 by root, Thu Jun 30 17:03:45 2016 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,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
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 ;
1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1488#ifdef HAVE_BG_PIXMAP
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)
1498 {
1499 int x, y;
1500
1501 if (ev.xconfigure.send_event)
1502 {
1503 x = ev.xconfigure.x;
1504 y = ev.xconfigure.y;
1505 }
1506 else
1507 get_window_origin (x, y);
1508
1509 if (x != parent_x || y != parent_y)
1510 {
1511 parent_x = x;
1512 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1515 }
1516 }
1440 1517
1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1442 { 1519 {
1443 seen_resize = 1; 1520 seen_resize = 1;
1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1445 } 1522 }
1446 else 1523 else
1447 { 1524 {
1448#ifdef HAVE_BG_PIXMAP 1525#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ())
1450 {
1451 if (mapped) 1526 if (moved)
1452 update_background (); 1527 update_background ();
1453 else
1454 bgPixmap.invalidate ();
1455 }
1456#endif 1528#endif
1457 } 1529 }
1458 1530
1459 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1460 } 1532 }
1461 break; 1533 break;
1462 1534
1463 case PropertyNotify: 1535 case PropertyNotify:
1464 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1536 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1466 && ev.xproperty.state == PropertyNewValue)
1467 selection_property (ev.xproperty.window, ev.xproperty.atom);
1468
1469 break; 1537 break;
1470 1538
1471 case SelectionClear: 1539 case SelectionClear:
1472 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1540 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1473 break; 1541 break;
1474 1542
1475 case SelectionNotify:
1476 if (selection_wait == Sel_normal)
1477 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1478 break;
1479
1480 case SelectionRequest: 1543 case SelectionRequest:
1481 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1482 break; 1545 break;
1483 1546
1484 case MapNotify: 1547 case MapNotify:
1485#ifdef HAVE_BG_PIXMAP 1548#ifdef HAVE_BG_PIXMAP
1486 /* 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
1487 * non-reparenting window manager. In those cases we never get first 1550 // or a non-reparenting window manager and also because we
1488 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1551 // defer bg image updates if the window is not mapped. The
1489 * care of multiplicity of ConfigureNotify events arriving while WM does 1552 // short delay is to optimize for multiple ConfigureNotify
1490 * reparenting. 1553 // events at startup when the window manager reparents the
1491 * We should not render background immediately, as there could be several 1554 // window, so as to perform the computation after we have
1492 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1555 // received all of them.
1493 * by scheduling background redraw as soon as we can, but giving a short 1556 if (bg_img == 0)
1494 * bit of time for ConfigureNotifies to arrive.
1495 * We should render background PRIOR to drawing any text, but AFTER all
1496 * of ConfigureNotifys for the best results.
1497 */
1498 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1499 update_background_ev.start (0.025); 1557 update_background_ev.start (0.025);
1500#endif 1558#endif
1501 mapped = 1; 1559 mapped = 1;
1502#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1503 text_blink_ev.start (); 1561 text_blink_ev.start ();
… …
1518 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1519 { 1577 {
1520 do 1578 do
1521 { 1579 {
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1580 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1581 ev.xexpose.width, ev.xexpose.height, false);
1524 } 1582 }
1525 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1583 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1526 1584
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1585 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1586
1529 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1587 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1530 { 1588 {
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1533 } 1591 }
1534 1592
1535 want_refresh = 1; 1593 want_refresh = 1;
1536 } 1594 }
1537 else 1595 else
… …
1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1544 ; 1602 ;
1545 1603
1546 if (scrollBar.state && ev.xany.window == scrollBar.win) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1547 { 1605 {
1548 scrollBar.state = STATE_IDLE; 1606 scrollBar.state = SB_STATE_IDLE;
1549 scrollBar.show (0); 1607 scrollBar.show (0);
1550 } 1608 }
1551 } 1609 }
1552 break; 1610 break;
1553 1611
1554 case MotionNotify: 1612 case MotionNotify:
1555#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1556 if (hidden_pointer) 1614 if (hidden_pointer)
1557 pointer_unblank (); 1615 pointer_unblank ();
1558#endif 1616#endif
1617 if (!bypass_keystate
1559 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1560 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1561 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1563 break; 1622 break;
1564 1623
1565 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1577 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1578 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1579 &ev.xbutton.state); 1638 &ev.xbutton.state);
1580#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1581 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1582 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1583 { 1643 {
1584#endif
1585#if ISO_14755 1644#if ISO_14755
1586 // 5.4 1645 // 5.4
1587 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1588 { 1647 {
1589 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1595 1654
1596#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1597 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1598 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1599 { 1658 {
1659 page_dirn scroll_selection_dir;
1600 int dist; 1660 int dist;
1601 1661
1602 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1603 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1604 */ 1664 */
… …
1619 dist = int_bwidth - ev.xbutton.y; 1679 dist = int_bwidth - ev.xbutton.y;
1620 } 1680 }
1621 else 1681 else
1622 { 1682 {
1623 scroll_selection_dir = DN; 1683 scroll_selection_dir = DN;
1624 dist = ev.xbutton.y - (int_bwidth + height); 1684 dist = ev.xbutton.y - (int_bwidth + vt_height);
1625 } 1685 }
1626 1686
1627 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1628 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1629 + 1; 1689 + 1;
1630 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1631 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1632 } 1693 }
1633 else 1694 else
1634 { 1695 {
1635 /* we are within the text window, so we 1696 /* we are within the text window, so we
1636 * shouldn't be scrolling 1697 * shouldn't be scrolling
1637 */ 1698 */
1638 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1639 } 1700 }
1640#endif 1701#endif
1641#ifdef MOUSE_THRESHOLD
1642 } 1702 }
1643#endif
1644 } 1703 }
1645 } 1704 }
1646 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1647 { 1706 {
1648 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1649 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1650 ; 1709 ;
1651 1710
1652 XQueryPointer (dpy, scrollBar.win, 1711 XQueryPointer (dpy, scrollBar.win,
1653 &unused_root, &unused_child, 1712 &unused_root, &unused_child,
1654 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1655 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1656 &unused_mask); 1715 &unused_mask);
1657 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1658 scrollBar.size ()); 1717 scrollBar.size ());
1659 want_refresh = 1; 1718 want_refresh = 1;
1660 scrollBar.show (1); 1719 scrollBar.show (1);
1661 } 1720 }
1662 break; 1721 break;
1663 } 1722 }
1664 1723
1665#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1666 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1667 {
1668 if (hidden_cursor)
1669 {
1670 hidden_cursor = 0;
1671 want_refresh = 1;
1672 }
1673
1674 cursor_blink_ev.again (); 1726 cursor_blink_reset ();
1675 }
1676#endif 1727#endif
1677 1728
1678#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1679 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1680 { 1731 {
… …
1691 1742
1692 refresh_check (); 1743 refresh_check ();
1693} 1744}
1694 1745
1695#if ENABLE_FRILLS 1746#if ENABLE_FRILLS
1696void 1747void ecb_cold
1697rxvt_term::set_urgency (bool enable) 1748rxvt_term::set_urgency (bool enable)
1698{ 1749{
1699 if (enable == urgency_hint) 1750 if (enable == urgency_hint)
1700 return; 1751 return;
1701 1752
1702 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1703 { 1754 {
1704 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1705 XSetWMHints (dpy, parent[0], h); 1756 XSetWMHints (dpy, parent, h);
1706 urgency_hint = enable; 1757 urgency_hint = enable;
1758 XFree (h);
1707 } 1759 }
1708} 1760}
1709#endif 1761#endif
1710 1762
1711void 1763void ecb_cold
1712rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1713{ 1765{
1714 if (!focus) 1766 if (!focus)
1715 { 1767 {
1716 focus = 1; 1768 focus = 1;
1717 want_refresh = 1; 1769 want_refresh = 1;
1718 1770
1719#if USE_XIM 1771#if USE_XIM
1720 if (Input_Context != NULL) 1772 if (Input_Context != NULL)
1721 { 1773 {
1722 IMSetPosition (); 1774 im_set_position ();
1723 XSetICFocus (Input_Context); 1775 XSetICFocus (Input_Context);
1724 } 1776 }
1725#endif 1777#endif
1726#if CURSOR_BLINK 1778#if CURSOR_BLINK
1727 if (option (Opt_cursorBlink)) 1779 if (option (Opt_cursorBlink))
… …
1729#endif 1781#endif
1730#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1731 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1732 { 1784 {
1733 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1734 scr_recolour (); 1786 scr_recolor ();
1735 } 1787 }
1736#endif 1788#endif
1737#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1738 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1739 set_urgency (0); 1791 set_urgency (0);
1792
1793 if (priv_modes & PrivMode_FocusEvent)
1794 tt_printf ("\x1b[I");
1740#endif 1795#endif
1741 1796
1742 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 } 1798 }
1744} 1799}
1745 1800
1746void 1801void ecb_cold
1747rxvt_term::focus_out () 1802rxvt_term::focus_out ()
1748{ 1803{
1749 if (focus) 1804 if (focus)
1750 { 1805 {
1751 focus = 0; 1806 focus = 0;
1752 want_refresh = 1; 1807 want_refresh = 1;
1753 1808
1754#if ENABLE_FRILLS 1809#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell)) 1810 if (option (Opt_urgentOnBell))
1756 set_urgency (0); 1811 set_urgency (0);
1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1757#endif 1815#endif
1758#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1759 if (iso14755buf) 1817 if (iso14755buf)
1760 { 1818 {
1761 iso14755buf = 0; 1819 iso14755buf = 0;
… …
1776#endif 1834#endif
1777#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1779 { 1837 {
1780 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1781 scr_recolour (); 1839 scr_recolor ();
1782 } 1840 }
1783#endif 1841#endif
1784 1842
1785 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786 } 1844 }
1787} 1845}
1788 1846
1789void 1847void ecb_cold
1790rxvt_term::update_fade_color (unsigned int idx) 1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1791{ 1849{
1792#if OFF_FOCUS_FADING 1850#if OFF_FOCUS_FADING
1793 if (rs[Rs_fade]) 1851 if (rs[Rs_fade])
1794 { 1852 {
1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1855
1795 rgba c; 1856 rgba c;
1796 pix_colors [Color_fade].get (c); 1857 pix_colors [Color_fade].get (c);
1797 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1798 } 1859 }
1799#endif 1860#endif
1800} 1861}
1801 1862
1802#if ENABLE_TRANSPARENCY || ENABLE_PERL 1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1803void 1864void ecb_hot
1804rxvt_term::rootwin_cb (XEvent &ev) 1865rxvt_term::rootwin_cb (XEvent &ev)
1805{ 1866{
1806 make_current (); 1867 make_current ();
1807 1868
1808 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1869 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1809 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1870 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1810 return; 1871 return;
1811 1872
1812# if ENABLE_TRANSPARENCY
1813 switch (ev.type) 1873 switch (ev.type)
1814 { 1874 {
1815 case PropertyNotify: 1875 case PropertyNotify:
1816 /* 1876 /*
1817 * if user used some Esetroot compatible prog to set the root bg, 1877 * if user used some Esetroot compatible prog to set the root bg,
1818 * use the property to determine the pixmap. We use it later on. 1878 * use the property to determine the pixmap. We use it later on.
1819 */ 1879 */
1820 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1822 { 1882 {
1823 bgPixmap.set_root_pixmap (); 1883#if BG_IMAGE_FROM_ROOT
1884 if (option (Opt_transparent))
1885 {
1886 rxvt_img::new_from_root (this)->replace (root_img);
1824 update_background (); 1887 update_background ();
1888 }
1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1825 } 1891 }
1826 1892
1827 break; 1893 break;
1828 } 1894 }
1829# endif
1830 1895
1831 refresh_check (); 1896 refresh_check ();
1832} 1897}
1833#endif 1898#endif
1834 1899
… …
1857 iso14755_54 (ev.x, ev.y); 1922 iso14755_54 (ev.x, ev.y);
1858 return; 1923 return;
1859 } 1924 }
1860#endif 1925#endif
1861 1926
1862 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1927 clickintime = ev.time - MEvent.time < multiClickTime;
1863 1928
1864 if (reportmode) 1929 if (reportmode)
1865 { 1930 {
1866 /* mouse report from vt window */ 1931 /* mouse report from vt window */
1867 /* save the xbutton state (for ButtonRelease) */ 1932 /* save the xbutton state (for ButtonRelease) */
… …
1958 if (scrollBar.upButton (ev.y)) 2023 if (scrollBar.upButton (ev.y))
1959 direction = UP; /* up */ 2024 direction = UP; /* up */
1960 else if (scrollBar.dnButton (ev.y)) 2025 else if (scrollBar.dnButton (ev.y))
1961 direction = DN; /* down */ 2026 direction = DN; /* down */
1962 2027
1963 scrollBar.state = STATE_IDLE; 2028 scrollBar.state = SB_STATE_IDLE;
1964 /* 2029 /*
1965 * Rxvt-style scrollbar: 2030 * Rxvt-style scrollbar:
1966 * move up if mouse is above slider 2031 * move up if mouse is above slider
1967 * move dn if mouse is below slider 2032 * move dn if mouse is below slider
1968 * 2033 *
… …
2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2072 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2008#endif 2073#endif
2009 if (scr_page (direction, 1)) 2074 if (scr_page (direction, 1))
2010 { 2075 {
2011 if (direction == UP) 2076 if (direction == UP)
2012 scrollBar.state = STATE_UP; 2077 scrollBar.state = SB_STATE_UP;
2013 else 2078 else
2014 scrollBar.state = STATE_DOWN; 2079 scrollBar.state = SB_STATE_DOWN;
2015 } 2080 }
2016 } 2081 }
2017 else 2082 else
2018 switch (ev.button) 2083 switch (ev.button)
2019 { 2084 {
2020 case Button2: 2085 case Button2:
2021 switch (scrollBar.align) 2086 switch (scrollBar.align)
2022 { 2087 {
2023 case R_SB_ALIGN_TOP: 2088 case SB_ALIGN_TOP:
2024 csrO = 0; 2089 csrO = 0;
2025 break; 2090 break;
2026 case R_SB_ALIGN_CENTRE: 2091 case SB_ALIGN_CENTRE:
2027 csrO = (scrollBar.bot - scrollBar.top) / 2; 2092 csrO = (scrollBar.bot - scrollBar.top) / 2;
2028 break; 2093 break;
2029 case R_SB_ALIGN_BOTTOM: 2094 case SB_ALIGN_BOTTOM:
2030 csrO = scrollBar.bot - scrollBar.top; 2095 csrO = scrollBar.bot - scrollBar.top;
2031 break; 2096 break;
2032 } 2097 }
2033 2098
2034 if (scrollBar.style == R_SB_XTERM 2099 if (scrollBar.style == SB_STYLE_XTERM
2035 || scrollbar_above_slider (ev.y) 2100 || scrollBar.above_slider (ev.y)
2036 || scrollbar_below_slider (ev.y)) 2101 || scrollBar.below_slider (ev.y))
2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2102 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2038 2103
2039 scrollBar.state = STATE_MOTION; 2104 scrollBar.state = SB_STATE_MOTION;
2040 break; 2105 break;
2041 2106
2042 case Button1: 2107 case Button1:
2043 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2108 if (scrollBar.align == SB_ALIGN_CENTRE)
2044 csrO = ev.y - scrollBar.top; 2109 csrO = ev.y - scrollBar.top;
2045 /* FALLTHROUGH */ 2110 /* FALLTHROUGH */
2046 2111
2047 case Button3: 2112 case Button3:
2048 if (scrollBar.style != R_SB_XTERM) 2113 if (scrollBar.style != SB_STYLE_XTERM)
2049 { 2114 {
2050 if (scrollbar_above_slider (ev.y)) 2115 if (scrollBar.above_slider (ev.y))
2051# ifdef RXVT_SCROLL_FULL 2116# ifdef RXVT_SCROLL_FULL
2052 scr_page (UP, nrow - 1); 2117 scr_page (UP, nrow - 1);
2053# else 2118# else
2054 scr_page (UP, nrow / 4); 2119 scr_page (UP, nrow / 4);
2055# endif 2120# endif
2056 else if (scrollbar_below_slider (ev.y)) 2121 else if (scrollBar.below_slider (ev.y))
2057# ifdef RXVT_SCROLL_FULL 2122# ifdef RXVT_SCROLL_FULL
2058 scr_page (DN, nrow - 1); 2123 scr_page (DN, nrow - 1);
2059# else 2124# else
2060 scr_page (DN, nrow / 4); 2125 scr_page (DN, nrow / 4);
2061# endif 2126# endif
2062 else 2127 else
2063 scrollBar.state = STATE_MOTION; 2128 scrollBar.state = SB_STATE_MOTION;
2064 } 2129 }
2065 else 2130 else
2066 { 2131 {
2067 scr_page ((ev.button == Button1 ? DN : UP), 2132 scr_page ((ev.button == Button1 ? DN : UP),
2068 (nrow 2133 (nrow
2069 * scrollbar_position (ev.y) 2134 * scrollBar.position (ev.y)
2070 / scrollBar.size ())); 2135 / scrollBar.size ()));
2071 } 2136 }
2072 2137
2073 break; 2138 break;
2074 } 2139 }
… …
2085 2150
2086 csrO = 0; /* reset csr Offset */ 2151 csrO = 0; /* reset csr Offset */
2087 if (!bypass_keystate) 2152 if (!bypass_keystate)
2088 reportmode = !! (priv_modes & PrivMode_mouse_report); 2153 reportmode = !! (priv_modes & PrivMode_mouse_report);
2089 2154
2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2155 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2091 { 2156 {
2092 scrollBar.state = STATE_IDLE; 2157 scrollBar.state = SB_STATE_IDLE;
2093 scrollBar.show (0); 2158 scrollBar.show (0);
2094 } 2159 }
2095 2160
2096#ifdef SELECTION_SCROLLING 2161#ifdef SELECTION_SCROLLING
2097 sel_scroll_ev.stop(); 2162 sel_scroll_ev.stop();
… …
2117#ifdef MOUSE_REPORT_DOUBLECLICK 2182#ifdef MOUSE_REPORT_DOUBLECLICK
2118 /* only report the release of 'slow' single clicks */ 2183 /* only report the release of 'slow' single clicks */
2119 if (MEvent.button != AnyButton 2184 if (MEvent.button != AnyButton
2120 && (ev.button != MEvent.button 2185 && (ev.button != MEvent.button
2121 || (ev.time - MEvent.time 2186 || (ev.time - MEvent.time
2122 > MULTICLICK_TIME / 2))) 2187 > multiClickTime / 2)))
2123 { 2188 {
2124 MEvent.clicks = 0; 2189 MEvent.clicks = 0;
2125 MEvent.button = AnyButton; 2190 MEvent.button = AnyButton;
2126 mouse_report (ev); 2191 mouse_report (ev);
2127 } 2192 }
… …
2147 case Button3: 2212 case Button3:
2148 selection_make (ev.time); 2213 selection_make (ev.time);
2149 break; 2214 break;
2150 2215
2151 case Button2: 2216 case Button2:
2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2217 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2218 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2154 break; 2219 break;
2155 2220
2156#ifdef MOUSE_WHEEL 2221#ifdef MOUSE_WHEEL
2157 case Button4: 2222 case Button4:
2158 case Button5: 2223 case Button5:
2159 { 2224 {
2160 int i; 2225 int lines;
2161 page_dirn v; 2226 page_dirn dirn;
2162 2227
2163 v = ev.button == Button4 ? UP : DN; 2228 dirn = ev.button == Button4 ? UP : DN;
2164 2229
2165 if (ev.state & ShiftMask) 2230 if (ev.state & ShiftMask)
2166 i = 1; 2231 lines = 1;
2167 else if (option (Opt_mouseWheelScrollPage)) 2232 else if (option (Opt_mouseWheelScrollPage))
2168 i = nrow - 1; 2233 lines = nrow - 1;
2169 else 2234 else
2170 i = 5; 2235 lines = 5;
2171 2236
2172# ifdef MOUSE_SLIP_WHEELING 2237# ifdef MOUSE_SLIP_WHEELING
2173 if (ev.state & ControlMask) 2238 if (ev.state & ControlMask)
2174 { 2239 {
2175 mouse_slip_wheel_speed += v ? -1 : 1; 2240 mouse_slip_wheel_speed += dirn;
2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2241 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2178 2242
2179 if (!slip_wheel_ev.is_active ()) 2243 if (!slip_wheel_ev.is_active ())
2180 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2244 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2181 } 2245 }
2182 else 2246 else
2183# endif 2247# endif
2184 { 2248 {
2185 scr_page (v, i); 2249 scr_page (dirn, lines);
2186 scrollBar.show (1); 2250 scrollBar.show (1);
2187 } 2251 }
2188 } 2252 }
2189 break; 2253 break;
2190#endif 2254#endif
… …
2192 } 2256 }
2193} 2257}
2194 2258
2195/*}}} */ 2259/*}}} */
2196 2260
2197void 2261void ecb_hot
2198rxvt_term::cmd_parse () 2262rxvt_term::cmd_parse ()
2199{ 2263{
2200 wchar_t ch = NOCHAR; 2264 wchar_t ch = NOCHAR;
2201 char *seq_begin; // remember start of esc-sequence here 2265 char *seq_begin; // remember start of esc-sequence here
2202 2266
2203 for (;;) 2267 for (;;)
2204 { 2268 {
2205 if (expect_false (ch == NOCHAR)) 2269 if (ecb_unlikely (ch == NOCHAR))
2206 { 2270 {
2207 seq_begin = cmdbuf_ptr; 2271 seq_begin = cmdbuf_ptr;
2208 ch = next_char (); 2272 ch = next_char ();
2209 2273
2210 if (ch == NOCHAR) 2274 if (ch == NOCHAR)
2211 break; 2275 break;
2212 } 2276 }
2213 2277
2214 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2278 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2215 { 2279 {
2216 if (expect_false (!seen_input)) 2280 if (ecb_unlikely (!seen_input))
2217 { 2281 {
2218 seen_input = 1; 2282 seen_input = 1;
2219 // many badly-written programs (e.g. jed) contain a race condition: 2283 // many badly-written programs (e.g. jed) contain a race condition:
2220 // they first read the screensize and then install a SIGWINCH handler. 2284 // they first read the screensize and then install a SIGWINCH handler.
2221 // some window managers resize the window early, and these programs 2285 // some window managers resize the window early, and these programs
… …
2234 wchar_t *str = buf; 2298 wchar_t *str = buf;
2235 wchar_t *eol = str + min (ncol, UBUFSIZ); 2299 wchar_t *eol = str + min (ncol, UBUFSIZ);
2236 2300
2237 for (;;) 2301 for (;;)
2238 { 2302 {
2239 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2303 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2240 break; 2304 break;
2241 2305
2242 *str++ = ch; 2306 *str++ = ch;
2243 2307
2244 if (expect_false (ch == C0_LF || str >= eol)) 2308 if (ecb_unlikely (ch == C0_LF || str >= eol))
2245 { 2309 {
2246 if (ch == C0_LF) 2310 if (ch == C0_LF)
2247 nlines++; 2311 nlines++;
2248 2312
2249 refresh_count++; 2313 refresh_count++;
… …
2321 } 2385 }
2322 } 2386 }
2323} 2387}
2324 2388
2325// read the next character 2389// read the next character
2326wchar_t 2390wchar_t ecb_hot
2327rxvt_term::next_char () NOTHROW 2391rxvt_term::next_char () NOTHROW
2328{ 2392{
2329 while (cmdbuf_ptr < cmdbuf_endp) 2393 while (cmdbuf_ptr < cmdbuf_endp)
2330 { 2394 {
2331 // assume 7-bit to be ascii ALWAYS 2395 // assume 7-bit to be ascii ALWAYS
2332 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2396 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2333 return *cmdbuf_ptr++; 2397 return *cmdbuf_ptr++;
2334 2398
2335 wchar_t wc; 2399 wchar_t wc;
2336 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2400 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2337 2401
… …
2343 } 2407 }
2344 2408
2345 if (len == (size_t)-1) 2409 if (len == (size_t)-1)
2346 { 2410 {
2347 mbstate.reset (); // reset now undefined conversion state 2411 mbstate.reset (); // reset now undefined conversion state
2412 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2413 // in which case we "erroneously" return the next byte which might be valid.
2348 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2414 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2349 } 2415 }
2350 2416
2351 // assume wchar == unicode 2417 // assume wchar == unicode
2352 cmdbuf_ptr += len; 2418 cmdbuf_ptr += len;
… …
2355 2421
2356 return NOCHAR; 2422 return NOCHAR;
2357} 2423}
2358 2424
2359// read the next octet 2425// read the next octet
2360uint32_t 2426uint32_t ecb_hot
2361rxvt_term::next_octet () NOTHROW 2427rxvt_term::next_octet () NOTHROW
2362{ 2428{
2363 return cmdbuf_ptr < cmdbuf_endp 2429 return cmdbuf_ptr < cmdbuf_endp
2364 ? (unsigned char)*cmdbuf_ptr++ 2430 ? (unsigned char)*cmdbuf_ptr++
2365 : NOCHAR; 2431 : NOCHAR;
2366} 2432}
2367 2433
2368static class out_of_input out_of_input; 2434static class out_of_input out_of_input;
2369 2435
2370/* rxvt_cmd_getc () - Return next input character */ 2436wchar_t ecb_hot
2371/*
2372 * Return the next input character after first passing any keyboard input
2373 * to the command.
2374 */
2375wchar_t
2376rxvt_term::cmd_getc () THROW ((class out_of_input)) 2437rxvt_term::cmd_getc () THROW ((class out_of_input))
2377{ 2438{
2378 wchar_t c = next_char (); 2439 wchar_t c = next_char ();
2379 2440
2380 if (c == NOCHAR) 2441 if (c == NOCHAR)
2381 throw out_of_input; 2442 throw out_of_input;
2382 2443
2383 return c; 2444 return c;
2384} 2445}
2385 2446
2386uint32_t 2447uint32_t ecb_hot
2387rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2448rxvt_term::cmd_get8 () THROW ((class out_of_input))
2388{ 2449{
2389 uint32_t c = next_octet (); 2450 uint32_t c = next_octet ();
2390 2451
2391 if (c == NOCHAR) 2452 if (c == NOCHAR)
… …
2395} 2456}
2396 2457
2397/*{{{ print pipe */ 2458/*{{{ print pipe */
2398/*----------------------------------------------------------------------*/ 2459/*----------------------------------------------------------------------*/
2399#ifdef PRINTPIPE 2460#ifdef PRINTPIPE
2400FILE * 2461FILE * ecb_cold
2401rxvt_term::popen_printer () 2462rxvt_term::popen_printer ()
2402{ 2463{
2403 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2464 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2404 2465
2405 if (stream == NULL) 2466 if (stream == NULL)
2406 rxvt_warn ("can't open printer pipe, not printing.\n"); 2467 rxvt_warn ("can't open printer pipe, not printing.\n");
2407 2468
2408 return stream; 2469 return stream;
2409} 2470}
2410 2471
2411int 2472int ecb_cold
2412rxvt_term::pclose_printer (FILE *stream) 2473rxvt_term::pclose_printer (FILE *stream)
2413{ 2474{
2414 fflush (stream); 2475 fflush (stream);
2415 return pclose (stream); 2476 return pclose (stream);
2416} 2477}
2417 2478
2418/* 2479/*
2419 * simulate attached vt100 printer 2480 * simulate attached vt100 printer
2420 */ 2481 */
2421void 2482void ecb_cold
2422rxvt_term::process_print_pipe () 2483rxvt_term::process_print_pipe ()
2423{ 2484{
2424 FILE *fd = popen_printer (); 2485 FILE *fd = popen_printer ();
2425 2486
2426 if (!fd) 2487 if (!fd)
… …
2472 pclose_printer (fd); 2533 pclose_printer (fd);
2473} 2534}
2474#endif /* PRINTPIPE */ 2535#endif /* PRINTPIPE */
2475/*}}} */ 2536/*}}} */
2476 2537
2477/* *INDENT-OFF* */
2478enum { 2538enum {
2479 C1_40 = 0x40, 2539 C1_40 = 0x40,
2480 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2540 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2481 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2541 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2482 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2542 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2483 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2543 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2484}; 2544};
2485/* *INDENT-ON* */
2486 2545
2487/*{{{ process non-printing single characters */ 2546/*{{{ process non-printing single characters */
2488void 2547void ecb_hot
2489rxvt_term::process_nonprinting (unicode_t ch) 2548rxvt_term::process_nonprinting (unicode_t ch)
2490{ 2549{
2491 switch (ch) 2550 switch (ch)
2492 { 2551 {
2493 case C0_ESC: 2552 case C0_ESC:
… …
2523 scr_charset_choose (0); 2582 scr_charset_choose (0);
2524 break; 2583 break;
2525 2584
2526#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
2527 // 8-bit controls 2586 // 8-bit controls
2528 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
2529 process_dcs_seq (); 2588 process_dcs_seq ();
2530 break; 2589 break;
2531 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
2532 process_csi_seq (); 2591 process_csi_seq ();
2533 break; 2592 break;
2534 case 0x9d: /* OSC */ 2593 case 0x9d: /* OSC */
2535 process_osc_seq (); 2594 process_osc_seq ();
2536 break; 2595 break;
2537#endif 2596#endif
2538 } 2597 }
2539} 2598}
2540/*}}} */ 2599/*}}} */
2541 2600
2542 2601
2543/*{{{ process VT52 escape sequences */ 2602/*{{{ process VT52 escape sequences */
2544void 2603void ecb_cold
2545rxvt_term::process_escape_vt52 (unicode_t ch) 2604rxvt_term::process_escape_vt52 (unicode_t ch)
2546{ 2605{
2547 int row, col; 2606 int row, col;
2548 2607
2549 switch (ch) 2608 switch (ch)
… …
2583 break; 2642 break;
2584 case 'Z': /* identify the terminal type */ 2643 case 'Z': /* identify the terminal type */
2585 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2644 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2586 break; 2645 break;
2587 case '<': /* turn off VT52 mode */ 2646 case '<': /* turn off VT52 mode */
2588 set_privmode (PrivMode_vt52, 0); 2647 priv_modes &= ~PrivMode_vt52;
2589 break; 2648 break;
2590 case 'F': /* use special graphics character set */ 2649 case 'F': /* use special graphics character set */
2591 case 'G': /* use regular character set */ 2650 case 'G': /* use regular character set */
2592 /* unimplemented */ 2651 /* unimplemented */
2593 break; 2652 break;
… …
2599} 2658}
2600/*}}} */ 2659/*}}} */
2601 2660
2602 2661
2603/*{{{ process escape sequences */ 2662/*{{{ process escape sequences */
2604void 2663void ecb_hot
2605rxvt_term::process_escape_seq () 2664rxvt_term::process_escape_seq ()
2606{ 2665{
2607 unicode_t ch = cmd_getc (); 2666 unicode_t ch = cmd_getc ();
2608 2667
2609 if (priv_modes & PrivMode_vt52) 2668 if (priv_modes & PrivMode_vt52)
… …
2612 return; 2671 return;
2613 } 2672 }
2614 2673
2615 switch (ch) 2674 switch (ch)
2616 { 2675 {
2617 /* case 1: do_tek_mode (); break; */
2618 case '#': 2676 case '#':
2619 if (cmd_getc () == '8') 2677 if (cmd_getc () == '8')
2620 scr_E (); 2678 scr_E ();
2621 break; 2679 break;
2622 case '(': 2680 case '(':
… …
2645#if !ENABLE_MINIMAL 2703#if !ENABLE_MINIMAL
2646 case '9': 2704 case '9':
2647 scr_forwardindex (); 2705 scr_forwardindex ();
2648 break; 2706 break;
2649#endif 2707#endif
2708 // DECPAM/DECPNM
2650 case '=': 2709 case '=':
2710 priv_modes |= PrivMode_aplKP;
2711 break;
2651 case '>': 2712 case '>':
2652 set_privmode (PrivMode_aplKP, ch == '='); 2713 priv_modes &= ~PrivMode_aplKP;
2653 break; 2714 break;
2654 2715
2655 case C1_40: 2716 case C1_40:
2656 cmd_getc (); 2717 cmd_getc ();
2657 break; 2718 break;
… …
2661 2722
2662 /* 8.3.87: NEXT LINE */ 2723 /* 8.3.87: NEXT LINE */
2663 case C1_NEL: /* ESC E */ 2724 case C1_NEL: /* ESC E */
2664 { 2725 {
2665 wchar_t nlcr[] = { C0_LF, C0_CR }; 2726 wchar_t nlcr[] = { C0_LF, C0_CR };
2666 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2727 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2667 } 2728 }
2668 break; 2729 break;
2669 2730
2670 /* kidnapped escape sequence: Should be 8.3.48 */ 2731 /* kidnapped escape sequence: Should be 8.3.48 */
2671 case C1_ESA: /* ESC G */ 2732 case C1_ESA: /* ESC G */
2672 process_graphics (); 2733 // used by original rxvt for rob nations own graphics mode
2734 if (cmd_getc () == 'Q')
2735 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2673 break; 2736 break;
2674 2737
2675 /* 8.3.63: CHARACTER TABULATION SET */ 2738 /* 8.3.63: CHARACTER TABULATION SET */
2676 case C1_HTS: /* ESC H */ 2739 case C1_HTS: /* ESC H */
2677 scr_set_tab (1); 2740 scr_set_tab (1);
… …
2681 case C1_RI: /* ESC M */ 2744 case C1_RI: /* ESC M */
2682 scr_index (DN); 2745 scr_index (DN);
2683 break; 2746 break;
2684 2747
2685 /* 8.3.142: SINGLE-SHIFT TWO */ 2748 /* 8.3.142: SINGLE-SHIFT TWO */
2686 /*case C1_SS2: scr_single_shift (2); break; */ 2749 /* case C1_SS2: break; */
2687 2750
2688 /* 8.3.143: SINGLE-SHIFT THREE */ 2751 /* 8.3.143: SINGLE-SHIFT THREE */
2689 /*case C1_SS3: scr_single_shift (3); break; */ 2752 /* case C1_SS3: break; */
2690 2753
2691 /* 8.3.27: DEVICE CONTROL STRING */ 2754 /* 8.3.27: DEVICE CONTROL STRING */
2692 case C1_DCS: /* ESC P */ 2755 case C1_DCS: /* ESC P */
2693 process_dcs_seq (); 2756 process_dcs_seq ();
2694 break; 2757 break;
… …
2727 } 2790 }
2728} 2791}
2729/*}}} */ 2792/*}}} */
2730 2793
2731/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2794/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2732/* *INDENT-OFF* */
2733enum { 2795enum {
2734 CSI_ICH = 0x40, 2796 CSI_ICH = 0x40,
2735 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2797 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2736 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2798 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2737 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2799 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2740 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2802 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2741 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2803 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2742 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2804 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2743}; 2805};
2744 2806
2745#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2807#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2746 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2808 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2747 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2809 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2748#define get_byte_array_bit(array, bit) \ 2810#define get_byte_array_bit(array, bit) \
2749 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2811 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2750 2812
2751const unsigned char csi_defaults[] = 2813static const unsigned char csi_defaults[] =
2752 { 2814 {
2753 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2815 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2754 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2816 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2755 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2817 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2756 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2818 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2757 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2819 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2758 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2820 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2759 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2821 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2760 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2822 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2761 }; 2823 };
2762/* *INDENT-ON* */
2763 2824
2764void 2825void ecb_hot
2765rxvt_term::process_csi_seq () 2826rxvt_term::process_csi_seq ()
2766{ 2827{
2767 unicode_t ch, priv, i; 2828 unicode_t ch, priv, prev_ch, i;
2768 unsigned int nargs, p; 2829 unsigned int nargs, p;
2769 int n, ndef; 2830 int n, ndef;
2770 int arg[ESC_ARGS] = { }; 2831 int arg[ESC_ARGS] = { };
2771 2832
2772 nargs = 0; 2833 nargs = 0;
… …
2778 /* '<' '=' '>' '?' '!' */ 2839 /* '<' '=' '>' '?' '!' */
2779 priv = ch; 2840 priv = ch;
2780 ch = cmd_getc (); 2841 ch = cmd_getc ();
2781 } 2842 }
2782 2843
2844 prev_ch = 0;
2783 /* read any numerical arguments */ 2845 /* read any numerical arguments */
2784 for (n = -1; ch < CSI_ICH; ) 2846 for (n = -1; ch < CSI_ICH; )
2785 { 2847 {
2786 if (isdigit (ch)) 2848 if (isdigit (ch))
2787 { 2849 {
… …
2797 n = -1; 2859 n = -1;
2798 } 2860 }
2799 else if (IS_CONTROL (ch)) 2861 else if (IS_CONTROL (ch))
2800 process_nonprinting (ch); 2862 process_nonprinting (ch);
2801 2863
2864 prev_ch = ch;
2802 ch = cmd_getc (); 2865 ch = cmd_getc ();
2803 } 2866 }
2804 2867
2805 if (ch > CSI_7F) 2868 if (ch > CSI_7F)
2806 return; 2869 return;
… …
2845 { 2908 {
2846 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2909 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2847 scr_soft_reset (); 2910 scr_soft_reset ();
2848 2911
2849 static const int pm_h[] = { 7, 25 }; 2912 static const int pm_h[] = { 7, 25 };
2850 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2913 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2851 2914
2852 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2915 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2853 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2916 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2854 } 2917 }
2855 break; 2918 break;
2856 } 2919 }
2857 2920
2858 return; 2921 return;
… …
2876 } 2939 }
2877 break; 2940 break;
2878#endif 2941#endif
2879 2942
2880 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2943 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2881 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2944 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2882 arg[0] = -arg[0]; 2945 arg[0] = -arg[0];
2883 /* FALLTHROUGH */ 2946 /* FALLTHROUGH */
2884 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2947 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2885 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2886 scr_gotorc (arg[0], 0, RELATIVE); 2949 scr_gotorc (arg[0], 0, RELATIVE);
2887 break; 2950 break;
2888 2951
2889 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2890 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3040 scr_insert_mode (1); 3103 scr_insert_mode (1);
3041 else if (arg[0] == 20) 3104 else if (arg[0] == 20)
3042 priv_modes |= PrivMode_LFNL; 3105 priv_modes |= PrivMode_LFNL;
3043 break; 3106 break;
3044 3107
3108 case CSI_71: // DECSCUSR: set cursor style
3109 if (prev_ch == ' ')
3110 set_cursor_style (arg[0]);
3111 break;
3112
3045 /* 3113 /*
3046 * PRIVATE USE beyond this point. All CSI_7? sequences here 3114 * PRIVATE USE beyond this point. All CSI_7? sequences here
3047 */ 3115 */
3048 case CSI_72: /* DECSTBM: set top and bottom margins */ 3116 case CSI_72: /* DECSTBM: set top and bottom margins */
3049 if (nargs == 1) 3117 if (nargs == 1)
… …
3077 } 3145 }
3078} 3146}
3079/*}}} */ 3147/*}}} */
3080 3148
3081#if !ENABLE_MINIMAL 3149#if !ENABLE_MINIMAL
3082/* ARGSUSED */
3083void 3150void
3084rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3151rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3085{ 3152{
3086 int x, y; 3153 int x, y;
3087 XWindowAttributes wattr; 3154 XWindowAttributes wattr;
… …
3096 { 3163 {
3097 /* 3164 /*
3098 * commands 3165 * commands
3099 */ 3166 */
3100 case 1: /* deiconify window */ 3167 case 1: /* deiconify window */
3101 XMapWindow (dpy, parent[0]); 3168 XMapWindow (dpy, parent);
3102 break; 3169 break;
3103 case 2: /* iconify window */ 3170 case 2: /* iconify window */
3104 XIconifyWindow (dpy, parent[0], display->screen); 3171 XIconifyWindow (dpy, parent, display->screen);
3105 break; 3172 break;
3106 case 3: /* set position (pixels) */ 3173 case 3: /* set position (pixels) */
3107 XMoveWindow (dpy, parent[0], args[1], args[2]); 3174 XMoveWindow (dpy, parent, args[1], args[2]);
3108 break; 3175 break;
3109 case 4: /* set size (pixels) */ 3176 case 4: /* set size (pixels) */
3110 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3177 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3111 break; 3178 break;
3112 case 5: /* raise window */ 3179 case 5: /* raise window */
3113 XRaiseWindow (dpy, parent[0]); 3180 XRaiseWindow (dpy, parent);
3114 break; 3181 break;
3115 case 6: /* lower window */ 3182 case 6: /* lower window */
3116 XLowerWindow (dpy, parent[0]); 3183 XLowerWindow (dpy, parent);
3117 break; 3184 break;
3118 case 7: /* refresh window */ 3185 case 7: /* refresh window */
3119 scr_touch (true); 3186 scr_touch (true);
3120 break; 3187 break;
3121 case 8: /* set size (chars) */ 3188 case 8: /* set size (chars) */
… …
3124 break; 3191 break;
3125 3192
3126 //case 9: NYI, TODO, restore maximized window or maximize window 3193 //case 9: NYI, TODO, restore maximized window or maximize window
3127 default: 3194 default:
3128 if (args[0] >= 24) /* set height (chars) */ 3195 if (args[0] >= 24) /* set height (chars) */
3129 set_widthheight ((unsigned int)width, 3196 set_widthheight ((unsigned int)vt_width,
3130 (unsigned int) (args[1] * fheight)); 3197 (unsigned int) (args[1] * fheight));
3131 break; 3198 break;
3132 3199
3133 /* 3200 /*
3134 * reports - some output format copied from XTerm 3201 * reports - some output format copied from XTerm
3135 */ 3202 */
3136 case 11: /* report window state */ 3203 case 11: /* report window state */
3137 XGetWindowAttributes (dpy, parent[0], &wattr); 3204 XGetWindowAttributes (dpy, parent, &wattr);
3138 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3205 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3139 break; 3206 break;
3140 case 13: /* report window position */ 3207 case 13: /* report window position */
3141 XGetWindowAttributes (dpy, parent[0], &wattr); 3208 XGetWindowAttributes (dpy, parent, &wattr);
3142 XTranslateCoordinates (dpy, parent[0], wattr.root, 3209 XTranslateCoordinates (dpy, parent, wattr.root,
3143 -wattr.border_width, -wattr.border_width, 3210 -wattr.border_width, -wattr.border_width,
3144 &x, &y, &wdummy); 3211 &x, &y, &wdummy);
3145 tt_printf ("\033[3;%d;%dt", x, y); 3212 tt_printf ("\033[3;%d;%dt", x, y);
3146 break; 3213 break;
3147 case 14: /* report window size (pixels) */ 3214 case 14: /* report window size (pixels) */
3148 XGetWindowAttributes (dpy, parent[0], &wattr); 3215 XGetWindowAttributes (dpy, parent, &wattr);
3149 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3216 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3150 break; 3217 break;
3151 case 18: /* report text area size (chars) */ 3218 case 18: /* report text area size (chars) */
3152 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3219 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3153 break; 3220 break;
… …
3155 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3222 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3156 break; 3223 break;
3157 case 20: /* report icon label */ 3224 case 20: /* report icon label */
3158 { 3225 {
3159 char *s; 3226 char *s;
3160 XGetIconName (dpy, parent[0], &s); 3227 XGetIconName (dpy, parent, &s);
3161 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3228 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3162 XFree (s); 3229 XFree (s);
3163 } 3230 }
3164 break; 3231 break;
3165 case 21: /* report window title */ 3232 case 21: /* report window title */
3166 { 3233 {
3167 char *s; 3234 char *s;
3168 XFetchName (dpy, parent[0], &s); 3235 XFetchName (dpy, parent, &s);
3169 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3236 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3170 XFree (s); 3237 XFree (s);
3171 } 3238 }
3172 break; 3239 break;
3173 } 3240 }
… …
3183rxvt_term::get_to_st (unicode_t &ends_how) 3250rxvt_term::get_to_st (unicode_t &ends_how)
3184{ 3251{
3185 unicode_t ch; 3252 unicode_t ch;
3186 bool seen_esc = false; 3253 bool seen_esc = false;
3187 unsigned int n = 0; 3254 unsigned int n = 0;
3188 wchar_t string[STRING_MAX]; 3255 wchar_t string[CBUFSIZ];
3189 3256
3190 while ((ch = cmd_getc ()) != NOCHAR) 3257 while ((ch = cmd_getc ()) != NOCHAR)
3191 { 3258 {
3192 if (seen_esc) 3259 if (seen_esc)
3193 { 3260 {
… …
3208 else if (ch < 0x20) 3275 else if (ch < 0x20)
3209 return NULL; /* other control character - exit */ 3276 return NULL; /* other control character - exit */
3210 3277
3211 seen_esc = false; 3278 seen_esc = false;
3212 3279
3213 if (n >= STRING_MAX - 1) 3280 if (n >= sizeof (string) - 1)
3214 // stop at some sane length 3281 // stop at some sane length
3215 return NULL; 3282 return NULL;
3216 3283
3217 string[n++] = ch; 3284 string[n++] = ch;
3218 } 3285 }
… …
3267 free (s); 3334 free (s);
3268 } 3335 }
3269 } 3336 }
3270} 3337}
3271 3338
3339static unsigned int
3340colorcube_index (unsigned int idx_r,
3341 unsigned int idx_g,
3342 unsigned int idx_b)
3343{
3344 assert (idx_r < Red_levels);
3345 assert (idx_g < Green_levels);
3346 assert (idx_b < Blue_levels);
3347
3348 return idx_r * Blue_levels * Green_levels +
3349 idx_g * Blue_levels +
3350 idx_b;
3351}
3352
3353/*
3354 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 24bit RGB color.
3356 */
3357unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b)
3359{
3360 r &= 0xff;
3361 g &= 0xff;
3362 b &= 0xff;
3363
3364 unsigned int color = (r << 16) | (g << 8) | b;
3365 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3366 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3367 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3368 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3369
3370 /* we allow one of the 6 directly neighbouring colours */
3371 /* to replace the current color, if they not used recently */
3372 static const signed char dxyz[][3] = {
3373 0, 0, 0,
3374 0, 0, +1,
3375 0, 0, -1,
3376 0, +1, 0,
3377 0, -1, 0,
3378 +1, 0, 0,
3379 -1, 0, 0,
3380 };
3381
3382 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3383 {
3384 int r = idx_r + dxyz[n][0];
3385 int g = idx_r + dxyz[n][1];
3386 int b = idx_r + dxyz[n][2];
3387
3388 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3389 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3390 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3391
3392 unsigned int index = colorcube_index (r, g, b);
3393
3394 if (rgb24_color[index] == color)
3395 {
3396 rgb24_seqno[index] = ++rgb24_sequence;
3397 return index + minTermCOLOR24;
3398 }
3399
3400 // minor issue: could update index 0 few more times
3401 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3402 {
3403 idx = index;
3404 goto update;
3405 }
3406
3407 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3408 // but also handles wrap around values good enough
3409 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3410 idx = index;
3411 }
3412
3413update:
3414 rgb24_color[idx] = color;
3415 rgb24_seqno[idx] = ++rgb24_sequence;
3416
3417 idx += minTermCOLOR24;
3418 pix_colors_focused [idx].free (this);
3419 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101));
3420 update_fade_color (idx, false);
3421
3422 return idx;
3423}
3424
3272void 3425void
3273rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3426rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3274{ 3427{
3275 if (str[0] == '?' && !str[1]) 3428 if (str[0] == '?' && !str[1])
3276 { 3429 {
3277 rgba c; 3430 rgba c;
3278 pix_colors_focused[color].get (c); 3431 pix_colors_focused[color].get (c);
3279 3432
3280#if XFT 3433#if XFT
3281 if (c.a != rgba::MAX_CC) 3434 if (c.a != rgba::MAX_CC)
3282 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3435 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3283 else 3436 else
3284#endif 3437#endif
3285 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3438 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3286 } 3439 }
3287 else 3440 else
… …
3327 unsigned long bytes_after; 3480 unsigned long bytes_after;
3328 unsigned char *value = 0; 3481 unsigned char *value = 0;
3329 const char *str = ""; 3482 const char *str = "";
3330 3483
3331 if (prop 3484 if (prop
3332 && XGetWindowProperty (dpy, parent[0], 3485 && XGetWindowProperty (dpy, parent,
3333 prop, 0, 1<<16, 0, AnyPropertyType, 3486 prop, 0, 1<<16, 0, AnyPropertyType,
3334 &actual_type, &actual_format, 3487 &actual_type, &actual_format,
3335 &nitems, &bytes_after, &value) == Success 3488 &nitems, &bytes_after, &value) == Success
3336 && actual_type != None 3489 && actual_type != None
3337 && actual_format == 8) 3490 && actual_format == 8)
3338 str = (const char *)(value); 3491 str = (const char *)(value);
3339 3492
3340 tt_printf ("\033]%d;%s%c", op, str, resp); 3493 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3341 3494
3342 XFree (value); 3495 XFree (value);
3343 } 3496 }
3344 else 3497 else
3345 { 3498 {
… …
3349 { 3502 {
3350 *eq = 0; 3503 *eq = 0;
3351 set_utf8_property (display->atom (str), eq + 1); 3504 set_utf8_property (display->atom (str), eq + 1);
3352 } 3505 }
3353 else 3506 else
3354 XDeleteProperty (dpy, parent[0], 3507 XDeleteProperty (dpy, parent,
3355 display->atom (str)); 3508 display->atom (str));
3356 } 3509 }
3357 break; 3510 break;
3358 3511
3359 case XTerm_Color: 3512 case XTerm_Color:
… …
3413 break; 3566 break;
3414#endif 3567#endif
3415 case URxvt_Color_border: 3568 case URxvt_Color_border:
3416 process_color_seq (op, Color_border, str, resp); 3569 process_color_seq (op, Color_border, str, resp);
3417 break; 3570 break;
3418#if ENABLE_TRANSPARENCY 3571
3572#if BG_IMAGE_FROM_ROOT
3419 case URxvt_Color_tint: 3573 case URxvt_Color_tint:
3420 process_color_seq (op, Color_tint, str, resp); 3574 process_color_seq (op, Color_tint, str, resp);
3421 { 3575 {
3422 bool changed = false; 3576 bool changed = false;
3423 3577
3424 if (ISSET_PIXCOLOR (Color_tint)) 3578 if (ISSET_PIXCOLOR (Color_tint))
3425 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3579 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3426 else
3427 changed = bgPixmap.unset_tint ();
3428 3580
3429 if (changed) 3581 if (changed)
3430 update_background (); 3582 update_background ();
3431 } 3583 }
3432 3584
… …
3436#if BG_IMAGE_FROM_FILE 3588#if BG_IMAGE_FROM_FILE
3437 case Rxvt_Pixmap: 3589 case Rxvt_Pixmap:
3438 if (!strcmp (str, "?")) 3590 if (!strcmp (str, "?"))
3439 { 3591 {
3440 char str[256]; 3592 char str[256];
3593 int h_scale = fimage.h_scale;
3594 int v_scale = fimage.v_scale;
3595 int h_align = fimage.h_align;
3596 int v_align = fimage.v_align;
3441 3597
3442 sprintf (str, "[%dx%d+%d+%d]", 3598 sprintf (str, "[%dx%d+%d+%d]",
3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3599 h_scale, v_scale,
3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3600 h_align, v_align);
3445 process_xterm_seq (XTerm_title, str, CHAR_ST); 3601 process_xterm_seq (XTerm_title, str, CHAR_ST);
3446 } 3602 }
3447 else 3603 else
3448 { 3604 {
3449 int changed = 0; 3605 bool changed = false;
3450 3606
3451 if (*str != ';') 3607 if (*str != ';')
3452 { 3608 {
3453 if (bgPixmap.set_file (str)) /* change pixmap */ 3609 try
3610 {
3611 fimage.set_file_geometry (this, str);
3454 changed++; 3612 changed = true;
3455 str = strchr (str, ';');
3456 if (str == NULL)
3457 bgPixmap.set_defaultGeometry ();
3458 else 3613 }
3459 bgPixmap.set_geometry (str+1); 3614 catch (const class rxvt_failure_exception &e)
3615 {
3616 }
3460 } 3617 }
3461 else 3618 else
3462 { 3619 {
3463 str++; 3620 str++;
3464 if (bgPixmap.set_geometry (str, true)) 3621 if (fimage.set_geometry (str, true))
3465 changed++; 3622 changed = true;
3466 } 3623 }
3467 3624
3468 if (changed) 3625 if (changed)
3626 {
3627 if (bg_window_position_sensitive ())
3628 {
3629 int x, y;
3630 get_window_origin (x, y);
3631 parent_x = x;
3632 parent_y = y;
3633 }
3469 update_background (); 3634 update_background ();
3635 }
3470 } 3636 }
3471 break; 3637 break;
3472#endif 3638#endif
3473 3639
3474 case XTerm_logfile: 3640 case XTerm_logfile:
… …
3561 * 's' = save 3727 * 's' = save
3562 * 'r' = restore 3728 * 'r' = restore
3563 * 't' = toggle 3729 * 't' = toggle
3564 * so no need for fancy checking 3730 * so no need for fancy checking
3565 */ 3731 */
3566int 3732int ecb_cold
3567rxvt_term::privcases (int mode, unsigned long bit) 3733rxvt_term::privcases (int mode, unsigned long bit)
3568{ 3734{
3569 int state; 3735 int state;
3570 3736
3571 if (mode == 's') 3737 if (mode == 's')
3572 { 3738 {
3573 SavedModes |= (priv_modes & bit); 3739 if (priv_modes & bit)
3740 SavedModes |= bit;
3741 else
3742 SavedModes &= ~bit;
3574 return -1; 3743 return -1;
3575 } 3744 }
3576 else 3745 else
3577 { 3746 {
3578 if (mode == 'r') 3747 if (mode == 'r')
3579 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3748 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3580 else 3749 else
3581 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3750 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3582 3751
3583 set_privmode (bit, state); 3752 if (state)
3753 priv_modes |= bit;
3754 else
3755 priv_modes &= ~bit;
3584 } 3756 }
3585 3757
3586 return state; 3758 return state;
3587} 3759}
3588 3760
3589/* we're not using priv _yet_ */ 3761/* we're not using priv _yet_ */
3590void 3762void
3591rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3763rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3592{ 3764{
3593 unsigned int i, j; 3765 unsigned int i, j;
3594 int state; 3766 int state;
3595 3767
3596 static const struct 3768 static const struct
3597 { 3769 {
3598 const int argval; 3770 const int argval;
3599 const unsigned long bit; 3771 const unsigned long bit;
3600 } argtopriv[] = { 3772 } argtopriv[] = {
3601 { 1, PrivMode_aplCUR }, // DECCKM 3773 { 1, PrivMode_aplCUR }, // DECCKM
3602 { 2, PrivMode_vt52 }, 3774 { 2, PrivMode_vt52 }, // DECANM
3603 { 3, PrivMode_132 }, // DECCOLM 3775 { 3, PrivMode_132 }, // DECCOLM
3604 { 4, PrivMode_smoothScroll }, // DECSCLM 3776 { 4, PrivMode_smoothScroll }, // DECSCLM
3605 { 5, PrivMode_rVideo }, // DECSCNM 3777 { 5, PrivMode_rVideo }, // DECSCNM
3606 { 6, PrivMode_relOrigin }, // DECOM 3778 { 6, PrivMode_relOrigin }, // DECOM
3607 { 7, PrivMode_Autowrap }, // DECAWM 3779 { 7, PrivMode_Autowrap }, // DECAWM
3608 // 8, auto-repeat keys // DECARM 3780 // 8, auto-repeat keys // DECARM
3609 { 9, PrivMode_MouseX10 }, 3781 { 9, PrivMode_MouseX10 },
3782 { 12, PrivMode_BlinkingCursor },
3610 // 18 end FF to printer after print screen 3783 // 18 end FF to printer after print screen
3611 // 19 Print screen prints full screen/scroll region 3784 // 19 Print screen prints full screen/scroll region
3612 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3785 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3613#ifdef scrollBar_esc 3786#ifdef scrollBar_esc
3614 { scrollBar_esc, PrivMode_scrollBar }, 3787 { scrollBar_esc, PrivMode_scrollBar },
3615#endif 3788#endif
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 3789 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 // 38, tektronix mode // DECTEK 3790 // 38, tektronix mode // DECTEK
3618 { 40, PrivMode_132OK }, 3791 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 3792 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 3793 // 45 margin bell NYI
3621 // 46 start logging 3794 // 46 start logging
3622 { 47, PrivMode_Screen }, 3795 { 47, PrivMode_Screen },
3623 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3796 { 66, PrivMode_aplKP }, // DECNKM
3624#ifndef NO_BACKSPACE_KEY 3797#ifndef NO_BACKSPACE_KEY
3625 { 67, PrivMode_BackSpace }, // DECBKM 3798 { 67, PrivMode_BackSpace }, // DECBKM
3626#endif 3799#endif
3627 { 1000, PrivMode_MouseX11 }, 3800 { 1000, PrivMode_MouseX11 },
3628 { 1002, PrivMode_MouseBtnEvent }, 3801 { 1002, PrivMode_MouseBtnEvent },
3629 { 1003, PrivMode_MouseAnyEvent }, 3802 { 1003, PrivMode_MouseAnyEvent },
3803#if ENABLE_FRILLS
3804 { 1004, PrivMode_FocusEvent },
3805 { 1005, PrivMode_ExtModeMouse },
3806#endif
3630 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3807 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3631 { 1011, PrivMode_Keypress }, // rxvt extension 3808 { 1011, PrivMode_Keypress }, // rxvt extension
3809#if ENABLE_FRILLS
3810 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3811#endif
3632 // 1035 enable modifiers for alt, numlock NYI 3812 // 1035 enable modifiers for alt, numlock NYI
3633 // 1036 send ESC for meta keys NYI 3813 // 1036 send ESC for meta keys NYI
3634 // 1037 send DEL for keypad delete NYI 3814 // 1037 send DEL for keypad delete NYI
3635 { 1047, PrivMode_Screen }, 3815 { 1047, PrivMode_Screen },
3636 // 1048 save and restore cursor 3816 // 1048 save and restore cursor, implemented in code
3637 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3817 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3638 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3818 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3639 { 2004, PrivMode_BracketPaste }, 3819 { 2004, PrivMode_BracketPaste },
3640 }; 3820 };
3641 3821
… …
3651 for (i = 0; i < nargs; i++) 3831 for (i = 0; i < nargs; i++)
3652 { 3832 {
3653 state = -1; 3833 state = -1;
3654 3834
3655 /* basic handling */ 3835 /* basic handling */
3656 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3836 for (j = 0; j < ecb_array_length (argtopriv); j++)
3657 if (argtopriv[j].argval == arg[i]) 3837 if (argtopriv[j].argval == arg[i])
3658 { 3838 {
3659 state = privcases (mode, argtopriv[j].bit); 3839 state = privcases (mode, argtopriv[j].bit);
3660 break; 3840 break;
3661 } 3841 }
… …
3687 case 2: /* VT52 mode */ 3867 case 2: /* VT52 mode */
3688 /* oddball mode. should be set regardless of set/reset 3868 /* oddball mode. should be set regardless of set/reset
3689 * parameter. Return from VT52 mode with an ESC < from 3869 * parameter. Return from VT52 mode with an ESC < from
3690 * within VT52 mode 3870 * within VT52 mode
3691 */ 3871 */
3692 set_privmode (PrivMode_vt52, 1); 3872 priv_modes |= PrivMode_vt52;
3693 break; 3873 break;
3694 case 3: /* 80/132 */ 3874 case 3: /* 80/132 */
3695 if (priv_modes & PrivMode_132OK) 3875 if (priv_modes & PrivMode_132OK)
3696 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3876 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3697 break; 3877 break;
… …
3712 if (state) /* orthogonal */ 3892 if (state) /* orthogonal */
3713 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3893 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3714 break; 3894 break;
3715#ifdef scrollBar_esc 3895#ifdef scrollBar_esc
3716 case scrollBar_esc: 3896 case scrollBar_esc:
3717 if (scrollBar.map (state)) 3897 scrollBar.map (state);
3718 {
3719 resize_all_windows (0, 0, 0); 3898 resize_all_windows (0, 0, 0);
3720 scr_touch (true); 3899 scr_touch (true);
3721 } 3900 break;
3901#endif
3902#ifdef CURSOR_BLINK
3903 case 12:
3904 cursor_blink_reset ();
3722 break; 3905 break;
3723#endif 3906#endif
3724 case 25: /* visible/invisible cursor */ 3907 case 25: /* visible/invisible cursor */
3725 scr_cursor_visible (state); 3908 scr_cursor_visible (state);
3726 break; 3909 break;
… …
3739 case 1003: 3922 case 1003:
3740 if (state) 3923 if (state)
3741 { 3924 {
3742 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3925 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3743 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3926 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3927 mouse_row = mouse_col = 0;
3744 vt_emask_mouse = PointerMotionMask; 3928 vt_emask_mouse = PointerMotionMask;
3745 } 3929 }
3746 else 3930 else
3747 vt_emask_mouse = NoEventMask; 3931 vt_emask_mouse = NoEventMask;
3748 3932
… …
3780 } 3964 }
3781} 3965}
3782/*}}} */ 3966/*}}} */
3783 3967
3784/*{{{ process sgr sequences */ 3968/*{{{ process sgr sequences */
3785void 3969void ecb_hot
3786rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3970rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3787{ 3971{
3788 unsigned int i; 3972 unsigned int i;
3789 short rendset; 3973 short rendset;
3790 int rendstyle; 3974 int rendstyle;
… …
3832 //case 19: // ninth alt font 4016 //case 19: // ninth alt font
3833 //case 20: // gothic 4017 //case 20: // gothic
3834 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 4018 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3835 rendset = 0, rendstyle = RS_Bold; 4019 rendset = 0, rendstyle = RS_Bold;
3836 break; 4020 break;
3837 case 22: // normal intensity 4021 case 22: // bold off (vt220)
3838 rendset = 0, rendstyle = RS_Bold; 4022 rendset = 0, rendstyle = RS_Bold;
3839 break; 4023 break;
3840 case 23: // disable italic 4024 case 23: // disable italic
3841 rendset = 0, rendstyle = RS_Italic; 4025 rendset = 0, rendstyle = RS_Italic;
3842 break; 4026 break;
3843 case 24: 4027 case 24: // underline off (vt220)
3844 rendset = 0, rendstyle = RS_Uline; 4028 rendset = 0, rendstyle = RS_Uline;
3845 break; 4029 break;
3846 case 25: 4030 case 25: // blink off (vt220)
3847 rendset = 0, rendstyle = RS_Blink; 4031 rendset = 0, rendstyle = RS_Blink;
3848 break; 4032 break;
3849 case 26: // variable spacing (iso 8613) 4033 case 26: // variable spacing (iso 8613)
3850 rendset = 0, rendstyle = RS_Blink; 4034 rendset = 0, rendstyle = RS_Blink;
3851 break; 4035 break;
3852 case 27: 4036 case 27: // reverse off (vt220)
3853 rendset = 0, rendstyle = RS_RVid; 4037 rendset = 0, rendstyle = RS_RVid;
3854 break; 4038 break;
3855 //case 28: // visible. NYI 4039 //case 28: // visible. NYI
3856 //case 29: // not crossed-out 4040 //case 29: // not crossed-out
3857 } 4041 }
… …
3878 if (nargs > i + 2 && arg[i + 1] == 5) 4062 if (nargs > i + 2 && arg[i + 1] == 5)
3879 { 4063 {
3880 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4064 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3881 i += 2; 4065 i += 2;
3882 } 4066 }
4067 else if (nargs > i + 4 && arg[i + 1] == 2)
4068 {
4069 unsigned int r = arg[i + 2];
4070 unsigned int g = arg[i + 3];
4071 unsigned int b = arg[i + 4];
4072 unsigned int idx = map_rgb24_color (r, g, b);
4073 scr_color (idx, Color_fg);
4074 i += 4;
4075 }
3883 break; 4076 break;
3884 case 39: /* default fg */ 4077 case 39: /* default fg */
3885 scr_color (Color_fg, Color_fg); 4078 scr_color (Color_fg, Color_fg);
3886 break; 4079 break;
3887 4080
… …
3898 case 48: // set bg color, ISO 8613-6 4091 case 48: // set bg color, ISO 8613-6
3899 if (nargs > i + 2 && arg[i + 1] == 5) 4092 if (nargs > i + 2 && arg[i + 1] == 5)
3900 { 4093 {
3901 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4094 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3902 i += 2; 4095 i += 2;
4096 }
4097 else if (nargs > i + 4 && arg[i + 1] == 2)
4098 {
4099 unsigned int r = arg[i + 2];
4100 unsigned int g = arg[i + 3];
4101 unsigned int b = arg[i + 4];
4102 unsigned int idx = map_rgb24_color (r, g, b);
4103 scr_color (idx, Color_bg);
4104 i += 4;
3903 } 4105 }
3904 break; 4106 break;
3905 case 49: /* default bg */ 4107 case 49: /* default bg */
3906 scr_color (Color_bg, Color_bg); 4108 scr_color (Color_bg, Color_bg);
3907 break; 4109 break;
… …
3931 break; 4133 break;
3932#endif 4134#endif
3933 } 4135 }
3934 } 4136 }
3935} 4137}
4138
4139void
4140rxvt_term::set_cursor_style (int style)
4141{
4142 if (!IN_RANGE_INC (style, 0, 6))
4143 return;
4144
4145 if (style == 0)
4146 style = 1;
4147
4148 cursor_type = (style - 1) / 2;
4149 set_option (Opt_cursorUnderline, cursor_type == 1);
4150
4151#ifdef CURSOR_BLINK
4152 set_option (Opt_cursorBlink, style & 1);
4153 cursor_blink_reset ();
4154#endif
4155
4156 want_refresh = 1;
4157}
3936/*}}} */ 4158/*}}} */
3937 4159
3938/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3939void
3940rxvt_term::process_graphics ()
3941{
3942 unicode_t ch, cmd = cmd_getc ();
3943
3944 if (cmd == 'Q')
3945 {
3946 /* query graphics */
3947 tt_printf ("\033G0\012"); /* no graphics */
3948 return;
3949 }
3950 /* swallow other graphics sequences until terminating ':' */
3951 do
3952 ch = cmd_getc ();
3953 while (ch != ':');
3954}
3955/*}}} */
3956
3957/* ------------------------------------------------------------------------- */ 4160/* ---------------------------------------------------------------------- */
4161/* Write data to the pty as typed by the user, pasted with the mouse,
4162 * or generated by us in response to a query ESC sequence.
4163 */
3958 4164
3959/* 4165/*
3960 * Send printf () formatted output to the command. 4166 * Send printf () formatted output to the command.
3961 * Only use for small amounts of data. 4167 * Only use for small amounts of data.
3962 */ 4168 */
… …
3970 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4176 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3971 va_end (arg_ptr); 4177 va_end (arg_ptr);
3972 tt_write (buf, strlen (buf)); 4178 tt_write (buf, strlen (buf));
3973} 4179}
3974 4180
3975/* ---------------------------------------------------------------------- */
3976/* Write data to the pty as typed by the user, pasted with the mouse, 4181/* Write data to the pty as typed by the user. */
3977 * or generated by us in response to a query ESC sequence. 4182void
3978 */ 4183rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3979const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4184{
4185 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4186 return;
4187
4188 if (option (Opt_scrollTtyKeypress))
4189 if (view_start)
4190 {
4191 view_start = 0;
4192 want_refresh = 1;
4193 }
4194
4195 tt_write_ (data, len);
4196}
3980 4197
3981void 4198void
3982rxvt_term::tt_write (const char *data, unsigned int len) 4199rxvt_term::tt_write (const char *data, unsigned int len)
3983{ 4200{
3984 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4201 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3985 return; 4202 return;
3986 4203
4204 tt_write_ (data, len);
4205}
4206
4207static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4208
4209void
4210rxvt_term::tt_write_ (const char *data, unsigned int len)
4211{
3987 if (pty->pty < 0) 4212 if (pty->pty < 0)
3988 return; 4213 return;
3989 4214
3990 if (v_buflen == 0) 4215 if (v_buflen == 0)
3991 { 4216 {
3992 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4217 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3993 4218
4219 max_it (written, 0);
4220
3994 if ((unsigned int)written == len) 4221 if (written == len)
3995 return; 4222 return;
3996 4223
3997 data += written; 4224 data += written;
3998 len -= written; 4225 len -= written;
3999 } 4226 }
4000 4227
4001 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4228 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4002 4229
4003 memcpy (v_buffer + v_buflen, data, len); 4230 memcpy (v_buffer + v_buflen, data, len);
4004 v_buflen += len; 4231 v_buflen += len;
4005 4232
4006 pty_ev.set (ev::READ | ev::WRITE); 4233 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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