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.345 by sasha, Mon Aug 13 22:41:34 2007 UTC vs.
Revision 1.581 by root, Tue Jul 5 16:42:21 2016 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-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)
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_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)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 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",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 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);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 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);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284int 291static int ecb_cold
285rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303void 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
304rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
305{ 409{
306 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
307 unsigned int newlen; 411 KeySym keysym = NoSymbol;
308 KeySym keysym;
309 int valid_keysym;
310 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
311 414
312#if ISO_14755 415#if ISO_14755
313 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
314 return; 417 return;
315#endif 418#endif
… …
322 */ 425 */
323 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
326 429
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332
333 kbuf[0] = 0; 430 kbuf[0] = 0;
334 431
335#ifdef USE_XIM 432#if USE_XIM
336 if (Input_Context) 433 if (Input_Context)
337 { 434 {
338 Status status_return; 435 Status status_return;
339 436
340#if 0 437#if 0
… …
378 } 475 }
379 } 476 }
380 else 477 else
381 len = 0; 478 len = 0;
382 } 479 }
383
384 valid_keysym = status_return == XLookupKeySym
385 || status_return == XLookupBoth;
386 } 480 }
387 else 481 else
388#endif 482#endif
389 { 483 {
390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
391 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
392 } 488 {
489 KeySym orig_keysym = keysym;
393 490
394 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)
395 { 704 {
396#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
398 return; 707 return;
399#endif 708#endif
400 709
401 if (saveLines) 710 if (saveLines)
402 { 711 {
… …
411#ifdef PAGING_CONTEXT_LINES 720#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 721 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 722#else
414 lnsppg = nrow * 4 / 5; 723 lnsppg = nrow * 4 / 5;
415#endif 724#endif
725 max_it (lnsppg, 1);
726
416 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
417 { 728 {
418 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
419 return; 730 return;
420 } 731 }
421 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
422 { 733 {
423 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
424 return; 735 return;
425 } 736 }
426 } 737 }
427#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
428 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
429 { 740 {
430 if (keysym == XK_Up) 741 if (keysym == XK_Up)
431 { 742 {
432 scr_page (UP, 1); 743 scr_page (1);
433 return; 744 return;
434 } 745 }
435 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
436 { 747 {
437 scr_page (DN, 1); 748 scr_page (-1);
438 return; 749 return;
439 } 750 }
440 } 751 }
441#endif 752#endif
442#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
443 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
444 { 755 {
445 if (keysym == XK_Home) 756 if (keysym == XK_Home)
446 { 757 {
447 scr_move_to (0, 1); 758 scr_changeview (top_row);
448 return; 759 return;
449 } 760 }
450 else if (keysym == XK_End) 761 else if (keysym == XK_End)
451 { 762 {
452 scr_move_to (1, 1); 763 scr_changeview (0);
453 return; 764 return;
454 } 765 }
455 } 766 }
456#endif 767#endif
457 } 768 }
458 769
459 if (shft) 770 if (shft)
460 { 771 {
461 /* Shift + F1 - F10 generates F11 - F20 */
462 if (keysym >= XK_F1 && keysym <= XK_F10)
463 {
464 keysym += (XK_F11 - XK_F1);
465 shft = 0; /* turn off Shift */
466 }
467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
468 { 773 {
469 switch (keysym) 774 switch (keysym)
470 { 775 {
471 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
472 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
473 selection_request (ev.time); 778 selection_request (ev.time);
474 return; 779 return;
475#if TODO 780#if TODO
476 /* rxvt extras */ 781 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 783 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 785 return;
483#endif 786#endif
484 } 787 }
485 } 788 }
486 } 789 }
487 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
488#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 807 // ISO 14755 support
490 if (shft && ctrl) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 809 {
492 int hv; 810 int hv;
493 811
494 if (iso14755buf & ISO_14755_51 812 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 813 && (keysym == XK_space || keysym == XK_KP_Space
… …
525 scr_overlay_off (); 843 scr_overlay_off ();
526# endif 844# endif
527 iso14755buf = 0; 845 iso14755buf = 0;
528 } 846 }
529 } 847 }
848 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 849 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 850 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 851 if (!(iso14755buf & ISO_14755_STARTED))
533 { 852 {
534 iso14755buf |= ISO_14755_STARTED; 853 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755 854# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 855 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
544 { 863 {
545 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
546 return; 865 return;
547 } 866 }
548#endif 867#endif
549
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 {
552 {
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, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent)
1481 { 1481 {
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1483 ;
1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 bool moved = false;
1488#ifdef HAVE_BG_PIXMAP
1489 if (bg_window_position_sensitive ())
1490 {
1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1495#endif
1496
1497 if (want_position_change)
1498 {
1499 int x, y;
1500
1501 if (ev.xconfigure.send_event)
1502 {
1503 x = ev.xconfigure.x;
1504 y = ev.xconfigure.y;
1505 }
1506 else
1507 get_window_origin (x, y);
1508
1509 if (x != parent_x || y != parent_y)
1510 {
1511 parent_x = x;
1512 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1515 }
1516 }
1484 1517
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1519 {
1487 seen_resize = 1; 1520 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1521 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492 {
1493 bgPixmap.render ();
1494 scr_touch (true);
1495 }
1496#endif
1497 } 1522 }
1523 else
1524 {
1525#ifdef HAVE_BG_PIXMAP
1526 if (moved)
1527 update_background ();
1528#endif
1529 }
1498 1530
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501#ifdef ENABLE_TRANSPARENCY
1502 if (option (Opt_transparent))
1503 bgPixmap.render ();
1504#endif
1505 } 1532 }
1506 break; 1533 break;
1507 1534
1508 case PropertyNotify: 1535 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1536 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1511 && ev.xproperty.state == PropertyNewValue)
1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1513
1514 break; 1537 break;
1515 1538
1516 case SelectionClear: 1539 case SelectionClear:
1517 selection_clear (); 1540 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1518 break;
1519
1520 case SelectionNotify:
1521 if (selection_wait == Sel_normal)
1522 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1523 break; 1541 break;
1524 1542
1525 case SelectionRequest: 1543 case SelectionRequest:
1526 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1527 break; 1545 break;
1528 1546
1529 case MapNotify: 1547 case MapNotify:
1548#ifdef HAVE_BG_PIXMAP
1549 // This is needed at startup for the case of no window manager
1550 // or a non-reparenting window manager and also because we
1551 // defer bg image updates if the window is not mapped. The
1552 // short delay is to optimize for multiple ConfigureNotify
1553 // events at startup when the window manager reparents the
1554 // window, so as to perform the computation after we have
1555 // received all of them.
1556 if (bg_img == 0)
1557 update_background_ev.start (0.025);
1558#endif
1530 mapped = 1; 1559 mapped = 1;
1531#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1532 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1561 text_blink_ev.start ();
1533#endif 1562#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1535 break; 1564 break;
1536 1565
1537 case UnmapNotify: 1566 case UnmapNotify:
… …
1539#ifdef TEXT_BLINK 1568#ifdef TEXT_BLINK
1540 text_blink_ev.stop (); 1569 text_blink_ev.stop ();
1541#endif 1570#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1571 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 break; 1572 break;
1544
1545#ifdef ENABLE_TRANSPARENCY
1546 case ReparentNotify:
1547 rootwin_cb (ev);
1548 break;
1549#endif /* ENABLE_TRANSPARENCY */
1550 1573
1551 case GraphicsExpose: 1574 case GraphicsExpose:
1552 case Expose: 1575 case Expose:
1553 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1554 { 1577 {
1555 do 1578 do
1579 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1580 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1581 ev.xexpose.width, ev.xexpose.height, false);
1582 }
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1583 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1559 1584
1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1585 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561 1586
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1587 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1588 {
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1591 }
1565 1592
1566 want_refresh = 1; 1593 want_refresh = 1;
1567 } 1594 }
1568 else 1595 else
1569 { 1596 {
… …
1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1599 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1573 ; 1600 ;
1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1575 ; 1602 ;
1576 1603
1577 if (isScrollbarWindow (ev.xany.window)) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1578 { 1605 {
1579 scrollBar.setIdle (); 1606 scrollBar.state = SB_STATE_IDLE;
1580 scrollbar_show (0); 1607 scrollBar.show (0);
1581 } 1608 }
1582 } 1609 }
1583 break; 1610 break;
1584 1611
1585 case MotionNotify: 1612 case MotionNotify:
1586#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1587 if (hidden_pointer) 1614 if (hidden_pointer)
1588 pointer_unblank (); 1615 pointer_unblank ();
1589#endif 1616#endif
1617 if (!bypass_keystate
1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1619 || priv_modes & PrivMode_MouseAnyEvent))
1620 mouse_report (ev.xbutton);
1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1591 break; 1622 break;
1592 1623
1593 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
1594 { 1625 {
… …
1605 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1606 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1607 &ev.xbutton.state); 1638 &ev.xbutton.state);
1608#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1609 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1610 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1611 { 1643 {
1612#endif
1613#if ISO_14755 1644#if ISO_14755
1614 // 5.4 1645 // 5.4
1615 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1616 { 1647 {
1617 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1623 1654
1624#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1625 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1626 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1627 { 1658 {
1659 page_dirn scroll_selection_dir;
1628 int dist; 1660 int dist;
1629 1661
1630 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1631 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1632 */ 1664 */
1633 if (!sel_scroll_ev.active) 1665 if (!sel_scroll_ev.is_active ())
1634 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1666 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1635 1667
1636 /* save the event params so we can highlight 1668 /* save the event params so we can highlight
1637 * the selection in the pending-scroll loop 1669 * the selection in the pending-scroll loop
1638 */ 1670 */
1639 selection_save_x = ev.xbutton.x; 1671 selection_save_x = ev.xbutton.x;
… …
1647 dist = int_bwidth - ev.xbutton.y; 1679 dist = int_bwidth - ev.xbutton.y;
1648 } 1680 }
1649 else 1681 else
1650 { 1682 {
1651 scroll_selection_dir = DN; 1683 scroll_selection_dir = DN;
1652 dist = ev.xbutton.y - (int_bwidth + height); 1684 dist = ev.xbutton.y - (int_bwidth + vt_height);
1653 } 1685 }
1654 1686
1655 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1656 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1657 + 1; 1689 + 1;
1658 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1659 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1660 } 1693 }
1661 else 1694 else
1662 { 1695 {
1663 /* we are within the text window, so we 1696 /* we are within the text window, so we
1664 * shouldn't be scrolling 1697 * shouldn't be scrolling
1665 */ 1698 */
1666 if (sel_scroll_ev.active)
1667 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1668 } 1700 }
1669#endif 1701#endif
1670#ifdef MOUSE_THRESHOLD
1671 } 1702 }
1672#endif
1673 } 1703 }
1674 } 1704 }
1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1676 { 1706 {
1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1678 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1679 ; 1709 ;
1680 1710
1681 XQueryPointer (dpy, scrollBar.win, 1711 XQueryPointer (dpy, scrollBar.win,
1682 &unused_root, &unused_child, 1712 &unused_root, &unused_child,
1683 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1684 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1685 &unused_mask); 1715 &unused_mask);
1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1687 scrollbar_size ()); 1717 scrollBar.size ());
1688 want_refresh = 1; 1718 want_refresh = 1;
1689 scrollbar_show (1); 1719 scrollBar.show (1);
1690 } 1720 }
1691 break; 1721 break;
1692 } 1722 }
1693 1723
1694#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1695 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1696 { 1726 cursor_blink_reset ();
1697 if (hidden_cursor)
1698 {
1699 hidden_cursor = 0;
1700 want_refresh = 1;
1701 }
1702
1703 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1704 }
1705#endif 1727#endif
1706 1728
1707#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1709 { 1731 {
… …
1715 1737
1716 if (ev.type == KeyPress && hidden_pointer == 0) 1738 if (ev.type == KeyPress && hidden_pointer == 0)
1717 pointer_blank (); 1739 pointer_blank ();
1718 } 1740 }
1719#endif 1741#endif
1720}
1721 1742
1722void 1743 refresh_check ();
1744}
1745
1746#if ENABLE_FRILLS
1747void ecb_cold
1748rxvt_term::set_urgency (bool enable)
1749{
1750 if (enable == urgency_hint)
1751 return;
1752
1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1754 {
1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1756 XSetWMHints (dpy, parent, h);
1757 urgency_hint = enable;
1758 XFree (h);
1759 }
1760}
1761#endif
1762
1763void ecb_cold
1723rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1724{ 1765{
1725 if (!focus) 1766 if (!focus)
1726 { 1767 {
1727 focus = 1; 1768 focus = 1;
1728 want_refresh = 1; 1769 want_refresh = 1;
1729 1770
1730 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1731
1732#if USE_XIM 1771#if USE_XIM
1733 if (Input_Context != NULL) 1772 if (Input_Context != NULL)
1734 { 1773 {
1735 IMSetPosition (); 1774 im_set_position ();
1736 XSetICFocus (Input_Context); 1775 XSetICFocus (Input_Context);
1737 } 1776 }
1738#endif 1777#endif
1739#if CURSOR_BLINK 1778#if CURSOR_BLINK
1740 if (option (Opt_cursorBlink)) 1779 if (option (Opt_cursorBlink))
1741 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1780 cursor_blink_ev.again ();
1742#endif 1781#endif
1743#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1744 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1745 { 1784 {
1746 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1747 scr_recolour (); 1786 scr_recolor ();
1748 } 1787 }
1749#endif 1788#endif
1750#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1751 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1752 { 1791 set_urgency (0);
1753 XWMHints *h;
1754 1792
1755 h = XGetWMHints(dpy, parent[0]); 1793 if (priv_modes & PrivMode_FocusEvent)
1756 if (h != NULL) 1794 tt_printf ("\x1b[I");
1757 {
1758 h->flags &= ~XUrgencyHint;
1759 XSetWMHints(dpy, parent[0], h);
1760 }
1761 }
1762#endif 1795#endif
1763 }
1764}
1765 1796
1766void 1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1798 }
1799}
1800
1801void ecb_cold
1767rxvt_term::focus_out () 1802rxvt_term::focus_out ()
1768{ 1803{
1769 if (focus) 1804 if (focus)
1770 { 1805 {
1771 focus = 0; 1806 focus = 0;
1772 want_refresh = 1; 1807 want_refresh = 1;
1773 1808
1774 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1809#if ENABLE_FRILLS
1810 if (option (Opt_urgentOnBell))
1811 set_urgency (0);
1775 1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1815#endif
1776#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1777 if (iso14755buf) 1817 if (iso14755buf)
1778 { 1818 {
1779 iso14755buf = 0; 1819 iso14755buf = 0;
1780# if ISO_14755 1820# if ISO_14755
… …
1787 XUnsetICFocus (Input_Context); 1827 XUnsetICFocus (Input_Context);
1788#endif 1828#endif
1789#if CURSOR_BLINK 1829#if CURSOR_BLINK
1790 if (option (Opt_cursorBlink)) 1830 if (option (Opt_cursorBlink))
1791 cursor_blink_ev.stop (); 1831 cursor_blink_ev.stop ();
1832
1792 hidden_cursor = 0; 1833 hidden_cursor = 0;
1793#endif 1834#endif
1794#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1796 { 1837 {
1797 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1798 scr_recolour (); 1839 scr_recolor ();
1799 } 1840 }
1800#endif 1841#endif
1801 }
1802}
1803 1842
1804void 1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1844 }
1845}
1846
1847void ecb_cold
1805rxvt_term::update_fade_color (unsigned int idx) 1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1806{ 1849{
1807#if OFF_FOCUS_FADING 1850#if OFF_FOCUS_FADING
1808 if (rs[Rs_fade]) 1851 if (rs[Rs_fade])
1809 { 1852 {
1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1855
1810 rgba c; 1856 rgba c;
1811 pix_colors [Color_fade].get (c); 1857 pix_colors [Color_fade].get (c);
1812 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1813 } 1859 }
1814#endif 1860#endif
1815} 1861}
1816 1862
1817#if ENABLE_TRANSPARENCY || ENABLE_PERL 1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1818void 1864void ecb_hot
1819rxvt_term::rootwin_cb (XEvent &ev) 1865rxvt_term::rootwin_cb (XEvent &ev)
1820{ 1866{
1821 make_current (); 1867 make_current ();
1822 1868
1823 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1869 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1824 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1870 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1825 return; 1871 return;
1826 1872
1827# if ENABLE_TRANSPARENCY
1828 switch (ev.type) 1873 switch (ev.type)
1829 { 1874 {
1830 case PropertyNotify: 1875 case PropertyNotify:
1831 /* 1876 /*
1832 * if user used some Esetroot compatible prog to set the root bg, 1877 * if user used some Esetroot compatible prog to set the root bg,
1833 * use the property to determine the pixmap. We use it later on. 1878 * use the property to determine the pixmap. We use it later on.
1834 */ 1879 */
1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1837 { 1882 {
1838 bgPixmap.set_root_pixmap (); 1883#if BG_IMAGE_FROM_ROOT
1839 bgPixmap.render (); 1884 if (option (Opt_transparent))
1885 {
1886 rxvt_img::new_from_root (this)->replace (root_img);
1887 update_background ();
1888 }
1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1840 } 1891 }
1892
1841 break; 1893 break;
1842 } 1894 }
1843# endif 1895
1896 refresh_check ();
1844} 1897}
1845#endif 1898#endif
1846 1899
1847void 1900void
1848rxvt_term::button_press (XButtonEvent &ev) 1901rxvt_term::button_press (XButtonEvent &ev)
… …
1869 iso14755_54 (ev.x, ev.y); 1922 iso14755_54 (ev.x, ev.y);
1870 return; 1923 return;
1871 } 1924 }
1872#endif 1925#endif
1873 1926
1874 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1927 clickintime = ev.time - MEvent.time < multiClickTime;
1875 1928
1876 if (reportmode) 1929 if (reportmode)
1877 { 1930 {
1878 /* mouse report from vt window */ 1931 /* mouse report from vt window */
1879 /* save the xbutton state (for ButtonRelease) */ 1932 /* save the xbutton state (for ButtonRelease) */
1880 MEvent.state = ev.state; 1933 MEvent.state = ev.state;
1881#ifdef MOUSE_REPORT_DOUBLECLICK 1934#ifdef MOUSE_REPORT_DOUBLECLICK
1882 if (ev.button == MEvent.button && clickintime) 1935 if (ev.button == MEvent.button && clickintime)
1883 { 1936 {
1884 /* same button, within alloted time */ 1937 /* same button, within allowed time */
1885 MEvent.clicks++; 1938 MEvent.clicks++;
1886 1939
1887 if (MEvent.clicks > 1) 1940 if (MEvent.clicks > 1)
1888 { 1941 {
1889 /* only report double clicks */ 1942 /* only report double clicks */
… …
1903 mouse_report (ev); 1956 mouse_report (ev);
1904 } 1957 }
1905#else 1958#else
1906 MEvent.button = ev.button; 1959 MEvent.button = ev.button;
1907 mouse_report (ev); 1960 mouse_report (ev);
1908#endif /* MOUSE_REPORT_DOUBLECLICK */ 1961#endif /* MOUSE_REPORT_DOUBLECLICK */
1909 1962
1910 } 1963 }
1911 else 1964 else
1912 { 1965 {
1913 if (ev.button != MEvent.button) 1966 if (ev.button != MEvent.button)
… …
1961 } 2014 }
1962 2015
1963 /* 2016 /*
1964 * Scrollbar window processing of button press 2017 * Scrollbar window processing of button press
1965 */ 2018 */
1966 if (isScrollbarWindow (ev.window)) 2019 if (scrollBar.state && ev.window == scrollBar.win)
1967 { 2020 {
1968 scrollBar.setIdle (); 2021 page_dirn direction = NO_DIR;
2022
2023 if (scrollBar.upButton (ev.y))
2024 direction = UP; /* up */
2025 else if (scrollBar.dnButton (ev.y))
2026 direction = DN; /* down */
2027
2028 scrollBar.state = SB_STATE_IDLE;
1969 /* 2029 /*
1970 * Rxvt-style scrollbar: 2030 * Rxvt-style scrollbar:
1971 * move up if mouse is above slider 2031 * move up if mouse is above slider
1972 * move dn if mouse is below slider 2032 * move dn if mouse is below slider
1973 * 2033 *
… …
1982 /* 2042 /*
1983 * Mouse report disabled scrollbar: 2043 * Mouse report disabled scrollbar:
1984 * arrow buttons - send up/down 2044 * arrow buttons - send up/down
1985 * click on scrollbar - send pageup/down 2045 * click on scrollbar - send pageup/down
1986 */ 2046 */
1987 if ((scrollBar.style == R_SB_NEXT 2047 if (direction == UP)
1988 && scrollbarnext_upButton (ev.y))
1989 || (scrollBar.style == R_SB_RXVT
1990 && scrollbarrxvt_upButton (ev.y)))
1991 tt_printf ("\033[A"); 2048 tt_printf ("\033[A");
1992 else if ((scrollBar.style == R_SB_NEXT 2049 else if (direction == DN)
1993 && scrollbarnext_dnButton (ev.y))
1994 || (scrollBar.style == R_SB_RXVT
1995 && scrollbarrxvt_dnButton (ev.y)))
1996 tt_printf ("\033[B"); 2050 tt_printf ("\033[B");
1997 else 2051 else
1998 switch (ev.button) 2052 switch (ev.button)
1999 { 2053 {
2000 case Button2: 2054 case Button2:
… …
2007 tt_printf ("\033[5~"); 2061 tt_printf ("\033[5~");
2008 break; 2062 break;
2009 } 2063 }
2010 } 2064 }
2011 else 2065 else
2012#endif /* NO_SCROLLBAR_REPORT */ 2066#endif /* NO_SCROLLBAR_REPORT */
2013
2014 {
2015 char upordown = 0;
2016
2017 if (scrollBar.style == R_SB_NEXT)
2018 { 2067 {
2019 if (scrollbarnext_upButton (ev.y)) 2068 if (direction != NO_DIR)
2020 upordown = -1; /* up */
2021 else if (scrollbarnext_dnButton (ev.y))
2022 upordown = 1; /* down */
2023 }
2024 else if (scrollBar.style == R_SB_RXVT)
2025 {
2026 if (scrollbarrxvt_upButton (ev.y))
2027 upordown = -1; /* up */
2028 else if (scrollbarrxvt_dnButton (ev.y))
2029 upordown = 1; /* down */
2030 }
2031 if (upordown)
2032 { 2069 {
2033#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2071 if (!cont_scroll_ev.is_active ())
2034 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2072 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2035#endif 2073#endif
2036 if (scr_page (upordown < 0 ? UP : DN, 1)) 2074 if (scr_page (direction, 1))
2037 { 2075 {
2038 if (upordown < 0) 2076 if (direction == UP)
2039 scrollBar.setUp (); 2077 scrollBar.state = SB_STATE_UP;
2040 else 2078 else
2041 scrollBar.setDn (); 2079 scrollBar.state = SB_STATE_DOWN;
2042 } 2080 }
2043 } 2081 }
2044 else 2082 else
2045 switch (ev.button) 2083 switch (ev.button)
2046 { 2084 {
2047 case Button2: 2085 case Button2:
2048 switch (scrollbar_align) 2086 switch (scrollBar.align)
2049 { 2087 {
2050 case R_SB_ALIGN_TOP: 2088 case SB_ALIGN_TOP:
2051 csrO = 0; 2089 csrO = 0;
2052 break; 2090 break;
2053 case R_SB_ALIGN_CENTRE: 2091 case SB_ALIGN_CENTRE:
2054 csrO = (scrollBar.bot - scrollBar.top) / 2; 2092 csrO = (scrollBar.bot - scrollBar.top) / 2;
2055 break; 2093 break;
2056 case R_SB_ALIGN_BOTTOM: 2094 case SB_ALIGN_BOTTOM:
2057 csrO = scrollBar.bot - scrollBar.top; 2095 csrO = scrollBar.bot - scrollBar.top;
2058 break; 2096 break;
2059 } 2097 }
2060 2098
2061 if (scrollBar.style == R_SB_XTERM 2099 if (scrollBar.style == SB_STYLE_XTERM
2062 || scrollbar_above_slider (ev.y) 2100 || scrollBar.above_slider (ev.y)
2063 || scrollbar_below_slider (ev.y)) 2101 || scrollBar.below_slider (ev.y))
2064 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2102 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2065 2103
2066 scrollBar.setMotion (); 2104 scrollBar.state = SB_STATE_MOTION;
2067 break; 2105 break;
2068 2106
2069 case Button1: 2107 case Button1:
2070 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2108 if (scrollBar.align == SB_ALIGN_CENTRE)
2071 csrO = ev.y - scrollBar.top; 2109 csrO = ev.y - scrollBar.top;
2072 /* FALLTHROUGH */ 2110 /* FALLTHROUGH */
2073 2111
2074 case Button3: 2112 case Button3:
2075 if (scrollBar.style != R_SB_XTERM) 2113 if (scrollBar.style != SB_STYLE_XTERM)
2076 { 2114 {
2077 if (scrollbar_above_slider (ev.y)) 2115 if (scrollBar.above_slider (ev.y))
2078# ifdef RXVT_SCROLL_FULL 2116# ifdef RXVT_SCROLL_FULL
2079 scr_page (UP, nrow - 1); 2117 scr_page (UP, nrow - 1);
2080# else 2118# else
2081 scr_page (UP, nrow / 4); 2119 scr_page (UP, nrow / 4);
2082# endif 2120# endif
2083 else if (scrollbar_below_slider (ev.y)) 2121 else if (scrollBar.below_slider (ev.y))
2084# ifdef RXVT_SCROLL_FULL 2122# ifdef RXVT_SCROLL_FULL
2085 scr_page (DN, nrow - 1); 2123 scr_page (DN, nrow - 1);
2086# else 2124# else
2087 scr_page (DN, nrow / 4); 2125 scr_page (DN, nrow / 4);
2088# endif 2126# endif
2089 else 2127 else
2090 scrollBar.setMotion (); 2128 scrollBar.state = SB_STATE_MOTION;
2091 } 2129 }
2092 else 2130 else
2093 { 2131 {
2094 scr_page ((ev.button == Button1 ? DN : UP), 2132 scr_page ((ev.button == Button1 ? DN : UP),
2095 (nrow 2133 (nrow
2096 * scrollbar_position (ev.y) 2134 * scrollBar.position (ev.y)
2097 / scrollbar_size ())); 2135 / scrollBar.size ()));
2098 } 2136 }
2099 2137
2100 break; 2138 break;
2101 } 2139 }
2102 } 2140 }
… …
2112 2150
2113 csrO = 0; /* reset csr Offset */ 2151 csrO = 0; /* reset csr Offset */
2114 if (!bypass_keystate) 2152 if (!bypass_keystate)
2115 reportmode = !! (priv_modes & PrivMode_mouse_report); 2153 reportmode = !! (priv_modes & PrivMode_mouse_report);
2116 2154
2117 if (scrollbar_isUpDn ()) 2155 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2118 { 2156 {
2119 scrollBar.setIdle (); 2157 scrollBar.state = SB_STATE_IDLE;
2120 scrollbar_show (0); 2158 scrollBar.show (0);
2121 } 2159 }
2122 2160
2123#ifdef SELECTION_SCROLLING 2161#ifdef SELECTION_SCROLLING
2124 if (sel_scroll_ev.active)
2125 sel_scroll_ev.stop(); 2162 sel_scroll_ev.stop();
2126#endif 2163#endif
2127 2164
2128 if (ev.window == vt) 2165 if (ev.window == vt)
2129 { 2166 {
2130 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2167 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2145#ifdef MOUSE_REPORT_DOUBLECLICK 2182#ifdef MOUSE_REPORT_DOUBLECLICK
2146 /* only report the release of 'slow' single clicks */ 2183 /* only report the release of 'slow' single clicks */
2147 if (MEvent.button != AnyButton 2184 if (MEvent.button != AnyButton
2148 && (ev.button != MEvent.button 2185 && (ev.button != MEvent.button
2149 || (ev.time - MEvent.time 2186 || (ev.time - MEvent.time
2150 > MULTICLICK_TIME / 2))) 2187 > multiClickTime / 2)))
2151 { 2188 {
2152 MEvent.clicks = 0; 2189 MEvent.clicks = 0;
2153 MEvent.button = AnyButton; 2190 MEvent.button = AnyButton;
2154 mouse_report (ev); 2191 mouse_report (ev);
2155 } 2192 }
2156#else /* MOUSE_REPORT_DOUBLECLICK */ 2193#else /* MOUSE_REPORT_DOUBLECLICK */
2157 MEvent.button = AnyButton; 2194 MEvent.button = AnyButton;
2158 mouse_report (ev); 2195 mouse_report (ev);
2159#endif /* MOUSE_REPORT_DOUBLECLICK */ 2196#endif /* MOUSE_REPORT_DOUBLECLICK */
2160 return; 2197 return;
2161 } 2198 }
2162 2199
2163 /* 2200 /*
2164 * dumb hack to compensate for the failure of click-and-drag 2201 * dumb hack to compensate for the failure of click-and-drag
… …
2175 case Button3: 2212 case Button3:
2176 selection_make (ev.time); 2213 selection_make (ev.time);
2177 break; 2214 break;
2178 2215
2179 case Button2: 2216 case Button2:
2180 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2217 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2181 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2218 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2182 break; 2219 break;
2183 2220
2184#ifdef MOUSE_WHEEL 2221#ifdef MOUSE_WHEEL
2185 case Button4: 2222 case Button4:
2186 case Button5: 2223 case Button5:
2187 { 2224 {
2188 int i; 2225 int lines;
2189 page_dirn v; 2226 page_dirn dirn;
2190 2227
2191 v = ev.button == Button4 ? UP : DN; 2228 dirn = ev.button == Button4 ? UP : DN;
2192 2229
2193 if (ev.state & ShiftMask) 2230 if (ev.state & ShiftMask)
2194 i = 1; 2231 lines = 1;
2195 else if (option (Opt_mouseWheelScrollPage)) 2232 else if (option (Opt_mouseWheelScrollPage))
2196 i = nrow - 1; 2233 lines = nrow - 1;
2197 else 2234 else
2198 i = 5; 2235 lines = 5;
2199 2236
2200# ifdef MOUSE_SLIP_WHEELING 2237# ifdef MOUSE_SLIP_WHEELING
2201 if (ev.state & ControlMask) 2238 if (ev.state & ControlMask)
2202 { 2239 {
2203 mouse_slip_wheel_speed += v ? -1 : 1; 2240 mouse_slip_wheel_speed += dirn;
2204 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2241 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2205 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2206 2242
2207 if (slip_wheel_ev.at < NOW) 2243 if (!slip_wheel_ev.is_active ())
2208 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2244 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2209
2210 slip_wheel_ev.start ();
2211 } 2245 }
2212 else 2246 else
2247# endif
2213 { 2248 {
2214# endif
2215 scr_page (v, i); 2249 scr_page (dirn, lines);
2216 scrollbar_show (1); 2250 scrollBar.show (1);
2217# ifdef MOUSE_SLIP_WHEELING
2218 } 2251 }
2219# endif
2220 } 2252 }
2221 break; 2253 break;
2222#endif 2254#endif
2223 } 2255 }
2224 } 2256 }
2225} 2257}
2226 2258
2227/*}}} */ 2259/*}}} */
2228 2260
2229bool 2261void ecb_hot
2230rxvt_term::cmd_parse () 2262rxvt_term::cmd_parse ()
2231{ 2263{
2232 bool flag = false;
2233 wchar_t ch = NOCHAR; 2264 wchar_t ch = NOCHAR;
2234 char *seq_begin; // remember start of esc-sequence here 2265 char *seq_begin; // remember start of esc-sequence here
2235 2266
2236 for (;;) 2267 for (;;)
2237 { 2268 {
2238 if (ch == NOCHAR) 2269 if (ecb_unlikely (ch == NOCHAR))
2239 { 2270 {
2240 seq_begin = cmdbuf_ptr; 2271 seq_begin = cmdbuf_ptr;
2241 ch = next_char (); 2272 ch = next_char ();
2242 2273
2243 if (ch == NOCHAR) 2274 if (ch == NOCHAR)
2244 break; 2275 break;
2245 } 2276 }
2246 2277
2247 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2278 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2248 { 2279 {
2249 if (!seen_input) 2280 if (ecb_unlikely (!seen_input))
2250 { 2281 {
2251 seen_input = 1; 2282 seen_input = 1;
2252 // many badly-written programs (e.g. jed) contain a race condition: 2283 // many badly-written programs (e.g. jed) contain a race condition:
2253 // they first read the screensize and then install a SIGWINCH handler. 2284 // they first read the screensize and then install a SIGWINCH handler.
2254 // some window managers resize the window early, and these programs 2285 // some window managers resize the window early, and these programs
… …
2267 wchar_t *str = buf; 2298 wchar_t *str = buf;
2268 wchar_t *eol = str + min (ncol, UBUFSIZ); 2299 wchar_t *eol = str + min (ncol, UBUFSIZ);
2269 2300
2270 for (;;) 2301 for (;;)
2271 { 2302 {
2272 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2303 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2273 break; 2304 break;
2274 2305
2275 *str++ = ch; 2306 *str++ = ch;
2276 2307
2277 if (ch == C0_LF || str >= eol) 2308 if (ecb_unlikely (ch == C0_LF || str >= eol))
2278 { 2309 {
2279 if (ch == C0_LF) 2310 if (ch == C0_LF)
2280 nlines++; 2311 nlines++;
2281 2312
2282 refresh_count++; 2313 refresh_count++;
2283 2314
2284 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2315 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2285 { 2316 {
2286 refresh_count = 0; 2317 refresh_count = 0;
2287 2318
2288 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2319 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2289 { 2320 {
2290 refreshnow = true; 2321 refreshnow = true;
2291 ch = NOCHAR; 2322 ch = NOCHAR;
2292 break; 2323 break;
2293 } 2324 }
… …
2331 * What the heck we'll cheat and only refresh less than every page-full. 2362 * What the heck we'll cheat and only refresh less than every page-full.
2332 * if skipScroll is enabled. 2363 * if skipScroll is enabled.
2333 */ 2364 */
2334 if (refreshnow) 2365 if (refreshnow)
2335 { 2366 {
2336 flag = true;
2337 scr_refresh (); 2367 scr_refresh ();
2338 want_refresh = 1; 2368 want_refresh = 1;
2339 } 2369 }
2340
2341 } 2370 }
2342 else 2371 else
2343 { 2372 {
2344 try 2373 try
2345 { 2374 {
… …
2353 } 2382 }
2354 2383
2355 ch = NOCHAR; 2384 ch = NOCHAR;
2356 } 2385 }
2357 } 2386 }
2358
2359 return flag;
2360} 2387}
2361 2388
2362// read the next character 2389// read the next character
2363wchar_t 2390wchar_t ecb_hot
2364rxvt_term::next_char () NOTHROW 2391rxvt_term::next_char () NOTHROW
2365{ 2392{
2366 while (cmdbuf_ptr < cmdbuf_endp) 2393 while (cmdbuf_ptr < cmdbuf_endp)
2367 { 2394 {
2368 // assume 7-bit to be ascii ALWAYS 2395 // assume 7-bit to be ascii ALWAYS
2369 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2396 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2370 return *cmdbuf_ptr++; 2397 return *cmdbuf_ptr++;
2371 2398
2372 wchar_t wc; 2399 wchar_t wc;
2373 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2400 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2374 2401
… …
2378 cmdbuf_ptr = cmdbuf_endp; 2405 cmdbuf_ptr = cmdbuf_endp;
2379 break; 2406 break;
2380 } 2407 }
2381 2408
2382 if (len == (size_t)-1) 2409 if (len == (size_t)-1)
2410 {
2411 mbstate.reset (); // reset now undefined conversion state
2412 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2413 // in which case we "erroneously" return the next byte which might be valid.
2383 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2414 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2415 }
2384 2416
2385 // assume wchar == unicode 2417 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2418 cmdbuf_ptr += len;
2387 return wc & UNICODE_MASK; 2419 return wc & UNICODE_MASK;
2388 } 2420 }
2389 2421
2390 return NOCHAR; 2422 return NOCHAR;
2391} 2423}
2392 2424
2393// read the next octet 2425// read the next octet
2394uint32_t 2426uint32_t ecb_hot
2395rxvt_term::next_octet () NOTHROW 2427rxvt_term::next_octet () NOTHROW
2396{ 2428{
2397 return cmdbuf_ptr < cmdbuf_endp 2429 return cmdbuf_ptr < cmdbuf_endp
2398 ? (unsigned char)*cmdbuf_ptr++ 2430 ? (unsigned char)*cmdbuf_ptr++
2399 : NOCHAR; 2431 : NOCHAR;
2400} 2432}
2401 2433
2402static class out_of_input out_of_input; 2434static class out_of_input out_of_input;
2403 2435
2404/* rxvt_cmd_getc () - Return next input character */ 2436wchar_t ecb_hot
2405/*
2406 * Return the next input character after first passing any keyboard input
2407 * to the command.
2408 */
2409wchar_t
2410rxvt_term::cmd_getc () THROW ((class out_of_input)) 2437rxvt_term::cmd_getc () THROW ((class out_of_input))
2411{ 2438{
2412 wchar_t c = next_char (); 2439 wchar_t c = next_char ();
2413 2440
2414 if (c == NOCHAR) 2441 if (c == NOCHAR)
2415 throw out_of_input; 2442 throw out_of_input;
2416 2443
2417 return c; 2444 return c;
2418} 2445}
2419 2446
2420uint32_t 2447uint32_t ecb_hot
2421rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2448rxvt_term::cmd_get8 () THROW ((class out_of_input))
2422{ 2449{
2423 uint32_t c = next_octet (); 2450 uint32_t c = next_octet ();
2424 2451
2425 if (c == NOCHAR) 2452 if (c == NOCHAR)
… …
2429} 2456}
2430 2457
2431/*{{{ print pipe */ 2458/*{{{ print pipe */
2432/*----------------------------------------------------------------------*/ 2459/*----------------------------------------------------------------------*/
2433#ifdef PRINTPIPE 2460#ifdef PRINTPIPE
2434FILE * 2461FILE * ecb_cold
2435rxvt_term::popen_printer () 2462rxvt_term::popen_printer ()
2436{ 2463{
2437 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2464 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2438 2465
2439 if (stream == NULL) 2466 if (stream == NULL)
2440 rxvt_warn ("can't open printer pipe, not printing.\n"); 2467 rxvt_warn ("can't open printer pipe, not printing.\n");
2441 2468
2442 return stream; 2469 return stream;
2443} 2470}
2444 2471
2445int 2472int ecb_cold
2446rxvt_term::pclose_printer (FILE *stream) 2473rxvt_term::pclose_printer (FILE *stream)
2447{ 2474{
2448 fflush (stream); 2475 fflush (stream);
2449 return pclose (stream); 2476 return pclose (stream);
2450} 2477}
2451 2478
2452/* 2479/*
2453 * simulate attached vt100 printer 2480 * simulate attached vt100 printer
2454 */ 2481 */
2455void 2482void ecb_cold
2456rxvt_term::process_print_pipe () 2483rxvt_term::process_print_pipe ()
2457{ 2484{
2458 int done; 2485 FILE *fd = popen_printer ();
2459 FILE *fd;
2460 2486
2461 if ((fd = popen_printer ()) == NULL) 2487 if (!fd)
2462 return; 2488 return;
2463 2489
2464 /* 2490 /*
2465 * Send all input to the printer until either ESC[4i or ESC[?4i 2491 * Send all input to the printer until either ESC[4i or ESC[?4i
2466 * is received. 2492 * is received.
2467 */ 2493 */
2468 for (done = 0; !done;) 2494 for (int done = 0; !done; )
2469 { 2495 {
2470 unsigned char buf[8]; 2496 unsigned char buf[8];
2471 unicode_t ch; 2497 unicode_t ch;
2472 unsigned int i, len; 2498 unsigned int i, len;
2473 2499
… …
2504 } 2530 }
2505 } 2531 }
2506 2532
2507 pclose_printer (fd); 2533 pclose_printer (fd);
2508} 2534}
2509#endif /* PRINTPIPE */ 2535#endif /* PRINTPIPE */
2510/*}}} */ 2536/*}}} */
2511 2537
2512/* *INDENT-OFF* */
2513enum { 2538enum {
2514 C1_40 = 0x40, 2539 C1_40 = 0x40,
2515 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2540 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2516 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2541 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2517 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2542 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2518 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2543 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2519}; 2544};
2520/* *INDENT-ON* */
2521 2545
2522/*{{{ process non-printing single characters */ 2546/*{{{ process non-printing single characters */
2523void 2547void ecb_hot
2524rxvt_term::process_nonprinting (unicode_t ch) 2548rxvt_term::process_nonprinting (unicode_t ch)
2525{ 2549{
2526 switch (ch) 2550 switch (ch)
2527 { 2551 {
2528 case C0_ESC: 2552 case C0_ESC:
… …
2558 scr_charset_choose (0); 2582 scr_charset_choose (0);
2559 break; 2583 break;
2560 2584
2561#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
2562 // 8-bit controls 2586 // 8-bit controls
2563 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
2564 process_dcs_seq (); 2588 process_dcs_seq ();
2565 break; 2589 break;
2566 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
2567 process_csi_seq (); 2591 process_csi_seq ();
2568 break; 2592 break;
2569 case 0x9d: /* OSC */ 2593 case 0x9d: /* OSC */
2570 process_osc_seq (); 2594 process_osc_seq ();
2571 break; 2595 break;
2572#endif 2596#endif
2573 } 2597 }
2574} 2598}
2575/*}}} */ 2599/*}}} */
2576 2600
2577 2601
2578/*{{{ process VT52 escape sequences */ 2602/*{{{ process VT52 escape sequences */
2579void 2603void ecb_cold
2580rxvt_term::process_escape_vt52 (unicode_t ch) 2604rxvt_term::process_escape_vt52 (unicode_t ch)
2581{ 2605{
2582 int row, col; 2606 int row, col;
2583 2607
2584 switch (ch) 2608 switch (ch)
… …
2618 break; 2642 break;
2619 case 'Z': /* identify the terminal type */ 2643 case 'Z': /* identify the terminal type */
2620 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2644 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2621 break; 2645 break;
2622 case '<': /* turn off VT52 mode */ 2646 case '<': /* turn off VT52 mode */
2623 PrivMode (0, PrivMode_vt52); 2647 priv_modes &= ~PrivMode_vt52;
2624 break; 2648 break;
2625 case 'F': /* use special graphics character set */ 2649 case 'F': /* use special graphics character set */
2626 case 'G': /* use regular character set */ 2650 case 'G': /* use regular character set */
2627 /* unimplemented */ 2651 /* unimplemented */
2628 break; 2652 break;
… …
2634} 2658}
2635/*}}} */ 2659/*}}} */
2636 2660
2637 2661
2638/*{{{ process escape sequences */ 2662/*{{{ process escape sequences */
2639void 2663void ecb_hot
2640rxvt_term::process_escape_seq () 2664rxvt_term::process_escape_seq ()
2641{ 2665{
2642 unicode_t ch = cmd_getc (); 2666 unicode_t ch = cmd_getc ();
2643 2667
2644 if (priv_modes & PrivMode_vt52) 2668 if (priv_modes & PrivMode_vt52)
… …
2647 return; 2671 return;
2648 } 2672 }
2649 2673
2650 switch (ch) 2674 switch (ch)
2651 { 2675 {
2652 /* case 1: do_tek_mode (); break; */
2653 case '#': 2676 case '#':
2654 if (cmd_getc () == '8') 2677 if (cmd_getc () == '8')
2655 scr_E (); 2678 scr_E ();
2656 break; 2679 break;
2657 case '(': 2680 case '(':
… …
2680#if !ENABLE_MINIMAL 2703#if !ENABLE_MINIMAL
2681 case '9': 2704 case '9':
2682 scr_forwardindex (); 2705 scr_forwardindex ();
2683 break; 2706 break;
2684#endif 2707#endif
2708 // DECPAM/DECPNM
2685 case '=': 2709 case '=':
2710 priv_modes |= PrivMode_aplKP;
2711 break;
2686 case '>': 2712 case '>':
2687 PrivMode ((ch == '='), PrivMode_aplKP); 2713 priv_modes &= ~PrivMode_aplKP;
2688 break; 2714 break;
2689 2715
2690 case C1_40: 2716 case C1_40:
2691 cmd_getc (); 2717 cmd_getc ();
2692 break; 2718 break;
… …
2696 2722
2697 /* 8.3.87: NEXT LINE */ 2723 /* 8.3.87: NEXT LINE */
2698 case C1_NEL: /* ESC E */ 2724 case C1_NEL: /* ESC E */
2699 { 2725 {
2700 wchar_t nlcr[] = { C0_LF, C0_CR }; 2726 wchar_t nlcr[] = { C0_LF, C0_CR };
2701 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2727 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2702 } 2728 }
2703 break; 2729 break;
2704 2730
2705 /* kidnapped escape sequence: Should be 8.3.48 */ 2731 /* kidnapped escape sequence: Should be 8.3.48 */
2706 case C1_ESA: /* ESC G */ 2732 case C1_ESA: /* ESC G */
2707 process_graphics (); 2733 // used by original rxvt for rob nations own graphics mode
2734 if (cmd_getc () == 'Q')
2735 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2708 break; 2736 break;
2709 2737
2710 /* 8.3.63: CHARACTER TABULATION SET */ 2738 /* 8.3.63: CHARACTER TABULATION SET */
2711 case C1_HTS: /* ESC H */ 2739 case C1_HTS: /* ESC H */
2712 scr_set_tab (1); 2740 scr_set_tab (1);
… …
2716 case C1_RI: /* ESC M */ 2744 case C1_RI: /* ESC M */
2717 scr_index (DN); 2745 scr_index (DN);
2718 break; 2746 break;
2719 2747
2720 /* 8.3.142: SINGLE-SHIFT TWO */ 2748 /* 8.3.142: SINGLE-SHIFT TWO */
2721 /*case C1_SS2: scr_single_shift (2); break; */ 2749 /* case C1_SS2: break; */
2722 2750
2723 /* 8.3.143: SINGLE-SHIFT THREE */ 2751 /* 8.3.143: SINGLE-SHIFT THREE */
2724 /*case C1_SS3: scr_single_shift (3); break; */ 2752 /* case C1_SS3: break; */
2725 2753
2726 /* 8.3.27: DEVICE CONTROL STRING */ 2754 /* 8.3.27: DEVICE CONTROL STRING */
2727 case C1_DCS: /* ESC P */ 2755 case C1_DCS: /* ESC P */
2728 process_dcs_seq (); 2756 process_dcs_seq ();
2729 break; 2757 break;
… …
2731 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2759 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2732 case C1_SCI: /* ESC Z */ 2760 case C1_SCI: /* ESC Z */
2733 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2761 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2734 break; /* steal obsolete ESC [ c */ 2762 break; /* steal obsolete ESC [ c */
2735 2763
2736 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2764 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2737 case C1_CSI: /* ESC [ */ 2765 case C1_CSI: /* ESC [ */
2738 process_csi_seq (); 2766 process_csi_seq ();
2739 break; 2767 break;
2740 2768
2741 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2769 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2742 case C1_OSC: /* ESC ] */ 2770 case C1_OSC: /* ESC ] */
2743 process_osc_seq (); 2771 process_osc_seq ();
2744 break; 2772 break;
2745 2773
2746 /* 8.3.106: RESET TO INITIAL STATE */ 2774 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2747 case 'c': 2775 case 'c':
2748 mbstate.reset (); 2776 mbstate.reset ();
2749 scr_poweron (); 2777 scr_poweron ();
2750 scrollbar_show (1); 2778 scrollBar.show (1);
2751 break; 2779 break;
2752 2780
2753 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2781 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2754 case 'n': 2782 case 'n':
2755 scr_charset_choose (2); 2783 scr_charset_choose (2);
… …
2762 } 2790 }
2763} 2791}
2764/*}}} */ 2792/*}}} */
2765 2793
2766/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2794/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2767/* *INDENT-OFF* */
2768enum { 2795enum {
2769 CSI_ICH = 0x40, 2796 CSI_ICH = 0x40,
2770 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2797 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2771 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2798 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2772 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2799 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2775 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2802 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2776 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2803 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2777 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2804 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2778}; 2805};
2779 2806
2780#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2807#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2781 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2808 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2782 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2809 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2783#define get_byte_array_bit(array, bit) \ 2810#define get_byte_array_bit(array, bit) \
2784 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2811 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2785 2812
2786const unsigned char csi_defaults[] = 2813static const unsigned char csi_defaults[] =
2787 { 2814 {
2788 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2815 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2789 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2816 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2790 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2817 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2791 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2818 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2792 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2819 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2793 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2820 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2794 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2821 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2795 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2822 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2796 }; 2823 };
2797/* *INDENT-ON* */
2798 2824
2799void 2825void ecb_hot
2800rxvt_term::process_csi_seq () 2826rxvt_term::process_csi_seq ()
2801{ 2827{
2802 unicode_t ch, priv, i; 2828 unicode_t ch, priv, prev_ch, i;
2803 unsigned int nargs, p; 2829 unsigned int nargs, p;
2804 int n, ndef; 2830 int n, ndef;
2805 int arg[ESC_ARGS]; 2831 int arg[ESC_ARGS] = { };
2806 2832
2807 memset (arg, 0, sizeof (arg));
2808 nargs = 0; 2833 nargs = 0;
2809 2834
2810 priv = 0; 2835 priv = 0;
2811 ch = cmd_getc (); 2836 ch = cmd_getc ();
2812 if (ch >= '<' && ch <= '?') 2837 if ((ch >= '<' && ch <= '?') || ch == '!')
2838 {
2813 { /* '<' '=' '>' '?' */ 2839 /* '<' '=' '>' '?' '!' */
2814 priv = ch; 2840 priv = ch;
2815 ch = cmd_getc (); 2841 ch = cmd_getc ();
2816 } 2842 }
2817 2843
2844 prev_ch = 0;
2818 /* read any numerical arguments */ 2845 /* read any numerical arguments */
2819 for (n = -1; ch < CSI_ICH; ) 2846 for (n = -1; ch < CSI_ICH; )
2820 { 2847 {
2821 if (isdigit (ch)) 2848 if (isdigit (ch))
2822 { 2849 {
… …
2832 n = -1; 2859 n = -1;
2833 } 2860 }
2834 else if (IS_CONTROL (ch)) 2861 else if (IS_CONTROL (ch))
2835 process_nonprinting (ch); 2862 process_nonprinting (ch);
2836 2863
2864 prev_ch = ch;
2837 ch = cmd_getc (); 2865 ch = cmd_getc ();
2838 } 2866 }
2839 2867
2840 if (ch > CSI_7F) 2868 if (ch > CSI_7F)
2841 return; 2869 return;
… …
2861 { 2889 {
2862 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2890 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2863 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2891 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2864 // 2892 //
2865 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2893 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2866 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2894 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2867 // that we do not support xterm mouse reporting (should be 95 when we do). 2895 // versions.
2868 // 2896 //
2869 tt_printf ("\033[>%d;94;0c", 'U'); 2897 tt_printf ("\033[>%d;95;0c", 'U');
2870 } 2898 }
2871 break; 2899 break;
2900
2872 case '?': 2901 case '?':
2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2902 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2874 process_terminal_mode (ch, priv, nargs, arg); 2903 process_terminal_mode (ch, priv, nargs, arg);
2875 break; 2904 break;
2905
2906 case '!':
2907 if (ch == CSI_70)
2908 {
2909 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2910 scr_soft_reset ();
2911
2912 static const int pm_h[] = { 7, 25 };
2913 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2914
2915 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2916 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2876 } 2917 }
2918 break;
2919 }
2920
2877 return; 2921 return;
2878 } 2922 }
2879 2923
2880 switch (ch) 2924 switch (ch)
2881 { 2925 {
… …
2895 } 2939 }
2896 break; 2940 break;
2897#endif 2941#endif
2898 2942
2899 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2943 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2900 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2944 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2901 arg[0] = -arg[0]; 2945 arg[0] = -arg[0];
2902 /* FALLTHROUGH */ 2946 /* FALLTHROUGH */
2903 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2947 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2904 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2905 scr_gotorc (arg[0], 0, RELATIVE); 2949 scr_gotorc (arg[0], 0, RELATIVE);
2906 break; 2950 break;
2907 2951
2908 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2909 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3059 scr_insert_mode (1); 3103 scr_insert_mode (1);
3060 else if (arg[0] == 20) 3104 else if (arg[0] == 20)
3061 priv_modes |= PrivMode_LFNL; 3105 priv_modes |= PrivMode_LFNL;
3062 break; 3106 break;
3063 3107
3108 case CSI_71: // DECSCUSR: set cursor style
3109 if (prev_ch == ' ')
3110 set_cursor_style (arg[0]);
3111 break;
3112
3064 /* 3113 /*
3065 * PRIVATE USE beyond this point. All CSI_7? sequences here 3114 * PRIVATE USE beyond this point. All CSI_7? sequences here
3066 */ 3115 */
3067 case CSI_72: /* DECSTBM: set top and bottom margins */ 3116 case CSI_72: /* DECSTBM: set top and bottom margins */
3068 if (nargs == 1) 3117 if (nargs == 1)
… …
3096 } 3145 }
3097} 3146}
3098/*}}} */ 3147/*}}} */
3099 3148
3100#if !ENABLE_MINIMAL 3149#if !ENABLE_MINIMAL
3101/* ARGSUSED */
3102void 3150void
3103rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3151rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3104{ 3152{
3105 int x, y; 3153 int x, y;
3106 XWindowAttributes wattr; 3154 XWindowAttributes wattr;
… …
3115 { 3163 {
3116 /* 3164 /*
3117 * commands 3165 * commands
3118 */ 3166 */
3119 case 1: /* deiconify window */ 3167 case 1: /* deiconify window */
3120 XMapWindow (dpy, parent[0]); 3168 XMapWindow (dpy, parent);
3121 break; 3169 break;
3122 case 2: /* iconify window */ 3170 case 2: /* iconify window */
3123 XIconifyWindow (dpy, parent[0], display->screen); 3171 XIconifyWindow (dpy, parent, display->screen);
3124 break; 3172 break;
3125 case 3: /* set position (pixels) */ 3173 case 3: /* set position (pixels) */
3126 XMoveWindow (dpy, parent[0], args[1], args[2]); 3174 XMoveWindow (dpy, parent, args[1], args[2]);
3127 break; 3175 break;
3128 case 4: /* set size (pixels) */ 3176 case 4: /* set size (pixels) */
3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3177 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3130 break; 3178 break;
3131 case 5: /* raise window */ 3179 case 5: /* raise window */
3132 XRaiseWindow (dpy, parent[0]); 3180 XRaiseWindow (dpy, parent);
3133 break; 3181 break;
3134 case 6: /* lower window */ 3182 case 6: /* lower window */
3135 XLowerWindow (dpy, parent[0]); 3183 XLowerWindow (dpy, parent);
3136 break; 3184 break;
3137 case 7: /* refresh window */ 3185 case 7: /* refresh window */
3138 scr_touch (true); 3186 scr_touch (true);
3139 break; 3187 break;
3140 case 8: /* set size (chars) */ 3188 case 8: /* set size (chars) */
… …
3143 break; 3191 break;
3144 3192
3145 //case 9: NYI, TODO, restore maximized window or maximize window 3193 //case 9: NYI, TODO, restore maximized window or maximize window
3146 default: 3194 default:
3147 if (args[0] >= 24) /* set height (chars) */ 3195 if (args[0] >= 24) /* set height (chars) */
3148 set_widthheight ((unsigned int)width, 3196 set_widthheight ((unsigned int)vt_width,
3149 (unsigned int) (args[1] * fheight)); 3197 (unsigned int) (args[1] * fheight));
3150 break; 3198 break;
3151 3199
3152 /* 3200 /*
3153 * reports - some output format copied from XTerm 3201 * reports - some output format copied from XTerm
3154 */ 3202 */
3155 case 11: /* report window state */ 3203 case 11: /* report window state */
3156 XGetWindowAttributes (dpy, parent[0], &wattr); 3204 XGetWindowAttributes (dpy, parent, &wattr);
3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3205 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3158 break; 3206 break;
3159 case 13: /* report window position */ 3207 case 13: /* report window position */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3208 XGetWindowAttributes (dpy, parent, &wattr);
3161 XTranslateCoordinates (dpy, parent[0], wattr.root, 3209 XTranslateCoordinates (dpy, parent, wattr.root,
3162 -wattr.border_width, -wattr.border_width, 3210 -wattr.border_width, -wattr.border_width,
3163 &x, &y, &wdummy); 3211 &x, &y, &wdummy);
3164 tt_printf ("\033[3;%d;%dt", x, y); 3212 tt_printf ("\033[3;%d;%dt", x, y);
3165 break; 3213 break;
3166 case 14: /* report window size (pixels) */ 3214 case 14: /* report window size (pixels) */
3167 XGetWindowAttributes (dpy, parent[0], &wattr); 3215 XGetWindowAttributes (dpy, parent, &wattr);
3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3216 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3169 break; 3217 break;
3170 case 18: /* report text area size (chars) */ 3218 case 18: /* report text area size (chars) */
3171 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3219 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3172 break; 3220 break;
… …
3174 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3222 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3175 break; 3223 break;
3176 case 20: /* report icon label */ 3224 case 20: /* report icon label */
3177 { 3225 {
3178 char *s; 3226 char *s;
3179 XGetIconName (dpy, parent[0], &s); 3227 XGetIconName (dpy, parent, &s);
3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3228 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3181 XFree (s); 3229 XFree (s);
3182 } 3230 }
3183 break; 3231 break;
3184 case 21: /* report window title */ 3232 case 21: /* report window title */
3185 { 3233 {
3186 char *s; 3234 char *s;
3187 XFetchName (dpy, parent[0], &s); 3235 XFetchName (dpy, parent, &s);
3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3236 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3189 XFree (s); 3237 XFree (s);
3190 } 3238 }
3191 break; 3239 break;
3192 } 3240 }
… …
3202rxvt_term::get_to_st (unicode_t &ends_how) 3250rxvt_term::get_to_st (unicode_t &ends_how)
3203{ 3251{
3204 unicode_t ch; 3252 unicode_t ch;
3205 bool seen_esc = false; 3253 bool seen_esc = false;
3206 unsigned int n = 0; 3254 unsigned int n = 0;
3207 wchar_t string[STRING_MAX]; 3255 wchar_t string[CBUFSIZ];
3208 3256
3209 while ((ch = cmd_getc ()) != NOCHAR) 3257 while ((ch = cmd_getc ()) != NOCHAR)
3210 { 3258 {
3211 if (seen_esc) 3259 if (seen_esc)
3212 { 3260 {
… …
3227 else if (ch < 0x20) 3275 else if (ch < 0x20)
3228 return NULL; /* other control character - exit */ 3276 return NULL; /* other control character - exit */
3229 3277
3230 seen_esc = false; 3278 seen_esc = false;
3231 3279
3232 if (n >= STRING_MAX - 1) 3280 if (n >= sizeof (string) - 1)
3233 // stop at some sane length 3281 // stop at some sane length
3234 return NULL; 3282 return NULL;
3235 3283
3236 string[n++] = ch; 3284 string[n++] = ch;
3237 } 3285 }
… …
3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3296 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3249 */ 3297 */
3250void 3298void
3251rxvt_term::process_dcs_seq () 3299rxvt_term::process_dcs_seq ()
3252{ 3300{
3253 char *s;
3254 unicode_t eh;
3255
3256 /* 3301 /*
3257 * Not handled yet 3302 * Not handled yet
3258 */ 3303 */
3304
3305 unicode_t eh;
3259 s = get_to_st (eh); 3306 char *s = get_to_st (eh);
3260 if (s) 3307 if (s)
3261 free (s); 3308 free (s);
3262 3309
3263 return; 3310 return;
3264} 3311}
… …
3268 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3315 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3269 */ 3316 */
3270void 3317void
3271rxvt_term::process_osc_seq () 3318rxvt_term::process_osc_seq ()
3272{ 3319{
3273 unicode_t ch, eh;
3274 int arg; 3320 int arg;
3275 3321
3276 ch = cmd_getc (); 3322 unicode_t ch = cmd_getc ();
3277 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3323 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3278 arg = arg * 10 + (ch - '0'); 3324 arg = arg * 10 + (ch - '0');
3279 3325
3280 if (ch == ';') 3326 if (ch == ';')
3281 { 3327 {
3328 unicode_t eh;
3282 char *s = get_to_st (eh); 3329 char *s = get_to_st (eh);
3283 3330
3284 if (s) 3331 if (s)
3285 { 3332 {
3286 process_xterm_seq (arg, s, eh); 3333 process_xterm_seq (arg, s, eh);
3287 free (s); 3334 free (s);
3288 } 3335 }
3289 } 3336 }
3290} 3337}
3291 3338
3339static unsigned int
3340colorcube_index (unsigned int idx_r,
3341 unsigned int idx_g,
3342 unsigned int idx_b)
3343{
3344 assert (idx_r < Red_levels);
3345 assert (idx_g < Green_levels);
3346 assert (idx_b < Blue_levels);
3347
3348 return idx_r * Blue_levels * Green_levels +
3349 idx_g * Blue_levels +
3350 idx_b;
3351}
3352
3353/*
3354 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 32bit RGBA color.
3356 */
3357unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3359{
3360 r &= 0xff;
3361 g &= 0xff;
3362 b &= 0xff;
3363 a &= 0xff;
3364
3365 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3366
3367 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3368 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3369 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3370 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3371
3372 /* we allow one of the 6 directly neighbouring colours */
3373 /* to replace the current color, if they not used recently */
3374 static const signed char dxyz[][3] = {
3375 0, 0, 0,
3376 0, 0, +1,
3377 0, 0, -1,
3378 0, +1, 0,
3379 0, -1, 0,
3380 +1, 0, 0,
3381 -1, 0, 0,
3382 };
3383
3384 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3385 {
3386 int r = idx_r + dxyz[n][0];
3387 int g = idx_g + dxyz[n][1];
3388 int b = idx_b + dxyz[n][2];
3389
3390 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3391 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3392 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3393
3394 unsigned int index = colorcube_index (r, g, b);
3395
3396 if (rgb24_color[index] == color)
3397 {
3398 rgb24_seqno[index] = ++rgb24_sequence;
3399 return index + minTermCOLOR24;
3400 }
3401
3402 // minor issue: could update index 0 few more times
3403 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3404 {
3405 idx = index;
3406 goto update;
3407 }
3408
3409 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3410 // but also handles wrap around values good enough
3411 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3412 idx = index;
3413 }
3414
3415update:
3416 rgb24_color[idx] = color;
3417 rgb24_seqno[idx] = ++rgb24_sequence;
3418
3419 idx += minTermCOLOR24;
3420 pix_colors_focused [idx].free (this);
3421 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3422 update_fade_color (idx, false);
3423
3424 return idx;
3425}
3426
3292void 3427void
3293rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3428rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3294{ 3429{
3295 if (str[0] == '?' && !str[1]) 3430 if (str[0] == '?' && !str[1])
3296 { 3431 {
3297 rgba c; 3432 rgba c;
3298 pix_colors_focused[color].get (c); 3433 pix_colors_focused[color].get (c);
3299 3434
3300#if XFT 3435#if XFT
3301 if (c.a != rgba::MAX_CC) 3436 if (c.a != rgba::MAX_CC)
3302 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3437 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3303 else 3438 else
3304#endif 3439#endif
3305 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3440 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3306 } 3441 }
3307 else 3442 else
… …
3310 3445
3311/* 3446/*
3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3447 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3313 */ 3448 */
3314void 3449void
3315rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3450rxvt_term::process_xterm_seq (int op, char *str, char resp)
3316{ 3451{
3317 int color; 3452 int color;
3318 char *buf, *name; 3453 char *buf, *name;
3319 bool query = str[0] == '?' && !str[1]; 3454 bool query = str[0] == '?' && !str[1];
3320 int saveop = op; 3455 int saveop = op;
… …
3347 unsigned long bytes_after; 3482 unsigned long bytes_after;
3348 unsigned char *value = 0; 3483 unsigned char *value = 0;
3349 const char *str = ""; 3484 const char *str = "";
3350 3485
3351 if (prop 3486 if (prop
3352 && XGetWindowProperty (dpy, parent[0], 3487 && XGetWindowProperty (dpy, parent,
3353 prop, 0, 1<<16, 0, AnyPropertyType, 3488 prop, 0, 1<<16, 0, AnyPropertyType,
3354 &actual_type, &actual_format, 3489 &actual_type, &actual_format,
3355 &nitems, &bytes_after, &value) == Success 3490 &nitems, &bytes_after, &value) == Success
3356 && actual_type != None 3491 && actual_type != None
3357 && actual_format == 8) 3492 && actual_format == 8)
3358 str = (const char *)(value); 3493 str = (const char *)(value);
3359 3494
3360 tt_printf ("\033]%d;%s%c", op, str, resp); 3495 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3361 3496
3362 XFree (value); 3497 XFree (value);
3363 } 3498 }
3364 else 3499 else
3365 { 3500 {
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3501 char *eq = strchr (str, '=');
3367 3502
3368 if (eq) 3503 if (eq)
3369 { 3504 {
3370 *eq = 0; 3505 *eq = 0;
3371 set_utf8_property (display->atom (str), eq + 1); 3506 set_utf8_property (display->atom (str), eq + 1);
3372 } 3507 }
3373 else 3508 else
3374 XDeleteProperty (dpy, parent[0], 3509 XDeleteProperty (dpy, parent,
3375 display->atom (str)); 3510 display->atom (str));
3376 } 3511 }
3377 break; 3512 break;
3378 3513
3379 case XTerm_Color: 3514 case XTerm_Color:
… …
3392 *buf++ = '\0'; 3527 *buf++ = '\0';
3393 3528
3394 process_color_seq (op, color, name, resp); 3529 process_color_seq (op, color, name, resp);
3395 } 3530 }
3396 break; 3531 break;
3532 case Rxvt_restoreFG:
3397 case XTerm_Color00: 3533 case XTerm_Color00:
3398 process_color_seq (op, Color_fg, str, resp); 3534 process_color_seq (op, Color_fg, str, resp);
3399 break; 3535 break;
3536 case Rxvt_restoreBG:
3400 case XTerm_Color01: 3537 case XTerm_Color01:
3401 process_color_seq (op, Color_bg, str, resp); 3538 process_color_seq (op, Color_bg, str, resp);
3402 break; 3539 break;
3403#ifndef NO_CURSORCOLOR 3540#ifndef NO_CURSORCOLOR
3404 case XTerm_Color_cursor: 3541 case XTerm_Color_cursor:
… …
3409 process_color_seq (op, Color_pointer_fg, str, resp); 3546 process_color_seq (op, Color_pointer_fg, str, resp);
3410 break; 3547 break;
3411 case XTerm_Color_pointer_bg: 3548 case XTerm_Color_pointer_bg:
3412 process_color_seq (op, Color_pointer_bg, str, resp); 3549 process_color_seq (op, Color_pointer_bg, str, resp);
3413 break; 3550 break;
3551#ifdef OPTION_HC
3552 case XTerm_Color_HC:
3553 process_color_seq (op, Color_HC, str, resp);
3554 break;
3555 case XTerm_Color_HTC:
3556 process_color_seq (op, Color_HTC, str, resp);
3557 break;
3558#endif
3414#ifndef NO_BOLD_UNDERLINE_REVERSE 3559#ifndef NO_BOLD_UNDERLINE_REVERSE
3415 case XTerm_Color_RV:
3416 process_color_seq (op, Color_RV, str, resp);
3417 break;
3418 case Rxvt_Color_BD:
3419 case URxvt_Color_BD: 3560 case URxvt_Color_BD:
3420 process_color_seq (op, Color_BD, str, resp); 3561 process_color_seq (op, Color_BD, str, resp);
3421 break; 3562 break;
3422 case Rxvt_Color_UL:
3423 case URxvt_Color_UL: 3563 case URxvt_Color_UL:
3424 process_color_seq (op, Color_UL, str, resp); 3564 process_color_seq (op, Color_UL, str, resp);
3425 break; 3565 break;
3426 case URxvt_Color_IT: 3566 case URxvt_Color_IT:
3427 process_color_seq (op, Color_IT, str, resp); 3567 process_color_seq (op, Color_IT, str, resp);
3428 break; 3568 break;
3429#endif 3569#endif
3430#if ENABLE_TRANSPARENCY 3570 case URxvt_Color_border:
3571 process_color_seq (op, Color_border, str, resp);
3572 break;
3573
3574#if BG_IMAGE_FROM_ROOT
3431 case URxvt_Color_tint: 3575 case URxvt_Color_tint:
3432 process_color_seq (op, Color_tint, str, resp); 3576 process_color_seq (op, Color_tint, str, resp);
3433 { 3577 {
3434 bool changed = false; 3578 bool changed = false;
3579
3435 if (ISSET_PIXCOLOR (Color_tint)) 3580 if (ISSET_PIXCOLOR (Color_tint))
3436 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3581 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3437 else 3582
3438 changed = bgPixmap.unset_tint ();
3439 if (changed) 3583 if (changed)
3440 bgPixmap.render (); 3584 update_background ();
3441 } 3585 }
3442 3586
3443 break; 3587 break;
3444#endif 3588#endif
3445 3589
3446#if XPM_BACKGROUND 3590#if BG_IMAGE_FROM_FILE
3447 case Rxvt_Pixmap: 3591 case Rxvt_Pixmap:
3448 if (!strcmp (str, "?")) 3592 if (!strcmp (str, "?"))
3449 { 3593 {
3450 char str[256]; 3594 char str[256];
3595 int h_scale = fimage.h_scale;
3596 int v_scale = fimage.v_scale;
3597 int h_align = fimage.h_align;
3598 int v_align = fimage.v_align;
3451 3599
3452 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3600 sprintf (str, "[%dx%d+%d+%d]",
3453 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3601 h_scale, v_scale,
3454 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3602 h_align, v_align);
3455 process_xterm_seq (XTerm_title, str, CHAR_ST); 3603 process_xterm_seq (XTerm_title, str, CHAR_ST);
3456 } 3604 }
3457 else 3605 else
3458 { 3606 {
3459 int changed = 0; 3607 bool changed = false;
3460 3608
3461 if (*str != ';') 3609 if (*str != ';')
3462 { 3610 {
3463 /* reset to default scaling :*/ 3611 try
3464 bgPixmap.unset_geometry (); 3612 {
3465 if (bgPixmap.set_file (str)) /* change pixmap */ 3613 fimage.set_file_geometry (this, str);
3466 changed++; 3614 changed = true;
3467 str = strchr (str, ';'); 3615 }
3468 if (str == NULL) 3616 catch (const class rxvt_failure_exception &e)
3469 bgPixmap.set_defaultGeometry (); 3617 {
3618 }
3470 } 3619 }
3471 while (str) 3620 else
3472 { 3621 {
3473 str++; 3622 str++;
3474 if (bgPixmap.set_geometry (str)) 3623 if (fimage.set_geometry (str, true))
3475 changed++; 3624 changed = true;
3476 str = strchr (str, ';');
3477 } 3625 }
3626
3478 if (changed) 3627 if (changed)
3479 { 3628 {
3480 bgPixmap.render (); 3629 if (bg_window_position_sensitive ())
3481 scr_touch (true); 3630 {
3631 int x, y;
3632 get_window_origin (x, y);
3633 parent_x = x;
3634 parent_y = y;
3635 }
3636 update_background ();
3482 } 3637 }
3483 } 3638 }
3484 break; 3639 break;
3485#endif 3640#endif
3486
3487 case Rxvt_restoreFG:
3488 set_window_color (Color_fg, str);
3489 break;
3490 case Rxvt_restoreBG:
3491 set_window_color (Color_bg, str);
3492 break;
3493 3641
3494 case XTerm_logfile: 3642 case XTerm_logfile:
3495 // TODO, when secure mode? 3643 // TODO, when secure mode?
3496 break; 3644 break;
3497 3645
… …
3564 break; 3712 break;
3565#endif 3713#endif
3566 3714
3567#if ENABLE_PERL 3715#if ENABLE_PERL
3568 case URxvt_perl: 3716 case URxvt_perl:
3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3717 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3570 ; // no responses yet
3571 break; 3718 break;
3572#endif 3719#endif
3573 } 3720 }
3574} 3721}
3575/*----------------------------------------------------------------------*/ 3722/*----------------------------------------------------------------------*/
… …
3582 * 's' = save 3729 * 's' = save
3583 * 'r' = restore 3730 * 'r' = restore
3584 * 't' = toggle 3731 * 't' = toggle
3585 * so no need for fancy checking 3732 * so no need for fancy checking
3586 */ 3733 */
3587int 3734int ecb_cold
3588rxvt_term::privcases (int mode, unsigned long bit) 3735rxvt_term::privcases (int mode, unsigned long bit)
3589{ 3736{
3590 int state; 3737 int state;
3591 3738
3592 if (mode == 's') 3739 if (mode == 's')
3593 { 3740 {
3594 SavedModes |= (priv_modes & bit); 3741 if (priv_modes & bit)
3742 SavedModes |= bit;
3743 else
3744 SavedModes &= ~bit;
3595 return -1; 3745 return -1;
3596 } 3746 }
3597 else 3747 else
3598 { 3748 {
3599 if (mode == 'r') 3749 if (mode == 'r')
3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3750 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3601 else 3751 else
3602 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3752 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3603 PrivMode (state, bit); 3753
3754 if (state)
3755 priv_modes |= bit;
3756 else
3757 priv_modes &= ~bit;
3604 } 3758 }
3605 3759
3606 return state; 3760 return state;
3607} 3761}
3608 3762
3609/* we're not using priv _yet_ */ 3763/* we're not using priv _yet_ */
3610void 3764void
3611rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3765rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3612{ 3766{
3613 unsigned int i, j; 3767 unsigned int i, j;
3614 int state; 3768 int state;
3615 3769
3616 static const struct 3770 static const struct
3617 { 3771 {
3618 const int argval; 3772 const int argval;
3619 const unsigned long bit; 3773 const unsigned long bit;
3620 } argtopriv[] = { 3774 } argtopriv[] = {
3621 { 1, PrivMode_aplCUR }, 3775 { 1, PrivMode_aplCUR }, // DECCKM
3622 { 2, PrivMode_vt52 }, 3776 { 2, PrivMode_vt52 }, // DECANM
3623 { 3, PrivMode_132 }, 3777 { 3, PrivMode_132 }, // DECCOLM
3624 { 4, PrivMode_smoothScroll }, 3778 { 4, PrivMode_smoothScroll }, // DECSCLM
3625 { 5, PrivMode_rVideo }, 3779 { 5, PrivMode_rVideo }, // DECSCNM
3626 { 6, PrivMode_relOrigin }, 3780 { 6, PrivMode_relOrigin }, // DECOM
3627 { 7, PrivMode_Autowrap }, 3781 { 7, PrivMode_Autowrap }, // DECAWM
3628 // 8, bi-directional support mode 3782 // 8, auto-repeat keys // DECARM
3629 { 9, PrivMode_MouseX10 }, 3783 { 9, PrivMode_MouseX10 },
3630 // 18, 19 printing-related
3631 { 25, PrivMode_VisibleCursor }, 3784 { 12, PrivMode_BlinkingCursor },
3785 // 18 end FF to printer after print screen
3786 // 19 Print screen prints full screen/scroll region
3787 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3632#ifdef scrollBar_esc 3788#ifdef scrollBar_esc
3633 { scrollBar_esc, PrivMode_scrollBar }, 3789 { scrollBar_esc, PrivMode_scrollBar },
3634#endif 3790#endif
3635 { 35, PrivMode_ShiftKeys }, // rxvt extension 3791 { 35, PrivMode_ShiftKeys }, // rxvt extension
3792 // 38, tektronix mode // DECTEK
3636 { 40, PrivMode_132OK }, 3793 { 40, PrivMode_132OK },
3637 // 41 xterm more fixes NYI 3794 // 41 xterm more fixes NYI
3638 // 45 margin bell NYI 3795 // 45 margin bell NYI
3639 // 46 start logging 3796 // 46 start logging
3640 { 47, PrivMode_Screen }, 3797 { 47, PrivMode_Screen },
3641 { 66, PrivMode_aplKP }, 3798 { 66, PrivMode_aplKP }, // DECNKM
3642#ifndef NO_BACKSPACE_KEY 3799#ifndef NO_BACKSPACE_KEY
3643 { 67, PrivMode_BackSpace }, 3800 { 67, PrivMode_BackSpace }, // DECBKM
3644#endif 3801#endif
3645 { 1000, PrivMode_MouseX11 }, 3802 { 1000, PrivMode_MouseX11 },
3646 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3803 { 1002, PrivMode_MouseBtnEvent },
3647 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3804 { 1003, PrivMode_MouseAnyEvent },
3648 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3805#if ENABLE_FRILLS
3806 { 1004, PrivMode_FocusEvent },
3807 { 1005, PrivMode_ExtModeMouse },
3808#endif
3649 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3809 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3650 { 1011, PrivMode_Keypress }, // rxvt extension 3810 { 1011, PrivMode_Keypress }, // rxvt extension
3811#if ENABLE_FRILLS
3812 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3813#endif
3651 // 1035 enable modifiers for alt, numlock NYI 3814 // 1035 enable modifiers for alt, numlock NYI
3652 // 1036 send ESC for meta keys NYI 3815 // 1036 send ESC for meta keys NYI
3653 // 1037 send DEL for keypad delete NYI 3816 // 1037 send DEL for keypad delete NYI
3654 { 1047, PrivMode_Screen }, 3817 { 1047, PrivMode_Screen },
3655 // 1048 save and restore cursor 3818 // 1048 save and restore cursor, implemented in code
3656 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3819 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3657 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3820 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3821 { 2004, PrivMode_BracketPaste },
3658 }; 3822 };
3659 3823
3660 if (nargs == 0) 3824 if (nargs == 0)
3661 return; 3825 return;
3662 3826
… …
3669 for (i = 0; i < nargs; i++) 3833 for (i = 0; i < nargs; i++)
3670 { 3834 {
3671 state = -1; 3835 state = -1;
3672 3836
3673 /* basic handling */ 3837 /* basic handling */
3674 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3838 for (j = 0; j < ecb_array_length (argtopriv); j++)
3675 if (argtopriv[j].argval == arg[i]) 3839 if (argtopriv[j].argval == arg[i])
3676 { 3840 {
3677 state = privcases (mode, argtopriv[j].bit); 3841 state = privcases (mode, argtopriv[j].bit);
3678 break; 3842 break;
3679 } 3843 }
… …
3687 3851
3688 scr_touch (true); 3852 scr_touch (true);
3689 break; 3853 break;
3690#endif 3854#endif
3691 case 1048: /* alternative cursor save */ 3855 case 1048: /* alternative cursor save */
3692 case 1049:
3693 if (option (Opt_secondaryScreen)) 3856 if (option (Opt_secondaryScreen))
3694 if (mode == 0) 3857 if (mode == 0)
3695 scr_cursor (RESTORE); 3858 scr_cursor (RESTORE);
3696 else if (mode == 1) 3859 else if (mode == 1)
3697 scr_cursor (SAVE); 3860 scr_cursor (SAVE);
… …
3706 case 2: /* VT52 mode */ 3869 case 2: /* VT52 mode */
3707 /* oddball mode. should be set regardless of set/reset 3870 /* oddball mode. should be set regardless of set/reset
3708 * parameter. Return from VT52 mode with an ESC < from 3871 * parameter. Return from VT52 mode with an ESC < from
3709 * within VT52 mode 3872 * within VT52 mode
3710 */ 3873 */
3711 PrivMode (1, PrivMode_vt52); 3874 priv_modes |= PrivMode_vt52;
3712 break; 3875 break;
3713 case 3: /* 80/132 */ 3876 case 3: /* 80/132 */
3714 if (priv_modes & PrivMode_132OK) 3877 if (priv_modes & PrivMode_132OK)
3715 set_widthheight (((state ? 132 : 80) * fwidth), height); 3878 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3716 break; 3879 break;
3717 case 4: /* smooth scrolling */ 3880 case 4: /* smooth scrolling */
3718 set_option (Opt_jumpScroll, !state); 3881 set_option (Opt_jumpScroll, !state);
3719 break; 3882 break;
3720 case 5: /* reverse video */ 3883 case 5: /* reverse video */
… …
3727 scr_autowrap (state); 3890 scr_autowrap (state);
3728 break; 3891 break;
3729 /* case 8: - auto repeat, can't do on a per window basis */ 3892 /* case 8: - auto repeat, can't do on a per window basis */
3730 case 9: /* X10 mouse reporting */ 3893 case 9: /* X10 mouse reporting */
3731 if (state) /* orthogonal */ 3894 if (state) /* orthogonal */
3732 priv_modes &= ~PrivMode_MouseX11; 3895 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3733 break; 3896 break;
3734#ifdef scrollBar_esc 3897#ifdef scrollBar_esc
3735 case scrollBar_esc: 3898 case scrollBar_esc:
3736 if (scrollbar_mapping (state)) 3899 scrollBar.map (state);
3737 {
3738 resize_all_windows (0, 0, 0); 3900 resize_all_windows (0, 0, 0);
3739 scr_touch (true); 3901 scr_touch (true);
3740 } 3902 break;
3903#endif
3904#ifdef CURSOR_BLINK
3905 case 12:
3906 cursor_blink_reset ();
3741 break; 3907 break;
3742#endif 3908#endif
3743 case 25: /* visible/invisible cursor */ 3909 case 25: /* visible/invisible cursor */
3744 scr_cursor_visible (state); 3910 scr_cursor_visible (state);
3745 break; 3911 break;
… …
3750 break; 3916 break;
3751 /* case 66: - application key pad */ 3917 /* case 66: - application key pad */
3752 /* case 67: - backspace key */ 3918 /* case 67: - backspace key */
3753 case 1000: /* X11 mouse reporting */ 3919 case 1000: /* X11 mouse reporting */
3754 if (state) /* orthogonal */ 3920 if (state) /* orthogonal */
3755 priv_modes &= ~PrivMode_MouseX10; 3921 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3756 break; 3922 break;
3757#if 0
3758 case 1001: 3923 case 1002:
3759 break; /* X11 mouse highlighting */ 3924 case 1003:
3760#endif 3925 if (state)
3926 {
3927 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3928 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3929 mouse_row = mouse_col = 0;
3930 vt_emask_mouse = PointerMotionMask;
3931 }
3932 else
3933 vt_emask_mouse = NoEventMask;
3934
3935 vt_select_input ();
3936 break;
3761 case 1010: /* scroll to bottom on TTY output inhibit */ 3937 case 1010: /* scroll to bottom on TTY output inhibit */
3762 set_option (Opt_scrollTtyOutput, !state); 3938 set_option (Opt_scrollTtyOutput, !state);
3763 break; 3939 break;
3764 case 1011: /* scroll to bottom on key press */ 3940 case 1011: /* scroll to bottom on key press */
3765 set_option (Opt_scrollTtyKeypress, state); 3941 set_option (Opt_scrollTtyKeypress, state);
3766 break; 3942 break;
3767 case 1047: /* secondary screen w/ clearing last */ 3943 case 1047: /* secondary screen w/ clearing last */
3768 if (option (Opt_secondaryScreen)) 3944 if (option (Opt_secondaryScreen))
3769 if (current_screen != PRIMARY) 3945 if (!state)
3770 scr_erase_screen (2); 3946 scr_erase_screen (2);
3947
3771 scr_change_screen (state); 3948 scr_change_screen (state);
3772 break; 3949 break;
3773 case 1049: /* secondary screen w/ clearing first */ 3950 case 1049: /* secondary screen w/ clearing first */
3951 if (option (Opt_secondaryScreen))
3952 if (state)
3953 scr_cursor (SAVE);
3954
3774 scr_change_screen (state); 3955 scr_change_screen (state);
3956
3775 if (option (Opt_secondaryScreen)) 3957 if (option (Opt_secondaryScreen))
3776 if (current_screen != PRIMARY) 3958 if (state)
3777 scr_erase_screen (2); 3959 scr_erase_screen (2);
3960 else
3961 scr_cursor (RESTORE);
3778 break; 3962 break;
3779 default: 3963 default:
3780 break; 3964 break;
3781 } 3965 }
3782 } 3966 }
3783} 3967}
3784/*}}} */ 3968/*}}} */
3785 3969
3786/*{{{ process sgr sequences */ 3970/*{{{ process sgr sequences */
3787void 3971void ecb_hot
3788rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3972rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3789{ 3973{
3790 unsigned int i; 3974 unsigned int i;
3791 short rendset; 3975 short rendset;
3792 int rendstyle; 3976 int rendstyle;
… …
3834 //case 19: // ninth alt font 4018 //case 19: // ninth alt font
3835 //case 20: // gothic 4019 //case 20: // gothic
3836 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 4020 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3837 rendset = 0, rendstyle = RS_Bold; 4021 rendset = 0, rendstyle = RS_Bold;
3838 break; 4022 break;
3839 case 22: // normal intensity 4023 case 22: // bold off (vt220)
3840 rendset = 0, rendstyle = RS_Bold; 4024 rendset = 0, rendstyle = RS_Bold;
3841 break; 4025 break;
3842 case 23: // disable italic 4026 case 23: // disable italic
3843 rendset = 0, rendstyle = RS_Italic; 4027 rendset = 0, rendstyle = RS_Italic;
3844 break; 4028 break;
3845 case 24: 4029 case 24: // underline off (vt220)
3846 rendset = 0, rendstyle = RS_Uline; 4030 rendset = 0, rendstyle = RS_Uline;
3847 break; 4031 break;
3848 case 25: 4032 case 25: // blink off (vt220)
3849 rendset = 0, rendstyle = RS_Blink; 4033 rendset = 0, rendstyle = RS_Blink;
3850 break; 4034 break;
3851 case 26: // variable spacing (iso 8613) 4035 case 26: // variable spacing (iso 8613)
3852 rendset = 0, rendstyle = RS_Blink; 4036 rendset = 0, rendstyle = RS_Blink;
3853 break; 4037 break;
3854 case 27: 4038 case 27: // reverse off (vt220)
3855 rendset = 0, rendstyle = RS_RVid; 4039 rendset = 0, rendstyle = RS_RVid;
3856 break; 4040 break;
3857 //case 28: // visible. NYI 4041 //case 28: // visible. NYI
3858 //case 29: // not crossed-out 4042 //case 29: // not crossed-out
3859 } 4043 }
… …
3874 case 35: 4058 case 35:
3875 case 36: 4059 case 36:
3876 case 37: 4060 case 37:
3877 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4061 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3878 break; 4062 break;
3879 case 38: // set fg color, ISO 8613-6
3880 if (nargs > i + 2 && arg[i + 1] == 5)
3881 {
3882 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3883 i += 2;
3884 }
3885 break;
3886 case 39: /* default fg */ 4063 case 39: /* default fg */
3887 scr_color (Color_fg, Color_fg); 4064 scr_color (Color_fg, Color_fg);
3888 break; 4065 break;
3889 4066
3890 case 40: 4067 case 40:
… …
3895 case 45: 4072 case 45:
3896 case 46: 4073 case 46:
3897 case 47: 4074 case 47:
3898 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4075 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3899 break; 4076 break;
3900 case 48: // set bg color, ISO 8613-6
3901 if (nargs > i + 2 && arg[i + 1] == 5)
3902 {
3903 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3904 i += 2;
3905 }
3906 break;
3907 case 49: /* default bg */ 4077 case 49: /* default bg */
3908 scr_color (Color_bg, Color_bg); 4078 scr_color (Color_bg, Color_bg);
4079 break;
4080
4081 case 38: // set fg color, ISO 8613-6
4082 case 48: // set bg color, ISO 8613-6
4083 {
4084 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4085 unsigned int idx;
4086
4087 if (nargs > i + 2 && arg[i + 1] == 5)
4088 {
4089 idx = minCOLOR + arg[i + 2];
4090 i += 2;
4091
4092 scr_color (idx, fgbg);
4093 }
4094 else if (nargs > i + 4 && arg[i + 1] == 2)
4095 {
4096 unsigned int r = arg[i + 2];
4097 unsigned int g = arg[i + 3];
4098 unsigned int b = arg[i + 4];
4099 unsigned int a = 0xff;
4100
4101 idx = map_rgb24_color (r, g, b, a);
4102
4103 i += 4;
4104
4105 scr_color (idx, fgbg);
4106 }
4107 }
3909 break; 4108 break;
3910 4109
3911 //case 50: // not variable spacing 4110 //case 50: // not variable spacing
3912 4111
3913#if !ENABLE_MINIMAL 4112#if !ENABLE_MINIMAL
… …
3933 break; 4132 break;
3934#endif 4133#endif
3935 } 4134 }
3936 } 4135 }
3937} 4136}
4137
4138void
4139rxvt_term::set_cursor_style (int style)
4140{
4141 if (!IN_RANGE_INC (style, 0, 6))
4142 return;
4143
4144 if (style == 0)
4145 style = 1;
4146
4147 cursor_type = (style - 1) / 2;
4148 set_option (Opt_cursorUnderline, cursor_type == 1);
4149
4150#ifdef CURSOR_BLINK
4151 set_option (Opt_cursorBlink, style & 1);
4152 cursor_blink_reset ();
4153#endif
4154
4155 want_refresh = 1;
4156}
3938/*}}} */ 4157/*}}} */
3939 4158
3940/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3941void
3942rxvt_term::process_graphics ()
3943{
3944 unicode_t ch, cmd = cmd_getc ();
3945
3946 if (cmd == 'Q')
3947 { /* query graphics */
3948 tt_printf ("\033G0\012"); /* no graphics */
3949 return;
3950 }
3951 /* swallow other graphics sequences until terminating ':' */
3952 do
3953 ch = cmd_getc ();
3954 while (ch != ':');
3955}
3956/*}}} */
3957
3958/* ------------------------------------------------------------------------- */ 4159/* ---------------------------------------------------------------------- */
4160/* Write data to the pty as typed by the user, pasted with the mouse,
4161 * or generated by us in response to a query ESC sequence.
4162 */
3959 4163
3960/* 4164/*
3961 * Send printf () formatted output to the command. 4165 * Send printf () formatted output to the command.
3962 * Only use for small amounts of data. 4166 * Only use for small amounts of data.
3963 */ 4167 */
… …
3971 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4175 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3972 va_end (arg_ptr); 4176 va_end (arg_ptr);
3973 tt_write (buf, strlen (buf)); 4177 tt_write (buf, strlen (buf));
3974} 4178}
3975 4179
3976/* ---------------------------------------------------------------------- */
3977/* Write data to the pty as typed by the user, pasted with the mouse, 4180/* Write data to the pty as typed by the user. */
3978 * or generated by us in response to a query ESC sequence. 4181void
3979 */ 4182rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3980const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4183{
4184 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4185 return;
4186
4187 if (option (Opt_scrollTtyKeypress))
4188 if (view_start)
4189 {
4190 view_start = 0;
4191 want_refresh = 1;
4192 }
4193
4194 tt_write_ (data, len);
4195}
3981 4196
3982void 4197void
3983rxvt_term::tt_write (const char *data, unsigned int len) 4198rxvt_term::tt_write (const char *data, unsigned int len)
3984{ 4199{
3985 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4200 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3986 return; 4201 return;
3987 4202
4203 tt_write_ (data, len);
4204}
4205
4206static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4207
4208void
4209rxvt_term::tt_write_ (const char *data, unsigned int len)
4210{
3988 if (pty->pty < 0) 4211 if (pty->pty < 0)
3989 return; 4212 return;
3990 4213
3991 if (v_buflen == 0) 4214 if (v_buflen == 0)
3992 { 4215 {
3993 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4216 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3994 4217
4218 max_it (written, 0);
4219
3995 if ((unsigned int)written == len) 4220 if (written == len)
3996 return; 4221 return;
3997 4222
3998 data += written; 4223 data += written;
3999 len -= written; 4224 len -= written;
4000 } 4225 }
4001 4226
4002 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4227 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4003 4228
4004 memcpy (v_buffer + v_buflen, data, len); 4229 memcpy (v_buffer + v_buflen, data, len);
4005 v_buflen += len; 4230 v_buflen += len;
4006 4231
4007 pty_ev.set (EVENT_READ | EVENT_WRITE); 4232 pty_ev.set (ev::READ | ev::WRITE);
4008} 4233}
4009 4234
4010void rxvt_term::pty_write () 4235void rxvt_term::pty_write ()
4011{ 4236{
4012 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4237 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4017 4242
4018 if (v_buflen == 0) 4243 if (v_buflen == 0)
4019 { 4244 {
4020 free (v_buffer); 4245 free (v_buffer);
4021 v_buffer = 0; 4246 v_buffer = 0;
4022 v_buflen = 0;
4023 4247
4024 pty_ev.set (EVENT_READ); 4248 pty_ev.set (ev::READ);
4025 return; 4249 return;
4026 } 4250 }
4027 4251
4028 memmove (v_buffer, v_buffer + written, v_buflen); 4252 memmove (v_buffer, v_buffer + written, v_buflen);
4029 } 4253 }
4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4254 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4031 pty_ev.set (EVENT_READ); 4255 pty_ev.set (ev::READ);
4032} 4256}
4033 4257
4034/*----------------------- end-of-file (C source) -----------------------*/ 4258/*----------------------- end-of-file (C source) -----------------------*/
4035 4259

Diff Legend

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