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

Diff Legend

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