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.364 by ayin, Mon Nov 12 14:53:13 2007 UTC vs.
Revision 1.486 by sf-exg, Fri Apr 29 13:29:45 2011 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.
… …
161 162
162void 163void
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
… …
250#endif 257#endif
251 258
252void 259void
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
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
306static inline KeySym
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
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
302void 401void
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
… …
320 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
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
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 423
332 kbuf[0] = 0; 424 kbuf[0] = 0;
333 425
334#ifdef USE_XIM 426#ifdef USE_XIM
335 if (Input_Context) 427 if (Input_Context)
… …
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
553 newlen = 1; 655 case XK_BackSpace:
554#ifdef XK_KP_Home 656 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 657 {
556 XK_KP_7, // XK_KP_Home 658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 659 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 660 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 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
684 newlen = 0;
685 }
686 break;
571 687
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 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:
573 { 768 {
574 unsigned int index = keysym - XK_KP_Home; 769 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
576 } 774 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 775 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 776 }
777
778 if (newlen)
779 len = strlen (kbuf);
794 780
795 /* 781 /*
796 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
797 */ 783 */
798#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
898 commit_iso14755 (); 884 commit_iso14755 ();
899 885
900 return; 886 return;
901 } 887 }
902 888
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 890 if (i[0] == keysym)
905 { 891 {
906 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 893 commit_iso14755 ();
908 894
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
947#endif 933#endif
948} 934}
949 935
950#if defined (KEYSYM_RESOURCE)
951unsigned int
952rxvt_term::cmd_write (const char *str, unsigned int count)
953{
954 unsigned int n, s;
955
956 n = cmdbuf_ptr - cmdbuf_base;
957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
958
959 if (n > 0 && s < count)
960 {
961 memmove (cmdbuf_base, cmdbuf_ptr,
962 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
963 cmdbuf_ptr = cmdbuf_base;
964 cmdbuf_endp -= n;
965 s += n;
966 }
967
968 if (count > s)
969 {
970 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
971 count = s;
972 }
973
974 for (; count--;)
975 *cmdbuf_endp++ = *str++;
976
977 cmd_parse ();
978
979 return 0;
980}
981#endif
982
983void 936void
984rxvt_term::flush () 937rxvt_term::flush ()
985{ 938{
986 flush_ev.stop (); 939 flush_ev.stop ();
987 940
988#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ()) 942 if (bg_flags & BG_NEEDS_REFRESH)
990 { 943 {
991// scr_clear (true); This needs to be researched further! 944 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 945 scr_touch (false);
993 } 946 }
994#endif 947#endif
995 948
996 if (want_refresh) 949 if (want_refresh)
… …
1032 } 985 }
1033 while (row < end_row); 986 while (row < end_row);
1034 } 987 }
1035 988
1036 scr_refresh (); 989 scr_refresh ();
1037 scrollbar_show (1); 990 scrollBar.show (1);
1038#ifdef USE_XIM 991#ifdef USE_XIM
1039 IMSendSpot (); 992 IMSendSpot ();
1040#endif 993#endif
1041 } 994 }
1042 995
1043 display->flush (); 996 display->flush ();
1044} 997}
1045 998
999/* checks whether a refresh is requested and starts the refresh timer */
1046void 1000void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1001rxvt_term::refresh_check ()
1048{ 1002{
1049 make_current (); 1003 if (want_refresh && !flush_ev.is_active ())
1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1005
1051 display->flush (); 1006 display->flush ();
1052
1053 if (want_refresh && !flush_ev.active)
1054 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1055} 1007}
1056 1008
1057void 1009void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1010rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1011{
… …
1067void 1019void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1021{
1070 hidden_cursor = !hidden_cursor; 1022 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1023 want_refresh = 1;
1024 refresh_check ();
1072} 1025}
1073#endif 1026#endif
1074 1027
1075#ifdef TEXT_BLINK 1028#ifdef TEXT_BLINK
1076void 1029void
… …
1078{ 1031{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1032 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1033 {
1081 hidden_text = !hidden_text; 1034 hidden_text = !hidden_text;
1082 want_refresh = 1; 1035 want_refresh = 1;
1036 refresh_check ();
1083 } 1037 }
1084}
1085#endif
1086
1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1088void
1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1090{
1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1093 want_refresh = 1;
1094 else 1038 else
1095 w.stop (); 1039 w.stop ();
1096} 1040}
1097#endif 1041#endif
1098 1042
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1049 {
1050 want_refresh = 1;
1051 refresh_check ();
1052 }
1053 else
1054 w.stop ();
1055}
1056#endif
1057
1099#ifdef SELECTION_SCROLLING 1058#ifdef SELECTION_SCROLLING
1100void 1059void
1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1102{ 1061{
1103 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1062 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1104 { 1063 {
1105 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1064 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1106 want_refresh = 1; 1065 want_refresh = 1;
1066 refresh_check ();
1107 } 1067 }
1108 else 1068 else
1109 w.stop (); 1069 w.stop ();
1110} 1070}
1111#endif 1071#endif
1112 1072
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void 1074void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{ 1076{
1117 if (mouse_slip_wheel_speed == 0 1077 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1119 : scr_page (UP, mouse_slip_wheel_speed))
1120 { 1078 {
1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
1124 want_refresh = 1; 1079 want_refresh = 1;
1080 refresh_check ();
1081 }
1082
1083 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1125 } 1084 {
1126 else 1085 mouse_slip_wheel_speed = 0;
1127 w.stop (); 1086 w.stop ();
1087 }
1128} 1088}
1129#endif 1089#endif
1130 1090
1131#if LINUX_YIELD_HACK 1091#if LINUX_YIELD_HACK
1132static struct event_handler 1092static struct event_handler
… …
1137 { 1097 {
1138 // this should really be sched_yield(), but the linux guys thought 1098 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than 1099 // that giving a process calling sched_yield () less cpu time than
1140 // ones with high nice levels is a useful thing to do. It surely is is 1100 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS. 1101 // allowed by the sus... as is returning ENOSYS.
1102 // since the linux guys additionally thought that breaking the only
1103 // known workaround against their unusable sched_yield hack is cool,
1104 // we just nanosleep a bit and hope for the best.
1142 1105
1143 struct timespec ts = { 0, 0 }; 1106 struct timespec ts = { 0, 1000 };
1144 nanosleep (&ts, 0); 1107 nanosleep (&ts, 0);
1145 1108
1146 w.stop (); 1109 w.stop ();
1147 } 1110 }
1148 1111
… …
1151 { 1114 {
1152 } 1115 }
1153} event_handler; 1116} event_handler;
1154#endif 1117#endif
1155 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1156bool 1152bool
1157rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1158{ 1154{
1159 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1160 1156
1161 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1162 { 1158
1163 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1164 n = 0;
1165 } 1160 {
1166 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1167 memmove (cmdbuf_base, cmdbuf_ptr, n);
1168 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1169 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1170 1166
1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1172 1168
1173 if (r > 0) 1169 if (r > 0)
1174 { 1170 {
1175 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1176 return true; 1172 return true;
… …
1198{ 1194{
1199 make_current (); 1195 make_current ();
1200 1196
1201 if (revents & ev::READ) 1197 if (revents & ev::READ)
1202 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1203 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1204 if (cmd_parse ()) 1200 cmd_parse ();
1205 break;
1206 1201
1207 if (revents & ev::WRITE) 1202 if (revents & ev::WRITE)
1208 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1209} 1206}
1210 1207
1211void 1208void
1212rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1213{ 1210{
… …
1249{ 1246{
1250 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1251 int x, y; 1248 int x, y;
1252 int code = 32; 1249 int code = 32;
1253 1250
1254 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1255 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1256 if (ev.type == MotionNotify) { 1254 if (ev.type == MotionNotify)
1255 {
1257 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1258 return; 1257 return;
1258
1259 mouse_row = x; 1259 mouse_row = x;
1260 mouse_col = y; 1260 mouse_col = y;
1261 code += 32; 1261 code += 32;
1262 } 1262 }
1263 1263
1264 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1265 button_number = 3; 1265 button_number = 3;
1266 else 1266 else
1267 { 1267 {
1268 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1269 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1270 if (button_number >= 3) 1270 if (button_number >= 3)
1271 button_number += (64 - 3); 1271 button_number += 64 - 3;
1272 } 1272 }
1273 1273
1274 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1275 { 1275 {
1276 /* 1276 /*
… …
1308 fputc ('A', stderr); 1308 fputc ('A', stderr);
1309 if (key_state & 32) 1309 if (key_state & 32)
1310 fputc ('2', stderr); 1310 fputc ('2', stderr);
1311 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1312 button_number, 1312 button_number,
1313 x + 1, 1313 x,
1314 y + 1); 1314 y);
1315#endif 1315#endif
1316 1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
1317 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1318 (code + button_number + key_state), 1331 code + button_number + key_state,
1319 (32 + x + 1), 1332 32 + x,
1320 (32 + y + 1)); 1333 32 + y);
1321} 1334}
1322 1335
1323/*{{{ process an X event */ 1336/*{{{ process an X event */
1324void 1337void
1325rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1427 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1428 focus_out (); 1441 focus_out ();
1429 break; 1442 break;
1430 1443
1431 case ConfigureNotify: 1444 case ConfigureNotify:
1432 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height); */
1435 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1436 { 1446 {
1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1438 ; 1448 ;
1449
1450#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ())
1453 {
1454 int x, y;
1455 if (ev.xconfigure.send_event)
1456 {
1457 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y;
1459 }
1460 else
1461 get_window_origin (x, y);
1462
1463 if (bg_set_position (x, y)
1464 || !(bg_flags & BG_IS_VALID))
1465 moved = true;
1466 }
1467#endif
1439 1468
1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1441 { 1470 {
1442 seen_resize = 1; 1471 seen_resize = 1;
1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1444 } 1473 }
1445 else 1474 else
1446 { 1475 {
1447#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ()) 1477 if (moved)
1478 {
1479 if (mapped)
1449 update_background (); 1480 update_background ();
1481 else
1482 bg_invalidate ();
1483 }
1450#endif 1484#endif
1451 } 1485 }
1486
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1453 } 1488 }
1454 break; 1489 break;
1455 1490
1456 case PropertyNotify: 1491 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1492 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1459 && ev.xproperty.state == PropertyNewValue)
1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1461
1462 break; 1493 break;
1463 1494
1464 case SelectionClear: 1495 case SelectionClear:
1465 selection_clear (); 1496 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1466 break;
1467
1468 case SelectionNotify:
1469 if (selection_wait == Sel_normal)
1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1471 break; 1497 break;
1472 1498
1473 case SelectionRequest: 1499 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1475 break; 1501 break;
1476 1502
1477 case MapNotify: 1503 case MapNotify:
1504#ifdef HAVE_BG_PIXMAP
1505 /* This is needed specifically to fix the case of no window manager or a
1506 * non-reparenting window manager. In those cases we never get first
1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1509 * reparenting.
1510 * We should not render background immediately, as there could be several
1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1512 * by scheduling background redraw as soon as we can, but giving a short
1513 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results.
1516 */
1517 if (!(bg_flags & BG_IS_VALID))
1518 update_background_ev.start (0.025);
1519#endif
1478 mapped = 1; 1520 mapped = 1;
1479#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1480 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1522 text_blink_ev.start ();
1481#endif 1523#endif
1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1524 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1483 break; 1525 break;
1484 1526
1485 case UnmapNotify: 1527 case UnmapNotify:
… …
1495 if (ev.xany.window == vt) 1537 if (ev.xany.window == vt)
1496 { 1538 {
1497 do 1539 do
1498 { 1540 {
1499 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1500 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, false);
1501 } 1543 }
1502 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1503 1545
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1547
1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 { 1549 {
1508 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1509 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, false);
1510 } 1552 }
1553
1511 want_refresh = 1; 1554 want_refresh = 1;
1512 } 1555 }
1513 else 1556 else
1514 { 1557 {
1515 XEvent unused_event; 1558 XEvent unused_event;
… …
1517 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1560 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1518 ; 1561 ;
1519 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1520 ; 1563 ;
1521 1564
1522 if (isScrollbarWindow (ev.xany.window)) 1565 if (scrollBar.state && ev.xany.window == scrollBar.win)
1523 { 1566 {
1524 scrollBar.setIdle (); 1567 scrollBar.state = STATE_IDLE;
1525 scrollbar_show (0); 1568 scrollBar.show (0);
1526 } 1569 }
1527 } 1570 }
1528 break; 1571 break;
1529 1572
1530 case MotionNotify: 1573 case MotionNotify:
… …
1576 int dist; 1619 int dist;
1577 1620
1578 /* don't clobber the current delay if we are 1621 /* don't clobber the current delay if we are
1579 * already in the middle of scrolling. 1622 * already in the middle of scrolling.
1580 */ 1623 */
1581 if (!sel_scroll_ev.active) 1624 if (!sel_scroll_ev.is_active ())
1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1625 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1583 1626
1584 /* save the event params so we can highlight 1627 /* save the event params so we can highlight
1585 * the selection in the pending-scroll loop 1628 * the selection in the pending-scroll loop
1586 */ 1629 */
… …
1609 else 1652 else
1610 { 1653 {
1611 /* we are within the text window, so we 1654 /* we are within the text window, so we
1612 * shouldn't be scrolling 1655 * shouldn't be scrolling
1613 */ 1656 */
1614 if (sel_scroll_ev.active)
1615 sel_scroll_ev.stop(); 1657 sel_scroll_ev.stop();
1616 } 1658 }
1617#endif 1659#endif
1618#ifdef MOUSE_THRESHOLD 1660#ifdef MOUSE_THRESHOLD
1619 } 1661 }
1620#endif 1662#endif
1621 } 1663 }
1622 } 1664 }
1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1624 { 1666 {
1625 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1626 MotionNotify, &ev)) 1668 MotionNotify, &ev))
1627 ; 1669 ;
1628 1670
… …
1630 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1674 &ev.xbutton.x, &ev.xbutton.y,
1633 &unused_mask); 1675 &unused_mask);
1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1635 scrollbar_size ()); 1677 scrollBar.size ());
1636 want_refresh = 1; 1678 want_refresh = 1;
1637 scrollbar_show (1); 1679 scrollBar.show (1);
1638 } 1680 }
1639 break; 1681 break;
1640 } 1682 }
1641 1683
1642#if defined(CURSOR_BLINK) 1684#if defined(CURSOR_BLINK)
… …
1663 1705
1664 if (ev.type == KeyPress && hidden_pointer == 0) 1706 if (ev.type == KeyPress && hidden_pointer == 0)
1665 pointer_blank (); 1707 pointer_blank ();
1666 } 1708 }
1667#endif 1709#endif
1710
1711 refresh_check ();
1668} 1712}
1713
1714#if ENABLE_FRILLS
1715void
1716rxvt_term::set_urgency (bool enable)
1717{
1718 if (enable == urgency_hint)
1719 return;
1720
1721 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable;
1726 }
1727}
1728#endif
1669 1729
1670void 1730void
1671rxvt_term::focus_in () 1731rxvt_term::focus_in ()
1672{ 1732{
1673 if (!focus) 1733 if (!focus)
1674 { 1734 {
1675 focus = 1; 1735 focus = 1;
1676 want_refresh = 1; 1736 want_refresh = 1;
1677 1737
1678 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1679
1680#if USE_XIM 1738#if USE_XIM
1681 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1682 { 1740 {
1683 IMSetPosition (); 1741 IMSetPosition ();
1684 XSetICFocus (Input_Context); 1742 XSetICFocus (Input_Context);
1685 } 1743 }
1686#endif 1744#endif
1687#if CURSOR_BLINK 1745#if CURSOR_BLINK
1688 if (option (Opt_cursorBlink)) 1746 if (option (Opt_cursorBlink))
1689 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1747 cursor_blink_ev.again ();
1690#endif 1748#endif
1691#if OFF_FOCUS_FADING 1749#if OFF_FOCUS_FADING
1692 if (rs[Rs_fade]) 1750 if (rs[Rs_fade])
1693 { 1751 {
1694 pix_colors = pix_colors_focused; 1752 pix_colors = pix_colors_focused;
1695 scr_recolour (); 1753 scr_recolour ();
1696 } 1754 }
1697#endif 1755#endif
1698#if ENABLE_FRILLS 1756#if ENABLE_FRILLS
1699 if (option (Opt_urgentOnBell)) 1757 if (option (Opt_urgentOnBell))
1700 { 1758 set_urgency (0);
1701 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1702 {
1703 h->flags &= ~XUrgencyHint;
1704 XSetWMHints (dpy, parent[0], h);
1705 }
1706 }
1707#endif 1759#endif
1760
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1708 } 1762 }
1709} 1763}
1710 1764
1711void 1765void
1712rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1714 if (focus) 1768 if (focus)
1715 { 1769 {
1716 focus = 0; 1770 focus = 0;
1717 want_refresh = 1; 1771 want_refresh = 1;
1718 1772
1719 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1773#if ENABLE_FRILLS
1720 1774 if (option (Opt_urgentOnBell))
1775 set_urgency (0);
1776#endif
1721#if ENABLE_FRILLS || ISO_14755 1777#if ENABLE_FRILLS || ISO_14755
1722 if (iso14755buf) 1778 if (iso14755buf)
1723 { 1779 {
1724 iso14755buf = 0; 1780 iso14755buf = 0;
1725# if ISO_14755 1781# if ISO_14755
… …
1742 { 1798 {
1743 pix_colors = pix_colors_unfocused; 1799 pix_colors = pix_colors_unfocused;
1744 scr_recolour (); 1800 scr_recolour ();
1745 } 1801 }
1746#endif 1802#endif
1803
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747 } 1805 }
1748} 1806}
1749 1807
1750void 1808void
1751rxvt_term::update_fade_color (unsigned int idx) 1809rxvt_term::update_fade_color (unsigned int idx)
… …
1779 * use the property to determine the pixmap. We use it later on. 1837 * use the property to determine the pixmap. We use it later on.
1780 */ 1838 */
1781 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1783 { 1841 {
1784 bgPixmap.set_root_pixmap (); 1842 bg_set_root_pixmap ();
1785 update_background (); 1843 update_background ();
1786 } 1844 }
1845
1787 break; 1846 break;
1788 } 1847 }
1789# endif 1848# endif
1849
1850 refresh_check ();
1790} 1851}
1791#endif 1852#endif
1792 1853
1793void 1854void
1794rxvt_term::button_press (XButtonEvent &ev) 1855rxvt_term::button_press (XButtonEvent &ev)
… …
1825 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1826 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1827#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1828 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1829 { 1890 {
1830 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1831 MEvent.clicks++; 1892 MEvent.clicks++;
1832 1893
1833 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1834 { 1895 {
1835 /* only report double clicks */ 1896 /* only report double clicks */
… …
1849 mouse_report (ev); 1910 mouse_report (ev);
1850 } 1911 }
1851#else 1912#else
1852 MEvent.button = ev.button; 1913 MEvent.button = ev.button;
1853 mouse_report (ev); 1914 mouse_report (ev);
1854#endif /* MOUSE_REPORT_DOUBLECLICK */ 1915#endif /* MOUSE_REPORT_DOUBLECLICK */
1855 1916
1856 } 1917 }
1857 else 1918 else
1858 { 1919 {
1859 if (ev.button != MEvent.button) 1920 if (ev.button != MEvent.button)
… …
1907 } 1968 }
1908 1969
1909 /* 1970 /*
1910 * Scrollbar window processing of button press 1971 * Scrollbar window processing of button press
1911 */ 1972 */
1912 if (isScrollbarWindow (ev.window)) 1973 if (scrollBar.state && ev.window == scrollBar.win)
1913 { 1974 {
1914 scrollBar.setIdle (); 1975 page_dirn direction = NO_DIR;
1976
1977 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */
1981
1982 scrollBar.state = STATE_IDLE;
1915 /* 1983 /*
1916 * Rxvt-style scrollbar: 1984 * Rxvt-style scrollbar:
1917 * move up if mouse is above slider 1985 * move up if mouse is above slider
1918 * move dn if mouse is below slider 1986 * move dn if mouse is below slider
1919 * 1987 *
… …
1928 /* 1996 /*
1929 * Mouse report disabled scrollbar: 1997 * Mouse report disabled scrollbar:
1930 * arrow buttons - send up/down 1998 * arrow buttons - send up/down
1931 * click on scrollbar - send pageup/down 1999 * click on scrollbar - send pageup/down
1932 */ 2000 */
1933 if ((scrollBar.style == R_SB_NEXT 2001 if (direction == UP)
1934 && scrollbarnext_upButton (ev.y))
1935 || (scrollBar.style == R_SB_RXVT
1936 && scrollbarrxvt_upButton (ev.y)))
1937 tt_printf ("\033[A"); 2002 tt_printf ("\033[A");
1938 else if ((scrollBar.style == R_SB_NEXT 2003 else if (direction == DN)
1939 && scrollbarnext_dnButton (ev.y))
1940 || (scrollBar.style == R_SB_RXVT
1941 && scrollbarrxvt_dnButton (ev.y)))
1942 tt_printf ("\033[B"); 2004 tt_printf ("\033[B");
1943 else 2005 else
1944 switch (ev.button) 2006 switch (ev.button)
1945 { 2007 {
1946 case Button2: 2008 case Button2:
… …
1953 tt_printf ("\033[5~"); 2015 tt_printf ("\033[5~");
1954 break; 2016 break;
1955 } 2017 }
1956 } 2018 }
1957 else 2019 else
1958#endif /* NO_SCROLLBAR_REPORT */ 2020#endif /* NO_SCROLLBAR_REPORT */
1959
1960 {
1961 char upordown = 0;
1962
1963 if (scrollBar.style == R_SB_NEXT)
1964 { 2021 {
1965 if (scrollbarnext_upButton (ev.y)) 2022 if (direction != NO_DIR)
1966 upordown = -1; /* up */
1967 else if (scrollbarnext_dnButton (ev.y))
1968 upordown = 1; /* down */
1969 }
1970 else if (scrollBar.style == R_SB_RXVT)
1971 {
1972 if (scrollbarrxvt_upButton (ev.y))
1973 upordown = -1; /* up */
1974 else if (scrollbarrxvt_dnButton (ev.y))
1975 upordown = 1; /* down */
1976 }
1977 if (upordown)
1978 { 2023 {
1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2024#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2025 if (!cont_scroll_ev.is_active ())
1980 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1981#endif 2027#endif
1982 if (scr_page (upordown < 0 ? UP : DN, 1)) 2028 if (scr_page (direction, 1))
1983 { 2029 {
1984 if (upordown < 0) 2030 if (direction == UP)
1985 scrollBar.setUp (); 2031 scrollBar.state = STATE_UP;
1986 else 2032 else
1987 scrollBar.setDn (); 2033 scrollBar.state = STATE_DOWN;
1988 } 2034 }
1989 } 2035 }
1990 else 2036 else
1991 switch (ev.button) 2037 switch (ev.button)
1992 { 2038 {
1993 case Button2: 2039 case Button2:
1994 switch (scrollbar_align) 2040 switch (scrollBar.align)
1995 { 2041 {
1996 case R_SB_ALIGN_TOP: 2042 case R_SB_ALIGN_TOP:
1997 csrO = 0; 2043 csrO = 0;
1998 break; 2044 break;
1999 case R_SB_ALIGN_CENTRE: 2045 case R_SB_ALIGN_CENTRE:
… …
2005 } 2051 }
2006 2052
2007 if (scrollBar.style == R_SB_XTERM 2053 if (scrollBar.style == R_SB_XTERM
2008 || scrollbar_above_slider (ev.y) 2054 || scrollbar_above_slider (ev.y)
2009 || scrollbar_below_slider (ev.y)) 2055 || scrollbar_below_slider (ev.y))
2010 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2011 2057
2012 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2013 break; 2059 break;
2014 2060
2015 case Button1: 2061 case Button1:
2016 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2062 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2017 csrO = ev.y - scrollBar.top; 2063 csrO = ev.y - scrollBar.top;
2018 /* FALLTHROUGH */ 2064 /* FALLTHROUGH */
2019 2065
2020 case Button3: 2066 case Button3:
2021 if (scrollBar.style != R_SB_XTERM) 2067 if (scrollBar.style != R_SB_XTERM)
… …
2031 scr_page (DN, nrow - 1); 2077 scr_page (DN, nrow - 1);
2032# else 2078# else
2033 scr_page (DN, nrow / 4); 2079 scr_page (DN, nrow / 4);
2034# endif 2080# endif
2035 else 2081 else
2036 scrollBar.setMotion (); 2082 scrollBar.state = STATE_MOTION;
2037 } 2083 }
2038 else 2084 else
2039 { 2085 {
2040 scr_page ((ev.button == Button1 ? DN : UP), 2086 scr_page ((ev.button == Button1 ? DN : UP),
2041 (nrow 2087 (nrow
2042 * scrollbar_position (ev.y) 2088 * scrollbar_position (ev.y)
2043 / scrollbar_size ())); 2089 / scrollBar.size ()));
2044 } 2090 }
2045 2091
2046 break; 2092 break;
2047 } 2093 }
2048 } 2094 }
… …
2058 2104
2059 csrO = 0; /* reset csr Offset */ 2105 csrO = 0; /* reset csr Offset */
2060 if (!bypass_keystate) 2106 if (!bypass_keystate)
2061 reportmode = !! (priv_modes & PrivMode_mouse_report); 2107 reportmode = !! (priv_modes & PrivMode_mouse_report);
2062 2108
2063 if (scrollbar_isUpDn ()) 2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2064 { 2110 {
2065 scrollBar.setIdle (); 2111 scrollBar.state = STATE_IDLE;
2066 scrollbar_show (0); 2112 scrollBar.show (0);
2067 } 2113 }
2068 2114
2069#ifdef SELECTION_SCROLLING 2115#ifdef SELECTION_SCROLLING
2070 if (sel_scroll_ev.active)
2071 sel_scroll_ev.stop(); 2116 sel_scroll_ev.stop();
2072#endif 2117#endif
2073 2118
2074 if (ev.window == vt) 2119 if (ev.window == vt)
2075 { 2120 {
2076 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2121 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2100 mouse_report (ev); 2145 mouse_report (ev);
2101 } 2146 }
2102#else /* MOUSE_REPORT_DOUBLECLICK */ 2147#else /* MOUSE_REPORT_DOUBLECLICK */
2103 MEvent.button = AnyButton; 2148 MEvent.button = AnyButton;
2104 mouse_report (ev); 2149 mouse_report (ev);
2105#endif /* MOUSE_REPORT_DOUBLECLICK */ 2150#endif /* MOUSE_REPORT_DOUBLECLICK */
2106 return; 2151 return;
2107 } 2152 }
2108 2153
2109 /* 2154 /*
2110 * dumb hack to compensate for the failure of click-and-drag 2155 * dumb hack to compensate for the failure of click-and-drag
… …
2122 selection_make (ev.time); 2167 selection_make (ev.time);
2123 break; 2168 break;
2124 2169
2125 case Button2: 2170 case Button2:
2126 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2127 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2128 break; 2173 break;
2129 2174
2130#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
2131 case Button4: 2176 case Button4:
2132 case Button5: 2177 case Button5:
… …
2148 { 2193 {
2149 mouse_slip_wheel_speed += v ? -1 : 1; 2194 mouse_slip_wheel_speed += v ? -1 : 1;
2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2195 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2196 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2152 2197
2198 if (!slip_wheel_ev.is_active ())
2153 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2199 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2154 } 2200 }
2155 else 2201 else
2202# endif
2156 { 2203 {
2157# endif
2158 scr_page (v, i); 2204 scr_page (v, i);
2159 scrollbar_show (1); 2205 scrollBar.show (1);
2160# ifdef MOUSE_SLIP_WHEELING
2161 } 2206 }
2162# endif
2163 } 2207 }
2164 break; 2208 break;
2165#endif 2209#endif
2166 } 2210 }
2167 } 2211 }
2168} 2212}
2169 2213
2170/*}}} */ 2214/*}}} */
2171 2215
2172bool 2216void
2173rxvt_term::cmd_parse () 2217rxvt_term::cmd_parse ()
2174{ 2218{
2175 bool flag = false;
2176 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2177 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2178 2221
2179 for (;;) 2222 for (;;)
2180 { 2223 {
2181 if (ch == NOCHAR) 2224 if (expect_false (ch == NOCHAR))
2182 { 2225 {
2183 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2184 ch = next_char (); 2227 ch = next_char ();
2185 2228
2186 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2187 break; 2230 break;
2188 } 2231 }
2189 2232
2190 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2233 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2191 { 2234 {
2192 if (!seen_input) 2235 if (expect_false (!seen_input))
2193 { 2236 {
2194 seen_input = 1; 2237 seen_input = 1;
2195 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2196 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2197 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2210 wchar_t *str = buf; 2253 wchar_t *str = buf;
2211 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2212 2255
2213 for (;;) 2256 for (;;)
2214 { 2257 {
2215 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2258 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2216 break; 2259 break;
2217 2260
2218 *str++ = ch; 2261 *str++ = ch;
2219 2262
2220 if (ch == C0_LF || str >= eol) 2263 if (expect_false (ch == C0_LF || str >= eol))
2221 { 2264 {
2222 if (ch == C0_LF) 2265 if (ch == C0_LF)
2223 nlines++; 2266 nlines++;
2224 2267
2225 refresh_count++; 2268 refresh_count++;
2226 2269
2227 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2270 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2228 { 2271 {
2229 refresh_count = 0; 2272 refresh_count = 0;
2230 2273
2231 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.) 2274 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2232 { 2275 {
2233 refreshnow = true; 2276 refreshnow = true;
2234 ch = NOCHAR; 2277 ch = NOCHAR;
2235 break; 2278 break;
2236 } 2279 }
… …
2274 * What the heck we'll cheat and only refresh less than every page-full. 2317 * What the heck we'll cheat and only refresh less than every page-full.
2275 * if skipScroll is enabled. 2318 * if skipScroll is enabled.
2276 */ 2319 */
2277 if (refreshnow) 2320 if (refreshnow)
2278 { 2321 {
2279 flag = true;
2280 scr_refresh (); 2322 scr_refresh ();
2281 want_refresh = 1; 2323 want_refresh = 1;
2282 } 2324 }
2283
2284 } 2325 }
2285 else 2326 else
2286 { 2327 {
2287 try 2328 try
2288 { 2329 {
… …
2296 } 2337 }
2297 2338
2298 ch = NOCHAR; 2339 ch = NOCHAR;
2299 } 2340 }
2300 } 2341 }
2301
2302 return flag;
2303} 2342}
2304 2343
2305// read the next character 2344// read the next character
2306wchar_t 2345wchar_t
2307rxvt_term::next_char () NOTHROW 2346rxvt_term::next_char () NOTHROW
2308{ 2347{
2309 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2310 { 2349 {
2311 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2312 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2313 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2314 2353
2315 wchar_t wc; 2354 wchar_t wc;
2316 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2317 2356
… …
2321 cmdbuf_ptr = cmdbuf_endp; 2360 cmdbuf_ptr = cmdbuf_endp;
2322 break; 2361 break;
2323 } 2362 }
2324 2363
2325 if (len == (size_t)-1) 2364 if (len == (size_t)-1)
2365 {
2366 mbstate.reset (); // reset now undefined conversion state
2326 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368 }
2327 2369
2328 // assume wchar == unicode 2370 // assume wchar == unicode
2329 cmdbuf_ptr += len; 2371 cmdbuf_ptr += len;
2330 return wc & UNICODE_MASK; 2372 return wc & UNICODE_MASK;
2331 } 2373 }
… …
2342 : NOCHAR; 2384 : NOCHAR;
2343} 2385}
2344 2386
2345static class out_of_input out_of_input; 2387static class out_of_input out_of_input;
2346 2388
2347/* rxvt_cmd_getc () - Return next input character */
2348/*
2349 * Return the next input character after first passing any keyboard input
2350 * to the command.
2351 */
2352wchar_t 2389wchar_t
2353rxvt_term::cmd_getc () THROW ((class out_of_input)) 2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2354{ 2391{
2355 wchar_t c = next_char (); 2392 wchar_t c = next_char ();
2356 2393
… …
2375/*----------------------------------------------------------------------*/ 2412/*----------------------------------------------------------------------*/
2376#ifdef PRINTPIPE 2413#ifdef PRINTPIPE
2377FILE * 2414FILE *
2378rxvt_term::popen_printer () 2415rxvt_term::popen_printer ()
2379{ 2416{
2380 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2417 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2381 2418
2382 if (stream == NULL) 2419 if (stream == NULL)
2383 rxvt_warn ("can't open printer pipe, not printing.\n"); 2420 rxvt_warn ("can't open printer pipe, not printing.\n");
2384 2421
2385 return stream; 2422 return stream;
… …
2396 * simulate attached vt100 printer 2433 * simulate attached vt100 printer
2397 */ 2434 */
2398void 2435void
2399rxvt_term::process_print_pipe () 2436rxvt_term::process_print_pipe ()
2400{ 2437{
2401 int done; 2438 FILE *fd = popen_printer ();
2402 FILE *fd;
2403 2439
2404 if ((fd = popen_printer ()) == NULL) 2440 if (!fd)
2405 return; 2441 return;
2406 2442
2407 /* 2443 /*
2408 * Send all input to the printer until either ESC[4i or ESC[?4i 2444 * Send all input to the printer until either ESC[4i or ESC[?4i
2409 * is received. 2445 * is received.
2410 */ 2446 */
2411 for (done = 0; !done;) 2447 for (int done = 0; !done; )
2412 { 2448 {
2413 unsigned char buf[8]; 2449 unsigned char buf[8];
2414 unicode_t ch; 2450 unicode_t ch;
2415 unsigned int i, len; 2451 unsigned int i, len;
2416 2452
… …
2447 } 2483 }
2448 } 2484 }
2449 2485
2450 pclose_printer (fd); 2486 pclose_printer (fd);
2451} 2487}
2452#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2453/*}}} */ 2489/*}}} */
2454 2490
2455/* *INDENT-OFF* */
2456enum { 2491enum {
2457 C1_40 = 0x40, 2492 C1_40 = 0x40,
2458 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2493 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2459 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2494 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2460 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2461 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2462}; 2497};
2463/* *INDENT-ON* */
2464 2498
2465/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2466void 2500void
2467rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2468{ 2502{
… …
2561 break; 2595 break;
2562 case 'Z': /* identify the terminal type */ 2596 case 'Z': /* identify the terminal type */
2563 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2564 break; 2598 break;
2565 case '<': /* turn off VT52 mode */ 2599 case '<': /* turn off VT52 mode */
2566 PrivMode (0, PrivMode_vt52); 2600 set_privmode (PrivMode_vt52, 0);
2567 break; 2601 break;
2568 case 'F': /* use special graphics character set */ 2602 case 'F': /* use special graphics character set */
2569 case 'G': /* use regular character set */ 2603 case 'G': /* use regular character set */
2570 /* unimplemented */ 2604 /* unimplemented */
2571 break; 2605 break;
… …
2625 scr_forwardindex (); 2659 scr_forwardindex ();
2626 break; 2660 break;
2627#endif 2661#endif
2628 case '=': 2662 case '=':
2629 case '>': 2663 case '>':
2630 PrivMode ((ch == '='), PrivMode_aplKP); 2664 set_privmode (PrivMode_aplKP, ch == '=');
2631 break; 2665 break;
2632 2666
2633 case C1_40: 2667 case C1_40:
2634 cmd_getc (); 2668 cmd_getc ();
2635 break; 2669 break;
… …
2639 2673
2640 /* 8.3.87: NEXT LINE */ 2674 /* 8.3.87: NEXT LINE */
2641 case C1_NEL: /* ESC E */ 2675 case C1_NEL: /* ESC E */
2642 { 2676 {
2643 wchar_t nlcr[] = { C0_LF, C0_CR }; 2677 wchar_t nlcr[] = { C0_LF, C0_CR };
2644 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2678 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2645 } 2679 }
2646 break; 2680 break;
2647 2681
2648 /* kidnapped escape sequence: Should be 8.3.48 */ 2682 /* kidnapped escape sequence: Should be 8.3.48 */
2649 case C1_ESA: /* ESC G */ 2683 case C1_ESA: /* ESC G */
2650 process_graphics (); 2684 // used by original rxvt for rob nations own graphics mode
2685 if (cmd_getc () == 'Q')
2686 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2651 break; 2687 break;
2652 2688
2653 /* 8.3.63: CHARACTER TABULATION SET */ 2689 /* 8.3.63: CHARACTER TABULATION SET */
2654 case C1_HTS: /* ESC H */ 2690 case C1_HTS: /* ESC H */
2655 scr_set_tab (1); 2691 scr_set_tab (1);
… …
2674 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2710 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2675 case C1_SCI: /* ESC Z */ 2711 case C1_SCI: /* ESC Z */
2676 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2712 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2677 break; /* steal obsolete ESC [ c */ 2713 break; /* steal obsolete ESC [ c */
2678 2714
2679 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2715 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2680 case C1_CSI: /* ESC [ */ 2716 case C1_CSI: /* ESC [ */
2681 process_csi_seq (); 2717 process_csi_seq ();
2682 break; 2718 break;
2683 2719
2684 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2720 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2685 case C1_OSC: /* ESC ] */ 2721 case C1_OSC: /* ESC ] */
2686 process_osc_seq (); 2722 process_osc_seq ();
2687 break; 2723 break;
2688 2724
2689 /* 8.3.106: RESET TO INITIAL STATE */ 2725 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2690 case 'c': 2726 case 'c':
2691 mbstate.reset (); 2727 mbstate.reset ();
2692 scr_poweron (); 2728 scr_poweron ();
2693 scrollbar_show (1); 2729 scrollBar.show (1);
2694 break; 2730 break;
2695 2731
2696 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2732 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2697 case 'n': 2733 case 'n':
2698 scr_charset_choose (2); 2734 scr_charset_choose (2);
… …
2705 } 2741 }
2706} 2742}
2707/*}}} */ 2743/*}}} */
2708 2744
2709/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2745/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2710/* *INDENT-OFF* */
2711enum { 2746enum {
2712 CSI_ICH = 0x40, 2747 CSI_ICH = 0x40,
2713 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2748 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2714 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2749 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2715 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2750 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2718 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2753 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2719 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2754 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2720 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2755 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2721}; 2756};
2722 2757
2723#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2758#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2724 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2759 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2725 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2760 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2726#define get_byte_array_bit(array, bit) \ 2761#define get_byte_array_bit(array, bit) \
2727 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2762 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2728 2763
2729const unsigned char csi_defaults[] = 2764static const unsigned char csi_defaults[] =
2730 { 2765 {
2731 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2766 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2732 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2767 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2733 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2768 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2734 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2769 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2735 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2770 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2736 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2771 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2737 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2738 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2773 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2739 }; 2774 };
2740/* *INDENT-ON* */
2741 2775
2742void 2776void
2743rxvt_term::process_csi_seq () 2777rxvt_term::process_csi_seq ()
2744{ 2778{
2745 unicode_t ch, priv, i; 2779 unicode_t ch, priv, i;
… …
2749 2783
2750 nargs = 0; 2784 nargs = 0;
2751 2785
2752 priv = 0; 2786 priv = 0;
2753 ch = cmd_getc (); 2787 ch = cmd_getc ();
2754 if (ch >= '<' && ch <= '?') 2788 if ((ch >= '<' && ch <= '?') || ch == '!')
2789 {
2755 { /* '<' '=' '>' '?' */ 2790 /* '<' '=' '>' '?' '!' */
2756 priv = ch; 2791 priv = ch;
2757 ch = cmd_getc (); 2792 ch = cmd_getc ();
2758 } 2793 }
2759 2794
2760 /* read any numerical arguments */ 2795 /* read any numerical arguments */
… …
2809 // versions. 2844 // versions.
2810 // 2845 //
2811 tt_printf ("\033[>%d;95;0c", 'U'); 2846 tt_printf ("\033[>%d;95;0c", 'U');
2812 } 2847 }
2813 break; 2848 break;
2849
2814 case '?': 2850 case '?':
2815 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2851 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2816 process_terminal_mode (ch, priv, nargs, arg); 2852 process_terminal_mode (ch, priv, nargs, arg);
2817 break; 2853 break;
2854
2855 case '!':
2856 if (ch == CSI_70)
2857 {
2858 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2859 scr_soft_reset ();
2860
2861 static const int pm_h[] = { 7, 25 };
2862 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2863
2864 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2865 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2818 } 2866 }
2867 break;
2868 }
2869
2819 return; 2870 return;
2820 } 2871 }
2821 2872
2822 switch (ch) 2873 switch (ch)
2823 { 2874 {
… …
3038 } 3089 }
3039} 3090}
3040/*}}} */ 3091/*}}} */
3041 3092
3042#if !ENABLE_MINIMAL 3093#if !ENABLE_MINIMAL
3043/* ARGSUSED */
3044void 3094void
3045rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3095rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3046{ 3096{
3047 int x, y; 3097 int x, y;
3048 XWindowAttributes wattr; 3098 XWindowAttributes wattr;
… …
3057 { 3107 {
3058 /* 3108 /*
3059 * commands 3109 * commands
3060 */ 3110 */
3061 case 1: /* deiconify window */ 3111 case 1: /* deiconify window */
3062 XMapWindow (dpy, parent[0]); 3112 XMapWindow (dpy, parent);
3063 break; 3113 break;
3064 case 2: /* iconify window */ 3114 case 2: /* iconify window */
3065 XIconifyWindow (dpy, parent[0], display->screen); 3115 XIconifyWindow (dpy, parent, display->screen);
3066 break; 3116 break;
3067 case 3: /* set position (pixels) */ 3117 case 3: /* set position (pixels) */
3068 XMoveWindow (dpy, parent[0], args[1], args[2]); 3118 XMoveWindow (dpy, parent, args[1], args[2]);
3069 break; 3119 break;
3070 case 4: /* set size (pixels) */ 3120 case 4: /* set size (pixels) */
3071 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3121 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3072 break; 3122 break;
3073 case 5: /* raise window */ 3123 case 5: /* raise window */
3074 XRaiseWindow (dpy, parent[0]); 3124 XRaiseWindow (dpy, parent);
3075 break; 3125 break;
3076 case 6: /* lower window */ 3126 case 6: /* lower window */
3077 XLowerWindow (dpy, parent[0]); 3127 XLowerWindow (dpy, parent);
3078 break; 3128 break;
3079 case 7: /* refresh window */ 3129 case 7: /* refresh window */
3080 scr_touch (true); 3130 scr_touch (true);
3081 break; 3131 break;
3082 case 8: /* set size (chars) */ 3132 case 8: /* set size (chars) */
… …
3093 3143
3094 /* 3144 /*
3095 * reports - some output format copied from XTerm 3145 * reports - some output format copied from XTerm
3096 */ 3146 */
3097 case 11: /* report window state */ 3147 case 11: /* report window state */
3098 XGetWindowAttributes (dpy, parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent, &wattr);
3099 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3149 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3100 break; 3150 break;
3101 case 13: /* report window position */ 3151 case 13: /* report window position */
3102 XGetWindowAttributes (dpy, parent[0], &wattr); 3152 XGetWindowAttributes (dpy, parent, &wattr);
3103 XTranslateCoordinates (dpy, parent[0], wattr.root, 3153 XTranslateCoordinates (dpy, parent, wattr.root,
3104 -wattr.border_width, -wattr.border_width, 3154 -wattr.border_width, -wattr.border_width,
3105 &x, &y, &wdummy); 3155 &x, &y, &wdummy);
3106 tt_printf ("\033[3;%d;%dt", x, y); 3156 tt_printf ("\033[3;%d;%dt", x, y);
3107 break; 3157 break;
3108 case 14: /* report window size (pixels) */ 3158 case 14: /* report window size (pixels) */
3109 XGetWindowAttributes (dpy, parent[0], &wattr); 3159 XGetWindowAttributes (dpy, parent, &wattr);
3110 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3160 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3111 break; 3161 break;
3112 case 18: /* report text area size (chars) */ 3162 case 18: /* report text area size (chars) */
3113 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3114 break; 3164 break;
… …
3116 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3117 break; 3167 break;
3118 case 20: /* report icon label */ 3168 case 20: /* report icon label */
3119 { 3169 {
3120 char *s; 3170 char *s;
3121 XGetIconName (dpy, parent[0], &s); 3171 XGetIconName (dpy, parent, &s);
3122 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3172 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3123 XFree (s); 3173 XFree (s);
3124 } 3174 }
3125 break; 3175 break;
3126 case 21: /* report window title */ 3176 case 21: /* report window title */
3127 { 3177 {
3128 char *s; 3178 char *s;
3129 XFetchName (dpy, parent[0], &s); 3179 XFetchName (dpy, parent, &s);
3130 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3131 XFree (s); 3181 XFree (s);
3132 } 3182 }
3133 break; 3183 break;
3134 } 3184 }
… …
3190 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3240 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3191 */ 3241 */
3192void 3242void
3193rxvt_term::process_dcs_seq () 3243rxvt_term::process_dcs_seq ()
3194{ 3244{
3195 char *s;
3196 unicode_t eh;
3197
3198 /* 3245 /*
3199 * Not handled yet 3246 * Not handled yet
3200 */ 3247 */
3248
3249 unicode_t eh;
3201 s = get_to_st (eh); 3250 char *s = get_to_st (eh);
3202 if (s) 3251 if (s)
3203 free (s); 3252 free (s);
3204 3253
3205 return; 3254 return;
3206} 3255}
… …
3210 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3259 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3211 */ 3260 */
3212void 3261void
3213rxvt_term::process_osc_seq () 3262rxvt_term::process_osc_seq ()
3214{ 3263{
3215 unicode_t ch, eh;
3216 int arg; 3264 int arg;
3217 3265
3218 ch = cmd_getc (); 3266 unicode_t ch = cmd_getc ();
3219 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3267 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3220 arg = arg * 10 + (ch - '0'); 3268 arg = arg * 10 + (ch - '0');
3221 3269
3222 if (ch == ';') 3270 if (ch == ';')
3223 { 3271 {
3272 unicode_t eh;
3224 char *s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3225 3274
3226 if (s) 3275 if (s)
3227 { 3276 {
3228 process_xterm_seq (arg, s, eh); 3277 process_xterm_seq (arg, s, eh);
… …
3252 3301
3253/* 3302/*
3254 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3303 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3255 */ 3304 */
3256void 3305void
3257rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3306rxvt_term::process_xterm_seq (int op, char *str, char resp)
3258{ 3307{
3259 int color; 3308 int color;
3260 char *buf, *name; 3309 char *buf, *name;
3261 bool query = str[0] == '?' && !str[1]; 3310 bool query = str[0] == '?' && !str[1];
3262 int saveop = op; 3311 int saveop = op;
… …
3289 unsigned long bytes_after; 3338 unsigned long bytes_after;
3290 unsigned char *value = 0; 3339 unsigned char *value = 0;
3291 const char *str = ""; 3340 const char *str = "";
3292 3341
3293 if (prop 3342 if (prop
3294 && XGetWindowProperty (dpy, parent[0], 3343 && XGetWindowProperty (dpy, parent,
3295 prop, 0, 1<<16, 0, AnyPropertyType, 3344 prop, 0, 1<<16, 0, AnyPropertyType,
3296 &actual_type, &actual_format, 3345 &actual_type, &actual_format,
3297 &nitems, &bytes_after, &value) == Success 3346 &nitems, &bytes_after, &value) == Success
3298 && actual_type != None 3347 && actual_type != None
3299 && actual_format == 8) 3348 && actual_format == 8)
… …
3303 3352
3304 XFree (value); 3353 XFree (value);
3305 } 3354 }
3306 else 3355 else
3307 { 3356 {
3308 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3357 char *eq = strchr (str, '=');
3309 3358
3310 if (eq) 3359 if (eq)
3311 { 3360 {
3312 *eq = 0; 3361 *eq = 0;
3313 set_utf8_property (display->atom (str), eq + 1); 3362 set_utf8_property (display->atom (str), eq + 1);
3314 } 3363 }
3315 else 3364 else
3316 XDeleteProperty (dpy, parent[0], 3365 XDeleteProperty (dpy, parent,
3317 display->atom (str)); 3366 display->atom (str));
3318 } 3367 }
3319 break; 3368 break;
3320 3369
3321 case XTerm_Color: 3370 case XTerm_Color:
… …
3334 *buf++ = '\0'; 3383 *buf++ = '\0';
3335 3384
3336 process_color_seq (op, color, name, resp); 3385 process_color_seq (op, color, name, resp);
3337 } 3386 }
3338 break; 3387 break;
3388 case Rxvt_restoreFG:
3339 case XTerm_Color00: 3389 case XTerm_Color00:
3340 process_color_seq (op, Color_fg, str, resp); 3390 process_color_seq (op, Color_fg, str, resp);
3341 break; 3391 break;
3392 case Rxvt_restoreBG:
3342 case XTerm_Color01: 3393 case XTerm_Color01:
3343 process_color_seq (op, Color_bg, str, resp); 3394 process_color_seq (op, Color_bg, str, resp);
3344 break; 3395 break;
3345#ifndef NO_CURSORCOLOR 3396#ifndef NO_CURSORCOLOR
3346 case XTerm_Color_cursor: 3397 case XTerm_Color_cursor:
… …
3351 process_color_seq (op, Color_pointer_fg, str, resp); 3402 process_color_seq (op, Color_pointer_fg, str, resp);
3352 break; 3403 break;
3353 case XTerm_Color_pointer_bg: 3404 case XTerm_Color_pointer_bg:
3354 process_color_seq (op, Color_pointer_bg, str, resp); 3405 process_color_seq (op, Color_pointer_bg, str, resp);
3355 break; 3406 break;
3407#ifdef OPTION_HC
3408 case XTerm_Color_HC:
3409 process_color_seq (op, Color_HC, str, resp);
3410 break;
3411 case XTerm_Color_HTC:
3412 process_color_seq (op, Color_HTC, str, resp);
3413 break;
3414#endif
3356#ifndef NO_BOLD_UNDERLINE_REVERSE 3415#ifndef NO_BOLD_UNDERLINE_REVERSE
3357 case XTerm_Color_RV:
3358 process_color_seq (op, Color_RV, str, resp);
3359 break;
3360 case Rxvt_Color_BD:
3361 case URxvt_Color_BD: 3416 case URxvt_Color_BD:
3362 process_color_seq (op, Color_BD, str, resp); 3417 process_color_seq (op, Color_BD, str, resp);
3363 break; 3418 break;
3364 case Rxvt_Color_UL:
3365 case URxvt_Color_UL: 3419 case URxvt_Color_UL:
3366 process_color_seq (op, Color_UL, str, resp); 3420 process_color_seq (op, Color_UL, str, resp);
3367 break; 3421 break;
3368 case URxvt_Color_IT: 3422 case URxvt_Color_IT:
3369 process_color_seq (op, Color_IT, str, resp); 3423 process_color_seq (op, Color_IT, str, resp);
3370 break; 3424 break;
3371#endif 3425#endif
3426 case URxvt_Color_border:
3427 process_color_seq (op, Color_border, str, resp);
3428 break;
3372#if ENABLE_TRANSPARENCY 3429#if ENABLE_TRANSPARENCY
3373 case URxvt_Color_tint: 3430 case URxvt_Color_tint:
3374 process_color_seq (op, Color_tint, str, resp); 3431 process_color_seq (op, Color_tint, str, resp);
3375 { 3432 {
3376 bool changed = false; 3433 bool changed = false;
3434
3377 if (ISSET_PIXCOLOR (Color_tint)) 3435 if (ISSET_PIXCOLOR (Color_tint))
3378 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3436 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3379 else 3437
3380 changed = bgPixmap.unset_tint ();
3381 if (changed) 3438 if (changed)
3382 update_background (); 3439 update_background ();
3383 } 3440 }
3384 3441
3385 break; 3442 break;
… …
3389 case Rxvt_Pixmap: 3446 case Rxvt_Pixmap:
3390 if (!strcmp (str, "?")) 3447 if (!strcmp (str, "?"))
3391 { 3448 {
3392 char str[256]; 3449 char str[256];
3393 3450
3394 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3451 sprintf (str, "[%dx%d+%d+%d]",
3395 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3452 min (h_scale, 32767), min (v_scale, 32767),
3396 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3453 min (h_align, 32767), min (v_align, 32767));
3397 process_xterm_seq (XTerm_title, str, CHAR_ST); 3454 process_xterm_seq (XTerm_title, str, CHAR_ST);
3398 } 3455 }
3399 else 3456 else
3400 { 3457 {
3401 int changed = 0; 3458 int changed = 0;
3402 3459
3403 if (*str != ';') 3460 if (*str != ';')
3404 { 3461 {
3405 /* reset to default scaling :*/
3406 bgPixmap.unset_geometry ();
3407 if (bgPixmap.set_file (str)) /* change pixmap */ 3462 if (bg_set_file (str)) /* change pixmap */
3463 {
3408 changed++; 3464 changed++;
3409 str = strchr (str, ';'); 3465 str = strchr (str, ';');
3410 if (str == NULL) 3466 if (str == NULL)
3411 bgPixmap.set_defaultGeometry (); 3467 bg_set_default_geometry ();
3468 else
3469 bg_set_geometry (str+1);
3470 }
3412 } 3471 }
3413 while (str) 3472 else
3414 { 3473 {
3415 str++; 3474 str++;
3416 if (bgPixmap.set_geometry (str)) 3475 if (bg_set_geometry (str, true))
3417 changed++; 3476 changed++;
3418 str = strchr (str, ';');
3419 } 3477 }
3478
3420 if (changed) 3479 if (changed)
3480 {
3481 if (bg_window_position_sensitive ())
3482 {
3483 int x, y;
3484 get_window_origin (x, y);
3485 bg_set_position (x, y);
3486 }
3421 update_background (); 3487 update_background ();
3488 }
3422 } 3489 }
3423 break; 3490 break;
3424#endif 3491#endif
3425
3426 case Rxvt_restoreFG:
3427 set_window_color (Color_fg, str);
3428 break;
3429 case Rxvt_restoreBG:
3430 set_window_color (Color_bg, str);
3431 break;
3432 3492
3433 case XTerm_logfile: 3493 case XTerm_logfile:
3434 // TODO, when secure mode? 3494 // TODO, when secure mode?
3435 break; 3495 break;
3436 3496
… …
3503 break; 3563 break;
3504#endif 3564#endif
3505 3565
3506#if ENABLE_PERL 3566#if ENABLE_PERL
3507 case URxvt_perl: 3567 case URxvt_perl:
3508 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3568 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3509 ; // no responses yet
3510 break; 3569 break;
3511#endif 3570#endif
3512 } 3571 }
3513} 3572}
3514/*----------------------------------------------------------------------*/ 3573/*----------------------------------------------------------------------*/
… …
3537 { 3596 {
3538 if (mode == 'r') 3597 if (mode == 'r')
3539 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3598 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3540 else 3599 else
3541 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3600 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3542 PrivMode (state, bit); 3601
3602 set_privmode (bit, state);
3543 } 3603 }
3544 3604
3545 return state; 3605 return state;
3546} 3606}
3547 3607
… …
3555 static const struct 3615 static const struct
3556 { 3616 {
3557 const int argval; 3617 const int argval;
3558 const unsigned long bit; 3618 const unsigned long bit;
3559 } argtopriv[] = { 3619 } argtopriv[] = {
3560 { 1, PrivMode_aplCUR }, 3620 { 1, PrivMode_aplCUR }, // DECCKM
3561 { 2, PrivMode_vt52 }, 3621 { 2, PrivMode_vt52 },
3562 { 3, PrivMode_132 }, 3622 { 3, PrivMode_132 }, // DECCOLM
3563 { 4, PrivMode_smoothScroll }, 3623 { 4, PrivMode_smoothScroll }, // DECSCLM
3564 { 5, PrivMode_rVideo }, 3624 { 5, PrivMode_rVideo }, // DECSCNM
3565 { 6, PrivMode_relOrigin }, 3625 { 6, PrivMode_relOrigin }, // DECOM
3566 { 7, PrivMode_Autowrap }, 3626 { 7, PrivMode_Autowrap }, // DECAWM
3567 // 8, bi-directional support mode 3627 // 8, auto-repeat keys // DECARM
3568 { 9, PrivMode_MouseX10 }, 3628 { 9, PrivMode_MouseX10 },
3569 // 18, 19 printing-related 3629 // 18 end FF to printer after print screen
3630 // 19 Print screen prints full screen/scroll region
3570 { 25, PrivMode_VisibleCursor }, 3631 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3571#ifdef scrollBar_esc 3632#ifdef scrollBar_esc
3572 { scrollBar_esc, PrivMode_scrollBar }, 3633 { scrollBar_esc, PrivMode_scrollBar },
3573#endif 3634#endif
3574 { 35, PrivMode_ShiftKeys }, // rxvt extension 3635 { 35, PrivMode_ShiftKeys }, // rxvt extension
3636 // 38, tektronix mode // DECTEK
3575 { 40, PrivMode_132OK }, 3637 { 40, PrivMode_132OK },
3576 // 41 xterm more fixes NYI 3638 // 41 xterm more fixes NYI
3577 // 45 margin bell NYI 3639 // 45 margin bell NYI
3578 // 46 start logging 3640 // 46 start logging
3579 { 47, PrivMode_Screen }, 3641 { 47, PrivMode_Screen },
3580 { 66, PrivMode_aplKP }, 3642 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3581#ifndef NO_BACKSPACE_KEY 3643#ifndef NO_BACKSPACE_KEY
3582 { 67, PrivMode_BackSpace }, 3644 { 67, PrivMode_BackSpace }, // DECBKM
3583#endif 3645#endif
3584 { 1000, PrivMode_MouseX11 }, 3646 { 1000, PrivMode_MouseX11 },
3585 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3586 { 1002, PrivMode_MouseBtnEvent }, 3647 { 1002, PrivMode_MouseBtnEvent },
3587 { 1003, PrivMode_MouseAnyEvent }, 3648 { 1003, PrivMode_MouseAnyEvent },
3649#if ENABLE_FRILLS
3650 { 1005, PrivMode_ExtModeMouse },
3651#endif
3588 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3652 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3589 { 1011, PrivMode_Keypress }, // rxvt extension 3653 { 1011, PrivMode_Keypress }, // rxvt extension
3654#if ENABLE_FRILLS
3655 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3656#endif
3590 // 1035 enable modifiers for alt, numlock NYI 3657 // 1035 enable modifiers for alt, numlock NYI
3591 // 1036 send ESC for meta keys NYI 3658 // 1036 send ESC for meta keys NYI
3592 // 1037 send DEL for keypad delete NYI 3659 // 1037 send DEL for keypad delete NYI
3593 { 1047, PrivMode_Screen }, 3660 { 1047, PrivMode_Screen },
3594 // 1048 save and restore cursor 3661 // 1048 save and restore cursor, implemented in code
3595 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3662 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3596 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3663 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3664 { 2004, PrivMode_BracketPaste },
3597 }; 3665 };
3598 3666
3599 if (nargs == 0) 3667 if (nargs == 0)
3600 return; 3668 return;
3601 3669
… …
3608 for (i = 0; i < nargs; i++) 3676 for (i = 0; i < nargs; i++)
3609 { 3677 {
3610 state = -1; 3678 state = -1;
3611 3679
3612 /* basic handling */ 3680 /* basic handling */
3613 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3681 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3614 if (argtopriv[j].argval == arg[i]) 3682 if (argtopriv[j].argval == arg[i])
3615 { 3683 {
3616 state = privcases (mode, argtopriv[j].bit); 3684 state = privcases (mode, argtopriv[j].bit);
3617 break; 3685 break;
3618 } 3686 }
… …
3626 3694
3627 scr_touch (true); 3695 scr_touch (true);
3628 break; 3696 break;
3629#endif 3697#endif
3630 case 1048: /* alternative cursor save */ 3698 case 1048: /* alternative cursor save */
3631 case 1049:
3632 if (option (Opt_secondaryScreen)) 3699 if (option (Opt_secondaryScreen))
3633 if (mode == 0) 3700 if (mode == 0)
3634 scr_cursor (RESTORE); 3701 scr_cursor (RESTORE);
3635 else if (mode == 1) 3702 else if (mode == 1)
3636 scr_cursor (SAVE); 3703 scr_cursor (SAVE);
… …
3645 case 2: /* VT52 mode */ 3712 case 2: /* VT52 mode */
3646 /* oddball mode. should be set regardless of set/reset 3713 /* oddball mode. should be set regardless of set/reset
3647 * parameter. Return from VT52 mode with an ESC < from 3714 * parameter. Return from VT52 mode with an ESC < from
3648 * within VT52 mode 3715 * within VT52 mode
3649 */ 3716 */
3650 PrivMode (1, PrivMode_vt52); 3717 set_privmode (PrivMode_vt52, 1);
3651 break; 3718 break;
3652 case 3: /* 80/132 */ 3719 case 3: /* 80/132 */
3653 if (priv_modes & PrivMode_132OK) 3720 if (priv_modes & PrivMode_132OK)
3654 set_widthheight (((state ? 132 : 80) * fwidth), height); 3721 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3655 break; 3722 break;
3656 case 4: /* smooth scrolling */ 3723 case 4: /* smooth scrolling */
3657 set_option (Opt_jumpScroll, !state); 3724 set_option (Opt_jumpScroll, !state);
3658 break; 3725 break;
3659 case 5: /* reverse video */ 3726 case 5: /* reverse video */
… …
3670 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
3671 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3738 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3672 break; 3739 break;
3673#ifdef scrollBar_esc 3740#ifdef scrollBar_esc
3674 case scrollBar_esc: 3741 case scrollBar_esc:
3675 if (scrollbar_mapping (state)) 3742 if (scrollBar.map (state))
3676 { 3743 {
3677 resize_all_windows (0, 0, 0); 3744 resize_all_windows (0, 0, 0);
3678 scr_touch (true); 3745 scr_touch (true);
3679 } 3746 }
3680 break; 3747 break;
… …
3691 /* case 67: - backspace key */ 3758 /* case 67: - backspace key */
3692 case 1000: /* X11 mouse reporting */ 3759 case 1000: /* X11 mouse reporting */
3693 if (state) /* orthogonal */ 3760 if (state) /* orthogonal */
3694 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3761 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3695 break; 3762 break;
3696#if 0
3697 case 1001:
3698 break; /* X11 mouse highlighting */
3699#endif
3700 case 1002: 3763 case 1002:
3701 case 1003: 3764 case 1003:
3702 if (state) { 3765 if (state)
3766 {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3767 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3768 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3769 mouse_row = mouse_col = 0;
3705 vt_emask_mouse = PointerMotionMask; 3770 vt_emask_mouse = PointerMotionMask;
3771 }
3706 } else 3772 else
3707 vt_emask_mouse = NoEventMask; 3773 vt_emask_mouse = NoEventMask;
3774
3708 vt_select_input (); 3775 vt_select_input ();
3709 break; 3776 break;
3710 case 1010: /* scroll to bottom on TTY output inhibit */ 3777 case 1010: /* scroll to bottom on TTY output inhibit */
3711 set_option (Opt_scrollTtyOutput, !state); 3778 set_option (Opt_scrollTtyOutput, !state);
3712 break; 3779 break;
3713 case 1011: /* scroll to bottom on key press */ 3780 case 1011: /* scroll to bottom on key press */
3714 set_option (Opt_scrollTtyKeypress, state); 3781 set_option (Opt_scrollTtyKeypress, state);
3715 break; 3782 break;
3716 case 1047: /* secondary screen w/ clearing last */ 3783 case 1047: /* secondary screen w/ clearing last */
3717 if (option (Opt_secondaryScreen)) 3784 if (option (Opt_secondaryScreen))
3718 if (current_screen != PRIMARY) 3785 if (!state)
3719 scr_erase_screen (2); 3786 scr_erase_screen (2);
3787
3720 scr_change_screen (state); 3788 scr_change_screen (state);
3721 break; 3789 break;
3722 case 1049: /* secondary screen w/ clearing first */ 3790 case 1049: /* secondary screen w/ clearing first */
3791 if (option (Opt_secondaryScreen))
3792 if (state)
3793 scr_cursor (SAVE);
3794
3723 scr_change_screen (state); 3795 scr_change_screen (state);
3796
3724 if (option (Opt_secondaryScreen)) 3797 if (option (Opt_secondaryScreen))
3725 if (current_screen != PRIMARY) 3798 if (state)
3726 scr_erase_screen (2); 3799 scr_erase_screen (2);
3800 else
3801 scr_cursor (RESTORE);
3727 break; 3802 break;
3728 default: 3803 default:
3729 break; 3804 break;
3730 } 3805 }
3731 } 3806 }
… …
3884 } 3959 }
3885 } 3960 }
3886} 3961}
3887/*}}} */ 3962/*}}} */
3888 3963
3889/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3890void
3891rxvt_term::process_graphics ()
3892{
3893 unicode_t ch, cmd = cmd_getc ();
3894
3895 if (cmd == 'Q')
3896 { /* query graphics */
3897 tt_printf ("\033G0\012"); /* no graphics */
3898 return;
3899 }
3900 /* swallow other graphics sequences until terminating ':' */
3901 do
3902 ch = cmd_getc ();
3903 while (ch != ':');
3904}
3905/*}}} */
3906
3907/* ------------------------------------------------------------------------- */ 3964/* ------------------------------------------------------------------------- */
3908 3965
3909/* 3966/*
3910 * Send printf () formatted output to the command. 3967 * Send printf () formatted output to the command.
3911 * Only use for small amounts of data. 3968 * Only use for small amounts of data.
… …
3924 3981
3925/* ---------------------------------------------------------------------- */ 3982/* ---------------------------------------------------------------------- */
3926/* Write data to the pty as typed by the user, pasted with the mouse, 3983/* Write data to the pty as typed by the user, pasted with the mouse,
3927 * or generated by us in response to a query ESC sequence. 3984 * or generated by us in response to a query ESC sequence.
3928 */ 3985 */
3929const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3986static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3930 3987
3931void 3988void
3932rxvt_term::tt_write (const char *data, unsigned int len) 3989rxvt_term::tt_write (const char *data, unsigned int len)
3933{ 3990{
3934 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3991 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3939 3996
3940 if (v_buflen == 0) 3997 if (v_buflen == 0)
3941 { 3998 {
3942 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3999 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3943 4000
4001 max_it (written, 0);
4002
3944 if ((unsigned int)written == len) 4003 if (written == len)
3945 return; 4004 return;
3946 4005
3947 data += written; 4006 data += written;
3948 len -= written; 4007 len -= written;
3949 } 4008 }
3950 4009
3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4010 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3952 4011
3953 memcpy (v_buffer + v_buflen, data, len); 4012 memcpy (v_buffer + v_buflen, data, len);
3954 v_buflen += len; 4013 v_buflen += len;
3955 4014
3956 pty_ev.set (ev::READ | ev::WRITE); 4015 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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