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.338 by ayin, Tue Jul 31 17:39:39 2007 UTC vs.
Revision 1.565 by root, Tue Apr 28 12:38:19 2015 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
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 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1491 {
1492 resize_pixmap ();
1493 scr_touch (true);
1494 }
1495#endif
1496 } 1522 }
1523 else
1524 {
1525#ifdef HAVE_BG_PIXMAP
1526 if (moved)
1527 update_background ();
1528#endif
1529 }
1497 1530
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1531 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent))
1502 check_our_parents ();
1503#endif
1504 } 1532 }
1505 break; 1533 break;
1506 1534
1507 case PropertyNotify: 1535 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1536 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1509 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1510 && ev.xproperty.state == PropertyNewValue)
1511 selection_property (ev.xproperty.window, ev.xproperty.atom);
1512
1513 break; 1537 break;
1514 1538
1515 case SelectionClear: 1539 case SelectionClear:
1516 selection_clear (); 1540 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1517 break;
1518
1519 case SelectionNotify:
1520 if (selection_wait == Sel_normal)
1521 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1522 break; 1541 break;
1523 1542
1524 case SelectionRequest: 1543 case SelectionRequest:
1525 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1526 break; 1545 break;
1527 1546
1528 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
1529 mapped = 1; 1559 mapped = 1;
1530#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1561 text_blink_ev.start ();
1532#endif 1562#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1534 break; 1564 break;
1535 1565
1536 case UnmapNotify: 1566 case UnmapNotify:
… …
1538#ifdef TEXT_BLINK 1568#ifdef TEXT_BLINK
1539 text_blink_ev.stop (); 1569 text_blink_ev.stop ();
1540#endif 1570#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1571 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1572 break;
1543
1544#ifdef ENABLE_TRANSPARENCY
1545 case ReparentNotify:
1546 rootwin_cb (ev);
1547 break;
1548#endif /* ENABLE_TRANSPARENCY */
1549 1573
1550 case GraphicsExpose: 1574 case GraphicsExpose:
1551 case Expose: 1575 case Expose:
1552 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1553 { 1577 {
1554 do 1578 do
1579 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1580 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1581 ev.xexpose.width, ev.xexpose.height, false);
1582 }
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1583 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1558 1584
1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1585 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1560 1586
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1587 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1588 {
1562 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1563 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1591 }
1564 1592
1565 want_refresh = 1; 1593 want_refresh = 1;
1566 } 1594 }
1567 else 1595 else
1568 { 1596 {
… …
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1599 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1572 ; 1600 ;
1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1574 ; 1602 ;
1575 1603
1576 if (isScrollbarWindow (ev.xany.window)) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1577 { 1605 {
1578 scrollBar.setIdle (); 1606 scrollBar.state = SB_STATE_IDLE;
1579 scrollbar_show (0); 1607 scrollBar.show (0);
1580 } 1608 }
1581
1582#ifdef ENABLE_TRANSPARENCY
1583 if (am_transparent && ev.xany.window == parent[0])
1584 XClearWindow (dpy, ev.xany.window);
1585#endif
1586 } 1609 }
1587 break; 1610 break;
1588 1611
1589 case MotionNotify: 1612 case MotionNotify:
1590#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1591 if (hidden_pointer) 1614 if (hidden_pointer)
1592 pointer_unblank (); 1615 pointer_unblank ();
1593#endif 1616#endif
1617 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1618 || priv_modes & PrivMode_MouseAnyEvent)
1619 mouse_report (ev.xbutton);
1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1620 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1595 break; 1621 break;
1596 1622
1597 if (ev.xany.window == vt) 1623 if (ev.xany.window == vt)
1598 { 1624 {
… …
1609 &unused_root_x, &unused_root_y, 1635 &unused_root_x, &unused_root_y,
1610 &ev.xbutton.x, &ev.xbutton.y, 1636 &ev.xbutton.x, &ev.xbutton.y,
1611 &ev.xbutton.state); 1637 &ev.xbutton.state);
1612#ifdef MOUSE_THRESHOLD 1638#ifdef MOUSE_THRESHOLD
1613 /* deal with a `jumpy' mouse */ 1639 /* deal with a `jumpy' mouse */
1614 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1640 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1641#endif
1615 { 1642 {
1616#endif
1617#if ISO_14755 1643#if ISO_14755
1618 // 5.4 1644 // 5.4
1619 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1645 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1620 { 1646 {
1621 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1647 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1627 1653
1628#ifdef SELECTION_SCROLLING 1654#ifdef SELECTION_SCROLLING
1629 if (ev.xbutton.y < int_bwidth 1655 if (ev.xbutton.y < int_bwidth
1630 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1656 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1631 { 1657 {
1658 page_dirn scroll_selection_dir;
1632 int dist; 1659 int dist;
1633 1660
1634 /* don't clobber the current delay if we are 1661 /* don't clobber the current delay if we are
1635 * already in the middle of scrolling. 1662 * already in the middle of scrolling.
1636 */ 1663 */
1637 if (!sel_scroll_ev.active) 1664 if (!sel_scroll_ev.is_active ())
1638 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1665 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1639 1666
1640 /* save the event params so we can highlight 1667 /* save the event params so we can highlight
1641 * the selection in the pending-scroll loop 1668 * the selection in the pending-scroll loop
1642 */ 1669 */
1643 selection_save_x = ev.xbutton.x; 1670 selection_save_x = ev.xbutton.x;
… …
1651 dist = int_bwidth - ev.xbutton.y; 1678 dist = int_bwidth - ev.xbutton.y;
1652 } 1679 }
1653 else 1680 else
1654 { 1681 {
1655 scroll_selection_dir = DN; 1682 scroll_selection_dir = DN;
1656 dist = ev.xbutton.y - (int_bwidth + height); 1683 dist = ev.xbutton.y - (int_bwidth + vt_height);
1657 } 1684 }
1658 1685
1659 scroll_selection_lines = Pixel2Height (dist) 1686 scroll_selection_lines = Pixel2Height (dist)
1660 / SELECTION_SCROLL_LINE_SPEEDUP 1687 / SELECTION_SCROLL_LINE_SPEEDUP
1661 + 1; 1688 + 1;
1662 min_it (scroll_selection_lines, 1689 min_it (scroll_selection_lines,
1663 SELECTION_SCROLL_MAX_LINES); 1690 SELECTION_SCROLL_MAX_LINES);
1691 scroll_selection_lines *= scroll_selection_dir;
1664 } 1692 }
1665 else 1693 else
1666 { 1694 {
1667 /* we are within the text window, so we 1695 /* we are within the text window, so we
1668 * shouldn't be scrolling 1696 * shouldn't be scrolling
1669 */ 1697 */
1670 if (sel_scroll_ev.active)
1671 sel_scroll_ev.stop(); 1698 sel_scroll_ev.stop();
1672 } 1699 }
1673#endif 1700#endif
1674#ifdef MOUSE_THRESHOLD
1675 } 1701 }
1676#endif
1677 } 1702 }
1678 } 1703 }
1679 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1704 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1680 { 1705 {
1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1706 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1682 MotionNotify, &ev)) 1707 MotionNotify, &ev))
1683 ; 1708 ;
1684 1709
1685 XQueryPointer (dpy, scrollBar.win, 1710 XQueryPointer (dpy, scrollBar.win,
1686 &unused_root, &unused_child, 1711 &unused_root, &unused_child,
1687 &unused_root_x, &unused_root_y, 1712 &unused_root_x, &unused_root_y,
1688 &ev.xbutton.x, &ev.xbutton.y, 1713 &ev.xbutton.x, &ev.xbutton.y,
1689 &unused_mask); 1714 &unused_mask);
1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1715 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1691 scrollbar_size ()); 1716 scrollBar.size ());
1692 want_refresh = 1; 1717 want_refresh = 1;
1693 scrollbar_show (1); 1718 scrollBar.show (1);
1694 } 1719 }
1695 break; 1720 break;
1696 } 1721 }
1697 1722
1698#if defined(CURSOR_BLINK) 1723#if defined(CURSOR_BLINK)
1699 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1724 if (ev.type == KeyPress)
1700 { 1725 cursor_blink_reset ();
1701 if (hidden_cursor)
1702 {
1703 hidden_cursor = 0;
1704 want_refresh = 1;
1705 }
1706
1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1708 }
1709#endif 1726#endif
1710 1727
1711#if defined(POINTER_BLANK) 1728#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1729 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1713 { 1730 {
… …
1719 1736
1720 if (ev.type == KeyPress && hidden_pointer == 0) 1737 if (ev.type == KeyPress && hidden_pointer == 0)
1721 pointer_blank (); 1738 pointer_blank ();
1722 } 1739 }
1723#endif 1740#endif
1724}
1725 1741
1726void 1742 refresh_check ();
1743}
1744
1745#if ENABLE_FRILLS
1746void ecb_cold
1747rxvt_term::set_urgency (bool enable)
1748{
1749 if (enable == urgency_hint)
1750 return;
1751
1752 if (XWMHints *h = XGetWMHints (dpy, parent))
1753 {
1754 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1755 XSetWMHints (dpy, parent, h);
1756 urgency_hint = enable;
1757 XFree (h);
1758 }
1759}
1760#endif
1761
1762void ecb_cold
1727rxvt_term::focus_in () 1763rxvt_term::focus_in ()
1728{ 1764{
1729 if (!focus) 1765 if (!focus)
1730 { 1766 {
1731 focus = 1; 1767 focus = 1;
1732 want_refresh = 1; 1768 want_refresh = 1;
1733 1769
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1735
1736#if USE_XIM 1770#if USE_XIM
1737 if (Input_Context != NULL) 1771 if (Input_Context != NULL)
1738 { 1772 {
1739 IMSetPosition (); 1773 im_set_position ();
1740 XSetICFocus (Input_Context); 1774 XSetICFocus (Input_Context);
1741 } 1775 }
1742#endif 1776#endif
1743#if CURSOR_BLINK 1777#if CURSOR_BLINK
1744 if (option (Opt_cursorBlink)) 1778 if (option (Opt_cursorBlink))
1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1779 cursor_blink_ev.again ();
1746#endif 1780#endif
1747#if OFF_FOCUS_FADING 1781#if OFF_FOCUS_FADING
1748 if (rs[Rs_fade]) 1782 if (rs[Rs_fade])
1749 { 1783 {
1750 pix_colors = pix_colors_focused; 1784 pix_colors = pix_colors_focused;
1751 scr_recolour (); 1785 scr_recolor ();
1752 } 1786 }
1753#endif 1787#endif
1754#if ENABLE_FRILLS 1788#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell)) 1789 if (option (Opt_urgentOnBell))
1756 { 1790 set_urgency (0);
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]);
1760 if (h != NULL)
1761 {
1762 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h);
1764 }
1765 }
1766#endif 1791#endif
1767 }
1768}
1769 1792
1770void 1793 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1794 }
1795}
1796
1797void ecb_cold
1771rxvt_term::focus_out () 1798rxvt_term::focus_out ()
1772{ 1799{
1773 if (focus) 1800 if (focus)
1774 { 1801 {
1775 focus = 0; 1802 focus = 0;
1776 want_refresh = 1; 1803 want_refresh = 1;
1777 1804
1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1805#if ENABLE_FRILLS
1779 1806 if (option (Opt_urgentOnBell))
1807 set_urgency (0);
1808#endif
1780#if ENABLE_FRILLS || ISO_14755 1809#if ENABLE_FRILLS || ISO_14755
1781 if (iso14755buf) 1810 if (iso14755buf)
1782 { 1811 {
1783 iso14755buf = 0; 1812 iso14755buf = 0;
1784# if ISO_14755 1813# if ISO_14755
… …
1791 XUnsetICFocus (Input_Context); 1820 XUnsetICFocus (Input_Context);
1792#endif 1821#endif
1793#if CURSOR_BLINK 1822#if CURSOR_BLINK
1794 if (option (Opt_cursorBlink)) 1823 if (option (Opt_cursorBlink))
1795 cursor_blink_ev.stop (); 1824 cursor_blink_ev.stop ();
1825
1796 hidden_cursor = 0; 1826 hidden_cursor = 0;
1797#endif 1827#endif
1798#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1799 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1800 { 1830 {
1801 pix_colors = pix_colors_unfocused; 1831 pix_colors = pix_colors_unfocused;
1802 scr_recolour (); 1832 scr_recolor ();
1803 } 1833 }
1804#endif 1834#endif
1805 }
1806}
1807 1835
1808void 1836 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1837 }
1838}
1839
1840void ecb_cold
1809rxvt_term::update_fade_color (unsigned int idx) 1841rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1810{ 1842{
1811#if OFF_FOCUS_FADING 1843#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1844 if (rs[Rs_fade])
1813 { 1845 {
1846 if (!first_time)
1847 pix_colors_focused [idx].free (this);
1848
1814 rgba c; 1849 rgba c;
1815 pix_colors [Color_fade].get (c); 1850 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1851 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 } 1852 }
1818#endif 1853#endif
1819} 1854}
1820 1855
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL 1856#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1822void 1857void ecb_hot
1823rxvt_term::rootwin_cb (XEvent &ev) 1858rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1859{
1825 make_current (); 1860 make_current ();
1826 1861
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1862 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1863 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return; 1864 return;
1830 1865
1831# if ENABLE_TRANSPARENCY
1832 switch (ev.type) 1866 switch (ev.type)
1833 { 1867 {
1834 case PropertyNotify: 1868 case PropertyNotify:
1835 /* 1869 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1870 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1871 * use the property to determine the pixmap. We use it later on.
1838 */ 1872 */
1839 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1873 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1874 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 return; 1875 {
1842 1876#if BG_IMAGE_FROM_ROOT
1843 /* FALLTHROUGH */
1844 case ReparentNotify:
1845 if (option (Opt_transparent)) 1877 if (option (Opt_transparent))
1846 check_our_parents (); 1878 {
1847 break; 1879 rxvt_img::new_from_root (this)->replace (root_img);
1848 } 1880 update_background ();
1881 }
1849# endif 1882#endif
1883 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1884 }
1885
1886 break;
1887 }
1888
1889 refresh_check ();
1850} 1890}
1851#endif 1891#endif
1852 1892
1853void 1893void
1854rxvt_term::button_press (XButtonEvent &ev) 1894rxvt_term::button_press (XButtonEvent &ev)
… …
1875 iso14755_54 (ev.x, ev.y); 1915 iso14755_54 (ev.x, ev.y);
1876 return; 1916 return;
1877 } 1917 }
1878#endif 1918#endif
1879 1919
1880 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1920 clickintime = ev.time - MEvent.time < multiClickTime;
1881 1921
1882 if (reportmode) 1922 if (reportmode)
1883 { 1923 {
1884 /* mouse report from vt window */ 1924 /* mouse report from vt window */
1885 /* save the xbutton state (for ButtonRelease) */ 1925 /* save the xbutton state (for ButtonRelease) */
1886 MEvent.state = ev.state; 1926 MEvent.state = ev.state;
1887#ifdef MOUSE_REPORT_DOUBLECLICK 1927#ifdef MOUSE_REPORT_DOUBLECLICK
1888 if (ev.button == MEvent.button && clickintime) 1928 if (ev.button == MEvent.button && clickintime)
1889 { 1929 {
1890 /* same button, within alloted time */ 1930 /* same button, within allowed time */
1891 MEvent.clicks++; 1931 MEvent.clicks++;
1892 1932
1893 if (MEvent.clicks > 1) 1933 if (MEvent.clicks > 1)
1894 { 1934 {
1895 /* only report double clicks */ 1935 /* only report double clicks */
… …
1909 mouse_report (ev); 1949 mouse_report (ev);
1910 } 1950 }
1911#else 1951#else
1912 MEvent.button = ev.button; 1952 MEvent.button = ev.button;
1913 mouse_report (ev); 1953 mouse_report (ev);
1914#endif /* MOUSE_REPORT_DOUBLECLICK */ 1954#endif /* MOUSE_REPORT_DOUBLECLICK */
1915 1955
1916 } 1956 }
1917 else 1957 else
1918 { 1958 {
1919 if (ev.button != MEvent.button) 1959 if (ev.button != MEvent.button)
… …
1967 } 2007 }
1968 2008
1969 /* 2009 /*
1970 * Scrollbar window processing of button press 2010 * Scrollbar window processing of button press
1971 */ 2011 */
1972 if (isScrollbarWindow (ev.window)) 2012 if (scrollBar.state && ev.window == scrollBar.win)
1973 { 2013 {
1974 scrollBar.setIdle (); 2014 page_dirn direction = NO_DIR;
2015
2016 if (scrollBar.upButton (ev.y))
2017 direction = UP; /* up */
2018 else if (scrollBar.dnButton (ev.y))
2019 direction = DN; /* down */
2020
2021 scrollBar.state = SB_STATE_IDLE;
1975 /* 2022 /*
1976 * Rxvt-style scrollbar: 2023 * Rxvt-style scrollbar:
1977 * move up if mouse is above slider 2024 * move up if mouse is above slider
1978 * move dn if mouse is below slider 2025 * move dn if mouse is below slider
1979 * 2026 *
… …
1988 /* 2035 /*
1989 * Mouse report disabled scrollbar: 2036 * Mouse report disabled scrollbar:
1990 * arrow buttons - send up/down 2037 * arrow buttons - send up/down
1991 * click on scrollbar - send pageup/down 2038 * click on scrollbar - send pageup/down
1992 */ 2039 */
1993 if ((scrollBar.style == R_SB_NEXT 2040 if (direction == UP)
1994 && scrollbarnext_upButton (ev.y))
1995 || (scrollBar.style == R_SB_RXVT
1996 && scrollbarrxvt_upButton (ev.y)))
1997 tt_printf ("\033[A"); 2041 tt_printf ("\033[A");
1998 else if ((scrollBar.style == R_SB_NEXT 2042 else if (direction == DN)
1999 && scrollbarnext_dnButton (ev.y))
2000 || (scrollBar.style == R_SB_RXVT
2001 && scrollbarrxvt_dnButton (ev.y)))
2002 tt_printf ("\033[B"); 2043 tt_printf ("\033[B");
2003 else 2044 else
2004 switch (ev.button) 2045 switch (ev.button)
2005 { 2046 {
2006 case Button2: 2047 case Button2:
… …
2013 tt_printf ("\033[5~"); 2054 tt_printf ("\033[5~");
2014 break; 2055 break;
2015 } 2056 }
2016 } 2057 }
2017 else 2058 else
2018#endif /* NO_SCROLLBAR_REPORT */ 2059#endif /* NO_SCROLLBAR_REPORT */
2019
2020 {
2021 char upordown = 0;
2022
2023 if (scrollBar.style == R_SB_NEXT)
2024 { 2060 {
2025 if (scrollbarnext_upButton (ev.y)) 2061 if (direction != NO_DIR)
2026 upordown = -1; /* up */
2027 else if (scrollbarnext_dnButton (ev.y))
2028 upordown = 1; /* down */
2029 }
2030 else if (scrollBar.style == R_SB_RXVT)
2031 {
2032 if (scrollbarrxvt_upButton (ev.y))
2033 upordown = -1; /* up */
2034 else if (scrollbarrxvt_dnButton (ev.y))
2035 upordown = 1; /* down */
2036 }
2037 if (upordown)
2038 { 2062 {
2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2064 if (!cont_scroll_ev.is_active ())
2040 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2065 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2041#endif 2066#endif
2042 if (scr_page (upordown < 0 ? UP : DN, 1)) 2067 if (scr_page (direction, 1))
2043 { 2068 {
2044 if (upordown < 0) 2069 if (direction == UP)
2045 scrollBar.setUp (); 2070 scrollBar.state = SB_STATE_UP;
2046 else 2071 else
2047 scrollBar.setDn (); 2072 scrollBar.state = SB_STATE_DOWN;
2048 } 2073 }
2049 } 2074 }
2050 else 2075 else
2051 switch (ev.button) 2076 switch (ev.button)
2052 { 2077 {
2053 case Button2: 2078 case Button2:
2054 switch (scrollbar_align) 2079 switch (scrollBar.align)
2055 { 2080 {
2056 case R_SB_ALIGN_TOP: 2081 case SB_ALIGN_TOP:
2057 csrO = 0; 2082 csrO = 0;
2058 break; 2083 break;
2059 case R_SB_ALIGN_CENTRE: 2084 case SB_ALIGN_CENTRE:
2060 csrO = (scrollBar.bot - scrollBar.top) / 2; 2085 csrO = (scrollBar.bot - scrollBar.top) / 2;
2061 break; 2086 break;
2062 case R_SB_ALIGN_BOTTOM: 2087 case SB_ALIGN_BOTTOM:
2063 csrO = scrollBar.bot - scrollBar.top; 2088 csrO = scrollBar.bot - scrollBar.top;
2064 break; 2089 break;
2065 } 2090 }
2066 2091
2067 if (scrollBar.style == R_SB_XTERM 2092 if (scrollBar.style == SB_STYLE_XTERM
2068 || scrollbar_above_slider (ev.y) 2093 || scrollBar.above_slider (ev.y)
2069 || scrollbar_below_slider (ev.y)) 2094 || scrollBar.below_slider (ev.y))
2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2095 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2071 2096
2072 scrollBar.setMotion (); 2097 scrollBar.state = SB_STATE_MOTION;
2073 break; 2098 break;
2074 2099
2075 case Button1: 2100 case Button1:
2076 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2101 if (scrollBar.align == SB_ALIGN_CENTRE)
2077 csrO = ev.y - scrollBar.top; 2102 csrO = ev.y - scrollBar.top;
2078 /* FALLTHROUGH */ 2103 /* FALLTHROUGH */
2079 2104
2080 case Button3: 2105 case Button3:
2081 if (scrollBar.style != R_SB_XTERM) 2106 if (scrollBar.style != SB_STYLE_XTERM)
2082 { 2107 {
2083 if (scrollbar_above_slider (ev.y)) 2108 if (scrollBar.above_slider (ev.y))
2084# ifdef RXVT_SCROLL_FULL 2109# ifdef RXVT_SCROLL_FULL
2085 scr_page (UP, nrow - 1); 2110 scr_page (UP, nrow - 1);
2086# else 2111# else
2087 scr_page (UP, nrow / 4); 2112 scr_page (UP, nrow / 4);
2088# endif 2113# endif
2089 else if (scrollbar_below_slider (ev.y)) 2114 else if (scrollBar.below_slider (ev.y))
2090# ifdef RXVT_SCROLL_FULL 2115# ifdef RXVT_SCROLL_FULL
2091 scr_page (DN, nrow - 1); 2116 scr_page (DN, nrow - 1);
2092# else 2117# else
2093 scr_page (DN, nrow / 4); 2118 scr_page (DN, nrow / 4);
2094# endif 2119# endif
2095 else 2120 else
2096 scrollBar.setMotion (); 2121 scrollBar.state = SB_STATE_MOTION;
2097 } 2122 }
2098 else 2123 else
2099 { 2124 {
2100 scr_page ((ev.button == Button1 ? DN : UP), 2125 scr_page ((ev.button == Button1 ? DN : UP),
2101 (nrow 2126 (nrow
2102 * scrollbar_position (ev.y) 2127 * scrollBar.position (ev.y)
2103 / scrollbar_size ())); 2128 / scrollBar.size ()));
2104 } 2129 }
2105 2130
2106 break; 2131 break;
2107 } 2132 }
2108 } 2133 }
… …
2118 2143
2119 csrO = 0; /* reset csr Offset */ 2144 csrO = 0; /* reset csr Offset */
2120 if (!bypass_keystate) 2145 if (!bypass_keystate)
2121 reportmode = !! (priv_modes & PrivMode_mouse_report); 2146 reportmode = !! (priv_modes & PrivMode_mouse_report);
2122 2147
2123 if (scrollbar_isUpDn ()) 2148 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2124 { 2149 {
2125 scrollBar.setIdle (); 2150 scrollBar.state = SB_STATE_IDLE;
2126 scrollbar_show (0); 2151 scrollBar.show (0);
2127 } 2152 }
2128 2153
2129#ifdef SELECTION_SCROLLING 2154#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2155 sel_scroll_ev.stop();
2132#endif 2156#endif
2133 2157
2134 if (ev.window == vt) 2158 if (ev.window == vt)
2135 { 2159 {
2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2160 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2151#ifdef MOUSE_REPORT_DOUBLECLICK 2175#ifdef MOUSE_REPORT_DOUBLECLICK
2152 /* only report the release of 'slow' single clicks */ 2176 /* only report the release of 'slow' single clicks */
2153 if (MEvent.button != AnyButton 2177 if (MEvent.button != AnyButton
2154 && (ev.button != MEvent.button 2178 && (ev.button != MEvent.button
2155 || (ev.time - MEvent.time 2179 || (ev.time - MEvent.time
2156 > MULTICLICK_TIME / 2))) 2180 > multiClickTime / 2)))
2157 { 2181 {
2158 MEvent.clicks = 0; 2182 MEvent.clicks = 0;
2159 MEvent.button = AnyButton; 2183 MEvent.button = AnyButton;
2160 mouse_report (ev); 2184 mouse_report (ev);
2161 } 2185 }
2162#else /* MOUSE_REPORT_DOUBLECLICK */ 2186#else /* MOUSE_REPORT_DOUBLECLICK */
2163 MEvent.button = AnyButton; 2187 MEvent.button = AnyButton;
2164 mouse_report (ev); 2188 mouse_report (ev);
2165#endif /* MOUSE_REPORT_DOUBLECLICK */ 2189#endif /* MOUSE_REPORT_DOUBLECLICK */
2166 return; 2190 return;
2167 } 2191 }
2168 2192
2169 /* 2193 /*
2170 * dumb hack to compensate for the failure of click-and-drag 2194 * dumb hack to compensate for the failure of click-and-drag
… …
2181 case Button3: 2205 case Button3:
2182 selection_make (ev.time); 2206 selection_make (ev.time);
2183 break; 2207 break;
2184 2208
2185 case Button2: 2209 case Button2:
2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2210 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2211 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2188 break; 2212 break;
2189 2213
2190#ifdef MOUSE_WHEEL 2214#ifdef MOUSE_WHEEL
2191 case Button4: 2215 case Button4:
2192 case Button5: 2216 case Button5:
2193 { 2217 {
2194 int i; 2218 int lines;
2195 page_dirn v; 2219 page_dirn dirn;
2196 2220
2197 v = ev.button == Button4 ? UP : DN; 2221 dirn = ev.button == Button4 ? UP : DN;
2198 2222
2199 if (ev.state & ShiftMask) 2223 if (ev.state & ShiftMask)
2200 i = 1; 2224 lines = 1;
2201 else if (option (Opt_mouseWheelScrollPage)) 2225 else if (option (Opt_mouseWheelScrollPage))
2202 i = nrow - 1; 2226 lines = nrow - 1;
2203 else 2227 else
2204 i = 5; 2228 lines = 5;
2205 2229
2206# ifdef MOUSE_SLIP_WHEELING 2230# ifdef MOUSE_SLIP_WHEELING
2207 if (ev.state & ControlMask) 2231 if (ev.state & ControlMask)
2208 { 2232 {
2209 mouse_slip_wheel_speed += v ? -1 : 1; 2233 mouse_slip_wheel_speed += dirn;
2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2234 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2212 2235
2213 if (slip_wheel_ev.at < NOW) 2236 if (!slip_wheel_ev.is_active ())
2214 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2237 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2215
2216 slip_wheel_ev.start ();
2217 } 2238 }
2218 else 2239 else
2240# endif
2219 { 2241 {
2220# endif
2221 scr_page (v, i); 2242 scr_page (dirn, lines);
2222 scrollbar_show (1); 2243 scrollBar.show (1);
2223# ifdef MOUSE_SLIP_WHEELING
2224 } 2244 }
2225# endif
2226 } 2245 }
2227 break; 2246 break;
2228#endif 2247#endif
2229 } 2248 }
2230 } 2249 }
2231} 2250}
2232 2251
2233/*}}} */ 2252/*}}} */
2234 2253
2235bool 2254void ecb_hot
2236rxvt_term::cmd_parse () 2255rxvt_term::cmd_parse ()
2237{ 2256{
2238 bool flag = false;
2239 wchar_t ch = NOCHAR; 2257 wchar_t ch = NOCHAR;
2240 char *seq_begin; // remember start of esc-sequence here 2258 char *seq_begin; // remember start of esc-sequence here
2241 2259
2242 for (;;) 2260 for (;;)
2243 { 2261 {
2244 if (ch == NOCHAR) 2262 if (ecb_unlikely (ch == NOCHAR))
2245 { 2263 {
2246 seq_begin = cmdbuf_ptr; 2264 seq_begin = cmdbuf_ptr;
2247 ch = next_char (); 2265 ch = next_char ();
2248 2266
2249 if (ch == NOCHAR) 2267 if (ch == NOCHAR)
2250 break; 2268 break;
2251 } 2269 }
2252 2270
2253 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2271 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2254 { 2272 {
2255 if (!seen_input) 2273 if (ecb_unlikely (!seen_input))
2256 { 2274 {
2257 seen_input = 1; 2275 seen_input = 1;
2258 // many badly-written programs (e.g. jed) contain a race condition: 2276 // many badly-written programs (e.g. jed) contain a race condition:
2259 // they first read the screensize and then install a SIGWINCH handler. 2277 // they first read the screensize and then install a SIGWINCH handler.
2260 // some window managers resize the window early, and these programs 2278 // some window managers resize the window early, and these programs
… …
2273 wchar_t *str = buf; 2291 wchar_t *str = buf;
2274 wchar_t *eol = str + min (ncol, UBUFSIZ); 2292 wchar_t *eol = str + min (ncol, UBUFSIZ);
2275 2293
2276 for (;;) 2294 for (;;)
2277 { 2295 {
2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2296 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2279 break; 2297 break;
2280 2298
2281 *str++ = ch; 2299 *str++ = ch;
2282 2300
2283 if (ch == C0_LF || str >= eol) 2301 if (ecb_unlikely (ch == C0_LF || str >= eol))
2284 { 2302 {
2285 if (ch == C0_LF) 2303 if (ch == C0_LF)
2286 nlines++; 2304 nlines++;
2287 2305
2288 refresh_count++; 2306 refresh_count++;
2289 2307
2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2308 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2291 { 2309 {
2292 refresh_count = 0; 2310 refresh_count = 0;
2293 2311
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2312 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2295 { 2313 {
2296 refreshnow = true; 2314 refreshnow = true;
2297 ch = NOCHAR; 2315 ch = NOCHAR;
2298 break; 2316 break;
2299 } 2317 }
… …
2337 * What the heck we'll cheat and only refresh less than every page-full. 2355 * What the heck we'll cheat and only refresh less than every page-full.
2338 * if skipScroll is enabled. 2356 * if skipScroll is enabled.
2339 */ 2357 */
2340 if (refreshnow) 2358 if (refreshnow)
2341 { 2359 {
2342 flag = true;
2343 scr_refresh (); 2360 scr_refresh ();
2344 want_refresh = 1; 2361 want_refresh = 1;
2345 } 2362 }
2346
2347 } 2363 }
2348 else 2364 else
2349 { 2365 {
2350 try 2366 try
2351 { 2367 {
… …
2359 } 2375 }
2360 2376
2361 ch = NOCHAR; 2377 ch = NOCHAR;
2362 } 2378 }
2363 } 2379 }
2364
2365 return flag;
2366} 2380}
2367 2381
2368// read the next character 2382// read the next character
2369wchar_t 2383wchar_t ecb_hot
2370rxvt_term::next_char () NOTHROW 2384rxvt_term::next_char () NOTHROW
2371{ 2385{
2372 while (cmdbuf_ptr < cmdbuf_endp) 2386 while (cmdbuf_ptr < cmdbuf_endp)
2373 { 2387 {
2374 // assume 7-bit to be ascii ALWAYS 2388 // assume 7-bit to be ascii ALWAYS
2375 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2389 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2376 return *cmdbuf_ptr++; 2390 return *cmdbuf_ptr++;
2377 2391
2378 wchar_t wc; 2392 wchar_t wc;
2379 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2393 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2380 2394
… …
2384 cmdbuf_ptr = cmdbuf_endp; 2398 cmdbuf_ptr = cmdbuf_endp;
2385 break; 2399 break;
2386 } 2400 }
2387 2401
2388 if (len == (size_t)-1) 2402 if (len == (size_t)-1)
2403 {
2404 mbstate.reset (); // reset now undefined conversion state
2405 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2406 // in which case we "erroneously" return the next byte which might be valid.
2389 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2407 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2408 }
2390 2409
2391 // assume wchar == unicode 2410 // assume wchar == unicode
2392 cmdbuf_ptr += len; 2411 cmdbuf_ptr += len;
2393 return wc & UNICODE_MASK; 2412 return wc & UNICODE_MASK;
2394 } 2413 }
2395 2414
2396 return NOCHAR; 2415 return NOCHAR;
2397} 2416}
2398 2417
2399// read the next octet 2418// read the next octet
2400uint32_t 2419uint32_t ecb_hot
2401rxvt_term::next_octet () NOTHROW 2420rxvt_term::next_octet () NOTHROW
2402{ 2421{
2403 return cmdbuf_ptr < cmdbuf_endp 2422 return cmdbuf_ptr < cmdbuf_endp
2404 ? (unsigned char)*cmdbuf_ptr++ 2423 ? (unsigned char)*cmdbuf_ptr++
2405 : NOCHAR; 2424 : NOCHAR;
2406} 2425}
2407 2426
2408static class out_of_input out_of_input; 2427static class out_of_input out_of_input;
2409 2428
2410/* rxvt_cmd_getc () - Return next input character */ 2429wchar_t ecb_hot
2411/*
2412 * Return the next input character after first passing any keyboard input
2413 * to the command.
2414 */
2415wchar_t
2416rxvt_term::cmd_getc () THROW ((class out_of_input)) 2430rxvt_term::cmd_getc () THROW ((class out_of_input))
2417{ 2431{
2418 wchar_t c = next_char (); 2432 wchar_t c = next_char ();
2419 2433
2420 if (c == NOCHAR) 2434 if (c == NOCHAR)
2421 throw out_of_input; 2435 throw out_of_input;
2422 2436
2423 return c; 2437 return c;
2424} 2438}
2425 2439
2426uint32_t 2440uint32_t ecb_hot
2427rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2441rxvt_term::cmd_get8 () THROW ((class out_of_input))
2428{ 2442{
2429 uint32_t c = next_octet (); 2443 uint32_t c = next_octet ();
2430 2444
2431 if (c == NOCHAR) 2445 if (c == NOCHAR)
… …
2435} 2449}
2436 2450
2437/*{{{ print pipe */ 2451/*{{{ print pipe */
2438/*----------------------------------------------------------------------*/ 2452/*----------------------------------------------------------------------*/
2439#ifdef PRINTPIPE 2453#ifdef PRINTPIPE
2440FILE * 2454FILE * ecb_cold
2441rxvt_term::popen_printer () 2455rxvt_term::popen_printer ()
2442{ 2456{
2443 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2457 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2444 2458
2445 if (stream == NULL) 2459 if (stream == NULL)
2446 rxvt_warn ("can't open printer pipe, not printing.\n"); 2460 rxvt_warn ("can't open printer pipe, not printing.\n");
2447 2461
2448 return stream; 2462 return stream;
2449} 2463}
2450 2464
2451int 2465int ecb_cold
2452rxvt_term::pclose_printer (FILE *stream) 2466rxvt_term::pclose_printer (FILE *stream)
2453{ 2467{
2454 fflush (stream); 2468 fflush (stream);
2455 return pclose (stream); 2469 return pclose (stream);
2456} 2470}
2457 2471
2458/* 2472/*
2459 * simulate attached vt100 printer 2473 * simulate attached vt100 printer
2460 */ 2474 */
2461void 2475void ecb_cold
2462rxvt_term::process_print_pipe () 2476rxvt_term::process_print_pipe ()
2463{ 2477{
2464 int done; 2478 FILE *fd = popen_printer ();
2465 FILE *fd;
2466 2479
2467 if ((fd = popen_printer ()) == NULL) 2480 if (!fd)
2468 return; 2481 return;
2469 2482
2470 /* 2483 /*
2471 * Send all input to the printer until either ESC[4i or ESC[?4i 2484 * Send all input to the printer until either ESC[4i or ESC[?4i
2472 * is received. 2485 * is received.
2473 */ 2486 */
2474 for (done = 0; !done;) 2487 for (int done = 0; !done; )
2475 { 2488 {
2476 unsigned char buf[8]; 2489 unsigned char buf[8];
2477 unicode_t ch; 2490 unicode_t ch;
2478 unsigned int i, len; 2491 unsigned int i, len;
2479 2492
… …
2510 } 2523 }
2511 } 2524 }
2512 2525
2513 pclose_printer (fd); 2526 pclose_printer (fd);
2514} 2527}
2515#endif /* PRINTPIPE */ 2528#endif /* PRINTPIPE */
2516/*}}} */ 2529/*}}} */
2517 2530
2518/* *INDENT-OFF* */
2519enum { 2531enum {
2520 C1_40 = 0x40, 2532 C1_40 = 0x40,
2521 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2533 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2522 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2534 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2523 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2535 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2524 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2536 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2525}; 2537};
2526/* *INDENT-ON* */
2527 2538
2528/*{{{ process non-printing single characters */ 2539/*{{{ process non-printing single characters */
2529void 2540void ecb_hot
2530rxvt_term::process_nonprinting (unicode_t ch) 2541rxvt_term::process_nonprinting (unicode_t ch)
2531{ 2542{
2532 switch (ch) 2543 switch (ch)
2533 { 2544 {
2534 case C0_ESC: 2545 case C0_ESC:
… …
2564 scr_charset_choose (0); 2575 scr_charset_choose (0);
2565 break; 2576 break;
2566 2577
2567#ifdef EIGHT_BIT_CONTROLS 2578#ifdef EIGHT_BIT_CONTROLS
2568 // 8-bit controls 2579 // 8-bit controls
2569 case 0x90: /* DCS */ 2580 case 0x90: /* DCS */
2570 process_dcs_seq (); 2581 process_dcs_seq ();
2571 break; 2582 break;
2572 case 0x9b: /* CSI */ 2583 case 0x9b: /* CSI */
2573 process_csi_seq (); 2584 process_csi_seq ();
2574 break; 2585 break;
2575 case 0x9d: /* OSC */ 2586 case 0x9d: /* OSC */
2576 process_osc_seq (); 2587 process_osc_seq ();
2577 break; 2588 break;
2578#endif 2589#endif
2579 } 2590 }
2580} 2591}
2581/*}}} */ 2592/*}}} */
2582 2593
2583 2594
2584/*{{{ process VT52 escape sequences */ 2595/*{{{ process VT52 escape sequences */
2585void 2596void ecb_cold
2586rxvt_term::process_escape_vt52 (unicode_t ch) 2597rxvt_term::process_escape_vt52 (unicode_t ch)
2587{ 2598{
2588 int row, col; 2599 int row, col;
2589 2600
2590 switch (ch) 2601 switch (ch)
… …
2624 break; 2635 break;
2625 case 'Z': /* identify the terminal type */ 2636 case 'Z': /* identify the terminal type */
2626 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2637 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2627 break; 2638 break;
2628 case '<': /* turn off VT52 mode */ 2639 case '<': /* turn off VT52 mode */
2629 PrivMode (0, PrivMode_vt52); 2640 priv_modes &= ~PrivMode_vt52;
2630 break; 2641 break;
2631 case 'F': /* use special graphics character set */ 2642 case 'F': /* use special graphics character set */
2632 case 'G': /* use regular character set */ 2643 case 'G': /* use regular character set */
2633 /* unimplemented */ 2644 /* unimplemented */
2634 break; 2645 break;
… …
2640} 2651}
2641/*}}} */ 2652/*}}} */
2642 2653
2643 2654
2644/*{{{ process escape sequences */ 2655/*{{{ process escape sequences */
2645void 2656void ecb_hot
2646rxvt_term::process_escape_seq () 2657rxvt_term::process_escape_seq ()
2647{ 2658{
2648 unicode_t ch = cmd_getc (); 2659 unicode_t ch = cmd_getc ();
2649 2660
2650 if (priv_modes & PrivMode_vt52) 2661 if (priv_modes & PrivMode_vt52)
… …
2653 return; 2664 return;
2654 } 2665 }
2655 2666
2656 switch (ch) 2667 switch (ch)
2657 { 2668 {
2658 /* case 1: do_tek_mode (); break; */
2659 case '#': 2669 case '#':
2660 if (cmd_getc () == '8') 2670 if (cmd_getc () == '8')
2661 scr_E (); 2671 scr_E ();
2662 break; 2672 break;
2663 case '(': 2673 case '(':
… …
2686#if !ENABLE_MINIMAL 2696#if !ENABLE_MINIMAL
2687 case '9': 2697 case '9':
2688 scr_forwardindex (); 2698 scr_forwardindex ();
2689 break; 2699 break;
2690#endif 2700#endif
2701 // DECPAM/DECPNM
2691 case '=': 2702 case '=':
2703 priv_modes |= PrivMode_aplKP;
2704 break;
2692 case '>': 2705 case '>':
2693 PrivMode ((ch == '='), PrivMode_aplKP); 2706 priv_modes &= ~PrivMode_aplKP;
2694 break; 2707 break;
2695 2708
2696 case C1_40: 2709 case C1_40:
2697 cmd_getc (); 2710 cmd_getc ();
2698 break; 2711 break;
… …
2702 2715
2703 /* 8.3.87: NEXT LINE */ 2716 /* 8.3.87: NEXT LINE */
2704 case C1_NEL: /* ESC E */ 2717 case C1_NEL: /* ESC E */
2705 { 2718 {
2706 wchar_t nlcr[] = { C0_LF, C0_CR }; 2719 wchar_t nlcr[] = { C0_LF, C0_CR };
2707 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2720 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2708 } 2721 }
2709 break; 2722 break;
2710 2723
2711 /* kidnapped escape sequence: Should be 8.3.48 */ 2724 /* kidnapped escape sequence: Should be 8.3.48 */
2712 case C1_ESA: /* ESC G */ 2725 case C1_ESA: /* ESC G */
2713 process_graphics (); 2726 // used by original rxvt for rob nations own graphics mode
2727 if (cmd_getc () == 'Q')
2728 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2714 break; 2729 break;
2715 2730
2716 /* 8.3.63: CHARACTER TABULATION SET */ 2731 /* 8.3.63: CHARACTER TABULATION SET */
2717 case C1_HTS: /* ESC H */ 2732 case C1_HTS: /* ESC H */
2718 scr_set_tab (1); 2733 scr_set_tab (1);
… …
2722 case C1_RI: /* ESC M */ 2737 case C1_RI: /* ESC M */
2723 scr_index (DN); 2738 scr_index (DN);
2724 break; 2739 break;
2725 2740
2726 /* 8.3.142: SINGLE-SHIFT TWO */ 2741 /* 8.3.142: SINGLE-SHIFT TWO */
2727 /*case C1_SS2: scr_single_shift (2); break; */ 2742 /* case C1_SS2: break; */
2728 2743
2729 /* 8.3.143: SINGLE-SHIFT THREE */ 2744 /* 8.3.143: SINGLE-SHIFT THREE */
2730 /*case C1_SS3: scr_single_shift (3); break; */ 2745 /* case C1_SS3: break; */
2731 2746
2732 /* 8.3.27: DEVICE CONTROL STRING */ 2747 /* 8.3.27: DEVICE CONTROL STRING */
2733 case C1_DCS: /* ESC P */ 2748 case C1_DCS: /* ESC P */
2734 process_dcs_seq (); 2749 process_dcs_seq ();
2735 break; 2750 break;
… …
2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2752 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2738 case C1_SCI: /* ESC Z */ 2753 case C1_SCI: /* ESC Z */
2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2754 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2740 break; /* steal obsolete ESC [ c */ 2755 break; /* steal obsolete ESC [ c */
2741 2756
2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2757 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2743 case C1_CSI: /* ESC [ */ 2758 case C1_CSI: /* ESC [ */
2744 process_csi_seq (); 2759 process_csi_seq ();
2745 break; 2760 break;
2746 2761
2747 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2762 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2748 case C1_OSC: /* ESC ] */ 2763 case C1_OSC: /* ESC ] */
2749 process_osc_seq (); 2764 process_osc_seq ();
2750 break; 2765 break;
2751 2766
2752 /* 8.3.106: RESET TO INITIAL STATE */ 2767 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2753 case 'c': 2768 case 'c':
2754 mbstate.reset (); 2769 mbstate.reset ();
2755 scr_poweron (); 2770 scr_poweron ();
2756 scrollbar_show (1); 2771 scrollBar.show (1);
2757 break; 2772 break;
2758 2773
2759 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2774 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2760 case 'n': 2775 case 'n':
2761 scr_charset_choose (2); 2776 scr_charset_choose (2);
… …
2768 } 2783 }
2769} 2784}
2770/*}}} */ 2785/*}}} */
2771 2786
2772/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2787/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2773/* *INDENT-OFF* */
2774enum { 2788enum {
2775 CSI_ICH = 0x40, 2789 CSI_ICH = 0x40,
2776 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2790 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2777 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2791 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2778 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2792 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2781 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2795 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2782 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2796 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2783 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2797 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2784}; 2798};
2785 2799
2786#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2800#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2787 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2801 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2788 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2802 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2789#define get_byte_array_bit(array, bit) \ 2803#define get_byte_array_bit(array, bit) \
2790 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2804 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2791 2805
2792const unsigned char csi_defaults[] = 2806static const unsigned char csi_defaults[] =
2793 { 2807 {
2794 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2808 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2795 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2809 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2796 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2810 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2797 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2811 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2798 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2812 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2799 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2813 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2800 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2814 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2801 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2815 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2802 }; 2816 };
2803/* *INDENT-ON* */
2804 2817
2805void 2818void ecb_hot
2806rxvt_term::process_csi_seq () 2819rxvt_term::process_csi_seq ()
2807{ 2820{
2808 unicode_t ch, priv, i; 2821 unicode_t ch, priv, prev_ch, i;
2809 unsigned int nargs, p; 2822 unsigned int nargs, p;
2810 int n, ndef; 2823 int n, ndef;
2811 int arg[ESC_ARGS]; 2824 int arg[ESC_ARGS] = { };
2812 2825
2813 memset (arg, 0, sizeof (arg));
2814 nargs = 0; 2826 nargs = 0;
2815 2827
2816 priv = 0; 2828 priv = 0;
2817 ch = cmd_getc (); 2829 ch = cmd_getc ();
2818 if (ch >= '<' && ch <= '?') 2830 if ((ch >= '<' && ch <= '?') || ch == '!')
2831 {
2819 { /* '<' '=' '>' '?' */ 2832 /* '<' '=' '>' '?' '!' */
2820 priv = ch; 2833 priv = ch;
2821 ch = cmd_getc (); 2834 ch = cmd_getc ();
2822 } 2835 }
2823 2836
2837 prev_ch = 0;
2824 /* read any numerical arguments */ 2838 /* read any numerical arguments */
2825 for (n = -1; ch < CSI_ICH; ) 2839 for (n = -1; ch < CSI_ICH; )
2826 { 2840 {
2827 if (isdigit (ch)) 2841 if (isdigit (ch))
2828 { 2842 {
… …
2838 n = -1; 2852 n = -1;
2839 } 2853 }
2840 else if (IS_CONTROL (ch)) 2854 else if (IS_CONTROL (ch))
2841 process_nonprinting (ch); 2855 process_nonprinting (ch);
2842 2856
2857 prev_ch = ch;
2843 ch = cmd_getc (); 2858 ch = cmd_getc ();
2844 } 2859 }
2845 2860
2846 if (ch > CSI_7F) 2861 if (ch > CSI_7F)
2847 return; 2862 return;
… …
2867 { 2882 {
2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2883 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2884 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870 // 2885 //
2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2886 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2887 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2873 // that we do not support xterm mouse reporting (should be 95 when we do). 2888 // versions.
2874 // 2889 //
2875 tt_printf ("\033[>%d;94;0c", 'U'); 2890 tt_printf ("\033[>%d;95;0c", 'U');
2876 } 2891 }
2877 break; 2892 break;
2893
2878 case '?': 2894 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2895 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 2896 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 2897 break;
2898
2899 case '!':
2900 if (ch == CSI_70)
2901 {
2902 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2903 scr_soft_reset ();
2904
2905 static const int pm_h[] = { 7, 25 };
2906 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2907
2908 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2909 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2882 } 2910 }
2911 break;
2912 }
2913
2883 return; 2914 return;
2884 } 2915 }
2885 2916
2886 switch (ch) 2917 switch (ch)
2887 { 2918 {
… …
2901 } 2932 }
2902 break; 2933 break;
2903#endif 2934#endif
2904 2935
2905 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2936 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2906 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2937 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2907 arg[0] = -arg[0]; 2938 arg[0] = -arg[0];
2908 /* FALLTHROUGH */ 2939 /* FALLTHROUGH */
2909 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2940 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2910 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2941 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2911 scr_gotorc (arg[0], 0, RELATIVE); 2942 scr_gotorc (arg[0], 0, RELATIVE);
2912 break; 2943 break;
2913 2944
2914 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2945 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2915 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2946 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3065 scr_insert_mode (1); 3096 scr_insert_mode (1);
3066 else if (arg[0] == 20) 3097 else if (arg[0] == 20)
3067 priv_modes |= PrivMode_LFNL; 3098 priv_modes |= PrivMode_LFNL;
3068 break; 3099 break;
3069 3100
3101 case CSI_71: // DECSCUSR: set cursor style
3102 if (prev_ch == ' ')
3103 set_cursor_style (arg[0]);
3104 break;
3105
3070 /* 3106 /*
3071 * PRIVATE USE beyond this point. All CSI_7? sequences here 3107 * PRIVATE USE beyond this point. All CSI_7? sequences here
3072 */ 3108 */
3073 case CSI_72: /* DECSTBM: set top and bottom margins */ 3109 case CSI_72: /* DECSTBM: set top and bottom margins */
3074 if (nargs == 1) 3110 if (nargs == 1)
… …
3102 } 3138 }
3103} 3139}
3104/*}}} */ 3140/*}}} */
3105 3141
3106#if !ENABLE_MINIMAL 3142#if !ENABLE_MINIMAL
3107/* ARGSUSED */
3108void 3143void
3109rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3144rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3110{ 3145{
3111 int x, y; 3146 int x, y;
3112 XWindowAttributes wattr; 3147 XWindowAttributes wattr;
… …
3121 { 3156 {
3122 /* 3157 /*
3123 * commands 3158 * commands
3124 */ 3159 */
3125 case 1: /* deiconify window */ 3160 case 1: /* deiconify window */
3126 XMapWindow (dpy, parent[0]); 3161 XMapWindow (dpy, parent);
3127 break; 3162 break;
3128 case 2: /* iconify window */ 3163 case 2: /* iconify window */
3129 XIconifyWindow (dpy, parent[0], display->screen); 3164 XIconifyWindow (dpy, parent, display->screen);
3130 break; 3165 break;
3131 case 3: /* set position (pixels) */ 3166 case 3: /* set position (pixels) */
3132 XMoveWindow (dpy, parent[0], args[1], args[2]); 3167 XMoveWindow (dpy, parent, args[1], args[2]);
3133 break; 3168 break;
3134 case 4: /* set size (pixels) */ 3169 case 4: /* set size (pixels) */
3135 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3170 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3136 break; 3171 break;
3137 case 5: /* raise window */ 3172 case 5: /* raise window */
3138 XRaiseWindow (dpy, parent[0]); 3173 XRaiseWindow (dpy, parent);
3139 break; 3174 break;
3140 case 6: /* lower window */ 3175 case 6: /* lower window */
3141 XLowerWindow (dpy, parent[0]); 3176 XLowerWindow (dpy, parent);
3142 break; 3177 break;
3143 case 7: /* refresh window */ 3178 case 7: /* refresh window */
3144 scr_touch (true); 3179 scr_touch (true);
3145 break; 3180 break;
3146 case 8: /* set size (chars) */ 3181 case 8: /* set size (chars) */
… …
3149 break; 3184 break;
3150 3185
3151 //case 9: NYI, TODO, restore maximized window or maximize window 3186 //case 9: NYI, TODO, restore maximized window or maximize window
3152 default: 3187 default:
3153 if (args[0] >= 24) /* set height (chars) */ 3188 if (args[0] >= 24) /* set height (chars) */
3154 set_widthheight ((unsigned int)width, 3189 set_widthheight ((unsigned int)vt_width,
3155 (unsigned int) (args[1] * fheight)); 3190 (unsigned int) (args[1] * fheight));
3156 break; 3191 break;
3157 3192
3158 /* 3193 /*
3159 * reports - some output format copied from XTerm 3194 * reports - some output format copied from XTerm
3160 */ 3195 */
3161 case 11: /* report window state */ 3196 case 11: /* report window state */
3162 XGetWindowAttributes (dpy, parent[0], &wattr); 3197 XGetWindowAttributes (dpy, parent, &wattr);
3163 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3198 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3164 break; 3199 break;
3165 case 13: /* report window position */ 3200 case 13: /* report window position */
3166 XGetWindowAttributes (dpy, parent[0], &wattr); 3201 XGetWindowAttributes (dpy, parent, &wattr);
3167 XTranslateCoordinates (dpy, parent[0], wattr.root, 3202 XTranslateCoordinates (dpy, parent, wattr.root,
3168 -wattr.border_width, -wattr.border_width, 3203 -wattr.border_width, -wattr.border_width,
3169 &x, &y, &wdummy); 3204 &x, &y, &wdummy);
3170 tt_printf ("\033[3;%d;%dt", x, y); 3205 tt_printf ("\033[3;%d;%dt", x, y);
3171 break; 3206 break;
3172 case 14: /* report window size (pixels) */ 3207 case 14: /* report window size (pixels) */
3173 XGetWindowAttributes (dpy, parent[0], &wattr); 3208 XGetWindowAttributes (dpy, parent, &wattr);
3174 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3209 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3175 break; 3210 break;
3176 case 18: /* report text area size (chars) */ 3211 case 18: /* report text area size (chars) */
3177 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3212 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3178 break; 3213 break;
… …
3180 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3215 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3181 break; 3216 break;
3182 case 20: /* report icon label */ 3217 case 20: /* report icon label */
3183 { 3218 {
3184 char *s; 3219 char *s;
3185 XGetIconName (dpy, parent[0], &s); 3220 XGetIconName (dpy, parent, &s);
3186 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3221 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3187 XFree (s); 3222 XFree (s);
3188 } 3223 }
3189 break; 3224 break;
3190 case 21: /* report window title */ 3225 case 21: /* report window title */
3191 { 3226 {
3192 char *s; 3227 char *s;
3193 XFetchName (dpy, parent[0], &s); 3228 XFetchName (dpy, parent, &s);
3194 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3229 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3195 XFree (s); 3230 XFree (s);
3196 } 3231 }
3197 break; 3232 break;
3198 } 3233 }
… …
3208rxvt_term::get_to_st (unicode_t &ends_how) 3243rxvt_term::get_to_st (unicode_t &ends_how)
3209{ 3244{
3210 unicode_t ch; 3245 unicode_t ch;
3211 bool seen_esc = false; 3246 bool seen_esc = false;
3212 unsigned int n = 0; 3247 unsigned int n = 0;
3213 wchar_t string[STRING_MAX]; 3248 wchar_t string[CBUFSIZ];
3214 3249
3215 while ((ch = cmd_getc ()) != NOCHAR) 3250 while ((ch = cmd_getc ()) != NOCHAR)
3216 { 3251 {
3217 if (seen_esc) 3252 if (seen_esc)
3218 { 3253 {
… …
3233 else if (ch < 0x20) 3268 else if (ch < 0x20)
3234 return NULL; /* other control character - exit */ 3269 return NULL; /* other control character - exit */
3235 3270
3236 seen_esc = false; 3271 seen_esc = false;
3237 3272
3238 if (n >= STRING_MAX - 1) 3273 if (n >= sizeof (string) - 1)
3239 // stop at some sane length 3274 // stop at some sane length
3240 return NULL; 3275 return NULL;
3241 3276
3242 string[n++] = ch; 3277 string[n++] = ch;
3243 } 3278 }
… …
3254 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3289 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3255 */ 3290 */
3256void 3291void
3257rxvt_term::process_dcs_seq () 3292rxvt_term::process_dcs_seq ()
3258{ 3293{
3259 char *s;
3260 unicode_t eh;
3261
3262 /* 3294 /*
3263 * Not handled yet 3295 * Not handled yet
3264 */ 3296 */
3297
3298 unicode_t eh;
3265 s = get_to_st (eh); 3299 char *s = get_to_st (eh);
3266 if (s) 3300 if (s)
3267 free (s); 3301 free (s);
3268 3302
3269 return; 3303 return;
3270} 3304}
… …
3274 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3308 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3275 */ 3309 */
3276void 3310void
3277rxvt_term::process_osc_seq () 3311rxvt_term::process_osc_seq ()
3278{ 3312{
3279 unicode_t ch, eh;
3280 int arg; 3313 int arg;
3281 3314
3282 ch = cmd_getc (); 3315 unicode_t ch = cmd_getc ();
3283 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3316 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3284 arg = arg * 10 + (ch - '0'); 3317 arg = arg * 10 + (ch - '0');
3285 3318
3286 if (ch == ';') 3319 if (ch == ';')
3287 { 3320 {
3321 unicode_t eh;
3288 char *s = get_to_st (eh); 3322 char *s = get_to_st (eh);
3289 3323
3290 if (s) 3324 if (s)
3291 { 3325 {
3292 process_xterm_seq (arg, s, eh); 3326 process_xterm_seq (arg, s, eh);
… …
3316 3350
3317/* 3351/*
3318 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3352 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3319 */ 3353 */
3320void 3354void
3321rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3355rxvt_term::process_xterm_seq (int op, char *str, char resp)
3322{ 3356{
3323 int color; 3357 int color;
3324 char *buf, *name; 3358 char *buf, *name;
3325 bool query = str[0] == '?' && !str[1]; 3359 bool query = str[0] == '?' && !str[1];
3326 int saveop = op; 3360 int saveop = op;
… …
3353 unsigned long bytes_after; 3387 unsigned long bytes_after;
3354 unsigned char *value = 0; 3388 unsigned char *value = 0;
3355 const char *str = ""; 3389 const char *str = "";
3356 3390
3357 if (prop 3391 if (prop
3358 && XGetWindowProperty (dpy, parent[0], 3392 && XGetWindowProperty (dpy, parent,
3359 prop, 0, 1<<16, 0, AnyPropertyType, 3393 prop, 0, 1<<16, 0, AnyPropertyType,
3360 &actual_type, &actual_format, 3394 &actual_type, &actual_format,
3361 &nitems, &bytes_after, &value) == Success 3395 &nitems, &bytes_after, &value) == Success
3362 && actual_type != None 3396 && actual_type != None
3363 && actual_format == 8) 3397 && actual_format == 8)
3364 str = (const char *)(value); 3398 str = (const char *)(value);
3365 3399
3366 tt_printf ("\033]%d;%s%c", op, str, resp); 3400 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3367 3401
3368 XFree (value); 3402 XFree (value);
3369 } 3403 }
3370 else 3404 else
3371 { 3405 {
3372 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3406 char *eq = strchr (str, '=');
3373 3407
3374 if (eq) 3408 if (eq)
3375 { 3409 {
3376 *eq = 0; 3410 *eq = 0;
3377 set_utf8_property (display->atom (str), eq + 1); 3411 set_utf8_property (display->atom (str), eq + 1);
3378 } 3412 }
3379 else 3413 else
3380 XDeleteProperty (dpy, parent[0], 3414 XDeleteProperty (dpy, parent,
3381 display->atom (str)); 3415 display->atom (str));
3382 } 3416 }
3383 break; 3417 break;
3384 3418
3385 case XTerm_Color: 3419 case XTerm_Color:
… …
3398 *buf++ = '\0'; 3432 *buf++ = '\0';
3399 3433
3400 process_color_seq (op, color, name, resp); 3434 process_color_seq (op, color, name, resp);
3401 } 3435 }
3402 break; 3436 break;
3437 case Rxvt_restoreFG:
3403 case XTerm_Color00: 3438 case XTerm_Color00:
3404 process_color_seq (op, Color_fg, str, resp); 3439 process_color_seq (op, Color_fg, str, resp);
3405 break; 3440 break;
3441 case Rxvt_restoreBG:
3406 case XTerm_Color01: 3442 case XTerm_Color01:
3407 process_color_seq (op, Color_bg, str, resp); 3443 process_color_seq (op, Color_bg, str, resp);
3408 break; 3444 break;
3409#ifndef NO_CURSORCOLOR 3445#ifndef NO_CURSORCOLOR
3410 case XTerm_Color_cursor: 3446 case XTerm_Color_cursor:
… …
3415 process_color_seq (op, Color_pointer_fg, str, resp); 3451 process_color_seq (op, Color_pointer_fg, str, resp);
3416 break; 3452 break;
3417 case XTerm_Color_pointer_bg: 3453 case XTerm_Color_pointer_bg:
3418 process_color_seq (op, Color_pointer_bg, str, resp); 3454 process_color_seq (op, Color_pointer_bg, str, resp);
3419 break; 3455 break;
3456#ifdef OPTION_HC
3457 case XTerm_Color_HC:
3458 process_color_seq (op, Color_HC, str, resp);
3459 break;
3460 case XTerm_Color_HTC:
3461 process_color_seq (op, Color_HTC, str, resp);
3462 break;
3463#endif
3420#ifndef NO_BOLD_UNDERLINE_REVERSE 3464#ifndef NO_BOLD_UNDERLINE_REVERSE
3421 case XTerm_Color_RV:
3422 process_color_seq (op, Color_RV, str, resp);
3423 break;
3424 case Rxvt_Color_BD:
3425 case URxvt_Color_BD: 3465 case URxvt_Color_BD:
3426 process_color_seq (op, Color_BD, str, resp); 3466 process_color_seq (op, Color_BD, str, resp);
3427 break; 3467 break;
3428 case Rxvt_Color_UL:
3429 case URxvt_Color_UL: 3468 case URxvt_Color_UL:
3430 process_color_seq (op, Color_UL, str, resp); 3469 process_color_seq (op, Color_UL, str, resp);
3431 break; 3470 break;
3432 case URxvt_Color_IT: 3471 case URxvt_Color_IT:
3433 process_color_seq (op, Color_IT, str, resp); 3472 process_color_seq (op, Color_IT, str, resp);
3434 break; 3473 break;
3435#endif 3474#endif
3436#if ENABLE_TRANSPARENCY && TINTING 3475 case URxvt_Color_border:
3476 process_color_seq (op, Color_border, str, resp);
3477 break;
3478
3479#if BG_IMAGE_FROM_ROOT
3437 case URxvt_Color_tint: 3480 case URxvt_Color_tint:
3438 process_color_seq (op, Color_tint, str, resp); 3481 process_color_seq (op, Color_tint, str, resp);
3482 {
3483 bool changed = false;
3439 3484
3440 check_our_parents (); 3485 if (ISSET_PIXCOLOR (Color_tint))
3486 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3441 3487
3442 if (am_transparent) 3488 if (changed)
3443 want_full_refresh = want_refresh = 1; 3489 update_background ();
3490 }
3444 3491
3445 break; 3492 break;
3446#endif 3493#endif
3447 3494
3495#if BG_IMAGE_FROM_FILE
3448 case Rxvt_Pixmap: 3496 case Rxvt_Pixmap:
3497 if (!strcmp (str, "?"))
3449 { 3498 {
3499 char str[256];
3500 int h_scale = fimage.h_scale;
3501 int v_scale = fimage.v_scale;
3502 int h_align = fimage.h_align;
3503 int v_align = fimage.v_align;
3504
3505 sprintf (str, "[%dx%d+%d+%d]",
3506 h_scale, v_scale,
3507 h_align, v_align);
3508 process_xterm_seq (XTerm_title, str, CHAR_ST);
3509 }
3510 else
3511 {
3512 bool changed = false;
3513
3450 if (*str != ';') 3514 if (*str != ';')
3451 { 3515 {
3452#if XPM_BACKGROUND 3516 try
3453 scale_pixmap (""); /* reset to default scaling */ 3517 {
3454 set_bgPixmap (str); /* change pixmap */ 3518 fimage.set_file_geometry (this, str);
3455 scr_touch (true); 3519 changed = true;
3456#endif 3520 }
3521 catch (const class rxvt_failure_exception &e)
3522 {
3523 }
3457 } 3524 }
3458 3525 else
3459 int changed = 0;
3460
3461 while ((str = strchr (str, ';')) != NULL)
3462 { 3526 {
3463 str++; 3527 str++;
3464#if XPM_BACKGROUND 3528 if (fimage.set_geometry (str, true))
3465 changed += scale_pixmap (str); 3529 changed = true;
3466#endif
3467 } 3530 }
3468 3531
3469 if (changed) 3532 if (changed)
3470 { 3533 {
3471#ifdef XPM_BACKGROUND 3534 if (bg_window_position_sensitive ())
3472 resize_pixmap (); 3535 {
3473 scr_touch (true); 3536 int x, y;
3474#endif 3537 get_window_origin (x, y);
3538 parent_x = x;
3539 parent_y = y;
3540 }
3541 update_background ();
3475 } 3542 }
3476#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3477 if (option (Opt_transparent))
3478 check_our_parents ();
3479#endif
3480 } 3543 }
3481 break; 3544 break;
3482 3545#endif
3483 case Rxvt_restoreFG:
3484 set_window_color (Color_fg, str);
3485 break;
3486 case Rxvt_restoreBG:
3487 set_window_color (Color_bg, str);
3488 break;
3489 3546
3490 case XTerm_logfile: 3547 case XTerm_logfile:
3491 // TODO, when secure mode? 3548 // TODO, when secure mode?
3492 break; 3549 break;
3493 3550
… …
3560 break; 3617 break;
3561#endif 3618#endif
3562 3619
3563#if ENABLE_PERL 3620#if ENABLE_PERL
3564 case URxvt_perl: 3621 case URxvt_perl:
3565 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3622 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3566 ; // no responses yet
3567 break; 3623 break;
3568#endif 3624#endif
3569 } 3625 }
3570} 3626}
3571/*----------------------------------------------------------------------*/ 3627/*----------------------------------------------------------------------*/
… …
3578 * 's' = save 3634 * 's' = save
3579 * 'r' = restore 3635 * 'r' = restore
3580 * 't' = toggle 3636 * 't' = toggle
3581 * so no need for fancy checking 3637 * so no need for fancy checking
3582 */ 3638 */
3583int 3639int ecb_cold
3584rxvt_term::privcases (int mode, unsigned long bit) 3640rxvt_term::privcases (int mode, unsigned long bit)
3585{ 3641{
3586 int state; 3642 int state;
3587 3643
3588 if (mode == 's') 3644 if (mode == 's')
3589 { 3645 {
3590 SavedModes |= (priv_modes & bit); 3646 if (priv_modes & bit)
3647 SavedModes |= bit;
3648 else
3649 SavedModes &= ~bit;
3591 return -1; 3650 return -1;
3592 } 3651 }
3593 else 3652 else
3594 { 3653 {
3595 if (mode == 'r') 3654 if (mode == 'r')
3596 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3655 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3597 else 3656 else
3598 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3657 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3599 PrivMode (state, bit); 3658
3659 if (state)
3660 priv_modes |= bit;
3661 else
3662 priv_modes &= ~bit;
3600 } 3663 }
3601 3664
3602 return state; 3665 return state;
3603} 3666}
3604 3667
3605/* we're not using priv _yet_ */ 3668/* we're not using priv _yet_ */
3606void 3669void
3607rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3670rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3608{ 3671{
3609 unsigned int i, j; 3672 unsigned int i, j;
3610 int state; 3673 int state;
3611 3674
3612 static const struct 3675 static const struct
3613 { 3676 {
3614 const int argval; 3677 const int argval;
3615 const unsigned long bit; 3678 const unsigned long bit;
3616 }
3617
3618 argtopriv[] = { 3679 } argtopriv[] = {
3619 { 1, PrivMode_aplCUR }, 3680 { 1, PrivMode_aplCUR }, // DECCKM
3620 { 2, PrivMode_vt52 }, 3681 { 2, PrivMode_vt52 }, // DECANM
3621 { 3, PrivMode_132 }, 3682 { 3, PrivMode_132 }, // DECCOLM
3622 { 4, PrivMode_smoothScroll }, 3683 { 4, PrivMode_smoothScroll }, // DECSCLM
3623 { 5, PrivMode_rVideo }, 3684 { 5, PrivMode_rVideo }, // DECSCNM
3624 { 6, PrivMode_relOrigin }, 3685 { 6, PrivMode_relOrigin }, // DECOM
3625 { 7, PrivMode_Autowrap }, 3686 { 7, PrivMode_Autowrap }, // DECAWM
3626 // 8, bi-directional support mode 3687 // 8, auto-repeat keys // DECARM
3627 { 9, PrivMode_MouseX10 }, 3688 { 9, PrivMode_MouseX10 },
3628 // 18, 19 printing-related
3629 { 25, PrivMode_VisibleCursor }, 3689 { 12, PrivMode_BlinkingCursor },
3690 // 18 end FF to printer after print screen
3691 // 19 Print screen prints full screen/scroll region
3692 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3630#ifdef scrollBar_esc 3693#ifdef scrollBar_esc
3631 { scrollBar_esc, PrivMode_scrollBar }, 3694 { scrollBar_esc, PrivMode_scrollBar },
3632#endif 3695#endif
3633 { 35, PrivMode_ShiftKeys }, // rxvt extension 3696 { 35, PrivMode_ShiftKeys }, // rxvt extension
3697 // 38, tektronix mode // DECTEK
3634 { 40, PrivMode_132OK }, 3698 { 40, PrivMode_132OK },
3635 // 41 xterm more fixes NYI 3699 // 41 xterm more fixes NYI
3636 // 45 margin bell NYI 3700 // 45 margin bell NYI
3637 // 46 start logging 3701 // 46 start logging
3638 { 47, PrivMode_Screen }, 3702 { 47, PrivMode_Screen },
3639 { 66, PrivMode_aplKP }, 3703 { 66, PrivMode_aplKP }, // DECNKM
3640#ifndef NO_BACKSPACE_KEY 3704#ifndef NO_BACKSPACE_KEY
3641 { 67, PrivMode_BackSpace }, 3705 { 67, PrivMode_BackSpace }, // DECBKM
3642#endif 3706#endif
3643 { 1000, PrivMode_MouseX11 }, 3707 { 1000, PrivMode_MouseX11 },
3644 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3708 { 1002, PrivMode_MouseBtnEvent },
3645 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3709 { 1003, PrivMode_MouseAnyEvent },
3646 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3710#if ENABLE_FRILLS
3711 { 1005, PrivMode_ExtModeMouse },
3712#endif
3647 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3713 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3648 { 1011, PrivMode_Keypress }, // rxvt extension 3714 { 1011, PrivMode_Keypress }, // rxvt extension
3715#if ENABLE_FRILLS
3716 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3717#endif
3649 // 1035 enable modifiers for alt, numlock NYI 3718 // 1035 enable modifiers for alt, numlock NYI
3650 // 1036 send ESC for meta keys NYI 3719 // 1036 send ESC for meta keys NYI
3651 // 1037 send DEL for keypad delete NYI 3720 // 1037 send DEL for keypad delete NYI
3652 { 1047, PrivMode_Screen }, 3721 { 1047, PrivMode_Screen },
3653 // 1048 save and restore cursor 3722 // 1048 save and restore cursor, implemented in code
3654 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3723 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3655 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3724 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3725 { 2004, PrivMode_BracketPaste },
3656 }; 3726 };
3657 3727
3658 if (nargs == 0) 3728 if (nargs == 0)
3659 return; 3729 return;
3660 3730
… …
3667 for (i = 0; i < nargs; i++) 3737 for (i = 0; i < nargs; i++)
3668 { 3738 {
3669 state = -1; 3739 state = -1;
3670 3740
3671 /* basic handling */ 3741 /* basic handling */
3672 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3742 for (j = 0; j < ecb_array_length (argtopriv); j++)
3673 if (argtopriv[j].argval == arg[i]) 3743 if (argtopriv[j].argval == arg[i])
3674 { 3744 {
3675 state = privcases (mode, argtopriv[j].bit); 3745 state = privcases (mode, argtopriv[j].bit);
3676 break; 3746 break;
3677 } 3747 }
… …
3685 3755
3686 scr_touch (true); 3756 scr_touch (true);
3687 break; 3757 break;
3688#endif 3758#endif
3689 case 1048: /* alternative cursor save */ 3759 case 1048: /* alternative cursor save */
3690 case 1049:
3691 if (option (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
3692 if (mode == 0) 3761 if (mode == 0)
3693 scr_cursor (RESTORE); 3762 scr_cursor (RESTORE);
3694 else if (mode == 1) 3763 else if (mode == 1)
3695 scr_cursor (SAVE); 3764 scr_cursor (SAVE);
… …
3704 case 2: /* VT52 mode */ 3773 case 2: /* VT52 mode */
3705 /* oddball mode. should be set regardless of set/reset 3774 /* oddball mode. should be set regardless of set/reset
3706 * parameter. Return from VT52 mode with an ESC < from 3775 * parameter. Return from VT52 mode with an ESC < from
3707 * within VT52 mode 3776 * within VT52 mode
3708 */ 3777 */
3709 PrivMode (1, PrivMode_vt52); 3778 priv_modes |= PrivMode_vt52;
3710 break; 3779 break;
3711 case 3: /* 80/132 */ 3780 case 3: /* 80/132 */
3712 if (priv_modes & PrivMode_132OK) 3781 if (priv_modes & PrivMode_132OK)
3713 set_widthheight (((state ? 132 : 80) * fwidth), height); 3782 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3714 break; 3783 break;
3715 case 4: /* smooth scrolling */ 3784 case 4: /* smooth scrolling */
3716 set_option (Opt_jumpScroll, !state); 3785 set_option (Opt_jumpScroll, !state);
3717 break; 3786 break;
3718 case 5: /* reverse video */ 3787 case 5: /* reverse video */
… …
3725 scr_autowrap (state); 3794 scr_autowrap (state);
3726 break; 3795 break;
3727 /* case 8: - auto repeat, can't do on a per window basis */ 3796 /* case 8: - auto repeat, can't do on a per window basis */
3728 case 9: /* X10 mouse reporting */ 3797 case 9: /* X10 mouse reporting */
3729 if (state) /* orthogonal */ 3798 if (state) /* orthogonal */
3730 priv_modes &= ~PrivMode_MouseX11; 3799 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3731 break; 3800 break;
3732#ifdef scrollBar_esc 3801#ifdef scrollBar_esc
3733 case scrollBar_esc: 3802 case scrollBar_esc:
3734 if (scrollbar_mapping (state)) 3803 scrollBar.map (state);
3735 {
3736 resize_all_windows (0, 0, 0); 3804 resize_all_windows (0, 0, 0);
3737 scr_touch (true); 3805 scr_touch (true);
3738 } 3806 break;
3807#endif
3808#ifdef CURSOR_BLINK
3809 case 12:
3810 cursor_blink_reset ();
3739 break; 3811 break;
3740#endif 3812#endif
3741 case 25: /* visible/invisible cursor */ 3813 case 25: /* visible/invisible cursor */
3742 scr_cursor_visible (state); 3814 scr_cursor_visible (state);
3743 break; 3815 break;
… …
3748 break; 3820 break;
3749 /* case 66: - application key pad */ 3821 /* case 66: - application key pad */
3750 /* case 67: - backspace key */ 3822 /* case 67: - backspace key */
3751 case 1000: /* X11 mouse reporting */ 3823 case 1000: /* X11 mouse reporting */
3752 if (state) /* orthogonal */ 3824 if (state) /* orthogonal */
3753 priv_modes &= ~PrivMode_MouseX10; 3825 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3754 break; 3826 break;
3755#if 0
3756 case 1001: 3827 case 1002:
3757 break; /* X11 mouse highlighting */ 3828 case 1003:
3758#endif 3829 if (state)
3830 {
3831 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3832 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3833 mouse_row = mouse_col = 0;
3834 vt_emask_mouse = PointerMotionMask;
3835 }
3836 else
3837 vt_emask_mouse = NoEventMask;
3838
3839 vt_select_input ();
3840 break;
3759 case 1010: /* scroll to bottom on TTY output inhibit */ 3841 case 1010: /* scroll to bottom on TTY output inhibit */
3760 set_option (Opt_scrollTtyOutput, !state); 3842 set_option (Opt_scrollTtyOutput, !state);
3761 break; 3843 break;
3762 case 1011: /* scroll to bottom on key press */ 3844 case 1011: /* scroll to bottom on key press */
3763 set_option (Opt_scrollTtyKeypress, state); 3845 set_option (Opt_scrollTtyKeypress, state);
3764 break; 3846 break;
3765 case 1047: /* secondary screen w/ clearing last */ 3847 case 1047: /* secondary screen w/ clearing last */
3766 if (option (Opt_secondaryScreen)) 3848 if (option (Opt_secondaryScreen))
3767 if (current_screen != PRIMARY) 3849 if (!state)
3768 scr_erase_screen (2); 3850 scr_erase_screen (2);
3851
3769 scr_change_screen (state); 3852 scr_change_screen (state);
3770 break; 3853 break;
3771 case 1049: /* secondary screen w/ clearing first */ 3854 case 1049: /* secondary screen w/ clearing first */
3855 if (option (Opt_secondaryScreen))
3856 if (state)
3857 scr_cursor (SAVE);
3858
3772 scr_change_screen (state); 3859 scr_change_screen (state);
3860
3773 if (option (Opt_secondaryScreen)) 3861 if (option (Opt_secondaryScreen))
3774 if (current_screen != PRIMARY) 3862 if (state)
3775 scr_erase_screen (2); 3863 scr_erase_screen (2);
3864 else
3865 scr_cursor (RESTORE);
3776 break; 3866 break;
3777 default: 3867 default:
3778 break; 3868 break;
3779 } 3869 }
3780 } 3870 }
3781} 3871}
3782/*}}} */ 3872/*}}} */
3783 3873
3784/*{{{ process sgr sequences */ 3874/*{{{ process sgr sequences */
3785void 3875void ecb_hot
3786rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3876rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3787{ 3877{
3788 unsigned int i; 3878 unsigned int i;
3789 short rendset; 3879 short rendset;
3790 int rendstyle; 3880 int rendstyle;
… …
3832 //case 19: // ninth alt font 3922 //case 19: // ninth alt font
3833 //case 20: // gothic 3923 //case 20: // gothic
3834 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3924 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3835 rendset = 0, rendstyle = RS_Bold; 3925 rendset = 0, rendstyle = RS_Bold;
3836 break; 3926 break;
3837 case 22: // normal intensity 3927 case 22: // bold off (vt220)
3838 rendset = 0, rendstyle = RS_Bold; 3928 rendset = 0, rendstyle = RS_Bold;
3839 break; 3929 break;
3840 case 23: // disable italic 3930 case 23: // disable italic
3841 rendset = 0, rendstyle = RS_Italic; 3931 rendset = 0, rendstyle = RS_Italic;
3842 break; 3932 break;
3843 case 24: 3933 case 24: // underline off (vt220)
3844 rendset = 0, rendstyle = RS_Uline; 3934 rendset = 0, rendstyle = RS_Uline;
3845 break; 3935 break;
3846 case 25: 3936 case 25: // blink off (vt220)
3847 rendset = 0, rendstyle = RS_Blink; 3937 rendset = 0, rendstyle = RS_Blink;
3848 break; 3938 break;
3849 case 26: // variable spacing (iso 8613) 3939 case 26: // variable spacing (iso 8613)
3850 rendset = 0, rendstyle = RS_Blink; 3940 rendset = 0, rendstyle = RS_Blink;
3851 break; 3941 break;
3852 case 27: 3942 case 27: // reverse off (vt220)
3853 rendset = 0, rendstyle = RS_RVid; 3943 rendset = 0, rendstyle = RS_RVid;
3854 break; 3944 break;
3855 //case 28: // visible. NYI 3945 //case 28: // visible. NYI
3856 //case 29: // not crossed-out 3946 //case 29: // not crossed-out
3857 } 3947 }
… …
3931 break; 4021 break;
3932#endif 4022#endif
3933 } 4023 }
3934 } 4024 }
3935} 4025}
4026
4027void
4028rxvt_term::set_cursor_style (int style)
4029{
4030 if (!IN_RANGE_INC (style, 0, 6))
4031 return;
4032
4033 if (style == 0)
4034 style = 1;
4035
4036 cursor_type = (style - 1) / 2;
4037 set_option (Opt_cursorUnderline, cursor_type == 1);
4038
4039#ifdef CURSOR_BLINK
4040 set_option (Opt_cursorBlink, style & 1);
4041 cursor_blink_reset ();
4042#endif
4043
4044 want_refresh = 1;
4045}
3936/*}}} */ 4046/*}}} */
3937 4047
3938/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3939void
3940rxvt_term::process_graphics ()
3941{
3942 unicode_t ch, cmd = cmd_getc ();
3943
3944 if (cmd == 'Q')
3945 { /* query graphics */
3946 tt_printf ("\033G0\012"); /* no graphics */
3947 return;
3948 }
3949 /* swallow other graphics sequences until terminating ':' */
3950 do
3951 ch = cmd_getc ();
3952 while (ch != ':');
3953}
3954/*}}} */
3955
3956/* ------------------------------------------------------------------------- */ 4048/* ---------------------------------------------------------------------- */
4049/* Write data to the pty as typed by the user, pasted with the mouse,
4050 * or generated by us in response to a query ESC sequence.
4051 */
3957 4052
3958/* 4053/*
3959 * Send printf () formatted output to the command. 4054 * Send printf () formatted output to the command.
3960 * Only use for small amounts of data. 4055 * Only use for small amounts of data.
3961 */ 4056 */
… …
3969 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4064 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3970 va_end (arg_ptr); 4065 va_end (arg_ptr);
3971 tt_write (buf, strlen (buf)); 4066 tt_write (buf, strlen (buf));
3972} 4067}
3973 4068
3974/* ---------------------------------------------------------------------- */
3975/* Write data to the pty as typed by the user, pasted with the mouse, 4069/* Write data to the pty as typed by the user. */
3976 * or generated by us in response to a query ESC sequence. 4070void
3977 */ 4071rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3978const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4072{
4073 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4074 return;
4075
4076 if (option (Opt_scrollTtyKeypress))
4077 if (view_start)
4078 {
4079 view_start = 0;
4080 want_refresh = 1;
4081 }
4082
4083 tt_write_ (data, len);
4084}
3979 4085
3980void 4086void
3981rxvt_term::tt_write (const char *data, unsigned int len) 4087rxvt_term::tt_write (const char *data, unsigned int len)
3982{ 4088{
3983 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4089 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3984 return; 4090 return;
3985 4091
4092 tt_write_ (data, len);
4093}
4094
4095static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4096
4097void
4098rxvt_term::tt_write_ (const char *data, unsigned int len)
4099{
3986 if (pty->pty < 0) 4100 if (pty->pty < 0)
3987 return; 4101 return;
3988 4102
3989 if (v_buflen == 0) 4103 if (v_buflen == 0)
3990 { 4104 {
3991 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4105 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3992 4106
4107 max_it (written, 0);
4108
3993 if ((unsigned int)written == len) 4109 if (written == len)
3994 return; 4110 return;
3995 4111
3996 data += written; 4112 data += written;
3997 len -= written; 4113 len -= written;
3998 } 4114 }
3999 4115
4000 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4116 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4001 4117
4002 memcpy (v_buffer + v_buflen, data, len); 4118 memcpy (v_buffer + v_buflen, data, len);
4003 v_buflen += len; 4119 v_buflen += len;
4004 4120
4005 pty_ev.set (EVENT_READ | EVENT_WRITE); 4121 pty_ev.set (ev::READ | ev::WRITE);
4006} 4122}
4007 4123
4008void rxvt_term::pty_write () 4124void rxvt_term::pty_write ()
4009{ 4125{
4010 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4126 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4015 4131
4016 if (v_buflen == 0) 4132 if (v_buflen == 0)
4017 { 4133 {
4018 free (v_buffer); 4134 free (v_buffer);
4019 v_buffer = 0; 4135 v_buffer = 0;
4020 v_buflen = 0;
4021 4136
4022 pty_ev.set (EVENT_READ); 4137 pty_ev.set (ev::READ);
4023 return; 4138 return;
4024 } 4139 }
4025 4140
4026 memmove (v_buffer, v_buffer + written, v_buflen); 4141 memmove (v_buffer, v_buffer + written, v_buflen);
4027 } 4142 }
4028 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4143 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4029 pty_ev.set (EVENT_READ); 4144 pty_ev.set (ev::READ);
4030} 4145}
4031 4146
4032/*----------------------- end-of-file (C source) -----------------------*/ 4147/*----------------------- end-of-file (C source) -----------------------*/
4033 4148

Diff Legend

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