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.381 by root, Fri Dec 14 05:25:23 2007 UTC vs.
Revision 1.581 by root, Tue Jul 5 16:42:21 2016 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,2015 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 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
148 149
149 text_t t = l.t[x]; 150 text_t t = l.t[x];
150 151
151 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
152 { 153 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
155 break; 156 break;
156 } 157 }
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
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);
… …
183 181
184 alloc = 0; 182 alloc = 0;
185 chr = &ch2; 183 chr = &ch2;
186 len = 1; 184 len = 1;
187 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 189
189 char attr[80]; // plenty 190 char attr[80]; // plenty
190 191
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r, 193 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
201 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
202 210
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
205 212
206 if (y >= 0) 213 if (y >= 0)
207 { 214 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
209 x = 0; 216 x = 0;
210 } 217 }
211 218
212 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
213 222
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 224
216 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
217 { 226 {
218 char buf[9]; 227 char buf[9];
219 228
220 ch = *chr++; 229 ch = *chr++;
221 230
222 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 234# if !UNICODE_3
226 if (ch >= 0x10000) 235 if (ch >= 0x10000)
227 ch = 0xfffd; 236 ch = 0xfffd;
228# endif 237# endif
229 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
230 239
231 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 242 }
234 243
235// { 244// {
236// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
239// } 248// }
240 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
241 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 253 free (fname[i]);
254 }
244 255
245# if ENABLE_COMBINING 256# if ENABLE_COMBINING
246 if (alloc) 257 if (alloc)
247 delete [] alloc; 258 delete [] alloc;
248# endif 259# endif
249} 260}
250#endif 261#endif
251 262
252void 263void ecb_cold
253rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
254{ 265{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 267
260 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
261 { 269 {
262 char mb[16]; 270 char mb[MB_LEN_MAX];
263 int len; 271 int len;
264 272
265 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
268 else 276 else
269 { 277 {
270 mb[0] = ch[0]; 278 mb[0] = ch;
271 len = 1; 279 len = 1;
272 } 280 }
273 281
274 if (len > 0) 282 if (len > 0)
275 tt_write (mb, len); 283 tt_write (mb, len);
… …
278 } 286 }
279 287
280 iso14755buf = 0; 288 iso14755buf = 0;
281} 289}
282 290
283int 291static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
285{ 293{
286 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
289 { 297 {
290 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
291 299
… …
297 305
298 return -1; 306 return -1;
299} 307}
300#endif 308#endif
301 309
302void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322 XK_KP_1, // XK_KP_End
323 XK_KP_5, // XK_KP_Begin
324 };
325
326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
327 {
328 unsigned int index = keysym - XK_KP_Home;
329 keysym = kp ? keypadtrans[index] : XK_Home + index;
330 }
331 else if (keysym == XK_KP_Insert)
332 keysym = kp ? XK_KP_0 : XK_Insert;
333# ifndef NO_DELETE_KEY
334 else if (keysym == XK_KP_Delete)
335 keysym = kp ? XK_KP_Decimal : XK_Delete;
336# endif
337#endif
338 return keysym;
339}
340
341static inline int ecb_cold
342map_function_key (KeySym keysym)
343{
344 int param = 0;
345
346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
347 {
348 param = 11 + keysym - XK_F1;
349 if (keysym >= XK_F17)
350 param += 4;
351 else if (keysym >= XK_F15)
352 param += 3;
353 else if (keysym >= XK_F11)
354 param += 2;
355 else if (keysym >= XK_F6)
356 param += 1;
357 }
358 else
359 switch (keysym)
360 {
361 case XK_Find:
362 param = 1;
363 break;
364 case XK_Insert:
365 param = 2;
366 break;
367#ifdef DXK_Remove
368 case DXK_Remove:
369#endif
370 case XK_Execute:
371 param = 3;
372 break;
373 case XK_Select:
374 param = 4;
375 break;
376 case XK_Prior:
377 param = 5;
378 break;
379 case XK_Next:
380 param = 6;
381 break;
382 case XK_Home:
383 param = 7;
384 break;
385 case XK_End:
386 param = 8;
387 break;
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
303rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
304{ 409{
305 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
306 unsigned int newlen; 411 KeySym keysym = NoSymbol;
307 KeySym keysym;
308 int valid_keysym;
309 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
310 414
311#if ISO_14755 415#if ISO_14755
312 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
313 return; 417 return;
314#endif 418#endif
… …
321 */ 425 */
322 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
325 429
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 430 kbuf[0] = 0;
333 431
334#ifdef USE_XIM 432#if USE_XIM
335 if (Input_Context) 433 if (Input_Context)
336 { 434 {
337 Status status_return; 435 Status status_return;
338 436
339#if 0 437#if 0
… …
377 } 475 }
378 } 476 }
379 else 477 else
380 len = 0; 478 len = 0;
381 } 479 }
382
383 valid_keysym = status_return == XLookupKeySym
384 || status_return == XLookupBoth;
385 } 480 }
386 else 481 else
387#endif 482#endif
388 { 483 {
389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
390 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
391 } 488 {
489 KeySym orig_keysym = keysym;
392 490
393 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
394 { 704 {
395#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
397 return; 707 return;
398#endif 708#endif
399 709
400 if (saveLines) 710 if (saveLines)
401 { 711 {
… …
410#ifdef PAGING_CONTEXT_LINES 720#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 721 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 722#else
413 lnsppg = nrow * 4 / 5; 723 lnsppg = nrow * 4 / 5;
414#endif 724#endif
725 max_it (lnsppg, 1);
726
415 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
416 { 728 {
417 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
418 return; 730 return;
419 } 731 }
420 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
421 { 733 {
422 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
423 return; 735 return;
424 } 736 }
425 } 737 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
428 { 740 {
429 if (keysym == XK_Up) 741 if (keysym == XK_Up)
430 { 742 {
431 scr_page (UP, 1); 743 scr_page (1);
432 return; 744 return;
433 } 745 }
434 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
435 { 747 {
436 scr_page (DN, 1); 748 scr_page (-1);
437 return; 749 return;
438 } 750 }
439 } 751 }
440#endif 752#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
443 { 755 {
444 if (keysym == XK_Home) 756 if (keysym == XK_Home)
445 { 757 {
446 scr_move_to (0, 1); 758 scr_changeview (top_row);
447 return; 759 return;
448 } 760 }
449 else if (keysym == XK_End) 761 else if (keysym == XK_End)
450 { 762 {
451 scr_move_to (1, 1); 763 scr_changeview (0);
452 return; 764 return;
453 } 765 }
454 } 766 }
455#endif 767#endif
456 } 768 }
457 769
458 if (shft) 770 if (shft)
459 { 771 {
460 /* Shift + F1 - F10 generates F11 - F20 */
461 if (keysym >= XK_F1 && keysym <= XK_F10)
462 {
463 keysym += (XK_F11 - XK_F1);
464 shft = 0; /* turn off Shift */
465 }
466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
467 { 773 {
468 switch (keysym) 774 switch (keysym)
469 { 775 {
470 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
471 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
472 selection_request (ev.time); 778 selection_request (ev.time);
473 return; 779 return;
474#if TODO 780#if TODO
475 /* rxvt extras */ 781 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 783 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 785 return;
482#endif 786#endif
483 } 787 }
484 } 788 }
485 } 789 }
486 790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
804 }
805
487#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 807 // ISO 14755 support
489 if (shft && ctrl) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 809 {
491 int hv; 810 int hv;
492 811
493 if (iso14755buf & ISO_14755_51 812 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 813 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 843 scr_overlay_off ();
525# endif 844# endif
526 iso14755buf = 0; 845 iso14755buf = 0;
527 } 846 }
528 } 847 }
848 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 849 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 850 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 851 if (!(iso14755buf & ISO_14755_STARTED))
532 { 852 {
533 iso14755buf |= ISO_14755_STARTED; 853 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 854# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 855 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
543 { 863 {
544 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
545 return; 865 return;
546 } 866 }
547#endif 867#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
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 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
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;
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 }
794
795 /*
796 * Pass meta for all function keys, if 'meta' option set
797 */
798#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80) && len > 0)
800 kbuf[len - 1] |= 0x80;
801#endif
802
803 }
804 else if (ctrl && keysym == XK_minus)
805 {
806 len = 1;
807 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
808 }
809 else if (keysym == XK_ISO_Left_Tab)
810 {
811 strcpy (kbuf, "\033[Z");
812 len = 3;
813 }
814 else
815 {
816#ifdef META8_OPTION
817 /* set 8-bit on */
818 if (meta && (meta_char == 0x80))
819 {
820 char *ch;
821
822 for (ch = kbuf; ch < kbuf + len; ch++)
823 *ch |= 0x80;
824
825 meta = 0;
826 }
827#endif
828 /* nil */ ;
829 }
830 } 868 }
831
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return;
834 869
835 if (len <= 0) 870 if (len <= 0)
836 return; /* not mapped */ 871 return; /* not mapped */
837 872
838 if (option (Opt_scrollTtyKeypress))
839 if (view_start)
840 {
841 view_start = 0;
842 want_refresh = 1;
843 }
844
845 /*
846 * these modifications only affect the static keybuffer
847 * pass Shift/Control indicators for function keys ending with `~'
848 *
849 * eg,
850 * Prior = "ESC[5~"
851 * Shift+Prior = "ESC[5$"
852 * Ctrl+Prior = "ESC[5^"
853 * Ctrl+Shift+Prior = "ESC[5@"
854 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
855 */
856 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
857 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
858
859 /* escape prefix */
860 if (meta
861#ifdef META8_OPTION
862 && meta_char == C0_ESC
863#endif
864 )
865 {
866 const char ch = C0_ESC;
867 tt_write (&ch, 1);
868 }
869
870 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
871} 874}
872 875
873void 876void ecb_cold
874rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
875{ 878{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym; 880 KeySym keysym;
878 881
… …
898 commit_iso14755 (); 901 commit_iso14755 ();
899 902
900 return; 903 return;
901 } 904 }
902 905
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 907 if (i[0] == keysym)
905 { 908 {
906 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 910 commit_iso14755 ();
908 911
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
947#endif 950#endif
948} 951}
949 952
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 953void
984rxvt_term::flush () 954rxvt_term::flush ()
985{ 955{
986 flush_ev.stop (); 956 flush_ev.stop ();
987 957
988#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
989 if (bgPixmap.check_clearChanged ()) 959 if (bg_flags & BG_NEEDS_REFRESH)
990 { 960 {
991// scr_clear (true); This needs to be researched further! 961 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 962 scr_touch (false);
993 } 963 }
994#endif 964#endif
995 965
996 if (want_refresh) 966 if (want_refresh)
… …
1032 } 1002 }
1033 while (row < end_row); 1003 while (row < end_row);
1034 } 1004 }
1035 1005
1036 scr_refresh (); 1006 scr_refresh ();
1037 scrollbar_show (1); 1007 scrollBar.show (1);
1038#ifdef USE_XIM 1008#if USE_XIM
1039 IMSendSpot (); 1009 im_send_spot ();
1040#endif 1010#endif
1041 } 1011 }
1042 1012
1043 display->flush (); 1013 display->flush ();
1044} 1014}
1045 1015
1046/* checks wether a refresh is requested and starts the refresh timer */ 1016/* checks whether a refresh is requested and starts the refresh timer */
1047void 1017void
1048rxvt_term::refresh_check () 1018rxvt_term::refresh_check ()
1049{ 1019{
1050 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1022
1023 display->flush ();
1052} 1024}
1053 1025
1054void 1026void
1055rxvt_term::flush_cb (ev::timer &w, int revents) 1027rxvt_term::flush_cb (ev::timer &w, int revents)
1056{ 1028{
… …
1059 refresh_count = 0; 1031 refresh_count = 0;
1060 flush (); 1032 flush ();
1061} 1033}
1062 1034
1063#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1064void 1054void
1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1066{ 1056{
1067 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1068 want_refresh = 1; 1058 want_refresh = 1;
… …
1076{ 1066{
1077 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1067 if (scr_refresh_rend (RS_Blink, RS_Blink))
1078 { 1068 {
1079 hidden_text = !hidden_text; 1069 hidden_text = !hidden_text;
1080 want_refresh = 1; 1070 want_refresh = 1;
1081 refresh_check (); 1071 refresh_check ();
1082 } 1072 }
1083 else 1073 else
1084 w.stop (); 1074 w.stop ();
1085} 1075}
1086#endif 1076#endif
1087 1077
1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1089void 1079void
1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1091{ 1081{
1092 if ((scrollbar_isUp () || scrollbar_isDn ()) 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1093 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1094 { 1084 {
1095 want_refresh = 1; 1085 want_refresh = 1;
1096 refresh_check (); 1086 refresh_check ();
1097 } 1087 }
1098 else 1088 else
… …
1102 1092
1103#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1104void 1094void
1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1106{ 1096{
1107 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1108 { 1098 {
1109 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1110 want_refresh = 1; 1100 want_refresh = 1;
1111 refresh_check (); 1101 refresh_check ();
1112 } 1102 }
… …
1117 1107
1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1119void 1109void
1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1121{ 1111{
1122 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1123 { 1113 {
1124 want_refresh = 1; 1114 want_refresh = 1;
1125 refresh_check (); 1115 refresh_check ();
1126 } 1116 }
1127 1117
… …
1142 { 1132 {
1143 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than 1134 // that giving a process calling sched_yield () less cpu time than
1145 // ones with high nice levels is a useful thing to do. It surely is is 1135 // ones with high nice levels is a useful thing to do. It surely is is
1146 // allowed by the sus... as is returning ENOSYS. 1136 // allowed by the sus... as is returning ENOSYS.
1137 // since the linux guys additionally thought that breaking the only
1138 // known workaround against their unusable sched_yield hack is cool,
1139 // we just nanosleep a bit and hope for the best.
1147 1140
1148 struct timespec ts = { 0, 0 }; 1141 struct timespec ts = { 0, 1000 };
1149 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1150 1143
1151 w.stop (); 1144 w.stop ();
1152 } 1145 }
1153 1146
… …
1156 { 1149 {
1157 } 1150 }
1158} event_handler; 1151} event_handler;
1159#endif 1152#endif
1160 1153
1154/* make sure all the cmd data is at beginning of cmdbuf */
1155void
1156rxvt_term::cmdbuf_reify ()
1157{
1158 if (cmdbuf_ptr == cmdbuf_base)
1159 return;
1160
1161 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1162
1163 memmove (cmdbuf_base, cmdbuf_ptr, used);
1164 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + used;
1166
1167}
1168
1169#if defined (KEYSYM_RESOURCE)
1170void
1171rxvt_term::cmdbuf_append (const char *str, size_t count)
1172{
1173 cmdbuf_reify ();
1174
1175 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1176
1177 if (count > avail)
1178 return;
1179
1180 memcpy (cmdbuf_endp, str, count);
1181 cmdbuf_endp += count;
1182
1183 cmd_parse ();
1184}
1185#endif
1186
1161bool 1187bool
1162rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1163{ 1189{
1164 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1165 1191
1166 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1167 { 1193
1168 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1169 n = 0;
1170 } 1195 {
1171 1196 // normally this indicates a "too long" command sequence - just drop the data we have
1172 memmove (cmdbuf_base, cmdbuf_ptr, n);
1173 cmdbuf_ptr = cmdbuf_base; 1197 cmdbuf_ptr = cmdbuf_base;
1174 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1175 1201
1176 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1177 1203
1178 if (r > 0) 1204 if (r > 0)
1179 { 1205 {
1180 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1181 return true; 1207 return true;
… …
1203{ 1229{
1204 make_current (); 1230 make_current ();
1205 1231
1206 if (revents & ev::READ) 1232 if (revents & ev::READ)
1207 // loop, but don't allow a single term to monopolize us 1233 // loop, but don't allow a single term to monopolize us
1208 while (pty_fill ()) 1234 for (int i = CBUFCNT; i-- && pty_fill (); )
1209 if (cmd_parse ()) 1235 cmd_parse ();
1210 break;
1211 1236
1212 if (revents & ev::WRITE) 1237 if (revents & ev::WRITE)
1213 pty_write (); 1238 pty_write ();
1214}
1215 1239
1216void 1240 refresh_check ();
1241}
1242
1243void ecb_cold
1217rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1218{ 1245{
1219 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1220 recolour_cursor (); 1247 recolor_cursor ();
1221 1248
1222#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1223 hidden_pointer = 0; 1250 hidden_pointer = 0;
1224 1251
1225 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1226 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1227#endif 1254#endif
1228} 1255}
1229 1256
1230#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1231void 1258void ecb_cold
1232rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1233{ 1260{
1234 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1235 return; 1262 return;
1236 1263
… …
1238 XFlush (dpy); 1265 XFlush (dpy);
1239 1266
1240 hidden_pointer = 1; 1267 hidden_pointer = 1;
1241} 1268}
1242 1269
1243void 1270void ecb_cold
1244rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1245{ 1272{
1246 make_current (); 1273 make_current ();
1247 1274
1248 pointer_blank (); 1275 pointer_blank ();
… …
1254{ 1281{
1255 int button_number, key_state = 0; 1282 int button_number, key_state = 0;
1256 int x, y; 1283 int x, y;
1257 int code = 32; 1284 int code = 32;
1258 1285
1259 x = Pixel2Col (ev.x); 1286 x = Pixel2Col (ev.x) + 1;
1260 y = Pixel2Row (ev.y); 1287 y = Pixel2Row (ev.y) + 1;
1288
1261 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
1262 { 1290 {
1263 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1264 return; 1292 return;
1293
1265 mouse_row = x; 1294 mouse_row = x;
1266 mouse_col = y; 1295 mouse_col = y;
1267 code += 32; 1296 code += 32;
1268 } 1297 }
1269 1298
… …
1272 else 1301 else
1273 { 1302 {
1274 button_number = MEvent.button - Button1; 1303 button_number = MEvent.button - Button1;
1275 /* add 0x3D for wheel events, like xterm does */ 1304 /* add 0x3D for wheel events, like xterm does */
1276 if (button_number >= 3) 1305 if (button_number >= 3)
1277 button_number += (64 - 3); 1306 button_number += 64 - 3;
1278 } 1307 }
1279 1308
1280 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1281 { 1310 {
1282 /* 1311 /*
… …
1314 fputc ('A', stderr); 1343 fputc ('A', stderr);
1315 if (key_state & 32) 1344 if (key_state & 32)
1316 fputc ('2', stderr); 1345 fputc ('2', stderr);
1317 fprintf (stderr, "]: <%d>, %d/%d\n", 1346 fprintf (stderr, "]: <%d>, %d/%d\n",
1318 button_number, 1347 button_number,
1319 x + 1, 1348 x,
1320 y + 1); 1349 y);
1321#endif 1350#endif
1322 1351
1352#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight)
1354 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state,
1356 x,
1357 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse)
1359 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state,
1361 wint_t (32 + x),
1362 wint_t (32 + y));
1363 else
1364#endif
1323 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
1324 (code + button_number + key_state), 1366 code + button_number + key_state,
1325 (32 + x + 1), 1367 32 + x,
1326 (32 + y + 1)); 1368 32 + y);
1327} 1369}
1328 1370
1329/*{{{ process an X event */ 1371/*{{{ process an X event */
1330void 1372void ecb_hot
1331rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1332{ 1374{
1333 make_current (); 1375 make_current ();
1334 1376
1335 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
… …
1433 && ev.xfocus.mode != NotifyGrab) 1475 && ev.xfocus.mode != NotifyGrab)
1434 focus_out (); 1476 focus_out ();
1435 break; 1477 break;
1436 1478
1437 case ConfigureNotify: 1479 case ConfigureNotify:
1438 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1439 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1440 szHint.width, szHint.height); */
1441 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent)
1442 { 1481 {
1443 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1444 ; 1483 ;
1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1488#ifdef HAVE_BG_PIXMAP
1489 if (bg_window_position_sensitive ())
1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change)
1498 {
1499 int x, y;
1500
1501 if (ev.xconfigure.send_event)
1502 {
1503 x = ev.xconfigure.x;
1504 y = ev.xconfigure.y;
1505 }
1506 else
1507 get_window_origin (x, y);
1508
1509 if (x != parent_x || y != parent_y)
1510 {
1511 parent_x = x;
1512 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1515 }
1516 }
1445 1517
1446 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1447 { 1519 {
1448 seen_resize = 1; 1520 seen_resize = 1;
1449 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1450 } 1522 }
1451 else 1523 else
1452 { 1524 {
1453#ifdef HAVE_BG_PIXMAP 1525#ifdef HAVE_BG_PIXMAP
1454 if (bgPixmap.window_position_sensitive ()) 1526 if (moved)
1455 update_background (); 1527 update_background ();
1456#endif 1528#endif
1457 } 1529 }
1530
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1532 }
1460 break; 1533 break;
1461 1534
1462 case PropertyNotify: 1535 case PropertyNotify:
1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1536 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1465 && ev.xproperty.state == PropertyNewValue)
1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1467
1468 break; 1537 break;
1469 1538
1470 case SelectionClear: 1539 case SelectionClear:
1471 selection_clear (); 1540 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1472 break;
1473
1474 case SelectionNotify:
1475 if (selection_wait == Sel_normal)
1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1477 break; 1541 break;
1478 1542
1479 case SelectionRequest: 1543 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1481 break; 1545 break;
1482 1546
1483 case MapNotify: 1547 case MapNotify:
1548#ifdef HAVE_BG_PIXMAP
1549 // This is needed at startup for the case of no window manager
1550 // or a non-reparenting window manager and also because we
1551 // defer bg image updates if the window is not mapped. The
1552 // short delay is to optimize for multiple ConfigureNotify
1553 // events at startup when the window manager reparents the
1554 // window, so as to perform the computation after we have
1555 // received all of them.
1556 if (bg_img == 0)
1557 update_background_ev.start (0.025);
1558#endif
1484 mapped = 1; 1559 mapped = 1;
1485#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1486 text_blink_ev.start (); 1561 text_blink_ev.start ();
1487#endif 1562#endif
1488 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1501 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1502 { 1577 {
1503 do 1578 do
1504 { 1579 {
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1580 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1581 ev.xexpose.width, ev.xexpose.height, false);
1507 } 1582 }
1508 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1583 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1509 1584
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1585 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1586
1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1587 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1513 { 1588 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1591 }
1517 1592
1518 want_refresh = 1; 1593 want_refresh = 1;
1519 } 1594 }
1520 else 1595 else
… …
1524 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1599 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1525 ; 1600 ;
1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1527 ; 1602 ;
1528 1603
1529 if (isScrollbarWindow (ev.xany.window)) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1530 { 1605 {
1531 scrollBar.setIdle (); 1606 scrollBar.state = SB_STATE_IDLE;
1532 scrollbar_show (0); 1607 scrollBar.show (0);
1533 } 1608 }
1534 } 1609 }
1535 break; 1610 break;
1536 1611
1537 case MotionNotify: 1612 case MotionNotify:
1538#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1539 if (hidden_pointer) 1614 if (hidden_pointer)
1540 pointer_unblank (); 1615 pointer_unblank ();
1541#endif 1616#endif
1617 if (!bypass_keystate
1542 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1543 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1544 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1546 break; 1622 break;
1547 1623
1548 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1560 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1561 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1562 &ev.xbutton.state); 1638 &ev.xbutton.state);
1563#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1564 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1565 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1566 { 1643 {
1567#endif
1568#if ISO_14755 1644#if ISO_14755
1569 // 5.4 1645 // 5.4
1570 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1571 { 1647 {
1572 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1578 1654
1579#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1580 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1581 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1582 { 1658 {
1659 page_dirn scroll_selection_dir;
1583 int dist; 1660 int dist;
1584 1661
1585 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1586 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1587 */ 1664 */
… …
1602 dist = int_bwidth - ev.xbutton.y; 1679 dist = int_bwidth - ev.xbutton.y;
1603 } 1680 }
1604 else 1681 else
1605 { 1682 {
1606 scroll_selection_dir = DN; 1683 scroll_selection_dir = DN;
1607 dist = ev.xbutton.y - (int_bwidth + height); 1684 dist = ev.xbutton.y - (int_bwidth + vt_height);
1608 } 1685 }
1609 1686
1610 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1611 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1612 + 1; 1689 + 1;
1613 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1614 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1615 } 1693 }
1616 else 1694 else
1617 { 1695 {
1618 /* we are within the text window, so we 1696 /* we are within the text window, so we
1619 * shouldn't be scrolling 1697 * shouldn't be scrolling
1620 */ 1698 */
1621 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1622 } 1700 }
1623#endif 1701#endif
1624#ifdef MOUSE_THRESHOLD
1625 } 1702 }
1626#endif
1627 } 1703 }
1628 } 1704 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1630 { 1706 {
1631 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1633 ; 1709 ;
1634 1710
1635 XQueryPointer (dpy, scrollBar.win, 1711 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1712 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1715 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1717 scrollBar.size ());
1642 want_refresh = 1; 1718 want_refresh = 1;
1643 scrollbar_show (1); 1719 scrollBar.show (1);
1644 } 1720 }
1645 break; 1721 break;
1646 } 1722 }
1647 1723
1648#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1649 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1650 {
1651 if (hidden_cursor)
1652 {
1653 hidden_cursor = 0;
1654 want_refresh = 1;
1655 }
1656
1657 cursor_blink_ev.again (); 1726 cursor_blink_reset ();
1658 }
1659#endif 1727#endif
1660 1728
1661#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1662 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1663 { 1731 {
… …
1673#endif 1741#endif
1674 1742
1675 refresh_check (); 1743 refresh_check ();
1676} 1744}
1677 1745
1678void 1746#if ENABLE_FRILLS
1747void ecb_cold
1748rxvt_term::set_urgency (bool enable)
1749{
1750 if (enable == urgency_hint)
1751 return;
1752
1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1754 {
1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1756 XSetWMHints (dpy, parent, h);
1757 urgency_hint = enable;
1758 XFree (h);
1759 }
1760}
1761#endif
1762
1763void ecb_cold
1679rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1680{ 1765{
1681 if (!focus) 1766 if (!focus)
1682 { 1767 {
1683 focus = 1; 1768 focus = 1;
1684 want_refresh = 1; 1769 want_refresh = 1;
1685 1770
1686 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1687
1688#if USE_XIM 1771#if USE_XIM
1689 if (Input_Context != NULL) 1772 if (Input_Context != NULL)
1690 { 1773 {
1691 IMSetPosition (); 1774 im_set_position ();
1692 XSetICFocus (Input_Context); 1775 XSetICFocus (Input_Context);
1693 } 1776 }
1694#endif 1777#endif
1695#if CURSOR_BLINK 1778#if CURSOR_BLINK
1696 if (option (Opt_cursorBlink)) 1779 if (option (Opt_cursorBlink))
… …
1698#endif 1781#endif
1699#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1700 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1701 { 1784 {
1702 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1703 scr_recolour (); 1786 scr_recolor ();
1704 } 1787 }
1705#endif 1788#endif
1706#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1707 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1708 { 1791 set_urgency (0);
1709 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1710 {
1711 h->flags &= ~XUrgencyHint;
1712 XSetWMHints (dpy, parent[0], h);
1713 }
1714 }
1715#endif
1716 }
1717}
1718 1792
1719void 1793 if (priv_modes & PrivMode_FocusEvent)
1794 tt_printf ("\x1b[I");
1795#endif
1796
1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1798 }
1799}
1800
1801void ecb_cold
1720rxvt_term::focus_out () 1802rxvt_term::focus_out ()
1721{ 1803{
1722 if (focus) 1804 if (focus)
1723 { 1805 {
1724 focus = 0; 1806 focus = 0;
1725 want_refresh = 1; 1807 want_refresh = 1;
1726 1808
1727 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1809#if ENABLE_FRILLS
1810 if (option (Opt_urgentOnBell))
1811 set_urgency (0);
1728 1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1815#endif
1729#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1730 if (iso14755buf) 1817 if (iso14755buf)
1731 { 1818 {
1732 iso14755buf = 0; 1819 iso14755buf = 0;
1733# if ISO_14755 1820# if ISO_14755
… …
1747#endif 1834#endif
1748#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1749 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1750 { 1837 {
1751 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1752 scr_recolour (); 1839 scr_recolor ();
1753 } 1840 }
1754#endif 1841#endif
1755 }
1756}
1757 1842
1758void 1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1844 }
1845}
1846
1847void ecb_cold
1759rxvt_term::update_fade_color (unsigned int idx) 1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1760{ 1849{
1761#if OFF_FOCUS_FADING 1850#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade]) 1851 if (rs[Rs_fade])
1763 { 1852 {
1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1855
1764 rgba c; 1856 rgba c;
1765 pix_colors [Color_fade].get (c); 1857 pix_colors [Color_fade].get (c);
1766 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1767 } 1859 }
1768#endif 1860#endif
1769} 1861}
1770 1862
1771#if ENABLE_TRANSPARENCY || ENABLE_PERL 1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1772void 1864void ecb_hot
1773rxvt_term::rootwin_cb (XEvent &ev) 1865rxvt_term::rootwin_cb (XEvent &ev)
1774{ 1866{
1775 make_current (); 1867 make_current ();
1776 1868
1777 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1869 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1778 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1870 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1779 return; 1871 return;
1780 1872
1781# if ENABLE_TRANSPARENCY
1782 switch (ev.type) 1873 switch (ev.type)
1783 { 1874 {
1784 case PropertyNotify: 1875 case PropertyNotify:
1785 /* 1876 /*
1786 * if user used some Esetroot compatible prog to set the root bg, 1877 * if user used some Esetroot compatible prog to set the root bg,
1787 * use the property to determine the pixmap. We use it later on. 1878 * use the property to determine the pixmap. We use it later on.
1788 */ 1879 */
1789 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1790 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1791 { 1882 {
1792 bgPixmap.set_root_pixmap (); 1883#if BG_IMAGE_FROM_ROOT
1884 if (option (Opt_transparent))
1885 {
1886 rxvt_img::new_from_root (this)->replace (root_img);
1793 update_background (); 1887 update_background ();
1888 }
1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1794 } 1891 }
1892
1795 break; 1893 break;
1796 } 1894 }
1797# endif
1798 1895
1799 refresh_check (); 1896 refresh_check ();
1800} 1897}
1801#endif 1898#endif
1802 1899
… …
1825 iso14755_54 (ev.x, ev.y); 1922 iso14755_54 (ev.x, ev.y);
1826 return; 1923 return;
1827 } 1924 }
1828#endif 1925#endif
1829 1926
1830 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1927 clickintime = ev.time - MEvent.time < multiClickTime;
1831 1928
1832 if (reportmode) 1929 if (reportmode)
1833 { 1930 {
1834 /* mouse report from vt window */ 1931 /* mouse report from vt window */
1835 /* save the xbutton state (for ButtonRelease) */ 1932 /* save the xbutton state (for ButtonRelease) */
1836 MEvent.state = ev.state; 1933 MEvent.state = ev.state;
1837#ifdef MOUSE_REPORT_DOUBLECLICK 1934#ifdef MOUSE_REPORT_DOUBLECLICK
1838 if (ev.button == MEvent.button && clickintime) 1935 if (ev.button == MEvent.button && clickintime)
1839 { 1936 {
1840 /* same button, within alloted time */ 1937 /* same button, within allowed time */
1841 MEvent.clicks++; 1938 MEvent.clicks++;
1842 1939
1843 if (MEvent.clicks > 1) 1940 if (MEvent.clicks > 1)
1844 { 1941 {
1845 /* only report double clicks */ 1942 /* only report double clicks */
… …
1917 } 2014 }
1918 2015
1919 /* 2016 /*
1920 * Scrollbar window processing of button press 2017 * Scrollbar window processing of button press
1921 */ 2018 */
1922 if (isScrollbarWindow (ev.window)) 2019 if (scrollBar.state && ev.window == scrollBar.win)
1923 { 2020 {
1924 scrollBar.setIdle (); 2021 page_dirn direction = NO_DIR;
2022
2023 if (scrollBar.upButton (ev.y))
2024 direction = UP; /* up */
2025 else if (scrollBar.dnButton (ev.y))
2026 direction = DN; /* down */
2027
2028 scrollBar.state = SB_STATE_IDLE;
1925 /* 2029 /*
1926 * Rxvt-style scrollbar: 2030 * Rxvt-style scrollbar:
1927 * move up if mouse is above slider 2031 * move up if mouse is above slider
1928 * move dn if mouse is below slider 2032 * move dn if mouse is below slider
1929 * 2033 *
… …
1938 /* 2042 /*
1939 * Mouse report disabled scrollbar: 2043 * Mouse report disabled scrollbar:
1940 * arrow buttons - send up/down 2044 * arrow buttons - send up/down
1941 * click on scrollbar - send pageup/down 2045 * click on scrollbar - send pageup/down
1942 */ 2046 */
1943 if ((scrollBar.style == R_SB_NEXT 2047 if (direction == UP)
1944 && scrollbarnext_upButton (ev.y))
1945 || (scrollBar.style == R_SB_RXVT
1946 && scrollbarrxvt_upButton (ev.y)))
1947 tt_printf ("\033[A"); 2048 tt_printf ("\033[A");
1948 else if ((scrollBar.style == R_SB_NEXT 2049 else if (direction == DN)
1949 && scrollbarnext_dnButton (ev.y))
1950 || (scrollBar.style == R_SB_RXVT
1951 && scrollbarrxvt_dnButton (ev.y)))
1952 tt_printf ("\033[B"); 2050 tt_printf ("\033[B");
1953 else 2051 else
1954 switch (ev.button) 2052 switch (ev.button)
1955 { 2053 {
1956 case Button2: 2054 case Button2:
… …
1964 break; 2062 break;
1965 } 2063 }
1966 } 2064 }
1967 else 2065 else
1968#endif /* NO_SCROLLBAR_REPORT */ 2066#endif /* NO_SCROLLBAR_REPORT */
1969
1970 {
1971 char upordown = 0;
1972
1973 if (scrollBar.style == R_SB_NEXT)
1974 { 2067 {
1975 if (scrollbarnext_upButton (ev.y)) 2068 if (direction != NO_DIR)
1976 upordown = -1; /* up */
1977 else if (scrollbarnext_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 else if (scrollBar.style == R_SB_RXVT)
1981 {
1982 if (scrollbarrxvt_upButton (ev.y))
1983 upordown = -1; /* up */
1984 else if (scrollbarrxvt_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987
1988 if (upordown)
1989 { 2069 {
1990#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1991 if (!cont_scroll_ev.is_active ()) 2071 if (!cont_scroll_ev.is_active ())
1992 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2072 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1993#endif 2073#endif
1994 if (scr_page (upordown < 0 ? UP : DN, 1)) 2074 if (scr_page (direction, 1))
1995 { 2075 {
1996 if (upordown < 0) 2076 if (direction == UP)
1997 scrollBar.setUp (); 2077 scrollBar.state = SB_STATE_UP;
1998 else 2078 else
1999 scrollBar.setDn (); 2079 scrollBar.state = SB_STATE_DOWN;
2000 } 2080 }
2001 } 2081 }
2002 else 2082 else
2003 switch (ev.button) 2083 switch (ev.button)
2004 { 2084 {
2005 case Button2: 2085 case Button2:
2006 switch (scrollbar_align) 2086 switch (scrollBar.align)
2007 { 2087 {
2008 case R_SB_ALIGN_TOP: 2088 case SB_ALIGN_TOP:
2009 csrO = 0; 2089 csrO = 0;
2010 break; 2090 break;
2011 case R_SB_ALIGN_CENTRE: 2091 case SB_ALIGN_CENTRE:
2012 csrO = (scrollBar.bot - scrollBar.top) / 2; 2092 csrO = (scrollBar.bot - scrollBar.top) / 2;
2013 break; 2093 break;
2014 case R_SB_ALIGN_BOTTOM: 2094 case SB_ALIGN_BOTTOM:
2015 csrO = scrollBar.bot - scrollBar.top; 2095 csrO = scrollBar.bot - scrollBar.top;
2016 break; 2096 break;
2017 } 2097 }
2018 2098
2019 if (scrollBar.style == R_SB_XTERM 2099 if (scrollBar.style == SB_STYLE_XTERM
2020 || scrollbar_above_slider (ev.y) 2100 || scrollBar.above_slider (ev.y)
2021 || scrollbar_below_slider (ev.y)) 2101 || scrollBar.below_slider (ev.y))
2022 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2102 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2023 2103
2024 scrollBar.setMotion (); 2104 scrollBar.state = SB_STATE_MOTION;
2025 break; 2105 break;
2026 2106
2027 case Button1: 2107 case Button1:
2028 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2108 if (scrollBar.align == SB_ALIGN_CENTRE)
2029 csrO = ev.y - scrollBar.top; 2109 csrO = ev.y - scrollBar.top;
2030 /* FALLTHROUGH */ 2110 /* FALLTHROUGH */
2031 2111
2032 case Button3: 2112 case Button3:
2033 if (scrollBar.style != R_SB_XTERM) 2113 if (scrollBar.style != SB_STYLE_XTERM)
2034 { 2114 {
2035 if (scrollbar_above_slider (ev.y)) 2115 if (scrollBar.above_slider (ev.y))
2036# ifdef RXVT_SCROLL_FULL 2116# ifdef RXVT_SCROLL_FULL
2037 scr_page (UP, nrow - 1); 2117 scr_page (UP, nrow - 1);
2038# else 2118# else
2039 scr_page (UP, nrow / 4); 2119 scr_page (UP, nrow / 4);
2040# endif 2120# endif
2041 else if (scrollbar_below_slider (ev.y)) 2121 else if (scrollBar.below_slider (ev.y))
2042# ifdef RXVT_SCROLL_FULL 2122# ifdef RXVT_SCROLL_FULL
2043 scr_page (DN, nrow - 1); 2123 scr_page (DN, nrow - 1);
2044# else 2124# else
2045 scr_page (DN, nrow / 4); 2125 scr_page (DN, nrow / 4);
2046# endif 2126# endif
2047 else 2127 else
2048 scrollBar.setMotion (); 2128 scrollBar.state = SB_STATE_MOTION;
2049 } 2129 }
2050 else 2130 else
2051 { 2131 {
2052 scr_page ((ev.button == Button1 ? DN : UP), 2132 scr_page ((ev.button == Button1 ? DN : UP),
2053 (nrow 2133 (nrow
2054 * scrollbar_position (ev.y) 2134 * scrollBar.position (ev.y)
2055 / scrollbar_size ())); 2135 / scrollBar.size ()));
2056 } 2136 }
2057 2137
2058 break; 2138 break;
2059 } 2139 }
2060 } 2140 }
… …
2070 2150
2071 csrO = 0; /* reset csr Offset */ 2151 csrO = 0; /* reset csr Offset */
2072 if (!bypass_keystate) 2152 if (!bypass_keystate)
2073 reportmode = !! (priv_modes & PrivMode_mouse_report); 2153 reportmode = !! (priv_modes & PrivMode_mouse_report);
2074 2154
2075 if (scrollbar_isUpDn ()) 2155 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2076 { 2156 {
2077 scrollBar.setIdle (); 2157 scrollBar.state = SB_STATE_IDLE;
2078 scrollbar_show (0); 2158 scrollBar.show (0);
2079 } 2159 }
2080 2160
2081#ifdef SELECTION_SCROLLING 2161#ifdef SELECTION_SCROLLING
2082 sel_scroll_ev.stop(); 2162 sel_scroll_ev.stop();
2083#endif 2163#endif
… …
2102#ifdef MOUSE_REPORT_DOUBLECLICK 2182#ifdef MOUSE_REPORT_DOUBLECLICK
2103 /* only report the release of 'slow' single clicks */ 2183 /* only report the release of 'slow' single clicks */
2104 if (MEvent.button != AnyButton 2184 if (MEvent.button != AnyButton
2105 && (ev.button != MEvent.button 2185 && (ev.button != MEvent.button
2106 || (ev.time - MEvent.time 2186 || (ev.time - MEvent.time
2107 > MULTICLICK_TIME / 2))) 2187 > multiClickTime / 2)))
2108 { 2188 {
2109 MEvent.clicks = 0; 2189 MEvent.clicks = 0;
2110 MEvent.button = AnyButton; 2190 MEvent.button = AnyButton;
2111 mouse_report (ev); 2191 mouse_report (ev);
2112 } 2192 }
… …
2132 case Button3: 2212 case Button3:
2133 selection_make (ev.time); 2213 selection_make (ev.time);
2134 break; 2214 break;
2135 2215
2136 case Button2: 2216 case Button2:
2137 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2217 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2138 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2218 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2139 break; 2219 break;
2140 2220
2141#ifdef MOUSE_WHEEL 2221#ifdef MOUSE_WHEEL
2142 case Button4: 2222 case Button4:
2143 case Button5: 2223 case Button5:
2144 { 2224 {
2145 int i; 2225 int lines;
2146 page_dirn v; 2226 page_dirn dirn;
2147 2227
2148 v = ev.button == Button4 ? UP : DN; 2228 dirn = ev.button == Button4 ? UP : DN;
2149 2229
2150 if (ev.state & ShiftMask) 2230 if (ev.state & ShiftMask)
2151 i = 1; 2231 lines = 1;
2152 else if (option (Opt_mouseWheelScrollPage)) 2232 else if (option (Opt_mouseWheelScrollPage))
2153 i = nrow - 1; 2233 lines = nrow - 1;
2154 else 2234 else
2155 i = 5; 2235 lines = 5;
2156 2236
2157# ifdef MOUSE_SLIP_WHEELING 2237# ifdef MOUSE_SLIP_WHEELING
2158 if (ev.state & ControlMask) 2238 if (ev.state & ControlMask)
2159 { 2239 {
2160 mouse_slip_wheel_speed += v ? -1 : 1; 2240 mouse_slip_wheel_speed += dirn;
2161 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2241 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2162 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2163 2242
2164 if (!slip_wheel_ev.is_active ()) 2243 if (!slip_wheel_ev.is_active ())
2165 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2244 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2166 } 2245 }
2167 else 2246 else
2247# endif
2168 { 2248 {
2169# endif
2170 scr_page (v, i); 2249 scr_page (dirn, lines);
2171 scrollbar_show (1); 2250 scrollBar.show (1);
2172# ifdef MOUSE_SLIP_WHEELING
2173 } 2251 }
2174# endif
2175 } 2252 }
2176 break; 2253 break;
2177#endif 2254#endif
2178 } 2255 }
2179 } 2256 }
2180} 2257}
2181 2258
2182/*}}} */ 2259/*}}} */
2183 2260
2184bool 2261void ecb_hot
2185rxvt_term::cmd_parse () 2262rxvt_term::cmd_parse ()
2186{ 2263{
2187 bool flag = false;
2188 wchar_t ch = NOCHAR; 2264 wchar_t ch = NOCHAR;
2189 char *seq_begin; // remember start of esc-sequence here 2265 char *seq_begin; // remember start of esc-sequence here
2190 2266
2191 for (;;) 2267 for (;;)
2192 { 2268 {
2193 if (ch == NOCHAR) 2269 if (ecb_unlikely (ch == NOCHAR))
2194 { 2270 {
2195 seq_begin = cmdbuf_ptr; 2271 seq_begin = cmdbuf_ptr;
2196 ch = next_char (); 2272 ch = next_char ();
2197 2273
2198 if (ch == NOCHAR) 2274 if (ch == NOCHAR)
2199 break; 2275 break;
2200 } 2276 }
2201 2277
2202 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2278 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2203 { 2279 {
2204 if (!seen_input) 2280 if (ecb_unlikely (!seen_input))
2205 { 2281 {
2206 seen_input = 1; 2282 seen_input = 1;
2207 // many badly-written programs (e.g. jed) contain a race condition: 2283 // many badly-written programs (e.g. jed) contain a race condition:
2208 // they first read the screensize and then install a SIGWINCH handler. 2284 // they first read the screensize and then install a SIGWINCH handler.
2209 // some window managers resize the window early, and these programs 2285 // some window managers resize the window early, and these programs
… …
2222 wchar_t *str = buf; 2298 wchar_t *str = buf;
2223 wchar_t *eol = str + min (ncol, UBUFSIZ); 2299 wchar_t *eol = str + min (ncol, UBUFSIZ);
2224 2300
2225 for (;;) 2301 for (;;)
2226 { 2302 {
2227 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2303 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2228 break; 2304 break;
2229 2305
2230 *str++ = ch; 2306 *str++ = ch;
2231 2307
2232 if (ch == C0_LF || str >= eol) 2308 if (ecb_unlikely (ch == C0_LF || str >= eol))
2233 { 2309 {
2234 if (ch == C0_LF) 2310 if (ch == C0_LF)
2235 nlines++; 2311 nlines++;
2236 2312
2237 refresh_count++; 2313 refresh_count++;
… …
2286 * What the heck we'll cheat and only refresh less than every page-full. 2362 * What the heck we'll cheat and only refresh less than every page-full.
2287 * if skipScroll is enabled. 2363 * if skipScroll is enabled.
2288 */ 2364 */
2289 if (refreshnow) 2365 if (refreshnow)
2290 { 2366 {
2291 flag = true;
2292 scr_refresh (); 2367 scr_refresh ();
2293 want_refresh = 1; 2368 want_refresh = 1;
2294 } 2369 }
2295
2296 } 2370 }
2297 else 2371 else
2298 { 2372 {
2299 try 2373 try
2300 { 2374 {
… …
2308 } 2382 }
2309 2383
2310 ch = NOCHAR; 2384 ch = NOCHAR;
2311 } 2385 }
2312 } 2386 }
2313
2314 refresh_check ();
2315
2316 return flag;
2317} 2387}
2318 2388
2319// read the next character 2389// read the next character
2320wchar_t 2390wchar_t ecb_hot
2321rxvt_term::next_char () NOTHROW 2391rxvt_term::next_char () NOTHROW
2322{ 2392{
2323 while (cmdbuf_ptr < cmdbuf_endp) 2393 while (cmdbuf_ptr < cmdbuf_endp)
2324 { 2394 {
2325 // assume 7-bit to be ascii ALWAYS 2395 // assume 7-bit to be ascii ALWAYS
2326 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2396 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2327 return *cmdbuf_ptr++; 2397 return *cmdbuf_ptr++;
2328 2398
2329 wchar_t wc; 2399 wchar_t wc;
2330 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2400 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2331 2401
… …
2335 cmdbuf_ptr = cmdbuf_endp; 2405 cmdbuf_ptr = cmdbuf_endp;
2336 break; 2406 break;
2337 } 2407 }
2338 2408
2339 if (len == (size_t)-1) 2409 if (len == (size_t)-1)
2410 {
2411 mbstate.reset (); // reset now undefined conversion state
2412 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2413 // in which case we "erroneously" return the next byte which might be valid.
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2414 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2415 }
2341 2416
2342 // assume wchar == unicode 2417 // assume wchar == unicode
2343 cmdbuf_ptr += len; 2418 cmdbuf_ptr += len;
2344 return wc & UNICODE_MASK; 2419 return wc & UNICODE_MASK;
2345 } 2420 }
2346 2421
2347 return NOCHAR; 2422 return NOCHAR;
2348} 2423}
2349 2424
2350// read the next octet 2425// read the next octet
2351uint32_t 2426uint32_t ecb_hot
2352rxvt_term::next_octet () NOTHROW 2427rxvt_term::next_octet () NOTHROW
2353{ 2428{
2354 return cmdbuf_ptr < cmdbuf_endp 2429 return cmdbuf_ptr < cmdbuf_endp
2355 ? (unsigned char)*cmdbuf_ptr++ 2430 ? (unsigned char)*cmdbuf_ptr++
2356 : NOCHAR; 2431 : NOCHAR;
2357} 2432}
2358 2433
2359static class out_of_input out_of_input; 2434static class out_of_input out_of_input;
2360 2435
2361/* rxvt_cmd_getc () - Return next input character */ 2436wchar_t ecb_hot
2362/*
2363 * Return the next input character after first passing any keyboard input
2364 * to the command.
2365 */
2366wchar_t
2367rxvt_term::cmd_getc () THROW ((class out_of_input)) 2437rxvt_term::cmd_getc () THROW ((class out_of_input))
2368{ 2438{
2369 wchar_t c = next_char (); 2439 wchar_t c = next_char ();
2370 2440
2371 if (c == NOCHAR) 2441 if (c == NOCHAR)
2372 throw out_of_input; 2442 throw out_of_input;
2373 2443
2374 return c; 2444 return c;
2375} 2445}
2376 2446
2377uint32_t 2447uint32_t ecb_hot
2378rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2448rxvt_term::cmd_get8 () THROW ((class out_of_input))
2379{ 2449{
2380 uint32_t c = next_octet (); 2450 uint32_t c = next_octet ();
2381 2451
2382 if (c == NOCHAR) 2452 if (c == NOCHAR)
… …
2386} 2456}
2387 2457
2388/*{{{ print pipe */ 2458/*{{{ print pipe */
2389/*----------------------------------------------------------------------*/ 2459/*----------------------------------------------------------------------*/
2390#ifdef PRINTPIPE 2460#ifdef PRINTPIPE
2391FILE * 2461FILE * ecb_cold
2392rxvt_term::popen_printer () 2462rxvt_term::popen_printer ()
2393{ 2463{
2394 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2464 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2395 2465
2396 if (stream == NULL) 2466 if (stream == NULL)
2397 rxvt_warn ("can't open printer pipe, not printing.\n"); 2467 rxvt_warn ("can't open printer pipe, not printing.\n");
2398 2468
2399 return stream; 2469 return stream;
2400} 2470}
2401 2471
2402int 2472int ecb_cold
2403rxvt_term::pclose_printer (FILE *stream) 2473rxvt_term::pclose_printer (FILE *stream)
2404{ 2474{
2405 fflush (stream); 2475 fflush (stream);
2406 return pclose (stream); 2476 return pclose (stream);
2407} 2477}
2408 2478
2409/* 2479/*
2410 * simulate attached vt100 printer 2480 * simulate attached vt100 printer
2411 */ 2481 */
2412void 2482void ecb_cold
2413rxvt_term::process_print_pipe () 2483rxvt_term::process_print_pipe ()
2414{ 2484{
2415 int done; 2485 FILE *fd = popen_printer ();
2416 FILE *fd;
2417 2486
2418 if ((fd = popen_printer ()) == NULL) 2487 if (!fd)
2419 return; 2488 return;
2420 2489
2421 /* 2490 /*
2422 * Send all input to the printer until either ESC[4i or ESC[?4i 2491 * Send all input to the printer until either ESC[4i or ESC[?4i
2423 * is received. 2492 * is received.
2424 */ 2493 */
2425 for (done = 0; !done;) 2494 for (int done = 0; !done; )
2426 { 2495 {
2427 unsigned char buf[8]; 2496 unsigned char buf[8];
2428 unicode_t ch; 2497 unicode_t ch;
2429 unsigned int i, len; 2498 unsigned int i, len;
2430 2499
… …
2464 pclose_printer (fd); 2533 pclose_printer (fd);
2465} 2534}
2466#endif /* PRINTPIPE */ 2535#endif /* PRINTPIPE */
2467/*}}} */ 2536/*}}} */
2468 2537
2469/* *INDENT-OFF* */
2470enum { 2538enum {
2471 C1_40 = 0x40, 2539 C1_40 = 0x40,
2472 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2540 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2473 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2541 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2474 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2542 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2475 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2543 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2476}; 2544};
2477/* *INDENT-ON* */
2478 2545
2479/*{{{ process non-printing single characters */ 2546/*{{{ process non-printing single characters */
2480void 2547void ecb_hot
2481rxvt_term::process_nonprinting (unicode_t ch) 2548rxvt_term::process_nonprinting (unicode_t ch)
2482{ 2549{
2483 switch (ch) 2550 switch (ch)
2484 { 2551 {
2485 case C0_ESC: 2552 case C0_ESC:
… …
2515 scr_charset_choose (0); 2582 scr_charset_choose (0);
2516 break; 2583 break;
2517 2584
2518#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
2519 // 8-bit controls 2586 // 8-bit controls
2520 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
2521 process_dcs_seq (); 2588 process_dcs_seq ();
2522 break; 2589 break;
2523 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
2524 process_csi_seq (); 2591 process_csi_seq ();
2525 break; 2592 break;
2526 case 0x9d: /* OSC */ 2593 case 0x9d: /* OSC */
2527 process_osc_seq (); 2594 process_osc_seq ();
2528 break; 2595 break;
2529#endif 2596#endif
2530 } 2597 }
2531} 2598}
2532/*}}} */ 2599/*}}} */
2533 2600
2534 2601
2535/*{{{ process VT52 escape sequences */ 2602/*{{{ process VT52 escape sequences */
2536void 2603void ecb_cold
2537rxvt_term::process_escape_vt52 (unicode_t ch) 2604rxvt_term::process_escape_vt52 (unicode_t ch)
2538{ 2605{
2539 int row, col; 2606 int row, col;
2540 2607
2541 switch (ch) 2608 switch (ch)
… …
2575 break; 2642 break;
2576 case 'Z': /* identify the terminal type */ 2643 case 'Z': /* identify the terminal type */
2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2644 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2578 break; 2645 break;
2579 case '<': /* turn off VT52 mode */ 2646 case '<': /* turn off VT52 mode */
2580 PrivMode (0, PrivMode_vt52); 2647 priv_modes &= ~PrivMode_vt52;
2581 break; 2648 break;
2582 case 'F': /* use special graphics character set */ 2649 case 'F': /* use special graphics character set */
2583 case 'G': /* use regular character set */ 2650 case 'G': /* use regular character set */
2584 /* unimplemented */ 2651 /* unimplemented */
2585 break; 2652 break;
… …
2591} 2658}
2592/*}}} */ 2659/*}}} */
2593 2660
2594 2661
2595/*{{{ process escape sequences */ 2662/*{{{ process escape sequences */
2596void 2663void ecb_hot
2597rxvt_term::process_escape_seq () 2664rxvt_term::process_escape_seq ()
2598{ 2665{
2599 unicode_t ch = cmd_getc (); 2666 unicode_t ch = cmd_getc ();
2600 2667
2601 if (priv_modes & PrivMode_vt52) 2668 if (priv_modes & PrivMode_vt52)
… …
2604 return; 2671 return;
2605 } 2672 }
2606 2673
2607 switch (ch) 2674 switch (ch)
2608 { 2675 {
2609 /* case 1: do_tek_mode (); break; */
2610 case '#': 2676 case '#':
2611 if (cmd_getc () == '8') 2677 if (cmd_getc () == '8')
2612 scr_E (); 2678 scr_E ();
2613 break; 2679 break;
2614 case '(': 2680 case '(':
… …
2637#if !ENABLE_MINIMAL 2703#if !ENABLE_MINIMAL
2638 case '9': 2704 case '9':
2639 scr_forwardindex (); 2705 scr_forwardindex ();
2640 break; 2706 break;
2641#endif 2707#endif
2708 // DECPAM/DECPNM
2642 case '=': 2709 case '=':
2710 priv_modes |= PrivMode_aplKP;
2711 break;
2643 case '>': 2712 case '>':
2644 PrivMode ((ch == '='), PrivMode_aplKP); 2713 priv_modes &= ~PrivMode_aplKP;
2645 break; 2714 break;
2646 2715
2647 case C1_40: 2716 case C1_40:
2648 cmd_getc (); 2717 cmd_getc ();
2649 break; 2718 break;
… …
2653 2722
2654 /* 8.3.87: NEXT LINE */ 2723 /* 8.3.87: NEXT LINE */
2655 case C1_NEL: /* ESC E */ 2724 case C1_NEL: /* ESC E */
2656 { 2725 {
2657 wchar_t nlcr[] = { C0_LF, C0_CR }; 2726 wchar_t nlcr[] = { C0_LF, C0_CR };
2658 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2727 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2659 } 2728 }
2660 break; 2729 break;
2661 2730
2662 /* kidnapped escape sequence: Should be 8.3.48 */ 2731 /* kidnapped escape sequence: Should be 8.3.48 */
2663 case C1_ESA: /* ESC G */ 2732 case C1_ESA: /* ESC G */
2664 process_graphics (); 2733 // used by original rxvt for rob nations own graphics mode
2734 if (cmd_getc () == 'Q')
2735 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2665 break; 2736 break;
2666 2737
2667 /* 8.3.63: CHARACTER TABULATION SET */ 2738 /* 8.3.63: CHARACTER TABULATION SET */
2668 case C1_HTS: /* ESC H */ 2739 case C1_HTS: /* ESC H */
2669 scr_set_tab (1); 2740 scr_set_tab (1);
… …
2673 case C1_RI: /* ESC M */ 2744 case C1_RI: /* ESC M */
2674 scr_index (DN); 2745 scr_index (DN);
2675 break; 2746 break;
2676 2747
2677 /* 8.3.142: SINGLE-SHIFT TWO */ 2748 /* 8.3.142: SINGLE-SHIFT TWO */
2678 /*case C1_SS2: scr_single_shift (2); break; */ 2749 /* case C1_SS2: break; */
2679 2750
2680 /* 8.3.143: SINGLE-SHIFT THREE */ 2751 /* 8.3.143: SINGLE-SHIFT THREE */
2681 /*case C1_SS3: scr_single_shift (3); break; */ 2752 /* case C1_SS3: break; */
2682 2753
2683 /* 8.3.27: DEVICE CONTROL STRING */ 2754 /* 8.3.27: DEVICE CONTROL STRING */
2684 case C1_DCS: /* ESC P */ 2755 case C1_DCS: /* ESC P */
2685 process_dcs_seq (); 2756 process_dcs_seq ();
2686 break; 2757 break;
… …
2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2759 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2689 case C1_SCI: /* ESC Z */ 2760 case C1_SCI: /* ESC Z */
2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2761 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2691 break; /* steal obsolete ESC [ c */ 2762 break; /* steal obsolete ESC [ c */
2692 2763
2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2764 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2694 case C1_CSI: /* ESC [ */ 2765 case C1_CSI: /* ESC [ */
2695 process_csi_seq (); 2766 process_csi_seq ();
2696 break; 2767 break;
2697 2768
2698 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2769 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2699 case C1_OSC: /* ESC ] */ 2770 case C1_OSC: /* ESC ] */
2700 process_osc_seq (); 2771 process_osc_seq ();
2701 break; 2772 break;
2702 2773
2703 /* 8.3.106: RESET TO INITIAL STATE */ 2774 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2704 case 'c': 2775 case 'c':
2705 mbstate.reset (); 2776 mbstate.reset ();
2706 scr_poweron (); 2777 scr_poweron ();
2707 scrollbar_show (1); 2778 scrollBar.show (1);
2708 break; 2779 break;
2709 2780
2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2781 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2711 case 'n': 2782 case 'n':
2712 scr_charset_choose (2); 2783 scr_charset_choose (2);
… …
2719 } 2790 }
2720} 2791}
2721/*}}} */ 2792/*}}} */
2722 2793
2723/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2794/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2724/* *INDENT-OFF* */
2725enum { 2795enum {
2726 CSI_ICH = 0x40, 2796 CSI_ICH = 0x40,
2727 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2797 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2728 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2798 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2729 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2799 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2732 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2802 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2733 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2803 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2734 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2804 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2735}; 2805};
2736 2806
2737#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2807#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2738 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2808 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2739 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2809 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2740#define get_byte_array_bit(array, bit) \ 2810#define get_byte_array_bit(array, bit) \
2741 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2811 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2742 2812
2743const unsigned char csi_defaults[] = 2813static const unsigned char csi_defaults[] =
2744 { 2814 {
2745 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2815 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2746 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2816 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2747 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2817 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2748 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2818 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2749 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2819 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2750 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2820 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2751 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2821 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2752 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2822 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2753 }; 2823 };
2754/* *INDENT-ON* */
2755 2824
2756void 2825void ecb_hot
2757rxvt_term::process_csi_seq () 2826rxvt_term::process_csi_seq ()
2758{ 2827{
2759 unicode_t ch, priv, i; 2828 unicode_t ch, priv, prev_ch, i;
2760 unsigned int nargs, p; 2829 unsigned int nargs, p;
2761 int n, ndef; 2830 int n, ndef;
2762 int arg[ESC_ARGS] = { }; 2831 int arg[ESC_ARGS] = { };
2763 2832
2764 nargs = 0; 2833 nargs = 0;
2765 2834
2766 priv = 0; 2835 priv = 0;
2767 ch = cmd_getc (); 2836 ch = cmd_getc ();
2768 if (ch >= '<' && ch <= '?') 2837 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 { 2838 {
2770 /* '<' '=' '>' '?' */ 2839 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2840 priv = ch;
2772 ch = cmd_getc (); 2841 ch = cmd_getc ();
2773 } 2842 }
2774 2843
2844 prev_ch = 0;
2775 /* read any numerical arguments */ 2845 /* read any numerical arguments */
2776 for (n = -1; ch < CSI_ICH; ) 2846 for (n = -1; ch < CSI_ICH; )
2777 { 2847 {
2778 if (isdigit (ch)) 2848 if (isdigit (ch))
2779 { 2849 {
… …
2789 n = -1; 2859 n = -1;
2790 } 2860 }
2791 else if (IS_CONTROL (ch)) 2861 else if (IS_CONTROL (ch))
2792 process_nonprinting (ch); 2862 process_nonprinting (ch);
2793 2863
2864 prev_ch = ch;
2794 ch = cmd_getc (); 2865 ch = cmd_getc ();
2795 } 2866 }
2796 2867
2797 if (ch > CSI_7F) 2868 if (ch > CSI_7F)
2798 return; 2869 return;
… …
2824 // versions. 2895 // versions.
2825 // 2896 //
2826 tt_printf ("\033[>%d;95;0c", 'U'); 2897 tt_printf ("\033[>%d;95;0c", 'U');
2827 } 2898 }
2828 break; 2899 break;
2900
2829 case '?': 2901 case '?':
2830 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2902 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2831 process_terminal_mode (ch, priv, nargs, arg); 2903 process_terminal_mode (ch, priv, nargs, arg);
2832 break; 2904 break;
2905
2906 case '!':
2907 if (ch == CSI_70)
2908 {
2909 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2910 scr_soft_reset ();
2911
2912 static const int pm_h[] = { 7, 25 };
2913 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2914
2915 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2916 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2833 } 2917 }
2918 break;
2919 }
2920
2834 return; 2921 return;
2835 } 2922 }
2836 2923
2837 switch (ch) 2924 switch (ch)
2838 { 2925 {
… …
2852 } 2939 }
2853 break; 2940 break;
2854#endif 2941#endif
2855 2942
2856 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2943 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2857 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2944 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2858 arg[0] = -arg[0]; 2945 arg[0] = -arg[0];
2859 /* FALLTHROUGH */ 2946 /* FALLTHROUGH */
2860 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2947 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2861 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2862 scr_gotorc (arg[0], 0, RELATIVE); 2949 scr_gotorc (arg[0], 0, RELATIVE);
2863 break; 2950 break;
2864 2951
2865 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2866 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3016 scr_insert_mode (1); 3103 scr_insert_mode (1);
3017 else if (arg[0] == 20) 3104 else if (arg[0] == 20)
3018 priv_modes |= PrivMode_LFNL; 3105 priv_modes |= PrivMode_LFNL;
3019 break; 3106 break;
3020 3107
3108 case CSI_71: // DECSCUSR: set cursor style
3109 if (prev_ch == ' ')
3110 set_cursor_style (arg[0]);
3111 break;
3112
3021 /* 3113 /*
3022 * PRIVATE USE beyond this point. All CSI_7? sequences here 3114 * PRIVATE USE beyond this point. All CSI_7? sequences here
3023 */ 3115 */
3024 case CSI_72: /* DECSTBM: set top and bottom margins */ 3116 case CSI_72: /* DECSTBM: set top and bottom margins */
3025 if (nargs == 1) 3117 if (nargs == 1)
… …
3053 } 3145 }
3054} 3146}
3055/*}}} */ 3147/*}}} */
3056 3148
3057#if !ENABLE_MINIMAL 3149#if !ENABLE_MINIMAL
3058/* ARGSUSED */
3059void 3150void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3151rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3152{
3062 int x, y; 3153 int x, y;
3063 XWindowAttributes wattr; 3154 XWindowAttributes wattr;
… …
3072 { 3163 {
3073 /* 3164 /*
3074 * commands 3165 * commands
3075 */ 3166 */
3076 case 1: /* deiconify window */ 3167 case 1: /* deiconify window */
3077 XMapWindow (dpy, parent[0]); 3168 XMapWindow (dpy, parent);
3078 break; 3169 break;
3079 case 2: /* iconify window */ 3170 case 2: /* iconify window */
3080 XIconifyWindow (dpy, parent[0], display->screen); 3171 XIconifyWindow (dpy, parent, display->screen);
3081 break; 3172 break;
3082 case 3: /* set position (pixels) */ 3173 case 3: /* set position (pixels) */
3083 XMoveWindow (dpy, parent[0], args[1], args[2]); 3174 XMoveWindow (dpy, parent, args[1], args[2]);
3084 break; 3175 break;
3085 case 4: /* set size (pixels) */ 3176 case 4: /* set size (pixels) */
3086 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3177 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3087 break; 3178 break;
3088 case 5: /* raise window */ 3179 case 5: /* raise window */
3089 XRaiseWindow (dpy, parent[0]); 3180 XRaiseWindow (dpy, parent);
3090 break; 3181 break;
3091 case 6: /* lower window */ 3182 case 6: /* lower window */
3092 XLowerWindow (dpy, parent[0]); 3183 XLowerWindow (dpy, parent);
3093 break; 3184 break;
3094 case 7: /* refresh window */ 3185 case 7: /* refresh window */
3095 scr_touch (true); 3186 scr_touch (true);
3096 break; 3187 break;
3097 case 8: /* set size (chars) */ 3188 case 8: /* set size (chars) */
… …
3100 break; 3191 break;
3101 3192
3102 //case 9: NYI, TODO, restore maximized window or maximize window 3193 //case 9: NYI, TODO, restore maximized window or maximize window
3103 default: 3194 default:
3104 if (args[0] >= 24) /* set height (chars) */ 3195 if (args[0] >= 24) /* set height (chars) */
3105 set_widthheight ((unsigned int)width, 3196 set_widthheight ((unsigned int)vt_width,
3106 (unsigned int) (args[1] * fheight)); 3197 (unsigned int) (args[1] * fheight));
3107 break; 3198 break;
3108 3199
3109 /* 3200 /*
3110 * reports - some output format copied from XTerm 3201 * reports - some output format copied from XTerm
3111 */ 3202 */
3112 case 11: /* report window state */ 3203 case 11: /* report window state */
3113 XGetWindowAttributes (dpy, parent[0], &wattr); 3204 XGetWindowAttributes (dpy, parent, &wattr);
3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3205 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3115 break; 3206 break;
3116 case 13: /* report window position */ 3207 case 13: /* report window position */
3117 XGetWindowAttributes (dpy, parent[0], &wattr); 3208 XGetWindowAttributes (dpy, parent, &wattr);
3118 XTranslateCoordinates (dpy, parent[0], wattr.root, 3209 XTranslateCoordinates (dpy, parent, wattr.root,
3119 -wattr.border_width, -wattr.border_width, 3210 -wattr.border_width, -wattr.border_width,
3120 &x, &y, &wdummy); 3211 &x, &y, &wdummy);
3121 tt_printf ("\033[3;%d;%dt", x, y); 3212 tt_printf ("\033[3;%d;%dt", x, y);
3122 break; 3213 break;
3123 case 14: /* report window size (pixels) */ 3214 case 14: /* report window size (pixels) */
3124 XGetWindowAttributes (dpy, parent[0], &wattr); 3215 XGetWindowAttributes (dpy, parent, &wattr);
3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3216 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3126 break; 3217 break;
3127 case 18: /* report text area size (chars) */ 3218 case 18: /* report text area size (chars) */
3128 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3219 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3129 break; 3220 break;
… …
3131 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3222 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3132 break; 3223 break;
3133 case 20: /* report icon label */ 3224 case 20: /* report icon label */
3134 { 3225 {
3135 char *s; 3226 char *s;
3136 XGetIconName (dpy, parent[0], &s); 3227 XGetIconName (dpy, parent, &s);
3137 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3228 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3138 XFree (s); 3229 XFree (s);
3139 } 3230 }
3140 break; 3231 break;
3141 case 21: /* report window title */ 3232 case 21: /* report window title */
3142 { 3233 {
3143 char *s; 3234 char *s;
3144 XFetchName (dpy, parent[0], &s); 3235 XFetchName (dpy, parent, &s);
3145 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3236 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3146 XFree (s); 3237 XFree (s);
3147 } 3238 }
3148 break; 3239 break;
3149 } 3240 }
… …
3159rxvt_term::get_to_st (unicode_t &ends_how) 3250rxvt_term::get_to_st (unicode_t &ends_how)
3160{ 3251{
3161 unicode_t ch; 3252 unicode_t ch;
3162 bool seen_esc = false; 3253 bool seen_esc = false;
3163 unsigned int n = 0; 3254 unsigned int n = 0;
3164 wchar_t string[STRING_MAX]; 3255 wchar_t string[CBUFSIZ];
3165 3256
3166 while ((ch = cmd_getc ()) != NOCHAR) 3257 while ((ch = cmd_getc ()) != NOCHAR)
3167 { 3258 {
3168 if (seen_esc) 3259 if (seen_esc)
3169 { 3260 {
… …
3184 else if (ch < 0x20) 3275 else if (ch < 0x20)
3185 return NULL; /* other control character - exit */ 3276 return NULL; /* other control character - exit */
3186 3277
3187 seen_esc = false; 3278 seen_esc = false;
3188 3279
3189 if (n >= STRING_MAX - 1) 3280 if (n >= sizeof (string) - 1)
3190 // stop at some sane length 3281 // stop at some sane length
3191 return NULL; 3282 return NULL;
3192 3283
3193 string[n++] = ch; 3284 string[n++] = ch;
3194 } 3285 }
… …
3205 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3296 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3206 */ 3297 */
3207void 3298void
3208rxvt_term::process_dcs_seq () 3299rxvt_term::process_dcs_seq ()
3209{ 3300{
3210 char *s;
3211 unicode_t eh;
3212
3213 /* 3301 /*
3214 * Not handled yet 3302 * Not handled yet
3215 */ 3303 */
3304
3305 unicode_t eh;
3216 s = get_to_st (eh); 3306 char *s = get_to_st (eh);
3217 if (s) 3307 if (s)
3218 free (s); 3308 free (s);
3219 3309
3220 return; 3310 return;
3221} 3311}
… …
3225 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3315 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3226 */ 3316 */
3227void 3317void
3228rxvt_term::process_osc_seq () 3318rxvt_term::process_osc_seq ()
3229{ 3319{
3230 unicode_t ch, eh;
3231 int arg; 3320 int arg;
3232 3321
3233 ch = cmd_getc (); 3322 unicode_t ch = cmd_getc ();
3234 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3323 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3235 arg = arg * 10 + (ch - '0'); 3324 arg = arg * 10 + (ch - '0');
3236 3325
3237 if (ch == ';') 3326 if (ch == ';')
3238 { 3327 {
3328 unicode_t eh;
3239 char *s = get_to_st (eh); 3329 char *s = get_to_st (eh);
3240 3330
3241 if (s) 3331 if (s)
3242 { 3332 {
3243 process_xterm_seq (arg, s, eh); 3333 process_xterm_seq (arg, s, eh);
3244 free (s); 3334 free (s);
3245 } 3335 }
3246 } 3336 }
3247} 3337}
3248 3338
3339static unsigned int
3340colorcube_index (unsigned int idx_r,
3341 unsigned int idx_g,
3342 unsigned int idx_b)
3343{
3344 assert (idx_r < Red_levels);
3345 assert (idx_g < Green_levels);
3346 assert (idx_b < Blue_levels);
3347
3348 return idx_r * Blue_levels * Green_levels +
3349 idx_g * Blue_levels +
3350 idx_b;
3351}
3352
3353/*
3354 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 32bit RGBA color.
3356 */
3357unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3359{
3360 r &= 0xff;
3361 g &= 0xff;
3362 b &= 0xff;
3363 a &= 0xff;
3364
3365 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3366
3367 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3368 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3369 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3370 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3371
3372 /* we allow one of the 6 directly neighbouring colours */
3373 /* to replace the current color, if they not used recently */
3374 static const signed char dxyz[][3] = {
3375 0, 0, 0,
3376 0, 0, +1,
3377 0, 0, -1,
3378 0, +1, 0,
3379 0, -1, 0,
3380 +1, 0, 0,
3381 -1, 0, 0,
3382 };
3383
3384 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3385 {
3386 int r = idx_r + dxyz[n][0];
3387 int g = idx_g + dxyz[n][1];
3388 int b = idx_b + dxyz[n][2];
3389
3390 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3391 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3392 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3393
3394 unsigned int index = colorcube_index (r, g, b);
3395
3396 if (rgb24_color[index] == color)
3397 {
3398 rgb24_seqno[index] = ++rgb24_sequence;
3399 return index + minTermCOLOR24;
3400 }
3401
3402 // minor issue: could update index 0 few more times
3403 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3404 {
3405 idx = index;
3406 goto update;
3407 }
3408
3409 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3410 // but also handles wrap around values good enough
3411 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3412 idx = index;
3413 }
3414
3415update:
3416 rgb24_color[idx] = color;
3417 rgb24_seqno[idx] = ++rgb24_sequence;
3418
3419 idx += minTermCOLOR24;
3420 pix_colors_focused [idx].free (this);
3421 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3422 update_fade_color (idx, false);
3423
3424 return idx;
3425}
3426
3249void 3427void
3250rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3428rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3251{ 3429{
3252 if (str[0] == '?' && !str[1]) 3430 if (str[0] == '?' && !str[1])
3253 { 3431 {
3254 rgba c; 3432 rgba c;
3255 pix_colors_focused[color].get (c); 3433 pix_colors_focused[color].get (c);
3256 3434
3257#if XFT 3435#if XFT
3258 if (c.a != rgba::MAX_CC) 3436 if (c.a != rgba::MAX_CC)
3259 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3437 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3260 else 3438 else
3261#endif 3439#endif
3262 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3440 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3263 } 3441 }
3264 else 3442 else
… …
3267 3445
3268/* 3446/*
3269 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3447 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3270 */ 3448 */
3271void 3449void
3272rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3450rxvt_term::process_xterm_seq (int op, char *str, char resp)
3273{ 3451{
3274 int color; 3452 int color;
3275 char *buf, *name; 3453 char *buf, *name;
3276 bool query = str[0] == '?' && !str[1]; 3454 bool query = str[0] == '?' && !str[1];
3277 int saveop = op; 3455 int saveop = op;
… …
3304 unsigned long bytes_after; 3482 unsigned long bytes_after;
3305 unsigned char *value = 0; 3483 unsigned char *value = 0;
3306 const char *str = ""; 3484 const char *str = "";
3307 3485
3308 if (prop 3486 if (prop
3309 && XGetWindowProperty (dpy, parent[0], 3487 && XGetWindowProperty (dpy, parent,
3310 prop, 0, 1<<16, 0, AnyPropertyType, 3488 prop, 0, 1<<16, 0, AnyPropertyType,
3311 &actual_type, &actual_format, 3489 &actual_type, &actual_format,
3312 &nitems, &bytes_after, &value) == Success 3490 &nitems, &bytes_after, &value) == Success
3313 && actual_type != None 3491 && actual_type != None
3314 && actual_format == 8) 3492 && actual_format == 8)
3315 str = (const char *)(value); 3493 str = (const char *)(value);
3316 3494
3317 tt_printf ("\033]%d;%s%c", op, str, resp); 3495 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3318 3496
3319 XFree (value); 3497 XFree (value);
3320 } 3498 }
3321 else 3499 else
3322 { 3500 {
3323 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3501 char *eq = strchr (str, '=');
3324 3502
3325 if (eq) 3503 if (eq)
3326 { 3504 {
3327 *eq = 0; 3505 *eq = 0;
3328 set_utf8_property (display->atom (str), eq + 1); 3506 set_utf8_property (display->atom (str), eq + 1);
3329 } 3507 }
3330 else 3508 else
3331 XDeleteProperty (dpy, parent[0], 3509 XDeleteProperty (dpy, parent,
3332 display->atom (str)); 3510 display->atom (str));
3333 } 3511 }
3334 break; 3512 break;
3335 3513
3336 case XTerm_Color: 3514 case XTerm_Color:
… …
3349 *buf++ = '\0'; 3527 *buf++ = '\0';
3350 3528
3351 process_color_seq (op, color, name, resp); 3529 process_color_seq (op, color, name, resp);
3352 } 3530 }
3353 break; 3531 break;
3532 case Rxvt_restoreFG:
3354 case XTerm_Color00: 3533 case XTerm_Color00:
3355 process_color_seq (op, Color_fg, str, resp); 3534 process_color_seq (op, Color_fg, str, resp);
3356 break; 3535 break;
3536 case Rxvt_restoreBG:
3357 case XTerm_Color01: 3537 case XTerm_Color01:
3358 process_color_seq (op, Color_bg, str, resp); 3538 process_color_seq (op, Color_bg, str, resp);
3359 break; 3539 break;
3360#ifndef NO_CURSORCOLOR 3540#ifndef NO_CURSORCOLOR
3361 case XTerm_Color_cursor: 3541 case XTerm_Color_cursor:
… …
3366 process_color_seq (op, Color_pointer_fg, str, resp); 3546 process_color_seq (op, Color_pointer_fg, str, resp);
3367 break; 3547 break;
3368 case XTerm_Color_pointer_bg: 3548 case XTerm_Color_pointer_bg:
3369 process_color_seq (op, Color_pointer_bg, str, resp); 3549 process_color_seq (op, Color_pointer_bg, str, resp);
3370 break; 3550 break;
3551#ifdef OPTION_HC
3552 case XTerm_Color_HC:
3553 process_color_seq (op, Color_HC, str, resp);
3554 break;
3555 case XTerm_Color_HTC:
3556 process_color_seq (op, Color_HTC, str, resp);
3557 break;
3558#endif
3371#ifndef NO_BOLD_UNDERLINE_REVERSE 3559#ifndef NO_BOLD_UNDERLINE_REVERSE
3372 case XTerm_Color_RV:
3373 process_color_seq (op, Color_RV, str, resp);
3374 break;
3375 case Rxvt_Color_BD:
3376 case URxvt_Color_BD: 3560 case URxvt_Color_BD:
3377 process_color_seq (op, Color_BD, str, resp); 3561 process_color_seq (op, Color_BD, str, resp);
3378 break; 3562 break;
3379 case Rxvt_Color_UL:
3380 case URxvt_Color_UL: 3563 case URxvt_Color_UL:
3381 process_color_seq (op, Color_UL, str, resp); 3564 process_color_seq (op, Color_UL, str, resp);
3382 break; 3565 break;
3383 case URxvt_Color_IT: 3566 case URxvt_Color_IT:
3384 process_color_seq (op, Color_IT, str, resp); 3567 process_color_seq (op, Color_IT, str, resp);
3385 break; 3568 break;
3386#endif 3569#endif
3387#if ENABLE_TRANSPARENCY 3570 case URxvt_Color_border:
3571 process_color_seq (op, Color_border, str, resp);
3572 break;
3573
3574#if BG_IMAGE_FROM_ROOT
3388 case URxvt_Color_tint: 3575 case URxvt_Color_tint:
3389 process_color_seq (op, Color_tint, str, resp); 3576 process_color_seq (op, Color_tint, str, resp);
3390 { 3577 {
3391 bool changed = false; 3578 bool changed = false;
3579
3392 if (ISSET_PIXCOLOR (Color_tint)) 3580 if (ISSET_PIXCOLOR (Color_tint))
3393 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3581 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3394 else 3582
3395 changed = bgPixmap.unset_tint ();
3396 if (changed) 3583 if (changed)
3397 update_background (); 3584 update_background ();
3398 } 3585 }
3399 3586
3400 break; 3587 break;
… …
3403#if BG_IMAGE_FROM_FILE 3590#if BG_IMAGE_FROM_FILE
3404 case Rxvt_Pixmap: 3591 case Rxvt_Pixmap:
3405 if (!strcmp (str, "?")) 3592 if (!strcmp (str, "?"))
3406 { 3593 {
3407 char str[256]; 3594 char str[256];
3595 int h_scale = fimage.h_scale;
3596 int v_scale = fimage.v_scale;
3597 int h_align = fimage.h_align;
3598 int v_align = fimage.v_align;
3408 3599
3409 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3600 sprintf (str, "[%dx%d+%d+%d]",
3410 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3601 h_scale, v_scale,
3411 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3602 h_align, v_align);
3412 process_xterm_seq (XTerm_title, str, CHAR_ST); 3603 process_xterm_seq (XTerm_title, str, CHAR_ST);
3413 } 3604 }
3414 else 3605 else
3415 { 3606 {
3416 int changed = 0; 3607 bool changed = false;
3417 3608
3418 if (*str != ';') 3609 if (*str != ';')
3419 { 3610 {
3420 /* reset to default scaling :*/ 3611 try
3421 bgPixmap.unset_geometry (); 3612 {
3422 if (bgPixmap.set_file (str)) /* change pixmap */ 3613 fimage.set_file_geometry (this, str);
3423 changed++; 3614 changed = true;
3424 str = strchr (str, ';'); 3615 }
3425 if (str == NULL) 3616 catch (const class rxvt_failure_exception &e)
3426 bgPixmap.set_defaultGeometry (); 3617 {
3618 }
3427 } 3619 }
3428 while (str) 3620 else
3429 { 3621 {
3430 str++; 3622 str++;
3431 if (bgPixmap.set_geometry (str)) 3623 if (fimage.set_geometry (str, true))
3432 changed++; 3624 changed = true;
3433 str = strchr (str, ';');
3434 } 3625 }
3626
3435 if (changed) 3627 if (changed)
3628 {
3629 if (bg_window_position_sensitive ())
3630 {
3631 int x, y;
3632 get_window_origin (x, y);
3633 parent_x = x;
3634 parent_y = y;
3635 }
3436 update_background (); 3636 update_background ();
3637 }
3437 } 3638 }
3438 break; 3639 break;
3439#endif 3640#endif
3440
3441 case Rxvt_restoreFG:
3442 set_window_color (Color_fg, str);
3443 break;
3444 case Rxvt_restoreBG:
3445 set_window_color (Color_bg, str);
3446 break;
3447 3641
3448 case XTerm_logfile: 3642 case XTerm_logfile:
3449 // TODO, when secure mode? 3643 // TODO, when secure mode?
3450 break; 3644 break;
3451 3645
… …
3518 break; 3712 break;
3519#endif 3713#endif
3520 3714
3521#if ENABLE_PERL 3715#if ENABLE_PERL
3522 case URxvt_perl: 3716 case URxvt_perl:
3523 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3717 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3524 ; // no responses yet
3525 break; 3718 break;
3526#endif 3719#endif
3527 } 3720 }
3528} 3721}
3529/*----------------------------------------------------------------------*/ 3722/*----------------------------------------------------------------------*/
… …
3536 * 's' = save 3729 * 's' = save
3537 * 'r' = restore 3730 * 'r' = restore
3538 * 't' = toggle 3731 * 't' = toggle
3539 * so no need for fancy checking 3732 * so no need for fancy checking
3540 */ 3733 */
3541int 3734int ecb_cold
3542rxvt_term::privcases (int mode, unsigned long bit) 3735rxvt_term::privcases (int mode, unsigned long bit)
3543{ 3736{
3544 int state; 3737 int state;
3545 3738
3546 if (mode == 's') 3739 if (mode == 's')
3547 { 3740 {
3548 SavedModes |= (priv_modes & bit); 3741 if (priv_modes & bit)
3742 SavedModes |= bit;
3743 else
3744 SavedModes &= ~bit;
3549 return -1; 3745 return -1;
3550 } 3746 }
3551 else 3747 else
3552 { 3748 {
3553 if (mode == 'r') 3749 if (mode == 'r')
3554 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3750 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3555 else 3751 else
3556 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3752 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3557 PrivMode (state, bit); 3753
3754 if (state)
3755 priv_modes |= bit;
3756 else
3757 priv_modes &= ~bit;
3558 } 3758 }
3559 3759
3560 return state; 3760 return state;
3561} 3761}
3562 3762
3563/* we're not using priv _yet_ */ 3763/* we're not using priv _yet_ */
3564void 3764void
3565rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3765rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3566{ 3766{
3567 unsigned int i, j; 3767 unsigned int i, j;
3568 int state; 3768 int state;
3569 3769
3570 static const struct 3770 static const struct
3571 { 3771 {
3572 const int argval; 3772 const int argval;
3573 const unsigned long bit; 3773 const unsigned long bit;
3574 } argtopriv[] = { 3774 } argtopriv[] = {
3575 { 1, PrivMode_aplCUR }, 3775 { 1, PrivMode_aplCUR }, // DECCKM
3576 { 2, PrivMode_vt52 }, 3776 { 2, PrivMode_vt52 }, // DECANM
3577 { 3, PrivMode_132 }, 3777 { 3, PrivMode_132 }, // DECCOLM
3578 { 4, PrivMode_smoothScroll }, 3778 { 4, PrivMode_smoothScroll }, // DECSCLM
3579 { 5, PrivMode_rVideo }, 3779 { 5, PrivMode_rVideo }, // DECSCNM
3580 { 6, PrivMode_relOrigin }, 3780 { 6, PrivMode_relOrigin }, // DECOM
3581 { 7, PrivMode_Autowrap }, 3781 { 7, PrivMode_Autowrap }, // DECAWM
3582 // 8, bi-directional support mode 3782 // 8, auto-repeat keys // DECARM
3583 { 9, PrivMode_MouseX10 }, 3783 { 9, PrivMode_MouseX10 },
3584 // 18, 19 printing-related
3585 { 25, PrivMode_VisibleCursor }, 3784 { 12, PrivMode_BlinkingCursor },
3785 // 18 end FF to printer after print screen
3786 // 19 Print screen prints full screen/scroll region
3787 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3586#ifdef scrollBar_esc 3788#ifdef scrollBar_esc
3587 { scrollBar_esc, PrivMode_scrollBar }, 3789 { scrollBar_esc, PrivMode_scrollBar },
3588#endif 3790#endif
3589 { 35, PrivMode_ShiftKeys }, // rxvt extension 3791 { 35, PrivMode_ShiftKeys }, // rxvt extension
3792 // 38, tektronix mode // DECTEK
3590 { 40, PrivMode_132OK }, 3793 { 40, PrivMode_132OK },
3591 // 41 xterm more fixes NYI 3794 // 41 xterm more fixes NYI
3592 // 45 margin bell NYI 3795 // 45 margin bell NYI
3593 // 46 start logging 3796 // 46 start logging
3594 { 47, PrivMode_Screen }, 3797 { 47, PrivMode_Screen },
3595 { 66, PrivMode_aplKP }, 3798 { 66, PrivMode_aplKP }, // DECNKM
3596#ifndef NO_BACKSPACE_KEY 3799#ifndef NO_BACKSPACE_KEY
3597 { 67, PrivMode_BackSpace }, 3800 { 67, PrivMode_BackSpace }, // DECBKM
3598#endif 3801#endif
3599 { 1000, PrivMode_MouseX11 }, 3802 { 1000, PrivMode_MouseX11 },
3600 { 1002, PrivMode_MouseBtnEvent }, 3803 { 1002, PrivMode_MouseBtnEvent },
3601 { 1003, PrivMode_MouseAnyEvent }, 3804 { 1003, PrivMode_MouseAnyEvent },
3805#if ENABLE_FRILLS
3806 { 1004, PrivMode_FocusEvent },
3807 { 1005, PrivMode_ExtModeMouse },
3808#endif
3602 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3809 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3603 { 1011, PrivMode_Keypress }, // rxvt extension 3810 { 1011, PrivMode_Keypress }, // rxvt extension
3811#if ENABLE_FRILLS
3812 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3813#endif
3604 // 1035 enable modifiers for alt, numlock NYI 3814 // 1035 enable modifiers for alt, numlock NYI
3605 // 1036 send ESC for meta keys NYI 3815 // 1036 send ESC for meta keys NYI
3606 // 1037 send DEL for keypad delete NYI 3816 // 1037 send DEL for keypad delete NYI
3607 { 1047, PrivMode_Screen }, 3817 { 1047, PrivMode_Screen },
3608 // 1048 save and restore cursor 3818 // 1048 save and restore cursor, implemented in code
3609 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3819 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3610 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3820 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3821 { 2004, PrivMode_BracketPaste },
3611 }; 3822 };
3612 3823
3613 if (nargs == 0) 3824 if (nargs == 0)
3614 return; 3825 return;
3615 3826
… …
3622 for (i = 0; i < nargs; i++) 3833 for (i = 0; i < nargs; i++)
3623 { 3834 {
3624 state = -1; 3835 state = -1;
3625 3836
3626 /* basic handling */ 3837 /* basic handling */
3627 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3838 for (j = 0; j < ecb_array_length (argtopriv); j++)
3628 if (argtopriv[j].argval == arg[i]) 3839 if (argtopriv[j].argval == arg[i])
3629 { 3840 {
3630 state = privcases (mode, argtopriv[j].bit); 3841 state = privcases (mode, argtopriv[j].bit);
3631 break; 3842 break;
3632 } 3843 }
… …
3640 3851
3641 scr_touch (true); 3852 scr_touch (true);
3642 break; 3853 break;
3643#endif 3854#endif
3644 case 1048: /* alternative cursor save */ 3855 case 1048: /* alternative cursor save */
3645 case 1049:
3646 if (option (Opt_secondaryScreen)) 3856 if (option (Opt_secondaryScreen))
3647 if (mode == 0) 3857 if (mode == 0)
3648 scr_cursor (RESTORE); 3858 scr_cursor (RESTORE);
3649 else if (mode == 1) 3859 else if (mode == 1)
3650 scr_cursor (SAVE); 3860 scr_cursor (SAVE);
… …
3659 case 2: /* VT52 mode */ 3869 case 2: /* VT52 mode */
3660 /* oddball mode. should be set regardless of set/reset 3870 /* oddball mode. should be set regardless of set/reset
3661 * parameter. Return from VT52 mode with an ESC < from 3871 * parameter. Return from VT52 mode with an ESC < from
3662 * within VT52 mode 3872 * within VT52 mode
3663 */ 3873 */
3664 PrivMode (1, PrivMode_vt52); 3874 priv_modes |= PrivMode_vt52;
3665 break; 3875 break;
3666 case 3: /* 80/132 */ 3876 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3877 if (priv_modes & PrivMode_132OK)
3668 set_widthheight (((state ? 132 : 80) * fwidth), height); 3878 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3669 break; 3879 break;
3670 case 4: /* smooth scrolling */ 3880 case 4: /* smooth scrolling */
3671 set_option (Opt_jumpScroll, !state); 3881 set_option (Opt_jumpScroll, !state);
3672 break; 3882 break;
3673 case 5: /* reverse video */ 3883 case 5: /* reverse video */
… …
3684 if (state) /* orthogonal */ 3894 if (state) /* orthogonal */
3685 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3895 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3686 break; 3896 break;
3687#ifdef scrollBar_esc 3897#ifdef scrollBar_esc
3688 case scrollBar_esc: 3898 case scrollBar_esc:
3689 if (scrollbar_mapping (state)) 3899 scrollBar.map (state);
3690 {
3691 resize_all_windows (0, 0, 0); 3900 resize_all_windows (0, 0, 0);
3692 scr_touch (true); 3901 scr_touch (true);
3693 } 3902 break;
3903#endif
3904#ifdef CURSOR_BLINK
3905 case 12:
3906 cursor_blink_reset ();
3694 break; 3907 break;
3695#endif 3908#endif
3696 case 25: /* visible/invisible cursor */ 3909 case 25: /* visible/invisible cursor */
3697 scr_cursor_visible (state); 3910 scr_cursor_visible (state);
3698 break; 3911 break;
… …
3711 case 1003: 3924 case 1003:
3712 if (state) 3925 if (state)
3713 { 3926 {
3714 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3927 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3715 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3928 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3929 mouse_row = mouse_col = 0;
3716 vt_emask_mouse = PointerMotionMask; 3930 vt_emask_mouse = PointerMotionMask;
3717 } 3931 }
3718 else 3932 else
3719 vt_emask_mouse = NoEventMask; 3933 vt_emask_mouse = NoEventMask;
3934
3720 vt_select_input (); 3935 vt_select_input ();
3721 break; 3936 break;
3722 case 1010: /* scroll to bottom on TTY output inhibit */ 3937 case 1010: /* scroll to bottom on TTY output inhibit */
3723 set_option (Opt_scrollTtyOutput, !state); 3938 set_option (Opt_scrollTtyOutput, !state);
3724 break; 3939 break;
3725 case 1011: /* scroll to bottom on key press */ 3940 case 1011: /* scroll to bottom on key press */
3726 set_option (Opt_scrollTtyKeypress, state); 3941 set_option (Opt_scrollTtyKeypress, state);
3727 break; 3942 break;
3728 case 1047: /* secondary screen w/ clearing last */ 3943 case 1047: /* secondary screen w/ clearing last */
3729 if (option (Opt_secondaryScreen)) 3944 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3945 if (!state)
3731 scr_erase_screen (2); 3946 scr_erase_screen (2);
3947
3732 scr_change_screen (state); 3948 scr_change_screen (state);
3733 break; 3949 break;
3734 case 1049: /* secondary screen w/ clearing first */ 3950 case 1049: /* secondary screen w/ clearing first */
3951 if (option (Opt_secondaryScreen))
3952 if (state)
3953 scr_cursor (SAVE);
3954
3735 scr_change_screen (state); 3955 scr_change_screen (state);
3956
3736 if (option (Opt_secondaryScreen)) 3957 if (option (Opt_secondaryScreen))
3737 if (current_screen != PRIMARY) 3958 if (state)
3738 scr_erase_screen (2); 3959 scr_erase_screen (2);
3960 else
3961 scr_cursor (RESTORE);
3739 break; 3962 break;
3740 default: 3963 default:
3741 break; 3964 break;
3742 } 3965 }
3743 } 3966 }
3744} 3967}
3745/*}}} */ 3968/*}}} */
3746 3969
3747/*{{{ process sgr sequences */ 3970/*{{{ process sgr sequences */
3748void 3971void ecb_hot
3749rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3972rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3750{ 3973{
3751 unsigned int i; 3974 unsigned int i;
3752 short rendset; 3975 short rendset;
3753 int rendstyle; 3976 int rendstyle;
… …
3795 //case 19: // ninth alt font 4018 //case 19: // ninth alt font
3796 //case 20: // gothic 4019 //case 20: // gothic
3797 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 4020 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3798 rendset = 0, rendstyle = RS_Bold; 4021 rendset = 0, rendstyle = RS_Bold;
3799 break; 4022 break;
3800 case 22: // normal intensity 4023 case 22: // bold off (vt220)
3801 rendset = 0, rendstyle = RS_Bold; 4024 rendset = 0, rendstyle = RS_Bold;
3802 break; 4025 break;
3803 case 23: // disable italic 4026 case 23: // disable italic
3804 rendset = 0, rendstyle = RS_Italic; 4027 rendset = 0, rendstyle = RS_Italic;
3805 break; 4028 break;
3806 case 24: 4029 case 24: // underline off (vt220)
3807 rendset = 0, rendstyle = RS_Uline; 4030 rendset = 0, rendstyle = RS_Uline;
3808 break; 4031 break;
3809 case 25: 4032 case 25: // blink off (vt220)
3810 rendset = 0, rendstyle = RS_Blink; 4033 rendset = 0, rendstyle = RS_Blink;
3811 break; 4034 break;
3812 case 26: // variable spacing (iso 8613) 4035 case 26: // variable spacing (iso 8613)
3813 rendset = 0, rendstyle = RS_Blink; 4036 rendset = 0, rendstyle = RS_Blink;
3814 break; 4037 break;
3815 case 27: 4038 case 27: // reverse off (vt220)
3816 rendset = 0, rendstyle = RS_RVid; 4039 rendset = 0, rendstyle = RS_RVid;
3817 break; 4040 break;
3818 //case 28: // visible. NYI 4041 //case 28: // visible. NYI
3819 //case 29: // not crossed-out 4042 //case 29: // not crossed-out
3820 } 4043 }
… …
3835 case 35: 4058 case 35:
3836 case 36: 4059 case 36:
3837 case 37: 4060 case 37:
3838 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4061 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3839 break; 4062 break;
3840 case 38: // set fg color, ISO 8613-6
3841 if (nargs > i + 2 && arg[i + 1] == 5)
3842 {
3843 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3844 i += 2;
3845 }
3846 break;
3847 case 39: /* default fg */ 4063 case 39: /* default fg */
3848 scr_color (Color_fg, Color_fg); 4064 scr_color (Color_fg, Color_fg);
3849 break; 4065 break;
3850 4066
3851 case 40: 4067 case 40:
… …
3856 case 45: 4072 case 45:
3857 case 46: 4073 case 46:
3858 case 47: 4074 case 47:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4075 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3860 break; 4076 break;
3861 case 48: // set bg color, ISO 8613-6
3862 if (nargs > i + 2 && arg[i + 1] == 5)
3863 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3865 i += 2;
3866 }
3867 break;
3868 case 49: /* default bg */ 4077 case 49: /* default bg */
3869 scr_color (Color_bg, Color_bg); 4078 scr_color (Color_bg, Color_bg);
4079 break;
4080
4081 case 38: // set fg color, ISO 8613-6
4082 case 48: // set bg color, ISO 8613-6
4083 {
4084 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4085 unsigned int idx;
4086
4087 if (nargs > i + 2 && arg[i + 1] == 5)
4088 {
4089 idx = minCOLOR + arg[i + 2];
4090 i += 2;
4091
4092 scr_color (idx, fgbg);
4093 }
4094 else if (nargs > i + 4 && arg[i + 1] == 2)
4095 {
4096 unsigned int r = arg[i + 2];
4097 unsigned int g = arg[i + 3];
4098 unsigned int b = arg[i + 4];
4099 unsigned int a = 0xff;
4100
4101 idx = map_rgb24_color (r, g, b, a);
4102
4103 i += 4;
4104
4105 scr_color (idx, fgbg);
4106 }
4107 }
3870 break; 4108 break;
3871 4109
3872 //case 50: // not variable spacing 4110 //case 50: // not variable spacing
3873 4111
3874#if !ENABLE_MINIMAL 4112#if !ENABLE_MINIMAL
… …
3894 break; 4132 break;
3895#endif 4133#endif
3896 } 4134 }
3897 } 4135 }
3898} 4136}
4137
4138void
4139rxvt_term::set_cursor_style (int style)
4140{
4141 if (!IN_RANGE_INC (style, 0, 6))
4142 return;
4143
4144 if (style == 0)
4145 style = 1;
4146
4147 cursor_type = (style - 1) / 2;
4148 set_option (Opt_cursorUnderline, cursor_type == 1);
4149
4150#ifdef CURSOR_BLINK
4151 set_option (Opt_cursorBlink, style & 1);
4152 cursor_blink_reset ();
4153#endif
4154
4155 want_refresh = 1;
4156}
3899/*}}} */ 4157/*}}} */
3900 4158
3901/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3902void
3903rxvt_term::process_graphics ()
3904{
3905 unicode_t ch, cmd = cmd_getc ();
3906
3907 if (cmd == 'Q')
3908 {
3909 /* query graphics */
3910 tt_printf ("\033G0\012"); /* no graphics */
3911 return;
3912 }
3913 /* swallow other graphics sequences until terminating ':' */
3914 do
3915 ch = cmd_getc ();
3916 while (ch != ':');
3917}
3918/*}}} */
3919
3920/* ------------------------------------------------------------------------- */ 4159/* ---------------------------------------------------------------------- */
4160/* Write data to the pty as typed by the user, pasted with the mouse,
4161 * or generated by us in response to a query ESC sequence.
4162 */
3921 4163
3922/* 4164/*
3923 * Send printf () formatted output to the command. 4165 * Send printf () formatted output to the command.
3924 * Only use for small amounts of data. 4166 * Only use for small amounts of data.
3925 */ 4167 */
… …
3933 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4175 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3934 va_end (arg_ptr); 4176 va_end (arg_ptr);
3935 tt_write (buf, strlen (buf)); 4177 tt_write (buf, strlen (buf));
3936} 4178}
3937 4179
3938/* ---------------------------------------------------------------------- */
3939/* Write data to the pty as typed by the user, pasted with the mouse, 4180/* Write data to the pty as typed by the user. */
3940 * or generated by us in response to a query ESC sequence. 4181void
3941 */ 4182rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3942const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4183{
4184 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4185 return;
4186
4187 if (option (Opt_scrollTtyKeypress))
4188 if (view_start)
4189 {
4190 view_start = 0;
4191 want_refresh = 1;
4192 }
4193
4194 tt_write_ (data, len);
4195}
3943 4196
3944void 4197void
3945rxvt_term::tt_write (const char *data, unsigned int len) 4198rxvt_term::tt_write (const char *data, unsigned int len)
3946{ 4199{
3947 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4200 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3948 return; 4201 return;
3949 4202
4203 tt_write_ (data, len);
4204}
4205
4206static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4207
4208void
4209rxvt_term::tt_write_ (const char *data, unsigned int len)
4210{
3950 if (pty->pty < 0) 4211 if (pty->pty < 0)
3951 return; 4212 return;
3952 4213
3953 if (v_buflen == 0) 4214 if (v_buflen == 0)
3954 { 4215 {
3955 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4216 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3956 4217
4218 max_it (written, 0);
4219
3957 if ((unsigned int)written == len) 4220 if (written == len)
3958 return; 4221 return;
3959 4222
3960 data += written; 4223 data += written;
3961 len -= written; 4224 len -= written;
3962 } 4225 }
3963 4226
3964 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4227 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3965 4228
3966 memcpy (v_buffer + v_buflen, data, len); 4229 memcpy (v_buffer + v_buflen, data, len);
3967 v_buflen += len; 4230 v_buflen += len;
3968 4231
3969 pty_ev.set (ev::READ | ev::WRITE); 4232 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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