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

Diff Legend

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