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.354 by sasha, Wed Sep 12 21:06:08 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_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot 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 ();
941
942#ifdef HAVE_BG_PIXMAP
943 if (bg_flags & BG_NEEDS_REFRESH)
944 {
945 bg_flags &= ~BG_NEEDS_REFRESH;
946 scr_touch (false);
947 }
948#endif
1039 949
1040 if (want_refresh) 950 if (want_refresh)
1041 { 951 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 952 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 { 953 {
… …
1076 } 986 }
1077 while (row < end_row); 987 while (row < end_row);
1078 } 988 }
1079 989
1080 scr_refresh (); 990 scr_refresh ();
1081 scrollbar_show (1); 991 scrollBar.show (1);
1082#ifdef USE_XIM 992#if USE_XIM
1083 IMSendSpot (); 993 im_send_spot ();
1084#endif 994#endif
1085 } 995 }
1086 996
1087 display->flush (); 997 display->flush ();
1088} 998}
1089 999
1000/* checks whether a refresh is requested and starts the refresh timer */
1090void 1001void
1091rxvt_term::check_cb (check_watcher &w) 1002rxvt_term::refresh_check ()
1092{ 1003{
1093 make_current (); 1004 if (want_refresh && !flush_ev.is_active ())
1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1094 1006
1095 display->flush (); 1007 display->flush ();
1096
1097 if (want_refresh && !flush_ev.active)
1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1099} 1008}
1100 1009
1101void 1010void
1102rxvt_term::flush_cb (time_watcher &w) 1011rxvt_term::flush_cb (ev::timer &w, int revents)
1103{ 1012{
1104 make_current (); 1013 make_current ();
1105 1014
1106 refresh_count = 0; 1015 refresh_count = 0;
1107 flush (); 1016 flush ();
1108} 1017}
1109 1018
1110#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1111void 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
1112rxvt_term::cursor_blink_cb (time_watcher &w) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1113{ 1037{
1114 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1115 want_refresh = 1; 1039 want_refresh = 1;
1116 1040 refresh_check ();
1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1118} 1041}
1119#endif 1042#endif
1120 1043
1121#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
1122void 1045void
1123rxvt_term::text_blink_cb (time_watcher &w) 1046rxvt_term::text_blink_cb (ev::timer &w, int revents)
1124{ 1047{
1125 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1048 if (scr_refresh_rend (RS_Blink, RS_Blink))
1126 { 1049 {
1127 hidden_text = !hidden_text; 1050 hidden_text = !hidden_text;
1128 want_refresh = 1; 1051 want_refresh = 1;
1129 w.start (w.at + TEXT_BLINK_INTERVAL); 1052 refresh_check ();
1130 } 1053 }
1054 else
1055 w.stop ();
1131} 1056}
1132#endif 1057#endif
1133 1058
1134#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135void 1060void
1136rxvt_term::cont_scroll_cb (time_watcher &w) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1137{ 1062{
1138 if ((scrollbar_isUp() || scrollbar_isDn()) && 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1139 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1140 { 1065 {
1141 want_refresh = 1; 1066 want_refresh = 1;
1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1067 refresh_check ();
1143 } 1068 }
1069 else
1070 w.stop ();
1144} 1071}
1145#endif 1072#endif
1146 1073
1147#ifdef SELECTION_SCROLLING 1074#ifdef SELECTION_SCROLLING
1148void 1075void
1149rxvt_term::sel_scroll_cb (time_watcher &w) 1076rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1150{ 1077{
1151 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1078 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152 { 1079 {
1153 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1080 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154 want_refresh = 1; 1081 want_refresh = 1;
1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1156 } 1083 }
1084 else
1085 w.stop ();
1157} 1086}
1158#endif 1087#endif
1159 1088
1160#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161void 1090void
1162rxvt_term::slip_wheel_cb (time_watcher &w) 1091rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1163{ 1092{
1164 if (mouse_slip_wheel_speed == 0 1093 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166 : scr_page (UP, mouse_slip_wheel_speed))
1167 { 1094 {
1168 if (view_start == top_row || view_start == 0)
1169 mouse_slip_wheel_speed = 0;
1170
1171 want_refresh = 1; 1095 want_refresh = 1;
1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1097 }
1098
1099 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1100 {
1101 mouse_slip_wheel_speed = 0;
1102 w.stop ();
1173 } 1103 }
1174} 1104}
1175#endif 1105#endif
1176 1106
1177#if LINUX_YIELD_HACK 1107#if LINUX_YIELD_HACK
1178static struct event_handler 1108static struct event_handler
1179{ 1109{
1180 check_watcher yield_ev; 1110 ev::prepare yield_ev;
1181 1111
1182 void yield_cb (check_watcher &w) 1112 void yield_cb (ev::prepare &w, int revents)
1183 { 1113 {
1184 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than 1115 // that giving a process calling sched_yield () less cpu time than
1186 // 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
1187 // 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.
1188 1121
1189 struct timespec ts = { 0, 0 }; 1122 struct timespec ts = { 0, 1000 };
1190 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1191 1124
1192 w.stop (); 1125 w.stop ();
1193 } 1126 }
1194 1127
… …
1197 { 1130 {
1198 } 1131 }
1199} event_handler; 1132} event_handler;
1200#endif 1133#endif
1201 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
1202bool 1168bool
1203rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1204{ 1170{
1205 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1206 1172
1207 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1208 { 1174
1209 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1210 n = 0;
1211 } 1176 {
1212 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
1214 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1215 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1216 1182
1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1218 1184
1219 if (r > 0) 1185 if (r > 0)
1220 { 1186 {
1221 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1222 return true; 1188 return true;
… …
1238 1204
1239 return false; 1205 return false;
1240} 1206}
1241 1207
1242void 1208void
1243rxvt_term::pty_cb (io_watcher &w, short revents) 1209rxvt_term::pty_cb (ev::io &w, int revents)
1244{ 1210{
1245 make_current (); 1211 make_current ();
1246 1212
1247 if (revents & EVENT_READ) 1213 if (revents & ev::READ)
1248 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1249 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1250 if (cmd_parse ()) 1216 cmd_parse ();
1251 break;
1252 1217
1253 if (revents & EVENT_WRITE) 1218 if (revents & ev::WRITE)
1254 pty_write (); 1219 pty_write ();
1255}
1256 1220
1257void 1221 refresh_check ();
1222}
1223
1224void ecb_cold
1258rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1259{ 1226{
1260 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1261 recolour_cursor (); 1228 recolour_cursor ();
1262 1229
1263#ifdef POINTER_BLANK 1230#ifdef POINTER_BLANK
1264 hidden_pointer = 0; 1231 hidden_pointer = 0;
1265 1232
1266 if (option (Opt_pointerBlank)) 1233 if (option (Opt_pointerBlank))
1267 pointer_ev.start (NOW + pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1268#endif 1235#endif
1269} 1236}
1270 1237
1271#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1272void 1239void ecb_cold
1273rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1274{ 1241{
1275 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1276 return; 1243 return;
1277 1244
… …
1279 XFlush (dpy); 1246 XFlush (dpy);
1280 1247
1281 hidden_pointer = 1; 1248 hidden_pointer = 1;
1282} 1249}
1283 1250
1284void 1251void ecb_cold
1285rxvt_term::pointer_cb (time_watcher &w) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1286{ 1253{
1287 make_current (); 1254 make_current ();
1288 1255
1289 pointer_blank (); 1256 pointer_blank ();
1290} 1257}
… …
1293void 1260void
1294rxvt_term::mouse_report (XButtonEvent &ev) 1261rxvt_term::mouse_report (XButtonEvent &ev)
1295{ 1262{
1296 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1297 int x, y; 1264 int x, y;
1265 int code = 32;
1298 1266
1299 x = ev.x; 1267 x = Pixel2Col (ev.x) + 1;
1300 y = ev.y; 1268 y = Pixel2Row (ev.y) + 1;
1301 pixel_position (&x, &y); 1269
1270 if (ev.type == MotionNotify)
1271 {
1272 if (x == mouse_row && y == mouse_col)
1273 return;
1274
1275 mouse_row = x;
1276 mouse_col = y;
1277 code += 32;
1278 }
1302 1279
1303 if (MEvent.button == AnyButton) 1280 if (MEvent.button == AnyButton)
1304 button_number = 3; 1281 button_number = 3;
1305 else 1282 else
1306 { 1283 {
1307 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1308 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1309 if (button_number >= 3) 1286 if (button_number >= 3)
1310 button_number += (64 - 3); 1287 button_number += 64 - 3;
1311 } 1288 }
1312 1289
1313 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1314 { 1291 {
1315 /* 1292 /*
… …
1347 fputc ('A', stderr); 1324 fputc ('A', stderr);
1348 if (key_state & 32) 1325 if (key_state & 32)
1349 fputc ('2', stderr); 1326 fputc ('2', stderr);
1350 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1351 button_number, 1328 button_number,
1352 x + 1, 1329 x,
1353 y + 1); 1330 y);
1354#endif 1331#endif
1355 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
1356 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1357 (32 + button_number + key_state), 1347 code + button_number + key_state,
1358 (32 + x + 1), 1348 32 + x,
1359 (32 + y + 1)); 1349 32 + y);
1360} 1350}
1361 1351
1362/*{{{ process an X event */ 1352/*{{{ process an X event */
1363void 1353void ecb_hot
1364rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1365{ 1355{
1366 make_current (); 1356 make_current ();
1367 1357
1368 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1466 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1457 focus_out ();
1468 break; 1458 break;
1469 1459
1470 case ConfigureNotify: 1460 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1474 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1475 { 1462 {
1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477 ; 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 }
1478 1498
1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1480 { 1500 {
1481 seen_resize = 1; 1501 seen_resize = 1;
1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1483 } 1503 }
1484 else 1504 else
1485 { 1505 {
1486#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ()) 1507 if (moved)
1488 update_background (); 1508 update_background ();
1489#endif 1509#endif
1490 } 1510 }
1511
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 } 1513 }
1493 break; 1514 break;
1494 1515
1495 case PropertyNotify: 1516 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1517 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1498 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500
1501 break; 1518 break;
1502 1519
1503 case SelectionClear: 1520 case SelectionClear:
1504 selection_clear (); 1521 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1505 break;
1506
1507 case SelectionNotify:
1508 if (selection_wait == Sel_normal)
1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1510 break; 1522 break;
1511 1523
1512 case SelectionRequest: 1524 case SelectionRequest:
1513 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1514 break; 1526 break;
1515 1527
1516 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
1517 mapped = 1; 1545 mapped = 1;
1518#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1547 text_blink_ev.start ();
1520#endif 1548#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1549 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1550 break;
1523 1551
1524 case UnmapNotify: 1552 case UnmapNotify:
… …
1532 case GraphicsExpose: 1560 case GraphicsExpose:
1533 case Expose: 1561 case Expose:
1534 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1535 { 1563 {
1536 do 1564 do
1565 {
1537 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1538 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1568 }
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540 1570
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542 1572
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1574 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1577 }
1546 1578
1547 want_refresh = 1; 1579 want_refresh = 1;
1548 } 1580 }
1549 else 1581 else
1550 { 1582 {
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1585 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1554 ; 1586 ;
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1556 ; 1588 ;
1557 1589
1558 if (isScrollbarWindow (ev.xany.window)) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1559 { 1591 {
1560 scrollBar.setIdle (); 1592 scrollBar.state = SB_STATE_IDLE;
1561 scrollbar_show (0); 1593 scrollBar.show (0);
1562 } 1594 }
1563 } 1595 }
1564 break; 1596 break;
1565 1597
1566 case MotionNotify: 1598 case MotionNotify:
1567#ifdef POINTER_BLANK 1599#ifdef POINTER_BLANK
1568 if (hidden_pointer) 1600 if (hidden_pointer)
1569 pointer_unblank (); 1601 pointer_unblank ();
1570#endif 1602#endif
1603 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1604 || priv_modes & PrivMode_MouseAnyEvent)
1605 mouse_report (ev.xbutton);
1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572 break; 1607 break;
1573 1608
1574 if (ev.xany.window == vt) 1609 if (ev.xany.window == vt)
1575 { 1610 {
… …
1609 int dist; 1644 int dist;
1610 1645
1611 /* don't clobber the current delay if we are 1646 /* don't clobber the current delay if we are
1612 * already in the middle of scrolling. 1647 * already in the middle of scrolling.
1613 */ 1648 */
1614 if (!sel_scroll_ev.active) 1649 if (!sel_scroll_ev.is_active ())
1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1650 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616 1651
1617 /* save the event params so we can highlight 1652 /* save the event params so we can highlight
1618 * the selection in the pending-scroll loop 1653 * the selection in the pending-scroll loop
1619 */ 1654 */
1620 selection_save_x = ev.xbutton.x; 1655 selection_save_x = ev.xbutton.x;
… …
1628 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1629 } 1664 }
1630 else 1665 else
1631 { 1666 {
1632 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1633 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1634 } 1669 }
1635 1670
1636 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1637 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1638 + 1; 1673 + 1;
… …
1642 else 1677 else
1643 { 1678 {
1644 /* we are within the text window, so we 1679 /* we are within the text window, so we
1645 * shouldn't be scrolling 1680 * shouldn't be scrolling
1646 */ 1681 */
1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1649 } 1683 }
1650#endif 1684#endif
1651#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1652 } 1686 }
1653#endif 1687#endif
1654 } 1688 }
1655 } 1689 }
1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1691 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1660 ; 1694 ;
1661 1695
1662 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1663 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1700 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1702 scrollBar.size ());
1669 want_refresh = 1; 1703 want_refresh = 1;
1670 scrollbar_show (1); 1704 scrollBar.show (1);
1671 } 1705 }
1672 break; 1706 break;
1673 } 1707 }
1674 1708
1675#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1677 { 1711 cursor_blink_reset ();
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685 }
1686#endif 1712#endif
1687 1713
1688#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 { 1716 {
… …
1696 1722
1697 if (ev.type == KeyPress && hidden_pointer == 0) 1723 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank (); 1724 pointer_blank ();
1699 } 1725 }
1700#endif 1726#endif
1701}
1702 1727
1703void 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
1704rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1705{ 1750{
1706 if (!focus) 1751 if (!focus)
1707 { 1752 {
1708 focus = 1; 1753 focus = 1;
1709 want_refresh = 1; 1754 want_refresh = 1;
1710 1755
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1713#if USE_XIM 1756#if USE_XIM
1714 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1715 { 1758 {
1716 IMSetPosition (); 1759 im_set_position ();
1717 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1718 } 1761 }
1719#endif 1762#endif
1720#if CURSOR_BLINK 1763#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1765 cursor_blink_ev.again ();
1723#endif 1766#endif
1724#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1726 { 1769 {
1727 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1728 scr_recolour (); 1771 scr_recolour ();
1729 } 1772 }
1730#endif 1773#endif
1731#if ENABLE_FRILLS 1774#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell)) 1775 if (option (Opt_urgentOnBell))
1733 { 1776 set_urgency (0);
1734 XWMHints *h;
1735
1736 h = XGetWMHints(dpy, parent[0]);
1737 if (h != NULL)
1738 {
1739 h->flags &= ~XUrgencyHint;
1740 XSetWMHints(dpy, parent[0], h);
1741 }
1742 }
1743#endif 1777#endif
1744 }
1745}
1746 1778
1747void 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1780 }
1781}
1782
1783void ecb_cold
1748rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1749{ 1785{
1750 if (focus) 1786 if (focus)
1751 { 1787 {
1752 focus = 0; 1788 focus = 0;
1753 want_refresh = 1; 1789 want_refresh = 1;
1754 1790
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1791#if ENABLE_FRILLS
1756 1792 if (option (Opt_urgentOnBell))
1793 set_urgency (0);
1794#endif
1757#if ENABLE_FRILLS || ISO_14755 1795#if ENABLE_FRILLS || ISO_14755
1758 if (iso14755buf) 1796 if (iso14755buf)
1759 { 1797 {
1760 iso14755buf = 0; 1798 iso14755buf = 0;
1761# if ISO_14755 1799# if ISO_14755
… …
1768 XUnsetICFocus (Input_Context); 1806 XUnsetICFocus (Input_Context);
1769#endif 1807#endif
1770#if CURSOR_BLINK 1808#if CURSOR_BLINK
1771 if (option (Opt_cursorBlink)) 1809 if (option (Opt_cursorBlink))
1772 cursor_blink_ev.stop (); 1810 cursor_blink_ev.stop ();
1811
1773 hidden_cursor = 0; 1812 hidden_cursor = 0;
1774#endif 1813#endif
1775#if OFF_FOCUS_FADING 1814#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade]) 1815 if (rs[Rs_fade])
1777 { 1816 {
1778 pix_colors = pix_colors_unfocused; 1817 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1818 scr_recolour ();
1780 } 1819 }
1781#endif 1820#endif
1782 }
1783}
1784 1821
1785void 1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1823 }
1824}
1825
1826void ecb_cold
1786rxvt_term::update_fade_color (unsigned int idx) 1827rxvt_term::update_fade_color (unsigned int idx)
1787{ 1828{
1788#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1790 { 1831 {
… …
1794 } 1835 }
1795#endif 1836#endif
1796} 1837}
1797 1838
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1799void 1840void ecb_hot
1800rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1801{ 1842{
1802 make_current (); 1843 make_current ();
1803 1844
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1846 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return; 1847 return;
1807 1848
1808# if ENABLE_TRANSPARENCY
1809 switch (ev.type) 1849 switch (ev.type)
1810 { 1850 {
1811 case PropertyNotify: 1851 case PropertyNotify:
1812 /* 1852 /*
1813 * 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,
1814 * 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.
1815 */ 1855 */
1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1856 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1857 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 { 1858 {
1859# if ENABLE_TRANSPARENCY
1819 bgPixmap.set_root_pixmap (); 1860 bg_set_root_pixmap ();
1820 update_background (); 1861 update_background ();
1862#endif
1863#if ENABLE_PERL
1864 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1865#endif
1821 } 1866 }
1867
1822 break; 1868 break;
1823 } 1869 }
1824# endif 1870
1871 refresh_check ();
1825} 1872}
1826#endif 1873#endif
1827 1874
1828void 1875void
1829rxvt_term::button_press (XButtonEvent &ev) 1876rxvt_term::button_press (XButtonEvent &ev)
… …
1860 /* save the xbutton state (for ButtonRelease) */ 1907 /* save the xbutton state (for ButtonRelease) */
1861 MEvent.state = ev.state; 1908 MEvent.state = ev.state;
1862#ifdef MOUSE_REPORT_DOUBLECLICK 1909#ifdef MOUSE_REPORT_DOUBLECLICK
1863 if (ev.button == MEvent.button && clickintime) 1910 if (ev.button == MEvent.button && clickintime)
1864 { 1911 {
1865 /* same button, within alloted time */ 1912 /* same button, within allowed time */
1866 MEvent.clicks++; 1913 MEvent.clicks++;
1867 1914
1868 if (MEvent.clicks > 1) 1915 if (MEvent.clicks > 1)
1869 { 1916 {
1870 /* only report double clicks */ 1917 /* only report double clicks */
… …
1884 mouse_report (ev); 1931 mouse_report (ev);
1885 } 1932 }
1886#else 1933#else
1887 MEvent.button = ev.button; 1934 MEvent.button = ev.button;
1888 mouse_report (ev); 1935 mouse_report (ev);
1889#endif /* MOUSE_REPORT_DOUBLECLICK */ 1936#endif /* MOUSE_REPORT_DOUBLECLICK */
1890 1937
1891 } 1938 }
1892 else 1939 else
1893 { 1940 {
1894 if (ev.button != MEvent.button) 1941 if (ev.button != MEvent.button)
… …
1942 } 1989 }
1943 1990
1944 /* 1991 /*
1945 * Scrollbar window processing of button press 1992 * Scrollbar window processing of button press
1946 */ 1993 */
1947 if (isScrollbarWindow (ev.window)) 1994 if (scrollBar.state && ev.window == scrollBar.win)
1948 { 1995 {
1949 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;
1950 /* 2004 /*
1951 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1952 * move up if mouse is above slider 2006 * move up if mouse is above slider
1953 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1954 * 2008 *
… …
1963 /* 2017 /*
1964 * Mouse report disabled scrollbar: 2018 * Mouse report disabled scrollbar:
1965 * arrow buttons - send up/down 2019 * arrow buttons - send up/down
1966 * click on scrollbar - send pageup/down 2020 * click on scrollbar - send pageup/down
1967 */ 2021 */
1968 if ((scrollBar.style == R_SB_NEXT 2022 if (direction == UP)
1969 && scrollbarnext_upButton (ev.y))
1970 || (scrollBar.style == R_SB_RXVT
1971 && scrollbarrxvt_upButton (ev.y)))
1972 tt_printf ("\033[A"); 2023 tt_printf ("\033[A");
1973 else if ((scrollBar.style == R_SB_NEXT 2024 else if (direction == DN)
1974 && scrollbarnext_dnButton (ev.y))
1975 || (scrollBar.style == R_SB_RXVT
1976 && scrollbarrxvt_dnButton (ev.y)))
1977 tt_printf ("\033[B"); 2025 tt_printf ("\033[B");
1978 else 2026 else
1979 switch (ev.button) 2027 switch (ev.button)
1980 { 2028 {
1981 case Button2: 2029 case Button2:
… …
1988 tt_printf ("\033[5~"); 2036 tt_printf ("\033[5~");
1989 break; 2037 break;
1990 } 2038 }
1991 } 2039 }
1992 else 2040 else
1993#endif /* NO_SCROLLBAR_REPORT */ 2041#endif /* NO_SCROLLBAR_REPORT */
1994
1995 {
1996 char upordown = 0;
1997
1998 if (scrollBar.style == R_SB_NEXT)
1999 { 2042 {
2000 if (scrollbarnext_upButton (ev.y)) 2043 if (direction != NO_DIR)
2001 upordown = -1; /* up */
2002 else if (scrollbarnext_dnButton (ev.y))
2003 upordown = 1; /* down */
2004 }
2005 else if (scrollBar.style == R_SB_RXVT)
2006 {
2007 if (scrollbarrxvt_upButton (ev.y))
2008 upordown = -1; /* up */
2009 else if (scrollbarrxvt_dnButton (ev.y))
2010 upordown = 1; /* down */
2011 }
2012 if (upordown)
2013 { 2044 {
2014#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2046 if (!cont_scroll_ev.is_active ())
2015 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2016#endif 2048#endif
2017 if (scr_page (upordown < 0 ? UP : DN, 1)) 2049 if (scr_page (direction, 1))
2018 { 2050 {
2019 if (upordown < 0) 2051 if (direction == UP)
2020 scrollBar.setUp (); 2052 scrollBar.state = SB_STATE_UP;
2021 else 2053 else
2022 scrollBar.setDn (); 2054 scrollBar.state = SB_STATE_DOWN;
2023 } 2055 }
2024 } 2056 }
2025 else 2057 else
2026 switch (ev.button) 2058 switch (ev.button)
2027 { 2059 {
2028 case Button2: 2060 case Button2:
2029 switch (scrollbar_align) 2061 switch (scrollBar.align)
2030 { 2062 {
2031 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2032 csrO = 0; 2064 csrO = 0;
2033 break; 2065 break;
2034 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2035 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2036 break; 2068 break;
2037 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2038 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2039 break; 2071 break;
2040 } 2072 }
2041 2073
2042 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2043 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2044 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2045 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2046 2078
2047 scrollBar.setMotion (); 2079 scrollBar.state = SB_STATE_MOTION;
2048 break; 2080 break;
2049 2081
2050 case Button1: 2082 case Button1:
2051 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2052 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2053 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2054 2086
2055 case Button3: 2087 case Button3:
2056 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2057 { 2089 {
2058 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2059# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2060 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2061# else 2093# else
2062 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2063# endif 2095# endif
2064 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2065# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2066 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2067# else 2099# else
2068 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2069# endif 2101# endif
2070 else 2102 else
2071 scrollBar.setMotion (); 2103 scrollBar.state = SB_STATE_MOTION;
2072 } 2104 }
2073 else 2105 else
2074 { 2106 {
2075 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2076 (nrow 2108 (nrow
2077 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2078 / scrollbar_size ())); 2110 / scrollBar.size ()));
2079 } 2111 }
2080 2112
2081 break; 2113 break;
2082 } 2114 }
2083 } 2115 }
… …
2093 2125
2094 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2095 if (!bypass_keystate) 2127 if (!bypass_keystate)
2096 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2097 2129
2098 if (scrollbar_isUpDn ()) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2099 { 2131 {
2100 scrollBar.setIdle (); 2132 scrollBar.state = SB_STATE_IDLE;
2101 scrollbar_show (0); 2133 scrollBar.show (0);
2102 } 2134 }
2103 2135
2104#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2105 if (sel_scroll_ev.active)
2106 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2107#endif 2138#endif
2108 2139
2109 if (ev.window == vt) 2140 if (ev.window == vt)
2110 { 2141 {
2111 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)))
… …
2135 mouse_report (ev); 2166 mouse_report (ev);
2136 } 2167 }
2137#else /* MOUSE_REPORT_DOUBLECLICK */ 2168#else /* MOUSE_REPORT_DOUBLECLICK */
2138 MEvent.button = AnyButton; 2169 MEvent.button = AnyButton;
2139 mouse_report (ev); 2170 mouse_report (ev);
2140#endif /* MOUSE_REPORT_DOUBLECLICK */ 2171#endif /* MOUSE_REPORT_DOUBLECLICK */
2141 return; 2172 return;
2142 } 2173 }
2143 2174
2144 /* 2175 /*
2145 * dumb hack to compensate for the failure of click-and-drag 2176 * dumb hack to compensate for the failure of click-and-drag
… …
2156 case Button3: 2187 case Button3:
2157 selection_make (ev.time); 2188 selection_make (ev.time);
2158 break; 2189 break;
2159 2190
2160 case Button2: 2191 case Button2:
2161 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?
2162 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2163 break; 2194 break;
2164 2195
2165#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2166 case Button4: 2197 case Button4:
2167 case Button5: 2198 case Button5:
… …
2183 { 2214 {
2184 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += v ? -1 : 1;
2185 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2186 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2187 2218
2188 if (slip_wheel_ev.at < NOW) 2219 if (!slip_wheel_ev.is_active ())
2189 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2190
2191 slip_wheel_ev.start ();
2192 } 2221 }
2193 else 2222 else
2223# endif
2194 { 2224 {
2195# endif
2196 scr_page (v, i); 2225 scr_page (v, i);
2197 scrollbar_show (1); 2226 scrollBar.show (1);
2198# ifdef MOUSE_SLIP_WHEELING
2199 } 2227 }
2200# endif
2201 } 2228 }
2202 break; 2229 break;
2203#endif 2230#endif
2204 } 2231 }
2205 } 2232 }
2206} 2233}
2207 2234
2208/*}}} */ 2235/*}}} */
2209 2236
2210bool 2237void ecb_hot
2211rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2212{ 2239{
2213 bool flag = false;
2214 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2216 2242
2217 for (;;) 2243 for (;;)
2218 { 2244 {
2219 if (ch == NOCHAR) 2245 if (ecb_unlikely (ch == NOCHAR))
2220 { 2246 {
2221 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2222 ch = next_char (); 2248 ch = next_char ();
2223 2249
2224 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2225 break; 2251 break;
2226 } 2252 }
2227 2253
2228 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))
2229 { 2255 {
2230 if (!seen_input) 2256 if (ecb_unlikely (!seen_input))
2231 { 2257 {
2232 seen_input = 1; 2258 seen_input = 1;
2233 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2234 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2235 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2248 wchar_t *str = buf; 2274 wchar_t *str = buf;
2249 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2250 2276
2251 for (;;) 2277 for (;;)
2252 { 2278 {
2253 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)))
2254 break; 2280 break;
2255 2281
2256 *str++ = ch; 2282 *str++ = ch;
2257 2283
2258 if (ch == C0_LF || str >= eol) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2259 { 2285 {
2260 if (ch == C0_LF) 2286 if (ch == C0_LF)
2261 nlines++; 2287 nlines++;
2262 2288
2263 refresh_count++; 2289 refresh_count++;
2264 2290
2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2266 { 2292 {
2267 refresh_count = 0; 2293 refresh_count = 0;
2268 2294
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2295 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 { 2296 {
2271 refreshnow = true; 2297 refreshnow = true;
2272 ch = NOCHAR; 2298 ch = NOCHAR;
2273 break; 2299 break;
2274 } 2300 }
… …
2312 * 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.
2313 * if skipScroll is enabled. 2339 * if skipScroll is enabled.
2314 */ 2340 */
2315 if (refreshnow) 2341 if (refreshnow)
2316 { 2342 {
2317 flag = true;
2318 scr_refresh (); 2343 scr_refresh ();
2319 want_refresh = 1; 2344 want_refresh = 1;
2320 } 2345 }
2321
2322 } 2346 }
2323 else 2347 else
2324 { 2348 {
2325 try 2349 try
2326 { 2350 {
… …
2334 } 2358 }
2335 2359
2336 ch = NOCHAR; 2360 ch = NOCHAR;
2337 } 2361 }
2338 } 2362 }
2339
2340 return flag;
2341} 2363}
2342 2364
2343// read the next character 2365// read the next character
2344wchar_t 2366wchar_t ecb_hot
2345rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2346{ 2368{
2347 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2348 { 2370 {
2349 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2351 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2352 2374
2353 wchar_t wc; 2375 wchar_t wc;
2354 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);
2355 2377
… …
2359 cmdbuf_ptr = cmdbuf_endp; 2381 cmdbuf_ptr = cmdbuf_endp;
2360 break; 2382 break;
2361 } 2383 }
2362 2384
2363 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2386 {
2387 mbstate.reset (); // reset now undefined conversion state
2364 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 }
2365 2390
2366 // assume wchar == unicode 2391 // assume wchar == unicode
2367 cmdbuf_ptr += len; 2392 cmdbuf_ptr += len;
2368 return wc & UNICODE_MASK; 2393 return wc & UNICODE_MASK;
2369 } 2394 }
2370 2395
2371 return NOCHAR; 2396 return NOCHAR;
2372} 2397}
2373 2398
2374// read the next octet 2399// read the next octet
2375uint32_t 2400uint32_t ecb_hot
2376rxvt_term::next_octet () NOTHROW 2401rxvt_term::next_octet () NOTHROW
2377{ 2402{
2378 return cmdbuf_ptr < cmdbuf_endp 2403 return cmdbuf_ptr < cmdbuf_endp
2379 ? (unsigned char)*cmdbuf_ptr++ 2404 ? (unsigned char)*cmdbuf_ptr++
2380 : NOCHAR; 2405 : NOCHAR;
2381} 2406}
2382 2407
2383static class out_of_input out_of_input; 2408static class out_of_input out_of_input;
2384 2409
2385/* rxvt_cmd_getc () - Return next input character */ 2410wchar_t ecb_hot
2386/*
2387 * Return the next input character after first passing any keyboard input
2388 * to the command.
2389 */
2390wchar_t
2391rxvt_term::cmd_getc () THROW ((class out_of_input)) 2411rxvt_term::cmd_getc () THROW ((class out_of_input))
2392{ 2412{
2393 wchar_t c = next_char (); 2413 wchar_t c = next_char ();
2394 2414
2395 if (c == NOCHAR) 2415 if (c == NOCHAR)
2396 throw out_of_input; 2416 throw out_of_input;
2397 2417
2398 return c; 2418 return c;
2399} 2419}
2400 2420
2401uint32_t 2421uint32_t ecb_hot
2402rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2422rxvt_term::cmd_get8 () THROW ((class out_of_input))
2403{ 2423{
2404 uint32_t c = next_octet (); 2424 uint32_t c = next_octet ();
2405 2425
2406 if (c == NOCHAR) 2426 if (c == NOCHAR)
… …
2410} 2430}
2411 2431
2412/*{{{ print pipe */ 2432/*{{{ print pipe */
2413/*----------------------------------------------------------------------*/ 2433/*----------------------------------------------------------------------*/
2414#ifdef PRINTPIPE 2434#ifdef PRINTPIPE
2415FILE * 2435FILE * ecb_cold
2416rxvt_term::popen_printer () 2436rxvt_term::popen_printer ()
2417{ 2437{
2418 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2438 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2419 2439
2420 if (stream == NULL) 2440 if (stream == NULL)
2421 rxvt_warn ("can't open printer pipe, not printing.\n"); 2441 rxvt_warn ("can't open printer pipe, not printing.\n");
2422 2442
2423 return stream; 2443 return stream;
2424} 2444}
2425 2445
2426int 2446int ecb_cold
2427rxvt_term::pclose_printer (FILE *stream) 2447rxvt_term::pclose_printer (FILE *stream)
2428{ 2448{
2429 fflush (stream); 2449 fflush (stream);
2430 return pclose (stream); 2450 return pclose (stream);
2431} 2451}
2432 2452
2433/* 2453/*
2434 * simulate attached vt100 printer 2454 * simulate attached vt100 printer
2435 */ 2455 */
2436void 2456void ecb_cold
2437rxvt_term::process_print_pipe () 2457rxvt_term::process_print_pipe ()
2438{ 2458{
2439 int done; 2459 FILE *fd = popen_printer ();
2440 FILE *fd;
2441 2460
2442 if ((fd = popen_printer ()) == NULL) 2461 if (!fd)
2443 return; 2462 return;
2444 2463
2445 /* 2464 /*
2446 * 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
2447 * is received. 2466 * is received.
2448 */ 2467 */
2449 for (done = 0; !done;) 2468 for (int done = 0; !done; )
2450 { 2469 {
2451 unsigned char buf[8]; 2470 unsigned char buf[8];
2452 unicode_t ch; 2471 unicode_t ch;
2453 unsigned int i, len; 2472 unsigned int i, len;
2454 2473
… …
2485 } 2504 }
2486 } 2505 }
2487 2506
2488 pclose_printer (fd); 2507 pclose_printer (fd);
2489} 2508}
2490#endif /* PRINTPIPE */ 2509#endif /* PRINTPIPE */
2491/*}}} */ 2510/*}}} */
2492 2511
2493/* *INDENT-OFF* */
2494enum { 2512enum {
2495 C1_40 = 0x40, 2513 C1_40 = 0x40,
2496 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,
2497 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,
2498 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,
2499 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,
2500}; 2518};
2501/* *INDENT-ON* */
2502 2519
2503/*{{{ process non-printing single characters */ 2520/*{{{ process non-printing single characters */
2504void 2521void ecb_hot
2505rxvt_term::process_nonprinting (unicode_t ch) 2522rxvt_term::process_nonprinting (unicode_t ch)
2506{ 2523{
2507 switch (ch) 2524 switch (ch)
2508 { 2525 {
2509 case C0_ESC: 2526 case C0_ESC:
… …
2555} 2572}
2556/*}}} */ 2573/*}}} */
2557 2574
2558 2575
2559/*{{{ process VT52 escape sequences */ 2576/*{{{ process VT52 escape sequences */
2560void 2577void ecb_cold
2561rxvt_term::process_escape_vt52 (unicode_t ch) 2578rxvt_term::process_escape_vt52 (unicode_t ch)
2562{ 2579{
2563 int row, col; 2580 int row, col;
2564 2581
2565 switch (ch) 2582 switch (ch)
… …
2599 break; 2616 break;
2600 case 'Z': /* identify the terminal type */ 2617 case 'Z': /* identify the terminal type */
2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2602 break; 2619 break;
2603 case '<': /* turn off VT52 mode */ 2620 case '<': /* turn off VT52 mode */
2604 PrivMode (0, PrivMode_vt52); 2621 priv_modes &= ~PrivMode_vt52;
2605 break; 2622 break;
2606 case 'F': /* use special graphics character set */ 2623 case 'F': /* use special graphics character set */
2607 case 'G': /* use regular character set */ 2624 case 'G': /* use regular character set */
2608 /* unimplemented */ 2625 /* unimplemented */
2609 break; 2626 break;
… …
2615} 2632}
2616/*}}} */ 2633/*}}} */
2617 2634
2618 2635
2619/*{{{ process escape sequences */ 2636/*{{{ process escape sequences */
2620void 2637void ecb_hot
2621rxvt_term::process_escape_seq () 2638rxvt_term::process_escape_seq ()
2622{ 2639{
2623 unicode_t ch = cmd_getc (); 2640 unicode_t ch = cmd_getc ();
2624 2641
2625 if (priv_modes & PrivMode_vt52) 2642 if (priv_modes & PrivMode_vt52)
… …
2628 return; 2645 return;
2629 } 2646 }
2630 2647
2631 switch (ch) 2648 switch (ch)
2632 { 2649 {
2633 /* case 1: do_tek_mode (); break; */
2634 case '#': 2650 case '#':
2635 if (cmd_getc () == '8') 2651 if (cmd_getc () == '8')
2636 scr_E (); 2652 scr_E ();
2637 break; 2653 break;
2638 case '(': 2654 case '(':
… …
2661#if !ENABLE_MINIMAL 2677#if !ENABLE_MINIMAL
2662 case '9': 2678 case '9':
2663 scr_forwardindex (); 2679 scr_forwardindex ();
2664 break; 2680 break;
2665#endif 2681#endif
2682 // DECPAM/DECPNM
2666 case '=': 2683 case '=':
2684 priv_modes |= PrivMode_aplKP;
2685 break;
2667 case '>': 2686 case '>':
2668 PrivMode ((ch == '='), PrivMode_aplKP); 2687 priv_modes &= ~PrivMode_aplKP;
2669 break; 2688 break;
2670 2689
2671 case C1_40: 2690 case C1_40:
2672 cmd_getc (); 2691 cmd_getc ();
2673 break; 2692 break;
… …
2677 2696
2678 /* 8.3.87: NEXT LINE */ 2697 /* 8.3.87: NEXT LINE */
2679 case C1_NEL: /* ESC E */ 2698 case C1_NEL: /* ESC E */
2680 { 2699 {
2681 wchar_t nlcr[] = { C0_LF, C0_CR }; 2700 wchar_t nlcr[] = { C0_LF, C0_CR };
2682 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2701 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2683 } 2702 }
2684 break; 2703 break;
2685 2704
2686 /* kidnapped escape sequence: Should be 8.3.48 */ 2705 /* kidnapped escape sequence: Should be 8.3.48 */
2687 case C1_ESA: /* ESC G */ 2706 case C1_ESA: /* ESC G */
2688 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 */
2689 break; 2710 break;
2690 2711
2691 /* 8.3.63: CHARACTER TABULATION SET */ 2712 /* 8.3.63: CHARACTER TABULATION SET */
2692 case C1_HTS: /* ESC H */ 2713 case C1_HTS: /* ESC H */
2693 scr_set_tab (1); 2714 scr_set_tab (1);
… …
2697 case C1_RI: /* ESC M */ 2718 case C1_RI: /* ESC M */
2698 scr_index (DN); 2719 scr_index (DN);
2699 break; 2720 break;
2700 2721
2701 /* 8.3.142: SINGLE-SHIFT TWO */ 2722 /* 8.3.142: SINGLE-SHIFT TWO */
2702 /*case C1_SS2: scr_single_shift (2); break; */ 2723 /* case C1_SS2: break; */
2703 2724
2704 /* 8.3.143: SINGLE-SHIFT THREE */ 2725 /* 8.3.143: SINGLE-SHIFT THREE */
2705 /*case C1_SS3: scr_single_shift (3); break; */ 2726 /* case C1_SS3: break; */
2706 2727
2707 /* 8.3.27: DEVICE CONTROL STRING */ 2728 /* 8.3.27: DEVICE CONTROL STRING */
2708 case C1_DCS: /* ESC P */ 2729 case C1_DCS: /* ESC P */
2709 process_dcs_seq (); 2730 process_dcs_seq ();
2710 break; 2731 break;
… …
2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2733 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2713 case C1_SCI: /* ESC Z */ 2734 case C1_SCI: /* ESC Z */
2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2735 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2715 break; /* steal obsolete ESC [ c */ 2736 break; /* steal obsolete ESC [ c */
2716 2737
2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2738 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2718 case C1_CSI: /* ESC [ */ 2739 case C1_CSI: /* ESC [ */
2719 process_csi_seq (); 2740 process_csi_seq ();
2720 break; 2741 break;
2721 2742
2722 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2743 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2723 case C1_OSC: /* ESC ] */ 2744 case C1_OSC: /* ESC ] */
2724 process_osc_seq (); 2745 process_osc_seq ();
2725 break; 2746 break;
2726 2747
2727 /* 8.3.106: RESET TO INITIAL STATE */ 2748 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2728 case 'c': 2749 case 'c':
2729 mbstate.reset (); 2750 mbstate.reset ();
2730 scr_poweron (); 2751 scr_poweron ();
2731 scrollbar_show (1); 2752 scrollBar.show (1);
2732 break; 2753 break;
2733 2754
2734 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2755 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2735 case 'n': 2756 case 'n':
2736 scr_charset_choose (2); 2757 scr_charset_choose (2);
… …
2743 } 2764 }
2744} 2765}
2745/*}}} */ 2766/*}}} */
2746 2767
2747/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2768/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2748/* *INDENT-OFF* */
2749enum { 2769enum {
2750 CSI_ICH = 0x40, 2770 CSI_ICH = 0x40,
2751 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,
2752 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 ,
2753 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,
… …
2756 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,
2757 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 ,
2758 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
2759}; 2779};
2760 2780
2761#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2781#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2782 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2783 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2764#define get_byte_array_bit(array, bit) \ 2784#define get_byte_array_bit(array, bit) \
2765 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2785 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2766 2786
2767const unsigned char csi_defaults[] = 2787static const unsigned char csi_defaults[] =
2768 { 2788 {
2769 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, */
2770 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, */
2771 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, */
2772 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, [, \, ], ^, _, */
2773 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, */
2774 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, */
2775 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, */
2776 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, {, |, }, ~, */
2777 }; 2797 };
2778/* *INDENT-ON* */
2779 2798
2780void 2799void ecb_hot
2781rxvt_term::process_csi_seq () 2800rxvt_term::process_csi_seq ()
2782{ 2801{
2783 unicode_t ch, priv, i; 2802 unicode_t ch, priv, i;
2784 unsigned int nargs, p; 2803 unsigned int nargs, p;
2785 int n, ndef; 2804 int n, ndef;
… …
2787 2806
2788 nargs = 0; 2807 nargs = 0;
2789 2808
2790 priv = 0; 2809 priv = 0;
2791 ch = cmd_getc (); 2810 ch = cmd_getc ();
2792 if (ch >= '<' && ch <= '?') 2811 if ((ch >= '<' && ch <= '?') || ch == '!')
2812 {
2793 { /* '<' '=' '>' '?' */ 2813 /* '<' '=' '>' '?' '!' */
2794 priv = ch; 2814 priv = ch;
2795 ch = cmd_getc (); 2815 ch = cmd_getc ();
2796 } 2816 }
2797 2817
2798 /* read any numerical arguments */ 2818 /* read any numerical arguments */
… …
2841 { 2861 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2862 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2863 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 // 2864 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2865 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2866 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2847 // that we do not support xterm mouse reporting (should be 95 when we do). 2867 // versions.
2848 // 2868 //
2849 tt_printf ("\033[>%d;94;0c", 'U'); 2869 tt_printf ("\033[>%d;95;0c", 'U');
2850 } 2870 }
2851 break; 2871 break;
2872
2852 case '?': 2873 case '?':
2853 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2874 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2854 process_terminal_mode (ch, priv, nargs, arg); 2875 process_terminal_mode (ch, priv, nargs, arg);
2855 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);
2856 } 2889 }
2890 break;
2891 }
2892
2857 return; 2893 return;
2858 } 2894 }
2859 2895
2860 switch (ch) 2896 switch (ch)
2861 { 2897 {
… …
2875 } 2911 }
2876 break; 2912 break;
2877#endif 2913#endif
2878 2914
2879 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2915 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2880 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2916 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2881 arg[0] = -arg[0]; 2917 arg[0] = -arg[0];
2882 /* FALLTHROUGH */ 2918 /* FALLTHROUGH */
2883 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2919 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2884 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2920 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2885 scr_gotorc (arg[0], 0, RELATIVE); 2921 scr_gotorc (arg[0], 0, RELATIVE);
2886 break; 2922 break;
2887 2923
2888 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2924 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2889 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2925 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3076 } 3112 }
3077} 3113}
3078/*}}} */ 3114/*}}} */
3079 3115
3080#if !ENABLE_MINIMAL 3116#if !ENABLE_MINIMAL
3081/* ARGSUSED */
3082void 3117void
3083rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3118rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3084{ 3119{
3085 int x, y; 3120 int x, y;
3086 XWindowAttributes wattr; 3121 XWindowAttributes wattr;
… …
3095 { 3130 {
3096 /* 3131 /*
3097 * commands 3132 * commands
3098 */ 3133 */
3099 case 1: /* deiconify window */ 3134 case 1: /* deiconify window */
3100 XMapWindow (dpy, parent[0]); 3135 XMapWindow (dpy, parent);
3101 break; 3136 break;
3102 case 2: /* iconify window */ 3137 case 2: /* iconify window */
3103 XIconifyWindow (dpy, parent[0], display->screen); 3138 XIconifyWindow (dpy, parent, display->screen);
3104 break; 3139 break;
3105 case 3: /* set position (pixels) */ 3140 case 3: /* set position (pixels) */
3106 XMoveWindow (dpy, parent[0], args[1], args[2]); 3141 XMoveWindow (dpy, parent, args[1], args[2]);
3107 break; 3142 break;
3108 case 4: /* set size (pixels) */ 3143 case 4: /* set size (pixels) */
3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3110 break; 3145 break;
3111 case 5: /* raise window */ 3146 case 5: /* raise window */
3112 XRaiseWindow (dpy, parent[0]); 3147 XRaiseWindow (dpy, parent);
3113 break; 3148 break;
3114 case 6: /* lower window */ 3149 case 6: /* lower window */
3115 XLowerWindow (dpy, parent[0]); 3150 XLowerWindow (dpy, parent);
3116 break; 3151 break;
3117 case 7: /* refresh window */ 3152 case 7: /* refresh window */
3118 scr_touch (true); 3153 scr_touch (true);
3119 break; 3154 break;
3120 case 8: /* set size (chars) */ 3155 case 8: /* set size (chars) */
… …
3123 break; 3158 break;
3124 3159
3125 //case 9: NYI, TODO, restore maximized window or maximize window 3160 //case 9: NYI, TODO, restore maximized window or maximize window
3126 default: 3161 default:
3127 if (args[0] >= 24) /* set height (chars) */ 3162 if (args[0] >= 24) /* set height (chars) */
3128 set_widthheight ((unsigned int)width, 3163 set_widthheight ((unsigned int)vt_width,
3129 (unsigned int) (args[1] * fheight)); 3164 (unsigned int) (args[1] * fheight));
3130 break; 3165 break;
3131 3166
3132 /* 3167 /*
3133 * reports - some output format copied from XTerm 3168 * reports - some output format copied from XTerm
3134 */ 3169 */
3135 case 11: /* report window state */ 3170 case 11: /* report window state */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3171 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3138 break; 3173 break;
3139 case 13: /* report window position */ 3174 case 13: /* report window position */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent, &wattr);
3141 XTranslateCoordinates (dpy, parent[0], wattr.root, 3176 XTranslateCoordinates (dpy, parent, wattr.root,
3142 -wattr.border_width, -wattr.border_width, 3177 -wattr.border_width, -wattr.border_width,
3143 &x, &y, &wdummy); 3178 &x, &y, &wdummy);
3144 tt_printf ("\033[3;%d;%dt", x, y); 3179 tt_printf ("\033[3;%d;%dt", x, y);
3145 break; 3180 break;
3146 case 14: /* report window size (pixels) */ 3181 case 14: /* report window size (pixels) */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3182 XGetWindowAttributes (dpy, parent, &wattr);
3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3149 break; 3184 break;
3150 case 18: /* report text area size (chars) */ 3185 case 18: /* report text area size (chars) */
3151 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3152 break; 3187 break;
… …
3154 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3189 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3155 break; 3190 break;
3156 case 20: /* report icon label */ 3191 case 20: /* report icon label */
3157 { 3192 {
3158 char *s; 3193 char *s;
3159 XGetIconName (dpy, parent[0], &s); 3194 XGetIconName (dpy, parent, &s);
3160 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 */
3161 XFree (s); 3196 XFree (s);
3162 } 3197 }
3163 break; 3198 break;
3164 case 21: /* report window title */ 3199 case 21: /* report window title */
3165 { 3200 {
3166 char *s; 3201 char *s;
3167 XFetchName (dpy, parent[0], &s); 3202 XFetchName (dpy, parent, &s);
3168 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 */
3169 XFree (s); 3204 XFree (s);
3170 } 3205 }
3171 break; 3206 break;
3172 } 3207 }
… …
3228 * 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)'
3229 */ 3264 */
3230void 3265void
3231rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3232{ 3267{
3233 char *s;
3234 unicode_t eh;
3235
3236 /* 3268 /*
3237 * Not handled yet 3269 * Not handled yet
3238 */ 3270 */
3271
3272 unicode_t eh;
3239 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3240 if (s) 3274 if (s)
3241 free (s); 3275 free (s);
3242 3276
3243 return; 3277 return;
3244} 3278}
… …
3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3249 */ 3283 */
3250void 3284void
3251rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3252{ 3286{
3253 unicode_t ch, eh;
3254 int arg; 3287 int arg;
3255 3288
3256 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3257 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3258 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3259 3292
3260 if (ch == ';') 3293 if (ch == ';')
3261 { 3294 {
3295 unicode_t eh;
3262 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3263 3297
3264 if (s) 3298 if (s)
3265 { 3299 {
3266 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
… …
3290 3324
3291/* 3325/*
3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3326 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3293 */ 3327 */
3294void 3328void
3295rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3329rxvt_term::process_xterm_seq (int op, char *str, char resp)
3296{ 3330{
3297 int color; 3331 int color;
3298 char *buf, *name; 3332 char *buf, *name;
3299 bool query = str[0] == '?' && !str[1]; 3333 bool query = str[0] == '?' && !str[1];
3300 int saveop = op; 3334 int saveop = op;
… …
3327 unsigned long bytes_after; 3361 unsigned long bytes_after;
3328 unsigned char *value = 0; 3362 unsigned char *value = 0;
3329 const char *str = ""; 3363 const char *str = "";
3330 3364
3331 if (prop 3365 if (prop
3332 && XGetWindowProperty (dpy, parent[0], 3366 && XGetWindowProperty (dpy, parent,
3333 prop, 0, 1<<16, 0, AnyPropertyType, 3367 prop, 0, 1<<16, 0, AnyPropertyType,
3334 &actual_type, &actual_format, 3368 &actual_type, &actual_format,
3335 &nitems, &bytes_after, &value) == Success 3369 &nitems, &bytes_after, &value) == Success
3336 && actual_type != None 3370 && actual_type != None
3337 && actual_format == 8) 3371 && actual_format == 8)
… …
3341 3375
3342 XFree (value); 3376 XFree (value);
3343 } 3377 }
3344 else 3378 else
3345 { 3379 {
3346 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3347 3381
3348 if (eq) 3382 if (eq)
3349 { 3383 {
3350 *eq = 0; 3384 *eq = 0;
3351 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
3352 } 3386 }
3353 else 3387 else
3354 XDeleteProperty (dpy, parent[0], 3388 XDeleteProperty (dpy, parent,
3355 display->atom (str)); 3389 display->atom (str));
3356 } 3390 }
3357 break; 3391 break;
3358 3392
3359 case XTerm_Color: 3393 case XTerm_Color:
… …
3372 *buf++ = '\0'; 3406 *buf++ = '\0';
3373 3407
3374 process_color_seq (op, color, name, resp); 3408 process_color_seq (op, color, name, resp);
3375 } 3409 }
3376 break; 3410 break;
3411 case Rxvt_restoreFG:
3377 case XTerm_Color00: 3412 case XTerm_Color00:
3378 process_color_seq (op, Color_fg, str, resp); 3413 process_color_seq (op, Color_fg, str, resp);
3379 break; 3414 break;
3415 case Rxvt_restoreBG:
3380 case XTerm_Color01: 3416 case XTerm_Color01:
3381 process_color_seq (op, Color_bg, str, resp); 3417 process_color_seq (op, Color_bg, str, resp);
3382 break; 3418 break;
3383#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
3384 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
… …
3389 process_color_seq (op, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3390 break; 3426 break;
3391 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3392 process_color_seq (op, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3393 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
3394#ifndef NO_BOLD_UNDERLINE_REVERSE 3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3395 case XTerm_Color_RV:
3396 process_color_seq (op, Color_RV, str, resp);
3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD: 3439 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp); 3440 process_color_seq (op, Color_BD, str, resp);
3401 break; 3441 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL: 3442 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp); 3443 process_color_seq (op, Color_UL, str, resp);
3405 break; 3444 break;
3406 case URxvt_Color_IT: 3445 case URxvt_Color_IT:
3407 process_color_seq (op, Color_IT, str, resp); 3446 process_color_seq (op, Color_IT, str, resp);
3408 break; 3447 break;
3409#endif 3448#endif
3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3410#if ENABLE_TRANSPARENCY 3452#if ENABLE_TRANSPARENCY
3411 case URxvt_Color_tint: 3453 case URxvt_Color_tint:
3412 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3413 { 3455 {
3414 bool changed = false; 3456 bool changed = false;
3457
3415 if (ISSET_PIXCOLOR (Color_tint)) 3458 if (ISSET_PIXCOLOR (Color_tint))
3416 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3459 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3417 else 3460
3418 changed = bgPixmap.unset_tint ();
3419 if (changed) 3461 if (changed)
3420 update_background (); 3462 update_background ();
3421 } 3463 }
3422 3464
3423 break; 3465 break;
… …
3426#if BG_IMAGE_FROM_FILE 3468#if BG_IMAGE_FROM_FILE
3427 case Rxvt_Pixmap: 3469 case Rxvt_Pixmap:
3428 if (!strcmp (str, "?")) 3470 if (!strcmp (str, "?"))
3429 { 3471 {
3430 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 }
3431 3482
3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3483 sprintf (str, "[%dx%d+%d+%d]",
3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3484 h_scale, v_scale,
3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3485 h_align, v_align);
3435 process_xterm_seq (XTerm_title, str, CHAR_ST); 3486 process_xterm_seq (XTerm_title, str, CHAR_ST);
3436 } 3487 }
3437 else 3488 else
3438 { 3489 {
3439 int changed = 0; 3490 bool changed = false;
3440 3491
3441 if (*str != ';') 3492 if (*str != ';')
3442 { 3493 {
3443 /* reset to default scaling :*/ 3494 if (image_vec.size () > 0)
3444 bgPixmap.unset_geometry (); 3495 changed = image_vec[0].set_file_geometry (str);
3445 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
3446 changed++; 3502 changed = true;
3447 str = strchr (str, ';'); 3503 }
3448 if (str == NULL)
3449 bgPixmap.set_defaultGeometry ();
3450 } 3504 }
3451 while (str) 3505 else
3452 { 3506 {
3453 str++; 3507 str++;
3454 if (bgPixmap.set_geometry (str)) 3508 if (image_vec.size () > 0)
3455 changed++; 3509 changed = image_vec[0].set_geometry (str, true);
3456 str = strchr (str, ';');
3457 } 3510 }
3511
3458 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 }
3459 update_background (); 3520 update_background ();
3521 }
3460 } 3522 }
3461 break; 3523 break;
3462#endif 3524#endif
3463
3464 case Rxvt_restoreFG:
3465 set_window_color (Color_fg, str);
3466 break;
3467 case Rxvt_restoreBG:
3468 set_window_color (Color_bg, str);
3469 break;
3470 3525
3471 case XTerm_logfile: 3526 case XTerm_logfile:
3472 // TODO, when secure mode? 3527 // TODO, when secure mode?
3473 break; 3528 break;
3474 3529
… …
3541 break; 3596 break;
3542#endif 3597#endif
3543 3598
3544#if ENABLE_PERL 3599#if ENABLE_PERL
3545 case URxvt_perl: 3600 case URxvt_perl:
3546 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));
3547 ; // no responses yet
3548 break; 3602 break;
3549#endif 3603#endif
3550 } 3604 }
3551} 3605}
3552/*----------------------------------------------------------------------*/ 3606/*----------------------------------------------------------------------*/
… …
3559 * 's' = save 3613 * 's' = save
3560 * 'r' = restore 3614 * 'r' = restore
3561 * 't' = toggle 3615 * 't' = toggle
3562 * so no need for fancy checking 3616 * so no need for fancy checking
3563 */ 3617 */
3564int 3618int ecb_cold
3565rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
3566{ 3620{
3567 int state; 3621 int state;
3568 3622
3569 if (mode == 's') 3623 if (mode == 's')
3570 { 3624 {
3571 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
3572 return -1; 3629 return -1;
3573 } 3630 }
3574 else 3631 else
3575 { 3632 {
3576 if (mode == 'r') 3633 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3635 else
3579 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3637
3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
3581 } 3642 }
3582 3643
3583 return state; 3644 return state;
3584} 3645}
3585 3646
3586/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
3587void 3648void
3588rxvt_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)
3589{ 3650{
3590 unsigned int i, j; 3651 unsigned int i, j;
3591 int state; 3652 int state;
3592 3653
3593 static const struct 3654 static const struct
3594 { 3655 {
3595 const int argval; 3656 const int argval;
3596 const unsigned long bit; 3657 const unsigned long bit;
3597 } argtopriv[] = { 3658 } argtopriv[] = {
3598 { 1, PrivMode_aplCUR }, 3659 { 1, PrivMode_aplCUR }, // DECCKM
3599 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
3600 { 3, PrivMode_132 }, 3661 { 3, PrivMode_132 }, // DECCOLM
3601 { 4, PrivMode_smoothScroll }, 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
3602 { 5, PrivMode_rVideo }, 3663 { 5, PrivMode_rVideo }, // DECSCNM
3603 { 6, PrivMode_relOrigin }, 3664 { 6, PrivMode_relOrigin }, // DECOM
3604 { 7, PrivMode_Autowrap }, 3665 { 7, PrivMode_Autowrap }, // DECAWM
3605 // 8, bi-directional support mode 3666 // 8, auto-repeat keys // DECARM
3606 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
3607 // 18, 19 printing-related 3668 // 18 end FF to printer after print screen
3669 // 19 Print screen prints full screen/scroll region
3608 { 25, PrivMode_VisibleCursor }, 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3609#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
3610 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
3611#endif 3673#endif
3612 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3675 // 38, tektronix mode // DECTEK
3613 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
3614 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
3615 // 45 margin bell NYI 3678 // 45 margin bell NYI
3616 // 46 start logging 3679 // 46 start logging
3617 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
3618 { 66, PrivMode_aplKP }, 3681 { 66, PrivMode_aplKP }, // DECNKM
3619#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
3620 { 67, PrivMode_BackSpace }, 3683 { 67, PrivMode_BackSpace }, // DECBKM
3621#endif 3684#endif
3622 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
3623 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3686 { 1002, PrivMode_MouseBtnEvent },
3624 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3687 { 1003, PrivMode_MouseAnyEvent },
3625 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3688#if ENABLE_FRILLS
3689 { 1005, PrivMode_ExtModeMouse },
3690#endif
3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3691 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627 { 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
3628 // 1035 enable modifiers for alt, numlock NYI 3696 // 1035 enable modifiers for alt, numlock NYI
3629 // 1036 send ESC for meta keys NYI 3697 // 1036 send ESC for meta keys NYI
3630 // 1037 send DEL for keypad delete NYI 3698 // 1037 send DEL for keypad delete NYI
3631 { 1047, PrivMode_Screen }, 3699 { 1047, PrivMode_Screen },
3632 // 1048 save and restore cursor 3700 // 1048 save and restore cursor, implemented in code
3633 { 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 */
3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3702 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3703 { 2004, PrivMode_BracketPaste },
3635 }; 3704 };
3636 3705
3637 if (nargs == 0) 3706 if (nargs == 0)
3638 return; 3707 return;
3639 3708
… …
3646 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
3647 { 3716 {
3648 state = -1; 3717 state = -1;
3649 3718
3650 /* basic handling */ 3719 /* basic handling */
3651 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
3652 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
3653 { 3722 {
3654 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
3655 break; 3724 break;
3656 } 3725 }
… …
3664 3733
3665 scr_touch (true); 3734 scr_touch (true);
3666 break; 3735 break;
3667#endif 3736#endif
3668 case 1048: /* alternative cursor save */ 3737 case 1048: /* alternative cursor save */
3669 case 1049:
3670 if (option (Opt_secondaryScreen)) 3738 if (option (Opt_secondaryScreen))
3671 if (mode == 0) 3739 if (mode == 0)
3672 scr_cursor (RESTORE); 3740 scr_cursor (RESTORE);
3673 else if (mode == 1) 3741 else if (mode == 1)
3674 scr_cursor (SAVE); 3742 scr_cursor (SAVE);
… …
3683 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
3684 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
3685 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
3686 * within VT52 mode 3754 * within VT52 mode
3687 */ 3755 */
3688 PrivMode (1, PrivMode_vt52); 3756 priv_modes |= PrivMode_vt52;
3689 break; 3757 break;
3690 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
3691 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
3692 set_widthheight (((state ? 132 : 80) * fwidth), height); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3693 break; 3761 break;
3694 case 4: /* smooth scrolling */ 3762 case 4: /* smooth scrolling */
3695 set_option (Opt_jumpScroll, !state); 3763 set_option (Opt_jumpScroll, !state);
3696 break; 3764 break;
3697 case 5: /* reverse video */ 3765 case 5: /* reverse video */
… …
3704 scr_autowrap (state); 3772 scr_autowrap (state);
3705 break; 3773 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 3774 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 3775 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
3709 priv_modes &= ~PrivMode_MouseX11; 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3710 break; 3778 break;
3711#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
3712 case scrollBar_esc: 3780 case scrollBar_esc:
3713 if (scrollbar_mapping (state)) 3781 scrollBar.map (state);
3714 {
3715 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
3716 scr_touch (true); 3783 scr_touch (true);
3717 }
3718 break; 3784 break;
3719#endif 3785#endif
3720 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
3721 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
3722 break; 3788 break;
… …
3727 break; 3793 break;
3728 /* case 66: - application key pad */ 3794 /* case 66: - application key pad */
3729 /* case 67: - backspace key */ 3795 /* case 67: - backspace key */
3730 case 1000: /* X11 mouse reporting */ 3796 case 1000: /* X11 mouse reporting */
3731 if (state) /* orthogonal */ 3797 if (state) /* orthogonal */
3732 priv_modes &= ~PrivMode_MouseX10; 3798 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3733 break; 3799 break;
3734#if 0
3735 case 1001: 3800 case 1002:
3736 break; /* X11 mouse highlighting */ 3801 case 1003:
3737#endif 3802 if (state)
3803 {
3804 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3805 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3806 mouse_row = mouse_col = 0;
3807 vt_emask_mouse = PointerMotionMask;
3808 }
3809 else
3810 vt_emask_mouse = NoEventMask;
3811
3812 vt_select_input ();
3813 break;
3738 case 1010: /* scroll to bottom on TTY output inhibit */ 3814 case 1010: /* scroll to bottom on TTY output inhibit */
3739 set_option (Opt_scrollTtyOutput, !state); 3815 set_option (Opt_scrollTtyOutput, !state);
3740 break; 3816 break;
3741 case 1011: /* scroll to bottom on key press */ 3817 case 1011: /* scroll to bottom on key press */
3742 set_option (Opt_scrollTtyKeypress, state); 3818 set_option (Opt_scrollTtyKeypress, state);
3743 break; 3819 break;
3744 case 1047: /* secondary screen w/ clearing last */ 3820 case 1047: /* secondary screen w/ clearing last */
3745 if (option (Opt_secondaryScreen)) 3821 if (option (Opt_secondaryScreen))
3746 if (current_screen != PRIMARY) 3822 if (!state)
3747 scr_erase_screen (2); 3823 scr_erase_screen (2);
3824
3748 scr_change_screen (state); 3825 scr_change_screen (state);
3749 break; 3826 break;
3750 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
3751 scr_change_screen (state); 3832 scr_change_screen (state);
3833
3752 if (option (Opt_secondaryScreen)) 3834 if (option (Opt_secondaryScreen))
3753 if (current_screen != PRIMARY) 3835 if (state)
3754 scr_erase_screen (2); 3836 scr_erase_screen (2);
3837 else
3838 scr_cursor (RESTORE);
3755 break; 3839 break;
3756 default: 3840 default:
3757 break; 3841 break;
3758 } 3842 }
3759 } 3843 }
3760} 3844}
3761/*}}} */ 3845/*}}} */
3762 3846
3763/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
3764void 3848void ecb_hot
3765rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3766{ 3850{
3767 unsigned int i; 3851 unsigned int i;
3768 short rendset; 3852 short rendset;
3769 int rendstyle; 3853 int rendstyle;
… …
3912 } 3996 }
3913 } 3997 }
3914} 3998}
3915/*}}} */ 3999/*}}} */
3916 4000
3917/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3918void
3919rxvt_term::process_graphics ()
3920{
3921 unicode_t ch, cmd = cmd_getc ();
3922
3923 if (cmd == 'Q')
3924 { /* query graphics */
3925 tt_printf ("\033G0\012"); /* no graphics */
3926 return;
3927 }
3928 /* swallow other graphics sequences until terminating ':' */
3929 do
3930 ch = cmd_getc ();
3931 while (ch != ':');
3932}
3933/*}}} */
3934
3935/* ------------------------------------------------------------------------- */ 4001/* ------------------------------------------------------------------------- */
3936 4002
3937/* 4003/*
3938 * Send printf () formatted output to the command. 4004 * Send printf () formatted output to the command.
3939 * Only use for small amounts of data. 4005 * Only use for small amounts of data.
… …
3952 4018
3953/* ---------------------------------------------------------------------- */ 4019/* ---------------------------------------------------------------------- */
3954/* 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,
3955 * or generated by us in response to a query ESC sequence. 4021 * or generated by us in response to a query ESC sequence.
3956 */ 4022 */
3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4023static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3958 4024
3959void 4025void
3960rxvt_term::tt_write (const char *data, unsigned int len) 4026rxvt_term::tt_write (const char *data, unsigned int len)
3961{ 4027{
3962 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)))
… …
3967 4033
3968 if (v_buflen == 0) 4034 if (v_buflen == 0)
3969 { 4035 {
3970 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));
3971 4037
4038 max_it (written, 0);
4039
3972 if ((unsigned int)written == len) 4040 if (written == len)
3973 return; 4041 return;
3974 4042
3975 data += written; 4043 data += written;
3976 len -= written; 4044 len -= written;
3977 } 4045 }
3978 4046
3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4047 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3980 4048
3981 memcpy (v_buffer + v_buflen, data, len); 4049 memcpy (v_buffer + v_buflen, data, len);
3982 v_buflen += len; 4050 v_buflen += len;
3983 4051
3984 pty_ev.set (EVENT_READ | EVENT_WRITE); 4052 pty_ev.set (ev::READ | ev::WRITE);
3985} 4053}
3986 4054
3987void rxvt_term::pty_write () 4055void rxvt_term::pty_write ()
3988{ 4056{
3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4057 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
3994 4062
3995 if (v_buflen == 0) 4063 if (v_buflen == 0)
3996 { 4064 {
3997 free (v_buffer); 4065 free (v_buffer);
3998 v_buffer = 0; 4066 v_buffer = 0;
3999 v_buflen = 0;
4000 4067
4001 pty_ev.set (EVENT_READ); 4068 pty_ev.set (ev::READ);
4002 return; 4069 return;
4003 } 4070 }
4004 4071
4005 memmove (v_buffer, v_buffer + written, v_buflen); 4072 memmove (v_buffer, v_buffer + written, v_buflen);
4006 } 4073 }
4007 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4074 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4008 pty_ev.set (EVENT_READ); 4075 pty_ev.set (ev::READ);
4009} 4076}
4010 4077
4011/*----------------------- end-of-file (C source) -----------------------*/ 4078/*----------------------- end-of-file (C source) -----------------------*/
4012 4079

Diff Legend

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