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.378 by root, Fri Dec 14 02:27:54 2007 UTC vs.
Revision 1.495 by sf-exg, Sun Aug 28 18:48:41 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-2007 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 im_send_spot ();
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 ();
1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.is_active ()) 1003 if (want_refresh && !flush_ev.is_active ())
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1005
1006 display->flush ();
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 else 1038 else
1085 w.stop (); 1039 w.stop ();
1086} 1040}
1087#endif 1041#endif
1088 1042
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1044void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1046{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1049 {
1095 want_refresh = 1; 1050 want_refresh = 1;
1051 refresh_check ();
1052 }
1096 else 1053 else
1097 w.stop (); 1054 w.stop ();
1098} 1055}
1099#endif 1056#endif
1100 1057
… …
1104{ 1061{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1062 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1063 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1064 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1065 want_refresh = 1;
1066 refresh_check ();
1109 } 1067 }
1110 else 1068 else
1111 w.stop (); 1069 w.stop ();
1112} 1070}
1113#endif 1071#endif
1114 1072
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1074void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1076{
1119 if (mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1077 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120 : scr_page (UP, mouse_slip_wheel_speed)) 1078 {
1121 want_refresh = 1; 1079 want_refresh = 1;
1080 refresh_check ();
1081 }
1122 1082
1123 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0) 1083 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1124 { 1084 {
1125 mouse_slip_wheel_speed = 0; 1085 mouse_slip_wheel_speed = 0;
1126 w.stop (); 1086 w.stop ();
… …
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)
1257 { 1255 {
1258 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1259 return; 1257 return;
1258
1260 mouse_row = x; 1259 mouse_row = x;
1261 mouse_col = y; 1260 mouse_col = y;
1262 code += 32; 1261 code += 32;
1263 } 1262 }
1264 1263
… …
1267 else 1266 else
1268 { 1267 {
1269 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1270 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1271 if (button_number >= 3) 1270 if (button_number >= 3)
1272 button_number += (64 - 3); 1271 button_number += 64 - 3;
1273 } 1272 }
1274 1273
1275 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1276 { 1275 {
1277 /* 1276 /*
… …
1309 fputc ('A', stderr); 1308 fputc ('A', stderr);
1310 if (key_state & 32) 1309 if (key_state & 32)
1311 fputc ('2', stderr); 1310 fputc ('2', stderr);
1312 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1313 button_number, 1312 button_number,
1314 x + 1, 1313 x,
1315 y + 1); 1314 y);
1316#endif 1315#endif
1317 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
1318 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1319 (code + button_number + key_state), 1331 code + button_number + key_state,
1320 (32 + x + 1), 1332 32 + x,
1321 (32 + y + 1)); 1333 32 + y);
1322} 1334}
1323 1335
1324/*{{{ process an X event */ 1336/*{{{ process an X event */
1325void 1337void
1326rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1428 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1429 focus_out (); 1441 focus_out ();
1430 break; 1442 break;
1431 1443
1432 case ConfigureNotify: 1444 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1436 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1437 { 1446 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 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
1440 1468
1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1442 { 1470 {
1443 seen_resize = 1; 1471 seen_resize = 1;
1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1445 } 1473 }
1446 else 1474 else
1447 { 1475 {
1448#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1477 if (moved)
1450 update_background (); 1478 update_background ();
1451#endif 1479#endif
1452 } 1480 }
1481
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1483 }
1455 break; 1484 break;
1456 1485
1457 case PropertyNotify: 1486 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463 break; 1488 break;
1464 1489
1465 case SelectionClear: 1490 case SelectionClear:
1466 selection_clear (); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break;
1468
1469 case SelectionNotify:
1470 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472 break; 1492 break;
1473 1493
1474 case SelectionRequest: 1494 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1476 break; 1496 break;
1477 1497
1478 case MapNotify: 1498 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP
1500 /* This is needed specifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1504 * reparenting.
1505 * We should not render background immediately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025);
1514#endif
1479 mapped = 1; 1515 mapped = 1;
1480#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1481 text_blink_ev.start (); 1517 text_blink_ev.start ();
1482#endif 1518#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1496 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1497 { 1533 {
1498 do 1534 do
1499 { 1535 {
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1502 } 1538 }
1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1504 1540
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506 1542
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 { 1544 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1511 } 1547 }
1548
1512 want_refresh = 1; 1549 want_refresh = 1;
1513 } 1550 }
1514 else 1551 else
1515 { 1552 {
1516 XEvent unused_event; 1553 XEvent unused_event;
… …
1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1556 ;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1558 ;
1522 1559
1523 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1524 { 1561 {
1525 scrollBar.setIdle (); 1562 scrollBar.state = STATE_IDLE;
1526 scrollbar_show (0); 1563 scrollBar.show (0);
1527 } 1564 }
1528 } 1565 }
1529 break; 1566 break;
1530 1567
1531 case MotionNotify: 1568 case MotionNotify:
… …
1618#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1619 } 1656 }
1620#endif 1657#endif
1621 } 1658 }
1622 } 1659 }
1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1624 { 1661 {
1625 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1626 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1627 ; 1664 ;
1628 1665
1629 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1630 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1633 &unused_mask); 1670 &unused_mask);
1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1635 scrollbar_size ()); 1672 scrollBar.size ());
1636 want_refresh = 1; 1673 want_refresh = 1;
1637 scrollbar_show (1); 1674 scrollBar.show (1);
1638 } 1675 }
1639 break; 1676 break;
1640 } 1677 }
1641 1678
1642#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
… …
1663 1700
1664 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1665 pointer_blank (); 1702 pointer_blank ();
1666 } 1703 }
1667#endif 1704#endif
1705
1706 refresh_check ();
1668} 1707}
1708
1709#if ENABLE_FRILLS
1710void
1711rxvt_term::set_urgency (bool enable)
1712{
1713 if (enable == urgency_hint)
1714 return;
1715
1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable;
1721 }
1722}
1723#endif
1669 1724
1670void 1725void
1671rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1672{ 1727{
1673 if (!focus) 1728 if (!focus)
1674 { 1729 {
1675 focus = 1; 1730 focus = 1;
1676 want_refresh = 1; 1731 want_refresh = 1;
1677 1732
1678 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1679
1680#if USE_XIM 1733#if USE_XIM
1681 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1682 { 1735 {
1683 IMSetPosition (); 1736 im_set_position ();
1684 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1685 } 1738 }
1686#endif 1739#endif
1687#if CURSOR_BLINK 1740#if CURSOR_BLINK
1688 if (option (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
… …
1695 scr_recolour (); 1748 scr_recolour ();
1696 } 1749 }
1697#endif 1750#endif
1698#if ENABLE_FRILLS 1751#if ENABLE_FRILLS
1699 if (option (Opt_urgentOnBell)) 1752 if (option (Opt_urgentOnBell))
1700 { 1753 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 1754#endif
1755
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1708 } 1757 }
1709} 1758}
1710 1759
1711void 1760void
1712rxvt_term::focus_out () 1761rxvt_term::focus_out ()
… …
1714 if (focus) 1763 if (focus)
1715 { 1764 {
1716 focus = 0; 1765 focus = 0;
1717 want_refresh = 1; 1766 want_refresh = 1;
1718 1767
1719 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1768#if ENABLE_FRILLS
1720 1769 if (option (Opt_urgentOnBell))
1770 set_urgency (0);
1771#endif
1721#if ENABLE_FRILLS || ISO_14755 1772#if ENABLE_FRILLS || ISO_14755
1722 if (iso14755buf) 1773 if (iso14755buf)
1723 { 1774 {
1724 iso14755buf = 0; 1775 iso14755buf = 0;
1725# if ISO_14755 1776# if ISO_14755
… …
1742 { 1793 {
1743 pix_colors = pix_colors_unfocused; 1794 pix_colors = pix_colors_unfocused;
1744 scr_recolour (); 1795 scr_recolour ();
1745 } 1796 }
1746#endif 1797#endif
1798
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747 } 1800 }
1748} 1801}
1749 1802
1750void 1803void
1751rxvt_term::update_fade_color (unsigned int idx) 1804rxvt_term::update_fade_color (unsigned int idx)
… …
1779 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1780 */ 1833 */
1781 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1783 { 1836 {
1784 bgPixmap.set_root_pixmap (); 1837 bg_set_root_pixmap ();
1785 update_background (); 1838 update_background ();
1786 } 1839 }
1840
1787 break; 1841 break;
1788 } 1842 }
1789# endif 1843# endif
1844
1845 refresh_check ();
1790} 1846}
1791#endif 1847#endif
1792 1848
1793void 1849void
1794rxvt_term::button_press (XButtonEvent &ev) 1850rxvt_term::button_press (XButtonEvent &ev)
… …
1825 /* save the xbutton state (for ButtonRelease) */ 1881 /* save the xbutton state (for ButtonRelease) */
1826 MEvent.state = ev.state; 1882 MEvent.state = ev.state;
1827#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1828 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1829 { 1885 {
1830 /* same button, within alloted time */ 1886 /* same button, within allowed time */
1831 MEvent.clicks++; 1887 MEvent.clicks++;
1832 1888
1833 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1834 { 1890 {
1835 /* only report double clicks */ 1891 /* only report double clicks */
… …
1907 } 1963 }
1908 1964
1909 /* 1965 /*
1910 * Scrollbar window processing of button press 1966 * Scrollbar window processing of button press
1911 */ 1967 */
1912 if (isScrollbarWindow (ev.window)) 1968 if (scrollBar.state && ev.window == scrollBar.win)
1913 { 1969 {
1914 scrollBar.setIdle (); 1970 page_dirn direction = NO_DIR;
1971
1972 if (scrollBar.upButton (ev.y))
1973 direction = UP; /* up */
1974 else if (scrollBar.dnButton (ev.y))
1975 direction = DN; /* down */
1976
1977 scrollBar.state = STATE_IDLE;
1915 /* 1978 /*
1916 * Rxvt-style scrollbar: 1979 * Rxvt-style scrollbar:
1917 * move up if mouse is above slider 1980 * move up if mouse is above slider
1918 * move dn if mouse is below slider 1981 * move dn if mouse is below slider
1919 * 1982 *
… …
1928 /* 1991 /*
1929 * Mouse report disabled scrollbar: 1992 * Mouse report disabled scrollbar:
1930 * arrow buttons - send up/down 1993 * arrow buttons - send up/down
1931 * click on scrollbar - send pageup/down 1994 * click on scrollbar - send pageup/down
1932 */ 1995 */
1933 if ((scrollBar.style == R_SB_NEXT 1996 if (direction == UP)
1934 && scrollbarnext_upButton (ev.y))
1935 || (scrollBar.style == R_SB_RXVT
1936 && scrollbarrxvt_upButton (ev.y)))
1937 tt_printf ("\033[A"); 1997 tt_printf ("\033[A");
1938 else if ((scrollBar.style == R_SB_NEXT 1998 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"); 1999 tt_printf ("\033[B");
1943 else 2000 else
1944 switch (ev.button) 2001 switch (ev.button)
1945 { 2002 {
1946 case Button2: 2003 case Button2:
… …
1954 break; 2011 break;
1955 } 2012 }
1956 } 2013 }
1957 else 2014 else
1958#endif /* NO_SCROLLBAR_REPORT */ 2015#endif /* NO_SCROLLBAR_REPORT */
1959
1960 {
1961 char upordown = 0;
1962
1963 if (scrollBar.style == R_SB_NEXT)
1964 { 2016 {
1965 if (scrollbarnext_upButton (ev.y)) 2017 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
1978 if (upordown)
1979 { 2018 {
1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2019#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1981 if (!cont_scroll_ev.is_active ()) 2020 if (!cont_scroll_ev.is_active ())
1982 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1983#endif 2022#endif
1984 if (scr_page (upordown < 0 ? UP : DN, 1)) 2023 if (scr_page (direction, 1))
1985 { 2024 {
1986 if (upordown < 0) 2025 if (direction == UP)
1987 scrollBar.setUp (); 2026 scrollBar.state = STATE_UP;
1988 else 2027 else
1989 scrollBar.setDn (); 2028 scrollBar.state = STATE_DOWN;
1990 } 2029 }
1991 } 2030 }
1992 else 2031 else
1993 switch (ev.button) 2032 switch (ev.button)
1994 { 2033 {
1995 case Button2: 2034 case Button2:
1996 switch (scrollbar_align) 2035 switch (scrollBar.align)
1997 { 2036 {
1998 case R_SB_ALIGN_TOP: 2037 case R_SB_ALIGN_TOP:
1999 csrO = 0; 2038 csrO = 0;
2000 break; 2039 break;
2001 case R_SB_ALIGN_CENTRE: 2040 case R_SB_ALIGN_CENTRE:
… …
2005 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
2006 break; 2045 break;
2007 } 2046 }
2008 2047
2009 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == R_SB_XTERM
2010 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
2011 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
2012 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2013 2052
2014 scrollBar.setMotion (); 2053 scrollBar.state = STATE_MOTION;
2015 break; 2054 break;
2016 2055
2017 case Button1: 2056 case Button1:
2018 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2057 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2019 csrO = ev.y - scrollBar.top; 2058 csrO = ev.y - scrollBar.top;
2020 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2021 2060
2022 case Button3: 2061 case Button3:
2023 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != R_SB_XTERM)
2024 { 2063 {
2025 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
2026# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
2027 scr_page (UP, nrow - 1); 2066 scr_page (UP, nrow - 1);
2028# else 2067# else
2029 scr_page (UP, nrow / 4); 2068 scr_page (UP, nrow / 4);
2030# endif 2069# endif
2031 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
2032# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
2033 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2034# else 2073# else
2035 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2036# endif 2075# endif
2037 else 2076 else
2038 scrollBar.setMotion (); 2077 scrollBar.state = STATE_MOTION;
2039 } 2078 }
2040 else 2079 else
2041 { 2080 {
2042 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2043 (nrow 2082 (nrow
2044 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
2045 / scrollbar_size ())); 2084 / scrollBar.size ()));
2046 } 2085 }
2047 2086
2048 break; 2087 break;
2049 } 2088 }
2050 } 2089 }
… …
2060 2099
2061 csrO = 0; /* reset csr Offset */ 2100 csrO = 0; /* reset csr Offset */
2062 if (!bypass_keystate) 2101 if (!bypass_keystate)
2063 reportmode = !! (priv_modes & PrivMode_mouse_report); 2102 reportmode = !! (priv_modes & PrivMode_mouse_report);
2064 2103
2065 if (scrollbar_isUpDn ()) 2104 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2066 { 2105 {
2067 scrollBar.setIdle (); 2106 scrollBar.state = STATE_IDLE;
2068 scrollbar_show (0); 2107 scrollBar.show (0);
2069 } 2108 }
2070 2109
2071#ifdef SELECTION_SCROLLING 2110#ifdef SELECTION_SCROLLING
2072 sel_scroll_ev.stop(); 2111 sel_scroll_ev.stop();
2073#endif 2112#endif
… …
2123 selection_make (ev.time); 2162 selection_make (ev.time);
2124 break; 2163 break;
2125 2164
2126 case Button2: 2165 case Button2:
2127 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2128 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2129 break; 2168 break;
2130 2169
2131#ifdef MOUSE_WHEEL 2170#ifdef MOUSE_WHEEL
2132 case Button4: 2171 case Button4:
2133 case Button5: 2172 case Button5:
… …
2153 2192
2154 if (!slip_wheel_ev.is_active ()) 2193 if (!slip_wheel_ev.is_active ())
2155 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2194 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2156 } 2195 }
2157 else 2196 else
2197# endif
2158 { 2198 {
2159# endif
2160 scr_page (v, i); 2199 scr_page (v, i);
2161 scrollbar_show (1); 2200 scrollBar.show (1);
2162# ifdef MOUSE_SLIP_WHEELING
2163 } 2201 }
2164# endif
2165 } 2202 }
2166 break; 2203 break;
2167#endif 2204#endif
2168 } 2205 }
2169 } 2206 }
2170} 2207}
2171 2208
2172/*}}} */ 2209/*}}} */
2173 2210
2174bool 2211void
2175rxvt_term::cmd_parse () 2212rxvt_term::cmd_parse ()
2176{ 2213{
2177 bool flag = false;
2178 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2179 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2180 2216
2181 for (;;) 2217 for (;;)
2182 { 2218 {
2183 if (ch == NOCHAR) 2219 if (ecb_unlikely (ch == NOCHAR))
2184 { 2220 {
2185 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2186 ch = next_char (); 2222 ch = next_char ();
2187 2223
2188 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2189 break; 2225 break;
2190 } 2226 }
2191 2227
2192 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2228 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2193 { 2229 {
2194 if (!seen_input) 2230 if (ecb_unlikely (!seen_input))
2195 { 2231 {
2196 seen_input = 1; 2232 seen_input = 1;
2197 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2198 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2199 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2212 wchar_t *str = buf; 2248 wchar_t *str = buf;
2213 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2214 2250
2215 for (;;) 2251 for (;;)
2216 { 2252 {
2217 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2253 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2218 break; 2254 break;
2219 2255
2220 *str++ = ch; 2256 *str++ = ch;
2221 2257
2222 if (ch == C0_LF || str >= eol) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2223 { 2259 {
2224 if (ch == C0_LF) 2260 if (ch == C0_LF)
2225 nlines++; 2261 nlines++;
2226 2262
2227 refresh_count++; 2263 refresh_count++;
… …
2276 * What the heck we'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2277 * if skipScroll is enabled. 2313 * if skipScroll is enabled.
2278 */ 2314 */
2279 if (refreshnow) 2315 if (refreshnow)
2280 { 2316 {
2281 flag = true;
2282 scr_refresh (); 2317 scr_refresh ();
2283 want_refresh = 1; 2318 want_refresh = 1;
2284 } 2319 }
2285
2286 } 2320 }
2287 else 2321 else
2288 { 2322 {
2289 try 2323 try
2290 { 2324 {
… …
2298 } 2332 }
2299 2333
2300 ch = NOCHAR; 2334 ch = NOCHAR;
2301 } 2335 }
2302 } 2336 }
2303
2304 return flag;
2305} 2337}
2306 2338
2307// read the next character 2339// read the next character
2308wchar_t 2340wchar_t
2309rxvt_term::next_char () NOTHROW 2341rxvt_term::next_char () NOTHROW
2310{ 2342{
2311 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2312 { 2344 {
2313 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2314 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2315 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2316 2348
2317 wchar_t wc; 2349 wchar_t wc;
2318 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2350 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2319 2351
… …
2323 cmdbuf_ptr = cmdbuf_endp; 2355 cmdbuf_ptr = cmdbuf_endp;
2324 break; 2356 break;
2325 } 2357 }
2326 2358
2327 if (len == (size_t)-1) 2359 if (len == (size_t)-1)
2360 {
2361 mbstate.reset (); // reset now undefined conversion state
2328 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2362 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363 }
2329 2364
2330 // assume wchar == unicode 2365 // assume wchar == unicode
2331 cmdbuf_ptr += len; 2366 cmdbuf_ptr += len;
2332 return wc & UNICODE_MASK; 2367 return wc & UNICODE_MASK;
2333 } 2368 }
… …
2344 : NOCHAR; 2379 : NOCHAR;
2345} 2380}
2346 2381
2347static class out_of_input out_of_input; 2382static class out_of_input out_of_input;
2348 2383
2349/* rxvt_cmd_getc () - Return next input character */
2350/*
2351 * Return the next input character after first passing any keyboard input
2352 * to the command.
2353 */
2354wchar_t 2384wchar_t
2355rxvt_term::cmd_getc () THROW ((class out_of_input)) 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2356{ 2386{
2357 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2358 2388
… …
2377/*----------------------------------------------------------------------*/ 2407/*----------------------------------------------------------------------*/
2378#ifdef PRINTPIPE 2408#ifdef PRINTPIPE
2379FILE * 2409FILE *
2380rxvt_term::popen_printer () 2410rxvt_term::popen_printer ()
2381{ 2411{
2382 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2383 2413
2384 if (stream == NULL) 2414 if (stream == NULL)
2385 rxvt_warn ("can't open printer pipe, not printing.\n"); 2415 rxvt_warn ("can't open printer pipe, not printing.\n");
2386 2416
2387 return stream; 2417 return stream;
… …
2398 * simulate attached vt100 printer 2428 * simulate attached vt100 printer
2399 */ 2429 */
2400void 2430void
2401rxvt_term::process_print_pipe () 2431rxvt_term::process_print_pipe ()
2402{ 2432{
2403 int done; 2433 FILE *fd = popen_printer ();
2404 FILE *fd;
2405 2434
2406 if ((fd = popen_printer ()) == NULL) 2435 if (!fd)
2407 return; 2436 return;
2408 2437
2409 /* 2438 /*
2410 * Send all input to the printer until either ESC[4i or ESC[?4i 2439 * Send all input to the printer until either ESC[4i or ESC[?4i
2411 * is received. 2440 * is received.
2412 */ 2441 */
2413 for (done = 0; !done;) 2442 for (int done = 0; !done; )
2414 { 2443 {
2415 unsigned char buf[8]; 2444 unsigned char buf[8];
2416 unicode_t ch; 2445 unicode_t ch;
2417 unsigned int i, len; 2446 unsigned int i, len;
2418 2447
… …
2452 pclose_printer (fd); 2481 pclose_printer (fd);
2453} 2482}
2454#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
2455/*}}} */ 2484/*}}} */
2456 2485
2457/* *INDENT-OFF* */
2458enum { 2486enum {
2459 C1_40 = 0x40, 2487 C1_40 = 0x40,
2460 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2488 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2461 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2489 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2462 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2463 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2464}; 2492};
2465/* *INDENT-ON* */
2466 2493
2467/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
2468void 2495void
2469rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
2470{ 2497{
… …
2563 break; 2590 break;
2564 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
2565 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2566 break; 2593 break;
2567 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
2568 PrivMode (0, PrivMode_vt52); 2595 set_privmode (PrivMode_vt52, 0);
2569 break; 2596 break;
2570 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
2571 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
2572 /* unimplemented */ 2599 /* unimplemented */
2573 break; 2600 break;
… …
2592 return; 2619 return;
2593 } 2620 }
2594 2621
2595 switch (ch) 2622 switch (ch)
2596 { 2623 {
2597 /* case 1: do_tek_mode (); break; */
2598 case '#': 2624 case '#':
2599 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
2600 scr_E (); 2626 scr_E ();
2601 break; 2627 break;
2602 case '(': 2628 case '(':
… …
2625#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2626 case '9': 2652 case '9':
2627 scr_forwardindex (); 2653 scr_forwardindex ();
2628 break; 2654 break;
2629#endif 2655#endif
2656 // DECPAM/DECPNM
2630 case '=': 2657 case '=':
2631 case '>': 2658 case '>':
2632 PrivMode ((ch == '='), PrivMode_aplKP); 2659 set_privmode (PrivMode_aplKP, ch == '=');
2633 break; 2660 break;
2634 2661
2635 case C1_40: 2662 case C1_40:
2636 cmd_getc (); 2663 cmd_getc ();
2637 break; 2664 break;
… …
2641 2668
2642 /* 8.3.87: NEXT LINE */ 2669 /* 8.3.87: NEXT LINE */
2643 case C1_NEL: /* ESC E */ 2670 case C1_NEL: /* ESC E */
2644 { 2671 {
2645 wchar_t nlcr[] = { C0_LF, C0_CR }; 2672 wchar_t nlcr[] = { C0_LF, C0_CR };
2646 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2673 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2647 } 2674 }
2648 break; 2675 break;
2649 2676
2650 /* kidnapped escape sequence: Should be 8.3.48 */ 2677 /* kidnapped escape sequence: Should be 8.3.48 */
2651 case C1_ESA: /* ESC G */ 2678 case C1_ESA: /* ESC G */
2652 process_graphics (); 2679 // used by original rxvt for rob nations own graphics mode
2680 if (cmd_getc () == 'Q')
2681 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2653 break; 2682 break;
2654 2683
2655 /* 8.3.63: CHARACTER TABULATION SET */ 2684 /* 8.3.63: CHARACTER TABULATION SET */
2656 case C1_HTS: /* ESC H */ 2685 case C1_HTS: /* ESC H */
2657 scr_set_tab (1); 2686 scr_set_tab (1);
… …
2661 case C1_RI: /* ESC M */ 2690 case C1_RI: /* ESC M */
2662 scr_index (DN); 2691 scr_index (DN);
2663 break; 2692 break;
2664 2693
2665 /* 8.3.142: SINGLE-SHIFT TWO */ 2694 /* 8.3.142: SINGLE-SHIFT TWO */
2666 /*case C1_SS2: scr_single_shift (2); break; */ 2695 /* case C1_SS2: break; */
2667 2696
2668 /* 8.3.143: SINGLE-SHIFT THREE */ 2697 /* 8.3.143: SINGLE-SHIFT THREE */
2669 /*case C1_SS3: scr_single_shift (3); break; */ 2698 /* case C1_SS3: break; */
2670 2699
2671 /* 8.3.27: DEVICE CONTROL STRING */ 2700 /* 8.3.27: DEVICE CONTROL STRING */
2672 case C1_DCS: /* ESC P */ 2701 case C1_DCS: /* ESC P */
2673 process_dcs_seq (); 2702 process_dcs_seq ();
2674 break; 2703 break;
… …
2676 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2705 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2677 case C1_SCI: /* ESC Z */ 2706 case C1_SCI: /* ESC Z */
2678 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2707 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2679 break; /* steal obsolete ESC [ c */ 2708 break; /* steal obsolete ESC [ c */
2680 2709
2681 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2710 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2682 case C1_CSI: /* ESC [ */ 2711 case C1_CSI: /* ESC [ */
2683 process_csi_seq (); 2712 process_csi_seq ();
2684 break; 2713 break;
2685 2714
2686 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2715 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2687 case C1_OSC: /* ESC ] */ 2716 case C1_OSC: /* ESC ] */
2688 process_osc_seq (); 2717 process_osc_seq ();
2689 break; 2718 break;
2690 2719
2691 /* 8.3.106: RESET TO INITIAL STATE */ 2720 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2692 case 'c': 2721 case 'c':
2693 mbstate.reset (); 2722 mbstate.reset ();
2694 scr_poweron (); 2723 scr_poweron ();
2695 scrollbar_show (1); 2724 scrollBar.show (1);
2696 break; 2725 break;
2697 2726
2698 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2727 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2699 case 'n': 2728 case 'n':
2700 scr_charset_choose (2); 2729 scr_charset_choose (2);
… …
2707 } 2736 }
2708} 2737}
2709/*}}} */ 2738/*}}} */
2710 2739
2711/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2740/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2712/* *INDENT-OFF* */
2713enum { 2741enum {
2714 CSI_ICH = 0x40, 2742 CSI_ICH = 0x40,
2715 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2743 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2716 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2744 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2717 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2745 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2720 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2748 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2721 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2749 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2722 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2750 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2723}; 2751};
2724 2752
2725#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2753#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2726 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2754 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2727 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2755 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2728#define get_byte_array_bit(array, bit) \ 2756#define get_byte_array_bit(array, bit) \
2729 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2757 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2730 2758
2731const unsigned char csi_defaults[] = 2759static const unsigned char csi_defaults[] =
2732 { 2760 {
2733 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2761 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2734 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2762 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2735 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2763 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2736 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2764 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2737 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2765 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2738 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2766 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2739 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2767 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2740 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2768 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2741 }; 2769 };
2742/* *INDENT-ON* */
2743 2770
2744void 2771void
2745rxvt_term::process_csi_seq () 2772rxvt_term::process_csi_seq ()
2746{ 2773{
2747 unicode_t ch, priv, i; 2774 unicode_t ch, priv, i;
… …
2751 2778
2752 nargs = 0; 2779 nargs = 0;
2753 2780
2754 priv = 0; 2781 priv = 0;
2755 ch = cmd_getc (); 2782 ch = cmd_getc ();
2756 if (ch >= '<' && ch <= '?') 2783 if ((ch >= '<' && ch <= '?') || ch == '!')
2757 { 2784 {
2758 /* '<' '=' '>' '?' */ 2785 /* '<' '=' '>' '?' '!' */
2759 priv = ch; 2786 priv = ch;
2760 ch = cmd_getc (); 2787 ch = cmd_getc ();
2761 } 2788 }
2762 2789
2763 /* read any numerical arguments */ 2790 /* read any numerical arguments */
… …
2812 // versions. 2839 // versions.
2813 // 2840 //
2814 tt_printf ("\033[>%d;95;0c", 'U'); 2841 tt_printf ("\033[>%d;95;0c", 'U');
2815 } 2842 }
2816 break; 2843 break;
2844
2817 case '?': 2845 case '?':
2818 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2846 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2819 process_terminal_mode (ch, priv, nargs, arg); 2847 process_terminal_mode (ch, priv, nargs, arg);
2820 break; 2848 break;
2849
2850 case '!':
2851 if (ch == CSI_70)
2852 {
2853 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2854 scr_soft_reset ();
2855
2856 static const int pm_h[] = { 7, 25 };
2857 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2858
2859 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2860 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2821 } 2861 }
2862 break;
2863 }
2864
2822 return; 2865 return;
2823 } 2866 }
2824 2867
2825 switch (ch) 2868 switch (ch)
2826 { 2869 {
… …
3041 } 3084 }
3042} 3085}
3043/*}}} */ 3086/*}}} */
3044 3087
3045#if !ENABLE_MINIMAL 3088#if !ENABLE_MINIMAL
3046/* ARGSUSED */
3047void 3089void
3048rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3090rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3049{ 3091{
3050 int x, y; 3092 int x, y;
3051 XWindowAttributes wattr; 3093 XWindowAttributes wattr;
… …
3060 { 3102 {
3061 /* 3103 /*
3062 * commands 3104 * commands
3063 */ 3105 */
3064 case 1: /* deiconify window */ 3106 case 1: /* deiconify window */
3065 XMapWindow (dpy, parent[0]); 3107 XMapWindow (dpy, parent);
3066 break; 3108 break;
3067 case 2: /* iconify window */ 3109 case 2: /* iconify window */
3068 XIconifyWindow (dpy, parent[0], display->screen); 3110 XIconifyWindow (dpy, parent, display->screen);
3069 break; 3111 break;
3070 case 3: /* set position (pixels) */ 3112 case 3: /* set position (pixels) */
3071 XMoveWindow (dpy, parent[0], args[1], args[2]); 3113 XMoveWindow (dpy, parent, args[1], args[2]);
3072 break; 3114 break;
3073 case 4: /* set size (pixels) */ 3115 case 4: /* set size (pixels) */
3074 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3075 break; 3117 break;
3076 case 5: /* raise window */ 3118 case 5: /* raise window */
3077 XRaiseWindow (dpy, parent[0]); 3119 XRaiseWindow (dpy, parent);
3078 break; 3120 break;
3079 case 6: /* lower window */ 3121 case 6: /* lower window */
3080 XLowerWindow (dpy, parent[0]); 3122 XLowerWindow (dpy, parent);
3081 break; 3123 break;
3082 case 7: /* refresh window */ 3124 case 7: /* refresh window */
3083 scr_touch (true); 3125 scr_touch (true);
3084 break; 3126 break;
3085 case 8: /* set size (chars) */ 3127 case 8: /* set size (chars) */
… …
3096 3138
3097 /* 3139 /*
3098 * reports - some output format copied from XTerm 3140 * reports - some output format copied from XTerm
3099 */ 3141 */
3100 case 11: /* report window state */ 3142 case 11: /* report window state */
3101 XGetWindowAttributes (dpy, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent, &wattr);
3102 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3103 break; 3145 break;
3104 case 13: /* report window position */ 3146 case 13: /* report window position */
3105 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3106 XTranslateCoordinates (dpy, parent[0], wattr.root, 3148 XTranslateCoordinates (dpy, parent, wattr.root,
3107 -wattr.border_width, -wattr.border_width, 3149 -wattr.border_width, -wattr.border_width,
3108 &x, &y, &wdummy); 3150 &x, &y, &wdummy);
3109 tt_printf ("\033[3;%d;%dt", x, y); 3151 tt_printf ("\033[3;%d;%dt", x, y);
3110 break; 3152 break;
3111 case 14: /* report window size (pixels) */ 3153 case 14: /* report window size (pixels) */
3112 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3113 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3114 break; 3156 break;
3115 case 18: /* report text area size (chars) */ 3157 case 18: /* report text area size (chars) */
3116 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3158 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3117 break; 3159 break;
… …
3119 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3120 break; 3162 break;
3121 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3122 { 3164 {
3123 char *s; 3165 char *s;
3124 XGetIconName (dpy, parent[0], &s); 3166 XGetIconName (dpy, parent, &s);
3125 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3167 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3126 XFree (s); 3168 XFree (s);
3127 } 3169 }
3128 break; 3170 break;
3129 case 21: /* report window title */ 3171 case 21: /* report window title */
3130 { 3172 {
3131 char *s; 3173 char *s;
3132 XFetchName (dpy, parent[0], &s); 3174 XFetchName (dpy, parent, &s);
3133 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3134 XFree (s); 3176 XFree (s);
3135 } 3177 }
3136 break; 3178 break;
3137 } 3179 }
… …
3193 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3194 */ 3236 */
3195void 3237void
3196rxvt_term::process_dcs_seq () 3238rxvt_term::process_dcs_seq ()
3197{ 3239{
3198 char *s;
3199 unicode_t eh;
3200
3201 /* 3240 /*
3202 * Not handled yet 3241 * Not handled yet
3203 */ 3242 */
3243
3244 unicode_t eh;
3204 s = get_to_st (eh); 3245 char *s = get_to_st (eh);
3205 if (s) 3246 if (s)
3206 free (s); 3247 free (s);
3207 3248
3208 return; 3249 return;
3209} 3250}
… …
3213 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3254 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3214 */ 3255 */
3215void 3256void
3216rxvt_term::process_osc_seq () 3257rxvt_term::process_osc_seq ()
3217{ 3258{
3218 unicode_t ch, eh;
3219 int arg; 3259 int arg;
3220 3260
3221 ch = cmd_getc (); 3261 unicode_t ch = cmd_getc ();
3222 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3262 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3223 arg = arg * 10 + (ch - '0'); 3263 arg = arg * 10 + (ch - '0');
3224 3264
3225 if (ch == ';') 3265 if (ch == ';')
3226 { 3266 {
3267 unicode_t eh;
3227 char *s = get_to_st (eh); 3268 char *s = get_to_st (eh);
3228 3269
3229 if (s) 3270 if (s)
3230 { 3271 {
3231 process_xterm_seq (arg, s, eh); 3272 process_xterm_seq (arg, s, eh);
… …
3255 3296
3256/* 3297/*
3257 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3298 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3258 */ 3299 */
3259void 3300void
3260rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3301rxvt_term::process_xterm_seq (int op, char *str, char resp)
3261{ 3302{
3262 int color; 3303 int color;
3263 char *buf, *name; 3304 char *buf, *name;
3264 bool query = str[0] == '?' && !str[1]; 3305 bool query = str[0] == '?' && !str[1];
3265 int saveop = op; 3306 int saveop = op;
… …
3292 unsigned long bytes_after; 3333 unsigned long bytes_after;
3293 unsigned char *value = 0; 3334 unsigned char *value = 0;
3294 const char *str = ""; 3335 const char *str = "";
3295 3336
3296 if (prop 3337 if (prop
3297 && XGetWindowProperty (dpy, parent[0], 3338 && XGetWindowProperty (dpy, parent,
3298 prop, 0, 1<<16, 0, AnyPropertyType, 3339 prop, 0, 1<<16, 0, AnyPropertyType,
3299 &actual_type, &actual_format, 3340 &actual_type, &actual_format,
3300 &nitems, &bytes_after, &value) == Success 3341 &nitems, &bytes_after, &value) == Success
3301 && actual_type != None 3342 && actual_type != None
3302 && actual_format == 8) 3343 && actual_format == 8)
… …
3306 3347
3307 XFree (value); 3348 XFree (value);
3308 } 3349 }
3309 else 3350 else
3310 { 3351 {
3311 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3352 char *eq = strchr (str, '=');
3312 3353
3313 if (eq) 3354 if (eq)
3314 { 3355 {
3315 *eq = 0; 3356 *eq = 0;
3316 set_utf8_property (display->atom (str), eq + 1); 3357 set_utf8_property (display->atom (str), eq + 1);
3317 } 3358 }
3318 else 3359 else
3319 XDeleteProperty (dpy, parent[0], 3360 XDeleteProperty (dpy, parent,
3320 display->atom (str)); 3361 display->atom (str));
3321 } 3362 }
3322 break; 3363 break;
3323 3364
3324 case XTerm_Color: 3365 case XTerm_Color:
… …
3337 *buf++ = '\0'; 3378 *buf++ = '\0';
3338 3379
3339 process_color_seq (op, color, name, resp); 3380 process_color_seq (op, color, name, resp);
3340 } 3381 }
3341 break; 3382 break;
3383 case Rxvt_restoreFG:
3342 case XTerm_Color00: 3384 case XTerm_Color00:
3343 process_color_seq (op, Color_fg, str, resp); 3385 process_color_seq (op, Color_fg, str, resp);
3344 break; 3386 break;
3387 case Rxvt_restoreBG:
3345 case XTerm_Color01: 3388 case XTerm_Color01:
3346 process_color_seq (op, Color_bg, str, resp); 3389 process_color_seq (op, Color_bg, str, resp);
3347 break; 3390 break;
3348#ifndef NO_CURSORCOLOR 3391#ifndef NO_CURSORCOLOR
3349 case XTerm_Color_cursor: 3392 case XTerm_Color_cursor:
… …
3354 process_color_seq (op, Color_pointer_fg, str, resp); 3397 process_color_seq (op, Color_pointer_fg, str, resp);
3355 break; 3398 break;
3356 case XTerm_Color_pointer_bg: 3399 case XTerm_Color_pointer_bg:
3357 process_color_seq (op, Color_pointer_bg, str, resp); 3400 process_color_seq (op, Color_pointer_bg, str, resp);
3358 break; 3401 break;
3402#ifdef OPTION_HC
3403 case XTerm_Color_HC:
3404 process_color_seq (op, Color_HC, str, resp);
3405 break;
3406 case XTerm_Color_HTC:
3407 process_color_seq (op, Color_HTC, str, resp);
3408 break;
3409#endif
3359#ifndef NO_BOLD_UNDERLINE_REVERSE 3410#ifndef NO_BOLD_UNDERLINE_REVERSE
3360 case XTerm_Color_RV:
3361 process_color_seq (op, Color_RV, str, resp);
3362 break;
3363 case Rxvt_Color_BD:
3364 case URxvt_Color_BD: 3411 case URxvt_Color_BD:
3365 process_color_seq (op, Color_BD, str, resp); 3412 process_color_seq (op, Color_BD, str, resp);
3366 break; 3413 break;
3367 case Rxvt_Color_UL:
3368 case URxvt_Color_UL: 3414 case URxvt_Color_UL:
3369 process_color_seq (op, Color_UL, str, resp); 3415 process_color_seq (op, Color_UL, str, resp);
3370 break; 3416 break;
3371 case URxvt_Color_IT: 3417 case URxvt_Color_IT:
3372 process_color_seq (op, Color_IT, str, resp); 3418 process_color_seq (op, Color_IT, str, resp);
3373 break; 3419 break;
3374#endif 3420#endif
3421 case URxvt_Color_border:
3422 process_color_seq (op, Color_border, str, resp);
3423 break;
3375#if ENABLE_TRANSPARENCY 3424#if ENABLE_TRANSPARENCY
3376 case URxvt_Color_tint: 3425 case URxvt_Color_tint:
3377 process_color_seq (op, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3378 { 3427 {
3379 bool changed = false; 3428 bool changed = false;
3429
3380 if (ISSET_PIXCOLOR (Color_tint)) 3430 if (ISSET_PIXCOLOR (Color_tint))
3381 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3431 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3382 else 3432
3383 changed = bgPixmap.unset_tint ();
3384 if (changed) 3433 if (changed)
3385 update_background (); 3434 update_background ();
3386 } 3435 }
3387 3436
3388 break; 3437 break;
… …
3392 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3393 if (!strcmp (str, "?")) 3442 if (!strcmp (str, "?"))
3394 { 3443 {
3395 char str[256]; 3444 char str[256];
3396 3445
3397 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3446 sprintf (str, "[%dx%d+%d+%d]",
3398 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3447 min (h_scale, 32767), min (v_scale, 32767),
3399 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3448 min (h_align, 32767), min (v_align, 32767));
3400 process_xterm_seq (XTerm_title, str, CHAR_ST); 3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3401 } 3450 }
3402 else 3451 else
3403 { 3452 {
3404 int changed = 0; 3453 bool changed = false;
3405 3454
3406 if (*str != ';') 3455 if (*str != ';')
3407 { 3456 {
3408 /* reset to default scaling :*/
3409 bgPixmap.unset_geometry ();
3410 if (bgPixmap.set_file (str)) /* change pixmap */ 3457 if (bg_set_file (str)) /* change pixmap */
3411 changed++; 3458 changed = true;
3412 str = strchr (str, ';');
3413 if (str == NULL)
3414 bgPixmap.set_defaultGeometry ();
3415 } 3459 }
3416 while (str) 3460 else
3417 { 3461 {
3418 str++; 3462 str++;
3419 if (bgPixmap.set_geometry (str)) 3463 if (bg_set_geometry (str, true))
3420 changed++; 3464 changed = true;
3421 str = strchr (str, ';');
3422 } 3465 }
3466
3423 if (changed) 3467 if (changed)
3468 {
3469 if (bg_window_position_sensitive ())
3470 {
3471 int x, y;
3472 get_window_origin (x, y);
3473 bg_set_position (x, y);
3474 }
3424 update_background (); 3475 update_background ();
3476 }
3425 } 3477 }
3426 break; 3478 break;
3427#endif 3479#endif
3428
3429 case Rxvt_restoreFG:
3430 set_window_color (Color_fg, str);
3431 break;
3432 case Rxvt_restoreBG:
3433 set_window_color (Color_bg, str);
3434 break;
3435 3480
3436 case XTerm_logfile: 3481 case XTerm_logfile:
3437 // TODO, when secure mode? 3482 // TODO, when secure mode?
3438 break; 3483 break;
3439 3484
… …
3506 break; 3551 break;
3507#endif 3552#endif
3508 3553
3509#if ENABLE_PERL 3554#if ENABLE_PERL
3510 case URxvt_perl: 3555 case URxvt_perl:
3511 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3556 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3512 ; // no responses yet
3513 break; 3557 break;
3514#endif 3558#endif
3515 } 3559 }
3516} 3560}
3517/*----------------------------------------------------------------------*/ 3561/*----------------------------------------------------------------------*/
… …
3540 { 3584 {
3541 if (mode == 'r') 3585 if (mode == 'r')
3542 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3586 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3543 else 3587 else
3544 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3588 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3545 PrivMode (state, bit); 3589
3590 set_privmode (bit, state);
3546 } 3591 }
3547 3592
3548 return state; 3593 return state;
3549} 3594}
3550 3595
3551/* we're not using priv _yet_ */ 3596/* we're not using priv _yet_ */
3552void 3597void
3553rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3598rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3554{ 3599{
3555 unsigned int i, j; 3600 unsigned int i, j;
3556 int state; 3601 int state;
3557 3602
3558 static const struct 3603 static const struct
3559 { 3604 {
3560 const int argval; 3605 const int argval;
3561 const unsigned long bit; 3606 const unsigned long bit;
3562 } argtopriv[] = { 3607 } argtopriv[] = {
3563 { 1, PrivMode_aplCUR }, 3608 { 1, PrivMode_aplCUR }, // DECCKM
3564 { 2, PrivMode_vt52 }, 3609 { 2, PrivMode_vt52 }, // DECANM
3565 { 3, PrivMode_132 }, 3610 { 3, PrivMode_132 }, // DECCOLM
3566 { 4, PrivMode_smoothScroll }, 3611 { 4, PrivMode_smoothScroll }, // DECSCLM
3567 { 5, PrivMode_rVideo }, 3612 { 5, PrivMode_rVideo }, // DECSCNM
3568 { 6, PrivMode_relOrigin }, 3613 { 6, PrivMode_relOrigin }, // DECOM
3569 { 7, PrivMode_Autowrap }, 3614 { 7, PrivMode_Autowrap }, // DECAWM
3570 // 8, bi-directional support mode 3615 // 8, auto-repeat keys // DECARM
3571 { 9, PrivMode_MouseX10 }, 3616 { 9, PrivMode_MouseX10 },
3572 // 18, 19 printing-related 3617 // 18 end FF to printer after print screen
3618 // 19 Print screen prints full screen/scroll region
3573 { 25, PrivMode_VisibleCursor }, 3619 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3574#ifdef scrollBar_esc 3620#ifdef scrollBar_esc
3575 { scrollBar_esc, PrivMode_scrollBar }, 3621 { scrollBar_esc, PrivMode_scrollBar },
3576#endif 3622#endif
3577 { 35, PrivMode_ShiftKeys }, // rxvt extension 3623 { 35, PrivMode_ShiftKeys }, // rxvt extension
3624 // 38, tektronix mode // DECTEK
3578 { 40, PrivMode_132OK }, 3625 { 40, PrivMode_132OK },
3579 // 41 xterm more fixes NYI 3626 // 41 xterm more fixes NYI
3580 // 45 margin bell NYI 3627 // 45 margin bell NYI
3581 // 46 start logging 3628 // 46 start logging
3582 { 47, PrivMode_Screen }, 3629 { 47, PrivMode_Screen },
3583 { 66, PrivMode_aplKP }, 3630 { 66, PrivMode_aplKP }, // DECNKM
3584#ifndef NO_BACKSPACE_KEY 3631#ifndef NO_BACKSPACE_KEY
3585 { 67, PrivMode_BackSpace }, 3632 { 67, PrivMode_BackSpace }, // DECBKM
3586#endif 3633#endif
3587 { 1000, PrivMode_MouseX11 }, 3634 { 1000, PrivMode_MouseX11 },
3588 { 1002, PrivMode_MouseBtnEvent }, 3635 { 1002, PrivMode_MouseBtnEvent },
3589 { 1003, PrivMode_MouseAnyEvent }, 3636 { 1003, PrivMode_MouseAnyEvent },
3637#if ENABLE_FRILLS
3638 { 1005, PrivMode_ExtModeMouse },
3639#endif
3590 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3591 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
3642#if ENABLE_FRILLS
3643 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3644#endif
3592 // 1035 enable modifiers for alt, numlock NYI 3645 // 1035 enable modifiers for alt, numlock NYI
3593 // 1036 send ESC for meta keys NYI 3646 // 1036 send ESC for meta keys NYI
3594 // 1037 send DEL for keypad delete NYI 3647 // 1037 send DEL for keypad delete NYI
3595 { 1047, PrivMode_Screen }, 3648 { 1047, PrivMode_Screen },
3596 // 1048 save and restore cursor 3649 // 1048 save and restore cursor, implemented in code
3597 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3650 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3598 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3651 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3652 { 2004, PrivMode_BracketPaste },
3599 }; 3653 };
3600 3654
3601 if (nargs == 0) 3655 if (nargs == 0)
3602 return; 3656 return;
3603 3657
… …
3610 for (i = 0; i < nargs; i++) 3664 for (i = 0; i < nargs; i++)
3611 { 3665 {
3612 state = -1; 3666 state = -1;
3613 3667
3614 /* basic handling */ 3668 /* basic handling */
3615 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3669 for (j = 0; j < ecb_array_length (argtopriv); j++)
3616 if (argtopriv[j].argval == arg[i]) 3670 if (argtopriv[j].argval == arg[i])
3617 { 3671 {
3618 state = privcases (mode, argtopriv[j].bit); 3672 state = privcases (mode, argtopriv[j].bit);
3619 break; 3673 break;
3620 } 3674 }
… …
3628 3682
3629 scr_touch (true); 3683 scr_touch (true);
3630 break; 3684 break;
3631#endif 3685#endif
3632 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
3633 case 1049:
3634 if (option (Opt_secondaryScreen)) 3687 if (option (Opt_secondaryScreen))
3635 if (mode == 0) 3688 if (mode == 0)
3636 scr_cursor (RESTORE); 3689 scr_cursor (RESTORE);
3637 else if (mode == 1) 3690 else if (mode == 1)
3638 scr_cursor (SAVE); 3691 scr_cursor (SAVE);
… …
3647 case 2: /* VT52 mode */ 3700 case 2: /* VT52 mode */
3648 /* oddball mode. should be set regardless of set/reset 3701 /* oddball mode. should be set regardless of set/reset
3649 * parameter. Return from VT52 mode with an ESC < from 3702 * parameter. Return from VT52 mode with an ESC < from
3650 * within VT52 mode 3703 * within VT52 mode
3651 */ 3704 */
3652 PrivMode (1, PrivMode_vt52); 3705 set_privmode (PrivMode_vt52, 1);
3653 break; 3706 break;
3654 case 3: /* 80/132 */ 3707 case 3: /* 80/132 */
3655 if (priv_modes & PrivMode_132OK) 3708 if (priv_modes & PrivMode_132OK)
3656 set_widthheight (((state ? 132 : 80) * fwidth), height); 3709 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3657 break; 3710 break;
3658 case 4: /* smooth scrolling */ 3711 case 4: /* smooth scrolling */
3659 set_option (Opt_jumpScroll, !state); 3712 set_option (Opt_jumpScroll, !state);
3660 break; 3713 break;
3661 case 5: /* reverse video */ 3714 case 5: /* reverse video */
… …
3672 if (state) /* orthogonal */ 3725 if (state) /* orthogonal */
3673 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3726 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3674 break; 3727 break;
3675#ifdef scrollBar_esc 3728#ifdef scrollBar_esc
3676 case scrollBar_esc: 3729 case scrollBar_esc:
3677 if (scrollbar_mapping (state)) 3730 scrollBar.map (state);
3678 {
3679 resize_all_windows (0, 0, 0); 3731 resize_all_windows (0, 0, 0);
3680 scr_touch (true); 3732 scr_touch (true);
3681 }
3682 break; 3733 break;
3683#endif 3734#endif
3684 case 25: /* visible/invisible cursor */ 3735 case 25: /* visible/invisible cursor */
3685 scr_cursor_visible (state); 3736 scr_cursor_visible (state);
3686 break; 3737 break;
… …
3699 case 1003: 3750 case 1003:
3700 if (state) 3751 if (state)
3701 { 3752 {
3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3753 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3703 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3754 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3755 mouse_row = mouse_col = 0;
3704 vt_emask_mouse = PointerMotionMask; 3756 vt_emask_mouse = PointerMotionMask;
3705 } 3757 }
3706 else 3758 else
3707 vt_emask_mouse = NoEventMask; 3759 vt_emask_mouse = NoEventMask;
3760
3708 vt_select_input (); 3761 vt_select_input ();
3709 break; 3762 break;
3710 case 1010: /* scroll to bottom on TTY output inhibit */ 3763 case 1010: /* scroll to bottom on TTY output inhibit */
3711 set_option (Opt_scrollTtyOutput, !state); 3764 set_option (Opt_scrollTtyOutput, !state);
3712 break; 3765 break;
3713 case 1011: /* scroll to bottom on key press */ 3766 case 1011: /* scroll to bottom on key press */
3714 set_option (Opt_scrollTtyKeypress, state); 3767 set_option (Opt_scrollTtyKeypress, state);
3715 break; 3768 break;
3716 case 1047: /* secondary screen w/ clearing last */ 3769 case 1047: /* secondary screen w/ clearing last */
3717 if (option (Opt_secondaryScreen)) 3770 if (option (Opt_secondaryScreen))
3718 if (current_screen != PRIMARY) 3771 if (!state)
3719 scr_erase_screen (2); 3772 scr_erase_screen (2);
3773
3720 scr_change_screen (state); 3774 scr_change_screen (state);
3721 break; 3775 break;
3722 case 1049: /* secondary screen w/ clearing first */ 3776 case 1049: /* secondary screen w/ clearing first */
3777 if (option (Opt_secondaryScreen))
3778 if (state)
3779 scr_cursor (SAVE);
3780
3723 scr_change_screen (state); 3781 scr_change_screen (state);
3782
3724 if (option (Opt_secondaryScreen)) 3783 if (option (Opt_secondaryScreen))
3725 if (current_screen != PRIMARY) 3784 if (state)
3726 scr_erase_screen (2); 3785 scr_erase_screen (2);
3786 else
3787 scr_cursor (RESTORE);
3727 break; 3788 break;
3728 default: 3789 default:
3729 break; 3790 break;
3730 } 3791 }
3731 } 3792 }
… …
3884 } 3945 }
3885 } 3946 }
3886} 3947}
3887/*}}} */ 3948/*}}} */
3888 3949
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 {
3897 /* query graphics */
3898 tt_printf ("\033G0\012"); /* no graphics */
3899 return;
3900 }
3901 /* swallow other graphics sequences until terminating ':' */
3902 do
3903 ch = cmd_getc ();
3904 while (ch != ':');
3905}
3906/*}}} */
3907
3908/* ------------------------------------------------------------------------- */ 3950/* ------------------------------------------------------------------------- */
3909 3951
3910/* 3952/*
3911 * Send printf () formatted output to the command. 3953 * Send printf () formatted output to the command.
3912 * Only use for small amounts of data. 3954 * Only use for small amounts of data.
… …
3925 3967
3926/* ---------------------------------------------------------------------- */ 3968/* ---------------------------------------------------------------------- */
3927/* Write data to the pty as typed by the user, pasted with the mouse, 3969/* Write data to the pty as typed by the user, pasted with the mouse,
3928 * or generated by us in response to a query ESC sequence. 3970 * or generated by us in response to a query ESC sequence.
3929 */ 3971 */
3930const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3972static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3931 3973
3932void 3974void
3933rxvt_term::tt_write (const char *data, unsigned int len) 3975rxvt_term::tt_write (const char *data, unsigned int len)
3934{ 3976{
3935 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3977 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3940 3982
3941 if (v_buflen == 0) 3983 if (v_buflen == 0)
3942 { 3984 {
3943 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3985 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3944 3986
3987 max_it (written, 0);
3988
3945 if ((unsigned int)written == len) 3989 if (written == len)
3946 return; 3990 return;
3947 3991
3948 data += written; 3992 data += written;
3949 len -= written; 3993 len -= written;
3950 } 3994 }
3951 3995
3952 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3996 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3953 3997
3954 memcpy (v_buffer + v_buflen, data, len); 3998 memcpy (v_buffer + v_buflen, data, len);
3955 v_buflen += len; 3999 v_buflen += len;
3956 4000
3957 pty_ev.set (ev::READ | ev::WRITE); 4001 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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