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

Diff Legend

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