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

Diff Legend

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