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.363 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.516 by root, Tue Jun 5 14:46:54 2012 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
… …
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
… …
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
249} 256}
250#endif 257#endif
251 258
252void 259void ecb_cold
253rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
254{ 261{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 263
260 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
261 { 265 {
262 char mb[16]; 266 char mb[MB_LEN_MAX];
263 int len; 267 int len;
264 268
265 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
268 else 272 else
269 { 273 {
270 mb[0] = ch[0]; 274 mb[0] = ch;
271 len = 1; 275 len = 1;
272 } 276 }
273 277
274 if (len > 0) 278 if (len > 0)
275 tt_write (mb, len); 279 tt_write (mb, len);
… …
278 } 282 }
279 283
280 iso14755buf = 0; 284 iso14755buf = 0;
281} 285}
282 286
283int 287static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
285{ 289{
286 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
289 { 293 {
290 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
291 295
… …
297 301
298 return -1; 302 return -1;
299} 303}
300#endif 304#endif
301 305
302void 306static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp)
308{
309#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home
312 XK_KP_4, // XK_KP_Left
313 XK_KP_8, // XK_KP_Up
314 XK_KP_6, // XK_KP_Right
315 XK_KP_2, // XK_KP_Down
316# ifndef UNSHIFTED_SCROLLKEYS
317 XK_KP_9, // XK_KP_Prior
318 XK_KP_3, // XK_KP_Next
319# else
320 XK_Prior,
321 XK_Next,
322# endif
323 XK_KP_1, // XK_KP_End
324 XK_KP_5, // XK_KP_Begin
325 };
326
327 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
328 {
329 unsigned int index = keysym - XK_KP_Home;
330 keysym = kp ? keypadtrans[index] : XK_Home + index;
331 }
332 else if (keysym == XK_KP_Insert)
333 keysym = kp ? XK_KP_0 : XK_Insert;
334# ifndef NO_DELETE_KEY
335 else if (keysym == XK_KP_Delete)
336 keysym = kp ? XK_KP_Decimal : XK_Delete;
337# endif
338#endif
339 return keysym;
340}
341
342static inline int ecb_cold
343map_function_key (KeySym keysym)
344{
345 int param = 0;
346
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
348 {
349 param = 11 + keysym - XK_F1;
350 if (keysym >= XK_F17)
351 param += 4;
352 else if (keysym >= XK_F15)
353 param += 3;
354 else if (keysym >= XK_F11)
355 param += 2;
356 else if (keysym >= XK_F6)
357 param += 1;
358 }
359 else
360 switch (keysym)
361 {
362 case XK_Find:
363 param = 1;
364 break;
365 case XK_Insert:
366 param = 2;
367 break;
368#ifdef DXK_Remove
369 case DXK_Remove:
370#endif
371 case XK_Execute:
372 param = 3;
373 break;
374 case XK_Select:
375 param = 4;
376 break;
377#ifndef UNSHIFTED_SCROLLKEYS
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390#endif
391 case XK_Help:
392 param = 28;
393 break;
394 case XK_Menu:
395 param = 29;
396 break;
397 }
398 return param;
399}
400
401void ecb_cold
303rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
304{ 403{
305 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 405 KeySym keysym;
308 int valid_keysym; 406 int valid_keysym;
309 char kbuf[KBUFSZ]; 407 char kbuf[KBUFSZ];
310 408
311#if ISO_14755 409#if ISO_14755
… …
321 */ 419 */
322 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
325 423
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 424 kbuf[0] = 0;
333 425
334#ifdef USE_XIM 426#if USE_XIM
335 if (Input_Context) 427 if (Input_Context)
336 { 428 {
337 Status status_return; 429 Status status_return;
338 430
339#if 0 431#if 0
… …
410#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 504#else
413 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
414#endif 506#endif
507 max_it (lnsppg, 1);
508
415 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
416 { 510 {
417 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
418 return; 512 return;
419 } 513 }
… …
472 selection_request (ev.time); 566 selection_request (ev.time);
473 return; 567 return;
474#if TODO 568#if TODO
475 /* rxvt extras */ 569 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 571 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 573 return;
482#endif 574#endif
483 } 575 }
484 } 576 }
485 } 577 }
486 578
487#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 580 // ISO 14755 support
489 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 582 {
491 int hv; 583 int hv;
492 584
493 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 616 scr_overlay_off ();
525# endif 617# endif
526 iso14755buf = 0; 618 iso14755buf = 0;
527 } 619 }
528 } 620 }
621 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
532 { 625 {
533 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 627# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 639 }
547#endif 640#endif
548 641
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
551 { 653 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
553 newlen = 1; 684 newlen = 0;
554 switch (keysym) 685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
555 { 768 {
556#ifndef NO_BACKSPACE_KEY 769 int param = map_function_key (keysym);
557 case XK_BackSpace: 770 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 771 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 772 else
565 strcpy (kbuf, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Down: /* \033Or or standard */
605 if (kp)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if (kp)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if (kp)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if (kp)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if (kp)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if (kp)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 773 newlen = 0;
840 break;
841 } 774 }
842 775 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 776 }
846 777
778 if (newlen)
779 len = strlen (kbuf);
780
781 if (len > 0)
782 {
847 /* 783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
848 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
849 */ 797 */
850#ifdef META8_OPTION 798#ifdef META8_OPTION
851 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
852 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
853#endif 801#endif
802 }
854 803
855 } 804 }
856 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
857 { 806 {
858 len = 1; 807 len = 1;
… …
892 { 841 {
893 view_start = 0; 842 view_start = 0;
894 want_refresh = 1; 843 want_refresh = 1;
895 } 844 }
896 845
897 /*
898 * these modifications only affect the static keybuffer
899 * pass Shift/Control indicators for function keys ending with `~'
900 *
901 * eg,
902 * Prior = "ESC[5~"
903 * Shift+Prior = "ESC[5$"
904 * Ctrl+Prior = "ESC[5^"
905 * Ctrl+Shift+Prior = "ESC[5@"
906 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
907 */
908 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
909 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
910
911 /* escape prefix */ 846 /* escape prefix */
912 if (meta 847 if (meta
913#ifdef META8_OPTION 848#ifdef META8_OPTION
914 && meta_char == C0_ESC 849 && meta_char == C0_ESC
915#endif 850#endif
… …
920 } 855 }
921 856
922 tt_write (kbuf, (unsigned int)len); 857 tt_write (kbuf, (unsigned int)len);
923} 858}
924 859
925void 860void ecb_cold
926rxvt_term::key_release (XKeyEvent &ev) 861rxvt_term::key_release (XKeyEvent &ev)
927{ 862{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 863#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym; 864 KeySym keysym;
930 865
… …
950 commit_iso14755 (); 885 commit_iso14755 ();
951 886
952 return; 887 return;
953 } 888 }
954 889
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 891 if (i[0] == keysym)
957 { 892 {
958 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 894 commit_iso14755 ();
960 895
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
999#endif 934#endif
1000} 935}
1001 936
1002#if defined (KEYSYM_RESOURCE)
1003unsigned int
1004rxvt_term::cmd_write (const char *str, unsigned int count)
1005{
1006 unsigned int n, s;
1007
1008 n = cmdbuf_ptr - cmdbuf_base;
1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
1011 if (n > 0 && s < count)
1012 {
1013 memmove (cmdbuf_base, cmdbuf_ptr,
1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1015 cmdbuf_ptr = cmdbuf_base;
1016 cmdbuf_endp -= n;
1017 s += n;
1018 }
1019
1020 if (count > s)
1021 {
1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1023 count = s;
1024 }
1025
1026 for (; count--;)
1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
1031 return 0;
1032}
1033#endif
1034
1035void 937void
1036rxvt_term::flush () 938rxvt_term::flush ()
1037{ 939{
1038 flush_ev.stop (); 940 flush_ev.stop ();
1039 941
1040#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
1041 if (bgPixmap.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 944 {
1043// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_touch (false); 946 scr_touch (false);
1045 } 947 }
1046#endif 948#endif
1047 949
1048 if (want_refresh) 950 if (want_refresh)
… …
1084 } 986 }
1085 while (row < end_row); 987 while (row < end_row);
1086 } 988 }
1087 989
1088 scr_refresh (); 990 scr_refresh ();
1089 scrollbar_show (1); 991 scrollBar.show (1);
1090#ifdef USE_XIM 992#if USE_XIM
1091 IMSendSpot (); 993 im_send_spot ();
1092#endif 994#endif
1093 } 995 }
1094 996
1095 display->flush (); 997 display->flush ();
1096} 998}
1097 999
1000/* checks whether a refresh is requested and starts the refresh timer */
1098void 1001void
1099rxvt_term::prepare_cb (ev::prepare &w, int revents) 1002rxvt_term::refresh_check ()
1100{ 1003{
1101 make_current (); 1004 if (want_refresh && !flush_ev.is_active ())
1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1006
1103 display->flush (); 1007 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1107} 1008}
1108 1009
1109void 1010void
1110rxvt_term::flush_cb (ev::timer &w, int revents) 1011rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1012{
… …
1115 flush (); 1016 flush ();
1116} 1017}
1117 1018
1118#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1119void 1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1035void
1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1037{
1122 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1039 want_refresh = 1;
1040 refresh_check ();
1124} 1041}
1125#endif 1042#endif
1126 1043
1127#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
1128void 1045void
… …
1130{ 1047{
1131 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1048 if (scr_refresh_rend (RS_Blink, RS_Blink))
1132 { 1049 {
1133 hidden_text = !hidden_text; 1050 hidden_text = !hidden_text;
1134 want_refresh = 1; 1051 want_refresh = 1;
1052 refresh_check ();
1135 } 1053 }
1054 else
1055 w.stop ();
1136} 1056}
1137#endif 1057#endif
1138 1058
1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1140void 1060void
1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1142{ 1062{
1143 if ((scrollbar_isUp() || scrollbar_isDn()) && 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1144 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1065 {
1145 want_refresh = 1; 1066 want_refresh = 1;
1067 refresh_check ();
1068 }
1146 else 1069 else
1147 w.stop (); 1070 w.stop ();
1148} 1071}
1149#endif 1072#endif
1150 1073
… …
1154{ 1077{
1155 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1078 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1156 { 1079 {
1157 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1080 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1158 want_refresh = 1; 1081 want_refresh = 1;
1082 refresh_check ();
1159 } 1083 }
1160 else 1084 else
1161 w.stop (); 1085 w.stop ();
1162} 1086}
1163#endif 1087#endif
1164 1088
1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1166void 1090void
1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1091rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1168{ 1092{
1169 if (mouse_slip_wheel_speed == 0 1093 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1170 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1171 : scr_page (UP, mouse_slip_wheel_speed))
1172 { 1094 {
1173 if (view_start == top_row || view_start == 0)
1174 mouse_slip_wheel_speed = 0;
1175
1176 want_refresh = 1; 1095 want_refresh = 1;
1096 refresh_check ();
1097 }
1098
1099 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1177 } 1100 {
1178 else 1101 mouse_slip_wheel_speed = 0;
1179 w.stop (); 1102 w.stop ();
1103 }
1180} 1104}
1181#endif 1105#endif
1182 1106
1183#if LINUX_YIELD_HACK 1107#if LINUX_YIELD_HACK
1184static struct event_handler 1108static struct event_handler
… …
1189 { 1113 {
1190 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1191 // that giving a process calling sched_yield () less cpu time than 1115 // that giving a process calling sched_yield () less cpu time than
1192 // ones with high nice levels is a useful thing to do. It surely is is 1116 // ones with high nice levels is a useful thing to do. It surely is is
1193 // allowed by the sus... as is returning ENOSYS. 1117 // allowed by the sus... as is returning ENOSYS.
1118 // since the linux guys additionally thought that breaking the only
1119 // known workaround against their unusable sched_yield hack is cool,
1120 // we just nanosleep a bit and hope for the best.
1194 1121
1195 struct timespec ts = { 0, 0 }; 1122 struct timespec ts = { 0, 1000 };
1196 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1197 1124
1198 w.stop (); 1125 w.stop ();
1199 } 1126 }
1200 1127
… …
1203 { 1130 {
1204 } 1131 }
1205} event_handler; 1132} event_handler;
1206#endif 1133#endif
1207 1134
1135/* make sure all the cmd data is at beginning of cmdbuf */
1136void
1137rxvt_term::cmdbuf_reify ()
1138{
1139 if (cmdbuf_ptr == cmdbuf_base)
1140 return;
1141
1142 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1143
1144 memmove (cmdbuf_base, cmdbuf_ptr, used);
1145 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + used;
1147
1148}
1149
1150#if defined (KEYSYM_RESOURCE)
1151void
1152rxvt_term::cmdbuf_append (const char *str, size_t count)
1153{
1154 cmdbuf_reify ();
1155
1156 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1157
1158 if (count > avail)
1159 return;
1160
1161 memcpy (cmdbuf_endp, str, count);
1162 cmdbuf_endp += count;
1163
1164 cmd_parse ();
1165}
1166#endif
1167
1208bool 1168bool
1209rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1210{ 1170{
1211 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1212 1172
1213 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1214 { 1174
1215 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1216 n = 0;
1217 } 1176 {
1218 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1219 memmove (cmdbuf_base, cmdbuf_ptr, n);
1220 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1221 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1222 1182
1223 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1224 1184
1225 if (r > 0) 1185 if (r > 0)
1226 { 1186 {
1227 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1228 return true; 1188 return true;
… …
1250{ 1210{
1251 make_current (); 1211 make_current ();
1252 1212
1253 if (revents & ev::READ) 1213 if (revents & ev::READ)
1254 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1255 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1256 if (cmd_parse ()) 1216 cmd_parse ();
1257 break;
1258 1217
1259 if (revents & ev::WRITE) 1218 if (revents & ev::WRITE)
1260 pty_write (); 1219 pty_write ();
1261}
1262 1220
1263void 1221 refresh_check ();
1222}
1223
1224void ecb_cold
1264rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1265{ 1226{
1266 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1267 recolour_cursor (); 1228 recolour_cursor ();
1268 1229
… …
1273 pointer_ev.start (pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1274#endif 1235#endif
1275} 1236}
1276 1237
1277#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1278void 1239void ecb_cold
1279rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1280{ 1241{
1281 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1282 return; 1243 return;
1283 1244
… …
1285 XFlush (dpy); 1246 XFlush (dpy);
1286 1247
1287 hidden_pointer = 1; 1248 hidden_pointer = 1;
1288} 1249}
1289 1250
1290void 1251void ecb_cold
1291rxvt_term::pointer_cb (ev::timer &w, int revents) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1292{ 1253{
1293 make_current (); 1254 make_current ();
1294 1255
1295 pointer_blank (); 1256 pointer_blank ();
… …
1301{ 1262{
1302 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1303 int x, y; 1264 int x, y;
1304 int code = 32; 1265 int code = 32;
1305 1266
1306 x = Pixel2Col (ev.x); 1267 x = Pixel2Col (ev.x) + 1;
1307 y = Pixel2Row (ev.y); 1268 y = Pixel2Row (ev.y) + 1;
1269
1308 if (ev.type == MotionNotify) { 1270 if (ev.type == MotionNotify)
1271 {
1309 if (x == mouse_row && y == mouse_col) 1272 if (x == mouse_row && y == mouse_col)
1310 return; 1273 return;
1274
1311 mouse_row = x; 1275 mouse_row = x;
1312 mouse_col = y; 1276 mouse_col = y;
1313 code += 32; 1277 code += 32;
1314 } 1278 }
1315 1279
1316 if (MEvent.button == AnyButton) 1280 if (MEvent.button == AnyButton)
1317 button_number = 3; 1281 button_number = 3;
1318 else 1282 else
1319 { 1283 {
1320 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1321 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1322 if (button_number >= 3) 1286 if (button_number >= 3)
1323 button_number += (64 - 3); 1287 button_number += 64 - 3;
1324 } 1288 }
1325 1289
1326 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1327 { 1291 {
1328 /* 1292 /*
… …
1360 fputc ('A', stderr); 1324 fputc ('A', stderr);
1361 if (key_state & 32) 1325 if (key_state & 32)
1362 fputc ('2', stderr); 1326 fputc ('2', stderr);
1363 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1364 button_number, 1328 button_number,
1365 x + 1, 1329 x,
1366 y + 1); 1330 y);
1367#endif 1331#endif
1368 1332
1333#if ENABLE_FRILLS
1334 if (priv_modes & PrivMode_ExtMouseRight)
1335 tt_printf ("\033[%d;%d;%dM",
1336 code + button_number + key_state,
1337 x,
1338 y);
1339 else if (priv_modes & PrivMode_ExtModeMouse)
1340 tt_printf ("\033[M%c%lc%lc",
1341 code + button_number + key_state,
1342 wint_t (32 + x),
1343 wint_t (32 + y));
1344 else
1345#endif
1369 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1370 (code + button_number + key_state), 1347 code + button_number + key_state,
1371 (32 + x + 1), 1348 32 + x,
1372 (32 + y + 1)); 1349 32 + y);
1373} 1350}
1374 1351
1375/*{{{ process an X event */ 1352/*{{{ process an X event */
1376void 1353void ecb_hot
1377rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1378{ 1355{
1379 make_current (); 1356 make_current ();
1380 1357
1381 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1479 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1480 focus_out (); 1457 focus_out ();
1481 break; 1458 break;
1482 1459
1483 case ConfigureNotify: 1460 case ConfigureNotify:
1484 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1485 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1486 szHint.width, szHint.height); */
1487 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1488 { 1462 {
1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1490 ; 1464 ;
1465
1466 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467
1468#ifdef HAVE_BG_PIXMAP
1469 if (bg_window_position_sensitive ())
1470 want_position_change = true;
1471#endif
1472
1473 bool moved = false;
1474
1475 if (want_position_change)
1476 {
1477 int x, y;
1478
1479 if (ev.xconfigure.send_event)
1480 {
1481 x = ev.xconfigure.x;
1482 y = ev.xconfigure.y;
1483 }
1484 else
1485 get_window_origin (x, y);
1486
1487 if (x != parent_x || y != parent_y)
1488 {
1489 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490 parent_x = x;
1491 parent_y = y;
1492 }
1493
1494 if (bg_set_position (x, y)
1495 || !(bg_flags & BG_IS_VALID))
1496 moved = true;
1497 }
1491 1498
1492 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1493 { 1500 {
1494 seen_resize = 1; 1501 seen_resize = 1;
1495 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1496 } 1503 }
1497 else 1504 else
1498 { 1505 {
1499#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1500 if (bgPixmap.window_position_sensitive ()) 1507 if (moved)
1501 update_background (); 1508 update_background ();
1502#endif 1509#endif
1503 } 1510 }
1511
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505 } 1513 }
1506 break; 1514 break;
1507 1515
1508 case PropertyNotify: 1516 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1517 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1511 && ev.xproperty.state == PropertyNewValue)
1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1513
1514 break; 1518 break;
1515 1519
1516 case SelectionClear: 1520 case SelectionClear:
1517 selection_clear (); 1521 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1518 break;
1519
1520 case SelectionNotify:
1521 if (selection_wait == Sel_normal)
1522 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1523 break; 1522 break;
1524 1523
1525 case SelectionRequest: 1524 case SelectionRequest:
1526 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1527 break; 1526 break;
1528 1527
1529 case MapNotify: 1528 case MapNotify:
1529#ifdef HAVE_BG_PIXMAP
1530 /* This is needed specifically to fix the case of no window manager or a
1531 * non-reparenting window manager. In those cases we never get first
1532 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1533 * care of multiplicity of ConfigureNotify events arriving while WM does
1534 * reparenting.
1535 * We should not render background immediately, as there could be several
1536 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1537 * by scheduling background redraw as soon as we can, but giving a short
1538 * bit of time for ConfigureNotifies to arrive.
1539 * We should render background PRIOR to drawing any text, but AFTER all
1540 * of ConfigureNotifys for the best results.
1541 */
1542 if (!(bg_flags & BG_IS_VALID))
1543 update_background_ev.start (0.025);
1544#endif
1530 mapped = 1; 1545 mapped = 1;
1531#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1532 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1547 text_blink_ev.start ();
1533#endif 1548#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1549 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1535 break; 1550 break;
1536 1551
1537 case UnmapNotify: 1552 case UnmapNotify:
… …
1547 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1548 { 1563 {
1549 do 1564 do
1550 { 1565 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1553 } 1568 }
1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1555 1570
1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1557 1572
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 { 1574 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1562 } 1577 }
1578
1563 want_refresh = 1; 1579 want_refresh = 1;
1564 } 1580 }
1565 else 1581 else
1566 { 1582 {
1567 XEvent unused_event; 1583 XEvent unused_event;
… …
1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1585 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1570 ; 1586 ;
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1572 ; 1588 ;
1573 1589
1574 if (isScrollbarWindow (ev.xany.window)) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1575 { 1591 {
1576 scrollBar.setIdle (); 1592 scrollBar.state = SB_STATE_IDLE;
1577 scrollbar_show (0); 1593 scrollBar.show (0);
1578 } 1594 }
1579 } 1595 }
1580 break; 1596 break;
1581 1597
1582 case MotionNotify: 1598 case MotionNotify:
… …
1628 int dist; 1644 int dist;
1629 1645
1630 /* don't clobber the current delay if we are 1646 /* don't clobber the current delay if we are
1631 * already in the middle of scrolling. 1647 * already in the middle of scrolling.
1632 */ 1648 */
1633 if (!sel_scroll_ev.active) 1649 if (!sel_scroll_ev.is_active ())
1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1650 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1635 1651
1636 /* save the event params so we can highlight 1652 /* save the event params so we can highlight
1637 * the selection in the pending-scroll loop 1653 * the selection in the pending-scroll loop
1638 */ 1654 */
… …
1647 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1648 } 1664 }
1649 else 1665 else
1650 { 1666 {
1651 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1652 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1653 } 1669 }
1654 1670
1655 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1656 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1657 + 1; 1673 + 1;
… …
1661 else 1677 else
1662 { 1678 {
1663 /* we are within the text window, so we 1679 /* we are within the text window, so we
1664 * shouldn't be scrolling 1680 * shouldn't be scrolling
1665 */ 1681 */
1666 if (sel_scroll_ev.active)
1667 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1668 } 1683 }
1669#endif 1684#endif
1670#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1671 } 1686 }
1672#endif 1687#endif
1673 } 1688 }
1674 } 1689 }
1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1676 { 1691 {
1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1678 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1679 ; 1694 ;
1680 1695
1681 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1682 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1683 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1684 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1685 &unused_mask); 1700 &unused_mask);
1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1687 scrollbar_size ()); 1702 scrollBar.size ());
1688 want_refresh = 1; 1703 want_refresh = 1;
1689 scrollbar_show (1); 1704 scrollBar.show (1);
1690 } 1705 }
1691 break; 1706 break;
1692 } 1707 }
1693 1708
1694#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1695 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1696 {
1697 if (hidden_cursor)
1698 {
1699 hidden_cursor = 0;
1700 want_refresh = 1;
1701 }
1702
1703 cursor_blink_ev.again (); 1711 cursor_blink_reset ();
1704 }
1705#endif 1712#endif
1706 1713
1707#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1709 { 1716 {
… …
1715 1722
1716 if (ev.type == KeyPress && hidden_pointer == 0) 1723 if (ev.type == KeyPress && hidden_pointer == 0)
1717 pointer_blank (); 1724 pointer_blank ();
1718 } 1725 }
1719#endif 1726#endif
1720}
1721 1727
1722void 1728 refresh_check ();
1729}
1730
1731#if ENABLE_FRILLS
1732void ecb_cold
1733rxvt_term::set_urgency (bool enable)
1734{
1735 if (enable == urgency_hint)
1736 return;
1737
1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1739 {
1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1741 XSetWMHints (dpy, parent, h);
1742 urgency_hint = enable;
1743 XFree (h);
1744 }
1745}
1746#endif
1747
1748void ecb_cold
1723rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1724{ 1750{
1725 if (!focus) 1751 if (!focus)
1726 { 1752 {
1727 focus = 1; 1753 focus = 1;
1728 want_refresh = 1; 1754 want_refresh = 1;
1729 1755
1730 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1731
1732#if USE_XIM 1756#if USE_XIM
1733 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1734 { 1758 {
1735 IMSetPosition (); 1759 im_set_position ();
1736 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1737 } 1761 }
1738#endif 1762#endif
1739#if CURSOR_BLINK 1763#if CURSOR_BLINK
1740 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1765 cursor_blink_ev.again ();
1742#endif 1766#endif
1743#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1744 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1745 { 1769 {
1746 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1747 scr_recolour (); 1771 scr_recolour ();
1748 } 1772 }
1749#endif 1773#endif
1750#if ENABLE_FRILLS 1774#if ENABLE_FRILLS
1751 if (option (Opt_urgentOnBell)) 1775 if (option (Opt_urgentOnBell))
1752 { 1776 set_urgency (0);
1753 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1754 {
1755 h->flags &= ~XUrgencyHint;
1756 XSetWMHints (dpy, parent[0], h);
1757 }
1758 }
1759#endif 1777#endif
1760 }
1761}
1762 1778
1763void 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1780 }
1781}
1782
1783void ecb_cold
1764rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1765{ 1785{
1766 if (focus) 1786 if (focus)
1767 { 1787 {
1768 focus = 0; 1788 focus = 0;
1769 want_refresh = 1; 1789 want_refresh = 1;
1770 1790
1771 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1791#if ENABLE_FRILLS
1772 1792 if (option (Opt_urgentOnBell))
1793 set_urgency (0);
1794#endif
1773#if ENABLE_FRILLS || ISO_14755 1795#if ENABLE_FRILLS || ISO_14755
1774 if (iso14755buf) 1796 if (iso14755buf)
1775 { 1797 {
1776 iso14755buf = 0; 1798 iso14755buf = 0;
1777# if ISO_14755 1799# if ISO_14755
… …
1794 { 1816 {
1795 pix_colors = pix_colors_unfocused; 1817 pix_colors = pix_colors_unfocused;
1796 scr_recolour (); 1818 scr_recolour ();
1797 } 1819 }
1798#endif 1820#endif
1799 }
1800}
1801 1821
1802void 1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1823 }
1824}
1825
1826void ecb_cold
1803rxvt_term::update_fade_color (unsigned int idx) 1827rxvt_term::update_fade_color (unsigned int idx)
1804{ 1828{
1805#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1806 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1807 { 1831 {
… …
1811 } 1835 }
1812#endif 1836#endif
1813} 1837}
1814 1838
1815#if ENABLE_TRANSPARENCY || ENABLE_PERL 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1816void 1840void ecb_hot
1817rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1818{ 1842{
1819 make_current (); 1843 make_current ();
1820 1844
1821 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1822 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1846 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1823 return; 1847 return;
1824 1848
1825# if ENABLE_TRANSPARENCY
1826 switch (ev.type) 1849 switch (ev.type)
1827 { 1850 {
1828 case PropertyNotify: 1851 case PropertyNotify:
1829 /* 1852 /*
1830 * if user used some Esetroot compatible prog to set the root bg, 1853 * if user used some Esetroot compatible prog to set the root bg,
1831 * use the property to determine the pixmap. We use it later on. 1854 * use the property to determine the pixmap. We use it later on.
1832 */ 1855 */
1833 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1856 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1834 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1857 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1835 { 1858 {
1859# if ENABLE_TRANSPARENCY
1836 bgPixmap.set_root_pixmap (); 1860 bg_set_root_pixmap ();
1837 update_background (); 1861 update_background ();
1862#endif
1863#if ENABLE_PERL
1864 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1865#endif
1838 } 1866 }
1867
1839 break; 1868 break;
1840 } 1869 }
1841# endif 1870
1871 refresh_check ();
1842} 1872}
1843#endif 1873#endif
1844 1874
1845void 1875void
1846rxvt_term::button_press (XButtonEvent &ev) 1876rxvt_term::button_press (XButtonEvent &ev)
… …
1877 /* save the xbutton state (for ButtonRelease) */ 1907 /* save the xbutton state (for ButtonRelease) */
1878 MEvent.state = ev.state; 1908 MEvent.state = ev.state;
1879#ifdef MOUSE_REPORT_DOUBLECLICK 1909#ifdef MOUSE_REPORT_DOUBLECLICK
1880 if (ev.button == MEvent.button && clickintime) 1910 if (ev.button == MEvent.button && clickintime)
1881 { 1911 {
1882 /* same button, within alloted time */ 1912 /* same button, within allowed time */
1883 MEvent.clicks++; 1913 MEvent.clicks++;
1884 1914
1885 if (MEvent.clicks > 1) 1915 if (MEvent.clicks > 1)
1886 { 1916 {
1887 /* only report double clicks */ 1917 /* only report double clicks */
… …
1901 mouse_report (ev); 1931 mouse_report (ev);
1902 } 1932 }
1903#else 1933#else
1904 MEvent.button = ev.button; 1934 MEvent.button = ev.button;
1905 mouse_report (ev); 1935 mouse_report (ev);
1906#endif /* MOUSE_REPORT_DOUBLECLICK */ 1936#endif /* MOUSE_REPORT_DOUBLECLICK */
1907 1937
1908 } 1938 }
1909 else 1939 else
1910 { 1940 {
1911 if (ev.button != MEvent.button) 1941 if (ev.button != MEvent.button)
… …
1959 } 1989 }
1960 1990
1961 /* 1991 /*
1962 * Scrollbar window processing of button press 1992 * Scrollbar window processing of button press
1963 */ 1993 */
1964 if (isScrollbarWindow (ev.window)) 1994 if (scrollBar.state && ev.window == scrollBar.win)
1965 { 1995 {
1966 scrollBar.setIdle (); 1996 page_dirn direction = NO_DIR;
1997
1998 if (scrollBar.upButton (ev.y))
1999 direction = UP; /* up */
2000 else if (scrollBar.dnButton (ev.y))
2001 direction = DN; /* down */
2002
2003 scrollBar.state = SB_STATE_IDLE;
1967 /* 2004 /*
1968 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1969 * move up if mouse is above slider 2006 * move up if mouse is above slider
1970 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1971 * 2008 *
… …
1980 /* 2017 /*
1981 * Mouse report disabled scrollbar: 2018 * Mouse report disabled scrollbar:
1982 * arrow buttons - send up/down 2019 * arrow buttons - send up/down
1983 * click on scrollbar - send pageup/down 2020 * click on scrollbar - send pageup/down
1984 */ 2021 */
1985 if ((scrollBar.style == R_SB_NEXT 2022 if (direction == UP)
1986 && scrollbarnext_upButton (ev.y))
1987 || (scrollBar.style == R_SB_RXVT
1988 && scrollbarrxvt_upButton (ev.y)))
1989 tt_printf ("\033[A"); 2023 tt_printf ("\033[A");
1990 else if ((scrollBar.style == R_SB_NEXT 2024 else if (direction == DN)
1991 && scrollbarnext_dnButton (ev.y))
1992 || (scrollBar.style == R_SB_RXVT
1993 && scrollbarrxvt_dnButton (ev.y)))
1994 tt_printf ("\033[B"); 2025 tt_printf ("\033[B");
1995 else 2026 else
1996 switch (ev.button) 2027 switch (ev.button)
1997 { 2028 {
1998 case Button2: 2029 case Button2:
… …
2005 tt_printf ("\033[5~"); 2036 tt_printf ("\033[5~");
2006 break; 2037 break;
2007 } 2038 }
2008 } 2039 }
2009 else 2040 else
2010#endif /* NO_SCROLLBAR_REPORT */ 2041#endif /* NO_SCROLLBAR_REPORT */
2011
2012 {
2013 char upordown = 0;
2014
2015 if (scrollBar.style == R_SB_NEXT)
2016 { 2042 {
2017 if (scrollbarnext_upButton (ev.y)) 2043 if (direction != NO_DIR)
2018 upordown = -1; /* up */
2019 else if (scrollbarnext_dnButton (ev.y))
2020 upordown = 1; /* down */
2021 }
2022 else if (scrollBar.style == R_SB_RXVT)
2023 {
2024 if (scrollbarrxvt_upButton (ev.y))
2025 upordown = -1; /* up */
2026 else if (scrollbarrxvt_dnButton (ev.y))
2027 upordown = 1; /* down */
2028 }
2029 if (upordown)
2030 { 2044 {
2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2046 if (!cont_scroll_ev.is_active ())
2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2033#endif 2048#endif
2034 if (scr_page (upordown < 0 ? UP : DN, 1)) 2049 if (scr_page (direction, 1))
2035 { 2050 {
2036 if (upordown < 0) 2051 if (direction == UP)
2037 scrollBar.setUp (); 2052 scrollBar.state = SB_STATE_UP;
2038 else 2053 else
2039 scrollBar.setDn (); 2054 scrollBar.state = SB_STATE_DOWN;
2040 } 2055 }
2041 } 2056 }
2042 else 2057 else
2043 switch (ev.button) 2058 switch (ev.button)
2044 { 2059 {
2045 case Button2: 2060 case Button2:
2046 switch (scrollbar_align) 2061 switch (scrollBar.align)
2047 { 2062 {
2048 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2049 csrO = 0; 2064 csrO = 0;
2050 break; 2065 break;
2051 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2052 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2053 break; 2068 break;
2054 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2055 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2056 break; 2071 break;
2057 } 2072 }
2058 2073
2059 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2060 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2061 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2062 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2063 2078
2064 scrollBar.setMotion (); 2079 scrollBar.state = SB_STATE_MOTION;
2065 break; 2080 break;
2066 2081
2067 case Button1: 2082 case Button1:
2068 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2069 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2070 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2071 2086
2072 case Button3: 2087 case Button3:
2073 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2074 { 2089 {
2075 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2077 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2078# else 2093# else
2079 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2080# endif 2095# endif
2081 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2082# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2083 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2084# else 2099# else
2085 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2086# endif 2101# endif
2087 else 2102 else
2088 scrollBar.setMotion (); 2103 scrollBar.state = SB_STATE_MOTION;
2089 } 2104 }
2090 else 2105 else
2091 { 2106 {
2092 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2093 (nrow 2108 (nrow
2094 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2095 / scrollbar_size ())); 2110 / scrollBar.size ()));
2096 } 2111 }
2097 2112
2098 break; 2113 break;
2099 } 2114 }
2100 } 2115 }
… …
2110 2125
2111 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2112 if (!bypass_keystate) 2127 if (!bypass_keystate)
2113 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2114 2129
2115 if (scrollbar_isUpDn ()) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2116 { 2131 {
2117 scrollBar.setIdle (); 2132 scrollBar.state = SB_STATE_IDLE;
2118 scrollbar_show (0); 2133 scrollBar.show (0);
2119 } 2134 }
2120 2135
2121#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2122 if (sel_scroll_ev.active)
2123 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2124#endif 2138#endif
2125 2139
2126 if (ev.window == vt) 2140 if (ev.window == vt)
2127 { 2141 {
2128 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2152 mouse_report (ev); 2166 mouse_report (ev);
2153 } 2167 }
2154#else /* MOUSE_REPORT_DOUBLECLICK */ 2168#else /* MOUSE_REPORT_DOUBLECLICK */
2155 MEvent.button = AnyButton; 2169 MEvent.button = AnyButton;
2156 mouse_report (ev); 2170 mouse_report (ev);
2157#endif /* MOUSE_REPORT_DOUBLECLICK */ 2171#endif /* MOUSE_REPORT_DOUBLECLICK */
2158 return; 2172 return;
2159 } 2173 }
2160 2174
2161 /* 2175 /*
2162 * dumb hack to compensate for the failure of click-and-drag 2176 * dumb hack to compensate for the failure of click-and-drag
… …
2173 case Button3: 2187 case Button3:
2174 selection_make (ev.time); 2188 selection_make (ev.time);
2175 break; 2189 break;
2176 2190
2177 case Button2: 2191 case Button2:
2178 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2179 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2180 break; 2194 break;
2181 2195
2182#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2183 case Button4: 2197 case Button4:
2184 case Button5: 2198 case Button5:
… …
2200 { 2214 {
2201 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += v ? -1 : 1;
2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2204 2218
2219 if (!slip_wheel_ev.is_active ())
2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2206 } 2221 }
2207 else 2222 else
2223# endif
2208 { 2224 {
2209# endif
2210 scr_page (v, i); 2225 scr_page (v, i);
2211 scrollbar_show (1); 2226 scrollBar.show (1);
2212# ifdef MOUSE_SLIP_WHEELING
2213 } 2227 }
2214# endif
2215 } 2228 }
2216 break; 2229 break;
2217#endif 2230#endif
2218 } 2231 }
2219 } 2232 }
2220} 2233}
2221 2234
2222/*}}} */ 2235/*}}} */
2223 2236
2224bool 2237void ecb_hot
2225rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2226{ 2239{
2227 bool flag = false;
2228 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2229 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2230 2242
2231 for (;;) 2243 for (;;)
2232 { 2244 {
2233 if (ch == NOCHAR) 2245 if (ecb_unlikely (ch == NOCHAR))
2234 { 2246 {
2235 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2236 ch = next_char (); 2248 ch = next_char ();
2237 2249
2238 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2239 break; 2251 break;
2240 } 2252 }
2241 2253
2242 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2243 { 2255 {
2244 if (!seen_input) 2256 if (ecb_unlikely (!seen_input))
2245 { 2257 {
2246 seen_input = 1; 2258 seen_input = 1;
2247 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2248 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2249 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2262 wchar_t *str = buf; 2274 wchar_t *str = buf;
2263 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2264 2276
2265 for (;;) 2277 for (;;)
2266 { 2278 {
2267 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2268 break; 2280 break;
2269 2281
2270 *str++ = ch; 2282 *str++ = ch;
2271 2283
2272 if (ch == C0_LF || str >= eol) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2273 { 2285 {
2274 if (ch == C0_LF) 2286 if (ch == C0_LF)
2275 nlines++; 2287 nlines++;
2276 2288
2277 refresh_count++; 2289 refresh_count++;
2278 2290
2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2280 { 2292 {
2281 refresh_count = 0; 2293 refresh_count = 0;
2282 2294
2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.) 2295 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2284 { 2296 {
2285 refreshnow = true; 2297 refreshnow = true;
2286 ch = NOCHAR; 2298 ch = NOCHAR;
2287 break; 2299 break;
2288 } 2300 }
… …
2326 * What the heck we'll cheat and only refresh less than every page-full. 2338 * What the heck we'll cheat and only refresh less than every page-full.
2327 * if skipScroll is enabled. 2339 * if skipScroll is enabled.
2328 */ 2340 */
2329 if (refreshnow) 2341 if (refreshnow)
2330 { 2342 {
2331 flag = true;
2332 scr_refresh (); 2343 scr_refresh ();
2333 want_refresh = 1; 2344 want_refresh = 1;
2334 } 2345 }
2335
2336 } 2346 }
2337 else 2347 else
2338 { 2348 {
2339 try 2349 try
2340 { 2350 {
… …
2348 } 2358 }
2349 2359
2350 ch = NOCHAR; 2360 ch = NOCHAR;
2351 } 2361 }
2352 } 2362 }
2353
2354 return flag;
2355} 2363}
2356 2364
2357// read the next character 2365// read the next character
2358wchar_t 2366wchar_t ecb_hot
2359rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2360{ 2368{
2361 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2362 { 2370 {
2363 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2364 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2365 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2366 2374
2367 wchar_t wc; 2375 wchar_t wc;
2368 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2369 2377
… …
2373 cmdbuf_ptr = cmdbuf_endp; 2381 cmdbuf_ptr = cmdbuf_endp;
2374 break; 2382 break;
2375 } 2383 }
2376 2384
2377 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2386 {
2387 mbstate.reset (); // reset now undefined conversion state
2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2388 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2389 }
2379 2390
2380 // assume wchar == unicode 2391 // assume wchar == unicode
2381 cmdbuf_ptr += len; 2392 cmdbuf_ptr += len;
2382 return wc & UNICODE_MASK; 2393 return wc & UNICODE_MASK;
2383 } 2394 }
2384 2395
2385 return NOCHAR; 2396 return NOCHAR;
2386} 2397}
2387 2398
2388// read the next octet 2399// read the next octet
2389uint32_t 2400uint32_t ecb_hot
2390rxvt_term::next_octet () NOTHROW 2401rxvt_term::next_octet () NOTHROW
2391{ 2402{
2392 return cmdbuf_ptr < cmdbuf_endp 2403 return cmdbuf_ptr < cmdbuf_endp
2393 ? (unsigned char)*cmdbuf_ptr++ 2404 ? (unsigned char)*cmdbuf_ptr++
2394 : NOCHAR; 2405 : NOCHAR;
2395} 2406}
2396 2407
2397static class out_of_input out_of_input; 2408static class out_of_input out_of_input;
2398 2409
2399/* rxvt_cmd_getc () - Return next input character */ 2410wchar_t ecb_hot
2400/*
2401 * Return the next input character after first passing any keyboard input
2402 * to the command.
2403 */
2404wchar_t
2405rxvt_term::cmd_getc () THROW ((class out_of_input)) 2411rxvt_term::cmd_getc () THROW ((class out_of_input))
2406{ 2412{
2407 wchar_t c = next_char (); 2413 wchar_t c = next_char ();
2408 2414
2409 if (c == NOCHAR) 2415 if (c == NOCHAR)
2410 throw out_of_input; 2416 throw out_of_input;
2411 2417
2412 return c; 2418 return c;
2413} 2419}
2414 2420
2415uint32_t 2421uint32_t ecb_hot
2416rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2422rxvt_term::cmd_get8 () THROW ((class out_of_input))
2417{ 2423{
2418 uint32_t c = next_octet (); 2424 uint32_t c = next_octet ();
2419 2425
2420 if (c == NOCHAR) 2426 if (c == NOCHAR)
… …
2424} 2430}
2425 2431
2426/*{{{ print pipe */ 2432/*{{{ print pipe */
2427/*----------------------------------------------------------------------*/ 2433/*----------------------------------------------------------------------*/
2428#ifdef PRINTPIPE 2434#ifdef PRINTPIPE
2429FILE * 2435FILE * ecb_cold
2430rxvt_term::popen_printer () 2436rxvt_term::popen_printer ()
2431{ 2437{
2432 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2438 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2433 2439
2434 if (stream == NULL) 2440 if (stream == NULL)
2435 rxvt_warn ("can't open printer pipe, not printing.\n"); 2441 rxvt_warn ("can't open printer pipe, not printing.\n");
2436 2442
2437 return stream; 2443 return stream;
2438} 2444}
2439 2445
2440int 2446int ecb_cold
2441rxvt_term::pclose_printer (FILE *stream) 2447rxvt_term::pclose_printer (FILE *stream)
2442{ 2448{
2443 fflush (stream); 2449 fflush (stream);
2444 return pclose (stream); 2450 return pclose (stream);
2445} 2451}
2446 2452
2447/* 2453/*
2448 * simulate attached vt100 printer 2454 * simulate attached vt100 printer
2449 */ 2455 */
2450void 2456void ecb_cold
2451rxvt_term::process_print_pipe () 2457rxvt_term::process_print_pipe ()
2452{ 2458{
2453 int done; 2459 FILE *fd = popen_printer ();
2454 FILE *fd;
2455 2460
2456 if ((fd = popen_printer ()) == NULL) 2461 if (!fd)
2457 return; 2462 return;
2458 2463
2459 /* 2464 /*
2460 * Send all input to the printer until either ESC[4i or ESC[?4i 2465 * Send all input to the printer until either ESC[4i or ESC[?4i
2461 * is received. 2466 * is received.
2462 */ 2467 */
2463 for (done = 0; !done;) 2468 for (int done = 0; !done; )
2464 { 2469 {
2465 unsigned char buf[8]; 2470 unsigned char buf[8];
2466 unicode_t ch; 2471 unicode_t ch;
2467 unsigned int i, len; 2472 unsigned int i, len;
2468 2473
… …
2499 } 2504 }
2500 } 2505 }
2501 2506
2502 pclose_printer (fd); 2507 pclose_printer (fd);
2503} 2508}
2504#endif /* PRINTPIPE */ 2509#endif /* PRINTPIPE */
2505/*}}} */ 2510/*}}} */
2506 2511
2507/* *INDENT-OFF* */
2508enum { 2512enum {
2509 C1_40 = 0x40, 2513 C1_40 = 0x40,
2510 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2514 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2511 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2515 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2512 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2516 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2513 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2517 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2514}; 2518};
2515/* *INDENT-ON* */
2516 2519
2517/*{{{ process non-printing single characters */ 2520/*{{{ process non-printing single characters */
2518void 2521void ecb_hot
2519rxvt_term::process_nonprinting (unicode_t ch) 2522rxvt_term::process_nonprinting (unicode_t ch)
2520{ 2523{
2521 switch (ch) 2524 switch (ch)
2522 { 2525 {
2523 case C0_ESC: 2526 case C0_ESC:
… …
2569} 2572}
2570/*}}} */ 2573/*}}} */
2571 2574
2572 2575
2573/*{{{ process VT52 escape sequences */ 2576/*{{{ process VT52 escape sequences */
2574void 2577void ecb_cold
2575rxvt_term::process_escape_vt52 (unicode_t ch) 2578rxvt_term::process_escape_vt52 (unicode_t ch)
2576{ 2579{
2577 int row, col; 2580 int row, col;
2578 2581
2579 switch (ch) 2582 switch (ch)
… …
2613 break; 2616 break;
2614 case 'Z': /* identify the terminal type */ 2617 case 'Z': /* identify the terminal type */
2615 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2616 break; 2619 break;
2617 case '<': /* turn off VT52 mode */ 2620 case '<': /* turn off VT52 mode */
2618 PrivMode (0, PrivMode_vt52); 2621 priv_modes &= ~PrivMode_vt52;
2619 break; 2622 break;
2620 case 'F': /* use special graphics character set */ 2623 case 'F': /* use special graphics character set */
2621 case 'G': /* use regular character set */ 2624 case 'G': /* use regular character set */
2622 /* unimplemented */ 2625 /* unimplemented */
2623 break; 2626 break;
… …
2629} 2632}
2630/*}}} */ 2633/*}}} */
2631 2634
2632 2635
2633/*{{{ process escape sequences */ 2636/*{{{ process escape sequences */
2634void 2637void ecb_hot
2635rxvt_term::process_escape_seq () 2638rxvt_term::process_escape_seq ()
2636{ 2639{
2637 unicode_t ch = cmd_getc (); 2640 unicode_t ch = cmd_getc ();
2638 2641
2639 if (priv_modes & PrivMode_vt52) 2642 if (priv_modes & PrivMode_vt52)
… …
2642 return; 2645 return;
2643 } 2646 }
2644 2647
2645 switch (ch) 2648 switch (ch)
2646 { 2649 {
2647 /* case 1: do_tek_mode (); break; */
2648 case '#': 2650 case '#':
2649 if (cmd_getc () == '8') 2651 if (cmd_getc () == '8')
2650 scr_E (); 2652 scr_E ();
2651 break; 2653 break;
2652 case '(': 2654 case '(':
… …
2675#if !ENABLE_MINIMAL 2677#if !ENABLE_MINIMAL
2676 case '9': 2678 case '9':
2677 scr_forwardindex (); 2679 scr_forwardindex ();
2678 break; 2680 break;
2679#endif 2681#endif
2682 // DECPAM/DECPNM
2680 case '=': 2683 case '=':
2684 priv_modes |= PrivMode_aplKP;
2685 break;
2681 case '>': 2686 case '>':
2682 PrivMode ((ch == '='), PrivMode_aplKP); 2687 priv_modes &= ~PrivMode_aplKP;
2683 break; 2688 break;
2684 2689
2685 case C1_40: 2690 case C1_40:
2686 cmd_getc (); 2691 cmd_getc ();
2687 break; 2692 break;
… …
2691 2696
2692 /* 8.3.87: NEXT LINE */ 2697 /* 8.3.87: NEXT LINE */
2693 case C1_NEL: /* ESC E */ 2698 case C1_NEL: /* ESC E */
2694 { 2699 {
2695 wchar_t nlcr[] = { C0_LF, C0_CR }; 2700 wchar_t nlcr[] = { C0_LF, C0_CR };
2696 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2701 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2697 } 2702 }
2698 break; 2703 break;
2699 2704
2700 /* kidnapped escape sequence: Should be 8.3.48 */ 2705 /* kidnapped escape sequence: Should be 8.3.48 */
2701 case C1_ESA: /* ESC G */ 2706 case C1_ESA: /* ESC G */
2702 process_graphics (); 2707 // used by original rxvt for rob nations own graphics mode
2708 if (cmd_getc () == 'Q')
2709 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2703 break; 2710 break;
2704 2711
2705 /* 8.3.63: CHARACTER TABULATION SET */ 2712 /* 8.3.63: CHARACTER TABULATION SET */
2706 case C1_HTS: /* ESC H */ 2713 case C1_HTS: /* ESC H */
2707 scr_set_tab (1); 2714 scr_set_tab (1);
… …
2711 case C1_RI: /* ESC M */ 2718 case C1_RI: /* ESC M */
2712 scr_index (DN); 2719 scr_index (DN);
2713 break; 2720 break;
2714 2721
2715 /* 8.3.142: SINGLE-SHIFT TWO */ 2722 /* 8.3.142: SINGLE-SHIFT TWO */
2716 /*case C1_SS2: scr_single_shift (2); break; */ 2723 /* case C1_SS2: break; */
2717 2724
2718 /* 8.3.143: SINGLE-SHIFT THREE */ 2725 /* 8.3.143: SINGLE-SHIFT THREE */
2719 /*case C1_SS3: scr_single_shift (3); break; */ 2726 /* case C1_SS3: break; */
2720 2727
2721 /* 8.3.27: DEVICE CONTROL STRING */ 2728 /* 8.3.27: DEVICE CONTROL STRING */
2722 case C1_DCS: /* ESC P */ 2729 case C1_DCS: /* ESC P */
2723 process_dcs_seq (); 2730 process_dcs_seq ();
2724 break; 2731 break;
… …
2726 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2733 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2727 case C1_SCI: /* ESC Z */ 2734 case C1_SCI: /* ESC Z */
2728 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2735 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2729 break; /* steal obsolete ESC [ c */ 2736 break; /* steal obsolete ESC [ c */
2730 2737
2731 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2738 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2732 case C1_CSI: /* ESC [ */ 2739 case C1_CSI: /* ESC [ */
2733 process_csi_seq (); 2740 process_csi_seq ();
2734 break; 2741 break;
2735 2742
2736 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2743 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2737 case C1_OSC: /* ESC ] */ 2744 case C1_OSC: /* ESC ] */
2738 process_osc_seq (); 2745 process_osc_seq ();
2739 break; 2746 break;
2740 2747
2741 /* 8.3.106: RESET TO INITIAL STATE */ 2748 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2742 case 'c': 2749 case 'c':
2743 mbstate.reset (); 2750 mbstate.reset ();
2744 scr_poweron (); 2751 scr_poweron ();
2745 scrollbar_show (1); 2752 scrollBar.show (1);
2746 break; 2753 break;
2747 2754
2748 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2755 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2749 case 'n': 2756 case 'n':
2750 scr_charset_choose (2); 2757 scr_charset_choose (2);
… …
2757 } 2764 }
2758} 2765}
2759/*}}} */ 2766/*}}} */
2760 2767
2761/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2768/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2762/* *INDENT-OFF* */
2763enum { 2769enum {
2764 CSI_ICH = 0x40, 2770 CSI_ICH = 0x40,
2765 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2771 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2766 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2772 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2767 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2773 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2770 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2776 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2771 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2777 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2772 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2778 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2773}; 2779};
2774 2780
2775#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2781#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2776 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2782 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2777 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2783 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2778#define get_byte_array_bit(array, bit) \ 2784#define get_byte_array_bit(array, bit) \
2779 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2785 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2780 2786
2781const unsigned char csi_defaults[] = 2787static const unsigned char csi_defaults[] =
2782 { 2788 {
2783 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2789 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2784 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2790 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2785 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2791 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2786 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2792 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2787 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2793 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2788 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2794 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2789 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2795 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2790 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2796 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2791 }; 2797 };
2792/* *INDENT-ON* */
2793 2798
2794void 2799void ecb_hot
2795rxvt_term::process_csi_seq () 2800rxvt_term::process_csi_seq ()
2796{ 2801{
2797 unicode_t ch, priv, i; 2802 unicode_t ch, priv, i;
2798 unsigned int nargs, p; 2803 unsigned int nargs, p;
2799 int n, ndef; 2804 int n, ndef;
… …
2801 2806
2802 nargs = 0; 2807 nargs = 0;
2803 2808
2804 priv = 0; 2809 priv = 0;
2805 ch = cmd_getc (); 2810 ch = cmd_getc ();
2806 if (ch >= '<' && ch <= '?') 2811 if ((ch >= '<' && ch <= '?') || ch == '!')
2812 {
2807 { /* '<' '=' '>' '?' */ 2813 /* '<' '=' '>' '?' '!' */
2808 priv = ch; 2814 priv = ch;
2809 ch = cmd_getc (); 2815 ch = cmd_getc ();
2810 } 2816 }
2811 2817
2812 /* read any numerical arguments */ 2818 /* read any numerical arguments */
… …
2861 // versions. 2867 // versions.
2862 // 2868 //
2863 tt_printf ("\033[>%d;95;0c", 'U'); 2869 tt_printf ("\033[>%d;95;0c", 'U');
2864 } 2870 }
2865 break; 2871 break;
2872
2866 case '?': 2873 case '?':
2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2874 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2868 process_terminal_mode (ch, priv, nargs, arg); 2875 process_terminal_mode (ch, priv, nargs, arg);
2869 break; 2876 break;
2877
2878 case '!':
2879 if (ch == CSI_70)
2880 {
2881 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2882 scr_soft_reset ();
2883
2884 static const int pm_h[] = { 7, 25 };
2885 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2886
2887 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2888 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2870 } 2889 }
2890 break;
2891 }
2892
2871 return; 2893 return;
2872 } 2894 }
2873 2895
2874 switch (ch) 2896 switch (ch)
2875 { 2897 {
… …
2889 } 2911 }
2890 break; 2912 break;
2891#endif 2913#endif
2892 2914
2893 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2915 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2894 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2916 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2895 arg[0] = -arg[0]; 2917 arg[0] = -arg[0];
2896 /* FALLTHROUGH */ 2918 /* FALLTHROUGH */
2897 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2919 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2898 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2920 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2899 scr_gotorc (arg[0], 0, RELATIVE); 2921 scr_gotorc (arg[0], 0, RELATIVE);
2900 break; 2922 break;
2901 2923
2902 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2924 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2903 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2925 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3090 } 3112 }
3091} 3113}
3092/*}}} */ 3114/*}}} */
3093 3115
3094#if !ENABLE_MINIMAL 3116#if !ENABLE_MINIMAL
3095/* ARGSUSED */
3096void 3117void
3097rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3118rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3098{ 3119{
3099 int x, y; 3120 int x, y;
3100 XWindowAttributes wattr; 3121 XWindowAttributes wattr;
… …
3109 { 3130 {
3110 /* 3131 /*
3111 * commands 3132 * commands
3112 */ 3133 */
3113 case 1: /* deiconify window */ 3134 case 1: /* deiconify window */
3114 XMapWindow (dpy, parent[0]); 3135 XMapWindow (dpy, parent);
3115 break; 3136 break;
3116 case 2: /* iconify window */ 3137 case 2: /* iconify window */
3117 XIconifyWindow (dpy, parent[0], display->screen); 3138 XIconifyWindow (dpy, parent, display->screen);
3118 break; 3139 break;
3119 case 3: /* set position (pixels) */ 3140 case 3: /* set position (pixels) */
3120 XMoveWindow (dpy, parent[0], args[1], args[2]); 3141 XMoveWindow (dpy, parent, args[1], args[2]);
3121 break; 3142 break;
3122 case 4: /* set size (pixels) */ 3143 case 4: /* set size (pixels) */
3123 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3124 break; 3145 break;
3125 case 5: /* raise window */ 3146 case 5: /* raise window */
3126 XRaiseWindow (dpy, parent[0]); 3147 XRaiseWindow (dpy, parent);
3127 break; 3148 break;
3128 case 6: /* lower window */ 3149 case 6: /* lower window */
3129 XLowerWindow (dpy, parent[0]); 3150 XLowerWindow (dpy, parent);
3130 break; 3151 break;
3131 case 7: /* refresh window */ 3152 case 7: /* refresh window */
3132 scr_touch (true); 3153 scr_touch (true);
3133 break; 3154 break;
3134 case 8: /* set size (chars) */ 3155 case 8: /* set size (chars) */
… …
3137 break; 3158 break;
3138 3159
3139 //case 9: NYI, TODO, restore maximized window or maximize window 3160 //case 9: NYI, TODO, restore maximized window or maximize window
3140 default: 3161 default:
3141 if (args[0] >= 24) /* set height (chars) */ 3162 if (args[0] >= 24) /* set height (chars) */
3142 set_widthheight ((unsigned int)width, 3163 set_widthheight ((unsigned int)vt_width,
3143 (unsigned int) (args[1] * fheight)); 3164 (unsigned int) (args[1] * fheight));
3144 break; 3165 break;
3145 3166
3146 /* 3167 /*
3147 * reports - some output format copied from XTerm 3168 * reports - some output format copied from XTerm
3148 */ 3169 */
3149 case 11: /* report window state */ 3170 case 11: /* report window state */
3150 XGetWindowAttributes (dpy, parent[0], &wattr); 3171 XGetWindowAttributes (dpy, parent, &wattr);
3151 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3152 break; 3173 break;
3153 case 13: /* report window position */ 3174 case 13: /* report window position */
3154 XGetWindowAttributes (dpy, parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent, &wattr);
3155 XTranslateCoordinates (dpy, parent[0], wattr.root, 3176 XTranslateCoordinates (dpy, parent, wattr.root,
3156 -wattr.border_width, -wattr.border_width, 3177 -wattr.border_width, -wattr.border_width,
3157 &x, &y, &wdummy); 3178 &x, &y, &wdummy);
3158 tt_printf ("\033[3;%d;%dt", x, y); 3179 tt_printf ("\033[3;%d;%dt", x, y);
3159 break; 3180 break;
3160 case 14: /* report window size (pixels) */ 3181 case 14: /* report window size (pixels) */
3161 XGetWindowAttributes (dpy, parent[0], &wattr); 3182 XGetWindowAttributes (dpy, parent, &wattr);
3162 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3163 break; 3184 break;
3164 case 18: /* report text area size (chars) */ 3185 case 18: /* report text area size (chars) */
3165 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3166 break; 3187 break;
… …
3168 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3189 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3169 break; 3190 break;
3170 case 20: /* report icon label */ 3191 case 20: /* report icon label */
3171 { 3192 {
3172 char *s; 3193 char *s;
3173 XGetIconName (dpy, parent[0], &s); 3194 XGetIconName (dpy, parent, &s);
3174 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3175 XFree (s); 3196 XFree (s);
3176 } 3197 }
3177 break; 3198 break;
3178 case 21: /* report window title */ 3199 case 21: /* report window title */
3179 { 3200 {
3180 char *s; 3201 char *s;
3181 XFetchName (dpy, parent[0], &s); 3202 XFetchName (dpy, parent, &s);
3182 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3203 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3183 XFree (s); 3204 XFree (s);
3184 } 3205 }
3185 break; 3206 break;
3186 } 3207 }
… …
3242 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3243 */ 3264 */
3244void 3265void
3245rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3246{ 3267{
3247 char *s;
3248 unicode_t eh;
3249
3250 /* 3268 /*
3251 * Not handled yet 3269 * Not handled yet
3252 */ 3270 */
3271
3272 unicode_t eh;
3253 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3254 if (s) 3274 if (s)
3255 free (s); 3275 free (s);
3256 3276
3257 return; 3277 return;
3258} 3278}
… …
3262 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3263 */ 3283 */
3264void 3284void
3265rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3266{ 3286{
3267 unicode_t ch, eh;
3268 int arg; 3287 int arg;
3269 3288
3270 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3271 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3272 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3273 3292
3274 if (ch == ';') 3293 if (ch == ';')
3275 { 3294 {
3295 unicode_t eh;
3276 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3277 3297
3278 if (s) 3298 if (s)
3279 { 3299 {
3280 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
… …
3304 3324
3305/* 3325/*
3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3326 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3307 */ 3327 */
3308void 3328void
3309rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3329rxvt_term::process_xterm_seq (int op, char *str, char resp)
3310{ 3330{
3311 int color; 3331 int color;
3312 char *buf, *name; 3332 char *buf, *name;
3313 bool query = str[0] == '?' && !str[1]; 3333 bool query = str[0] == '?' && !str[1];
3314 int saveop = op; 3334 int saveop = op;
… …
3341 unsigned long bytes_after; 3361 unsigned long bytes_after;
3342 unsigned char *value = 0; 3362 unsigned char *value = 0;
3343 const char *str = ""; 3363 const char *str = "";
3344 3364
3345 if (prop 3365 if (prop
3346 && XGetWindowProperty (dpy, parent[0], 3366 && XGetWindowProperty (dpy, parent,
3347 prop, 0, 1<<16, 0, AnyPropertyType, 3367 prop, 0, 1<<16, 0, AnyPropertyType,
3348 &actual_type, &actual_format, 3368 &actual_type, &actual_format,
3349 &nitems, &bytes_after, &value) == Success 3369 &nitems, &bytes_after, &value) == Success
3350 && actual_type != None 3370 && actual_type != None
3351 && actual_format == 8) 3371 && actual_format == 8)
… …
3355 3375
3356 XFree (value); 3376 XFree (value);
3357 } 3377 }
3358 else 3378 else
3359 { 3379 {
3360 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3361 3381
3362 if (eq) 3382 if (eq)
3363 { 3383 {
3364 *eq = 0; 3384 *eq = 0;
3365 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
3366 } 3386 }
3367 else 3387 else
3368 XDeleteProperty (dpy, parent[0], 3388 XDeleteProperty (dpy, parent,
3369 display->atom (str)); 3389 display->atom (str));
3370 } 3390 }
3371 break; 3391 break;
3372 3392
3373 case XTerm_Color: 3393 case XTerm_Color:
… …
3386 *buf++ = '\0'; 3406 *buf++ = '\0';
3387 3407
3388 process_color_seq (op, color, name, resp); 3408 process_color_seq (op, color, name, resp);
3389 } 3409 }
3390 break; 3410 break;
3411 case Rxvt_restoreFG:
3391 case XTerm_Color00: 3412 case XTerm_Color00:
3392 process_color_seq (op, Color_fg, str, resp); 3413 process_color_seq (op, Color_fg, str, resp);
3393 break; 3414 break;
3415 case Rxvt_restoreBG:
3394 case XTerm_Color01: 3416 case XTerm_Color01:
3395 process_color_seq (op, Color_bg, str, resp); 3417 process_color_seq (op, Color_bg, str, resp);
3396 break; 3418 break;
3397#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
3398 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
… …
3403 process_color_seq (op, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3404 break; 3426 break;
3405 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3406 process_color_seq (op, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3407 break; 3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3408#ifndef NO_BOLD_UNDERLINE_REVERSE 3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3409 case XTerm_Color_RV:
3410 process_color_seq (op, Color_RV, str, resp);
3411 break;
3412 case Rxvt_Color_BD:
3413 case URxvt_Color_BD: 3439 case URxvt_Color_BD:
3414 process_color_seq (op, Color_BD, str, resp); 3440 process_color_seq (op, Color_BD, str, resp);
3415 break; 3441 break;
3416 case Rxvt_Color_UL:
3417 case URxvt_Color_UL: 3442 case URxvt_Color_UL:
3418 process_color_seq (op, Color_UL, str, resp); 3443 process_color_seq (op, Color_UL, str, resp);
3419 break; 3444 break;
3420 case URxvt_Color_IT: 3445 case URxvt_Color_IT:
3421 process_color_seq (op, Color_IT, str, resp); 3446 process_color_seq (op, Color_IT, str, resp);
3422 break; 3447 break;
3423#endif 3448#endif
3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3424#if ENABLE_TRANSPARENCY 3452#if ENABLE_TRANSPARENCY
3425 case URxvt_Color_tint: 3453 case URxvt_Color_tint:
3426 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3427 { 3455 {
3428 bool changed = false; 3456 bool changed = false;
3457
3429 if (ISSET_PIXCOLOR (Color_tint)) 3458 if (ISSET_PIXCOLOR (Color_tint))
3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3459 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3431 else 3460
3432 changed = bgPixmap.unset_tint ();
3433 if (changed) 3461 if (changed)
3434 update_background (); 3462 update_background ();
3435 } 3463 }
3436 3464
3437 break; 3465 break;
… …
3440#if BG_IMAGE_FROM_FILE 3468#if BG_IMAGE_FROM_FILE
3441 case Rxvt_Pixmap: 3469 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?")) 3470 if (!strcmp (str, "?"))
3443 { 3471 {
3444 char str[256]; 3472 char str[256];
3473 int h_scale = 0, v_scale = 0;
3474 int h_align = 0, v_align = 0;
3475 if (image_vec.size () > 0)
3476 {
3477 h_scale = image_vec[0].h_scale;
3478 v_scale = image_vec[0].v_scale;
3479 h_align = image_vec[0].h_align;
3480 v_align = image_vec[0].v_align;
3481 }
3445 3482
3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3483 sprintf (str, "[%dx%d+%d+%d]",
3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3484 h_scale, v_scale,
3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3485 h_align, v_align);
3449 process_xterm_seq (XTerm_title, str, CHAR_ST); 3486 process_xterm_seq (XTerm_title, str, CHAR_ST);
3450 } 3487 }
3451 else 3488 else
3452 { 3489 {
3453 int changed = 0; 3490 bool changed = false;
3454 3491
3455 if (*str != ';') 3492 if (*str != ';')
3456 { 3493 {
3457 /* reset to default scaling :*/ 3494 if (image_vec.size () > 0)
3458 bgPixmap.unset_geometry (); 3495 changed = image_vec[0].set_file_geometry (str);
3459 if (bgPixmap.set_file (str)) /* change pixmap */ 3496 else
3497 {
3498 rxvt_image *image = new_image ();
3499 if (!image->set_file_geometry (str))
3500 image_vec.pop_back ();
3501 else
3460 changed++; 3502 changed = true;
3461 str = strchr (str, ';'); 3503 }
3462 if (str == NULL)
3463 bgPixmap.set_defaultGeometry ();
3464 } 3504 }
3465 while (str) 3505 else
3466 { 3506 {
3467 str++; 3507 str++;
3468 if (bgPixmap.set_geometry (str)) 3508 if (image_vec.size () > 0)
3469 changed++; 3509 changed = image_vec[0].set_geometry (str, true);
3470 str = strchr (str, ';');
3471 } 3510 }
3511
3472 if (changed) 3512 if (changed)
3513 {
3514 if (bg_window_position_sensitive ())
3515 {
3516 int x, y;
3517 get_window_origin (x, y);
3518 bg_set_position (x, y);
3519 }
3473 update_background (); 3520 update_background ();
3521 }
3474 } 3522 }
3475 break; 3523 break;
3476#endif 3524#endif
3477
3478 case Rxvt_restoreFG:
3479 set_window_color (Color_fg, str);
3480 break;
3481 case Rxvt_restoreBG:
3482 set_window_color (Color_bg, str);
3483 break;
3484 3525
3485 case XTerm_logfile: 3526 case XTerm_logfile:
3486 // TODO, when secure mode? 3527 // TODO, when secure mode?
3487 break; 3528 break;
3488 3529
… …
3555 break; 3596 break;
3556#endif 3597#endif
3557 3598
3558#if ENABLE_PERL 3599#if ENABLE_PERL
3559 case URxvt_perl: 3600 case URxvt_perl:
3560 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3601 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3561 ; // no responses yet
3562 break; 3602 break;
3563#endif 3603#endif
3564 } 3604 }
3565} 3605}
3566/*----------------------------------------------------------------------*/ 3606/*----------------------------------------------------------------------*/
… …
3573 * 's' = save 3613 * 's' = save
3574 * 'r' = restore 3614 * 'r' = restore
3575 * 't' = toggle 3615 * 't' = toggle
3576 * so no need for fancy checking 3616 * so no need for fancy checking
3577 */ 3617 */
3578int 3618int ecb_cold
3579rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
3580{ 3620{
3581 int state; 3621 int state;
3582 3622
3583 if (mode == 's') 3623 if (mode == 's')
3584 { 3624 {
3585 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
3586 return -1; 3629 return -1;
3587 } 3630 }
3588 else 3631 else
3589 { 3632 {
3590 if (mode == 'r') 3633 if (mode == 'r')
3591 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3592 else 3635 else
3593 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3594 PrivMode (state, bit); 3637
3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
3595 } 3642 }
3596 3643
3597 return state; 3644 return state;
3598} 3645}
3599 3646
3600/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
3601void 3648void
3602rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3649rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3603{ 3650{
3604 unsigned int i, j; 3651 unsigned int i, j;
3605 int state; 3652 int state;
3606 3653
3607 static const struct 3654 static const struct
3608 { 3655 {
3609 const int argval; 3656 const int argval;
3610 const unsigned long bit; 3657 const unsigned long bit;
3611 } argtopriv[] = { 3658 } argtopriv[] = {
3612 { 1, PrivMode_aplCUR }, 3659 { 1, PrivMode_aplCUR }, // DECCKM
3613 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
3614 { 3, PrivMode_132 }, 3661 { 3, PrivMode_132 }, // DECCOLM
3615 { 4, PrivMode_smoothScroll }, 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
3616 { 5, PrivMode_rVideo }, 3663 { 5, PrivMode_rVideo }, // DECSCNM
3617 { 6, PrivMode_relOrigin }, 3664 { 6, PrivMode_relOrigin }, // DECOM
3618 { 7, PrivMode_Autowrap }, 3665 { 7, PrivMode_Autowrap }, // DECAWM
3619 // 8, bi-directional support mode 3666 // 8, auto-repeat keys // DECARM
3620 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
3621 // 18, 19 printing-related 3668 // 18 end FF to printer after print screen
3669 // 19 Print screen prints full screen/scroll region
3622 { 25, PrivMode_VisibleCursor }, 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3623#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
3624 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
3625#endif 3673#endif
3626 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3675 // 38, tektronix mode // DECTEK
3627 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
3628 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
3629 // 45 margin bell NYI 3678 // 45 margin bell NYI
3630 // 46 start logging 3679 // 46 start logging
3631 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
3632 { 66, PrivMode_aplKP }, 3681 { 66, PrivMode_aplKP }, // DECNKM
3633#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
3634 { 67, PrivMode_BackSpace }, 3683 { 67, PrivMode_BackSpace }, // DECBKM
3635#endif 3684#endif
3636 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3638 { 1002, PrivMode_MouseBtnEvent }, 3686 { 1002, PrivMode_MouseBtnEvent },
3639 { 1003, PrivMode_MouseAnyEvent }, 3687 { 1003, PrivMode_MouseAnyEvent },
3688#if ENABLE_FRILLS
3689 { 1005, PrivMode_ExtModeMouse },
3690#endif
3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3691 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641 { 1011, PrivMode_Keypress }, // rxvt extension 3692 { 1011, PrivMode_Keypress }, // rxvt extension
3693#if ENABLE_FRILLS
3694 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3695#endif
3642 // 1035 enable modifiers for alt, numlock NYI 3696 // 1035 enable modifiers for alt, numlock NYI
3643 // 1036 send ESC for meta keys NYI 3697 // 1036 send ESC for meta keys NYI
3644 // 1037 send DEL for keypad delete NYI 3698 // 1037 send DEL for keypad delete NYI
3645 { 1047, PrivMode_Screen }, 3699 { 1047, PrivMode_Screen },
3646 // 1048 save and restore cursor 3700 // 1048 save and restore cursor, implemented in code
3647 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3701 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3648 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3702 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3703 { 2004, PrivMode_BracketPaste },
3649 }; 3704 };
3650 3705
3651 if (nargs == 0) 3706 if (nargs == 0)
3652 return; 3707 return;
3653 3708
… …
3660 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
3661 { 3716 {
3662 state = -1; 3717 state = -1;
3663 3718
3664 /* basic handling */ 3719 /* basic handling */
3665 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
3666 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
3667 { 3722 {
3668 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
3669 break; 3724 break;
3670 } 3725 }
… …
3678 3733
3679 scr_touch (true); 3734 scr_touch (true);
3680 break; 3735 break;
3681#endif 3736#endif
3682 case 1048: /* alternative cursor save */ 3737 case 1048: /* alternative cursor save */
3683 case 1049:
3684 if (option (Opt_secondaryScreen)) 3738 if (option (Opt_secondaryScreen))
3685 if (mode == 0) 3739 if (mode == 0)
3686 scr_cursor (RESTORE); 3740 scr_cursor (RESTORE);
3687 else if (mode == 1) 3741 else if (mode == 1)
3688 scr_cursor (SAVE); 3742 scr_cursor (SAVE);
… …
3697 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
3698 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
3699 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
3700 * within VT52 mode 3754 * within VT52 mode
3701 */ 3755 */
3702 PrivMode (1, PrivMode_vt52); 3756 priv_modes |= PrivMode_vt52;
3703 break; 3757 break;
3704 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
3705 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
3706 set_widthheight (((state ? 132 : 80) * fwidth), height); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3707 break; 3761 break;
3708 case 4: /* smooth scrolling */ 3762 case 4: /* smooth scrolling */
3709 set_option (Opt_jumpScroll, !state); 3763 set_option (Opt_jumpScroll, !state);
3710 break; 3764 break;
3711 case 5: /* reverse video */ 3765 case 5: /* reverse video */
… …
3722 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3724 break; 3778 break;
3725#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
3726 case scrollBar_esc: 3780 case scrollBar_esc:
3727 if (scrollbar_mapping (state)) 3781 scrollBar.map (state);
3728 {
3729 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
3730 scr_touch (true); 3783 scr_touch (true);
3731 }
3732 break; 3784 break;
3733#endif 3785#endif
3734 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
3735 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
3736 break; 3788 break;
… …
3743 /* case 67: - backspace key */ 3795 /* case 67: - backspace key */
3744 case 1000: /* X11 mouse reporting */ 3796 case 1000: /* X11 mouse reporting */
3745 if (state) /* orthogonal */ 3797 if (state) /* orthogonal */
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3798 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3799 break;
3748#if 0
3749 case 1001:
3750 break; /* X11 mouse highlighting */
3751#endif
3752 case 1002: 3800 case 1002:
3753 case 1003: 3801 case 1003:
3754 if (state) { 3802 if (state)
3803 {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3804 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3805 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3806 mouse_row = mouse_col = 0;
3757 vt_emask_mouse = PointerMotionMask; 3807 vt_emask_mouse = PointerMotionMask;
3808 }
3758 } else 3809 else
3759 vt_emask_mouse = NoEventMask; 3810 vt_emask_mouse = NoEventMask;
3811
3760 vt_select_input (); 3812 vt_select_input ();
3761 break; 3813 break;
3762 case 1010: /* scroll to bottom on TTY output inhibit */ 3814 case 1010: /* scroll to bottom on TTY output inhibit */
3763 set_option (Opt_scrollTtyOutput, !state); 3815 set_option (Opt_scrollTtyOutput, !state);
3764 break; 3816 break;
3765 case 1011: /* scroll to bottom on key press */ 3817 case 1011: /* scroll to bottom on key press */
3766 set_option (Opt_scrollTtyKeypress, state); 3818 set_option (Opt_scrollTtyKeypress, state);
3767 break; 3819 break;
3768 case 1047: /* secondary screen w/ clearing last */ 3820 case 1047: /* secondary screen w/ clearing last */
3769 if (option (Opt_secondaryScreen)) 3821 if (option (Opt_secondaryScreen))
3770 if (current_screen != PRIMARY) 3822 if (!state)
3771 scr_erase_screen (2); 3823 scr_erase_screen (2);
3824
3772 scr_change_screen (state); 3825 scr_change_screen (state);
3773 break; 3826 break;
3774 case 1049: /* secondary screen w/ clearing first */ 3827 case 1049: /* secondary screen w/ clearing first */
3828 if (option (Opt_secondaryScreen))
3829 if (state)
3830 scr_cursor (SAVE);
3831
3775 scr_change_screen (state); 3832 scr_change_screen (state);
3833
3776 if (option (Opt_secondaryScreen)) 3834 if (option (Opt_secondaryScreen))
3777 if (current_screen != PRIMARY) 3835 if (state)
3778 scr_erase_screen (2); 3836 scr_erase_screen (2);
3837 else
3838 scr_cursor (RESTORE);
3779 break; 3839 break;
3780 default: 3840 default:
3781 break; 3841 break;
3782 } 3842 }
3783 } 3843 }
3784} 3844}
3785/*}}} */ 3845/*}}} */
3786 3846
3787/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
3788void 3848void ecb_hot
3789rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3790{ 3850{
3791 unsigned int i; 3851 unsigned int i;
3792 short rendset; 3852 short rendset;
3793 int rendstyle; 3853 int rendstyle;
… …
3936 } 3996 }
3937 } 3997 }
3938} 3998}
3939/*}}} */ 3999/*}}} */
3940 4000
3941/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3942void
3943rxvt_term::process_graphics ()
3944{
3945 unicode_t ch, cmd = cmd_getc ();
3946
3947 if (cmd == 'Q')
3948 { /* query graphics */
3949 tt_printf ("\033G0\012"); /* no graphics */
3950 return;
3951 }
3952 /* swallow other graphics sequences until terminating ':' */
3953 do
3954 ch = cmd_getc ();
3955 while (ch != ':');
3956}
3957/*}}} */
3958
3959/* ------------------------------------------------------------------------- */ 4001/* ------------------------------------------------------------------------- */
3960 4002
3961/* 4003/*
3962 * Send printf () formatted output to the command. 4004 * Send printf () formatted output to the command.
3963 * Only use for small amounts of data. 4005 * Only use for small amounts of data.
… …
3976 4018
3977/* ---------------------------------------------------------------------- */ 4019/* ---------------------------------------------------------------------- */
3978/* Write data to the pty as typed by the user, pasted with the mouse, 4020/* Write data to the pty as typed by the user, pasted with the mouse,
3979 * or generated by us in response to a query ESC sequence. 4021 * or generated by us in response to a query ESC sequence.
3980 */ 4022 */
3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4023static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3982 4024
3983void 4025void
3984rxvt_term::tt_write (const char *data, unsigned int len) 4026rxvt_term::tt_write (const char *data, unsigned int len)
3985{ 4027{
3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4028 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3991 4033
3992 if (v_buflen == 0) 4034 if (v_buflen == 0)
3993 { 4035 {
3994 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4036 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3995 4037
4038 max_it (written, 0);
4039
3996 if ((unsigned int)written == len) 4040 if (written == len)
3997 return; 4041 return;
3998 4042
3999 data += written; 4043 data += written;
4000 len -= written; 4044 len -= written;
4001 } 4045 }
4002 4046
4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4047 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4004 4048
4005 memcpy (v_buffer + v_buflen, data, len); 4049 memcpy (v_buffer + v_buflen, data, len);
4006 v_buflen += len; 4050 v_buflen += len;
4007 4051
4008 pty_ev.set (ev::READ | ev::WRITE); 4052 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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