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.314 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.558 by root, Tue Sep 2 16:28:34 2014 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
… …
497 { 815 {
498 commit_iso14755 (); 816 commit_iso14755 ();
499 iso14755buf = ISO_14755_51; 817 iso14755buf = ISO_14755_51;
500# if ISO_14755 818# if ISO_14755
501 iso14755_51 (0); 819 iso14755_51 (0);
820# endif
821 return;
822 }
823 else if (keysym == XK_BackSpace)
824 {
825 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
826# if ISO_14755
827 iso14755_51 (iso14755buf & ISO_14755_MASK);
502# endif 828# endif
503 return; 829 return;
504 } 830 }
505 else if ((hv = hex_keyval (ev)) >= 0) 831 else if ((hv = hex_keyval (ev)) >= 0)
506 { 832 {
… …
511# endif 837# endif
512 return; 838 return;
513 } 839 }
514 else 840 else
515 { 841 {
516# if ENABLE_OVERLAY 842# if ISO_14755
517 scr_overlay_off (); 843 scr_overlay_off ();
518# endif 844# endif
519 iso14755buf = 0; 845 iso14755buf = 0;
520 } 846 }
521 } 847 }
848 else if (option (Opt_iso14755) &&
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 849 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 850 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
524 if (!(iso14755buf & ISO_14755_STARTED)) 851 if (!(iso14755buf & ISO_14755_STARTED))
525 { 852 {
526 iso14755buf |= ISO_14755_STARTED; 853 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 854# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 855 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 856 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 857# endif
531 } 858 }
532#endif 859#endif
533 860
534#ifdef PRINTPIPE 861#ifdef PRINTPIPE
535 if (keysym == XK_Print) 862 if (keysym == XK_Print)
536 { 863 {
537 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
538 return; 865 return;
539 } 866 }
540#endif 867#endif
541
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 {
544 {
545 newlen = 1;
546 switch (keysym)
547 {
548#ifndef NO_BACKSPACE_KEY
549 case XK_BackSpace:
550 if (priv_modes & PrivMode_HaveBackSpace)
551 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0';
555 }
556 else
557 strcpy (kbuf, key_backspace);
558 break;
559#endif
560#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete:
572 strcpy (kbuf, key_delete);
573 break;
574#endif
575 case XK_Tab:
576 if (shft)
577 strcpy (kbuf, "\033[Z");
578 else
579 {
580#ifdef CTRL_TAB_MAKES_META
581 if (ctrl)
582 meta = 1;
583#endif
584#ifdef MOD4_TAB_MAKES_META
585 if (ev.state & Mod4Mask)
586 meta = 1;
587#endif
588 newlen = 0;
589 }
590 break;
591
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z");
613 kbuf[2] = "DACB"[keysym - XK_Left];
614 /* do Shift first */
615 if (shft)
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 else if (ctrl)
618 {
619 kbuf[1] = 'O';
620 kbuf[2] = "dacb"[keysym - XK_Left];
621 }
622 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O';
624 break;
625
626#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior:
638 strcpy (kbuf, "\033[5~");
639 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next:
651 strcpy (kbuf, "\033[6~");
652 break;
653#endif
654 case XK_KP_Enter:
655 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
657 {
658 strcpy (kbuf, "\033OM");
659 break;
660 }
661
662 /* FALLTHROUGH */
663
664 case XK_Return:
665 if (priv_modes & PrivMode_LFNL)
666 {
667 kbuf[0] = '\015';
668 kbuf[1] = '\012';
669 kbuf[2] = '\0';
670 }
671 else
672 {
673 kbuf[0] = '\015';
674 kbuf[1] = '\0';
675 }
676 break;
677
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP");
689 kbuf[2] += (keysym - XK_KP_F1);
690 break;
691
692 case XK_KP_Multiply: /* "\033Oj" : "*" */
693 case XK_KP_Add: /* "\033Ok" : "+" */
694 case XK_KP_Separator: /* "\033Ol" : "," */
695 case XK_KP_Subtract: /* "\033Om" : "-" */
696 case XK_KP_Decimal: /* "\033On" : "." */
697 case XK_KP_Divide: /* "\033Oo" : "/" */
698 case XK_KP_0: /* "\033Op" : "0" */
699 case XK_KP_1: /* "\033Oq" : "1" */
700 case XK_KP_2: /* "\033Or" : "2" */
701 case XK_KP_3: /* "\033Os" : "3" */
702 case XK_KP_4: /* "\033Ot" : "4" */
703 case XK_KP_5: /* "\033Ou" : "5" */
704 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
710 {
711 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply);
713 }
714 else
715 {
716 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_Find:
722 strcpy (kbuf, "\033[1~");
723 break;
724
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert:
736 strcpy (kbuf, "\033[2~");
737 break;
738#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove:
740 /* FALLTHROUGH */
741#endif
742 case XK_Execute:
743 strcpy (kbuf, "\033[3~");
744 break;
745 case XK_Select:
746 strcpy (kbuf, "\033[4~");
747 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home:
772 strcpy (kbuf, KS_HOME);
773 break;
774
775#define FKEY(n, fkey) \
776 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
777
778 case XK_F1: /* "\033[11~" */
779 case XK_F2: /* "\033[12~" */
780 case XK_F3: /* "\033[13~" */
781 case XK_F4: /* "\033[14~" */
782 case XK_F5: /* "\033[15~" */
783 FKEY (11, XK_F1);
784 break;
785 case XK_F6: /* "\033[17~" */
786 case XK_F7: /* "\033[18~" */
787 case XK_F8: /* "\033[19~" */
788 case XK_F9: /* "\033[20~" */
789 case XK_F10: /* "\033[21~" */
790 FKEY (17, XK_F6);
791 break;
792 case XK_F11: /* "\033[23~" */
793 case XK_F12: /* "\033[24~" */
794 case XK_F13: /* "\033[25~" */
795 case XK_F14: /* "\033[26~" */
796 FKEY (23, XK_F11);
797 break;
798 case XK_F15: /* "\033[28~" */
799 case XK_F16: /* "\033[29~" */
800 FKEY (28, XK_F15);
801 break;
802 case XK_Help: /* "\033[28~" */
803 FKEY (28, XK_Help);
804 break;
805 case XK_Menu: /* "\033[29~" */
806 FKEY (29, XK_Menu);
807 break;
808 case XK_F17: /* "\033[31~" */
809 case XK_F18: /* "\033[32~" */
810 case XK_F19: /* "\033[33~" */
811 case XK_F20: /* "\033[34~" */
812 case XK_F21: /* "\033[35~" */
813 case XK_F22: /* "\033[36~" */
814 case XK_F23: /* "\033[37~" */
815 case XK_F24: /* "\033[38~" */
816 case XK_F25: /* "\033[39~" */
817 case XK_F26: /* "\033[40~" */
818 case XK_F27: /* "\033[41~" */
819 case XK_F28: /* "\033[42~" */
820 case XK_F29: /* "\033[43~" */
821 case XK_F30: /* "\033[44~" */
822 case XK_F31: /* "\033[45~" */
823 case XK_F32: /* "\033[46~" */
824 case XK_F33: /* "\033[47~" */
825 case XK_F34: /* "\033[48~" */
826 case XK_F35: /* "\033[49~" */
827 FKEY (31, XK_F17);
828 break;
829#undef FKEY
830 default:
831 newlen = 0;
832 break;
833 }
834
835 if (newlen)
836 len = strlen (kbuf);
837 }
838
839 /*
840 * Pass meta for all function keys, if 'meta' option set
841 */
842#ifdef META8_OPTION
843 if (meta && (meta_char == 0x80) && len > 0)
844 kbuf[len - 1] |= 0x80;
845#endif
846
847 }
848 else if (ctrl && keysym == XK_minus)
849 {
850 len = 1;
851 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
852 }
853 else if (keysym == XK_ISO_Left_Tab)
854 {
855 strcpy (kbuf, "\033[Z");
856 len = 3;
857 }
858 else
859 {
860#ifdef META8_OPTION
861 /* set 8-bit on */
862 if (meta && (meta_char == 0x80))
863 {
864 char *ch;
865
866 for (ch = kbuf; ch < kbuf + len; ch++)
867 *ch |= 0x80;
868
869 meta = 0;
870 }
871#endif
872 /* nil */ ;
873 }
874 } 868 }
875
876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
877 return;
878 869
879 if (len <= 0) 870 if (len <= 0)
880 return; /* not mapped */ 871 return; /* not mapped */
881 872
882 if (OPTION (Opt_scrollTtyKeypress))
883 if (view_start)
884 {
885 view_start = 0;
886 want_refresh = 1;
887 }
888
889 /*
890 * these modifications only affect the static keybuffer
891 * pass Shift/Control indicators for function keys ending with `~'
892 *
893 * eg,
894 * Prior = "ESC[5~"
895 * Shift+Prior = "ESC[5$"
896 * Ctrl+Prior = "ESC[5^"
897 * Ctrl+Shift+Prior = "ESC[5@"
898 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
899 */
900 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
901 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
902
903 /* escape prefix */
904 if (meta
905#ifdef META8_OPTION
906 && meta_char == C0_ESC
907#endif
908 )
909 {
910 const char ch = C0_ESC;
911 tt_write (&ch, 1);
912 }
913
914 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
915} 874}
916 875
917void 876void ecb_cold
918rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
919{ 878{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym; 880 KeySym keysym;
922 881
… …
926#if ENABLE_FRILLS || ISO_14755 885#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 886 // ISO 14755 support
928 if (iso14755buf) 887 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 888 if (iso14755buf & ISO_14755_52)
930 { 889 {
931# if ENABLE_OVERLAY 890# if ISO_14755
932 scr_overlay_off (); 891 scr_overlay_off ();
933# endif 892# endif
934# if ISO_14755 893# if ISO_14755
935 // iso14755 part 5.2 handling: release time 894 // iso14755 part 5.2 handling: release time
936 // first: controls 895 // first: controls
… …
942 commit_iso14755 (); 901 commit_iso14755 ();
943 902
944 return; 903 return;
945 } 904 }
946 905
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
948 if (i[0] == keysym) 907 if (i[0] == keysym)
949 { 908 {
950 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 (); 910 commit_iso14755 ();
952 911
… …
959 918
960 return; 919 return;
961 } 920 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 921 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 922 {
964# if ENABLE_OVERLAY 923# if ISO_14755
965 scr_overlay_off (); 924 scr_overlay_off ();
966# endif 925# endif
967 if (iso14755buf & ISO_14755_51) 926 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 927 commit_iso14755 ();
969#if ISO_14755 928#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 929 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 930 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 931 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 932
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 933 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 934 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
989 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
991#endif 950#endif
992} 951}
993 952
994#if defined (KEYSYM_RESOURCE)
995unsigned int
996rxvt_term::cmd_write (const char *str, unsigned int count)
997{
998 unsigned int n, s;
999
1000 n = cmdbuf_ptr - cmdbuf_base;
1001 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1002
1003 if (n > 0 && s < count)
1004 {
1005 memmove (cmdbuf_base, cmdbuf_ptr,
1006 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1007 cmdbuf_ptr = cmdbuf_base;
1008 cmdbuf_endp -= n;
1009 s += n;
1010 }
1011
1012 if (count > s)
1013 {
1014 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1015 count = s;
1016 }
1017
1018 for (; count--;)
1019 *cmdbuf_endp++ = *str++;
1020
1021 cmd_parse ();
1022
1023 return 0;
1024}
1025#endif
1026
1027void 953void
1028rxvt_term::flush () 954rxvt_term::flush ()
1029{ 955{
1030 flush_ev.stop (); 956 flush_ev.stop ();
1031 957
1032#ifdef TRANSPARENT 958#ifdef HAVE_IMG
1033 if (want_full_refresh) 959 if (bg_flags & BG_NEEDS_REFRESH)
1034 { 960 {
1035 want_full_refresh = 0; 961 bg_flags &= ~BG_NEEDS_REFRESH;
1036 scr_clear ();
1037 scr_touch (false); 962 scr_touch (false);
1038 } 963 }
1039#endif 964#endif
1040 965
1041 if (want_refresh) 966 if (want_refresh)
… …
1077 } 1002 }
1078 while (row < end_row); 1003 while (row < end_row);
1079 } 1004 }
1080 1005
1081 scr_refresh (); 1006 scr_refresh ();
1082 scrollbar_show (1); 1007 scrollBar.show (1);
1083#ifdef USE_XIM 1008#if USE_XIM
1084 IMSendSpot (); 1009 im_send_spot ();
1085#endif 1010#endif
1086 } 1011 }
1087 1012
1088 display->flush (); 1013 display->flush ();
1089} 1014}
1090 1015
1016/* checks whether a refresh is requested and starts the refresh timer */
1091void 1017void
1092rxvt_term::check_cb (check_watcher &w) 1018rxvt_term::refresh_check ()
1019{
1020 if (want_refresh && !flush_ev.is_active ())
1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1022
1023 display->flush ();
1024}
1025
1026void
1027rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1028{
1094 make_current (); 1029 make_current ();
1095 1030
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1031 refresh_count = 0;
1109 flush (); 1032 flush ();
1110} 1033}
1111 1034
1112#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1113void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (hidden_cursor)
1040 {
1041 hidden_cursor = 0;
1042 want_refresh = 1;
1043 }
1044
1045 if (option (Opt_cursorBlink))
1046 cursor_blink_ev.again ();
1047 else
1048 cursor_blink_ev.stop ();
1049}
1050
1051void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1052rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1053{
1116 hidden_cursor = !hidden_cursor; 1054 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1055 want_refresh = 1;
1118 1056 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1057}
1121#endif 1058#endif
1122 1059
1123#ifdef TEXT_BLINK 1060#ifdef TEXT_BLINK
1124void 1061void
1125rxvt_term::text_blink_cb (time_watcher &w) 1062rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1063{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1064 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1065 {
1129 hidden_text = !hidden_text; 1066 hidden_text = !hidden_text;
1130 want_refresh = 1; 1067 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1068 refresh_check ();
1132 } 1069 }
1070 else
1071 w.stop ();
1133} 1072}
1134#endif 1073#endif
1135 1074
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1075#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1076void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1077rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1078{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1079 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1080 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1142 { 1081 {
1143 want_refresh = 1; 1082 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1083 refresh_check ();
1145 } 1084 }
1085 else
1086 w.stop ();
1146} 1087}
1147#endif 1088#endif
1148 1089
1149#ifdef SELECTION_SCROLLING 1090#ifdef SELECTION_SCROLLING
1150void 1091void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1092rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1093{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1094 if (scr_page (scroll_selection_lines))
1154 { 1095 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1096 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1097 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1158 } 1099 }
1100 else
1101 w.stop ();
1159} 1102}
1160#endif 1103#endif
1161 1104
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1105#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1106void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1107rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1108{
1166 if (mouse_slip_wheel_speed == 0 1109 if (scr_page (mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1110 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1111 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 refresh_check ();
1113 }
1114
1115 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1116 {
1117 mouse_slip_wheel_speed = 0;
1118 w.stop ();
1175 } 1119 }
1176} 1120}
1177#endif 1121#endif
1178 1122
1179#if LINUX_YIELD_HACK 1123#if LINUX_YIELD_HACK
1180static struct event_handler 1124static struct event_handler
1181{ 1125{
1182 check_watcher yield_ev; 1126 ev::prepare yield_ev;
1183 1127
1184 void yield_cb (check_watcher &w) 1128 void yield_cb (ev::prepare &w, int revents)
1185 { 1129 {
1186 // this should really be sched_yield(), but the linux guys thought 1130 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1131 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1132 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1133 // allowed by the sus... as is returning ENOSYS.
1134 // since the linux guys additionally thought that breaking the only
1135 // known workaround against their unusable sched_yield hack is cool,
1136 // we just nanosleep a bit and hope for the best.
1190 1137
1191 struct timespec ts = { 0, 0 }; 1138 struct timespec ts = { 0, 1000 };
1192 nanosleep (&ts, 0); 1139 nanosleep (&ts, 0);
1193 1140
1194 w.stop (); 1141 w.stop ();
1195 } 1142 }
1196 1143
… …
1199 { 1146 {
1200 } 1147 }
1201} event_handler; 1148} event_handler;
1202#endif 1149#endif
1203 1150
1151/* make sure all the cmd data is at beginning of cmdbuf */
1152void
1153rxvt_term::cmdbuf_reify ()
1154{
1155 if (cmdbuf_ptr == cmdbuf_base)
1156 return;
1157
1158 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1159
1160 memmove (cmdbuf_base, cmdbuf_ptr, used);
1161 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + used;
1163
1164}
1165
1166#if defined (KEYSYM_RESOURCE)
1167void
1168rxvt_term::cmdbuf_append (const char *str, size_t count)
1169{
1170 cmdbuf_reify ();
1171
1172 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1173
1174 if (count > avail)
1175 return;
1176
1177 memcpy (cmdbuf_endp, str, count);
1178 cmdbuf_endp += count;
1179
1180 cmd_parse ();
1181}
1182#endif
1183
1204bool 1184bool
1205rxvt_term::pty_fill () 1185rxvt_term::pty_fill ()
1206{ 1186{
1207 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1187 cmdbuf_reify ();
1208 1188
1209 if (CBUFSIZ == n) 1189 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1210 { 1190
1211 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1191 if (!avail)
1212 n = 0;
1213 } 1192 {
1214 1193 // normally this indicates a "too long" command sequence - just drop the data we have
1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1216 cmdbuf_ptr = cmdbuf_base; 1194 cmdbuf_ptr = cmdbuf_base;
1217 cmdbuf_endp = cmdbuf_ptr + n; 1195 cmdbuf_endp = cmdbuf_ptr;
1196 avail = CBUFSIZ;
1197 }
1218 1198
1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1199 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1220 1200
1221 if (r > 0) 1201 if (r > 0)
1222 { 1202 {
1223 cmdbuf_endp += r; 1203 cmdbuf_endp += r;
1224 return true; 1204 return true;
… …
1232 } 1212 }
1233 else 1213 else
1234 { 1214 {
1235 pty_ev.stop (); 1215 pty_ev.stop ();
1236 1216
1237 if (!OPTION (Opt_hold)) 1217 if (!option (Opt_hold))
1238 destroy (); 1218 destroy ();
1239 } 1219 }
1240 1220
1241 return false; 1221 return false;
1242} 1222}
1243 1223
1244void 1224void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1225rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1226{
1247 make_current (); 1227 make_current ();
1248 1228
1249 if (revents & EVENT_READ) 1229 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1230 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1231 for (int i = CBUFCNT; i-- && pty_fill (); )
1252 if (cmd_parse ()) 1232 cmd_parse ();
1253 break;
1254 1233
1255 if (revents & EVENT_WRITE) 1234 if (revents & ev::WRITE)
1256 pty_write (); 1235 pty_write ();
1257}
1258 1236
1259void 1237 refresh_check ();
1238}
1239
1240void ecb_cold
1260rxvt_term::pointer_unblank () 1241rxvt_term::pointer_unblank ()
1261{ 1242{
1262 XDefineCursor (dpy, vt, TermWin_cursor); 1243 XDefineCursor (dpy, vt, TermWin_cursor);
1263 recolour_cursor (); 1244 recolour_cursor ();
1264 1245
1265#ifdef POINTER_BLANK 1246#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1247 hidden_pointer = 0;
1267 1248
1268 if (OPTION (Opt_pointerBlank)) 1249 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1250 pointer_ev.start (pointerBlankDelay);
1270#endif 1251#endif
1271} 1252}
1272 1253
1273#ifdef POINTER_BLANK 1254#ifdef POINTER_BLANK
1274void 1255void ecb_cold
1275rxvt_term::pointer_blank () 1256rxvt_term::pointer_blank ()
1276{ 1257{
1277 if (!OPTION (Opt_pointerBlank)) 1258 if (!option (Opt_pointerBlank))
1278 return; 1259 return;
1279 1260
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1261 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1262 XFlush (dpy);
1282 1263
1283 hidden_pointer = 1; 1264 hidden_pointer = 1;
1284} 1265}
1285 1266
1286void 1267void ecb_cold
1287rxvt_term::pointer_cb (time_watcher &w) 1268rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1269{
1289 make_current (); 1270 make_current ();
1290 1271
1291 pointer_blank (); 1272 pointer_blank ();
1292} 1273}
… …
1295void 1276void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1277rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1278{
1298 int button_number, key_state = 0; 1279 int button_number, key_state = 0;
1299 int x, y; 1280 int x, y;
1281 int code = 32;
1300 1282
1301 x = ev.x; 1283 x = Pixel2Col (ev.x) + 1;
1302 y = ev.y; 1284 y = Pixel2Row (ev.y) + 1;
1303 pixel_position (&x, &y); 1285
1286 if (ev.type == MotionNotify)
1287 {
1288 if (x == mouse_row && y == mouse_col)
1289 return;
1290
1291 mouse_row = x;
1292 mouse_col = y;
1293 code += 32;
1294 }
1304 1295
1305 if (MEvent.button == AnyButton) 1296 if (MEvent.button == AnyButton)
1306 button_number = 3; 1297 button_number = 3;
1307 else 1298 else
1308 { 1299 {
1309 button_number = MEvent.button - Button1; 1300 button_number = MEvent.button - Button1;
1310 /* add 0x3D for wheel events, like xterm does */ 1301 /* add 0x3D for wheel events, like xterm does */
1311 if (button_number >= 3) 1302 if (button_number >= 3)
1312 button_number += (64 - 3); 1303 button_number += 64 - 3;
1313 } 1304 }
1314 1305
1315 if (priv_modes & PrivMode_MouseX10) 1306 if (priv_modes & PrivMode_MouseX10)
1316 { 1307 {
1317 /* 1308 /*
… …
1349 fputc ('A', stderr); 1340 fputc ('A', stderr);
1350 if (key_state & 32) 1341 if (key_state & 32)
1351 fputc ('2', stderr); 1342 fputc ('2', stderr);
1352 fprintf (stderr, "]: <%d>, %d/%d\n", 1343 fprintf (stderr, "]: <%d>, %d/%d\n",
1353 button_number, 1344 button_number,
1354 x + 1, 1345 x,
1355 y + 1); 1346 y);
1356#endif 1347#endif
1357 1348
1349#if ENABLE_FRILLS
1350 if (priv_modes & PrivMode_ExtMouseRight)
1351 tt_printf ("\033[%d;%d;%dM",
1352 code + button_number + key_state,
1353 x,
1354 y);
1355 else if (priv_modes & PrivMode_ExtModeMouse)
1356 tt_printf ("\033[M%c%lc%lc",
1357 code + button_number + key_state,
1358 wint_t (32 + x),
1359 wint_t (32 + y));
1360 else
1361#endif
1358 tt_printf ("\033[M%c%c%c", 1362 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1363 code + button_number + key_state,
1360 (32 + x + 1), 1364 32 + x,
1361 (32 + y + 1)); 1365 32 + y);
1362} 1366}
1363 1367
1364/*{{{ process an X event */ 1368/*{{{ process an X event */
1365void 1369void ecb_hot
1366rxvt_term::x_cb (XEvent &ev) 1370rxvt_term::x_cb (XEvent &ev)
1367{ 1371{
1368 make_current (); 1372 make_current ();
1369 1373
1370 dLocal (Display *, dpy); 1374 dLocal (Display *, dpy);
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1430 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1431 focus_out ();
1428 } 1432 }
1429#endif 1433#endif
1430 } 1434 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1435 break;
1436 1436
1437 /* 1437 /*
1438 * XXX: this is not the _current_ arrangement 1438 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1439 * Here's my conclusion:
… …
1458 break; 1458 break;
1459 } 1459 }
1460 break; 1460 break;
1461 1461
1462 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1466 focus_in ();
1464 break; 1467 break;
1465 1468
1466 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1473 focus_out ();
1468 break; 1474 break;
1469 1475
1470 case ConfigureNotify: 1476 case ConfigureNotify:
1471 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent)
1472 { 1478 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1480 ;
1481
1482 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1483
1484 bool moved = false;
1485#ifdef HAVE_BG_PIXMAP
1486 if (bg_window_position_sensitive ())
1487 {
1488 want_position_change = true;
1489 if (bg_img == 0)
1490 moved = true;
1491 }
1492#endif
1493
1494 if (want_position_change)
1495 {
1496 int x, y;
1497
1498 if (ev.xconfigure.send_event)
1499 {
1500 x = ev.xconfigure.x;
1501 y = ev.xconfigure.y;
1502 }
1503 else
1504 get_window_origin (x, y);
1505
1506 if (x != parent_x || y != parent_y)
1507 {
1508 parent_x = x;
1509 parent_y = y;
1510 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1511 moved = true;
1512 }
1513 }
1475 1514
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1515 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1516 {
1478 seen_resize = 1; 1517 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1518 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1519 }
1520 else
1521 {
1522#ifdef HAVE_BG_PIXMAP
1523 if (moved)
1524 update_background ();
1525#endif
1526 }
1481 1527
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1528 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1529 }
1489 break; 1530 break;
1490 1531
1491 case PropertyNotify: 1532 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1533 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1494 && ev.xproperty.state == PropertyNewValue)
1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1496
1497 break; 1534 break;
1498 1535
1499 case SelectionClear: 1536 case SelectionClear:
1500 selection_clear (); 1537 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1501 break;
1502
1503 case SelectionNotify:
1504 if (selection_wait == Sel_normal)
1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1506 break; 1538 break;
1507 1539
1508 case SelectionRequest: 1540 case SelectionRequest:
1509 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1510 break; 1542 break;
1511 1543
1512 case MapNotify: 1544 case MapNotify:
1545#ifdef HAVE_BG_PIXMAP
1546 // This is needed at startup for the case of no window manager
1547 // or a non-reparenting window manager and also because we
1548 // defer bg image updates if the window is not mapped. The
1549 // short delay is to optimize for multiple ConfigureNotify
1550 // events at startup when the window manager reparents the
1551 // window, so as to perform the computation after we have
1552 // received all of them.
1553 if (bg_img == 0)
1554 update_background_ev.start (0.025);
1555#endif
1513 mapped = 1; 1556 mapped = 1;
1514#ifdef TEXT_BLINK 1557#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1558 text_blink_ev.start ();
1516#endif 1559#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1560 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1561 break;
1519 1562
1520 case UnmapNotify: 1563 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1565#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1566 text_blink_ev.stop ();
1524#endif 1567#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1568 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1569 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1570
1534 case GraphicsExpose: 1571 case GraphicsExpose:
1535 case Expose: 1572 case Expose:
1536 if (ev.xany.window == vt) 1573 if (ev.xany.window == vt)
1537 { 1574 {
1538 do 1575 do
1576 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1577 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1578 ev.xexpose.width, ev.xexpose.height, false);
1579 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1580 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1581
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1582 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1583
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1584 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1585 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1588 }
1548 1589
1549 want_refresh = 1; 1590 want_refresh = 1;
1550 } 1591 }
1551 else 1592 else
1552 { 1593 {
… …
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1596 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1597 ;
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1598 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1599 ;
1559 1600
1560 if (isScrollbarWindow (ev.xany.window)) 1601 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1602 {
1562 scrollBar.setIdle (); 1603 scrollBar.state = SB_STATE_IDLE;
1563 scrollbar_show (0); 1604 scrollBar.show (0);
1564 } 1605 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1606 }
1571 break; 1607 break;
1572 1608
1573 case MotionNotify: 1609 case MotionNotify:
1574#ifdef POINTER_BLANK 1610#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1611 if (hidden_pointer)
1576 pointer_unblank (); 1612 pointer_unblank ();
1577#endif 1613#endif
1614 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1615 || priv_modes & PrivMode_MouseAnyEvent)
1616 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1618 break;
1580 1619
1581 if (ev.xany.window == vt) 1620 if (ev.xany.window == vt)
1582 { 1621 {
… …
1611 1650
1612#ifdef SELECTION_SCROLLING 1651#ifdef SELECTION_SCROLLING
1613 if (ev.xbutton.y < int_bwidth 1652 if (ev.xbutton.y < int_bwidth
1614 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1653 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1615 { 1654 {
1655 page_dirn scroll_selection_dir;
1616 int dist; 1656 int dist;
1617 1657
1618 /* don't clobber the current delay if we are 1658 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1659 * already in the middle of scrolling.
1620 */ 1660 */
1621 if (!sel_scroll_ev.active) 1661 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1662 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1663
1624 /* save the event params so we can highlight 1664 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1665 * the selection in the pending-scroll loop
1626 */ 1666 */
1627 selection_save_x = ev.xbutton.x; 1667 selection_save_x = ev.xbutton.x;
… …
1635 dist = int_bwidth - ev.xbutton.y; 1675 dist = int_bwidth - ev.xbutton.y;
1636 } 1676 }
1637 else 1677 else
1638 { 1678 {
1639 scroll_selection_dir = DN; 1679 scroll_selection_dir = DN;
1640 dist = ev.xbutton.y - (int_bwidth + height); 1680 dist = ev.xbutton.y - (int_bwidth + vt_height);
1641 } 1681 }
1642 1682
1643 scroll_selection_lines = Pixel2Height (dist) 1683 scroll_selection_lines = Pixel2Height (dist)
1644 / SELECTION_SCROLL_LINE_SPEEDUP 1684 / SELECTION_SCROLL_LINE_SPEEDUP
1645 + 1; 1685 + 1;
1646 min_it (scroll_selection_lines, 1686 min_it (scroll_selection_lines,
1647 SELECTION_SCROLL_MAX_LINES); 1687 SELECTION_SCROLL_MAX_LINES);
1688 scroll_selection_lines *= scroll_selection_dir;
1648 } 1689 }
1649 else 1690 else
1650 { 1691 {
1651 /* we are within the text window, so we 1692 /* we are within the text window, so we
1652 * shouldn't be scrolling 1693 * shouldn't be scrolling
1653 */ 1694 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1695 sel_scroll_ev.stop();
1656 } 1696 }
1657#endif 1697#endif
1658#ifdef MOUSE_THRESHOLD 1698#ifdef MOUSE_THRESHOLD
1659 } 1699 }
1660#endif 1700#endif
1661 } 1701 }
1662 } 1702 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1703 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1664 { 1704 {
1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1705 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1706 MotionNotify, &ev))
1667 ; 1707 ;
1668 1708
1669 XQueryPointer (dpy, scrollBar.win, 1709 XQueryPointer (dpy, scrollBar.win,
1670 &unused_root, &unused_child, 1710 &unused_root, &unused_child,
1671 &unused_root_x, &unused_root_y, 1711 &unused_root_x, &unused_root_y,
1672 &ev.xbutton.x, &ev.xbutton.y, 1712 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1713 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1714 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1715 scrollBar.size ());
1676 want_refresh = 1; 1716 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1717 scrollBar.show (1);
1679 } 1718 }
1680 break; 1719 break;
1681 } 1720 }
1682 1721
1683#if defined(CURSOR_BLINK) 1722#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1723 if (ev.type == KeyPress)
1685 { 1724 cursor_blink_reset ();
1686 if (hidden_cursor)
1687 {
1688 hidden_cursor = 0;
1689 want_refresh = 1;
1690 }
1691
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 }
1694#endif 1725#endif
1695 1726
1696#if defined(POINTER_BLANK) 1727#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1728 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1729 {
1699 if (ev.type == MotionNotify 1730 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1731 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1732 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1733 if (hidden_pointer)
… …
1704 1735
1705 if (ev.type == KeyPress && hidden_pointer == 0) 1736 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank (); 1737 pointer_blank ();
1707 } 1738 }
1708#endif 1739#endif
1709}
1710 1740
1711void 1741 refresh_check ();
1742}
1743
1744#if ENABLE_FRILLS
1745void ecb_cold
1746rxvt_term::set_urgency (bool enable)
1747{
1748 if (enable == urgency_hint)
1749 return;
1750
1751 if (XWMHints *h = XGetWMHints (dpy, parent))
1752 {
1753 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1754 XSetWMHints (dpy, parent, h);
1755 urgency_hint = enable;
1756 XFree (h);
1757 }
1758}
1759#endif
1760
1761void ecb_cold
1712rxvt_term::focus_in () 1762rxvt_term::focus_in ()
1713{ 1763{
1714 if (!focus) 1764 if (!focus)
1715 { 1765 {
1716 focus = 1; 1766 focus = 1;
1717 want_refresh = 1; 1767 want_refresh = 1;
1718 1768
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1721#if USE_XIM 1769#if USE_XIM
1722 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1723 { 1771 {
1724 IMSetPosition (); 1772 im_set_position ();
1725 XSetICFocus (Input_Context); 1773 XSetICFocus (Input_Context);
1726 } 1774 }
1727#endif 1775#endif
1728#if CURSOR_BLINK 1776#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1777 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1778 cursor_blink_ev.again ();
1731#endif 1779#endif
1732#if OFF_FOCUS_FADING 1780#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1781 if (rs[Rs_fade])
1734 { 1782 {
1735 pix_colors = pix_colors_focused; 1783 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1784 scr_recolour ();
1737 } 1785 }
1738#endif 1786#endif
1739 } 1787#if ENABLE_FRILLS
1740} 1788 if (option (Opt_urgentOnBell))
1789 set_urgency (0);
1790#endif
1741 1791
1742void 1792 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1793 }
1794}
1795
1796void ecb_cold
1743rxvt_term::focus_out () 1797rxvt_term::focus_out ()
1744{ 1798{
1745 if (focus) 1799 if (focus)
1746 { 1800 {
1747 focus = 0; 1801 focus = 0;
1748 want_refresh = 1; 1802 want_refresh = 1;
1749 1803
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1804#if ENABLE_FRILLS
1751 1805 if (option (Opt_urgentOnBell))
1806 set_urgency (0);
1807#endif
1752#if ENABLE_FRILLS || ISO_14755 1808#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1809 if (iso14755buf)
1754 { 1810 {
1755 iso14755buf = 0; 1811 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1812# if ISO_14755
1757 scr_overlay_off (); 1813 scr_overlay_off ();
1758# endif 1814# endif
1759 } 1815 }
1760#endif 1816#endif
1761#if USE_XIM 1817#if USE_XIM
1762 if (Input_Context != NULL) 1818 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1819 XUnsetICFocus (Input_Context);
1764#endif 1820#endif
1765#if CURSOR_BLINK 1821#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1822 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1823 cursor_blink_ev.stop ();
1824
1768 hidden_cursor = 0; 1825 hidden_cursor = 0;
1769#endif 1826#endif
1770#if OFF_FOCUS_FADING 1827#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1828 if (rs[Rs_fade])
1772 { 1829 {
1773 pix_colors = pix_colors_unfocused; 1830 pix_colors = pix_colors_unfocused;
1774 scr_recolour (); 1831 scr_recolour ();
1775 } 1832 }
1776#endif 1833#endif
1777 }
1778}
1779 1834
1780void 1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1836 }
1837}
1838
1839void ecb_cold
1781rxvt_term::update_fade_color (unsigned int idx) 1840rxvt_term::update_fade_color (unsigned int idx)
1782{ 1841{
1783#if OFF_FOCUS_FADING 1842#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade]) 1843 if (rs[Rs_fade])
1785 { 1844 {
… …
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1847 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 } 1848 }
1790#endif 1849#endif
1791} 1850}
1792 1851
1793#if TRANSPARENT || ENABLE_PERL 1852#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1794void 1853void ecb_hot
1795rxvt_term::rootwin_cb (XEvent &ev) 1854rxvt_term::rootwin_cb (XEvent &ev)
1796{ 1855{
1797 make_current (); 1856 make_current ();
1798 1857
1799 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1858 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1800 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1859 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1801 return; 1860 return;
1802 1861
1803# if TRANSPARENT
1804 switch (ev.type) 1862 switch (ev.type)
1805 { 1863 {
1806 case PropertyNotify: 1864 case PropertyNotify:
1807 /* 1865 /*
1808 * if user used some Esetroot compatible prog to set the root bg, 1866 * if user used some Esetroot compatible prog to set the root bg,
1809 * use the property to determine the pixmap. We use it later on. 1867 * use the property to determine the pixmap. We use it later on.
1810 */ 1868 */
1811 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1869 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1812 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1870 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1813 return; 1871 {
1814 1872#if BG_IMAGE_FROM_ROOT
1815 /* FALLTHROUGH */ 1873 if (option (Opt_transparent))
1816 case ReparentNotify: 1874 {
1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1875 rxvt_img::new_from_root (this)->replace (root_img);
1818 want_refresh = want_full_refresh = 1; 1876 update_background ();
1819 break; 1877 }
1820 }
1821# endif 1878#endif
1879 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1880 }
1881
1882 break;
1883 }
1884
1885 refresh_check ();
1822} 1886}
1823#endif 1887#endif
1824 1888
1825void 1889void
1826rxvt_term::button_press (XButtonEvent &ev) 1890rxvt_term::button_press (XButtonEvent &ev)
… …
1847 iso14755_54 (ev.x, ev.y); 1911 iso14755_54 (ev.x, ev.y);
1848 return; 1912 return;
1849 } 1913 }
1850#endif 1914#endif
1851 1915
1852 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1916 clickintime = ev.time - MEvent.time < multiClickTime;
1853 1917
1854 if (reportmode) 1918 if (reportmode)
1855 { 1919 {
1856 /* mouse report from vt window */ 1920 /* mouse report from vt window */
1857 /* save the xbutton state (for ButtonRelease) */ 1921 /* save the xbutton state (for ButtonRelease) */
1858 MEvent.state = ev.state; 1922 MEvent.state = ev.state;
1859#ifdef MOUSE_REPORT_DOUBLECLICK 1923#ifdef MOUSE_REPORT_DOUBLECLICK
1860 if (ev.button == MEvent.button && clickintime) 1924 if (ev.button == MEvent.button && clickintime)
1861 { 1925 {
1862 /* same button, within alloted time */ 1926 /* same button, within allowed time */
1863 MEvent.clicks++; 1927 MEvent.clicks++;
1864 1928
1865 if (MEvent.clicks > 1) 1929 if (MEvent.clicks > 1)
1866 { 1930 {
1867 /* only report double clicks */ 1931 /* only report double clicks */
… …
1881 mouse_report (ev); 1945 mouse_report (ev);
1882 } 1946 }
1883#else 1947#else
1884 MEvent.button = ev.button; 1948 MEvent.button = ev.button;
1885 mouse_report (ev); 1949 mouse_report (ev);
1886#endif /* MOUSE_REPORT_DOUBLECLICK */ 1950#endif /* MOUSE_REPORT_DOUBLECLICK */
1887 1951
1888 } 1952 }
1889 else 1953 else
1890 { 1954 {
1891 if (ev.button != MEvent.button) 1955 if (ev.button != MEvent.button)
… …
1939 } 2003 }
1940 2004
1941 /* 2005 /*
1942 * Scrollbar window processing of button press 2006 * Scrollbar window processing of button press
1943 */ 2007 */
1944 if (isScrollbarWindow (ev.window)) 2008 if (scrollBar.state && ev.window == scrollBar.win)
1945 { 2009 {
1946 scrollBar.setIdle (); 2010 page_dirn direction = NO_DIR;
2011
2012 if (scrollBar.upButton (ev.y))
2013 direction = UP; /* up */
2014 else if (scrollBar.dnButton (ev.y))
2015 direction = DN; /* down */
2016
2017 scrollBar.state = SB_STATE_IDLE;
1947 /* 2018 /*
1948 * Rxvt-style scrollbar: 2019 * Rxvt-style scrollbar:
1949 * move up if mouse is above slider 2020 * move up if mouse is above slider
1950 * move dn if mouse is below slider 2021 * move dn if mouse is below slider
1951 * 2022 *
… …
1960 /* 2031 /*
1961 * Mouse report disabled scrollbar: 2032 * Mouse report disabled scrollbar:
1962 * arrow buttons - send up/down 2033 * arrow buttons - send up/down
1963 * click on scrollbar - send pageup/down 2034 * click on scrollbar - send pageup/down
1964 */ 2035 */
1965 if ((scrollBar.style == R_SB_NEXT 2036 if (direction == UP)
1966 && scrollbarnext_upButton (ev.y))
1967 || (scrollBar.style == R_SB_RXVT
1968 && scrollbarrxvt_upButton (ev.y)))
1969 tt_printf ("\033[A"); 2037 tt_printf ("\033[A");
1970 else if ((scrollBar.style == R_SB_NEXT 2038 else if (direction == DN)
1971 && scrollbarnext_dnButton (ev.y))
1972 || (scrollBar.style == R_SB_RXVT
1973 && scrollbarrxvt_dnButton (ev.y)))
1974 tt_printf ("\033[B"); 2039 tt_printf ("\033[B");
1975 else 2040 else
1976 switch (ev.button) 2041 switch (ev.button)
1977 { 2042 {
1978 case Button2: 2043 case Button2:
… …
1985 tt_printf ("\033[5~"); 2050 tt_printf ("\033[5~");
1986 break; 2051 break;
1987 } 2052 }
1988 } 2053 }
1989 else 2054 else
1990#endif /* NO_SCROLLBAR_REPORT */ 2055#endif /* NO_SCROLLBAR_REPORT */
1991
1992 {
1993 char upordown = 0;
1994
1995 if (scrollBar.style == R_SB_NEXT)
1996 { 2056 {
1997 if (scrollbarnext_upButton (ev.y)) 2057 if (direction != NO_DIR)
1998 upordown = -1; /* up */
1999 else if (scrollbarnext_dnButton (ev.y))
2000 upordown = 1; /* down */
2001 }
2002 else if (scrollBar.style == R_SB_RXVT)
2003 {
2004 if (scrollbarrxvt_upButton (ev.y))
2005 upordown = -1; /* up */
2006 else if (scrollbarrxvt_dnButton (ev.y))
2007 upordown = 1; /* down */
2008 }
2009 if (upordown)
2010 { 2058 {
2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2060 if (!cont_scroll_ev.is_active ())
2012 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2061 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2013#endif 2062#endif
2014 if (scr_page (upordown < 0 ? UP : DN, 1)) 2063 if (scr_page (direction, 1))
2015 { 2064 {
2016 if (upordown < 0) 2065 if (direction == UP)
2017 scrollBar.setUp (); 2066 scrollBar.state = SB_STATE_UP;
2018 else 2067 else
2019 scrollBar.setDn (); 2068 scrollBar.state = SB_STATE_DOWN;
2020 } 2069 }
2021 } 2070 }
2022 else 2071 else
2023 switch (ev.button) 2072 switch (ev.button)
2024 { 2073 {
2025 case Button2: 2074 case Button2:
2026 switch (scrollbar_align) 2075 switch (scrollBar.align)
2027 { 2076 {
2028 case R_SB_ALIGN_TOP: 2077 case SB_ALIGN_TOP:
2029 csrO = 0; 2078 csrO = 0;
2030 break; 2079 break;
2031 case R_SB_ALIGN_CENTRE: 2080 case SB_ALIGN_CENTRE:
2032 csrO = (scrollBar.bot - scrollBar.top) / 2; 2081 csrO = (scrollBar.bot - scrollBar.top) / 2;
2033 break; 2082 break;
2034 case R_SB_ALIGN_BOTTOM: 2083 case SB_ALIGN_BOTTOM:
2035 csrO = scrollBar.bot - scrollBar.top; 2084 csrO = scrollBar.bot - scrollBar.top;
2036 break; 2085 break;
2037 } 2086 }
2038 2087
2039 if (scrollBar.style == R_SB_XTERM 2088 if (scrollBar.style == SB_STYLE_XTERM
2040 || scrollbar_above_slider (ev.y) 2089 || scrollBar.above_slider (ev.y)
2041 || scrollbar_below_slider (ev.y)) 2090 || scrollBar.below_slider (ev.y))
2042 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2091 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2043 2092
2044 scrollBar.setMotion (); 2093 scrollBar.state = SB_STATE_MOTION;
2045 break; 2094 break;
2046 2095
2047 case Button1: 2096 case Button1:
2048 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2097 if (scrollBar.align == SB_ALIGN_CENTRE)
2049 csrO = ev.y - scrollBar.top; 2098 csrO = ev.y - scrollBar.top;
2050 /* FALLTHROUGH */ 2099 /* FALLTHROUGH */
2051 2100
2052 case Button3: 2101 case Button3:
2053 if (scrollBar.style != R_SB_XTERM) 2102 if (scrollBar.style != SB_STYLE_XTERM)
2054 { 2103 {
2055 if (scrollbar_above_slider (ev.y)) 2104 if (scrollBar.above_slider (ev.y))
2056# ifdef RXVT_SCROLL_FULL 2105# ifdef RXVT_SCROLL_FULL
2057 scr_page (UP, nrow - 1); 2106 scr_page (UP, nrow - 1);
2058# else 2107# else
2059 scr_page (UP, nrow / 4); 2108 scr_page (UP, nrow / 4);
2060# endif 2109# endif
2061 else if (scrollbar_below_slider (ev.y)) 2110 else if (scrollBar.below_slider (ev.y))
2062# ifdef RXVT_SCROLL_FULL 2111# ifdef RXVT_SCROLL_FULL
2063 scr_page (DN, nrow - 1); 2112 scr_page (DN, nrow - 1);
2064# else 2113# else
2065 scr_page (DN, nrow / 4); 2114 scr_page (DN, nrow / 4);
2066# endif 2115# endif
2067 else 2116 else
2068 scrollBar.setMotion (); 2117 scrollBar.state = SB_STATE_MOTION;
2069 } 2118 }
2070 else 2119 else
2071 { 2120 {
2072 scr_page ((ev.button == Button1 ? DN : UP), 2121 scr_page ((ev.button == Button1 ? DN : UP),
2073 (nrow 2122 (nrow
2074 * scrollbar_position (ev.y) 2123 * scrollBar.position (ev.y)
2075 / scrollbar_size ())); 2124 / scrollBar.size ()));
2076 } 2125 }
2077 2126
2078 break; 2127 break;
2079 } 2128 }
2080 } 2129 }
… …
2090 2139
2091 csrO = 0; /* reset csr Offset */ 2140 csrO = 0; /* reset csr Offset */
2092 if (!bypass_keystate) 2141 if (!bypass_keystate)
2093 reportmode = !! (priv_modes & PrivMode_mouse_report); 2142 reportmode = !! (priv_modes & PrivMode_mouse_report);
2094 2143
2095 if (scrollbar_isUpDn ()) 2144 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2096 { 2145 {
2097 scrollBar.setIdle (); 2146 scrollBar.state = SB_STATE_IDLE;
2098 scrollbar_show (0); 2147 scrollBar.show (0);
2099 } 2148 }
2100 2149
2101#ifdef SELECTION_SCROLLING 2150#ifdef SELECTION_SCROLLING
2102 if (sel_scroll_ev.active)
2103 sel_scroll_ev.stop(); 2151 sel_scroll_ev.stop();
2104#endif 2152#endif
2105 2153
2106 if (ev.window == vt) 2154 if (ev.window == vt)
2107 { 2155 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2156 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2123#ifdef MOUSE_REPORT_DOUBLECLICK 2171#ifdef MOUSE_REPORT_DOUBLECLICK
2124 /* only report the release of 'slow' single clicks */ 2172 /* only report the release of 'slow' single clicks */
2125 if (MEvent.button != AnyButton 2173 if (MEvent.button != AnyButton
2126 && (ev.button != MEvent.button 2174 && (ev.button != MEvent.button
2127 || (ev.time - MEvent.time 2175 || (ev.time - MEvent.time
2128 > MULTICLICK_TIME / 2))) 2176 > multiClickTime / 2)))
2129 { 2177 {
2130 MEvent.clicks = 0; 2178 MEvent.clicks = 0;
2131 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2132 mouse_report (ev); 2180 mouse_report (ev);
2133 } 2181 }
2134#else /* MOUSE_REPORT_DOUBLECLICK */ 2182#else /* MOUSE_REPORT_DOUBLECLICK */
2135 MEvent.button = AnyButton; 2183 MEvent.button = AnyButton;
2136 mouse_report (ev); 2184 mouse_report (ev);
2137#endif /* MOUSE_REPORT_DOUBLECLICK */ 2185#endif /* MOUSE_REPORT_DOUBLECLICK */
2138 return; 2186 return;
2139 } 2187 }
2140 2188
2141 /* 2189 /*
2142 * dumb hack to compensate for the failure of click-and-drag 2190 * dumb hack to compensate for the failure of click-and-drag
… …
2153 case Button3: 2201 case Button3:
2154 selection_make (ev.time); 2202 selection_make (ev.time);
2155 break; 2203 break;
2156 2204
2157 case Button2: 2205 case Button2:
2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2206 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2207 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2208 break;
2161 2209
2162#ifdef MOUSE_WHEEL 2210#ifdef MOUSE_WHEEL
2163 case Button4: 2211 case Button4:
2164 case Button5: 2212 case Button5:
2165 { 2213 {
2166 int i; 2214 int lines;
2167 page_dirn v; 2215 page_dirn dirn;
2168 2216
2169 v = ev.button == Button4 ? UP : DN; 2217 dirn = ev.button == Button4 ? UP : DN;
2170 2218
2171 if (ev.state & ShiftMask) 2219 if (ev.state & ShiftMask)
2172 i = 1; 2220 lines = 1;
2173 else if (OPTION (Opt_mouseWheelScrollPage)) 2221 else if (option (Opt_mouseWheelScrollPage))
2174 i = nrow - 1; 2222 lines = nrow - 1;
2175 else 2223 else
2176 i = 5; 2224 lines = 5;
2177 2225
2178# ifdef MOUSE_SLIP_WHEELING 2226# ifdef MOUSE_SLIP_WHEELING
2179 if (ev.state & ControlMask) 2227 if (ev.state & ControlMask)
2180 { 2228 {
2181 mouse_slip_wheel_speed += v ? -1 : 1; 2229 mouse_slip_wheel_speed += dirn;
2182 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2230 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2183 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2184 2231
2185 if (slip_wheel_ev.at < NOW) 2232 if (!slip_wheel_ev.is_active ())
2186 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2233 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2187
2188 slip_wheel_ev.start ();
2189 } 2234 }
2190 else 2235 else
2236# endif
2191 { 2237 {
2192# endif
2193 scr_page (v, i); 2238 scr_page (dirn, lines);
2194 scrollbar_show (1); 2239 scrollBar.show (1);
2195# ifdef MOUSE_SLIP_WHEELING
2196 } 2240 }
2197# endif
2198 } 2241 }
2199 break; 2242 break;
2200#endif 2243#endif
2201 } 2244 }
2202 } 2245 }
2203} 2246}
2204 2247
2205#ifdef TRANSPARENT
2206#if TINTING
2207/* taken from aterm-0.4.2 */
2208
2209typedef uint32_t RUINT32T;
2210
2211void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2212{
2213 int sh_r, sh_g, sh_b;
2214 RUINT32T mask_r, mask_g, mask_b;
2215 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2216 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2217 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2218 int i;
2219
2220 Visual *visual = term->visual;
2221
2222 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2223
2224 /* for convenience */
2225 mask_r = visual->red_mask;
2226 mask_g = visual->green_mask;
2227 mask_b = visual->blue_mask;
2228
2229 /* boring lookup table pre-initialization */
2230 switch (srcImage->bits_per_pixel) {
2231 case 15:
2232 if ((mask_r != 0x7c00) ||
2233 (mask_g != 0x03e0) ||
2234 (mask_b != 0x001f))
2235 return;
2236 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2237 lookup_r = lookup;
2238 lookup_g = lookup+32;
2239 lookup_b = lookup+32+32;
2240 sh_r = 10;
2241 sh_g = 5;
2242 sh_b = 0;
2243 break;
2244 case 16:
2245 if ((mask_r != 0xf800) ||
2246 (mask_g != 0x07e0) ||
2247 (mask_b != 0x001f))
2248 return;
2249 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2250 lookup_r = lookup;
2251 lookup_g = lookup+32;
2252 lookup_b = lookup+32+64;
2253 sh_r = 11;
2254 sh_g = 5;
2255 sh_b = 0;
2256 break;
2257 case 24:
2258 if ((mask_r != 0xff0000) ||
2259 (mask_g != 0x00ff00) ||
2260 (mask_b != 0x0000ff))
2261 return;
2262 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2263 lookup_r = lookup;
2264 lookup_g = lookup+256;
2265 lookup_b = lookup+256+256;
2266 sh_r = 16;
2267 sh_g = 8;
2268 sh_b = 0;
2269 break;
2270 case 32:
2271 if ((mask_r != 0xff0000) ||
2272 (mask_g != 0x00ff00) ||
2273 (mask_b != 0x0000ff))
2274 return;
2275 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2276 lookup_r = lookup;
2277 lookup_g = lookup+256;
2278 lookup_b = lookup+256+256;
2279 sh_r = 16;
2280 sh_g = 8;
2281 sh_b = 0;
2282 break;
2283 default:
2284 return; /* we do not support this color depth */
2285 }
2286
2287 /* prepare limits for color transformation (each channel is handled separately) */
2288 if (shade < 0) {
2289 shade = -shade;
2290 if (shade < 0) shade = 0;
2291 if (shade > 100) shade = 100;
2292
2293 lower_lim_r = 65535-rm;
2294 lower_lim_g = 65535-gm;
2295 lower_lim_b = 65535-bm;
2296
2297 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2298 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2299 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2300
2301 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2302 } else {
2303 if (shade < 0) shade = 0;
2304 if (shade > 100) shade = 100;
2305
2306 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2307
2308 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2309 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2310 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2311 }
2312
2313 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2314 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2315 {
2316 unsigned int tmp;
2317
2318 tmp = lower_lim_r;
2319 lower_lim_r = lower_lim_b;
2320 lower_lim_b = tmp;
2321
2322 tmp = upper_lim_r;
2323 upper_lim_r = upper_lim_b;
2324 upper_lim_b = tmp;
2325 }
2326
2327 /* fill our lookup tables */
2328 for (i = 0; i <= mask_r>>sh_r; i++)
2329 {
2330 RUINT32T tmp;
2331 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2332 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2333 lookup_r[i] = (tmp/65535)<<sh_r;
2334 }
2335 for (i = 0; i <= mask_g>>sh_g; i++)
2336 {
2337 RUINT32T tmp;
2338 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2339 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2340 lookup_g[i] = (tmp/65535)<<sh_g;
2341 }
2342 for (i = 0; i <= mask_b>>sh_b; i++)
2343 {
2344 RUINT32T tmp;
2345 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2346 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2347 lookup_b[i] = (tmp/65535)<<sh_b;
2348 }
2349
2350 /* apply table to input image (replacing colors by newly calculated ones) */
2351 switch (srcImage->bits_per_pixel)
2352 {
2353 case 15:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0x7c00)>>10] |
2365 lookup_g[(*p & 0x03e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 16:
2373 {
2374 unsigned short *p1, *pf, *p, *pl;
2375 p1 = (unsigned short *) srcImage->data;
2376 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width;
2381 for (; p < pl; p++)
2382 {
2383 *p = lookup_r[(*p & 0xf800)>>11] |
2384 lookup_g[(*p & 0x07e0)>> 5] |
2385 lookup_b[(*p & 0x001f)];
2386 }
2387 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 24:
2392 {
2393 unsigned char *p1, *pf, *p, *pl;
2394 p1 = (unsigned char *) srcImage->data;
2395 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width * 3;
2400 for (; p < pl; p += 3)
2401 {
2402 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2403 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2404 p[2] = lookup_r[(p[2] & 0x0000ff)];
2405 }
2406 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2407 }
2408 break;
2409 }
2410 case 32:
2411 {
2412 RUINT32T *p1, *pf, *p, *pl;
2413 p1 = (RUINT32T *) srcImage->data;
2414 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2415
2416 while (p1 < pf)
2417 {
2418 p = p1;
2419 pl = p1 + srcImage->width;
2420 for (; p < pl; p++)
2421 {
2422 *p = lookup_r[(*p & 0xff0000)>>16] |
2423 lookup_g[(*p & 0x00ff00)>> 8] |
2424 lookup_b[(*p & 0x0000ff)] |
2425 (*p & ~0xffffff);
2426 }
2427 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2428 }
2429 break;
2430 }
2431 }
2432
2433 free (lookup);
2434}
2435#endif
2436
2437/*
2438 * Check our parents are still who we think they are.
2439 * Do transparency updates if required
2440 */
2441int
2442rxvt_term::check_our_parents ()
2443{
2444 int i, pchanged, aformat, have_pixmap, rootdepth;
2445 unsigned long nitems, bytes_after;
2446 Atom atype;
2447 unsigned char *prop = NULL;
2448 Window root, oldp, *list;
2449 Pixmap rootpixmap = None;
2450 XWindowAttributes wattr, wrootattr;
2451
2452 pchanged = 0;
2453
2454 if (!OPTION (Opt_transparent))
2455 return pchanged; /* Don't try any more */
2456
2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2458 rootdepth = wrootattr.depth;
2459
2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2461
2462 if (rootdepth != wattr.depth)
2463 {
2464 if (am_transparent)
2465 {
2466 pchanged = 1;
2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2468 am_transparent = am_pixmap_trans = 0;
2469 }
2470
2471 return pchanged; /* Don't try any more */
2472 }
2473
2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2475 XSync (dpy, False);
2476
2477 /*
2478 * Make the frame window set by the window manager have
2479 * the root background. Some window managers put multiple nested frame
2480 * windows for each client, so we have to take care about that.
2481 */
2482 i = (xa[XA_XROOTPMAP_ID]
2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL)
2488 i = (xa[XA_ESETROOT_PMAP_ID]
2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL
2494#if TINTING
2495 || !ISSET_PIXCOLOR (Color_tint)
2496#endif
2497 )
2498 have_pixmap = 0;
2499 else
2500 {
2501 have_pixmap = 1;
2502 rootpixmap = *(Pixmap *)prop;
2503 XFree (prop);
2504 }
2505
2506 if (have_pixmap)
2507 {
2508 /*
2509 * Copy display->root pixmap transparency
2510 */
2511 int sx, sy, nx, ny;
2512 unsigned int nw, nh;
2513 Window cr;
2514 XImage *image;
2515 GC gc;
2516 XGCValues gcvalue;
2517
2518 XTranslateCoordinates (dpy, parent[0], display->root,
2519 0, 0, &sx, &sy, &cr);
2520 nw = (unsigned int)szHint.width;
2521 nh = (unsigned int)szHint.height;
2522 nx = ny = 0;
2523
2524 if (sx < 0)
2525 {
2526 nw += sx;
2527 nx = -sx;
2528 sx = 0;
2529 }
2530
2531 if (sy < 0)
2532 {
2533 nh += sy;
2534 ny = -sy;
2535 sy = 0;
2536 }
2537
2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540
2541 XSync (dpy, False);
2542 allowedxerror = -1;
2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544
2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2546 /* XXX: may need a delay here? */
2547 allowedxerror = 0;
2548
2549 if (image == NULL)
2550 {
2551 if (am_transparent && am_pixmap_trans)
2552 {
2553 pchanged = 1;
2554 if (pixmap != None)
2555 {
2556 XFreePixmap (dpy, pixmap);
2557 pixmap = None;
2558 }
2559 }
2560
2561 am_pixmap_trans = 0;
2562 }
2563 else
2564 {
2565 if (pixmap != None)
2566 XFreePixmap (dpy, pixmap);
2567
2568#if TINTING
2569 if (ISSET_PIXCOLOR (Color_tint))
2570 {
2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2572
2573 rgba c;
2574 pix_colors_focused [Color_tint].get (c);
2575
2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577 }
2578#endif
2579
2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2583 nx, ny, image->width, image->height);
2584 XFreeGC (dpy, gc);
2585 XDestroyImage (image);
2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2587 XClearWindow (dpy, parent[0]);
2588
2589 if (!am_transparent || !am_pixmap_trans)
2590 pchanged = 1;
2591
2592 am_transparent = am_pixmap_trans = 1;
2593 }
2594 }
2595
2596 if (am_pixmap_trans)
2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2598 else
2599 {
2600 unsigned int n;
2601 /*
2602 * InheritPixmap transparency
2603 */
2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 {
2606 oldp = parent[i];
2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2608 XFree (list);
2609
2610 if (parent[i] == display->root)
2611 {
2612 if (oldp != None)
2613 pchanged = 1;
2614
2615 break;
2616 }
2617
2618 if (oldp != parent[i])
2619 pchanged = 1;
2620 }
2621
2622 n = 0;
2623
2624 if (pchanged)
2625 for (; n < (unsigned int)i; n++)
2626 {
2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2630 {
2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2632 break;
2633 }
2634 }
2635
2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2637 {
2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2640 am_transparent = 0;
2641 /* XXX: also turn off Opt_transparent? */
2642 }
2643 else
2644 {
2645 for (n = 0; n < (unsigned int)i; n++)
2646 {
2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2648 XClearWindow (dpy, parent[n]);
2649 }
2650
2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2652 am_transparent = 1;
2653 }
2654
2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2656 parent[i] = None;
2657 }
2658
2659 if (scrollBar.win)
2660 {
2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2662 scrollBar.setIdle ();
2663 scrollbar_show (0);
2664 }
2665
2666 if (am_transparent)
2667 {
2668 want_refresh = want_full_refresh = 1;
2669 if (am_pixmap_trans)
2670 flush ();
2671 }
2672
2673 return pchanged;
2674}
2675#endif
2676
2677/*}}} */ 2248/*}}} */
2678 2249
2679bool 2250void ecb_hot
2680rxvt_term::cmd_parse () 2251rxvt_term::cmd_parse ()
2681{ 2252{
2682 bool flag = false;
2683 wchar_t ch = NOCHAR; 2253 wchar_t ch = NOCHAR;
2684 char *seq_begin; // remember start of esc-sequence here 2254 char *seq_begin; // remember start of esc-sequence here
2685 2255
2686 for (;;) 2256 for (;;)
2687 { 2257 {
2688 if (ch == NOCHAR) 2258 if (ecb_unlikely (ch == NOCHAR))
2689 { 2259 {
2690 seq_begin = cmdbuf_ptr; 2260 seq_begin = cmdbuf_ptr;
2691 ch = next_char (); 2261 ch = next_char ();
2692 2262
2693 if (ch == NOCHAR) 2263 if (ch == NOCHAR)
2694 break; 2264 break;
2695 } 2265 }
2696 2266
2697 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2267 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2698 { 2268 {
2699 if (!seen_input) 2269 if (ecb_unlikely (!seen_input))
2700 { 2270 {
2701 seen_input = 1; 2271 seen_input = 1;
2702 // many badly-written programs (e.g. jed) contain a race condition: 2272 // many badly-written programs (e.g. jed) contain a race condition:
2703 // they first read the screensize and then install a SIGWINCH handler. 2273 // they first read the screensize and then install a SIGWINCH handler.
2704 // some window managers resize the window early, and these programs 2274 // some window managers resize the window early, and these programs
… …
2717 wchar_t *str = buf; 2287 wchar_t *str = buf;
2718 wchar_t *eol = str + min (ncol, UBUFSIZ); 2288 wchar_t *eol = str + min (ncol, UBUFSIZ);
2719 2289
2720 for (;;) 2290 for (;;)
2721 { 2291 {
2722 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2292 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2723 break; 2293 break;
2724 2294
2725 *str++ = ch; 2295 *str++ = ch;
2726 2296
2727 if (ch == C0_LF || str >= eol) 2297 if (ecb_unlikely (ch == C0_LF || str >= eol))
2728 { 2298 {
2729 if (ch == C0_LF) 2299 if (ch == C0_LF)
2730 nlines++; 2300 nlines++;
2731 2301
2732 refresh_count++; 2302 refresh_count++;
2733 2303
2734 if (!OPTION (Opt_jumpScroll) 2304 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2735 || (refresh_count >= refresh_limit * (nrow - 1)))
2736 { 2305 {
2737 refreshnow = true;
2738 refresh_count = 0; 2306 refresh_count = 0;
2307
2308 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2309 {
2310 refreshnow = true;
2739 ch = NOCHAR; 2311 ch = NOCHAR;
2740 break; 2312 break;
2313 }
2741 } 2314 }
2742 2315
2743 // scr_add_lines only works for nlines <= nrow - 1. 2316 // scr_add_lines only works for nlines <= nrow - 1.
2744 if (nlines >= nrow - 1) 2317 if (nlines >= nrow - 1)
2745 { 2318 {
… …
2773 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2346 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2774 scr_add_lines (buf, str - buf, nlines); 2347 scr_add_lines (buf, str - buf, nlines);
2775 2348
2776 /* 2349 /*
2777 * If there have been a lot of new lines, then update the screen 2350 * If there have been a lot of new lines, then update the screen
2778 * What the heck I'll cheat and only refresh less than every page-full. 2351 * What the heck we'll cheat and only refresh less than every page-full.
2779 * the number of pages between refreshes is refresh_limit, which 2352 * if skipScroll is enabled.
2780 * is incremented here because we must be doing flat-out scrolling.
2781 */ 2353 */
2782 if (refreshnow) 2354 if (refreshnow)
2783 { 2355 {
2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2785 refresh_limit++;
2786 else
2787 {
2788 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2790 scr_refresh (); 2356 scr_refresh ();
2791 want_refresh = 1; 2357 want_refresh = 1;
2792 }
2793 } 2358 }
2794
2795 } 2359 }
2796 else 2360 else
2797 { 2361 {
2798 try 2362 try
2799 { 2363 {
… …
2807 } 2371 }
2808 2372
2809 ch = NOCHAR; 2373 ch = NOCHAR;
2810 } 2374 }
2811 } 2375 }
2812
2813 return flag;
2814} 2376}
2815 2377
2816// read the next character 2378// read the next character
2817wchar_t 2379wchar_t ecb_hot
2818rxvt_term::next_char () NOTHROW 2380rxvt_term::next_char () NOTHROW
2819{ 2381{
2820 while (cmdbuf_ptr < cmdbuf_endp) 2382 while (cmdbuf_ptr < cmdbuf_endp)
2821 { 2383 {
2822 // assume 7-bit to be ascii ALWAYS 2384 // assume 7-bit to be ascii ALWAYS
2823 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2385 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2824 return *cmdbuf_ptr++; 2386 return *cmdbuf_ptr++;
2825 2387
2826 wchar_t wc; 2388 wchar_t wc;
2827 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2828 2390
… …
2832 cmdbuf_ptr = cmdbuf_endp; 2394 cmdbuf_ptr = cmdbuf_endp;
2833 break; 2395 break;
2834 } 2396 }
2835 2397
2836 if (len == (size_t)-1) 2398 if (len == (size_t)-1)
2399 {
2400 mbstate.reset (); // reset now undefined conversion state
2401 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2402 // in which case we "erroneously" return the next byte which might be valid.
2837 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2403 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2404 }
2838 2405
2839 // assume wchar == unicode 2406 // assume wchar == unicode
2840 cmdbuf_ptr += len; 2407 cmdbuf_ptr += len;
2841 return wc & UNICODE_MASK; 2408 return wc & UNICODE_MASK;
2842 } 2409 }
2843 2410
2844 return NOCHAR; 2411 return NOCHAR;
2845} 2412}
2846 2413
2847// read the next octet 2414// read the next octet
2848uint32_t 2415uint32_t ecb_hot
2849rxvt_term::next_octet () NOTHROW 2416rxvt_term::next_octet () NOTHROW
2850{ 2417{
2851 return cmdbuf_ptr < cmdbuf_endp 2418 return cmdbuf_ptr < cmdbuf_endp
2852 ? (unsigned char)*cmdbuf_ptr++ 2419 ? (unsigned char)*cmdbuf_ptr++
2853 : NOCHAR; 2420 : NOCHAR;
2854} 2421}
2855 2422
2856static class out_of_input out_of_input; 2423static class out_of_input out_of_input;
2857 2424
2858/* rxvt_cmd_getc () - Return next input character */ 2425wchar_t ecb_hot
2859/*
2860 * Return the next input character after first passing any keyboard input
2861 * to the command.
2862 */
2863wchar_t
2864rxvt_term::cmd_getc () THROW ((class out_of_input)) 2426rxvt_term::cmd_getc () THROW ((class out_of_input))
2865{ 2427{
2866 wchar_t c = next_char (); 2428 wchar_t c = next_char ();
2867 2429
2868 if (c == NOCHAR) 2430 if (c == NOCHAR)
2869 throw out_of_input; 2431 throw out_of_input;
2870 2432
2871 return c; 2433 return c;
2872} 2434}
2873 2435
2874uint32_t 2436uint32_t ecb_hot
2875rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2437rxvt_term::cmd_get8 () THROW ((class out_of_input))
2876{ 2438{
2877 uint32_t c = next_octet (); 2439 uint32_t c = next_octet ();
2878 2440
2879 if (c == NOCHAR) 2441 if (c == NOCHAR)
… …
2883} 2445}
2884 2446
2885/*{{{ print pipe */ 2447/*{{{ print pipe */
2886/*----------------------------------------------------------------------*/ 2448/*----------------------------------------------------------------------*/
2887#ifdef PRINTPIPE 2449#ifdef PRINTPIPE
2888FILE * 2450FILE * ecb_cold
2889rxvt_term::popen_printer () 2451rxvt_term::popen_printer ()
2890{ 2452{
2891 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2453 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2892 2454
2893 if (stream == NULL) 2455 if (stream == NULL)
2894 rxvt_warn ("can't open printer pipe, not printing.\n"); 2456 rxvt_warn ("can't open printer pipe, not printing.\n");
2895 2457
2896 return stream; 2458 return stream;
2897} 2459}
2898 2460
2899int 2461int ecb_cold
2900rxvt_term::pclose_printer (FILE *stream) 2462rxvt_term::pclose_printer (FILE *stream)
2901{ 2463{
2902 fflush (stream); 2464 fflush (stream);
2903 return pclose (stream); 2465 return pclose (stream);
2904} 2466}
2905 2467
2906/* 2468/*
2907 * simulate attached vt100 printer 2469 * simulate attached vt100 printer
2908 */ 2470 */
2909void 2471void ecb_cold
2910rxvt_term::process_print_pipe () 2472rxvt_term::process_print_pipe ()
2911{ 2473{
2912 int done; 2474 FILE *fd = popen_printer ();
2913 FILE *fd;
2914 2475
2915 if ((fd = popen_printer ()) == NULL) 2476 if (!fd)
2916 return; 2477 return;
2917 2478
2918 /* 2479 /*
2919 * Send all input to the printer until either ESC[4i or ESC[?4i 2480 * Send all input to the printer until either ESC[4i or ESC[?4i
2920 * is received. 2481 * is received.
2921 */ 2482 */
2922 for (done = 0; !done;) 2483 for (int done = 0; !done; )
2923 { 2484 {
2924 unsigned char buf[8]; 2485 unsigned char buf[8];
2925 unicode_t ch; 2486 unicode_t ch;
2926 unsigned int i, len; 2487 unsigned int i, len;
2927 2488
… …
2946 { 2507 {
2947 if ((buf[len++] = cmd_getc ()) == 'i') 2508 if ((buf[len++] = cmd_getc ()) == 'i')
2948 break; /* done = 1 */ 2509 break; /* done = 1 */
2949 } 2510 }
2950 } 2511 }
2951 2512
2952 for (i = 0; i < len; i++) 2513 for (i = 0; i < len; i++)
2953 if (putc (buf[i], fd) == EOF) 2514 if (putc (buf[i], fd) == EOF)
2954 { 2515 {
2955 done = 1; 2516 done = 1;
2956 break; 2517 break;
… …
2958 } 2519 }
2959 } 2520 }
2960 2521
2961 pclose_printer (fd); 2522 pclose_printer (fd);
2962} 2523}
2963#endif /* PRINTPIPE */ 2524#endif /* PRINTPIPE */
2964/*}}} */ 2525/*}}} */
2965 2526
2966/* *INDENT-OFF* */
2967enum { 2527enum {
2968 C1_40 = 0x40, 2528 C1_40 = 0x40,
2969 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2529 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2970 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2530 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2971 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2531 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2972 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2532 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2973}; 2533};
2974/* *INDENT-ON* */
2975 2534
2976/*{{{ process non-printing single characters */ 2535/*{{{ process non-printing single characters */
2977void 2536void ecb_hot
2978rxvt_term::process_nonprinting (unicode_t ch) 2537rxvt_term::process_nonprinting (unicode_t ch)
2979{ 2538{
2980 switch (ch) 2539 switch (ch)
2981 { 2540 {
2982 case C0_ESC: 2541 case C0_ESC:
… …
3018 process_dcs_seq (); 2577 process_dcs_seq ();
3019 break; 2578 break;
3020 case 0x9b: /* CSI */ 2579 case 0x9b: /* CSI */
3021 process_csi_seq (); 2580 process_csi_seq ();
3022 break; 2581 break;
3023 case 0x9d: /* CSI */ 2582 case 0x9d: /* OSC */
3024 process_osc_seq (); 2583 process_osc_seq ();
3025 break; 2584 break;
3026#endif 2585#endif
3027 } 2586 }
3028} 2587}
3029/*}}} */ 2588/*}}} */
3030 2589
3031 2590
3032/*{{{ process VT52 escape sequences */ 2591/*{{{ process VT52 escape sequences */
3033void 2592void ecb_cold
3034rxvt_term::process_escape_vt52 (unicode_t ch) 2593rxvt_term::process_escape_vt52 (unicode_t ch)
3035{ 2594{
3036 int row, col; 2595 int row, col;
3037 2596
3038 switch (ch) 2597 switch (ch)
… …
3072 break; 2631 break;
3073 case 'Z': /* identify the terminal type */ 2632 case 'Z': /* identify the terminal type */
3074 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2633 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3075 break; 2634 break;
3076 case '<': /* turn off VT52 mode */ 2635 case '<': /* turn off VT52 mode */
3077 PrivMode (0, PrivMode_vt52); 2636 priv_modes &= ~PrivMode_vt52;
3078 break; 2637 break;
3079 case 'F': /* use special graphics character set */ 2638 case 'F': /* use special graphics character set */
3080 case 'G': /* use regular character set */ 2639 case 'G': /* use regular character set */
3081 /* unimplemented */ 2640 /* unimplemented */
3082 break; 2641 break;
… …
3088} 2647}
3089/*}}} */ 2648/*}}} */
3090 2649
3091 2650
3092/*{{{ process escape sequences */ 2651/*{{{ process escape sequences */
3093void 2652void ecb_hot
3094rxvt_term::process_escape_seq () 2653rxvt_term::process_escape_seq ()
3095{ 2654{
3096 unicode_t ch = cmd_getc (); 2655 unicode_t ch = cmd_getc ();
3097 2656
3098 if (priv_modes & PrivMode_vt52) 2657 if (priv_modes & PrivMode_vt52)
… …
3101 return; 2660 return;
3102 } 2661 }
3103 2662
3104 switch (ch) 2663 switch (ch)
3105 { 2664 {
3106 /* case 1: do_tek_mode (); break; */
3107 case '#': 2665 case '#':
3108 if (cmd_getc () == '8') 2666 if (cmd_getc () == '8')
3109 scr_E (); 2667 scr_E ();
3110 break; 2668 break;
3111 case '(': 2669 case '(':
… …
3134#if !ENABLE_MINIMAL 2692#if !ENABLE_MINIMAL
3135 case '9': 2693 case '9':
3136 scr_forwardindex (); 2694 scr_forwardindex ();
3137 break; 2695 break;
3138#endif 2696#endif
2697 // DECPAM/DECPNM
3139 case '=': 2698 case '=':
2699 priv_modes |= PrivMode_aplKP;
2700 break;
3140 case '>': 2701 case '>':
3141 PrivMode ((ch == '='), PrivMode_aplKP); 2702 priv_modes &= ~PrivMode_aplKP;
3142 break; 2703 break;
3143 2704
3144 case C1_40: 2705 case C1_40:
3145 cmd_getc (); 2706 cmd_getc ();
3146 break; 2707 break;
… …
3150 2711
3151 /* 8.3.87: NEXT LINE */ 2712 /* 8.3.87: NEXT LINE */
3152 case C1_NEL: /* ESC E */ 2713 case C1_NEL: /* ESC E */
3153 { 2714 {
3154 wchar_t nlcr[] = { C0_LF, C0_CR }; 2715 wchar_t nlcr[] = { C0_LF, C0_CR };
3155 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2716 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3156 } 2717 }
3157 break; 2718 break;
3158 2719
3159 /* kidnapped escape sequence: Should be 8.3.48 */ 2720 /* kidnapped escape sequence: Should be 8.3.48 */
3160 case C1_ESA: /* ESC G */ 2721 case C1_ESA: /* ESC G */
3161 process_graphics (); 2722 // used by original rxvt for rob nations own graphics mode
2723 if (cmd_getc () == 'Q')
2724 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3162 break; 2725 break;
3163 2726
3164 /* 8.3.63: CHARACTER TABULATION SET */ 2727 /* 8.3.63: CHARACTER TABULATION SET */
3165 case C1_HTS: /* ESC H */ 2728 case C1_HTS: /* ESC H */
3166 scr_set_tab (1); 2729 scr_set_tab (1);
… …
3170 case C1_RI: /* ESC M */ 2733 case C1_RI: /* ESC M */
3171 scr_index (DN); 2734 scr_index (DN);
3172 break; 2735 break;
3173 2736
3174 /* 8.3.142: SINGLE-SHIFT TWO */ 2737 /* 8.3.142: SINGLE-SHIFT TWO */
3175 /*case C1_SS2: scr_single_shift (2); break; */ 2738 /* case C1_SS2: break; */
3176 2739
3177 /* 8.3.143: SINGLE-SHIFT THREE */ 2740 /* 8.3.143: SINGLE-SHIFT THREE */
3178 /*case C1_SS3: scr_single_shift (3); break; */ 2741 /* case C1_SS3: break; */
3179 2742
3180 /* 8.3.27: DEVICE CONTROL STRING */ 2743 /* 8.3.27: DEVICE CONTROL STRING */
3181 case C1_DCS: /* ESC P */ 2744 case C1_DCS: /* ESC P */
3182 process_dcs_seq (); 2745 process_dcs_seq ();
3183 break; 2746 break;
… …
3185 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2748 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3186 case C1_SCI: /* ESC Z */ 2749 case C1_SCI: /* ESC Z */
3187 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2750 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3188 break; /* steal obsolete ESC [ c */ 2751 break; /* steal obsolete ESC [ c */
3189 2752
3190 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2753 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3191 case C1_CSI: /* ESC [ */ 2754 case C1_CSI: /* ESC [ */
3192 process_csi_seq (); 2755 process_csi_seq ();
3193 break; 2756 break;
3194 2757
3195 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2758 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3196 case C1_OSC: /* ESC ] */ 2759 case C1_OSC: /* ESC ] */
3197 process_osc_seq (); 2760 process_osc_seq ();
3198 break; 2761 break;
3199 2762
3200 /* 8.3.106: RESET TO INITIAL STATE */ 2763 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3201 case 'c': 2764 case 'c':
3202 mbstate.reset (); 2765 mbstate.reset ();
3203 scr_poweron (); 2766 scr_poweron ();
3204 scrollbar_show (1); 2767 scrollBar.show (1);
3205 break; 2768 break;
3206 2769
3207 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2770 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3208 case 'n': 2771 case 'n':
3209 scr_charset_choose (2); 2772 scr_charset_choose (2);
… …
3216 } 2779 }
3217} 2780}
3218/*}}} */ 2781/*}}} */
3219 2782
3220/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2783/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3221/* *INDENT-OFF* */
3222enum { 2784enum {
3223 CSI_ICH = 0x40, 2785 CSI_ICH = 0x40,
3224 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2786 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3225 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2787 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3226 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2788 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3229 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2791 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3230 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2792 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3231 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2793 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3232}; 2794};
3233 2795
3234#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2796#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3235 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2797 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3236 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2798 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3237#define get_byte_array_bit(array, bit) \ 2799#define get_byte_array_bit(array, bit) \
3238 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2800 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3239 2801
3240const unsigned char csi_defaults[] = 2802static const unsigned char csi_defaults[] =
3241 { 2803 {
3242 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2804 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3243 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2805 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3244 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2806 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3245 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2807 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3246 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2808 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3247 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2809 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3248 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2810 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3249 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2811 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3250 }; 2812 };
3251/* *INDENT-ON* */
3252 2813
3253void 2814void ecb_hot
3254rxvt_term::process_csi_seq () 2815rxvt_term::process_csi_seq ()
3255{ 2816{
3256 unicode_t ch, priv, i; 2817 unicode_t ch, priv, prev_ch, i;
3257 unsigned int nargs, p; 2818 unsigned int nargs, p;
3258 int n, ndef; 2819 int n, ndef;
3259 int arg[ESC_ARGS]; 2820 int arg[ESC_ARGS] = { };
3260 2821
3261 for (nargs = ESC_ARGS; nargs > 0;) 2822 nargs = 0;
3262 arg[--nargs] = 0;
3263 2823
3264 priv = 0; 2824 priv = 0;
3265 ch = cmd_getc (); 2825 ch = cmd_getc ();
3266 if (ch >= '<' && ch <= '?') 2826 if ((ch >= '<' && ch <= '?') || ch == '!')
2827 {
3267 { /* '<' '=' '>' '?' */ 2828 /* '<' '=' '>' '?' '!' */
3268 priv = ch; 2829 priv = ch;
3269 ch = cmd_getc (); 2830 ch = cmd_getc ();
3270 } 2831 }
3271 2832
2833 prev_ch = 0;
3272 /* read any numerical arguments */ 2834 /* read any numerical arguments */
3273 for (n = -1; ch < CSI_ICH; ) 2835 for (n = -1; ch < CSI_ICH; )
3274 { 2836 {
3275 if (isdigit (ch)) 2837 if (isdigit (ch))
3276 { 2838 {
… …
3286 n = -1; 2848 n = -1;
3287 } 2849 }
3288 else if (IS_CONTROL (ch)) 2850 else if (IS_CONTROL (ch))
3289 process_nonprinting (ch); 2851 process_nonprinting (ch);
3290 2852
2853 prev_ch = ch;
3291 ch = cmd_getc (); 2854 ch = cmd_getc ();
3292 } 2855 }
3293 2856
3294 if (ch > CSI_7F) 2857 if (ch > CSI_7F)
3295 return; 2858 return;
… …
3311 switch (priv) 2874 switch (priv)
3312 { 2875 {
3313 case '>': 2876 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 2877 if (ch == CSI_DA) /* secondary device attributes */
3315 { 2878 {
3316 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2879 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3317 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2880 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3318 // 2881 //
3319 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2882 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3320 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2883 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3321 // that we do not support xterm mouse reporting (should be 95 when we do). 2884 // versions.
3322 // 2885 //
3323 tt_printf ("\033[>%d;94;0c", 'U'); 2886 tt_printf ("\033[>%d;95;0c", 'U');
3324 } 2887 }
3325 break; 2888 break;
2889
3326 case '?': 2890 case '?':
3327 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2891 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3328 process_terminal_mode (ch, priv, nargs, arg); 2892 process_terminal_mode (ch, priv, nargs, arg);
3329 break; 2893 break;
2894
2895 case '!':
2896 if (ch == CSI_70)
2897 {
2898 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2899 scr_soft_reset ();
2900
2901 static const int pm_h[] = { 7, 25 };
2902 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2903
2904 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2905 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3330 } 2906 }
2907 break;
2908 }
2909
3331 return; 2910 return;
3332 } 2911 }
3333 2912
3334 switch (ch) 2913 switch (ch)
3335 { 2914 {
… …
3349 } 2928 }
3350 break; 2929 break;
3351#endif 2930#endif
3352 2931
3353 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2932 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3354 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2933 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3355 arg[0] = -arg[0]; 2934 arg[0] = -arg[0];
3356 /* FALLTHROUGH */ 2935 /* FALLTHROUGH */
3357 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2936 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3358 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2937 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3359 scr_gotorc (arg[0], 0, RELATIVE); 2938 scr_gotorc (arg[0], 0, RELATIVE);
3360 break; 2939 break;
3361 2940
3362 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2941 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3363 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2942 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3455 break; 3034 break;
3456 case 6: /* CPR requested */ 3035 case 6: /* CPR requested */
3457 scr_report_position (); 3036 scr_report_position ();
3458 break; 3037 break;
3459 case 7: /* unofficial extension */ 3038 case 7: /* unofficial extension */
3460 if (OPTION (Opt_insecure)) 3039 if (option (Opt_insecure))
3461 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3040 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3462 break; 3041 break;
3463 case 8: /* unofficial extension */ 3042 case 8: /* unofficial extension */
3464 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3043 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3465 break; 3044 break;
… …
3513 scr_insert_mode (1); 3092 scr_insert_mode (1);
3514 else if (arg[0] == 20) 3093 else if (arg[0] == 20)
3515 priv_modes |= PrivMode_LFNL; 3094 priv_modes |= PrivMode_LFNL;
3516 break; 3095 break;
3517 3096
3097 case CSI_71: // DECSCUSR: set cursor style
3098 if (prev_ch == ' ')
3099 set_cursor_style (arg[0]);
3100 break;
3101
3518 /* 3102 /*
3519 * PRIVATE USE beyond this point. All CSI_7? sequences here 3103 * PRIVATE USE beyond this point. All CSI_7? sequences here
3520 */ 3104 */
3521 case CSI_72: /* DECSTBM: set top and bottom margins */ 3105 case CSI_72: /* DECSTBM: set top and bottom margins */
3522 if (nargs == 1) 3106 if (nargs == 1)
… …
3550 } 3134 }
3551} 3135}
3552/*}}} */ 3136/*}}} */
3553 3137
3554#if !ENABLE_MINIMAL 3138#if !ENABLE_MINIMAL
3555/* ARGSUSED */
3556void 3139void
3557rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3140rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3558{ 3141{
3559 int x, y; 3142 int x, y;
3560 XWindowAttributes wattr; 3143 XWindowAttributes wattr;
… …
3569 { 3152 {
3570 /* 3153 /*
3571 * commands 3154 * commands
3572 */ 3155 */
3573 case 1: /* deiconify window */ 3156 case 1: /* deiconify window */
3574 XMapWindow (dpy, parent[0]); 3157 XMapWindow (dpy, parent);
3575 break; 3158 break;
3576 case 2: /* iconify window */ 3159 case 2: /* iconify window */
3577 XIconifyWindow (dpy, parent[0], display->screen); 3160 XIconifyWindow (dpy, parent, display->screen);
3578 break; 3161 break;
3579 case 3: /* set position (pixels) */ 3162 case 3: /* set position (pixels) */
3580 XMoveWindow (dpy, parent[0], args[1], args[2]); 3163 XMoveWindow (dpy, parent, args[1], args[2]);
3581 break; 3164 break;
3582 case 4: /* set size (pixels) */ 3165 case 4: /* set size (pixels) */
3583 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3166 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3584 break; 3167 break;
3585 case 5: /* raise window */ 3168 case 5: /* raise window */
3586 XRaiseWindow (dpy, parent[0]); 3169 XRaiseWindow (dpy, parent);
3587 break; 3170 break;
3588 case 6: /* lower window */ 3171 case 6: /* lower window */
3589 XLowerWindow (dpy, parent[0]); 3172 XLowerWindow (dpy, parent);
3590 break; 3173 break;
3591 case 7: /* refresh window */ 3174 case 7: /* refresh window */
3592 scr_touch (true); 3175 scr_touch (true);
3593 break; 3176 break;
3594 case 8: /* set size (chars) */ 3177 case 8: /* set size (chars) */
… …
3597 break; 3180 break;
3598 3181
3599 //case 9: NYI, TODO, restore maximized window or maximize window 3182 //case 9: NYI, TODO, restore maximized window or maximize window
3600 default: 3183 default:
3601 if (args[0] >= 24) /* set height (chars) */ 3184 if (args[0] >= 24) /* set height (chars) */
3602 set_widthheight ((unsigned int)width, 3185 set_widthheight ((unsigned int)vt_width,
3603 (unsigned int) (args[1] * fheight)); 3186 (unsigned int) (args[1] * fheight));
3604 break; 3187 break;
3605 3188
3606 /* 3189 /*
3607 * reports - some output format copied from XTerm 3190 * reports - some output format copied from XTerm
3608 */ 3191 */
3609 case 11: /* report window state */ 3192 case 11: /* report window state */
3610 XGetWindowAttributes (dpy, parent[0], &wattr); 3193 XGetWindowAttributes (dpy, parent, &wattr);
3611 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3194 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3612 break; 3195 break;
3613 case 13: /* report window position */ 3196 case 13: /* report window position */
3614 XGetWindowAttributes (dpy, parent[0], &wattr); 3197 XGetWindowAttributes (dpy, parent, &wattr);
3615 XTranslateCoordinates (dpy, parent[0], wattr.root, 3198 XTranslateCoordinates (dpy, parent, wattr.root,
3616 -wattr.border_width, -wattr.border_width, 3199 -wattr.border_width, -wattr.border_width,
3617 &x, &y, &wdummy); 3200 &x, &y, &wdummy);
3618 tt_printf ("\033[3;%d;%dt", x, y); 3201 tt_printf ("\033[3;%d;%dt", x, y);
3619 break; 3202 break;
3620 case 14: /* report window size (pixels) */ 3203 case 14: /* report window size (pixels) */
3621 XGetWindowAttributes (dpy, parent[0], &wattr); 3204 XGetWindowAttributes (dpy, parent, &wattr);
3622 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3205 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3623 break; 3206 break;
3624 case 18: /* report text area size (chars) */ 3207 case 18: /* report text area size (chars) */
3625 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3208 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3626 break; 3209 break;
… …
3628 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3211 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3629 break; 3212 break;
3630 case 20: /* report icon label */ 3213 case 20: /* report icon label */
3631 { 3214 {
3632 char *s; 3215 char *s;
3633 XGetIconName (dpy, parent[0], &s); 3216 XGetIconName (dpy, parent, &s);
3634 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3217 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3635 XFree (s); 3218 XFree (s);
3636 } 3219 }
3637 break; 3220 break;
3638 case 21: /* report window title */ 3221 case 21: /* report window title */
3639 { 3222 {
3640 char *s; 3223 char *s;
3641 XFetchName (dpy, parent[0], &s); 3224 XFetchName (dpy, parent, &s);
3642 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3225 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3643 XFree (s); 3226 XFree (s);
3644 } 3227 }
3645 break; 3228 break;
3646 } 3229 }
3647} 3230}
… …
3656rxvt_term::get_to_st (unicode_t &ends_how) 3239rxvt_term::get_to_st (unicode_t &ends_how)
3657{ 3240{
3658 unicode_t ch; 3241 unicode_t ch;
3659 bool seen_esc = false; 3242 bool seen_esc = false;
3660 unsigned int n = 0; 3243 unsigned int n = 0;
3661 wchar_t string[STRING_MAX]; 3244 wchar_t string[CBUFSIZ];
3662 3245
3663 while ((ch = cmd_getc ()) != NOCHAR) 3246 while ((ch = cmd_getc ()) != NOCHAR)
3664 { 3247 {
3665 if (seen_esc) 3248 if (seen_esc)
3666 { 3249 {
… …
3674 seen_esc = true; 3257 seen_esc = true;
3675 continue; 3258 continue;
3676 } 3259 }
3677 else if (ch == C0_BEL || ch == CHAR_ST) 3260 else if (ch == C0_BEL || ch == CHAR_ST)
3678 break; 3261 break;
3262 else if (ch == C0_SYN)
3263 ch = cmd_get8 ();
3679 else if (ch < 0x20) 3264 else if (ch < 0x20)
3680 return NULL; /* other control character - exit */ 3265 return NULL; /* other control character - exit */
3681 3266
3682 seen_esc = false; 3267 seen_esc = false;
3683 3268
3684 if (n >= STRING_MAX - 1) 3269 if (n >= sizeof (string) - 1)
3685 // stop at some sane length 3270 // stop at some sane length
3686 return NULL; 3271 return NULL;
3687 3272
3688 if (ch == C0_SYN)
3689 string[n++] = cmd_get8 ();
3690 else
3691 string[n++] = ch; 3273 string[n++] = ch;
3692 } 3274 }
3693 3275
3694 string[n++] = '\0'; 3276 string[n++] = '\0';
3695 3277
3696 ends_how = (ch == 0x5c ? C0_ESC : ch); 3278 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3703 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3285 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3704 */ 3286 */
3705void 3287void
3706rxvt_term::process_dcs_seq () 3288rxvt_term::process_dcs_seq ()
3707{ 3289{
3708 char *s;
3709 unicode_t eh;
3710
3711 /* 3290 /*
3712 * Not handled yet 3291 * Not handled yet
3713 */ 3292 */
3293
3294 unicode_t eh;
3714 s = get_to_st (eh); 3295 char *s = get_to_st (eh);
3715 if (s) 3296 if (s)
3716 free (s); 3297 free (s);
3717 3298
3718 return; 3299 return;
3719} 3300}
… …
3723 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3304 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3724 */ 3305 */
3725void 3306void
3726rxvt_term::process_osc_seq () 3307rxvt_term::process_osc_seq ()
3727{ 3308{
3728 unicode_t ch, eh;
3729 int arg; 3309 int arg;
3730 3310
3731 ch = cmd_getc (); 3311 unicode_t ch = cmd_getc ();
3732 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3312 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3733 arg = arg * 10 + (ch - '0'); 3313 arg = arg * 10 + (ch - '0');
3734 3314
3735 if (ch == ';') 3315 if (ch == ';')
3736 { 3316 {
3317 unicode_t eh;
3737 char *s = get_to_st (eh); 3318 char *s = get_to_st (eh);
3738 3319
3739 if (s) 3320 if (s)
3740 { 3321 {
3741 process_xterm_seq (arg, s, eh); 3322 process_xterm_seq (arg, s, eh);
… …
3765 3346
3766/* 3347/*
3767 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3348 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3768 */ 3349 */
3769void 3350void
3770rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3351rxvt_term::process_xterm_seq (int op, char *str, char resp)
3771{ 3352{
3772 int color; 3353 int color;
3773 char *buf, *name; 3354 char *buf, *name;
3774 bool query = str[0] == '?' && !str[1]; 3355 bool query = str[0] == '?' && !str[1];
3775 int saveop = op; 3356 int saveop = op;
3776 3357
3777 dLocal (Display *, dpy); 3358 dLocal (Display *, dpy);
3778 3359
3779 assert (str != NULL); 3360 assert (str != NULL);
3780 3361
3781 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3362 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3782 return; 3363 return;
3783 3364
3784 switch (op) 3365 switch (op)
3785 { 3366 {
… …
3802 unsigned long bytes_after; 3383 unsigned long bytes_after;
3803 unsigned char *value = 0; 3384 unsigned char *value = 0;
3804 const char *str = ""; 3385 const char *str = "";
3805 3386
3806 if (prop 3387 if (prop
3807 && XGetWindowProperty (dpy, parent[0], 3388 && XGetWindowProperty (dpy, parent,
3808 prop, 0, 1<<16, 0, AnyPropertyType, 3389 prop, 0, 1<<16, 0, AnyPropertyType,
3809 &actual_type, &actual_format, 3390 &actual_type, &actual_format,
3810 &nitems, &bytes_after, &value) == Success 3391 &nitems, &bytes_after, &value) == Success
3811 && actual_type != None 3392 && actual_type != None
3812 && actual_format == 8) 3393 && actual_format == 8)
3813 str = (const char *)(value); 3394 str = (const char *)(value);
3814 3395
3815 tt_printf ("\033]%d;%s%c", op, str, resp); 3396 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3816 3397
3817 XFree (value); 3398 XFree (value);
3818 } 3399 }
3819 else 3400 else
3820 { 3401 {
3821 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3402 char *eq = strchr (str, '=');
3822 3403
3823 if (eq) 3404 if (eq)
3824 { 3405 {
3825 *eq = 0; 3406 *eq = 0;
3826 set_utf8_property (display->atom (str), eq + 1); 3407 set_utf8_property (display->atom (str), eq + 1);
3827 } 3408 }
3828 else 3409 else
3829 XDeleteProperty (dpy, parent[0], 3410 XDeleteProperty (dpy, parent,
3830 display->atom (str)); 3411 display->atom (str));
3831 } 3412 }
3832 break; 3413 break;
3833 3414
3834 case XTerm_Color: 3415 case XTerm_Color:
… …
3847 *buf++ = '\0'; 3428 *buf++ = '\0';
3848 3429
3849 process_color_seq (op, color, name, resp); 3430 process_color_seq (op, color, name, resp);
3850 } 3431 }
3851 break; 3432 break;
3433 case Rxvt_restoreFG:
3852 case XTerm_Color00: 3434 case XTerm_Color00:
3853 process_color_seq (op, Color_fg, str, resp); 3435 process_color_seq (op, Color_fg, str, resp);
3854 break; 3436 break;
3437 case Rxvt_restoreBG:
3855 case XTerm_Color01: 3438 case XTerm_Color01:
3856 process_color_seq (op, Color_bg, str, resp); 3439 process_color_seq (op, Color_bg, str, resp);
3857 break; 3440 break;
3858#ifndef NO_CURSORCOLOR 3441#ifndef NO_CURSORCOLOR
3859 case XTerm_Color_cursor: 3442 case XTerm_Color_cursor:
… …
3864 process_color_seq (op, Color_pointer_fg, str, resp); 3447 process_color_seq (op, Color_pointer_fg, str, resp);
3865 break; 3448 break;
3866 case XTerm_Color_pointer_bg: 3449 case XTerm_Color_pointer_bg:
3867 process_color_seq (op, Color_pointer_bg, str, resp); 3450 process_color_seq (op, Color_pointer_bg, str, resp);
3868 break; 3451 break;
3452#ifdef OPTION_HC
3453 case XTerm_Color_HC:
3454 process_color_seq (op, Color_HC, str, resp);
3455 break;
3456 case XTerm_Color_HTC:
3457 process_color_seq (op, Color_HTC, str, resp);
3458 break;
3459#endif
3869#ifndef NO_BOLD_UNDERLINE_REVERSE 3460#ifndef NO_BOLD_UNDERLINE_REVERSE
3870 case XTerm_Color_RV:
3871 process_color_seq (op, Color_RV, str, resp);
3872 break;
3873 case Rxvt_Color_BD:
3874 case URxvt_Color_BD: 3461 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp); 3462 process_color_seq (op, Color_BD, str, resp);
3876 break; 3463 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL: 3464 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp); 3465 process_color_seq (op, Color_UL, str, resp);
3880 break; 3466 break;
3881 case URxvt_Color_IT: 3467 case URxvt_Color_IT:
3882 process_color_seq (op, Color_IT, str, resp); 3468 process_color_seq (op, Color_IT, str, resp);
3883 break; 3469 break;
3884#endif 3470#endif
3885#if TRANSPARENT && TINTING 3471 case URxvt_Color_border:
3472 process_color_seq (op, Color_border, str, resp);
3473 break;
3474
3475#if BG_IMAGE_FROM_ROOT
3886 case URxvt_Color_tint: 3476 case URxvt_Color_tint:
3887 process_color_seq (op, Color_tint, str, resp); 3477 process_color_seq (op, Color_tint, str, resp);
3478 {
3479 bool changed = false;
3888 3480
3889 check_our_parents (); 3481 if (ISSET_PIXCOLOR (Color_tint))
3482 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3890 3483
3891 if (am_transparent) 3484 if (changed)
3892 want_full_refresh = want_refresh = 1; 3485 update_background ();
3486 }
3893 3487
3894 break; 3488 break;
3895#endif 3489#endif
3896 3490
3491#if BG_IMAGE_FROM_FILE
3897 case Rxvt_Pixmap: 3492 case Rxvt_Pixmap:
3493 if (!strcmp (str, "?"))
3898 { 3494 {
3495 char str[256];
3496 int h_scale = fimage.h_scale;
3497 int v_scale = fimage.v_scale;
3498 int h_align = fimage.h_align;
3499 int v_align = fimage.v_align;
3500
3501 sprintf (str, "[%dx%d+%d+%d]",
3502 h_scale, v_scale,
3503 h_align, v_align);
3504 process_xterm_seq (XTerm_title, str, CHAR_ST);
3505 }
3506 else
3507 {
3508 bool changed = false;
3509
3899 if (*str != ';') 3510 if (*str != ';')
3900 { 3511 {
3901#if XPM_BACKGROUND 3512 try
3902 scale_pixmap (""); /* reset to default scaling */ 3513 {
3903 set_bgPixmap (str); /* change pixmap */ 3514 fimage.set_file_geometry (this, str);
3904 scr_touch (true); 3515 changed = true;
3905#endif 3516 }
3517 catch (const class rxvt_failure_exception &e)
3518 {
3519 }
3906 } 3520 }
3907 3521 else
3908 int changed = 0;
3909
3910 while ((str = strchr (str, ';')) != NULL)
3911 { 3522 {
3912 str++; 3523 str++;
3913#if XPM_BACKGROUND 3524 if (fimage.set_geometry (str, true))
3914 changed += scale_pixmap (str); 3525 changed = true;
3915#endif
3916 } 3526 }
3917 3527
3918 if (changed) 3528 if (changed)
3919 { 3529 {
3920#ifdef XPM_BACKGROUND 3530 if (bg_window_position_sensitive ())
3921 resize_pixmap (); 3531 {
3922 scr_touch (true); 3532 int x, y;
3923#endif 3533 get_window_origin (x, y);
3534 parent_x = x;
3535 parent_y = y;
3536 }
3537 update_background ();
3924 } 3538 }
3925 } 3539 }
3926 break; 3540 break;
3927 3541#endif
3928 case Rxvt_restoreFG:
3929 set_window_color (Color_fg, str);
3930 break;
3931 case Rxvt_restoreBG:
3932 set_window_color (Color_bg, str);
3933 break;
3934 3542
3935 case XTerm_logfile: 3543 case XTerm_logfile:
3936 // TODO, when secure mode? 3544 // TODO, when secure mode?
3937 break; 3545 break;
3938 3546
… …
3956 case URxvt_italicFont: 3564 case URxvt_italicFont:
3957 case URxvt_boldItalicFont: 3565 case URxvt_boldItalicFont:
3958#endif 3566#endif
3959 if (query) 3567 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", saveop, 3568 tt_printf ("\33]%d;%-.250s%c", saveop,
3961 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3569 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3962 ? fontset[op - URxvt_font]->fontdesc : "", 3570 ? fontset[op - URxvt_font]->fontdesc : "",
3963 resp); 3571 resp);
3964 else 3572 else
3965 { 3573 {
3966 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3574 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3980 break; 3588 break;
3981 3589
3982#if !ENABLE_MINIMAL 3590#if !ENABLE_MINIMAL
3983 case URxvt_locale: 3591 case URxvt_locale:
3984 if (query) 3592 if (query)
3985 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3593 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3986 else 3594 else
3987 { 3595 {
3988 set_locale (str); 3596 set_locale (str);
3989 pty->set_utf8_mode (enc_utf8); 3597 pty->set_utf8_mode (enc_utf8);
3990 init_xlocale (); 3598 init_xlocale ();
… …
4005 break; 3613 break;
4006#endif 3614#endif
4007 3615
4008#if ENABLE_PERL 3616#if ENABLE_PERL
4009 case URxvt_perl: 3617 case URxvt_perl:
4010 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3618 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4011 ; // no responses yet
4012 break; 3619 break;
4013#endif 3620#endif
4014 } 3621 }
4015} 3622}
4016/*----------------------------------------------------------------------*/ 3623/*----------------------------------------------------------------------*/
… …
4023 * 's' = save 3630 * 's' = save
4024 * 'r' = restore 3631 * 'r' = restore
4025 * 't' = toggle 3632 * 't' = toggle
4026 * so no need for fancy checking 3633 * so no need for fancy checking
4027 */ 3634 */
4028int 3635int ecb_cold
4029rxvt_term::privcases (int mode, unsigned long bit) 3636rxvt_term::privcases (int mode, unsigned long bit)
4030{ 3637{
4031 int state; 3638 int state;
4032 3639
4033 if (mode == 's') 3640 if (mode == 's')
4034 { 3641 {
4035 SavedModes |= (priv_modes & bit); 3642 if (priv_modes & bit)
3643 SavedModes |= bit;
3644 else
3645 SavedModes &= ~bit;
4036 return -1; 3646 return -1;
4037 } 3647 }
4038 else 3648 else
4039 { 3649 {
4040 if (mode == 'r') 3650 if (mode == 'r')
4041 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3651 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4042 else 3652 else
4043 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3653 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4044 PrivMode (state, bit); 3654
3655 if (state)
3656 priv_modes |= bit;
3657 else
3658 priv_modes &= ~bit;
4045 } 3659 }
4046 3660
4047 return state; 3661 return state;
4048} 3662}
4049 3663
4050/* we're not using priv _yet_ */ 3664/* we're not using priv _yet_ */
4051void 3665void
4052rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3666rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4053{ 3667{
4054 unsigned int i, j; 3668 unsigned int i, j;
4055 int state; 3669 int state;
4056 3670
4057 static const struct 3671 static const struct
4058 { 3672 {
4059 const int argval; 3673 const int argval;
4060 const unsigned long bit; 3674 const unsigned long bit;
4061 }
4062
4063 argtopriv[] = { 3675 } argtopriv[] = {
4064 { 1, PrivMode_aplCUR }, 3676 { 1, PrivMode_aplCUR }, // DECCKM
4065 { 2, PrivMode_vt52 }, 3677 { 2, PrivMode_vt52 }, // DECANM
4066 { 3, PrivMode_132 }, 3678 { 3, PrivMode_132 }, // DECCOLM
4067 { 4, PrivMode_smoothScroll }, 3679 { 4, PrivMode_smoothScroll }, // DECSCLM
4068 { 5, PrivMode_rVideo }, 3680 { 5, PrivMode_rVideo }, // DECSCNM
4069 { 6, PrivMode_relOrigin }, 3681 { 6, PrivMode_relOrigin }, // DECOM
4070 { 7, PrivMode_Autowrap }, 3682 { 7, PrivMode_Autowrap }, // DECAWM
4071 // 8, bi-directional support mode 3683 // 8, auto-repeat keys // DECARM
4072 { 9, PrivMode_MouseX10 }, 3684 { 9, PrivMode_MouseX10 },
4073 // 18, 19 printing-related 3685 // 18 end FF to printer after print screen
3686 // 19 Print screen prints full screen/scroll region
4074 { 25, PrivMode_VisibleCursor }, 3687 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4075#ifdef scrollBar_esc 3688#ifdef scrollBar_esc
4076 { scrollBar_esc, PrivMode_scrollBar }, 3689 { scrollBar_esc, PrivMode_scrollBar },
4077#endif 3690#endif
4078 { 35, PrivMode_ShiftKeys }, // rxvt extension 3691 { 35, PrivMode_ShiftKeys }, // rxvt extension
3692 // 38, tektronix mode // DECTEK
4079 { 40, PrivMode_132OK }, 3693 { 40, PrivMode_132OK },
4080 // 41 xterm more fixes NYI 3694 // 41 xterm more fixes NYI
4081 // 45 margin bell NYI 3695 // 45 margin bell NYI
4082 // 46 start logging 3696 // 46 start logging
4083 { 47, PrivMode_Screen }, 3697 { 47, PrivMode_Screen },
4084 { 66, PrivMode_aplKP }, 3698 { 66, PrivMode_aplKP }, // DECNKM
4085#ifndef NO_BACKSPACE_KEY 3699#ifndef NO_BACKSPACE_KEY
4086 { 67, PrivMode_BackSpace }, 3700 { 67, PrivMode_BackSpace }, // DECBKM
4087#endif 3701#endif
4088 { 1000, PrivMode_MouseX11 }, 3702 { 1000, PrivMode_MouseX11 },
4089 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3703 { 1002, PrivMode_MouseBtnEvent },
4090 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3704 { 1003, PrivMode_MouseAnyEvent },
4091 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3705#if ENABLE_FRILLS
3706 { 1005, PrivMode_ExtModeMouse },
3707#endif
4092 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3708 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4093 { 1011, PrivMode_Keypress }, // rxvt extension 3709 { 1011, PrivMode_Keypress }, // rxvt extension
3710#if ENABLE_FRILLS
3711 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3712#endif
4094 // 1035 enable modifiers for alt, numlock NYI 3713 // 1035 enable modifiers for alt, numlock NYI
4095 // 1036 send ESC for meta keys NYI 3714 // 1036 send ESC for meta keys NYI
4096 // 1037 send DEL for keypad delete NYI 3715 // 1037 send DEL for keypad delete NYI
4097 { 1047, PrivMode_Screen }, 3716 { 1047, PrivMode_Screen },
4098 // 1048 save and restore cursor 3717 // 1048 save and restore cursor, implemented in code
4099 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3718 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4100 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3719 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3720 { 2004, PrivMode_BracketPaste },
4101 }; 3721 };
4102 3722
4103 if (nargs == 0) 3723 if (nargs == 0)
4104 return; 3724 return;
4105 3725
… …
4112 for (i = 0; i < nargs; i++) 3732 for (i = 0; i < nargs; i++)
4113 { 3733 {
4114 state = -1; 3734 state = -1;
4115 3735
4116 /* basic handling */ 3736 /* basic handling */
4117 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3737 for (j = 0; j < ecb_array_length (argtopriv); j++)
4118 if (argtopriv[j].argval == arg[i]) 3738 if (argtopriv[j].argval == arg[i])
4119 { 3739 {
4120 state = privcases (mode, argtopriv[j].bit); 3740 state = privcases (mode, argtopriv[j].bit);
4121 break; 3741 break;
4122 } 3742 }
… …
4130 3750
4131 scr_touch (true); 3751 scr_touch (true);
4132 break; 3752 break;
4133#endif 3753#endif
4134 case 1048: /* alternative cursor save */ 3754 case 1048: /* alternative cursor save */
4135 case 1049:
4136 if (OPTION (Opt_secondaryScreen)) 3755 if (option (Opt_secondaryScreen))
4137 if (mode == 0) 3756 if (mode == 0)
4138 scr_cursor (RESTORE); 3757 scr_cursor (RESTORE);
4139 else if (mode == 1) 3758 else if (mode == 1)
4140 scr_cursor (SAVE); 3759 scr_cursor (SAVE);
4141 break; 3760 break;
… …
4149 case 2: /* VT52 mode */ 3768 case 2: /* VT52 mode */
4150 /* oddball mode. should be set regardless of set/reset 3769 /* oddball mode. should be set regardless of set/reset
4151 * parameter. Return from VT52 mode with an ESC < from 3770 * parameter. Return from VT52 mode with an ESC < from
4152 * within VT52 mode 3771 * within VT52 mode
4153 */ 3772 */
4154 PrivMode (1, PrivMode_vt52); 3773 priv_modes |= PrivMode_vt52;
4155 break; 3774 break;
4156 case 3: /* 80/132 */ 3775 case 3: /* 80/132 */
4157 if (priv_modes & PrivMode_132OK) 3776 if (priv_modes & PrivMode_132OK)
4158 set_widthheight (((state ? 132 : 80) * fwidth), height); 3777 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4159 break; 3778 break;
4160 case 4: /* smooth scrolling */ 3779 case 4: /* smooth scrolling */
4161 set_option (Opt_jumpScroll, !state); 3780 set_option (Opt_jumpScroll, !state);
4162 break; 3781 break;
4163 case 5: /* reverse video */ 3782 case 5: /* reverse video */
… …
4170 scr_autowrap (state); 3789 scr_autowrap (state);
4171 break; 3790 break;
4172 /* case 8: - auto repeat, can't do on a per window basis */ 3791 /* case 8: - auto repeat, can't do on a per window basis */
4173 case 9: /* X10 mouse reporting */ 3792 case 9: /* X10 mouse reporting */
4174 if (state) /* orthogonal */ 3793 if (state) /* orthogonal */
4175 priv_modes &= ~PrivMode_MouseX11; 3794 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4176 break; 3795 break;
4177#ifdef scrollBar_esc 3796#ifdef scrollBar_esc
4178 case scrollBar_esc: 3797 case scrollBar_esc:
4179 if (scrollbar_mapping (state)) 3798 scrollBar.map (state);
4180 {
4181 resize_all_windows (0, 0, 0); 3799 resize_all_windows (0, 0, 0);
4182 scr_touch (true); 3800 scr_touch (true);
4183 }
4184 break; 3801 break;
4185#endif 3802#endif
4186 case 25: /* visible/invisible cursor */ 3803 case 25: /* visible/invisible cursor */
4187 scr_cursor_visible (state); 3804 scr_cursor_visible (state);
4188 break; 3805 break;
… …
4193 break; 3810 break;
4194 /* case 66: - application key pad */ 3811 /* case 66: - application key pad */
4195 /* case 67: - backspace key */ 3812 /* case 67: - backspace key */
4196 case 1000: /* X11 mouse reporting */ 3813 case 1000: /* X11 mouse reporting */
4197 if (state) /* orthogonal */ 3814 if (state) /* orthogonal */
4198 priv_modes &= ~PrivMode_MouseX10; 3815 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4199 break; 3816 break;
4200#if 0
4201 case 1001: 3817 case 1002:
4202 break; /* X11 mouse highlighting */ 3818 case 1003:
4203#endif 3819 if (state)
3820 {
3821 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3822 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3823 mouse_row = mouse_col = 0;
3824 vt_emask_mouse = PointerMotionMask;
3825 }
3826 else
3827 vt_emask_mouse = NoEventMask;
3828
3829 vt_select_input ();
3830 break;
4204 case 1010: /* scroll to bottom on TTY output inhibit */ 3831 case 1010: /* scroll to bottom on TTY output inhibit */
4205 set_option (Opt_scrollTtyOutput, !state); 3832 set_option (Opt_scrollTtyOutput, !state);
4206 break; 3833 break;
4207 case 1011: /* scroll to bottom on key press */ 3834 case 1011: /* scroll to bottom on key press */
4208 set_option (Opt_scrollTtyKeypress, state); 3835 set_option (Opt_scrollTtyKeypress, state);
4209 break; 3836 break;
4210 case 1047: /* secondary screen w/ clearing last */ 3837 case 1047: /* secondary screen w/ clearing last */
4211 if (OPTION (Opt_secondaryScreen)) 3838 if (option (Opt_secondaryScreen))
4212 if (current_screen != PRIMARY) 3839 if (!state)
4213 scr_erase_screen (2); 3840 scr_erase_screen (2);
3841
4214 scr_change_screen (state); 3842 scr_change_screen (state);
4215 break; 3843 break;
4216 case 1049: /* secondary screen w/ clearing first */ 3844 case 1049: /* secondary screen w/ clearing first */
3845 if (option (Opt_secondaryScreen))
3846 if (state)
3847 scr_cursor (SAVE);
3848
4217 scr_change_screen (state); 3849 scr_change_screen (state);
3850
4218 if (OPTION (Opt_secondaryScreen)) 3851 if (option (Opt_secondaryScreen))
4219 if (current_screen != PRIMARY) 3852 if (state)
4220 scr_erase_screen (2); 3853 scr_erase_screen (2);
3854 else
3855 scr_cursor (RESTORE);
4221 break; 3856 break;
4222 default: 3857 default:
4223 break; 3858 break;
4224 } 3859 }
4225 } 3860 }
4226} 3861}
4227/*}}} */ 3862/*}}} */
4228 3863
4229/*{{{ process sgr sequences */ 3864/*{{{ process sgr sequences */
4230void 3865void ecb_hot
4231rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3866rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4232{ 3867{
4233 unsigned int i; 3868 unsigned int i;
4234 short rendset; 3869 short rendset;
4235 int rendstyle; 3870 int rendstyle;
… …
4376 break; 4011 break;
4377#endif 4012#endif
4378 } 4013 }
4379 } 4014 }
4380} 4015}
4016
4017void
4018rxvt_term::set_cursor_style (int style)
4019{
4020 if (!IN_RANGE_INC (style, 0, 6))
4021 return;
4022
4023 if (style == 0)
4024 style = 1;
4025
4026 cursor_type = (style - 1) / 2;
4027 set_option (Opt_cursorUnderline, cursor_type == 1);
4028
4029#ifdef CURSOR_BLINK
4030 set_option (Opt_cursorBlink, style & 1);
4031 cursor_blink_reset ();
4032#endif
4033
4034 want_refresh = 1;
4035}
4381/*}}} */ 4036/*}}} */
4382 4037
4383/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4384void
4385rxvt_term::process_graphics ()
4386{
4387 unicode_t ch, cmd = cmd_getc ();
4388
4389 if (cmd == 'Q')
4390 { /* query graphics */
4391 tt_printf ("\033G0\012"); /* no graphics */
4392 return;
4393 }
4394 /* swallow other graphics sequences until terminating ':' */
4395 do
4396 ch = cmd_getc ();
4397 while (ch != ':');
4398}
4399/*}}} */
4400
4401/* ------------------------------------------------------------------------- */ 4038/* ---------------------------------------------------------------------- */
4039/* Write data to the pty as typed by the user, pasted with the mouse,
4040 * or generated by us in response to a query ESC sequence.
4041 */
4402 4042
4403/* 4043/*
4404 * Send printf () formatted output to the command. 4044 * Send printf () formatted output to the command.
4405 * Only use for small amounts of data. 4045 * Only use for small amounts of data.
4406 */ 4046 */
… …
4414 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4054 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4415 va_end (arg_ptr); 4055 va_end (arg_ptr);
4416 tt_write (buf, strlen (buf)); 4056 tt_write (buf, strlen (buf));
4417} 4057}
4418 4058
4419/* ---------------------------------------------------------------------- */
4420/* Write data to the pty as typed by the user, pasted with the mouse, 4059/* Write data to the pty as typed by the user. */
4421 * or generated by us in response to a query ESC sequence. 4060void
4422 */ 4061rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4423const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4062{
4063 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4064 return;
4065
4066 if (option (Opt_scrollTtyKeypress))
4067 if (view_start)
4068 {
4069 view_start = 0;
4070 want_refresh = 1;
4071 }
4072
4073 tt_write_ (data, len);
4074}
4424 4075
4425void 4076void
4426rxvt_term::tt_write (const char *data, unsigned int len) 4077rxvt_term::tt_write (const char *data, unsigned int len)
4427{ 4078{
4428 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4079 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4429 return; 4080 return;
4430 4081
4082 tt_write_ (data, len);
4083}
4084
4085static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4086
4087void
4088rxvt_term::tt_write_ (const char *data, unsigned int len)
4089{
4431 if (pty->pty < 0) 4090 if (pty->pty < 0)
4432 return; 4091 return;
4433 4092
4434 if (v_buflen == 0) 4093 if (v_buflen == 0)
4435 { 4094 {
4436 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4095 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4437 4096
4097 max_it (written, 0);
4098
4438 if ((unsigned int)written == len) 4099 if (written == len)
4439 return; 4100 return;
4440 4101
4441 data += written; 4102 data += written;
4442 len -= written; 4103 len -= written;
4443 } 4104 }
4444 4105
4445 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4106 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4446 4107
4447 memcpy (v_buffer + v_buflen, data, len); 4108 memcpy (v_buffer + v_buflen, data, len);
4448 v_buflen += len; 4109 v_buflen += len;
4449 4110
4450 pty_ev.set (EVENT_READ | EVENT_WRITE); 4111 pty_ev.set (ev::READ | ev::WRITE);
4451} 4112}
4452 4113
4453void rxvt_term::pty_write () 4114void rxvt_term::pty_write ()
4454{ 4115{
4455 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4116 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4460 4121
4461 if (v_buflen == 0) 4122 if (v_buflen == 0)
4462 { 4123 {
4463 free (v_buffer); 4124 free (v_buffer);
4464 v_buffer = 0; 4125 v_buffer = 0;
4465 v_buflen = 0;
4466 4126
4467 pty_ev.set (EVENT_READ); 4127 pty_ev.set (ev::READ);
4468 return; 4128 return;
4469 } 4129 }
4470 4130
4471 memmove (v_buffer, v_buffer + written, v_buflen); 4131 memmove (v_buffer, v_buffer + written, v_buflen);
4472 } 4132 }
4473 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4133 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4474 pty_ev.set (EVENT_READ); 4134 pty_ev.set (ev::READ);
4475} 4135}
4476 4136
4477/*----------------------- end-of-file (C source) -----------------------*/ 4137/*----------------------- end-of-file (C source) -----------------------*/
4478 4138

Diff Legend

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