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

Diff Legend

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