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.361 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 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 ();
1039 941
1040#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
1041 if (bgPixmap.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 944 {
1043// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_touch (false); 946 scr_touch (false);
1045 } 947 }
1046#endif 948#endif
1047 949
1048 if (want_refresh) 950 if (want_refresh)
… …
1084 } 986 }
1085 while (row < end_row); 987 while (row < end_row);
1086 } 988 }
1087 989
1088 scr_refresh (); 990 scr_refresh ();
1089 scrollbar_show (1); 991 scrollBar.show (1);
1090#ifdef USE_XIM 992#if USE_XIM
1091 IMSendSpot (); 993 im_send_spot ();
1092#endif 994#endif
1093 } 995 }
1094 996
1095 display->flush (); 997 display->flush ();
1096} 998}
1097 999
1000/* checks whether a refresh is requested and starts the refresh timer */
1098void 1001void
1099rxvt_term::check_cb (check_watcher &w) 1002rxvt_term::refresh_check ()
1100{ 1003{
1101 make_current (); 1004 if (want_refresh && !flush_ev.is_active ())
1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1006
1103 display->flush (); 1007 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1008}
1108 1009
1109void 1010void
1110rxvt_term::flush_cb (time_watcher &w) 1011rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1012{
1112 make_current (); 1013 make_current ();
1113 1014
1114 refresh_count = 0; 1015 refresh_count = 0;
1115 flush (); 1016 flush ();
1116} 1017}
1117 1018
1118#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1119void 1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1035void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1037{
1122 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1039 want_refresh = 1;
1124 1040 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1041}
1127#endif 1042#endif
1128 1043
1129#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
1130void 1045void
1131rxvt_term::text_blink_cb (time_watcher &w) 1046rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1047{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1048 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1049 {
1135 hidden_text = !hidden_text; 1050 hidden_text = !hidden_text;
1136 want_refresh = 1; 1051 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1052 refresh_check ();
1138 } 1053 }
1054 else
1055 w.stop ();
1139} 1056}
1140#endif 1057#endif
1141 1058
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1060void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1062{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1148 { 1065 {
1149 want_refresh = 1; 1066 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1067 refresh_check ();
1151 } 1068 }
1069 else
1070 w.stop ();
1152} 1071}
1153#endif 1072#endif
1154 1073
1155#ifdef SELECTION_SCROLLING 1074#ifdef SELECTION_SCROLLING
1156void 1075void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1076rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1077{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1078 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1079 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1080 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1081 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1164 } 1083 }
1084 else
1085 w.stop ();
1165} 1086}
1166#endif 1087#endif
1167 1088
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1090void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1091rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1092{
1172 if (mouse_slip_wheel_speed == 0 1093 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1094 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1095 want_refresh = 1;
1180 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 ();
1181 } 1103 }
1182} 1104}
1183#endif 1105#endif
1184 1106
1185#if LINUX_YIELD_HACK 1107#if LINUX_YIELD_HACK
1186static struct event_handler 1108static struct event_handler
1187{ 1109{
1188 check_watcher yield_ev; 1110 ev::prepare yield_ev;
1189 1111
1190 void yield_cb (check_watcher &w) 1112 void yield_cb (ev::prepare &w, int revents)
1191 { 1113 {
1192 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1115 // that giving a process calling sched_yield () less cpu time than
1194 // 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
1195 // 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.
1196 1121
1197 struct timespec ts = { 0, 0 }; 1122 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1199 1124
1200 w.stop (); 1125 w.stop ();
1201 } 1126 }
1202 1127
… …
1205 { 1130 {
1206 } 1131 }
1207} event_handler; 1132} event_handler;
1208#endif 1133#endif
1209 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
1210bool 1168bool
1211rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1212{ 1170{
1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1214 1172
1215 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1216 { 1174
1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1218 n = 0;
1219 } 1176 {
1220 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1222 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1223 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1224 1182
1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1226 1184
1227 if (r > 0) 1185 if (r > 0)
1228 { 1186 {
1229 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1230 return true; 1188 return true;
… …
1246 1204
1247 return false; 1205 return false;
1248} 1206}
1249 1207
1250void 1208void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1209rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1210{
1253 make_current (); 1211 make_current ();
1254 1212
1255 if (revents & EVENT_READ) 1213 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1216 cmd_parse ();
1259 break;
1260 1217
1261 if (revents & EVENT_WRITE) 1218 if (revents & ev::WRITE)
1262 pty_write (); 1219 pty_write ();
1263}
1264 1220
1265void 1221 refresh_check ();
1222}
1223
1224void ecb_cold
1266rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1267{ 1226{
1268 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1269 recolour_cursor (); 1228 recolour_cursor ();
1270 1229
1271#ifdef POINTER_BLANK 1230#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1231 hidden_pointer = 0;
1273 1232
1274 if (option (Opt_pointerBlank)) 1233 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1276#endif 1235#endif
1277} 1236}
1278 1237
1279#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1280void 1239void ecb_cold
1281rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1282{ 1241{
1283 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1284 return; 1243 return;
1285 1244
… …
1287 XFlush (dpy); 1246 XFlush (dpy);
1288 1247
1289 hidden_pointer = 1; 1248 hidden_pointer = 1;
1290} 1249}
1291 1250
1292void 1251void ecb_cold
1293rxvt_term::pointer_cb (time_watcher &w) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1253{
1295 make_current (); 1254 make_current ();
1296 1255
1297 pointer_blank (); 1256 pointer_blank ();
1298} 1257}
… …
1303{ 1262{
1304 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1305 int x, y; 1264 int x, y;
1306 int code = 32; 1265 int code = 32;
1307 1266
1308 x = Pixel2Col (ev.x); 1267 x = Pixel2Col (ev.x) + 1;
1309 y = Pixel2Row (ev.y); 1268 y = Pixel2Row (ev.y) + 1;
1269
1310 if (ev.type == MotionNotify) { 1270 if (ev.type == MotionNotify)
1271 {
1311 if (x == mouse_row && y == mouse_col) 1272 if (x == mouse_row && y == mouse_col)
1312 return; 1273 return;
1274
1313 mouse_row = x; 1275 mouse_row = x;
1314 mouse_col = y; 1276 mouse_col = y;
1315 code += 32; 1277 code += 32;
1316 } 1278 }
1317 1279
1318 if (MEvent.button == AnyButton) 1280 if (MEvent.button == AnyButton)
1319 button_number = 3; 1281 button_number = 3;
1320 else 1282 else
1321 { 1283 {
1322 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1323 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1324 if (button_number >= 3) 1286 if (button_number >= 3)
1325 button_number += (64 - 3); 1287 button_number += 64 - 3;
1326 } 1288 }
1327 1289
1328 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1329 { 1291 {
1330 /* 1292 /*
… …
1362 fputc ('A', stderr); 1324 fputc ('A', stderr);
1363 if (key_state & 32) 1325 if (key_state & 32)
1364 fputc ('2', stderr); 1326 fputc ('2', stderr);
1365 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1366 button_number, 1328 button_number,
1367 x + 1, 1329 x,
1368 y + 1); 1330 y);
1369#endif 1331#endif
1370 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
1371 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1372 (code + button_number + key_state), 1347 code + button_number + key_state,
1373 (32 + x + 1), 1348 32 + x,
1374 (32 + y + 1)); 1349 32 + y);
1375} 1350}
1376 1351
1377/*{{{ process an X event */ 1352/*{{{ process an X event */
1378void 1353void ecb_hot
1379rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1380{ 1355{
1381 make_current (); 1356 make_current ();
1382 1357
1383 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1481 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1482 focus_out (); 1457 focus_out ();
1483 break; 1458 break;
1484 1459
1485 case ConfigureNotify: 1460 case ConfigureNotify:
1486 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1487 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1488 szHint.width, szHint.height); */
1489 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1490 { 1462 {
1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1492 ; 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 }
1493 1498
1494 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1495 { 1500 {
1496 seen_resize = 1; 1501 seen_resize = 1;
1497 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1498 } 1503 }
1499 else 1504 else
1500 { 1505 {
1501#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1502 if (bgPixmap.window_position_sensitive ()) 1507 if (moved)
1503 update_background (); 1508 update_background ();
1504#endif 1509#endif
1505 } 1510 }
1511
1506 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1507 } 1513 }
1508 break; 1514 break;
1509 1515
1510 case PropertyNotify: 1516 case PropertyNotify:
1511 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1517 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1512 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1513 && ev.xproperty.state == PropertyNewValue)
1514 selection_property (ev.xproperty.window, ev.xproperty.atom);
1515
1516 break; 1518 break;
1517 1519
1518 case SelectionClear: 1520 case SelectionClear:
1519 selection_clear (); 1521 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1520 break;
1521
1522 case SelectionNotify:
1523 if (selection_wait == Sel_normal)
1524 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1525 break; 1522 break;
1526 1523
1527 case SelectionRequest: 1524 case SelectionRequest:
1528 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1529 break; 1526 break;
1530 1527
1531 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
1532 mapped = 1; 1545 mapped = 1;
1533#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1534 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1547 text_blink_ev.start ();
1535#endif 1548#endif
1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1549 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1537 break; 1550 break;
1538 1551
1539 case UnmapNotify: 1552 case UnmapNotify:
… …
1549 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1550 { 1563 {
1551 do 1564 do
1552 { 1565 {
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1555 } 1568 }
1556 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1557 1570
1558 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1559 1572
1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1561 { 1574 {
1562 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1563 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1564 } 1577 }
1578
1565 want_refresh = 1; 1579 want_refresh = 1;
1566 } 1580 }
1567 else 1581 else
1568 { 1582 {
1569 XEvent unused_event; 1583 XEvent unused_event;
… …
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1585 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1572 ; 1586 ;
1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1574 ; 1588 ;
1575 1589
1576 if (isScrollbarWindow (ev.xany.window)) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1577 { 1591 {
1578 scrollBar.setIdle (); 1592 scrollBar.state = SB_STATE_IDLE;
1579 scrollbar_show (0); 1593 scrollBar.show (0);
1580 } 1594 }
1581 } 1595 }
1582 break; 1596 break;
1583 1597
1584 case MotionNotify: 1598 case MotionNotify:
… …
1630 int dist; 1644 int dist;
1631 1645
1632 /* don't clobber the current delay if we are 1646 /* don't clobber the current delay if we are
1633 * already in the middle of scrolling. 1647 * already in the middle of scrolling.
1634 */ 1648 */
1635 if (!sel_scroll_ev.active) 1649 if (!sel_scroll_ev.is_active ())
1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1650 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1637 1651
1638 /* save the event params so we can highlight 1652 /* save the event params so we can highlight
1639 * the selection in the pending-scroll loop 1653 * the selection in the pending-scroll loop
1640 */ 1654 */
1641 selection_save_x = ev.xbutton.x; 1655 selection_save_x = ev.xbutton.x;
… …
1649 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1650 } 1664 }
1651 else 1665 else
1652 { 1666 {
1653 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1654 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1655 } 1669 }
1656 1670
1657 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1658 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1659 + 1; 1673 + 1;
… …
1663 else 1677 else
1664 { 1678 {
1665 /* we are within the text window, so we 1679 /* we are within the text window, so we
1666 * shouldn't be scrolling 1680 * shouldn't be scrolling
1667 */ 1681 */
1668 if (sel_scroll_ev.active)
1669 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1670 } 1683 }
1671#endif 1684#endif
1672#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1673 } 1686 }
1674#endif 1687#endif
1675 } 1688 }
1676 } 1689 }
1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1678 { 1691 {
1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1680 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1681 ; 1694 ;
1682 1695
1683 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1684 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1685 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1700 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1702 scrollBar.size ());
1690 want_refresh = 1; 1703 want_refresh = 1;
1691 scrollbar_show (1); 1704 scrollBar.show (1);
1692 } 1705 }
1693 break; 1706 break;
1694 } 1707 }
1695 1708
1696#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1697 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1698 { 1711 cursor_blink_reset ();
1699 if (hidden_cursor)
1700 {
1701 hidden_cursor = 0;
1702 want_refresh = 1;
1703 }
1704
1705 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1706 }
1707#endif 1712#endif
1708 1713
1709#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1710 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1711 { 1716 {
… …
1717 1722
1718 if (ev.type == KeyPress && hidden_pointer == 0) 1723 if (ev.type == KeyPress && hidden_pointer == 0)
1719 pointer_blank (); 1724 pointer_blank ();
1720 } 1725 }
1721#endif 1726#endif
1722}
1723 1727
1724void 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
1725rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1726{ 1750{
1727 if (!focus) 1751 if (!focus)
1728 { 1752 {
1729 focus = 1; 1753 focus = 1;
1730 want_refresh = 1; 1754 want_refresh = 1;
1731 1755
1732 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1733
1734#if USE_XIM 1756#if USE_XIM
1735 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1736 { 1758 {
1737 IMSetPosition (); 1759 im_set_position ();
1738 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1739 } 1761 }
1740#endif 1762#endif
1741#if CURSOR_BLINK 1763#if CURSOR_BLINK
1742 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
1743 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1765 cursor_blink_ev.again ();
1744#endif 1766#endif
1745#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1746 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1747 { 1769 {
1748 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1749 scr_recolour (); 1771 scr_recolour ();
1750 } 1772 }
1751#endif 1773#endif
1752#if ENABLE_FRILLS 1774#if ENABLE_FRILLS
1753 if (option (Opt_urgentOnBell)) 1775 if (option (Opt_urgentOnBell))
1754 { 1776 set_urgency (0);
1755 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1756 {
1757 h->flags &= ~XUrgencyHint;
1758 XSetWMHints (dpy, parent[0], h);
1759 }
1760 }
1761#endif 1777#endif
1762 }
1763}
1764 1778
1765void 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1780 }
1781}
1782
1783void ecb_cold
1766rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1767{ 1785{
1768 if (focus) 1786 if (focus)
1769 { 1787 {
1770 focus = 0; 1788 focus = 0;
1771 want_refresh = 1; 1789 want_refresh = 1;
1772 1790
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1791#if ENABLE_FRILLS
1774 1792 if (option (Opt_urgentOnBell))
1793 set_urgency (0);
1794#endif
1775#if ENABLE_FRILLS || ISO_14755 1795#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf) 1796 if (iso14755buf)
1777 { 1797 {
1778 iso14755buf = 0; 1798 iso14755buf = 0;
1779# if ISO_14755 1799# if ISO_14755
… …
1786 XUnsetICFocus (Input_Context); 1806 XUnsetICFocus (Input_Context);
1787#endif 1807#endif
1788#if CURSOR_BLINK 1808#if CURSOR_BLINK
1789 if (option (Opt_cursorBlink)) 1809 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop (); 1810 cursor_blink_ev.stop ();
1811
1791 hidden_cursor = 0; 1812 hidden_cursor = 0;
1792#endif 1813#endif
1793#if OFF_FOCUS_FADING 1814#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1815 if (rs[Rs_fade])
1795 { 1816 {
1796 pix_colors = pix_colors_unfocused; 1817 pix_colors = pix_colors_unfocused;
1797 scr_recolour (); 1818 scr_recolour ();
1798 } 1819 }
1799#endif 1820#endif
1800 }
1801}
1802 1821
1803void 1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1823 }
1824}
1825
1826void ecb_cold
1804rxvt_term::update_fade_color (unsigned int idx) 1827rxvt_term::update_fade_color (unsigned int idx)
1805{ 1828{
1806#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1808 { 1831 {
… …
1812 } 1835 }
1813#endif 1836#endif
1814} 1837}
1815 1838
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1817void 1840void ecb_hot
1818rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1842{
1820 make_current (); 1843 make_current ();
1821 1844
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
… …
1832 * use the property to determine the pixmap. We use it later on. 1855 * use the property to determine the pixmap. We use it later on.
1833 */ 1856 */
1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836 { 1859 {
1837 bgPixmap.set_root_pixmap (); 1860 bg_set_root_pixmap ();
1838 update_background (); 1861 update_background ();
1839 } 1862 }
1863
1840 break; 1864 break;
1841 } 1865 }
1842# endif 1866# endif
1867
1868 refresh_check ();
1843} 1869}
1844#endif 1870#endif
1845 1871
1846void 1872void
1847rxvt_term::button_press (XButtonEvent &ev) 1873rxvt_term::button_press (XButtonEvent &ev)
… …
1878 /* save the xbutton state (for ButtonRelease) */ 1904 /* save the xbutton state (for ButtonRelease) */
1879 MEvent.state = ev.state; 1905 MEvent.state = ev.state;
1880#ifdef MOUSE_REPORT_DOUBLECLICK 1906#ifdef MOUSE_REPORT_DOUBLECLICK
1881 if (ev.button == MEvent.button && clickintime) 1907 if (ev.button == MEvent.button && clickintime)
1882 { 1908 {
1883 /* same button, within alloted time */ 1909 /* same button, within allowed time */
1884 MEvent.clicks++; 1910 MEvent.clicks++;
1885 1911
1886 if (MEvent.clicks > 1) 1912 if (MEvent.clicks > 1)
1887 { 1913 {
1888 /* only report double clicks */ 1914 /* only report double clicks */
… …
1902 mouse_report (ev); 1928 mouse_report (ev);
1903 } 1929 }
1904#else 1930#else
1905 MEvent.button = ev.button; 1931 MEvent.button = ev.button;
1906 mouse_report (ev); 1932 mouse_report (ev);
1907#endif /* MOUSE_REPORT_DOUBLECLICK */ 1933#endif /* MOUSE_REPORT_DOUBLECLICK */
1908 1934
1909 } 1935 }
1910 else 1936 else
1911 { 1937 {
1912 if (ev.button != MEvent.button) 1938 if (ev.button != MEvent.button)
… …
1960 } 1986 }
1961 1987
1962 /* 1988 /*
1963 * Scrollbar window processing of button press 1989 * Scrollbar window processing of button press
1964 */ 1990 */
1965 if (isScrollbarWindow (ev.window)) 1991 if (scrollBar.state && ev.window == scrollBar.win)
1966 { 1992 {
1967 scrollBar.setIdle (); 1993 page_dirn direction = NO_DIR;
1994
1995 if (scrollBar.upButton (ev.y))
1996 direction = UP; /* up */
1997 else if (scrollBar.dnButton (ev.y))
1998 direction = DN; /* down */
1999
2000 scrollBar.state = SB_STATE_IDLE;
1968 /* 2001 /*
1969 * Rxvt-style scrollbar: 2002 * Rxvt-style scrollbar:
1970 * move up if mouse is above slider 2003 * move up if mouse is above slider
1971 * move dn if mouse is below slider 2004 * move dn if mouse is below slider
1972 * 2005 *
… …
1981 /* 2014 /*
1982 * Mouse report disabled scrollbar: 2015 * Mouse report disabled scrollbar:
1983 * arrow buttons - send up/down 2016 * arrow buttons - send up/down
1984 * click on scrollbar - send pageup/down 2017 * click on scrollbar - send pageup/down
1985 */ 2018 */
1986 if ((scrollBar.style == R_SB_NEXT 2019 if (direction == UP)
1987 && scrollbarnext_upButton (ev.y))
1988 || (scrollBar.style == R_SB_RXVT
1989 && scrollbarrxvt_upButton (ev.y)))
1990 tt_printf ("\033[A"); 2020 tt_printf ("\033[A");
1991 else if ((scrollBar.style == R_SB_NEXT 2021 else if (direction == DN)
1992 && scrollbarnext_dnButton (ev.y))
1993 || (scrollBar.style == R_SB_RXVT
1994 && scrollbarrxvt_dnButton (ev.y)))
1995 tt_printf ("\033[B"); 2022 tt_printf ("\033[B");
1996 else 2023 else
1997 switch (ev.button) 2024 switch (ev.button)
1998 { 2025 {
1999 case Button2: 2026 case Button2:
… …
2006 tt_printf ("\033[5~"); 2033 tt_printf ("\033[5~");
2007 break; 2034 break;
2008 } 2035 }
2009 } 2036 }
2010 else 2037 else
2011#endif /* NO_SCROLLBAR_REPORT */ 2038#endif /* NO_SCROLLBAR_REPORT */
2012
2013 {
2014 char upordown = 0;
2015
2016 if (scrollBar.style == R_SB_NEXT)
2017 { 2039 {
2018 if (scrollbarnext_upButton (ev.y)) 2040 if (direction != NO_DIR)
2019 upordown = -1; /* up */
2020 else if (scrollbarnext_dnButton (ev.y))
2021 upordown = 1; /* down */
2022 }
2023 else if (scrollBar.style == R_SB_RXVT)
2024 {
2025 if (scrollbarrxvt_upButton (ev.y))
2026 upordown = -1; /* up */
2027 else if (scrollbarrxvt_dnButton (ev.y))
2028 upordown = 1; /* down */
2029 }
2030 if (upordown)
2031 { 2041 {
2032#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2042#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2043 if (!cont_scroll_ev.is_active ())
2033 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2044 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2034#endif 2045#endif
2035 if (scr_page (upordown < 0 ? UP : DN, 1)) 2046 if (scr_page (direction, 1))
2036 { 2047 {
2037 if (upordown < 0) 2048 if (direction == UP)
2038 scrollBar.setUp (); 2049 scrollBar.state = SB_STATE_UP;
2039 else 2050 else
2040 scrollBar.setDn (); 2051 scrollBar.state = SB_STATE_DOWN;
2041 } 2052 }
2042 } 2053 }
2043 else 2054 else
2044 switch (ev.button) 2055 switch (ev.button)
2045 { 2056 {
2046 case Button2: 2057 case Button2:
2047 switch (scrollbar_align) 2058 switch (scrollBar.align)
2048 { 2059 {
2049 case R_SB_ALIGN_TOP: 2060 case SB_ALIGN_TOP:
2050 csrO = 0; 2061 csrO = 0;
2051 break; 2062 break;
2052 case R_SB_ALIGN_CENTRE: 2063 case SB_ALIGN_CENTRE:
2053 csrO = (scrollBar.bot - scrollBar.top) / 2; 2064 csrO = (scrollBar.bot - scrollBar.top) / 2;
2054 break; 2065 break;
2055 case R_SB_ALIGN_BOTTOM: 2066 case SB_ALIGN_BOTTOM:
2056 csrO = scrollBar.bot - scrollBar.top; 2067 csrO = scrollBar.bot - scrollBar.top;
2057 break; 2068 break;
2058 } 2069 }
2059 2070
2060 if (scrollBar.style == R_SB_XTERM 2071 if (scrollBar.style == SB_STYLE_XTERM
2061 || scrollbar_above_slider (ev.y) 2072 || scrollBar.above_slider (ev.y)
2062 || scrollbar_below_slider (ev.y)) 2073 || scrollBar.below_slider (ev.y))
2063 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2074 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2064 2075
2065 scrollBar.setMotion (); 2076 scrollBar.state = SB_STATE_MOTION;
2066 break; 2077 break;
2067 2078
2068 case Button1: 2079 case Button1:
2069 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2080 if (scrollBar.align == SB_ALIGN_CENTRE)
2070 csrO = ev.y - scrollBar.top; 2081 csrO = ev.y - scrollBar.top;
2071 /* FALLTHROUGH */ 2082 /* FALLTHROUGH */
2072 2083
2073 case Button3: 2084 case Button3:
2074 if (scrollBar.style != R_SB_XTERM) 2085 if (scrollBar.style != SB_STYLE_XTERM)
2075 { 2086 {
2076 if (scrollbar_above_slider (ev.y)) 2087 if (scrollBar.above_slider (ev.y))
2077# ifdef RXVT_SCROLL_FULL 2088# ifdef RXVT_SCROLL_FULL
2078 scr_page (UP, nrow - 1); 2089 scr_page (UP, nrow - 1);
2079# else 2090# else
2080 scr_page (UP, nrow / 4); 2091 scr_page (UP, nrow / 4);
2081# endif 2092# endif
2082 else if (scrollbar_below_slider (ev.y)) 2093 else if (scrollBar.below_slider (ev.y))
2083# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
2084 scr_page (DN, nrow - 1); 2095 scr_page (DN, nrow - 1);
2085# else 2096# else
2086 scr_page (DN, nrow / 4); 2097 scr_page (DN, nrow / 4);
2087# endif 2098# endif
2088 else 2099 else
2089 scrollBar.setMotion (); 2100 scrollBar.state = SB_STATE_MOTION;
2090 } 2101 }
2091 else 2102 else
2092 { 2103 {
2093 scr_page ((ev.button == Button1 ? DN : UP), 2104 scr_page ((ev.button == Button1 ? DN : UP),
2094 (nrow 2105 (nrow
2095 * scrollbar_position (ev.y) 2106 * scrollBar.position (ev.y)
2096 / scrollbar_size ())); 2107 / scrollBar.size ()));
2097 } 2108 }
2098 2109
2099 break; 2110 break;
2100 } 2111 }
2101 } 2112 }
… …
2111 2122
2112 csrO = 0; /* reset csr Offset */ 2123 csrO = 0; /* reset csr Offset */
2113 if (!bypass_keystate) 2124 if (!bypass_keystate)
2114 reportmode = !! (priv_modes & PrivMode_mouse_report); 2125 reportmode = !! (priv_modes & PrivMode_mouse_report);
2115 2126
2116 if (scrollbar_isUpDn ()) 2127 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2117 { 2128 {
2118 scrollBar.setIdle (); 2129 scrollBar.state = SB_STATE_IDLE;
2119 scrollbar_show (0); 2130 scrollBar.show (0);
2120 } 2131 }
2121 2132
2122#ifdef SELECTION_SCROLLING 2133#ifdef SELECTION_SCROLLING
2123 if (sel_scroll_ev.active)
2124 sel_scroll_ev.stop(); 2134 sel_scroll_ev.stop();
2125#endif 2135#endif
2126 2136
2127 if (ev.window == vt) 2137 if (ev.window == vt)
2128 { 2138 {
2129 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2139 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2153 mouse_report (ev); 2163 mouse_report (ev);
2154 } 2164 }
2155#else /* MOUSE_REPORT_DOUBLECLICK */ 2165#else /* MOUSE_REPORT_DOUBLECLICK */
2156 MEvent.button = AnyButton; 2166 MEvent.button = AnyButton;
2157 mouse_report (ev); 2167 mouse_report (ev);
2158#endif /* MOUSE_REPORT_DOUBLECLICK */ 2168#endif /* MOUSE_REPORT_DOUBLECLICK */
2159 return; 2169 return;
2160 } 2170 }
2161 2171
2162 /* 2172 /*
2163 * dumb hack to compensate for the failure of click-and-drag 2173 * dumb hack to compensate for the failure of click-and-drag
… …
2174 case Button3: 2184 case Button3:
2175 selection_make (ev.time); 2185 selection_make (ev.time);
2176 break; 2186 break;
2177 2187
2178 case Button2: 2188 case Button2:
2179 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2189 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2180 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2190 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2181 break; 2191 break;
2182 2192
2183#ifdef MOUSE_WHEEL 2193#ifdef MOUSE_WHEEL
2184 case Button4: 2194 case Button4:
2185 case Button5: 2195 case Button5:
… …
2201 { 2211 {
2202 mouse_slip_wheel_speed += v ? -1 : 1; 2212 mouse_slip_wheel_speed += v ? -1 : 1;
2203 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2213 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2204 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2214 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2205 2215
2206 if (slip_wheel_ev.at < NOW) 2216 if (!slip_wheel_ev.is_active ())
2207 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2217 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2208
2209 slip_wheel_ev.start ();
2210 } 2218 }
2211 else 2219 else
2220# endif
2212 { 2221 {
2213# endif
2214 scr_page (v, i); 2222 scr_page (v, i);
2215 scrollbar_show (1); 2223 scrollBar.show (1);
2216# ifdef MOUSE_SLIP_WHEELING
2217 } 2224 }
2218# endif
2219 } 2225 }
2220 break; 2226 break;
2221#endif 2227#endif
2222 } 2228 }
2223 } 2229 }
2224} 2230}
2225 2231
2226/*}}} */ 2232/*}}} */
2227 2233
2228bool 2234void ecb_hot
2229rxvt_term::cmd_parse () 2235rxvt_term::cmd_parse ()
2230{ 2236{
2231 bool flag = false;
2232 wchar_t ch = NOCHAR; 2237 wchar_t ch = NOCHAR;
2233 char *seq_begin; // remember start of esc-sequence here 2238 char *seq_begin; // remember start of esc-sequence here
2234 2239
2235 for (;;) 2240 for (;;)
2236 { 2241 {
2237 if (ch == NOCHAR) 2242 if (ecb_unlikely (ch == NOCHAR))
2238 { 2243 {
2239 seq_begin = cmdbuf_ptr; 2244 seq_begin = cmdbuf_ptr;
2240 ch = next_char (); 2245 ch = next_char ();
2241 2246
2242 if (ch == NOCHAR) 2247 if (ch == NOCHAR)
2243 break; 2248 break;
2244 } 2249 }
2245 2250
2246 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2251 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2247 { 2252 {
2248 if (!seen_input) 2253 if (ecb_unlikely (!seen_input))
2249 { 2254 {
2250 seen_input = 1; 2255 seen_input = 1;
2251 // many badly-written programs (e.g. jed) contain a race condition: 2256 // many badly-written programs (e.g. jed) contain a race condition:
2252 // they first read the screensize and then install a SIGWINCH handler. 2257 // they first read the screensize and then install a SIGWINCH handler.
2253 // some window managers resize the window early, and these programs 2258 // some window managers resize the window early, and these programs
… …
2266 wchar_t *str = buf; 2271 wchar_t *str = buf;
2267 wchar_t *eol = str + min (ncol, UBUFSIZ); 2272 wchar_t *eol = str + min (ncol, UBUFSIZ);
2268 2273
2269 for (;;) 2274 for (;;)
2270 { 2275 {
2271 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2276 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2272 break; 2277 break;
2273 2278
2274 *str++ = ch; 2279 *str++ = ch;
2275 2280
2276 if (ch == C0_LF || str >= eol) 2281 if (ecb_unlikely (ch == C0_LF || str >= eol))
2277 { 2282 {
2278 if (ch == C0_LF) 2283 if (ch == C0_LF)
2279 nlines++; 2284 nlines++;
2280 2285
2281 refresh_count++; 2286 refresh_count++;
2282 2287
2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2288 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2284 { 2289 {
2285 refresh_count = 0; 2290 refresh_count = 0;
2286 2291
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2292 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2288 { 2293 {
2289 refreshnow = true; 2294 refreshnow = true;
2290 ch = NOCHAR; 2295 ch = NOCHAR;
2291 break; 2296 break;
2292 } 2297 }
… …
2330 * What the heck we'll cheat and only refresh less than every page-full. 2335 * What the heck we'll cheat and only refresh less than every page-full.
2331 * if skipScroll is enabled. 2336 * if skipScroll is enabled.
2332 */ 2337 */
2333 if (refreshnow) 2338 if (refreshnow)
2334 { 2339 {
2335 flag = true;
2336 scr_refresh (); 2340 scr_refresh ();
2337 want_refresh = 1; 2341 want_refresh = 1;
2338 } 2342 }
2339
2340 } 2343 }
2341 else 2344 else
2342 { 2345 {
2343 try 2346 try
2344 { 2347 {
… …
2352 } 2355 }
2353 2356
2354 ch = NOCHAR; 2357 ch = NOCHAR;
2355 } 2358 }
2356 } 2359 }
2357
2358 return flag;
2359} 2360}
2360 2361
2361// read the next character 2362// read the next character
2362wchar_t 2363wchar_t ecb_hot
2363rxvt_term::next_char () NOTHROW 2364rxvt_term::next_char () NOTHROW
2364{ 2365{
2365 while (cmdbuf_ptr < cmdbuf_endp) 2366 while (cmdbuf_ptr < cmdbuf_endp)
2366 { 2367 {
2367 // assume 7-bit to be ascii ALWAYS 2368 // assume 7-bit to be ascii ALWAYS
2368 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2369 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2369 return *cmdbuf_ptr++; 2370 return *cmdbuf_ptr++;
2370 2371
2371 wchar_t wc; 2372 wchar_t wc;
2372 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2373 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2373 2374
… …
2377 cmdbuf_ptr = cmdbuf_endp; 2378 cmdbuf_ptr = cmdbuf_endp;
2378 break; 2379 break;
2379 } 2380 }
2380 2381
2381 if (len == (size_t)-1) 2382 if (len == (size_t)-1)
2383 {
2384 mbstate.reset (); // reset now undefined conversion state
2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2385 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2386 }
2383 2387
2384 // assume wchar == unicode 2388 // assume wchar == unicode
2385 cmdbuf_ptr += len; 2389 cmdbuf_ptr += len;
2386 return wc & UNICODE_MASK; 2390 return wc & UNICODE_MASK;
2387 } 2391 }
2388 2392
2389 return NOCHAR; 2393 return NOCHAR;
2390} 2394}
2391 2395
2392// read the next octet 2396// read the next octet
2393uint32_t 2397uint32_t ecb_hot
2394rxvt_term::next_octet () NOTHROW 2398rxvt_term::next_octet () NOTHROW
2395{ 2399{
2396 return cmdbuf_ptr < cmdbuf_endp 2400 return cmdbuf_ptr < cmdbuf_endp
2397 ? (unsigned char)*cmdbuf_ptr++ 2401 ? (unsigned char)*cmdbuf_ptr++
2398 : NOCHAR; 2402 : NOCHAR;
2399} 2403}
2400 2404
2401static class out_of_input out_of_input; 2405static class out_of_input out_of_input;
2402 2406
2403/* rxvt_cmd_getc () - Return next input character */ 2407wchar_t ecb_hot
2404/*
2405 * Return the next input character after first passing any keyboard input
2406 * to the command.
2407 */
2408wchar_t
2409rxvt_term::cmd_getc () THROW ((class out_of_input)) 2408rxvt_term::cmd_getc () THROW ((class out_of_input))
2410{ 2409{
2411 wchar_t c = next_char (); 2410 wchar_t c = next_char ();
2412 2411
2413 if (c == NOCHAR) 2412 if (c == NOCHAR)
2414 throw out_of_input; 2413 throw out_of_input;
2415 2414
2416 return c; 2415 return c;
2417} 2416}
2418 2417
2419uint32_t 2418uint32_t ecb_hot
2420rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2419rxvt_term::cmd_get8 () THROW ((class out_of_input))
2421{ 2420{
2422 uint32_t c = next_octet (); 2421 uint32_t c = next_octet ();
2423 2422
2424 if (c == NOCHAR) 2423 if (c == NOCHAR)
… …
2428} 2427}
2429 2428
2430/*{{{ print pipe */ 2429/*{{{ print pipe */
2431/*----------------------------------------------------------------------*/ 2430/*----------------------------------------------------------------------*/
2432#ifdef PRINTPIPE 2431#ifdef PRINTPIPE
2433FILE * 2432FILE * ecb_cold
2434rxvt_term::popen_printer () 2433rxvt_term::popen_printer ()
2435{ 2434{
2436 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2435 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2437 2436
2438 if (stream == NULL) 2437 if (stream == NULL)
2439 rxvt_warn ("can't open printer pipe, not printing.\n"); 2438 rxvt_warn ("can't open printer pipe, not printing.\n");
2440 2439
2441 return stream; 2440 return stream;
2442} 2441}
2443 2442
2444int 2443int ecb_cold
2445rxvt_term::pclose_printer (FILE *stream) 2444rxvt_term::pclose_printer (FILE *stream)
2446{ 2445{
2447 fflush (stream); 2446 fflush (stream);
2448 return pclose (stream); 2447 return pclose (stream);
2449} 2448}
2450 2449
2451/* 2450/*
2452 * simulate attached vt100 printer 2451 * simulate attached vt100 printer
2453 */ 2452 */
2454void 2453void ecb_cold
2455rxvt_term::process_print_pipe () 2454rxvt_term::process_print_pipe ()
2456{ 2455{
2457 int done; 2456 FILE *fd = popen_printer ();
2458 FILE *fd;
2459 2457
2460 if ((fd = popen_printer ()) == NULL) 2458 if (!fd)
2461 return; 2459 return;
2462 2460
2463 /* 2461 /*
2464 * Send all input to the printer until either ESC[4i or ESC[?4i 2462 * Send all input to the printer until either ESC[4i or ESC[?4i
2465 * is received. 2463 * is received.
2466 */ 2464 */
2467 for (done = 0; !done;) 2465 for (int done = 0; !done; )
2468 { 2466 {
2469 unsigned char buf[8]; 2467 unsigned char buf[8];
2470 unicode_t ch; 2468 unicode_t ch;
2471 unsigned int i, len; 2469 unsigned int i, len;
2472 2470
… …
2503 } 2501 }
2504 } 2502 }
2505 2503
2506 pclose_printer (fd); 2504 pclose_printer (fd);
2507} 2505}
2508#endif /* PRINTPIPE */ 2506#endif /* PRINTPIPE */
2509/*}}} */ 2507/*}}} */
2510 2508
2511/* *INDENT-OFF* */
2512enum { 2509enum {
2513 C1_40 = 0x40, 2510 C1_40 = 0x40,
2514 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2511 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2515 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2512 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2516 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2513 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2517 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2514 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2518}; 2515};
2519/* *INDENT-ON* */
2520 2516
2521/*{{{ process non-printing single characters */ 2517/*{{{ process non-printing single characters */
2522void 2518void ecb_hot
2523rxvt_term::process_nonprinting (unicode_t ch) 2519rxvt_term::process_nonprinting (unicode_t ch)
2524{ 2520{
2525 switch (ch) 2521 switch (ch)
2526 { 2522 {
2527 case C0_ESC: 2523 case C0_ESC:
… …
2573} 2569}
2574/*}}} */ 2570/*}}} */
2575 2571
2576 2572
2577/*{{{ process VT52 escape sequences */ 2573/*{{{ process VT52 escape sequences */
2578void 2574void ecb_cold
2579rxvt_term::process_escape_vt52 (unicode_t ch) 2575rxvt_term::process_escape_vt52 (unicode_t ch)
2580{ 2576{
2581 int row, col; 2577 int row, col;
2582 2578
2583 switch (ch) 2579 switch (ch)
… …
2617 break; 2613 break;
2618 case 'Z': /* identify the terminal type */ 2614 case 'Z': /* identify the terminal type */
2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2615 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2620 break; 2616 break;
2621 case '<': /* turn off VT52 mode */ 2617 case '<': /* turn off VT52 mode */
2622 PrivMode (0, PrivMode_vt52); 2618 priv_modes &= ~PrivMode_vt52;
2623 break; 2619 break;
2624 case 'F': /* use special graphics character set */ 2620 case 'F': /* use special graphics character set */
2625 case 'G': /* use regular character set */ 2621 case 'G': /* use regular character set */
2626 /* unimplemented */ 2622 /* unimplemented */
2627 break; 2623 break;
… …
2633} 2629}
2634/*}}} */ 2630/*}}} */
2635 2631
2636 2632
2637/*{{{ process escape sequences */ 2633/*{{{ process escape sequences */
2638void 2634void ecb_hot
2639rxvt_term::process_escape_seq () 2635rxvt_term::process_escape_seq ()
2640{ 2636{
2641 unicode_t ch = cmd_getc (); 2637 unicode_t ch = cmd_getc ();
2642 2638
2643 if (priv_modes & PrivMode_vt52) 2639 if (priv_modes & PrivMode_vt52)
… …
2646 return; 2642 return;
2647 } 2643 }
2648 2644
2649 switch (ch) 2645 switch (ch)
2650 { 2646 {
2651 /* case 1: do_tek_mode (); break; */
2652 case '#': 2647 case '#':
2653 if (cmd_getc () == '8') 2648 if (cmd_getc () == '8')
2654 scr_E (); 2649 scr_E ();
2655 break; 2650 break;
2656 case '(': 2651 case '(':
… …
2679#if !ENABLE_MINIMAL 2674#if !ENABLE_MINIMAL
2680 case '9': 2675 case '9':
2681 scr_forwardindex (); 2676 scr_forwardindex ();
2682 break; 2677 break;
2683#endif 2678#endif
2679 // DECPAM/DECPNM
2684 case '=': 2680 case '=':
2681 priv_modes |= PrivMode_aplKP;
2682 break;
2685 case '>': 2683 case '>':
2686 PrivMode ((ch == '='), PrivMode_aplKP); 2684 priv_modes &= ~PrivMode_aplKP;
2687 break; 2685 break;
2688 2686
2689 case C1_40: 2687 case C1_40:
2690 cmd_getc (); 2688 cmd_getc ();
2691 break; 2689 break;
… …
2695 2693
2696 /* 8.3.87: NEXT LINE */ 2694 /* 8.3.87: NEXT LINE */
2697 case C1_NEL: /* ESC E */ 2695 case C1_NEL: /* ESC E */
2698 { 2696 {
2699 wchar_t nlcr[] = { C0_LF, C0_CR }; 2697 wchar_t nlcr[] = { C0_LF, C0_CR };
2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2698 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2701 } 2699 }
2702 break; 2700 break;
2703 2701
2704 /* kidnapped escape sequence: Should be 8.3.48 */ 2702 /* kidnapped escape sequence: Should be 8.3.48 */
2705 case C1_ESA: /* ESC G */ 2703 case C1_ESA: /* ESC G */
2706 process_graphics (); 2704 // used by original rxvt for rob nations own graphics mode
2705 if (cmd_getc () == 'Q')
2706 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2707 break; 2707 break;
2708 2708
2709 /* 8.3.63: CHARACTER TABULATION SET */ 2709 /* 8.3.63: CHARACTER TABULATION SET */
2710 case C1_HTS: /* ESC H */ 2710 case C1_HTS: /* ESC H */
2711 scr_set_tab (1); 2711 scr_set_tab (1);
… …
2715 case C1_RI: /* ESC M */ 2715 case C1_RI: /* ESC M */
2716 scr_index (DN); 2716 scr_index (DN);
2717 break; 2717 break;
2718 2718
2719 /* 8.3.142: SINGLE-SHIFT TWO */ 2719 /* 8.3.142: SINGLE-SHIFT TWO */
2720 /*case C1_SS2: scr_single_shift (2); break; */ 2720 /* case C1_SS2: break; */
2721 2721
2722 /* 8.3.143: SINGLE-SHIFT THREE */ 2722 /* 8.3.143: SINGLE-SHIFT THREE */
2723 /*case C1_SS3: scr_single_shift (3); break; */ 2723 /* case C1_SS3: break; */
2724 2724
2725 /* 8.3.27: DEVICE CONTROL STRING */ 2725 /* 8.3.27: DEVICE CONTROL STRING */
2726 case C1_DCS: /* ESC P */ 2726 case C1_DCS: /* ESC P */
2727 process_dcs_seq (); 2727 process_dcs_seq ();
2728 break; 2728 break;
… …
2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2731 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2733 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
2734 2734
2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2736 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
2737 process_csi_seq (); 2737 process_csi_seq ();
2738 break; 2738 break;
2739 2739
2740 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2741 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
2742 process_osc_seq (); 2742 process_osc_seq ();
2743 break; 2743 break;
2744 2744
2745 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2746 case 'c': 2746 case 'c':
2747 mbstate.reset (); 2747 mbstate.reset ();
2748 scr_poweron (); 2748 scr_poweron ();
2749 scrollbar_show (1); 2749 scrollBar.show (1);
2750 break; 2750 break;
2751 2751
2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2753 case 'n': 2753 case 'n':
2754 scr_charset_choose (2); 2754 scr_charset_choose (2);
… …
2761 } 2761 }
2762} 2762}
2763/*}}} */ 2763/*}}} */
2764 2764
2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2766/* *INDENT-OFF* */
2767enum { 2766enum {
2768 CSI_ICH = 0x40, 2767 CSI_ICH = 0x40,
2769 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2768 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2770 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2769 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2771 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2770 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2773 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2775 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2774 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2776 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2775 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2777}; 2776};
2778 2777
2779#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2778#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2779 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2780 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2782#define get_byte_array_bit(array, bit) \ 2781#define get_byte_array_bit(array, bit) \
2783 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2782 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2784 2783
2785const unsigned char csi_defaults[] = 2784static const unsigned char csi_defaults[] =
2786 { 2785 {
2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2786 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2788 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2787 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2789 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2788 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2789 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2791 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2790 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2792 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2791 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2793 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2792 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2794 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2793 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2795 }; 2794 };
2796/* *INDENT-ON* */
2797 2795
2798void 2796void ecb_hot
2799rxvt_term::process_csi_seq () 2797rxvt_term::process_csi_seq ()
2800{ 2798{
2801 unicode_t ch, priv, i; 2799 unicode_t ch, priv, i;
2802 unsigned int nargs, p; 2800 unsigned int nargs, p;
2803 int n, ndef; 2801 int n, ndef;
… …
2805 2803
2806 nargs = 0; 2804 nargs = 0;
2807 2805
2808 priv = 0; 2806 priv = 0;
2809 ch = cmd_getc (); 2807 ch = cmd_getc ();
2810 if (ch >= '<' && ch <= '?') 2808 if ((ch >= '<' && ch <= '?') || ch == '!')
2809 {
2811 { /* '<' '=' '>' '?' */ 2810 /* '<' '=' '>' '?' '!' */
2812 priv = ch; 2811 priv = ch;
2813 ch = cmd_getc (); 2812 ch = cmd_getc ();
2814 } 2813 }
2815 2814
2816 /* read any numerical arguments */ 2815 /* read any numerical arguments */
… …
2865 // versions. 2864 // versions.
2866 // 2865 //
2867 tt_printf ("\033[>%d;95;0c", 'U'); 2866 tt_printf ("\033[>%d;95;0c", 'U');
2868 } 2867 }
2869 break; 2868 break;
2869
2870 case '?': 2870 case '?':
2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2872 process_terminal_mode (ch, priv, nargs, arg); 2872 process_terminal_mode (ch, priv, nargs, arg);
2873 break; 2873 break;
2874
2875 case '!':
2876 if (ch == CSI_70)
2877 {
2878 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2879 scr_soft_reset ();
2880
2881 static const int pm_h[] = { 7, 25 };
2882 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2883
2884 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2885 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2874 } 2886 }
2887 break;
2888 }
2889
2875 return; 2890 return;
2876 } 2891 }
2877 2892
2878 switch (ch) 2893 switch (ch)
2879 { 2894 {
… …
2893 } 2908 }
2894 break; 2909 break;
2895#endif 2910#endif
2896 2911
2897 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2912 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2898 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2913 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2899 arg[0] = -arg[0]; 2914 arg[0] = -arg[0];
2900 /* FALLTHROUGH */ 2915 /* FALLTHROUGH */
2901 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2916 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2902 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2917 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2903 scr_gotorc (arg[0], 0, RELATIVE); 2918 scr_gotorc (arg[0], 0, RELATIVE);
2904 break; 2919 break;
2905 2920
2906 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2921 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2907 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2922 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3094 } 3109 }
3095} 3110}
3096/*}}} */ 3111/*}}} */
3097 3112
3098#if !ENABLE_MINIMAL 3113#if !ENABLE_MINIMAL
3099/* ARGSUSED */
3100void 3114void
3101rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3115rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3102{ 3116{
3103 int x, y; 3117 int x, y;
3104 XWindowAttributes wattr; 3118 XWindowAttributes wattr;
… …
3113 { 3127 {
3114 /* 3128 /*
3115 * commands 3129 * commands
3116 */ 3130 */
3117 case 1: /* deiconify window */ 3131 case 1: /* deiconify window */
3118 XMapWindow (dpy, parent[0]); 3132 XMapWindow (dpy, parent);
3119 break; 3133 break;
3120 case 2: /* iconify window */ 3134 case 2: /* iconify window */
3121 XIconifyWindow (dpy, parent[0], display->screen); 3135 XIconifyWindow (dpy, parent, display->screen);
3122 break; 3136 break;
3123 case 3: /* set position (pixels) */ 3137 case 3: /* set position (pixels) */
3124 XMoveWindow (dpy, parent[0], args[1], args[2]); 3138 XMoveWindow (dpy, parent, args[1], args[2]);
3125 break; 3139 break;
3126 case 4: /* set size (pixels) */ 3140 case 4: /* set size (pixels) */
3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3141 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3128 break; 3142 break;
3129 case 5: /* raise window */ 3143 case 5: /* raise window */
3130 XRaiseWindow (dpy, parent[0]); 3144 XRaiseWindow (dpy, parent);
3131 break; 3145 break;
3132 case 6: /* lower window */ 3146 case 6: /* lower window */
3133 XLowerWindow (dpy, parent[0]); 3147 XLowerWindow (dpy, parent);
3134 break; 3148 break;
3135 case 7: /* refresh window */ 3149 case 7: /* refresh window */
3136 scr_touch (true); 3150 scr_touch (true);
3137 break; 3151 break;
3138 case 8: /* set size (chars) */ 3152 case 8: /* set size (chars) */
… …
3141 break; 3155 break;
3142 3156
3143 //case 9: NYI, TODO, restore maximized window or maximize window 3157 //case 9: NYI, TODO, restore maximized window or maximize window
3144 default: 3158 default:
3145 if (args[0] >= 24) /* set height (chars) */ 3159 if (args[0] >= 24) /* set height (chars) */
3146 set_widthheight ((unsigned int)width, 3160 set_widthheight ((unsigned int)vt_width,
3147 (unsigned int) (args[1] * fheight)); 3161 (unsigned int) (args[1] * fheight));
3148 break; 3162 break;
3149 3163
3150 /* 3164 /*
3151 * reports - some output format copied from XTerm 3165 * reports - some output format copied from XTerm
3152 */ 3166 */
3153 case 11: /* report window state */ 3167 case 11: /* report window state */
3154 XGetWindowAttributes (dpy, parent[0], &wattr); 3168 XGetWindowAttributes (dpy, parent, &wattr);
3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3169 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3156 break; 3170 break;
3157 case 13: /* report window position */ 3171 case 13: /* report window position */
3158 XGetWindowAttributes (dpy, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent, &wattr);
3159 XTranslateCoordinates (dpy, parent[0], wattr.root, 3173 XTranslateCoordinates (dpy, parent, wattr.root,
3160 -wattr.border_width, -wattr.border_width, 3174 -wattr.border_width, -wattr.border_width,
3161 &x, &y, &wdummy); 3175 &x, &y, &wdummy);
3162 tt_printf ("\033[3;%d;%dt", x, y); 3176 tt_printf ("\033[3;%d;%dt", x, y);
3163 break; 3177 break;
3164 case 14: /* report window size (pixels) */ 3178 case 14: /* report window size (pixels) */
3165 XGetWindowAttributes (dpy, parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3180 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3167 break; 3181 break;
3168 case 18: /* report text area size (chars) */ 3182 case 18: /* report text area size (chars) */
3169 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3183 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3170 break; 3184 break;
… …
3172 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3173 break; 3187 break;
3174 case 20: /* report icon label */ 3188 case 20: /* report icon label */
3175 { 3189 {
3176 char *s; 3190 char *s;
3177 XGetIconName (dpy, parent[0], &s); 3191 XGetIconName (dpy, parent, &s);
3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3192 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3179 XFree (s); 3193 XFree (s);
3180 } 3194 }
3181 break; 3195 break;
3182 case 21: /* report window title */ 3196 case 21: /* report window title */
3183 { 3197 {
3184 char *s; 3198 char *s;
3185 XFetchName (dpy, parent[0], &s); 3199 XFetchName (dpy, parent, &s);
3186 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3200 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3187 XFree (s); 3201 XFree (s);
3188 } 3202 }
3189 break; 3203 break;
3190 } 3204 }
… …
3246 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3260 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3247 */ 3261 */
3248void 3262void
3249rxvt_term::process_dcs_seq () 3263rxvt_term::process_dcs_seq ()
3250{ 3264{
3251 char *s;
3252 unicode_t eh;
3253
3254 /* 3265 /*
3255 * Not handled yet 3266 * Not handled yet
3256 */ 3267 */
3268
3269 unicode_t eh;
3257 s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3258 if (s) 3271 if (s)
3259 free (s); 3272 free (s);
3260 3273
3261 return; 3274 return;
3262} 3275}
… …
3266 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3279 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3267 */ 3280 */
3268void 3281void
3269rxvt_term::process_osc_seq () 3282rxvt_term::process_osc_seq ()
3270{ 3283{
3271 unicode_t ch, eh;
3272 int arg; 3284 int arg;
3273 3285
3274 ch = cmd_getc (); 3286 unicode_t ch = cmd_getc ();
3275 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3287 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3276 arg = arg * 10 + (ch - '0'); 3288 arg = arg * 10 + (ch - '0');
3277 3289
3278 if (ch == ';') 3290 if (ch == ';')
3279 { 3291 {
3292 unicode_t eh;
3280 char *s = get_to_st (eh); 3293 char *s = get_to_st (eh);
3281 3294
3282 if (s) 3295 if (s)
3283 { 3296 {
3284 process_xterm_seq (arg, s, eh); 3297 process_xterm_seq (arg, s, eh);
… …
3308 3321
3309/* 3322/*
3310 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3323 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3311 */ 3324 */
3312void 3325void
3313rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3326rxvt_term::process_xterm_seq (int op, char *str, char resp)
3314{ 3327{
3315 int color; 3328 int color;
3316 char *buf, *name; 3329 char *buf, *name;
3317 bool query = str[0] == '?' && !str[1]; 3330 bool query = str[0] == '?' && !str[1];
3318 int saveop = op; 3331 int saveop = op;
… …
3345 unsigned long bytes_after; 3358 unsigned long bytes_after;
3346 unsigned char *value = 0; 3359 unsigned char *value = 0;
3347 const char *str = ""; 3360 const char *str = "";
3348 3361
3349 if (prop 3362 if (prop
3350 && XGetWindowProperty (dpy, parent[0], 3363 && XGetWindowProperty (dpy, parent,
3351 prop, 0, 1<<16, 0, AnyPropertyType, 3364 prop, 0, 1<<16, 0, AnyPropertyType,
3352 &actual_type, &actual_format, 3365 &actual_type, &actual_format,
3353 &nitems, &bytes_after, &value) == Success 3366 &nitems, &bytes_after, &value) == Success
3354 && actual_type != None 3367 && actual_type != None
3355 && actual_format == 8) 3368 && actual_format == 8)
… …
3359 3372
3360 XFree (value); 3373 XFree (value);
3361 } 3374 }
3362 else 3375 else
3363 { 3376 {
3364 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3377 char *eq = strchr (str, '=');
3365 3378
3366 if (eq) 3379 if (eq)
3367 { 3380 {
3368 *eq = 0; 3381 *eq = 0;
3369 set_utf8_property (display->atom (str), eq + 1); 3382 set_utf8_property (display->atom (str), eq + 1);
3370 } 3383 }
3371 else 3384 else
3372 XDeleteProperty (dpy, parent[0], 3385 XDeleteProperty (dpy, parent,
3373 display->atom (str)); 3386 display->atom (str));
3374 } 3387 }
3375 break; 3388 break;
3376 3389
3377 case XTerm_Color: 3390 case XTerm_Color:
… …
3390 *buf++ = '\0'; 3403 *buf++ = '\0';
3391 3404
3392 process_color_seq (op, color, name, resp); 3405 process_color_seq (op, color, name, resp);
3393 } 3406 }
3394 break; 3407 break;
3408 case Rxvt_restoreFG:
3395 case XTerm_Color00: 3409 case XTerm_Color00:
3396 process_color_seq (op, Color_fg, str, resp); 3410 process_color_seq (op, Color_fg, str, resp);
3397 break; 3411 break;
3412 case Rxvt_restoreBG:
3398 case XTerm_Color01: 3413 case XTerm_Color01:
3399 process_color_seq (op, Color_bg, str, resp); 3414 process_color_seq (op, Color_bg, str, resp);
3400 break; 3415 break;
3401#ifndef NO_CURSORCOLOR 3416#ifndef NO_CURSORCOLOR
3402 case XTerm_Color_cursor: 3417 case XTerm_Color_cursor:
… …
3407 process_color_seq (op, Color_pointer_fg, str, resp); 3422 process_color_seq (op, Color_pointer_fg, str, resp);
3408 break; 3423 break;
3409 case XTerm_Color_pointer_bg: 3424 case XTerm_Color_pointer_bg:
3410 process_color_seq (op, Color_pointer_bg, str, resp); 3425 process_color_seq (op, Color_pointer_bg, str, resp);
3411 break; 3426 break;
3427#ifdef OPTION_HC
3428 case XTerm_Color_HC:
3429 process_color_seq (op, Color_HC, str, resp);
3430 break;
3431 case XTerm_Color_HTC:
3432 process_color_seq (op, Color_HTC, str, resp);
3433 break;
3434#endif
3412#ifndef NO_BOLD_UNDERLINE_REVERSE 3435#ifndef NO_BOLD_UNDERLINE_REVERSE
3413 case XTerm_Color_RV:
3414 process_color_seq (op, Color_RV, str, resp);
3415 break;
3416 case Rxvt_Color_BD:
3417 case URxvt_Color_BD: 3436 case URxvt_Color_BD:
3418 process_color_seq (op, Color_BD, str, resp); 3437 process_color_seq (op, Color_BD, str, resp);
3419 break; 3438 break;
3420 case Rxvt_Color_UL:
3421 case URxvt_Color_UL: 3439 case URxvt_Color_UL:
3422 process_color_seq (op, Color_UL, str, resp); 3440 process_color_seq (op, Color_UL, str, resp);
3423 break; 3441 break;
3424 case URxvt_Color_IT: 3442 case URxvt_Color_IT:
3425 process_color_seq (op, Color_IT, str, resp); 3443 process_color_seq (op, Color_IT, str, resp);
3426 break; 3444 break;
3427#endif 3445#endif
3446 case URxvt_Color_border:
3447 process_color_seq (op, Color_border, str, resp);
3448 break;
3428#if ENABLE_TRANSPARENCY 3449#if ENABLE_TRANSPARENCY
3429 case URxvt_Color_tint: 3450 case URxvt_Color_tint:
3430 process_color_seq (op, Color_tint, str, resp); 3451 process_color_seq (op, Color_tint, str, resp);
3431 { 3452 {
3432 bool changed = false; 3453 bool changed = false;
3454
3433 if (ISSET_PIXCOLOR (Color_tint)) 3455 if (ISSET_PIXCOLOR (Color_tint))
3434 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3456 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3435 else 3457
3436 changed = bgPixmap.unset_tint ();
3437 if (changed) 3458 if (changed)
3438 update_background (); 3459 update_background ();
3439 } 3460 }
3440 3461
3441 break; 3462 break;
… …
3444#if BG_IMAGE_FROM_FILE 3465#if BG_IMAGE_FROM_FILE
3445 case Rxvt_Pixmap: 3466 case Rxvt_Pixmap:
3446 if (!strcmp (str, "?")) 3467 if (!strcmp (str, "?"))
3447 { 3468 {
3448 char str[256]; 3469 char str[256];
3470 int h_scale = 0, v_scale = 0;
3471 int h_align = 0, v_align = 0;
3472 if (image_vec.size () > 0)
3473 {
3474 h_scale = image_vec[0].h_scale;
3475 v_scale = image_vec[0].v_scale;
3476 h_align = image_vec[0].h_align;
3477 v_align = image_vec[0].v_align;
3478 }
3449 3479
3450 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3480 sprintf (str, "[%dx%d+%d+%d]",
3451 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3481 h_scale, v_scale,
3452 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3482 h_align, v_align);
3453 process_xterm_seq (XTerm_title, str, CHAR_ST); 3483 process_xterm_seq (XTerm_title, str, CHAR_ST);
3454 } 3484 }
3455 else 3485 else
3456 { 3486 {
3457 int changed = 0; 3487 bool changed = false;
3458 3488
3459 if (*str != ';') 3489 if (*str != ';')
3460 { 3490 {
3461 /* reset to default scaling :*/ 3491 if (image_vec.size () > 0)
3462 bgPixmap.unset_geometry (); 3492 changed = image_vec[0].set_file_geometry (str);
3463 if (bgPixmap.set_file (str)) /* change pixmap */ 3493 else
3494 {
3495 rxvt_image *image = new_image ();
3496 if (!image->set_file_geometry (str))
3497 image_vec.pop_back ();
3498 else
3464 changed++; 3499 changed = true;
3465 str = strchr (str, ';'); 3500 }
3466 if (str == NULL)
3467 bgPixmap.set_defaultGeometry ();
3468 } 3501 }
3469 while (str) 3502 else
3470 { 3503 {
3471 str++; 3504 str++;
3472 if (bgPixmap.set_geometry (str)) 3505 if (image_vec.size () > 0)
3473 changed++; 3506 changed = image_vec[0].set_geometry (str, true);
3474 str = strchr (str, ';');
3475 } 3507 }
3508
3476 if (changed) 3509 if (changed)
3510 {
3511 if (bg_window_position_sensitive ())
3512 {
3513 int x, y;
3514 get_window_origin (x, y);
3515 bg_set_position (x, y);
3516 }
3477 update_background (); 3517 update_background ();
3518 }
3478 } 3519 }
3479 break; 3520 break;
3480#endif 3521#endif
3481
3482 case Rxvt_restoreFG:
3483 set_window_color (Color_fg, str);
3484 break;
3485 case Rxvt_restoreBG:
3486 set_window_color (Color_bg, str);
3487 break;
3488 3522
3489 case XTerm_logfile: 3523 case XTerm_logfile:
3490 // TODO, when secure mode? 3524 // TODO, when secure mode?
3491 break; 3525 break;
3492 3526
… …
3559 break; 3593 break;
3560#endif 3594#endif
3561 3595
3562#if ENABLE_PERL 3596#if ENABLE_PERL
3563 case URxvt_perl: 3597 case URxvt_perl:
3564 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3598 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3565 ; // no responses yet
3566 break; 3599 break;
3567#endif 3600#endif
3568 } 3601 }
3569} 3602}
3570/*----------------------------------------------------------------------*/ 3603/*----------------------------------------------------------------------*/
… …
3577 * 's' = save 3610 * 's' = save
3578 * 'r' = restore 3611 * 'r' = restore
3579 * 't' = toggle 3612 * 't' = toggle
3580 * so no need for fancy checking 3613 * so no need for fancy checking
3581 */ 3614 */
3582int 3615int ecb_cold
3583rxvt_term::privcases (int mode, unsigned long bit) 3616rxvt_term::privcases (int mode, unsigned long bit)
3584{ 3617{
3585 int state; 3618 int state;
3586 3619
3587 if (mode == 's') 3620 if (mode == 's')
3588 { 3621 {
3589 SavedModes |= (priv_modes & bit); 3622 if (priv_modes & bit)
3623 SavedModes |= bit;
3624 else
3625 SavedModes &= ~bit;
3590 return -1; 3626 return -1;
3591 } 3627 }
3592 else 3628 else
3593 { 3629 {
3594 if (mode == 'r') 3630 if (mode == 'r')
3595 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3631 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3596 else 3632 else
3597 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3633 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3598 PrivMode (state, bit); 3634
3635 if (state)
3636 priv_modes |= bit;
3637 else
3638 priv_modes &= ~bit;
3599 } 3639 }
3600 3640
3601 return state; 3641 return state;
3602} 3642}
3603 3643
3604/* we're not using priv _yet_ */ 3644/* we're not using priv _yet_ */
3605void 3645void
3606rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3646rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3607{ 3647{
3608 unsigned int i, j; 3648 unsigned int i, j;
3609 int state; 3649 int state;
3610 3650
3611 static const struct 3651 static const struct
3612 { 3652 {
3613 const int argval; 3653 const int argval;
3614 const unsigned long bit; 3654 const unsigned long bit;
3615 } argtopriv[] = { 3655 } argtopriv[] = {
3616 { 1, PrivMode_aplCUR }, 3656 { 1, PrivMode_aplCUR }, // DECCKM
3617 { 2, PrivMode_vt52 }, 3657 { 2, PrivMode_vt52 }, // DECANM
3618 { 3, PrivMode_132 }, 3658 { 3, PrivMode_132 }, // DECCOLM
3619 { 4, PrivMode_smoothScroll }, 3659 { 4, PrivMode_smoothScroll }, // DECSCLM
3620 { 5, PrivMode_rVideo }, 3660 { 5, PrivMode_rVideo }, // DECSCNM
3621 { 6, PrivMode_relOrigin }, 3661 { 6, PrivMode_relOrigin }, // DECOM
3622 { 7, PrivMode_Autowrap }, 3662 { 7, PrivMode_Autowrap }, // DECAWM
3623 // 8, bi-directional support mode 3663 // 8, auto-repeat keys // DECARM
3624 { 9, PrivMode_MouseX10 }, 3664 { 9, PrivMode_MouseX10 },
3625 // 18, 19 printing-related 3665 // 18 end FF to printer after print screen
3666 // 19 Print screen prints full screen/scroll region
3626 { 25, PrivMode_VisibleCursor }, 3667 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3627#ifdef scrollBar_esc 3668#ifdef scrollBar_esc
3628 { scrollBar_esc, PrivMode_scrollBar }, 3669 { scrollBar_esc, PrivMode_scrollBar },
3629#endif 3670#endif
3630 { 35, PrivMode_ShiftKeys }, // rxvt extension 3671 { 35, PrivMode_ShiftKeys }, // rxvt extension
3672 // 38, tektronix mode // DECTEK
3631 { 40, PrivMode_132OK }, 3673 { 40, PrivMode_132OK },
3632 // 41 xterm more fixes NYI 3674 // 41 xterm more fixes NYI
3633 // 45 margin bell NYI 3675 // 45 margin bell NYI
3634 // 46 start logging 3676 // 46 start logging
3635 { 47, PrivMode_Screen }, 3677 { 47, PrivMode_Screen },
3636 { 66, PrivMode_aplKP }, 3678 { 66, PrivMode_aplKP }, // DECNKM
3637#ifndef NO_BACKSPACE_KEY 3679#ifndef NO_BACKSPACE_KEY
3638 { 67, PrivMode_BackSpace }, 3680 { 67, PrivMode_BackSpace }, // DECBKM
3639#endif 3681#endif
3640 { 1000, PrivMode_MouseX11 }, 3682 { 1000, PrivMode_MouseX11 },
3641 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3642 { 1002, PrivMode_MouseBtnEvent }, 3683 { 1002, PrivMode_MouseBtnEvent },
3643 { 1003, PrivMode_MouseAnyEvent }, 3684 { 1003, PrivMode_MouseAnyEvent },
3685#if ENABLE_FRILLS
3686 { 1005, PrivMode_ExtModeMouse },
3687#endif
3644 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3688 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3645 { 1011, PrivMode_Keypress }, // rxvt extension 3689 { 1011, PrivMode_Keypress }, // rxvt extension
3690#if ENABLE_FRILLS
3691 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3692#endif
3646 // 1035 enable modifiers for alt, numlock NYI 3693 // 1035 enable modifiers for alt, numlock NYI
3647 // 1036 send ESC for meta keys NYI 3694 // 1036 send ESC for meta keys NYI
3648 // 1037 send DEL for keypad delete NYI 3695 // 1037 send DEL for keypad delete NYI
3649 { 1047, PrivMode_Screen }, 3696 { 1047, PrivMode_Screen },
3650 // 1048 save and restore cursor 3697 // 1048 save and restore cursor, implemented in code
3651 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3698 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3652 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3699 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3700 { 2004, PrivMode_BracketPaste },
3653 }; 3701 };
3654 3702
3655 if (nargs == 0) 3703 if (nargs == 0)
3656 return; 3704 return;
3657 3705
… …
3664 for (i = 0; i < nargs; i++) 3712 for (i = 0; i < nargs; i++)
3665 { 3713 {
3666 state = -1; 3714 state = -1;
3667 3715
3668 /* basic handling */ 3716 /* basic handling */
3669 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3717 for (j = 0; j < ecb_array_length (argtopriv); j++)
3670 if (argtopriv[j].argval == arg[i]) 3718 if (argtopriv[j].argval == arg[i])
3671 { 3719 {
3672 state = privcases (mode, argtopriv[j].bit); 3720 state = privcases (mode, argtopriv[j].bit);
3673 break; 3721 break;
3674 } 3722 }
… …
3682 3730
3683 scr_touch (true); 3731 scr_touch (true);
3684 break; 3732 break;
3685#endif 3733#endif
3686 case 1048: /* alternative cursor save */ 3734 case 1048: /* alternative cursor save */
3687 case 1049:
3688 if (option (Opt_secondaryScreen)) 3735 if (option (Opt_secondaryScreen))
3689 if (mode == 0) 3736 if (mode == 0)
3690 scr_cursor (RESTORE); 3737 scr_cursor (RESTORE);
3691 else if (mode == 1) 3738 else if (mode == 1)
3692 scr_cursor (SAVE); 3739 scr_cursor (SAVE);
… …
3701 case 2: /* VT52 mode */ 3748 case 2: /* VT52 mode */
3702 /* oddball mode. should be set regardless of set/reset 3749 /* oddball mode. should be set regardless of set/reset
3703 * parameter. Return from VT52 mode with an ESC < from 3750 * parameter. Return from VT52 mode with an ESC < from
3704 * within VT52 mode 3751 * within VT52 mode
3705 */ 3752 */
3706 PrivMode (1, PrivMode_vt52); 3753 priv_modes |= PrivMode_vt52;
3707 break; 3754 break;
3708 case 3: /* 80/132 */ 3755 case 3: /* 80/132 */
3709 if (priv_modes & PrivMode_132OK) 3756 if (priv_modes & PrivMode_132OK)
3710 set_widthheight (((state ? 132 : 80) * fwidth), height); 3757 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3711 break; 3758 break;
3712 case 4: /* smooth scrolling */ 3759 case 4: /* smooth scrolling */
3713 set_option (Opt_jumpScroll, !state); 3760 set_option (Opt_jumpScroll, !state);
3714 break; 3761 break;
3715 case 5: /* reverse video */ 3762 case 5: /* reverse video */
… …
3726 if (state) /* orthogonal */ 3773 if (state) /* orthogonal */
3727 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3774 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3728 break; 3775 break;
3729#ifdef scrollBar_esc 3776#ifdef scrollBar_esc
3730 case scrollBar_esc: 3777 case scrollBar_esc:
3731 if (scrollbar_mapping (state)) 3778 scrollBar.map (state);
3732 {
3733 resize_all_windows (0, 0, 0); 3779 resize_all_windows (0, 0, 0);
3734 scr_touch (true); 3780 scr_touch (true);
3735 }
3736 break; 3781 break;
3737#endif 3782#endif
3738 case 25: /* visible/invisible cursor */ 3783 case 25: /* visible/invisible cursor */
3739 scr_cursor_visible (state); 3784 scr_cursor_visible (state);
3740 break; 3785 break;
… …
3747 /* case 67: - backspace key */ 3792 /* case 67: - backspace key */
3748 case 1000: /* X11 mouse reporting */ 3793 case 1000: /* X11 mouse reporting */
3749 if (state) /* orthogonal */ 3794 if (state) /* orthogonal */
3750 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3795 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3751 break; 3796 break;
3752#if 0
3753 case 1001:
3754 break; /* X11 mouse highlighting */
3755#endif
3756 case 1002: 3797 case 1002:
3757 case 1003: 3798 case 1003:
3758 if (state) { 3799 if (state)
3800 {
3759 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3801 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3760 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3802 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3803 mouse_row = mouse_col = 0;
3761 vt_emask_mouse = PointerMotionMask; 3804 vt_emask_mouse = PointerMotionMask;
3805 }
3762 } else 3806 else
3763 vt_emask_mouse = NoEventMask; 3807 vt_emask_mouse = NoEventMask;
3808
3764 vt_select_input (); 3809 vt_select_input ();
3765 break; 3810 break;
3766 case 1010: /* scroll to bottom on TTY output inhibit */ 3811 case 1010: /* scroll to bottom on TTY output inhibit */
3767 set_option (Opt_scrollTtyOutput, !state); 3812 set_option (Opt_scrollTtyOutput, !state);
3768 break; 3813 break;
3769 case 1011: /* scroll to bottom on key press */ 3814 case 1011: /* scroll to bottom on key press */
3770 set_option (Opt_scrollTtyKeypress, state); 3815 set_option (Opt_scrollTtyKeypress, state);
3771 break; 3816 break;
3772 case 1047: /* secondary screen w/ clearing last */ 3817 case 1047: /* secondary screen w/ clearing last */
3773 if (option (Opt_secondaryScreen)) 3818 if (option (Opt_secondaryScreen))
3774 if (current_screen != PRIMARY) 3819 if (!state)
3775 scr_erase_screen (2); 3820 scr_erase_screen (2);
3821
3776 scr_change_screen (state); 3822 scr_change_screen (state);
3777 break; 3823 break;
3778 case 1049: /* secondary screen w/ clearing first */ 3824 case 1049: /* secondary screen w/ clearing first */
3825 if (option (Opt_secondaryScreen))
3826 if (state)
3827 scr_cursor (SAVE);
3828
3779 scr_change_screen (state); 3829 scr_change_screen (state);
3830
3780 if (option (Opt_secondaryScreen)) 3831 if (option (Opt_secondaryScreen))
3781 if (current_screen != PRIMARY) 3832 if (state)
3782 scr_erase_screen (2); 3833 scr_erase_screen (2);
3834 else
3835 scr_cursor (RESTORE);
3783 break; 3836 break;
3784 default: 3837 default:
3785 break; 3838 break;
3786 } 3839 }
3787 } 3840 }
3788} 3841}
3789/*}}} */ 3842/*}}} */
3790 3843
3791/*{{{ process sgr sequences */ 3844/*{{{ process sgr sequences */
3792void 3845void ecb_hot
3793rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3846rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3794{ 3847{
3795 unsigned int i; 3848 unsigned int i;
3796 short rendset; 3849 short rendset;
3797 int rendstyle; 3850 int rendstyle;
… …
3940 } 3993 }
3941 } 3994 }
3942} 3995}
3943/*}}} */ 3996/*}}} */
3944 3997
3945/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3946void
3947rxvt_term::process_graphics ()
3948{
3949 unicode_t ch, cmd = cmd_getc ();
3950
3951 if (cmd == 'Q')
3952 { /* query graphics */
3953 tt_printf ("\033G0\012"); /* no graphics */
3954 return;
3955 }
3956 /* swallow other graphics sequences until terminating ':' */
3957 do
3958 ch = cmd_getc ();
3959 while (ch != ':');
3960}
3961/*}}} */
3962
3963/* ------------------------------------------------------------------------- */ 3998/* ------------------------------------------------------------------------- */
3964 3999
3965/* 4000/*
3966 * Send printf () formatted output to the command. 4001 * Send printf () formatted output to the command.
3967 * Only use for small amounts of data. 4002 * Only use for small amounts of data.
… …
3980 4015
3981/* ---------------------------------------------------------------------- */ 4016/* ---------------------------------------------------------------------- */
3982/* Write data to the pty as typed by the user, pasted with the mouse, 4017/* Write data to the pty as typed by the user, pasted with the mouse,
3983 * or generated by us in response to a query ESC sequence. 4018 * or generated by us in response to a query ESC sequence.
3984 */ 4019 */
3985const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4020static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3986 4021
3987void 4022void
3988rxvt_term::tt_write (const char *data, unsigned int len) 4023rxvt_term::tt_write (const char *data, unsigned int len)
3989{ 4024{
3990 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4025 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3995 4030
3996 if (v_buflen == 0) 4031 if (v_buflen == 0)
3997 { 4032 {
3998 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4033 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3999 4034
4035 max_it (written, 0);
4036
4000 if ((unsigned int)written == len) 4037 if (written == len)
4001 return; 4038 return;
4002 4039
4003 data += written; 4040 data += written;
4004 len -= written; 4041 len -= written;
4005 } 4042 }
4006 4043
4007 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4044 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4008 4045
4009 memcpy (v_buffer + v_buflen, data, len); 4046 memcpy (v_buffer + v_buflen, data, len);
4010 v_buflen += len; 4047 v_buflen += len;
4011 4048
4012 pty_ev.set (EVENT_READ | EVENT_WRITE); 4049 pty_ev.set (ev::READ | ev::WRITE);
4013} 4050}
4014 4051
4015void rxvt_term::pty_write () 4052void rxvt_term::pty_write ()
4016{ 4053{
4017 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4054 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4023 if (v_buflen == 0) 4060 if (v_buflen == 0)
4024 { 4061 {
4025 free (v_buffer); 4062 free (v_buffer);
4026 v_buffer = 0; 4063 v_buffer = 0;
4027 4064
4028 pty_ev.set (EVENT_READ); 4065 pty_ev.set (ev::READ);
4029 return; 4066 return;
4030 } 4067 }
4031 4068
4032 memmove (v_buffer, v_buffer + written, v_buflen); 4069 memmove (v_buffer, v_buffer + written, v_buflen);
4033 } 4070 }
4034 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4071 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4035 pty_ev.set (EVENT_READ); 4072 pty_ev.set (ev::READ);
4036} 4073}
4037 4074
4038/*----------------------- end-of-file (C source) -----------------------*/ 4075/*----------------------- end-of-file (C source) -----------------------*/
4039 4076

Diff Legend

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