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.376 by root, Fri Dec 14 02:08:18 2007 UTC vs.
Revision 1.567 by sf-exg, Sat Sep 12 19:48:26 2015 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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 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
1016/* checks whether a refresh is requested and starts the refresh timer */
1046void 1017void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1018rxvt_term::refresh_check ()
1048{ 1019{
1049 make_current ();
1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1054 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 ();
1055} 1024}
1056 1025
1057void 1026void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1027rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1028{
… …
1063 flush (); 1032 flush ();
1064} 1033}
1065 1034
1066#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1067void 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
1054void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1056{
1070 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1058 want_refresh = 1;
1059 refresh_check ();
1072} 1060}
1073#endif 1061#endif
1074 1062
1075#ifdef TEXT_BLINK 1063#ifdef TEXT_BLINK
1076void 1064void
… …
1078{ 1066{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1067 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1068 {
1081 hidden_text = !hidden_text; 1069 hidden_text = !hidden_text;
1082 want_refresh = 1; 1070 want_refresh = 1;
1071 refresh_check ();
1083 } 1072 }
1084 else 1073 else
1085 w.stop (); 1074 w.stop ();
1086} 1075}
1087#endif 1076#endif
1088 1077
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1079void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1081{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1084 {
1095 want_refresh = 1; 1085 want_refresh = 1;
1086 refresh_check ();
1087 }
1096 else 1088 else
1097 w.stop (); 1089 w.stop ();
1098} 1090}
1099#endif 1091#endif
1100 1092
1101#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1102void 1094void
1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1104{ 1096{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1106 { 1098 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1100 want_refresh = 1;
1101 refresh_check ();
1109 } 1102 }
1110 else 1103 else
1111 w.stop (); 1104 w.stop ();
1112} 1105}
1113#endif 1106#endif
1114 1107
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1109void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1111{
1119 if (mouse_slip_wheel_speed == 0 1112 if (scr_page (mouse_slip_wheel_speed))
1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1121 : scr_page (UP, mouse_slip_wheel_speed))
1122 { 1113 {
1123 if (view_start == top_row || view_start == 0)
1124 mouse_slip_wheel_speed = 0;
1125
1126 want_refresh = 1; 1114 want_refresh = 1;
1115 refresh_check ();
1116 }
1117
1118 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127 } 1119 {
1128 else 1120 mouse_slip_wheel_speed = 0;
1129 w.stop (); 1121 w.stop ();
1122 }
1130} 1123}
1131#endif 1124#endif
1132 1125
1133#if LINUX_YIELD_HACK 1126#if LINUX_YIELD_HACK
1134static struct event_handler 1127static struct event_handler
… …
1139 { 1132 {
1140 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than 1134 // that giving a process calling sched_yield () less cpu time than
1142 // 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
1143 // 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.
1144 1140
1145 struct timespec ts = { 0, 0 }; 1141 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1147 1143
1148 w.stop (); 1144 w.stop ();
1149 } 1145 }
1150 1146
… …
1153 { 1149 {
1154 } 1150 }
1155} event_handler; 1151} event_handler;
1156#endif 1152#endif
1157 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
1158bool 1187bool
1159rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1160{ 1189{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1162 1191
1163 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1193
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1166 n = 0;
1167 } 1195 {
1168 1196 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1197 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1172 1201
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1203
1175 if (r > 0) 1204 if (r > 0)
1176 { 1205 {
1177 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1178 return true; 1207 return true;
… …
1200{ 1229{
1201 make_current (); 1230 make_current ();
1202 1231
1203 if (revents & ev::READ) 1232 if (revents & ev::READ)
1204 // loop, but don't allow a single term to monopolize us 1233 // loop, but don't allow a single term to monopolize us
1205 while (pty_fill ()) 1234 for (int i = CBUFCNT; i-- && pty_fill (); )
1206 if (cmd_parse ()) 1235 cmd_parse ();
1207 break;
1208 1236
1209 if (revents & ev::WRITE) 1237 if (revents & ev::WRITE)
1210 pty_write (); 1238 pty_write ();
1211}
1212 1239
1213void 1240 refresh_check ();
1241}
1242
1243void ecb_cold
1214rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1215{ 1245{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1247 recolor_cursor ();
1218 1248
1219#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1220 hidden_pointer = 0; 1250 hidden_pointer = 0;
1221 1251
1222 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1223 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1224#endif 1254#endif
1225} 1255}
1226 1256
1227#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1228void 1258void ecb_cold
1229rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1230{ 1260{
1231 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1232 return; 1262 return;
1233 1263
… …
1235 XFlush (dpy); 1265 XFlush (dpy);
1236 1266
1237 hidden_pointer = 1; 1267 hidden_pointer = 1;
1238} 1268}
1239 1269
1240void 1270void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1272{
1243 make_current (); 1273 make_current ();
1244 1274
1245 pointer_blank (); 1275 pointer_blank ();
… …
1251{ 1281{
1252 int button_number, key_state = 0; 1282 int button_number, key_state = 0;
1253 int x, y; 1283 int x, y;
1254 int code = 32; 1284 int code = 32;
1255 1285
1256 x = Pixel2Col (ev.x); 1286 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1287 y = Pixel2Row (ev.y) + 1;
1288
1258 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
1259 { 1290 {
1260 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1261 return; 1292 return;
1293
1262 mouse_row = x; 1294 mouse_row = x;
1263 mouse_col = y; 1295 mouse_col = y;
1264 code += 32; 1296 code += 32;
1265 } 1297 }
1266 1298
… …
1269 else 1301 else
1270 { 1302 {
1271 button_number = MEvent.button - Button1; 1303 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1304 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1305 if (button_number >= 3)
1274 button_number += (64 - 3); 1306 button_number += 64 - 3;
1275 } 1307 }
1276 1308
1277 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1278 { 1310 {
1279 /* 1311 /*
… …
1311 fputc ('A', stderr); 1343 fputc ('A', stderr);
1312 if (key_state & 32) 1344 if (key_state & 32)
1313 fputc ('2', stderr); 1345 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1346 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1347 button_number,
1316 x + 1, 1348 x,
1317 y + 1); 1349 y);
1318#endif 1350#endif
1319 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
1320 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1366 code + button_number + key_state,
1322 (32 + x + 1), 1367 32 + x,
1323 (32 + y + 1)); 1368 32 + y);
1324} 1369}
1325 1370
1326/*{{{ process an X event */ 1371/*{{{ process an X event */
1327void 1372void ecb_hot
1328rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1329{ 1374{
1330 make_current (); 1375 make_current ();
1331 1376
1332 dLocal (Display *, dpy); 1377 dLocal (Display *, dpy);
… …
1430 && ev.xfocus.mode != NotifyGrab) 1475 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1476 focus_out ();
1432 break; 1477 break;
1433 1478
1434 case ConfigureNotify: 1479 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1438 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent)
1439 { 1481 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 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 }
1442 1517
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1519 {
1445 seen_resize = 1; 1520 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1522 }
1448 else 1523 else
1449 { 1524 {
1450#ifdef HAVE_BG_PIXMAP 1525#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1526 if (moved)
1452 update_background (); 1527 update_background ();
1453#endif 1528#endif
1454 } 1529 }
1530
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1456 } 1532 }
1457 break; 1533 break;
1458 1534
1459 case PropertyNotify: 1535 case PropertyNotify:
1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1536 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1462 && ev.xproperty.state == PropertyNewValue)
1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464
1465 break; 1537 break;
1466 1538
1467 case SelectionClear: 1539 case SelectionClear:
1468 selection_clear (); 1540 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1469 break;
1470
1471 case SelectionNotify:
1472 if (selection_wait == Sel_normal)
1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1474 break; 1541 break;
1475 1542
1476 case SelectionRequest: 1543 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1478 break; 1545 break;
1479 1546
1480 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
1481 mapped = 1; 1559 mapped = 1;
1482#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1483 text_blink_ev.start (); 1561 text_blink_ev.start ();
1484#endif 1562#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1498 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1499 { 1577 {
1500 do 1578 do
1501 { 1579 {
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1580 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1581 ev.xexpose.width, ev.xexpose.height, false);
1504 } 1582 }
1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1583 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1506 1584
1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1585 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1508 1586
1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1587 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 { 1588 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1513 } 1591 }
1592
1514 want_refresh = 1; 1593 want_refresh = 1;
1515 } 1594 }
1516 else 1595 else
1517 { 1596 {
1518 XEvent unused_event; 1597 XEvent unused_event;
… …
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1599 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1521 ; 1600 ;
1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1523 ; 1602 ;
1524 1603
1525 if (isScrollbarWindow (ev.xany.window)) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1526 { 1605 {
1527 scrollBar.setIdle (); 1606 scrollBar.state = SB_STATE_IDLE;
1528 scrollbar_show (0); 1607 scrollBar.show (0);
1529 } 1608 }
1530 } 1609 }
1531 break; 1610 break;
1532 1611
1533 case MotionNotify: 1612 case MotionNotify:
1534#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1535 if (hidden_pointer) 1614 if (hidden_pointer)
1536 pointer_unblank (); 1615 pointer_unblank ();
1537#endif 1616#endif
1617 if (!bypass_keystate
1538 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1539 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1540 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1622 break;
1543 1623
1544 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1556 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1557 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1558 &ev.xbutton.state); 1638 &ev.xbutton.state);
1559#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1560 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1561 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1562 { 1643 {
1563#endif
1564#if ISO_14755 1644#if ISO_14755
1565 // 5.4 1645 // 5.4
1566 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1567 { 1647 {
1568 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1574 1654
1575#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1576 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1577 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1578 { 1658 {
1659 page_dirn scroll_selection_dir;
1579 int dist; 1660 int dist;
1580 1661
1581 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1582 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1583 */ 1664 */
… …
1598 dist = int_bwidth - ev.xbutton.y; 1679 dist = int_bwidth - ev.xbutton.y;
1599 } 1680 }
1600 else 1681 else
1601 { 1682 {
1602 scroll_selection_dir = DN; 1683 scroll_selection_dir = DN;
1603 dist = ev.xbutton.y - (int_bwidth + height); 1684 dist = ev.xbutton.y - (int_bwidth + vt_height);
1604 } 1685 }
1605 1686
1606 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1607 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1608 + 1; 1689 + 1;
1609 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1610 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1611 } 1693 }
1612 else 1694 else
1613 { 1695 {
1614 /* we are within the text window, so we 1696 /* we are within the text window, so we
1615 * shouldn't be scrolling 1697 * shouldn't be scrolling
1616 */ 1698 */
1617 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1618 } 1700 }
1619#endif 1701#endif
1620#ifdef MOUSE_THRESHOLD
1621 } 1702 }
1622#endif
1623 } 1703 }
1624 } 1704 }
1625 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1626 { 1706 {
1627 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1628 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1629 ; 1709 ;
1630 1710
1631 XQueryPointer (dpy, scrollBar.win, 1711 XQueryPointer (dpy, scrollBar.win,
1632 &unused_root, &unused_child, 1712 &unused_root, &unused_child,
1633 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1634 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1635 &unused_mask); 1715 &unused_mask);
1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1637 scrollbar_size ()); 1717 scrollBar.size ());
1638 want_refresh = 1; 1718 want_refresh = 1;
1639 scrollbar_show (1); 1719 scrollBar.show (1);
1640 } 1720 }
1641 break; 1721 break;
1642 } 1722 }
1643 1723
1644#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1645 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1646 {
1647 if (hidden_cursor)
1648 {
1649 hidden_cursor = 0;
1650 want_refresh = 1;
1651 }
1652
1653 cursor_blink_ev.again (); 1726 cursor_blink_reset ();
1654 }
1655#endif 1727#endif
1656 1728
1657#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1658 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1659 { 1731 {
… …
1665 1737
1666 if (ev.type == KeyPress && hidden_pointer == 0) 1738 if (ev.type == KeyPress && hidden_pointer == 0)
1667 pointer_blank (); 1739 pointer_blank ();
1668 } 1740 }
1669#endif 1741#endif
1670}
1671 1742
1672void 1743 refresh_check ();
1744}
1745
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
1673rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1674{ 1765{
1675 if (!focus) 1766 if (!focus)
1676 { 1767 {
1677 focus = 1; 1768 focus = 1;
1678 want_refresh = 1; 1769 want_refresh = 1;
1679 1770
1680 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1681
1682#if USE_XIM 1771#if USE_XIM
1683 if (Input_Context != NULL) 1772 if (Input_Context != NULL)
1684 { 1773 {
1685 IMSetPosition (); 1774 im_set_position ();
1686 XSetICFocus (Input_Context); 1775 XSetICFocus (Input_Context);
1687 } 1776 }
1688#endif 1777#endif
1689#if CURSOR_BLINK 1778#if CURSOR_BLINK
1690 if (option (Opt_cursorBlink)) 1779 if (option (Opt_cursorBlink))
… …
1692#endif 1781#endif
1693#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1694 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1695 { 1784 {
1696 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1697 scr_recolour (); 1786 scr_recolor ();
1698 } 1787 }
1699#endif 1788#endif
1700#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1701 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1702 { 1791 set_urgency (0);
1703 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1704 {
1705 h->flags &= ~XUrgencyHint;
1706 XSetWMHints (dpy, parent[0], h);
1707 }
1708 }
1709#endif 1792#endif
1710 }
1711}
1712 1793
1713void 1794 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1795 }
1796}
1797
1798void ecb_cold
1714rxvt_term::focus_out () 1799rxvt_term::focus_out ()
1715{ 1800{
1716 if (focus) 1801 if (focus)
1717 { 1802 {
1718 focus = 0; 1803 focus = 0;
1719 want_refresh = 1; 1804 want_refresh = 1;
1720 1805
1721 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1806#if ENABLE_FRILLS
1722 1807 if (option (Opt_urgentOnBell))
1808 set_urgency (0);
1809#endif
1723#if ENABLE_FRILLS || ISO_14755 1810#if ENABLE_FRILLS || ISO_14755
1724 if (iso14755buf) 1811 if (iso14755buf)
1725 { 1812 {
1726 iso14755buf = 0; 1813 iso14755buf = 0;
1727# if ISO_14755 1814# if ISO_14755
… …
1741#endif 1828#endif
1742#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1743 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1744 { 1831 {
1745 pix_colors = pix_colors_unfocused; 1832 pix_colors = pix_colors_unfocused;
1746 scr_recolour (); 1833 scr_recolor ();
1747 } 1834 }
1748#endif 1835#endif
1749 }
1750}
1751 1836
1752void 1837 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1838 }
1839}
1840
1841void ecb_cold
1753rxvt_term::update_fade_color (unsigned int idx) 1842rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1754{ 1843{
1755#if OFF_FOCUS_FADING 1844#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade]) 1845 if (rs[Rs_fade])
1757 { 1846 {
1847 if (!first_time)
1848 pix_colors_focused [idx].free (this);
1849
1758 rgba c; 1850 rgba c;
1759 pix_colors [Color_fade].get (c); 1851 pix_colors [Color_fade].get (c);
1760 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1852 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1761 } 1853 }
1762#endif 1854#endif
1763} 1855}
1764 1856
1765#if ENABLE_TRANSPARENCY || ENABLE_PERL 1857#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1766void 1858void ecb_hot
1767rxvt_term::rootwin_cb (XEvent &ev) 1859rxvt_term::rootwin_cb (XEvent &ev)
1768{ 1860{
1769 make_current (); 1861 make_current ();
1770 1862
1771 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1863 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1772 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1864 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1773 return; 1865 return;
1774 1866
1775# if ENABLE_TRANSPARENCY
1776 switch (ev.type) 1867 switch (ev.type)
1777 { 1868 {
1778 case PropertyNotify: 1869 case PropertyNotify:
1779 /* 1870 /*
1780 * if user used some Esetroot compatible prog to set the root bg, 1871 * if user used some Esetroot compatible prog to set the root bg,
1781 * use the property to determine the pixmap. We use it later on. 1872 * use the property to determine the pixmap. We use it later on.
1782 */ 1873 */
1783 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1874 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1784 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1875 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1785 { 1876 {
1786 bgPixmap.set_root_pixmap (); 1877#if BG_IMAGE_FROM_ROOT
1878 if (option (Opt_transparent))
1879 {
1880 rxvt_img::new_from_root (this)->replace (root_img);
1787 update_background (); 1881 update_background ();
1882 }
1883#endif
1884 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1788 } 1885 }
1886
1789 break; 1887 break;
1790 } 1888 }
1791# endif 1889
1890 refresh_check ();
1792} 1891}
1793#endif 1892#endif
1794 1893
1795void 1894void
1796rxvt_term::button_press (XButtonEvent &ev) 1895rxvt_term::button_press (XButtonEvent &ev)
… …
1817 iso14755_54 (ev.x, ev.y); 1916 iso14755_54 (ev.x, ev.y);
1818 return; 1917 return;
1819 } 1918 }
1820#endif 1919#endif
1821 1920
1822 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1921 clickintime = ev.time - MEvent.time < multiClickTime;
1823 1922
1824 if (reportmode) 1923 if (reportmode)
1825 { 1924 {
1826 /* mouse report from vt window */ 1925 /* mouse report from vt window */
1827 /* save the xbutton state (for ButtonRelease) */ 1926 /* save the xbutton state (for ButtonRelease) */
1828 MEvent.state = ev.state; 1927 MEvent.state = ev.state;
1829#ifdef MOUSE_REPORT_DOUBLECLICK 1928#ifdef MOUSE_REPORT_DOUBLECLICK
1830 if (ev.button == MEvent.button && clickintime) 1929 if (ev.button == MEvent.button && clickintime)
1831 { 1930 {
1832 /* same button, within alloted time */ 1931 /* same button, within allowed time */
1833 MEvent.clicks++; 1932 MEvent.clicks++;
1834 1933
1835 if (MEvent.clicks > 1) 1934 if (MEvent.clicks > 1)
1836 { 1935 {
1837 /* only report double clicks */ 1936 /* only report double clicks */
… …
1909 } 2008 }
1910 2009
1911 /* 2010 /*
1912 * Scrollbar window processing of button press 2011 * Scrollbar window processing of button press
1913 */ 2012 */
1914 if (isScrollbarWindow (ev.window)) 2013 if (scrollBar.state && ev.window == scrollBar.win)
1915 { 2014 {
1916 scrollBar.setIdle (); 2015 page_dirn direction = NO_DIR;
2016
2017 if (scrollBar.upButton (ev.y))
2018 direction = UP; /* up */
2019 else if (scrollBar.dnButton (ev.y))
2020 direction = DN; /* down */
2021
2022 scrollBar.state = SB_STATE_IDLE;
1917 /* 2023 /*
1918 * Rxvt-style scrollbar: 2024 * Rxvt-style scrollbar:
1919 * move up if mouse is above slider 2025 * move up if mouse is above slider
1920 * move dn if mouse is below slider 2026 * move dn if mouse is below slider
1921 * 2027 *
… …
1930 /* 2036 /*
1931 * Mouse report disabled scrollbar: 2037 * Mouse report disabled scrollbar:
1932 * arrow buttons - send up/down 2038 * arrow buttons - send up/down
1933 * click on scrollbar - send pageup/down 2039 * click on scrollbar - send pageup/down
1934 */ 2040 */
1935 if ((scrollBar.style == R_SB_NEXT 2041 if (direction == UP)
1936 && scrollbarnext_upButton (ev.y))
1937 || (scrollBar.style == R_SB_RXVT
1938 && scrollbarrxvt_upButton (ev.y)))
1939 tt_printf ("\033[A"); 2042 tt_printf ("\033[A");
1940 else if ((scrollBar.style == R_SB_NEXT 2043 else if (direction == DN)
1941 && scrollbarnext_dnButton (ev.y))
1942 || (scrollBar.style == R_SB_RXVT
1943 && scrollbarrxvt_dnButton (ev.y)))
1944 tt_printf ("\033[B"); 2044 tt_printf ("\033[B");
1945 else 2045 else
1946 switch (ev.button) 2046 switch (ev.button)
1947 { 2047 {
1948 case Button2: 2048 case Button2:
… …
1956 break; 2056 break;
1957 } 2057 }
1958 } 2058 }
1959 else 2059 else
1960#endif /* NO_SCROLLBAR_REPORT */ 2060#endif /* NO_SCROLLBAR_REPORT */
1961
1962 {
1963 char upordown = 0;
1964
1965 if (scrollBar.style == R_SB_NEXT)
1966 { 2061 {
1967 if (scrollbarnext_upButton (ev.y)) 2062 if (direction != NO_DIR)
1968 upordown = -1; /* up */
1969 else if (scrollbarnext_dnButton (ev.y))
1970 upordown = 1; /* down */
1971 }
1972 else if (scrollBar.style == R_SB_RXVT)
1973 {
1974 if (scrollbarrxvt_upButton (ev.y))
1975 upordown = -1; /* up */
1976 else if (scrollbarrxvt_dnButton (ev.y))
1977 upordown = 1; /* down */
1978 }
1979
1980 if (upordown)
1981 { 2063 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2064#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1983 if (!cont_scroll_ev.is_active ()) 2065 if (!cont_scroll_ev.is_active ())
1984 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2066 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1985#endif 2067#endif
1986 if (scr_page (upordown < 0 ? UP : DN, 1)) 2068 if (scr_page (direction, 1))
1987 { 2069 {
1988 if (upordown < 0) 2070 if (direction == UP)
1989 scrollBar.setUp (); 2071 scrollBar.state = SB_STATE_UP;
1990 else 2072 else
1991 scrollBar.setDn (); 2073 scrollBar.state = SB_STATE_DOWN;
1992 } 2074 }
1993 } 2075 }
1994 else 2076 else
1995 switch (ev.button) 2077 switch (ev.button)
1996 { 2078 {
1997 case Button2: 2079 case Button2:
1998 switch (scrollbar_align) 2080 switch (scrollBar.align)
1999 { 2081 {
2000 case R_SB_ALIGN_TOP: 2082 case SB_ALIGN_TOP:
2001 csrO = 0; 2083 csrO = 0;
2002 break; 2084 break;
2003 case R_SB_ALIGN_CENTRE: 2085 case SB_ALIGN_CENTRE:
2004 csrO = (scrollBar.bot - scrollBar.top) / 2; 2086 csrO = (scrollBar.bot - scrollBar.top) / 2;
2005 break; 2087 break;
2006 case R_SB_ALIGN_BOTTOM: 2088 case SB_ALIGN_BOTTOM:
2007 csrO = scrollBar.bot - scrollBar.top; 2089 csrO = scrollBar.bot - scrollBar.top;
2008 break; 2090 break;
2009 } 2091 }
2010 2092
2011 if (scrollBar.style == R_SB_XTERM 2093 if (scrollBar.style == SB_STYLE_XTERM
2012 || scrollbar_above_slider (ev.y) 2094 || scrollBar.above_slider (ev.y)
2013 || scrollbar_below_slider (ev.y)) 2095 || scrollBar.below_slider (ev.y))
2014 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2096 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2015 2097
2016 scrollBar.setMotion (); 2098 scrollBar.state = SB_STATE_MOTION;
2017 break; 2099 break;
2018 2100
2019 case Button1: 2101 case Button1:
2020 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2102 if (scrollBar.align == SB_ALIGN_CENTRE)
2021 csrO = ev.y - scrollBar.top; 2103 csrO = ev.y - scrollBar.top;
2022 /* FALLTHROUGH */ 2104 /* FALLTHROUGH */
2023 2105
2024 case Button3: 2106 case Button3:
2025 if (scrollBar.style != R_SB_XTERM) 2107 if (scrollBar.style != SB_STYLE_XTERM)
2026 { 2108 {
2027 if (scrollbar_above_slider (ev.y)) 2109 if (scrollBar.above_slider (ev.y))
2028# ifdef RXVT_SCROLL_FULL 2110# ifdef RXVT_SCROLL_FULL
2029 scr_page (UP, nrow - 1); 2111 scr_page (UP, nrow - 1);
2030# else 2112# else
2031 scr_page (UP, nrow / 4); 2113 scr_page (UP, nrow / 4);
2032# endif 2114# endif
2033 else if (scrollbar_below_slider (ev.y)) 2115 else if (scrollBar.below_slider (ev.y))
2034# ifdef RXVT_SCROLL_FULL 2116# ifdef RXVT_SCROLL_FULL
2035 scr_page (DN, nrow - 1); 2117 scr_page (DN, nrow - 1);
2036# else 2118# else
2037 scr_page (DN, nrow / 4); 2119 scr_page (DN, nrow / 4);
2038# endif 2120# endif
2039 else 2121 else
2040 scrollBar.setMotion (); 2122 scrollBar.state = SB_STATE_MOTION;
2041 } 2123 }
2042 else 2124 else
2043 { 2125 {
2044 scr_page ((ev.button == Button1 ? DN : UP), 2126 scr_page ((ev.button == Button1 ? DN : UP),
2045 (nrow 2127 (nrow
2046 * scrollbar_position (ev.y) 2128 * scrollBar.position (ev.y)
2047 / scrollbar_size ())); 2129 / scrollBar.size ()));
2048 } 2130 }
2049 2131
2050 break; 2132 break;
2051 } 2133 }
2052 } 2134 }
… …
2062 2144
2063 csrO = 0; /* reset csr Offset */ 2145 csrO = 0; /* reset csr Offset */
2064 if (!bypass_keystate) 2146 if (!bypass_keystate)
2065 reportmode = !! (priv_modes & PrivMode_mouse_report); 2147 reportmode = !! (priv_modes & PrivMode_mouse_report);
2066 2148
2067 if (scrollbar_isUpDn ()) 2149 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2068 { 2150 {
2069 scrollBar.setIdle (); 2151 scrollBar.state = SB_STATE_IDLE;
2070 scrollbar_show (0); 2152 scrollBar.show (0);
2071 } 2153 }
2072 2154
2073#ifdef SELECTION_SCROLLING 2155#ifdef SELECTION_SCROLLING
2074 sel_scroll_ev.stop(); 2156 sel_scroll_ev.stop();
2075#endif 2157#endif
… …
2094#ifdef MOUSE_REPORT_DOUBLECLICK 2176#ifdef MOUSE_REPORT_DOUBLECLICK
2095 /* only report the release of 'slow' single clicks */ 2177 /* only report the release of 'slow' single clicks */
2096 if (MEvent.button != AnyButton 2178 if (MEvent.button != AnyButton
2097 && (ev.button != MEvent.button 2179 && (ev.button != MEvent.button
2098 || (ev.time - MEvent.time 2180 || (ev.time - MEvent.time
2099 > MULTICLICK_TIME / 2))) 2181 > multiClickTime / 2)))
2100 { 2182 {
2101 MEvent.clicks = 0; 2183 MEvent.clicks = 0;
2102 MEvent.button = AnyButton; 2184 MEvent.button = AnyButton;
2103 mouse_report (ev); 2185 mouse_report (ev);
2104 } 2186 }
… …
2124 case Button3: 2206 case Button3:
2125 selection_make (ev.time); 2207 selection_make (ev.time);
2126 break; 2208 break;
2127 2209
2128 case Button2: 2210 case Button2:
2129 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2211 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2212 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2131 break; 2213 break;
2132 2214
2133#ifdef MOUSE_WHEEL 2215#ifdef MOUSE_WHEEL
2134 case Button4: 2216 case Button4:
2135 case Button5: 2217 case Button5:
2136 { 2218 {
2137 int i; 2219 int lines;
2138 page_dirn v; 2220 page_dirn dirn;
2139 2221
2140 v = ev.button == Button4 ? UP : DN; 2222 dirn = ev.button == Button4 ? UP : DN;
2141 2223
2142 if (ev.state & ShiftMask) 2224 if (ev.state & ShiftMask)
2143 i = 1; 2225 lines = 1;
2144 else if (option (Opt_mouseWheelScrollPage)) 2226 else if (option (Opt_mouseWheelScrollPage))
2145 i = nrow - 1; 2227 lines = nrow - 1;
2146 else 2228 else
2147 i = 5; 2229 lines = 5;
2148 2230
2149# ifdef MOUSE_SLIP_WHEELING 2231# ifdef MOUSE_SLIP_WHEELING
2150 if (ev.state & ControlMask) 2232 if (ev.state & ControlMask)
2151 { 2233 {
2152 mouse_slip_wheel_speed += v ? -1 : 1; 2234 mouse_slip_wheel_speed += dirn;
2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2235 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2155 2236
2156 if (!slip_wheel_ev.is_active ()) 2237 if (!slip_wheel_ev.is_active ())
2157 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2238 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2158 } 2239 }
2159 else 2240 else
2241# endif
2160 { 2242 {
2161# endif
2162 scr_page (v, i); 2243 scr_page (dirn, lines);
2163 scrollbar_show (1); 2244 scrollBar.show (1);
2164# ifdef MOUSE_SLIP_WHEELING
2165 } 2245 }
2166# endif
2167 } 2246 }
2168 break; 2247 break;
2169#endif 2248#endif
2170 } 2249 }
2171 } 2250 }
2172} 2251}
2173 2252
2174/*}}} */ 2253/*}}} */
2175 2254
2176bool 2255void ecb_hot
2177rxvt_term::cmd_parse () 2256rxvt_term::cmd_parse ()
2178{ 2257{
2179 bool flag = false;
2180 wchar_t ch = NOCHAR; 2258 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2259 char *seq_begin; // remember start of esc-sequence here
2182 2260
2183 for (;;) 2261 for (;;)
2184 { 2262 {
2185 if (ch == NOCHAR) 2263 if (ecb_unlikely (ch == NOCHAR))
2186 { 2264 {
2187 seq_begin = cmdbuf_ptr; 2265 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2266 ch = next_char ();
2189 2267
2190 if (ch == NOCHAR) 2268 if (ch == NOCHAR)
2191 break; 2269 break;
2192 } 2270 }
2193 2271
2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2272 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2195 { 2273 {
2196 if (!seen_input) 2274 if (ecb_unlikely (!seen_input))
2197 { 2275 {
2198 seen_input = 1; 2276 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2277 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2278 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2279 // some window managers resize the window early, and these programs
… …
2214 wchar_t *str = buf; 2292 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2293 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2294
2217 for (;;) 2295 for (;;)
2218 { 2296 {
2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2297 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220 break; 2298 break;
2221 2299
2222 *str++ = ch; 2300 *str++ = ch;
2223 2301
2224 if (ch == C0_LF || str >= eol) 2302 if (ecb_unlikely (ch == C0_LF || str >= eol))
2225 { 2303 {
2226 if (ch == C0_LF) 2304 if (ch == C0_LF)
2227 nlines++; 2305 nlines++;
2228 2306
2229 refresh_count++; 2307 refresh_count++;
… …
2278 * What the heck we'll cheat and only refresh less than every page-full. 2356 * What the heck we'll cheat and only refresh less than every page-full.
2279 * if skipScroll is enabled. 2357 * if skipScroll is enabled.
2280 */ 2358 */
2281 if (refreshnow) 2359 if (refreshnow)
2282 { 2360 {
2283 flag = true;
2284 scr_refresh (); 2361 scr_refresh ();
2285 want_refresh = 1; 2362 want_refresh = 1;
2286 } 2363 }
2287
2288 } 2364 }
2289 else 2365 else
2290 { 2366 {
2291 try 2367 try
2292 { 2368 {
… …
2300 } 2376 }
2301 2377
2302 ch = NOCHAR; 2378 ch = NOCHAR;
2303 } 2379 }
2304 } 2380 }
2305
2306 return flag;
2307} 2381}
2308 2382
2309// read the next character 2383// read the next character
2310wchar_t 2384wchar_t ecb_hot
2311rxvt_term::next_char () NOTHROW 2385rxvt_term::next_char () NOTHROW
2312{ 2386{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2387 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2388 {
2315 // assume 7-bit to be ascii ALWAYS 2389 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2390 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2391 return *cmdbuf_ptr++;
2318 2392
2319 wchar_t wc; 2393 wchar_t wc;
2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2394 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321 2395
… …
2325 cmdbuf_ptr = cmdbuf_endp; 2399 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2400 break;
2327 } 2401 }
2328 2402
2329 if (len == (size_t)-1) 2403 if (len == (size_t)-1)
2404 {
2405 mbstate.reset (); // reset now undefined conversion state
2406 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2407 // in which case we "erroneously" return the next byte which might be valid.
2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2408 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2409 }
2331 2410
2332 // assume wchar == unicode 2411 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2412 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2413 return wc & UNICODE_MASK;
2335 } 2414 }
2336 2415
2337 return NOCHAR; 2416 return NOCHAR;
2338} 2417}
2339 2418
2340// read the next octet 2419// read the next octet
2341uint32_t 2420uint32_t ecb_hot
2342rxvt_term::next_octet () NOTHROW 2421rxvt_term::next_octet () NOTHROW
2343{ 2422{
2344 return cmdbuf_ptr < cmdbuf_endp 2423 return cmdbuf_ptr < cmdbuf_endp
2345 ? (unsigned char)*cmdbuf_ptr++ 2424 ? (unsigned char)*cmdbuf_ptr++
2346 : NOCHAR; 2425 : NOCHAR;
2347} 2426}
2348 2427
2349static class out_of_input out_of_input; 2428static class out_of_input out_of_input;
2350 2429
2351/* rxvt_cmd_getc () - Return next input character */ 2430wchar_t ecb_hot
2352/*
2353 * Return the next input character after first passing any keyboard input
2354 * to the command.
2355 */
2356wchar_t
2357rxvt_term::cmd_getc () THROW ((class out_of_input)) 2431rxvt_term::cmd_getc () THROW ((class out_of_input))
2358{ 2432{
2359 wchar_t c = next_char (); 2433 wchar_t c = next_char ();
2360 2434
2361 if (c == NOCHAR) 2435 if (c == NOCHAR)
2362 throw out_of_input; 2436 throw out_of_input;
2363 2437
2364 return c; 2438 return c;
2365} 2439}
2366 2440
2367uint32_t 2441uint32_t ecb_hot
2368rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2442rxvt_term::cmd_get8 () THROW ((class out_of_input))
2369{ 2443{
2370 uint32_t c = next_octet (); 2444 uint32_t c = next_octet ();
2371 2445
2372 if (c == NOCHAR) 2446 if (c == NOCHAR)
… …
2376} 2450}
2377 2451
2378/*{{{ print pipe */ 2452/*{{{ print pipe */
2379/*----------------------------------------------------------------------*/ 2453/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2454#ifdef PRINTPIPE
2381FILE * 2455FILE * ecb_cold
2382rxvt_term::popen_printer () 2456rxvt_term::popen_printer ()
2383{ 2457{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2458 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2459
2386 if (stream == NULL) 2460 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2461 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2462
2389 return stream; 2463 return stream;
2390} 2464}
2391 2465
2392int 2466int ecb_cold
2393rxvt_term::pclose_printer (FILE *stream) 2467rxvt_term::pclose_printer (FILE *stream)
2394{ 2468{
2395 fflush (stream); 2469 fflush (stream);
2396 return pclose (stream); 2470 return pclose (stream);
2397} 2471}
2398 2472
2399/* 2473/*
2400 * simulate attached vt100 printer 2474 * simulate attached vt100 printer
2401 */ 2475 */
2402void 2476void ecb_cold
2403rxvt_term::process_print_pipe () 2477rxvt_term::process_print_pipe ()
2404{ 2478{
2405 int done; 2479 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2480
2408 if ((fd = popen_printer ()) == NULL) 2481 if (!fd)
2409 return; 2482 return;
2410 2483
2411 /* 2484 /*
2412 * Send all input to the printer until either ESC[4i or ESC[?4i 2485 * Send all input to the printer until either ESC[4i or ESC[?4i
2413 * is received. 2486 * is received.
2414 */ 2487 */
2415 for (done = 0; !done;) 2488 for (int done = 0; !done; )
2416 { 2489 {
2417 unsigned char buf[8]; 2490 unsigned char buf[8];
2418 unicode_t ch; 2491 unicode_t ch;
2419 unsigned int i, len; 2492 unsigned int i, len;
2420 2493
… …
2454 pclose_printer (fd); 2527 pclose_printer (fd);
2455} 2528}
2456#endif /* PRINTPIPE */ 2529#endif /* PRINTPIPE */
2457/*}}} */ 2530/*}}} */
2458 2531
2459/* *INDENT-OFF* */
2460enum { 2532enum {
2461 C1_40 = 0x40, 2533 C1_40 = 0x40,
2462 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2534 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2463 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2535 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2464 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2536 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2465 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2537 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2466}; 2538};
2467/* *INDENT-ON* */
2468 2539
2469/*{{{ process non-printing single characters */ 2540/*{{{ process non-printing single characters */
2470void 2541void ecb_hot
2471rxvt_term::process_nonprinting (unicode_t ch) 2542rxvt_term::process_nonprinting (unicode_t ch)
2472{ 2543{
2473 switch (ch) 2544 switch (ch)
2474 { 2545 {
2475 case C0_ESC: 2546 case C0_ESC:
… …
2505 scr_charset_choose (0); 2576 scr_charset_choose (0);
2506 break; 2577 break;
2507 2578
2508#ifdef EIGHT_BIT_CONTROLS 2579#ifdef EIGHT_BIT_CONTROLS
2509 // 8-bit controls 2580 // 8-bit controls
2510 case 0x90: /* DCS */ 2581 case 0x90: /* DCS */
2511 process_dcs_seq (); 2582 process_dcs_seq ();
2512 break; 2583 break;
2513 case 0x9b: /* CSI */ 2584 case 0x9b: /* CSI */
2514 process_csi_seq (); 2585 process_csi_seq ();
2515 break; 2586 break;
2516 case 0x9d: /* OSC */ 2587 case 0x9d: /* OSC */
2517 process_osc_seq (); 2588 process_osc_seq ();
2518 break; 2589 break;
2519#endif 2590#endif
2520 } 2591 }
2521} 2592}
2522/*}}} */ 2593/*}}} */
2523 2594
2524 2595
2525/*{{{ process VT52 escape sequences */ 2596/*{{{ process VT52 escape sequences */
2526void 2597void ecb_cold
2527rxvt_term::process_escape_vt52 (unicode_t ch) 2598rxvt_term::process_escape_vt52 (unicode_t ch)
2528{ 2599{
2529 int row, col; 2600 int row, col;
2530 2601
2531 switch (ch) 2602 switch (ch)
… …
2565 break; 2636 break;
2566 case 'Z': /* identify the terminal type */ 2637 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2638 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2639 break;
2569 case '<': /* turn off VT52 mode */ 2640 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2641 priv_modes &= ~PrivMode_vt52;
2571 break; 2642 break;
2572 case 'F': /* use special graphics character set */ 2643 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2644 case 'G': /* use regular character set */
2574 /* unimplemented */ 2645 /* unimplemented */
2575 break; 2646 break;
… …
2581} 2652}
2582/*}}} */ 2653/*}}} */
2583 2654
2584 2655
2585/*{{{ process escape sequences */ 2656/*{{{ process escape sequences */
2586void 2657void ecb_hot
2587rxvt_term::process_escape_seq () 2658rxvt_term::process_escape_seq ()
2588{ 2659{
2589 unicode_t ch = cmd_getc (); 2660 unicode_t ch = cmd_getc ();
2590 2661
2591 if (priv_modes & PrivMode_vt52) 2662 if (priv_modes & PrivMode_vt52)
… …
2594 return; 2665 return;
2595 } 2666 }
2596 2667
2597 switch (ch) 2668 switch (ch)
2598 { 2669 {
2599 /* case 1: do_tek_mode (); break; */
2600 case '#': 2670 case '#':
2601 if (cmd_getc () == '8') 2671 if (cmd_getc () == '8')
2602 scr_E (); 2672 scr_E ();
2603 break; 2673 break;
2604 case '(': 2674 case '(':
… …
2627#if !ENABLE_MINIMAL 2697#if !ENABLE_MINIMAL
2628 case '9': 2698 case '9':
2629 scr_forwardindex (); 2699 scr_forwardindex ();
2630 break; 2700 break;
2631#endif 2701#endif
2702 // DECPAM/DECPNM
2632 case '=': 2703 case '=':
2704 priv_modes |= PrivMode_aplKP;
2705 break;
2633 case '>': 2706 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2707 priv_modes &= ~PrivMode_aplKP;
2635 break; 2708 break;
2636 2709
2637 case C1_40: 2710 case C1_40:
2638 cmd_getc (); 2711 cmd_getc ();
2639 break; 2712 break;
… …
2643 2716
2644 /* 8.3.87: NEXT LINE */ 2717 /* 8.3.87: NEXT LINE */
2645 case C1_NEL: /* ESC E */ 2718 case C1_NEL: /* ESC E */
2646 { 2719 {
2647 wchar_t nlcr[] = { C0_LF, C0_CR }; 2720 wchar_t nlcr[] = { C0_LF, C0_CR };
2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2721 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2649 } 2722 }
2650 break; 2723 break;
2651 2724
2652 /* kidnapped escape sequence: Should be 8.3.48 */ 2725 /* kidnapped escape sequence: Should be 8.3.48 */
2653 case C1_ESA: /* ESC G */ 2726 case C1_ESA: /* ESC G */
2654 process_graphics (); 2727 // used by original rxvt for rob nations own graphics mode
2728 if (cmd_getc () == 'Q')
2729 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2655 break; 2730 break;
2656 2731
2657 /* 8.3.63: CHARACTER TABULATION SET */ 2732 /* 8.3.63: CHARACTER TABULATION SET */
2658 case C1_HTS: /* ESC H */ 2733 case C1_HTS: /* ESC H */
2659 scr_set_tab (1); 2734 scr_set_tab (1);
… …
2663 case C1_RI: /* ESC M */ 2738 case C1_RI: /* ESC M */
2664 scr_index (DN); 2739 scr_index (DN);
2665 break; 2740 break;
2666 2741
2667 /* 8.3.142: SINGLE-SHIFT TWO */ 2742 /* 8.3.142: SINGLE-SHIFT TWO */
2668 /*case C1_SS2: scr_single_shift (2); break; */ 2743 /* case C1_SS2: break; */
2669 2744
2670 /* 8.3.143: SINGLE-SHIFT THREE */ 2745 /* 8.3.143: SINGLE-SHIFT THREE */
2671 /*case C1_SS3: scr_single_shift (3); break; */ 2746 /* case C1_SS3: break; */
2672 2747
2673 /* 8.3.27: DEVICE CONTROL STRING */ 2748 /* 8.3.27: DEVICE CONTROL STRING */
2674 case C1_DCS: /* ESC P */ 2749 case C1_DCS: /* ESC P */
2675 process_dcs_seq (); 2750 process_dcs_seq ();
2676 break; 2751 break;
… …
2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2753 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679 case C1_SCI: /* ESC Z */ 2754 case C1_SCI: /* ESC Z */
2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2755 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681 break; /* steal obsolete ESC [ c */ 2756 break; /* steal obsolete ESC [ c */
2682 2757
2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2758 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684 case C1_CSI: /* ESC [ */ 2759 case C1_CSI: /* ESC [ */
2685 process_csi_seq (); 2760 process_csi_seq ();
2686 break; 2761 break;
2687 2762
2688 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2763 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689 case C1_OSC: /* ESC ] */ 2764 case C1_OSC: /* ESC ] */
2690 process_osc_seq (); 2765 process_osc_seq ();
2691 break; 2766 break;
2692 2767
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2768 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694 case 'c': 2769 case 'c':
2695 mbstate.reset (); 2770 mbstate.reset ();
2696 scr_poweron (); 2771 scr_poweron ();
2697 scrollbar_show (1); 2772 scrollBar.show (1);
2698 break; 2773 break;
2699 2774
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2775 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2776 case 'n':
2702 scr_charset_choose (2); 2777 scr_charset_choose (2);
… …
2709 } 2784 }
2710} 2785}
2711/*}}} */ 2786/*}}} */
2712 2787
2713/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2788/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2714/* *INDENT-OFF* */
2715enum { 2789enum {
2716 CSI_ICH = 0x40, 2790 CSI_ICH = 0x40,
2717 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2791 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2718 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2792 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2719 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2793 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2722 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2796 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2723 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2797 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2724 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2798 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2725}; 2799};
2726 2800
2727#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2801#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2728 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2802 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2729 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2803 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2730#define get_byte_array_bit(array, bit) \ 2804#define get_byte_array_bit(array, bit) \
2731 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2805 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2732 2806
2733const unsigned char csi_defaults[] = 2807static const unsigned char csi_defaults[] =
2734 { 2808 {
2735 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2809 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2736 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2810 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2737 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2811 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2738 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2812 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2739 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2813 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2740 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2814 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2741 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2815 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2742 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2816 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2743 }; 2817 };
2744/* *INDENT-ON* */
2745 2818
2746void 2819void ecb_hot
2747rxvt_term::process_csi_seq () 2820rxvt_term::process_csi_seq ()
2748{ 2821{
2749 unicode_t ch, priv, i; 2822 unicode_t ch, priv, prev_ch, i;
2750 unsigned int nargs, p; 2823 unsigned int nargs, p;
2751 int n, ndef; 2824 int n, ndef;
2752 int arg[ESC_ARGS] = { }; 2825 int arg[ESC_ARGS] = { };
2753 2826
2754 nargs = 0; 2827 nargs = 0;
2755 2828
2756 priv = 0; 2829 priv = 0;
2757 ch = cmd_getc (); 2830 ch = cmd_getc ();
2758 if (ch >= '<' && ch <= '?') 2831 if ((ch >= '<' && ch <= '?') || ch == '!')
2759 { 2832 {
2760 /* '<' '=' '>' '?' */ 2833 /* '<' '=' '>' '?' '!' */
2761 priv = ch; 2834 priv = ch;
2762 ch = cmd_getc (); 2835 ch = cmd_getc ();
2763 } 2836 }
2764 2837
2838 prev_ch = 0;
2765 /* read any numerical arguments */ 2839 /* read any numerical arguments */
2766 for (n = -1; ch < CSI_ICH; ) 2840 for (n = -1; ch < CSI_ICH; )
2767 { 2841 {
2768 if (isdigit (ch)) 2842 if (isdigit (ch))
2769 { 2843 {
… …
2779 n = -1; 2853 n = -1;
2780 } 2854 }
2781 else if (IS_CONTROL (ch)) 2855 else if (IS_CONTROL (ch))
2782 process_nonprinting (ch); 2856 process_nonprinting (ch);
2783 2857
2858 prev_ch = ch;
2784 ch = cmd_getc (); 2859 ch = cmd_getc ();
2785 } 2860 }
2786 2861
2787 if (ch > CSI_7F) 2862 if (ch > CSI_7F)
2788 return; 2863 return;
… …
2814 // versions. 2889 // versions.
2815 // 2890 //
2816 tt_printf ("\033[>%d;95;0c", 'U'); 2891 tt_printf ("\033[>%d;95;0c", 'U');
2817 } 2892 }
2818 break; 2893 break;
2894
2819 case '?': 2895 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2896 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2897 process_terminal_mode (ch, priv, nargs, arg);
2822 break; 2898 break;
2899
2900 case '!':
2901 if (ch == CSI_70)
2902 {
2903 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2904 scr_soft_reset ();
2905
2906 static const int pm_h[] = { 7, 25 };
2907 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2908
2909 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2910 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2823 } 2911 }
2912 break;
2913 }
2914
2824 return; 2915 return;
2825 } 2916 }
2826 2917
2827 switch (ch) 2918 switch (ch)
2828 { 2919 {
… …
2842 } 2933 }
2843 break; 2934 break;
2844#endif 2935#endif
2845 2936
2846 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2937 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2847 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2938 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2848 arg[0] = -arg[0]; 2939 arg[0] = -arg[0];
2849 /* FALLTHROUGH */ 2940 /* FALLTHROUGH */
2850 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2941 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2851 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2942 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2852 scr_gotorc (arg[0], 0, RELATIVE); 2943 scr_gotorc (arg[0], 0, RELATIVE);
2853 break; 2944 break;
2854 2945
2855 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2946 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2856 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2947 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3006 scr_insert_mode (1); 3097 scr_insert_mode (1);
3007 else if (arg[0] == 20) 3098 else if (arg[0] == 20)
3008 priv_modes |= PrivMode_LFNL; 3099 priv_modes |= PrivMode_LFNL;
3009 break; 3100 break;
3010 3101
3102 case CSI_71: // DECSCUSR: set cursor style
3103 if (prev_ch == ' ')
3104 set_cursor_style (arg[0]);
3105 break;
3106
3011 /* 3107 /*
3012 * PRIVATE USE beyond this point. All CSI_7? sequences here 3108 * PRIVATE USE beyond this point. All CSI_7? sequences here
3013 */ 3109 */
3014 case CSI_72: /* DECSTBM: set top and bottom margins */ 3110 case CSI_72: /* DECSTBM: set top and bottom margins */
3015 if (nargs == 1) 3111 if (nargs == 1)
… …
3043 } 3139 }
3044} 3140}
3045/*}}} */ 3141/*}}} */
3046 3142
3047#if !ENABLE_MINIMAL 3143#if !ENABLE_MINIMAL
3048/* ARGSUSED */
3049void 3144void
3050rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3145rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3051{ 3146{
3052 int x, y; 3147 int x, y;
3053 XWindowAttributes wattr; 3148 XWindowAttributes wattr;
… …
3062 { 3157 {
3063 /* 3158 /*
3064 * commands 3159 * commands
3065 */ 3160 */
3066 case 1: /* deiconify window */ 3161 case 1: /* deiconify window */
3067 XMapWindow (dpy, parent[0]); 3162 XMapWindow (dpy, parent);
3068 break; 3163 break;
3069 case 2: /* iconify window */ 3164 case 2: /* iconify window */
3070 XIconifyWindow (dpy, parent[0], display->screen); 3165 XIconifyWindow (dpy, parent, display->screen);
3071 break; 3166 break;
3072 case 3: /* set position (pixels) */ 3167 case 3: /* set position (pixels) */
3073 XMoveWindow (dpy, parent[0], args[1], args[2]); 3168 XMoveWindow (dpy, parent, args[1], args[2]);
3074 break; 3169 break;
3075 case 4: /* set size (pixels) */ 3170 case 4: /* set size (pixels) */
3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3171 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3077 break; 3172 break;
3078 case 5: /* raise window */ 3173 case 5: /* raise window */
3079 XRaiseWindow (dpy, parent[0]); 3174 XRaiseWindow (dpy, parent);
3080 break; 3175 break;
3081 case 6: /* lower window */ 3176 case 6: /* lower window */
3082 XLowerWindow (dpy, parent[0]); 3177 XLowerWindow (dpy, parent);
3083 break; 3178 break;
3084 case 7: /* refresh window */ 3179 case 7: /* refresh window */
3085 scr_touch (true); 3180 scr_touch (true);
3086 break; 3181 break;
3087 case 8: /* set size (chars) */ 3182 case 8: /* set size (chars) */
… …
3090 break; 3185 break;
3091 3186
3092 //case 9: NYI, TODO, restore maximized window or maximize window 3187 //case 9: NYI, TODO, restore maximized window or maximize window
3093 default: 3188 default:
3094 if (args[0] >= 24) /* set height (chars) */ 3189 if (args[0] >= 24) /* set height (chars) */
3095 set_widthheight ((unsigned int)width, 3190 set_widthheight ((unsigned int)vt_width,
3096 (unsigned int) (args[1] * fheight)); 3191 (unsigned int) (args[1] * fheight));
3097 break; 3192 break;
3098 3193
3099 /* 3194 /*
3100 * reports - some output format copied from XTerm 3195 * reports - some output format copied from XTerm
3101 */ 3196 */
3102 case 11: /* report window state */ 3197 case 11: /* report window state */
3103 XGetWindowAttributes (dpy, parent[0], &wattr); 3198 XGetWindowAttributes (dpy, parent, &wattr);
3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3199 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3105 break; 3200 break;
3106 case 13: /* report window position */ 3201 case 13: /* report window position */
3107 XGetWindowAttributes (dpy, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3108 XTranslateCoordinates (dpy, parent[0], wattr.root, 3203 XTranslateCoordinates (dpy, parent, wattr.root,
3109 -wattr.border_width, -wattr.border_width, 3204 -wattr.border_width, -wattr.border_width,
3110 &x, &y, &wdummy); 3205 &x, &y, &wdummy);
3111 tt_printf ("\033[3;%d;%dt", x, y); 3206 tt_printf ("\033[3;%d;%dt", x, y);
3112 break; 3207 break;
3113 case 14: /* report window size (pixels) */ 3208 case 14: /* report window size (pixels) */
3114 XGetWindowAttributes (dpy, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3210 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3116 break; 3211 break;
3117 case 18: /* report text area size (chars) */ 3212 case 18: /* report text area size (chars) */
3118 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3213 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3119 break; 3214 break;
… …
3121 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3216 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3122 break; 3217 break;
3123 case 20: /* report icon label */ 3218 case 20: /* report icon label */
3124 { 3219 {
3125 char *s; 3220 char *s;
3126 XGetIconName (dpy, parent[0], &s); 3221 XGetIconName (dpy, parent, &s);
3127 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3222 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3128 XFree (s); 3223 XFree (s);
3129 } 3224 }
3130 break; 3225 break;
3131 case 21: /* report window title */ 3226 case 21: /* report window title */
3132 { 3227 {
3133 char *s; 3228 char *s;
3134 XFetchName (dpy, parent[0], &s); 3229 XFetchName (dpy, parent, &s);
3135 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3230 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3136 XFree (s); 3231 XFree (s);
3137 } 3232 }
3138 break; 3233 break;
3139 } 3234 }
… …
3149rxvt_term::get_to_st (unicode_t &ends_how) 3244rxvt_term::get_to_st (unicode_t &ends_how)
3150{ 3245{
3151 unicode_t ch; 3246 unicode_t ch;
3152 bool seen_esc = false; 3247 bool seen_esc = false;
3153 unsigned int n = 0; 3248 unsigned int n = 0;
3154 wchar_t string[STRING_MAX]; 3249 wchar_t string[CBUFSIZ];
3155 3250
3156 while ((ch = cmd_getc ()) != NOCHAR) 3251 while ((ch = cmd_getc ()) != NOCHAR)
3157 { 3252 {
3158 if (seen_esc) 3253 if (seen_esc)
3159 { 3254 {
… …
3174 else if (ch < 0x20) 3269 else if (ch < 0x20)
3175 return NULL; /* other control character - exit */ 3270 return NULL; /* other control character - exit */
3176 3271
3177 seen_esc = false; 3272 seen_esc = false;
3178 3273
3179 if (n >= STRING_MAX - 1) 3274 if (n >= sizeof (string) - 1)
3180 // stop at some sane length 3275 // stop at some sane length
3181 return NULL; 3276 return NULL;
3182 3277
3183 string[n++] = ch; 3278 string[n++] = ch;
3184 } 3279 }
… …
3195 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3290 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3196 */ 3291 */
3197void 3292void
3198rxvt_term::process_dcs_seq () 3293rxvt_term::process_dcs_seq ()
3199{ 3294{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3295 /*
3204 * Not handled yet 3296 * Not handled yet
3205 */ 3297 */
3298
3299 unicode_t eh;
3206 s = get_to_st (eh); 3300 char *s = get_to_st (eh);
3207 if (s) 3301 if (s)
3208 free (s); 3302 free (s);
3209 3303
3210 return; 3304 return;
3211} 3305}
… …
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3309 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3310 */
3217void 3311void
3218rxvt_term::process_osc_seq () 3312rxvt_term::process_osc_seq ()
3219{ 3313{
3220 unicode_t ch, eh;
3221 int arg; 3314 int arg;
3222 3315
3223 ch = cmd_getc (); 3316 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3317 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3318 arg = arg * 10 + (ch - '0');
3226 3319
3227 if (ch == ';') 3320 if (ch == ';')
3228 { 3321 {
3322 unicode_t eh;
3229 char *s = get_to_st (eh); 3323 char *s = get_to_st (eh);
3230 3324
3231 if (s) 3325 if (s)
3232 { 3326 {
3233 process_xterm_seq (arg, s, eh); 3327 process_xterm_seq (arg, s, eh);
… …
3244 rgba c; 3338 rgba c;
3245 pix_colors_focused[color].get (c); 3339 pix_colors_focused[color].get (c);
3246 3340
3247#if XFT 3341#if XFT
3248 if (c.a != rgba::MAX_CC) 3342 if (c.a != rgba::MAX_CC)
3249 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3343 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3250 else 3344 else
3251#endif 3345#endif
3252 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3346 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3253 } 3347 }
3254 else 3348 else
… …
3257 3351
3258/* 3352/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3353 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3354 */
3261void 3355void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3356rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3357{
3264 int color; 3358 int color;
3265 char *buf, *name; 3359 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3360 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3361 int saveop = op;
… …
3294 unsigned long bytes_after; 3388 unsigned long bytes_after;
3295 unsigned char *value = 0; 3389 unsigned char *value = 0;
3296 const char *str = ""; 3390 const char *str = "";
3297 3391
3298 if (prop 3392 if (prop
3299 && XGetWindowProperty (dpy, parent[0], 3393 && XGetWindowProperty (dpy, parent,
3300 prop, 0, 1<<16, 0, AnyPropertyType, 3394 prop, 0, 1<<16, 0, AnyPropertyType,
3301 &actual_type, &actual_format, 3395 &actual_type, &actual_format,
3302 &nitems, &bytes_after, &value) == Success 3396 &nitems, &bytes_after, &value) == Success
3303 && actual_type != None 3397 && actual_type != None
3304 && actual_format == 8) 3398 && actual_format == 8)
3305 str = (const char *)(value); 3399 str = (const char *)(value);
3306 3400
3307 tt_printf ("\033]%d;%s%c", op, str, resp); 3401 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3308 3402
3309 XFree (value); 3403 XFree (value);
3310 } 3404 }
3311 else 3405 else
3312 { 3406 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3407 char *eq = strchr (str, '=');
3314 3408
3315 if (eq) 3409 if (eq)
3316 { 3410 {
3317 *eq = 0; 3411 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3412 set_utf8_property (display->atom (str), eq + 1);
3319 } 3413 }
3320 else 3414 else
3321 XDeleteProperty (dpy, parent[0], 3415 XDeleteProperty (dpy, parent,
3322 display->atom (str)); 3416 display->atom (str));
3323 } 3417 }
3324 break; 3418 break;
3325 3419
3326 case XTerm_Color: 3420 case XTerm_Color:
… …
3339 *buf++ = '\0'; 3433 *buf++ = '\0';
3340 3434
3341 process_color_seq (op, color, name, resp); 3435 process_color_seq (op, color, name, resp);
3342 } 3436 }
3343 break; 3437 break;
3438 case Rxvt_restoreFG:
3344 case XTerm_Color00: 3439 case XTerm_Color00:
3345 process_color_seq (op, Color_fg, str, resp); 3440 process_color_seq (op, Color_fg, str, resp);
3346 break; 3441 break;
3442 case Rxvt_restoreBG:
3347 case XTerm_Color01: 3443 case XTerm_Color01:
3348 process_color_seq (op, Color_bg, str, resp); 3444 process_color_seq (op, Color_bg, str, resp);
3349 break; 3445 break;
3350#ifndef NO_CURSORCOLOR 3446#ifndef NO_CURSORCOLOR
3351 case XTerm_Color_cursor: 3447 case XTerm_Color_cursor:
… …
3356 process_color_seq (op, Color_pointer_fg, str, resp); 3452 process_color_seq (op, Color_pointer_fg, str, resp);
3357 break; 3453 break;
3358 case XTerm_Color_pointer_bg: 3454 case XTerm_Color_pointer_bg:
3359 process_color_seq (op, Color_pointer_bg, str, resp); 3455 process_color_seq (op, Color_pointer_bg, str, resp);
3360 break; 3456 break;
3457#ifdef OPTION_HC
3458 case XTerm_Color_HC:
3459 process_color_seq (op, Color_HC, str, resp);
3460 break;
3461 case XTerm_Color_HTC:
3462 process_color_seq (op, Color_HTC, str, resp);
3463 break;
3464#endif
3361#ifndef NO_BOLD_UNDERLINE_REVERSE 3465#ifndef NO_BOLD_UNDERLINE_REVERSE
3362 case XTerm_Color_RV:
3363 process_color_seq (op, Color_RV, str, resp);
3364 break;
3365 case Rxvt_Color_BD:
3366 case URxvt_Color_BD: 3466 case URxvt_Color_BD:
3367 process_color_seq (op, Color_BD, str, resp); 3467 process_color_seq (op, Color_BD, str, resp);
3368 break; 3468 break;
3369 case Rxvt_Color_UL:
3370 case URxvt_Color_UL: 3469 case URxvt_Color_UL:
3371 process_color_seq (op, Color_UL, str, resp); 3470 process_color_seq (op, Color_UL, str, resp);
3372 break; 3471 break;
3373 case URxvt_Color_IT: 3472 case URxvt_Color_IT:
3374 process_color_seq (op, Color_IT, str, resp); 3473 process_color_seq (op, Color_IT, str, resp);
3375 break; 3474 break;
3376#endif 3475#endif
3377#if ENABLE_TRANSPARENCY 3476 case URxvt_Color_border:
3477 process_color_seq (op, Color_border, str, resp);
3478 break;
3479
3480#if BG_IMAGE_FROM_ROOT
3378 case URxvt_Color_tint: 3481 case URxvt_Color_tint:
3379 process_color_seq (op, Color_tint, str, resp); 3482 process_color_seq (op, Color_tint, str, resp);
3380 { 3483 {
3381 bool changed = false; 3484 bool changed = false;
3485
3382 if (ISSET_PIXCOLOR (Color_tint)) 3486 if (ISSET_PIXCOLOR (Color_tint))
3383 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3487 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3384 else 3488
3385 changed = bgPixmap.unset_tint ();
3386 if (changed) 3489 if (changed)
3387 update_background (); 3490 update_background ();
3388 } 3491 }
3389 3492
3390 break; 3493 break;
… …
3393#if BG_IMAGE_FROM_FILE 3496#if BG_IMAGE_FROM_FILE
3394 case Rxvt_Pixmap: 3497 case Rxvt_Pixmap:
3395 if (!strcmp (str, "?")) 3498 if (!strcmp (str, "?"))
3396 { 3499 {
3397 char str[256]; 3500 char str[256];
3501 int h_scale = fimage.h_scale;
3502 int v_scale = fimage.v_scale;
3503 int h_align = fimage.h_align;
3504 int v_align = fimage.v_align;
3398 3505
3399 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3506 sprintf (str, "[%dx%d+%d+%d]",
3400 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3507 h_scale, v_scale,
3401 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3508 h_align, v_align);
3402 process_xterm_seq (XTerm_title, str, CHAR_ST); 3509 process_xterm_seq (XTerm_title, str, CHAR_ST);
3403 } 3510 }
3404 else 3511 else
3405 { 3512 {
3406 int changed = 0; 3513 bool changed = false;
3407 3514
3408 if (*str != ';') 3515 if (*str != ';')
3409 { 3516 {
3410 /* reset to default scaling :*/ 3517 try
3411 bgPixmap.unset_geometry (); 3518 {
3412 if (bgPixmap.set_file (str)) /* change pixmap */ 3519 fimage.set_file_geometry (this, str);
3413 changed++; 3520 changed = true;
3414 str = strchr (str, ';'); 3521 }
3415 if (str == NULL) 3522 catch (const class rxvt_failure_exception &e)
3416 bgPixmap.set_defaultGeometry (); 3523 {
3524 }
3417 } 3525 }
3418 while (str) 3526 else
3419 { 3527 {
3420 str++; 3528 str++;
3421 if (bgPixmap.set_geometry (str)) 3529 if (fimage.set_geometry (str, true))
3422 changed++; 3530 changed = true;
3423 str = strchr (str, ';');
3424 } 3531 }
3532
3425 if (changed) 3533 if (changed)
3534 {
3535 if (bg_window_position_sensitive ())
3536 {
3537 int x, y;
3538 get_window_origin (x, y);
3539 parent_x = x;
3540 parent_y = y;
3541 }
3426 update_background (); 3542 update_background ();
3543 }
3427 } 3544 }
3428 break; 3545 break;
3429#endif 3546#endif
3430
3431 case Rxvt_restoreFG:
3432 set_window_color (Color_fg, str);
3433 break;
3434 case Rxvt_restoreBG:
3435 set_window_color (Color_bg, str);
3436 break;
3437 3547
3438 case XTerm_logfile: 3548 case XTerm_logfile:
3439 // TODO, when secure mode? 3549 // TODO, when secure mode?
3440 break; 3550 break;
3441 3551
… …
3508 break; 3618 break;
3509#endif 3619#endif
3510 3620
3511#if ENABLE_PERL 3621#if ENABLE_PERL
3512 case URxvt_perl: 3622 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3623 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514 ; // no responses yet
3515 break; 3624 break;
3516#endif 3625#endif
3517 } 3626 }
3518} 3627}
3519/*----------------------------------------------------------------------*/ 3628/*----------------------------------------------------------------------*/
… …
3526 * 's' = save 3635 * 's' = save
3527 * 'r' = restore 3636 * 'r' = restore
3528 * 't' = toggle 3637 * 't' = toggle
3529 * so no need for fancy checking 3638 * so no need for fancy checking
3530 */ 3639 */
3531int 3640int ecb_cold
3532rxvt_term::privcases (int mode, unsigned long bit) 3641rxvt_term::privcases (int mode, unsigned long bit)
3533{ 3642{
3534 int state; 3643 int state;
3535 3644
3536 if (mode == 's') 3645 if (mode == 's')
3537 { 3646 {
3538 SavedModes |= (priv_modes & bit); 3647 if (priv_modes & bit)
3648 SavedModes |= bit;
3649 else
3650 SavedModes &= ~bit;
3539 return -1; 3651 return -1;
3540 } 3652 }
3541 else 3653 else
3542 { 3654 {
3543 if (mode == 'r') 3655 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3656 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3657 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3658 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3659
3660 if (state)
3661 priv_modes |= bit;
3662 else
3663 priv_modes &= ~bit;
3548 } 3664 }
3549 3665
3550 return state; 3666 return state;
3551} 3667}
3552 3668
3553/* we're not using priv _yet_ */ 3669/* we're not using priv _yet_ */
3554void 3670void
3555rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3671rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3556{ 3672{
3557 unsigned int i, j; 3673 unsigned int i, j;
3558 int state; 3674 int state;
3559 3675
3560 static const struct 3676 static const struct
3561 { 3677 {
3562 const int argval; 3678 const int argval;
3563 const unsigned long bit; 3679 const unsigned long bit;
3564 } argtopriv[] = { 3680 } argtopriv[] = {
3565 { 1, PrivMode_aplCUR }, 3681 { 1, PrivMode_aplCUR }, // DECCKM
3566 { 2, PrivMode_vt52 }, 3682 { 2, PrivMode_vt52 }, // DECANM
3567 { 3, PrivMode_132 }, 3683 { 3, PrivMode_132 }, // DECCOLM
3568 { 4, PrivMode_smoothScroll }, 3684 { 4, PrivMode_smoothScroll }, // DECSCLM
3569 { 5, PrivMode_rVideo }, 3685 { 5, PrivMode_rVideo }, // DECSCNM
3570 { 6, PrivMode_relOrigin }, 3686 { 6, PrivMode_relOrigin }, // DECOM
3571 { 7, PrivMode_Autowrap }, 3687 { 7, PrivMode_Autowrap }, // DECAWM
3572 // 8, bi-directional support mode 3688 // 8, auto-repeat keys // DECARM
3573 { 9, PrivMode_MouseX10 }, 3689 { 9, PrivMode_MouseX10 },
3574 // 18, 19 printing-related
3575 { 25, PrivMode_VisibleCursor }, 3690 { 12, PrivMode_BlinkingCursor },
3691 // 18 end FF to printer after print screen
3692 // 19 Print screen prints full screen/scroll region
3693 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3576#ifdef scrollBar_esc 3694#ifdef scrollBar_esc
3577 { scrollBar_esc, PrivMode_scrollBar }, 3695 { scrollBar_esc, PrivMode_scrollBar },
3578#endif 3696#endif
3579 { 35, PrivMode_ShiftKeys }, // rxvt extension 3697 { 35, PrivMode_ShiftKeys }, // rxvt extension
3698 // 38, tektronix mode // DECTEK
3580 { 40, PrivMode_132OK }, 3699 { 40, PrivMode_132OK },
3581 // 41 xterm more fixes NYI 3700 // 41 xterm more fixes NYI
3582 // 45 margin bell NYI 3701 // 45 margin bell NYI
3583 // 46 start logging 3702 // 46 start logging
3584 { 47, PrivMode_Screen }, 3703 { 47, PrivMode_Screen },
3585 { 66, PrivMode_aplKP }, 3704 { 66, PrivMode_aplKP }, // DECNKM
3586#ifndef NO_BACKSPACE_KEY 3705#ifndef NO_BACKSPACE_KEY
3587 { 67, PrivMode_BackSpace }, 3706 { 67, PrivMode_BackSpace }, // DECBKM
3588#endif 3707#endif
3589 { 1000, PrivMode_MouseX11 }, 3708 { 1000, PrivMode_MouseX11 },
3590 { 1002, PrivMode_MouseBtnEvent }, 3709 { 1002, PrivMode_MouseBtnEvent },
3591 { 1003, PrivMode_MouseAnyEvent }, 3710 { 1003, PrivMode_MouseAnyEvent },
3711#if ENABLE_FRILLS
3712 { 1005, PrivMode_ExtModeMouse },
3713#endif
3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3714 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3593 { 1011, PrivMode_Keypress }, // rxvt extension 3715 { 1011, PrivMode_Keypress }, // rxvt extension
3716#if ENABLE_FRILLS
3717 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3718#endif
3594 // 1035 enable modifiers for alt, numlock NYI 3719 // 1035 enable modifiers for alt, numlock NYI
3595 // 1036 send ESC for meta keys NYI 3720 // 1036 send ESC for meta keys NYI
3596 // 1037 send DEL for keypad delete NYI 3721 // 1037 send DEL for keypad delete NYI
3597 { 1047, PrivMode_Screen }, 3722 { 1047, PrivMode_Screen },
3598 // 1048 save and restore cursor 3723 // 1048 save and restore cursor, implemented in code
3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3724 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3725 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3726 { 2004, PrivMode_BracketPaste },
3601 }; 3727 };
3602 3728
3603 if (nargs == 0) 3729 if (nargs == 0)
3604 return; 3730 return;
3605 3731
… …
3612 for (i = 0; i < nargs; i++) 3738 for (i = 0; i < nargs; i++)
3613 { 3739 {
3614 state = -1; 3740 state = -1;
3615 3741
3616 /* basic handling */ 3742 /* basic handling */
3617 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3743 for (j = 0; j < ecb_array_length (argtopriv); j++)
3618 if (argtopriv[j].argval == arg[i]) 3744 if (argtopriv[j].argval == arg[i])
3619 { 3745 {
3620 state = privcases (mode, argtopriv[j].bit); 3746 state = privcases (mode, argtopriv[j].bit);
3621 break; 3747 break;
3622 } 3748 }
… …
3630 3756
3631 scr_touch (true); 3757 scr_touch (true);
3632 break; 3758 break;
3633#endif 3759#endif
3634 case 1048: /* alternative cursor save */ 3760 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3761 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3762 if (mode == 0)
3638 scr_cursor (RESTORE); 3763 scr_cursor (RESTORE);
3639 else if (mode == 1) 3764 else if (mode == 1)
3640 scr_cursor (SAVE); 3765 scr_cursor (SAVE);
… …
3649 case 2: /* VT52 mode */ 3774 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3775 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3776 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3777 * within VT52 mode
3653 */ 3778 */
3654 PrivMode (1, PrivMode_vt52); 3779 priv_modes |= PrivMode_vt52;
3655 break; 3780 break;
3656 case 3: /* 80/132 */ 3781 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3782 if (priv_modes & PrivMode_132OK)
3658 set_widthheight (((state ? 132 : 80) * fwidth), height); 3783 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3659 break; 3784 break;
3660 case 4: /* smooth scrolling */ 3785 case 4: /* smooth scrolling */
3661 set_option (Opt_jumpScroll, !state); 3786 set_option (Opt_jumpScroll, !state);
3662 break; 3787 break;
3663 case 5: /* reverse video */ 3788 case 5: /* reverse video */
… …
3674 if (state) /* orthogonal */ 3799 if (state) /* orthogonal */
3675 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3800 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3676 break; 3801 break;
3677#ifdef scrollBar_esc 3802#ifdef scrollBar_esc
3678 case scrollBar_esc: 3803 case scrollBar_esc:
3679 if (scrollbar_mapping (state)) 3804 scrollBar.map (state);
3680 {
3681 resize_all_windows (0, 0, 0); 3805 resize_all_windows (0, 0, 0);
3682 scr_touch (true); 3806 scr_touch (true);
3683 } 3807 break;
3808#endif
3809#ifdef CURSOR_BLINK
3810 case 12:
3811 cursor_blink_reset ();
3684 break; 3812 break;
3685#endif 3813#endif
3686 case 25: /* visible/invisible cursor */ 3814 case 25: /* visible/invisible cursor */
3687 scr_cursor_visible (state); 3815 scr_cursor_visible (state);
3688 break; 3816 break;
… …
3701 case 1003: 3829 case 1003:
3702 if (state) 3830 if (state)
3703 { 3831 {
3704 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3832 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3705 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3833 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3834 mouse_row = mouse_col = 0;
3706 vt_emask_mouse = PointerMotionMask; 3835 vt_emask_mouse = PointerMotionMask;
3707 } 3836 }
3708 else 3837 else
3709 vt_emask_mouse = NoEventMask; 3838 vt_emask_mouse = NoEventMask;
3839
3710 vt_select_input (); 3840 vt_select_input ();
3711 break; 3841 break;
3712 case 1010: /* scroll to bottom on TTY output inhibit */ 3842 case 1010: /* scroll to bottom on TTY output inhibit */
3713 set_option (Opt_scrollTtyOutput, !state); 3843 set_option (Opt_scrollTtyOutput, !state);
3714 break; 3844 break;
3715 case 1011: /* scroll to bottom on key press */ 3845 case 1011: /* scroll to bottom on key press */
3716 set_option (Opt_scrollTtyKeypress, state); 3846 set_option (Opt_scrollTtyKeypress, state);
3717 break; 3847 break;
3718 case 1047: /* secondary screen w/ clearing last */ 3848 case 1047: /* secondary screen w/ clearing last */
3719 if (option (Opt_secondaryScreen)) 3849 if (option (Opt_secondaryScreen))
3720 if (current_screen != PRIMARY) 3850 if (!state)
3721 scr_erase_screen (2); 3851 scr_erase_screen (2);
3852
3722 scr_change_screen (state); 3853 scr_change_screen (state);
3723 break; 3854 break;
3724 case 1049: /* secondary screen w/ clearing first */ 3855 case 1049: /* secondary screen w/ clearing first */
3856 if (option (Opt_secondaryScreen))
3857 if (state)
3858 scr_cursor (SAVE);
3859
3725 scr_change_screen (state); 3860 scr_change_screen (state);
3861
3726 if (option (Opt_secondaryScreen)) 3862 if (option (Opt_secondaryScreen))
3727 if (current_screen != PRIMARY) 3863 if (state)
3728 scr_erase_screen (2); 3864 scr_erase_screen (2);
3865 else
3866 scr_cursor (RESTORE);
3729 break; 3867 break;
3730 default: 3868 default:
3731 break; 3869 break;
3732 } 3870 }
3733 } 3871 }
3734} 3872}
3735/*}}} */ 3873/*}}} */
3736 3874
3737/*{{{ process sgr sequences */ 3875/*{{{ process sgr sequences */
3738void 3876void ecb_hot
3739rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3877rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3740{ 3878{
3741 unsigned int i; 3879 unsigned int i;
3742 short rendset; 3880 short rendset;
3743 int rendstyle; 3881 int rendstyle;
… …
3785 //case 19: // ninth alt font 3923 //case 19: // ninth alt font
3786 //case 20: // gothic 3924 //case 20: // gothic
3787 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3925 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3788 rendset = 0, rendstyle = RS_Bold; 3926 rendset = 0, rendstyle = RS_Bold;
3789 break; 3927 break;
3790 case 22: // normal intensity 3928 case 22: // bold off (vt220)
3791 rendset = 0, rendstyle = RS_Bold; 3929 rendset = 0, rendstyle = RS_Bold;
3792 break; 3930 break;
3793 case 23: // disable italic 3931 case 23: // disable italic
3794 rendset = 0, rendstyle = RS_Italic; 3932 rendset = 0, rendstyle = RS_Italic;
3795 break; 3933 break;
3796 case 24: 3934 case 24: // underline off (vt220)
3797 rendset = 0, rendstyle = RS_Uline; 3935 rendset = 0, rendstyle = RS_Uline;
3798 break; 3936 break;
3799 case 25: 3937 case 25: // blink off (vt220)
3800 rendset = 0, rendstyle = RS_Blink; 3938 rendset = 0, rendstyle = RS_Blink;
3801 break; 3939 break;
3802 case 26: // variable spacing (iso 8613) 3940 case 26: // variable spacing (iso 8613)
3803 rendset = 0, rendstyle = RS_Blink; 3941 rendset = 0, rendstyle = RS_Blink;
3804 break; 3942 break;
3805 case 27: 3943 case 27: // reverse off (vt220)
3806 rendset = 0, rendstyle = RS_RVid; 3944 rendset = 0, rendstyle = RS_RVid;
3807 break; 3945 break;
3808 //case 28: // visible. NYI 3946 //case 28: // visible. NYI
3809 //case 29: // not crossed-out 3947 //case 29: // not crossed-out
3810 } 3948 }
… …
3884 break; 4022 break;
3885#endif 4023#endif
3886 } 4024 }
3887 } 4025 }
3888} 4026}
4027
4028void
4029rxvt_term::set_cursor_style (int style)
4030{
4031 if (!IN_RANGE_INC (style, 0, 6))
4032 return;
4033
4034 if (style == 0)
4035 style = 1;
4036
4037 cursor_type = (style - 1) / 2;
4038 set_option (Opt_cursorUnderline, cursor_type == 1);
4039
4040#ifdef CURSOR_BLINK
4041 set_option (Opt_cursorBlink, style & 1);
4042 cursor_blink_reset ();
4043#endif
4044
4045 want_refresh = 1;
4046}
3889/*}}} */ 4047/*}}} */
3890 4048
3891/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3892void
3893rxvt_term::process_graphics ()
3894{
3895 unicode_t ch, cmd = cmd_getc ();
3896
3897 if (cmd == 'Q')
3898 {
3899 /* query graphics */
3900 tt_printf ("\033G0\012"); /* no graphics */
3901 return;
3902 }
3903 /* swallow other graphics sequences until terminating ':' */
3904 do
3905 ch = cmd_getc ();
3906 while (ch != ':');
3907}
3908/*}}} */
3909
3910/* ------------------------------------------------------------------------- */ 4049/* ---------------------------------------------------------------------- */
4050/* Write data to the pty as typed by the user, pasted with the mouse,
4051 * or generated by us in response to a query ESC sequence.
4052 */
3911 4053
3912/* 4054/*
3913 * Send printf () formatted output to the command. 4055 * Send printf () formatted output to the command.
3914 * Only use for small amounts of data. 4056 * Only use for small amounts of data.
3915 */ 4057 */
… …
3923 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4065 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3924 va_end (arg_ptr); 4066 va_end (arg_ptr);
3925 tt_write (buf, strlen (buf)); 4067 tt_write (buf, strlen (buf));
3926} 4068}
3927 4069
3928/* ---------------------------------------------------------------------- */
3929/* Write data to the pty as typed by the user, pasted with the mouse, 4070/* Write data to the pty as typed by the user. */
3930 * or generated by us in response to a query ESC sequence. 4071void
3931 */ 4072rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3932const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4073{
4074 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4075 return;
4076
4077 if (option (Opt_scrollTtyKeypress))
4078 if (view_start)
4079 {
4080 view_start = 0;
4081 want_refresh = 1;
4082 }
4083
4084 tt_write_ (data, len);
4085}
3933 4086
3934void 4087void
3935rxvt_term::tt_write (const char *data, unsigned int len) 4088rxvt_term::tt_write (const char *data, unsigned int len)
3936{ 4089{
3937 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4090 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3938 return; 4091 return;
3939 4092
4093 tt_write_ (data, len);
4094}
4095
4096static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4097
4098void
4099rxvt_term::tt_write_ (const char *data, unsigned int len)
4100{
3940 if (pty->pty < 0) 4101 if (pty->pty < 0)
3941 return; 4102 return;
3942 4103
3943 if (v_buflen == 0) 4104 if (v_buflen == 0)
3944 { 4105 {
3945 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4106 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3946 4107
4108 max_it (written, 0);
4109
3947 if ((unsigned int)written == len) 4110 if (written == len)
3948 return; 4111 return;
3949 4112
3950 data += written; 4113 data += written;
3951 len -= written; 4114 len -= written;
3952 } 4115 }
3953 4116
3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4117 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3955 4118
3956 memcpy (v_buffer + v_buflen, data, len); 4119 memcpy (v_buffer + v_buflen, data, len);
3957 v_buflen += len; 4120 v_buflen += len;
3958 4121
3959 pty_ev.set (ev::READ | ev::WRITE); 4122 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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