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.312 by root, Sat Mar 4 22:05:05 2006 UTC vs.
Revision 1.536 by sf-exg, Thu Mar 28 08:53:16 2013 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
… …
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_dir, 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_changeview (view_start - 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:
1451 if (ev.xfocus.detail != NotifyInferior
1452 && ev.xfocus.detail != NotifyPointer
1453 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1454 focus_in ();
1464 break; 1455 break;
1465 1456
1466 case FocusOut: 1457 case FocusOut:
1458 if (ev.xfocus.detail != NotifyInferior
1459 && ev.xfocus.detail != NotifyPointer
1460 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1461 focus_out ();
1468 break; 1462 break;
1469 1463
1470 case ConfigureNotify: 1464 case ConfigureNotify:
1471 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1472 { 1466 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 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 }
1475 1502
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1504 {
1478 seen_resize = 1; 1505 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1507 }
1508 else
1509 {
1510#ifdef HAVE_BG_PIXMAP
1511 if (moved)
1512 update_background ();
1513#endif
1514 }
1481 1515
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1517 }
1489 break; 1518 break;
1490 1519
1491 case PropertyNotify: 1520 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1494 && ev.xproperty.state == PropertyNewValue)
1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1496
1497 break; 1522 break;
1498 1523
1499 case SelectionClear: 1524 case SelectionClear:
1500 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1501 break;
1502
1503 case SelectionNotify:
1504 if (selection_wait == Sel_normal)
1505 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1506 break; 1526 break;
1507 1527
1508 case SelectionRequest: 1528 case SelectionRequest:
1509 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1510 break; 1530 break;
1511 1531
1512 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
1513 mapped = 1; 1544 mapped = 1;
1514#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1546 text_blink_ev.start ();
1516#endif 1547#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1549 break;
1519 1550
1520 case UnmapNotify: 1551 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1553#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1554 text_blink_ev.stop ();
1524#endif 1555#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1557 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1558
1534 case GraphicsExpose: 1559 case GraphicsExpose:
1535 case Expose: 1560 case Expose:
1536 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1537 { 1562 {
1538 do 1563 do
1564 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1567 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1569
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1571
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1573 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1576 }
1548 1577
1549 want_refresh = 1; 1578 want_refresh = 1;
1550 } 1579 }
1551 else 1580 else
1552 { 1581 {
… …
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1584 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1585 ;
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1587 ;
1559 1588
1560 if (isScrollbarWindow (ev.xany.window)) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1590 {
1562 scrollBar.setIdle (); 1591 scrollBar.state = SB_STATE_IDLE;
1563 scrollbar_show (0); 1592 scrollBar.show (0);
1564 } 1593 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1594 }
1571 break; 1595 break;
1572 1596
1573 case MotionNotify: 1597 case MotionNotify:
1574#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1599 if (hidden_pointer)
1576 pointer_unblank (); 1600 pointer_unblank ();
1577#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);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1605 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1606 break;
1580 1607
1581 if (ev.xany.window == vt) 1608 if (ev.xany.window == vt)
1582 { 1609 {
… …
1616 int dist; 1643 int dist;
1617 1644
1618 /* don't clobber the current delay if we are 1645 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1646 * already in the middle of scrolling.
1620 */ 1647 */
1621 if (!sel_scroll_ev.active) 1648 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1649 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1650
1624 /* save the event params so we can highlight 1651 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1652 * the selection in the pending-scroll loop
1626 */ 1653 */
1627 selection_save_x = ev.xbutton.x; 1654 selection_save_x = ev.xbutton.x;
… …
1635 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1636 } 1663 }
1637 else 1664 else
1638 { 1665 {
1639 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1640 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1641 } 1668 }
1642 1669
1643 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1644 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1645 + 1; 1672 + 1;
… …
1649 else 1676 else
1650 { 1677 {
1651 /* we are within the text window, so we 1678 /* we are within the text window, so we
1652 * shouldn't be scrolling 1679 * shouldn't be scrolling
1653 */ 1680 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1681 sel_scroll_ev.stop();
1656 } 1682 }
1657#endif 1683#endif
1658#ifdef MOUSE_THRESHOLD 1684#ifdef MOUSE_THRESHOLD
1659 } 1685 }
1660#endif 1686#endif
1661 } 1687 }
1662 } 1688 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1664 { 1690 {
1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1692 MotionNotify, &ev))
1667 ; 1693 ;
1668 1694
1669 XQueryPointer (dpy, scrollBar.win, 1695 XQueryPointer (dpy, scrollBar.win,
1670 &unused_root, &unused_child, 1696 &unused_root, &unused_child,
1671 &unused_root_x, &unused_root_y, 1697 &unused_root_x, &unused_root_y,
1672 &ev.xbutton.x, &ev.xbutton.y, 1698 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1699 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1700 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1701 scrollBar.size ());
1676 want_refresh = 1; 1702 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1703 scrollBar.show (1);
1679 } 1704 }
1680 break; 1705 break;
1681 } 1706 }
1682 1707
1683#if defined(CURSOR_BLINK) 1708#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1709 if (ev.type == KeyPress)
1685 { 1710 cursor_blink_reset ();
1686 if (hidden_cursor)
1687 {
1688 hidden_cursor = 0;
1689 want_refresh = 1;
1690 }
1691
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 }
1694#endif 1711#endif
1695 1712
1696#if defined(POINTER_BLANK) 1713#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1714 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1715 {
1699 if (ev.type == MotionNotify 1716 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1717 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1718 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1719 if (hidden_pointer)
… …
1704 1721
1705 if (ev.type == KeyPress && hidden_pointer == 0) 1722 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank (); 1723 pointer_blank ();
1707 } 1724 }
1708#endif 1725#endif
1709}
1710 1726
1711void 1727 refresh_check ();
1728}
1729
1730#if ENABLE_FRILLS
1731void ecb_cold
1732rxvt_term::set_urgency (bool enable)
1733{
1734 if (enable == urgency_hint)
1735 return;
1736
1737 if (XWMHints *h = XGetWMHints (dpy, parent))
1738 {
1739 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1740 XSetWMHints (dpy, parent, h);
1741 urgency_hint = enable;
1742 XFree (h);
1743 }
1744}
1745#endif
1746
1747void ecb_cold
1712rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1713{ 1749{
1714 if (!focus) 1750 if (!focus)
1715 { 1751 {
1716 focus = 1; 1752 focus = 1;
1717 want_refresh = 1; 1753 want_refresh = 1;
1718 1754
1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1720
1721#if USE_XIM 1755#if USE_XIM
1722 if (Input_Context != NULL) 1756 if (Input_Context != NULL)
1723 { 1757 {
1724 IMSetPosition (); 1758 im_set_position ();
1725 XSetICFocus (Input_Context); 1759 XSetICFocus (Input_Context);
1726 } 1760 }
1727#endif 1761#endif
1728#if CURSOR_BLINK 1762#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1763 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1764 cursor_blink_ev.again ();
1731#endif 1765#endif
1732#if OFF_FOCUS_FADING 1766#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1767 if (rs[Rs_fade])
1734 { 1768 {
1735 pix_colors = pix_colors_focused; 1769 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1770 scr_recolour ();
1737 } 1771 }
1738#endif 1772#endif
1739 } 1773#if ENABLE_FRILLS
1740} 1774 if (option (Opt_urgentOnBell))
1775 set_urgency (0);
1776#endif
1741 1777
1742void 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1779 }
1780}
1781
1782void ecb_cold
1743rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1744{ 1784{
1745 if (focus) 1785 if (focus)
1746 { 1786 {
1747 focus = 0; 1787 focus = 0;
1748 want_refresh = 1; 1788 want_refresh = 1;
1749 1789
1750 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1790#if ENABLE_FRILLS
1751 1791 if (option (Opt_urgentOnBell))
1792 set_urgency (0);
1793#endif
1752#if ENABLE_FRILLS || ISO_14755 1794#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1795 if (iso14755buf)
1754 { 1796 {
1755 iso14755buf = 0; 1797 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1798# if ISO_14755
1757 scr_overlay_off (); 1799 scr_overlay_off ();
1758# endif 1800# endif
1759 } 1801 }
1760#endif 1802#endif
1761#if USE_XIM 1803#if USE_XIM
1762 if (Input_Context != NULL) 1804 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1805 XUnsetICFocus (Input_Context);
1764#endif 1806#endif
1765#if CURSOR_BLINK 1807#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1808 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1809 cursor_blink_ev.stop ();
1810
1768 hidden_cursor = 0; 1811 hidden_cursor = 0;
1769#endif 1812#endif
1770#if OFF_FOCUS_FADING 1813#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1814 if (rs[Rs_fade])
1772 { 1815 {
1773 pix_colors = pix_colors_unfocused; 1816 pix_colors = pix_colors_unfocused;
1774 scr_recolour (); 1817 scr_recolour ();
1775 } 1818 }
1776#endif 1819#endif
1820
1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1822 }
1823}
1824
1825void ecb_cold
1826rxvt_term::update_fade_color (unsigned int idx)
1827{
1828#if OFF_FOCUS_FADING
1829 if (rs[Rs_fade])
1777 } 1830 {
1831 rgba c;
1832 pix_colors [Color_fade].get (c);
1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1834 }
1835#endif
1778} 1836}
1779 1837
1780#if TRANSPARENT 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1781void 1839void ecb_hot
1782rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1841{
1784 make_current (); 1842 make_current ();
1843
1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1846 return;
1785 1847
1786 switch (ev.type) 1848 switch (ev.type)
1787 { 1849 {
1788 case PropertyNotify: 1850 case PropertyNotify:
1789 /* 1851 /*
1790 * if user used some Esetroot compatible prog to set the root bg, 1852 * if user used some Esetroot compatible prog to set the root bg,
1791 * use the property to determine the pixmap. We use it later on. 1853 * use the property to determine the pixmap. We use it later on.
1792 */ 1854 */
1793 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 return; 1857 {
1858#if BG_IMAGE_FROM_ROOT
1859 if (option (Opt_transparent))
1860 {
1861 rxvt_img::new_from_root (this)->replace (root_img);
1862 update_background ();
1863 }
1864#endif
1865 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1866 }
1796 1867
1797 /* FALLTHROUGH */
1798 case ReparentNotify:
1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1800 want_refresh = want_full_refresh = 1;
1801 break; 1868 break;
1802 } 1869 }
1870
1871 refresh_check ();
1803} 1872}
1804#endif 1873#endif
1805 1874
1806void 1875void
1807rxvt_term::button_press (XButtonEvent &ev) 1876rxvt_term::button_press (XButtonEvent &ev)
… …
1838 /* save the xbutton state (for ButtonRelease) */ 1907 /* save the xbutton state (for ButtonRelease) */
1839 MEvent.state = ev.state; 1908 MEvent.state = ev.state;
1840#ifdef MOUSE_REPORT_DOUBLECLICK 1909#ifdef MOUSE_REPORT_DOUBLECLICK
1841 if (ev.button == MEvent.button && clickintime) 1910 if (ev.button == MEvent.button && clickintime)
1842 { 1911 {
1843 /* same button, within alloted time */ 1912 /* same button, within allowed time */
1844 MEvent.clicks++; 1913 MEvent.clicks++;
1845 1914
1846 if (MEvent.clicks > 1) 1915 if (MEvent.clicks > 1)
1847 { 1916 {
1848 /* only report double clicks */ 1917 /* only report double clicks */
… …
1862 mouse_report (ev); 1931 mouse_report (ev);
1863 } 1932 }
1864#else 1933#else
1865 MEvent.button = ev.button; 1934 MEvent.button = ev.button;
1866 mouse_report (ev); 1935 mouse_report (ev);
1867#endif /* MOUSE_REPORT_DOUBLECLICK */ 1936#endif /* MOUSE_REPORT_DOUBLECLICK */
1868 1937
1869 } 1938 }
1870 else 1939 else
1871 { 1940 {
1872 if (ev.button != MEvent.button) 1941 if (ev.button != MEvent.button)
… …
1920 } 1989 }
1921 1990
1922 /* 1991 /*
1923 * Scrollbar window processing of button press 1992 * Scrollbar window processing of button press
1924 */ 1993 */
1925 if (isScrollbarWindow (ev.window)) 1994 if (scrollBar.state && ev.window == scrollBar.win)
1926 { 1995 {
1927 scrollBar.setIdle (); 1996 page_dirn direction = NO_DIR;
1997
1998 if (scrollBar.upButton (ev.y))
1999 direction = UP; /* up */
2000 else if (scrollBar.dnButton (ev.y))
2001 direction = DN; /* down */
2002
2003 scrollBar.state = SB_STATE_IDLE;
1928 /* 2004 /*
1929 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1930 * move up if mouse is above slider 2006 * move up if mouse is above slider
1931 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1932 * 2008 *
… …
1941 /* 2017 /*
1942 * Mouse report disabled scrollbar: 2018 * Mouse report disabled scrollbar:
1943 * arrow buttons - send up/down 2019 * arrow buttons - send up/down
1944 * click on scrollbar - send pageup/down 2020 * click on scrollbar - send pageup/down
1945 */ 2021 */
1946 if ((scrollBar.style == R_SB_NEXT 2022 if (direction == UP)
1947 && scrollbarnext_upButton (ev.y))
1948 || (scrollBar.style == R_SB_RXVT
1949 && scrollbarrxvt_upButton (ev.y)))
1950 tt_printf ("\033[A"); 2023 tt_printf ("\033[A");
1951 else if ((scrollBar.style == R_SB_NEXT 2024 else if (direction == DN)
1952 && scrollbarnext_dnButton (ev.y))
1953 || (scrollBar.style == R_SB_RXVT
1954 && scrollbarrxvt_dnButton (ev.y)))
1955 tt_printf ("\033[B"); 2025 tt_printf ("\033[B");
1956 else 2026 else
1957 switch (ev.button) 2027 switch (ev.button)
1958 { 2028 {
1959 case Button2: 2029 case Button2:
… …
1966 tt_printf ("\033[5~"); 2036 tt_printf ("\033[5~");
1967 break; 2037 break;
1968 } 2038 }
1969 } 2039 }
1970 else 2040 else
1971#endif /* NO_SCROLLBAR_REPORT */ 2041#endif /* NO_SCROLLBAR_REPORT */
1972
1973 {
1974 char upordown = 0;
1975
1976 if (scrollBar.style == R_SB_NEXT)
1977 { 2042 {
1978 if (scrollbarnext_upButton (ev.y)) 2043 if (direction != NO_DIR)
1979 upordown = -1; /* up */
1980 else if (scrollbarnext_dnButton (ev.y))
1981 upordown = 1; /* down */
1982 }
1983 else if (scrollBar.style == R_SB_RXVT)
1984 {
1985 if (scrollbarrxvt_upButton (ev.y))
1986 upordown = -1; /* up */
1987 else if (scrollbarrxvt_dnButton (ev.y))
1988 upordown = 1; /* down */
1989 }
1990 if (upordown)
1991 { 2044 {
1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2046 if (!cont_scroll_ev.is_active ())
1993 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1994#endif 2048#endif
1995 if (scr_page (upordown < 0 ? UP : DN, 1)) 2049 if (scr_page (direction, 1))
1996 { 2050 {
1997 if (upordown < 0) 2051 if (direction == UP)
1998 scrollBar.setUp (); 2052 scrollBar.state = SB_STATE_UP;
1999 else 2053 else
2000 scrollBar.setDn (); 2054 scrollBar.state = SB_STATE_DOWN;
2001 } 2055 }
2002 } 2056 }
2003 else 2057 else
2004 switch (ev.button) 2058 switch (ev.button)
2005 { 2059 {
2006 case Button2: 2060 case Button2:
2007 switch (scrollbar_align) 2061 switch (scrollBar.align)
2008 { 2062 {
2009 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2010 csrO = 0; 2064 csrO = 0;
2011 break; 2065 break;
2012 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2013 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2014 break; 2068 break;
2015 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2016 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2017 break; 2071 break;
2018 } 2072 }
2019 2073
2020 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2021 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2022 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2023 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2024 2078
2025 scrollBar.setMotion (); 2079 scrollBar.state = SB_STATE_MOTION;
2026 break; 2080 break;
2027 2081
2028 case Button1: 2082 case Button1:
2029 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2030 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2031 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2032 2086
2033 case Button3: 2087 case Button3:
2034 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2035 { 2089 {
2036 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2037# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2038 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2039# else 2093# else
2040 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2041# endif 2095# endif
2042 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2043# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2044 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2045# else 2099# else
2046 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2047# endif 2101# endif
2048 else 2102 else
2049 scrollBar.setMotion (); 2103 scrollBar.state = SB_STATE_MOTION;
2050 } 2104 }
2051 else 2105 else
2052 { 2106 {
2053 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2054 (nrow 2108 (nrow
2055 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2056 / scrollbar_size ())); 2110 / scrollBar.size ()));
2057 } 2111 }
2058 2112
2059 break; 2113 break;
2060 } 2114 }
2061 } 2115 }
… …
2071 2125
2072 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2073 if (!bypass_keystate) 2127 if (!bypass_keystate)
2074 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2075 2129
2076 if (scrollbar_isUpDn ()) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2077 { 2131 {
2078 scrollBar.setIdle (); 2132 scrollBar.state = SB_STATE_IDLE;
2079 scrollbar_show (0); 2133 scrollBar.show (0);
2080 } 2134 }
2081 2135
2082#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2083 if (sel_scroll_ev.active)
2084 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2085#endif 2138#endif
2086 2139
2087 if (ev.window == vt) 2140 if (ev.window == vt)
2088 { 2141 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2113 mouse_report (ev); 2166 mouse_report (ev);
2114 } 2167 }
2115#else /* MOUSE_REPORT_DOUBLECLICK */ 2168#else /* MOUSE_REPORT_DOUBLECLICK */
2116 MEvent.button = AnyButton; 2169 MEvent.button = AnyButton;
2117 mouse_report (ev); 2170 mouse_report (ev);
2118#endif /* MOUSE_REPORT_DOUBLECLICK */ 2171#endif /* MOUSE_REPORT_DOUBLECLICK */
2119 return; 2172 return;
2120 } 2173 }
2121 2174
2122 /* 2175 /*
2123 * dumb hack to compensate for the failure of click-and-drag 2176 * dumb hack to compensate for the failure of click-and-drag
… …
2134 case Button3: 2187 case Button3:
2135 selection_make (ev.time); 2188 selection_make (ev.time);
2136 break; 2189 break;
2137 2190
2138 case Button2: 2191 case Button2:
2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2194 break;
2142 2195
2143#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2144 case Button4: 2197 case Button4:
2145 case Button5: 2198 case Button5:
… …
2149 2202
2150 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2151 2204
2152 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2153 i = 1; 2206 i = 1;
2154 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2208 i = nrow - 1;
2156 else 2209 else
2157 i = 5; 2210 i = 5;
2158 2211
2159# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2160 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
2161 { 2214 {
2162 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += v;
2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2165 2218
2166 if (slip_wheel_ev.at < NOW) 2219 if (!slip_wheel_ev.is_active ())
2167 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2168
2169 slip_wheel_ev.start ();
2170 } 2221 }
2171 else 2222 else
2223# endif
2172 { 2224 {
2173# endif
2174 scr_page (v, i); 2225 scr_page (v, i);
2175 scrollbar_show (1); 2226 scrollBar.show (1);
2176# ifdef MOUSE_SLIP_WHEELING
2177 } 2227 }
2178# endif
2179 } 2228 }
2180 break; 2229 break;
2181#endif 2230#endif
2182 } 2231 }
2183 } 2232 }
2184} 2233}
2185 2234
2186#ifdef TRANSPARENT
2187#if TINTING
2188/* taken from aterm-0.4.2 */
2189
2190typedef uint32_t RUINT32T;
2191
2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2193{
2194 int sh_r, sh_g, sh_b;
2195 RUINT32T mask_r, mask_g, mask_b;
2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2199 int i;
2200
2201 Visual *visual = term->visual;
2202
2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2204
2205 /* for convenience */
2206 mask_r = visual->red_mask;
2207 mask_g = visual->green_mask;
2208 mask_b = visual->blue_mask;
2209
2210 /* boring lookup table pre-initialization */
2211 switch (srcImage->bits_per_pixel) {
2212 case 15:
2213 if ((mask_r != 0x7c00) ||
2214 (mask_g != 0x03e0) ||
2215 (mask_b != 0x001f))
2216 return;
2217 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2218 lookup_r = lookup;
2219 lookup_g = lookup+32;
2220 lookup_b = lookup+32+32;
2221 sh_r = 10;
2222 sh_g = 5;
2223 sh_b = 0;
2224 break;
2225 case 16:
2226 if ((mask_r != 0xf800) ||
2227 (mask_g != 0x07e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+64;
2234 sh_r = 11;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 24:
2239 if ((mask_r != 0xff0000) ||
2240 (mask_g != 0x00ff00) ||
2241 (mask_b != 0x0000ff))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2244 lookup_r = lookup;
2245 lookup_g = lookup+256;
2246 lookup_b = lookup+256+256;
2247 sh_r = 16;
2248 sh_g = 8;
2249 sh_b = 0;
2250 break;
2251 case 32:
2252 if ((mask_r != 0xff0000) ||
2253 (mask_g != 0x00ff00) ||
2254 (mask_b != 0x0000ff))
2255 return;
2256 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257 lookup_r = lookup;
2258 lookup_g = lookup+256;
2259 lookup_b = lookup+256+256;
2260 sh_r = 16;
2261 sh_g = 8;
2262 sh_b = 0;
2263 break;
2264 default:
2265 return; /* we do not support this color depth */
2266 }
2267
2268 /* prepare limits for color transformation (each channel is handled separately) */
2269 if (shade < 0) {
2270 shade = -shade;
2271 if (shade < 0) shade = 0;
2272 if (shade > 100) shade = 100;
2273
2274 lower_lim_r = 65535-rm;
2275 lower_lim_g = 65535-gm;
2276 lower_lim_b = 65535-bm;
2277
2278 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2279 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2280 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2281
2282 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2283 } else {
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2288
2289 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2290 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2291 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2292 }
2293
2294 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2295 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2296 {
2297 unsigned int tmp;
2298
2299 tmp = lower_lim_r;
2300 lower_lim_r = lower_lim_b;
2301 lower_lim_b = tmp;
2302
2303 tmp = upper_lim_r;
2304 upper_lim_r = upper_lim_b;
2305 upper_lim_b = tmp;
2306 }
2307
2308 /* fill our lookup tables */
2309 for (i = 0; i <= mask_r>>sh_r; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2313 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2314 lookup_r[i] = (tmp/65535)<<sh_r;
2315 }
2316 for (i = 0; i <= mask_g>>sh_g; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2320 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2321 lookup_g[i] = (tmp/65535)<<sh_g;
2322 }
2323 for (i = 0; i <= mask_b>>sh_b; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2327 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2328 lookup_b[i] = (tmp/65535)<<sh_b;
2329 }
2330
2331 /* apply table to input image (replacing colors by newly calculated ones) */
2332 switch (srcImage->bits_per_pixel)
2333 {
2334 case 15:
2335 {
2336 unsigned short *p1, *pf, *p, *pl;
2337 p1 = (unsigned short *) srcImage->data;
2338 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339 while (p1 < pf)
2340 {
2341 p = p1;
2342 pl = p1 + srcImage->width;
2343 for (; p < pl; p++)
2344 {
2345 *p = lookup_r[(*p & 0x7c00)>>10] |
2346 lookup_g[(*p & 0x03e0)>> 5] |
2347 lookup_b[(*p & 0x001f)];
2348 }
2349 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 case 16:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0xf800)>>11] |
2365 lookup_g[(*p & 0x07e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 24:
2373 {
2374 unsigned char *p1, *pf, *p, *pl;
2375 p1 = (unsigned char *) srcImage->data;
2376 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width * 3;
2381 for (; p < pl; p += 3)
2382 {
2383 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2384 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2385 p[2] = lookup_r[(p[2] & 0x0000ff)];
2386 }
2387 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 32:
2392 {
2393 RUINT32T *p1, *pf, *p, *pl;
2394 p1 = (RUINT32T *) srcImage->data;
2395 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
2402 {
2403 *p = lookup_r[(*p & 0xff0000)>>16] |
2404 lookup_g[(*p & 0x00ff00)>> 8] |
2405 lookup_b[(*p & 0x0000ff)] |
2406 (*p & ~0xffffff);
2407 }
2408 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 }
2413
2414 free (lookup);
2415}
2416#endif
2417
2418/*
2419 * Check our parents are still who we think they are.
2420 * Do transparency updates if required
2421 */
2422int
2423rxvt_term::check_our_parents ()
2424{
2425 int i, pchanged, aformat, have_pixmap, rootdepth;
2426 unsigned long nitems, bytes_after;
2427 Atom atype;
2428 unsigned char *prop = NULL;
2429 Window root, oldp, *list;
2430 Pixmap rootpixmap = None;
2431 XWindowAttributes wattr, wrootattr;
2432
2433 pchanged = 0;
2434
2435 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */
2437
2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth;
2440
2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2442
2443 if (rootdepth != wattr.depth)
2444 {
2445 if (am_transparent)
2446 {
2447 pchanged = 1;
2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0;
2450 }
2451
2452 return pchanged; /* Don't try any more */
2453 }
2454
2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (dpy, False);
2457
2458 /*
2459 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that.
2462 */
2463 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success);
2467
2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !ISSET_PIXCOLOR (Color_tint)
2477#endif
2478 )
2479 have_pixmap = 0;
2480 else
2481 {
2482 have_pixmap = 1;
2483 rootpixmap = *(Pixmap *)prop;
2484 XFree (prop);
2485 }
2486
2487 if (have_pixmap)
2488 {
2489 /*
2490 * Copy display->root pixmap transparency
2491 */
2492 int sx, sy, nx, ny;
2493 unsigned int nw, nh;
2494 Window cr;
2495 XImage *image;
2496 GC gc;
2497 XGCValues gcvalue;
2498
2499 XTranslateCoordinates (dpy, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height;
2503 nx = ny = 0;
2504
2505 if (sx < 0)
2506 {
2507 nw += sx;
2508 nx = -sx;
2509 sx = 0;
2510 }
2511
2512 if (sy < 0)
2513 {
2514 nh += sy;
2515 ny = -sy;
2516 sy = 0;
2517 }
2518
2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (dpy, False);
2523 allowedxerror = -1;
2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */
2528 allowedxerror = 0;
2529
2530 if (image == NULL)
2531 {
2532 if (am_transparent && am_pixmap_trans)
2533 {
2534 pchanged = 1;
2535 if (pixmap != None)
2536 {
2537 XFreePixmap (dpy, pixmap);
2538 pixmap = None;
2539 }
2540 }
2541
2542 am_pixmap_trans = 0;
2543 }
2544 else
2545 {
2546 if (pixmap != None)
2547 XFreePixmap (dpy, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 rgba c;
2555 pix_colors_focused [Color_tint].get (c);
2556
2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2564 nx, ny, image->width, image->height);
2565 XFreeGC (dpy, gc);
2566 XDestroyImage (image);
2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2568 XClearWindow (dpy, parent[0]);
2569
2570 if (!am_transparent || !am_pixmap_trans)
2571 pchanged = 1;
2572
2573 am_transparent = am_pixmap_trans = 1;
2574 }
2575 }
2576
2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 else
2580 {
2581 unsigned int n;
2582 /*
2583 * InheritPixmap transparency
2584 */
2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2586 {
2587 oldp = parent[i];
2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2589 XFree (list);
2590
2591 if (parent[i] == display->root)
2592 {
2593 if (oldp != None)
2594 pchanged = 1;
2595
2596 break;
2597 }
2598
2599 if (oldp != parent[i])
2600 pchanged = 1;
2601 }
2602
2603 n = 0;
2604
2605 if (pchanged)
2606 for (; n < (unsigned int)i; n++)
2607 {
2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2611 {
2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2613 break;
2614 }
2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2618 {
2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2621 am_transparent = 0;
2622 /* XXX: also turn off Opt_transparent? */
2623 }
2624 else
2625 {
2626 for (n = 0; n < (unsigned int)i; n++)
2627 {
2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2629 XClearWindow (dpy, parent[n]);
2630 }
2631
2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633 am_transparent = 1;
2634 }
2635
2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 parent[i] = None;
2638 }
2639
2640 if (scrollBar.win)
2641 {
2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2643 scrollBar.setIdle ();
2644 scrollbar_show (0);
2645 }
2646
2647 if (am_transparent)
2648 {
2649 want_refresh = want_full_refresh = 1;
2650 if (am_pixmap_trans)
2651 flush ();
2652 }
2653
2654 return pchanged;
2655}
2656#endif
2657
2658/*}}} */ 2235/*}}} */
2659 2236
2660bool 2237void ecb_hot
2661rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2662{ 2239{
2663 bool flag = false;
2664 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2665 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2666 2242
2667 for (;;) 2243 for (;;)
2668 { 2244 {
2669 if (ch == NOCHAR) 2245 if (ecb_unlikely (ch == NOCHAR))
2670 { 2246 {
2671 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2672 ch = next_char (); 2248 ch = next_char ();
2673 2249
2674 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2675 break; 2251 break;
2676 } 2252 }
2677 2253
2678 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2679 { 2255 {
2680 if (!seen_input) 2256 if (ecb_unlikely (!seen_input))
2681 { 2257 {
2682 seen_input = 1; 2258 seen_input = 1;
2683 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2684 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2685 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2698 wchar_t *str = buf; 2274 wchar_t *str = buf;
2699 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2700 2276
2701 for (;;) 2277 for (;;)
2702 { 2278 {
2703 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2704 break; 2280 break;
2705 2281
2706 *str++ = ch; 2282 *str++ = ch;
2707 2283
2708 if (ch == C0_LF || str >= eol) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2709 { 2285 {
2710 if (ch == C0_LF) 2286 if (ch == C0_LF)
2711 nlines++; 2287 nlines++;
2712 2288
2713 refresh_count++; 2289 refresh_count++;
2714 2290
2715 if (!OPTION (Opt_jumpScroll) 2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 { 2292 {
2718 refreshnow = true;
2719 refresh_count = 0; 2293 refresh_count = 0;
2294
2295 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2296 {
2297 refreshnow = true;
2720 ch = NOCHAR; 2298 ch = NOCHAR;
2721 break; 2299 break;
2300 }
2722 } 2301 }
2723 2302
2724 // scr_add_lines only works for nlines <= nrow - 1. 2303 // scr_add_lines only works for nlines <= nrow - 1.
2725 if (nlines >= nrow - 1) 2304 if (nlines >= nrow - 1)
2726 { 2305 {
… …
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2333 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2755 scr_add_lines (buf, str - buf, nlines); 2334 scr_add_lines (buf, str - buf, nlines);
2756 2335
2757 /* 2336 /*
2758 * If there have been a lot of new lines, then update the screen 2337 * If there have been a lot of new lines, then update the screen
2759 * What the heck I'll cheat and only refresh less than every page-full. 2338 * What the heck we'll cheat and only refresh less than every page-full.
2760 * the number of pages between refreshes is refresh_limit, which 2339 * if skipScroll is enabled.
2761 * is incremented here because we must be doing flat-out scrolling.
2762 */ 2340 */
2763 if (refreshnow) 2341 if (refreshnow)
2764 { 2342 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++;
2767 else
2768 {
2769 flag = true;
2770 //TODO: due to popular request, implement "skipscroll" option here
2771 scr_refresh (); 2343 scr_refresh ();
2772 want_refresh = 1; 2344 want_refresh = 1;
2773 }
2774 } 2345 }
2775
2776 } 2346 }
2777 else 2347 else
2778 { 2348 {
2779 try 2349 try
2780 { 2350 {
… …
2788 } 2358 }
2789 2359
2790 ch = NOCHAR; 2360 ch = NOCHAR;
2791 } 2361 }
2792 } 2362 }
2793
2794 return flag;
2795} 2363}
2796 2364
2797// read the next character 2365// read the next character
2798wchar_t 2366wchar_t ecb_hot
2799rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2800{ 2368{
2801 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2802 { 2370 {
2803 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2804 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2805 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2806 2374
2807 wchar_t wc; 2375 wchar_t wc;
2808 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2809 2377
… …
2813 cmdbuf_ptr = cmdbuf_endp; 2381 cmdbuf_ptr = cmdbuf_endp;
2814 break; 2382 break;
2815 } 2383 }
2816 2384
2817 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2386 {
2387 mbstate.reset (); // reset now undefined conversion state
2388 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2389 // in which case we "erroneously" return the next byte which might be valid.
2818 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2391 }
2819 2392
2820 // assume wchar == unicode 2393 // assume wchar == unicode
2821 cmdbuf_ptr += len; 2394 cmdbuf_ptr += len;
2822 return wc & UNICODE_MASK; 2395 return wc & UNICODE_MASK;
2823 } 2396 }
2824 2397
2825 return NOCHAR; 2398 return NOCHAR;
2826} 2399}
2827 2400
2828// read the next octet 2401// read the next octet
2829uint32_t 2402uint32_t ecb_hot
2830rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () NOTHROW
2831{ 2404{
2832 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2833 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2834 : NOCHAR; 2407 : NOCHAR;
2835} 2408}
2836 2409
2837static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2838 2411
2839/* rxvt_cmd_getc () - Return next input character */ 2412wchar_t ecb_hot
2840/*
2841 * Return the next input character after first passing any keyboard input
2842 * to the command.
2843 */
2844wchar_t
2845rxvt_term::cmd_getc () THROW ((class out_of_input)) 2413rxvt_term::cmd_getc () THROW ((class out_of_input))
2846{ 2414{
2847 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2848 2416
2849 if (c == NOCHAR) 2417 if (c == NOCHAR)
2850 throw out_of_input; 2418 throw out_of_input;
2851 2419
2852 return c; 2420 return c;
2853} 2421}
2854 2422
2855uint32_t 2423uint32_t ecb_hot
2856rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 () THROW ((class out_of_input))
2857{ 2425{
2858 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2859 2427
2860 if (c == NOCHAR) 2428 if (c == NOCHAR)
… …
2864} 2432}
2865 2433
2866/*{{{ print pipe */ 2434/*{{{ print pipe */
2867/*----------------------------------------------------------------------*/ 2435/*----------------------------------------------------------------------*/
2868#ifdef PRINTPIPE 2436#ifdef PRINTPIPE
2869FILE * 2437FILE * ecb_cold
2870rxvt_term::popen_printer () 2438rxvt_term::popen_printer ()
2871{ 2439{
2872 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2440 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2873 2441
2874 if (stream == NULL) 2442 if (stream == NULL)
2875 rxvt_warn ("can't open printer pipe, not printing.\n"); 2443 rxvt_warn ("can't open printer pipe, not printing.\n");
2876 2444
2877 return stream; 2445 return stream;
2878} 2446}
2879 2447
2880int 2448int ecb_cold
2881rxvt_term::pclose_printer (FILE *stream) 2449rxvt_term::pclose_printer (FILE *stream)
2882{ 2450{
2883 fflush (stream); 2451 fflush (stream);
2884 return pclose (stream); 2452 return pclose (stream);
2885} 2453}
2886 2454
2887/* 2455/*
2888 * simulate attached vt100 printer 2456 * simulate attached vt100 printer
2889 */ 2457 */
2890void 2458void ecb_cold
2891rxvt_term::process_print_pipe () 2459rxvt_term::process_print_pipe ()
2892{ 2460{
2893 int done; 2461 FILE *fd = popen_printer ();
2894 FILE *fd;
2895 2462
2896 if ((fd = popen_printer ()) == NULL) 2463 if (!fd)
2897 return; 2464 return;
2898 2465
2899 /* 2466 /*
2900 * Send all input to the printer until either ESC[4i or ESC[?4i 2467 * Send all input to the printer until either ESC[4i or ESC[?4i
2901 * is received. 2468 * is received.
2902 */ 2469 */
2903 for (done = 0; !done;) 2470 for (int done = 0; !done; )
2904 { 2471 {
2905 unsigned char buf[8]; 2472 unsigned char buf[8];
2906 unicode_t ch; 2473 unicode_t ch;
2907 unsigned int i, len; 2474 unsigned int i, len;
2908 2475
… …
2927 { 2494 {
2928 if ((buf[len++] = cmd_getc ()) == 'i') 2495 if ((buf[len++] = cmd_getc ()) == 'i')
2929 break; /* done = 1 */ 2496 break; /* done = 1 */
2930 } 2497 }
2931 } 2498 }
2932 2499
2933 for (i = 0; i < len; i++) 2500 for (i = 0; i < len; i++)
2934 if (putc (buf[i], fd) == EOF) 2501 if (putc (buf[i], fd) == EOF)
2935 { 2502 {
2936 done = 1; 2503 done = 1;
2937 break; 2504 break;
… …
2939 } 2506 }
2940 } 2507 }
2941 2508
2942 pclose_printer (fd); 2509 pclose_printer (fd);
2943} 2510}
2944#endif /* PRINTPIPE */ 2511#endif /* PRINTPIPE */
2945/*}}} */ 2512/*}}} */
2946 2513
2947/* *INDENT-OFF* */
2948enum { 2514enum {
2949 C1_40 = 0x40, 2515 C1_40 = 0x40,
2950 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2516 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2951 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2517 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2952 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2518 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2953 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2519 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2954}; 2520};
2955/* *INDENT-ON* */
2956 2521
2957/*{{{ process non-printing single characters */ 2522/*{{{ process non-printing single characters */
2958void 2523void ecb_hot
2959rxvt_term::process_nonprinting (unicode_t ch) 2524rxvt_term::process_nonprinting (unicode_t ch)
2960{ 2525{
2961 switch (ch) 2526 switch (ch)
2962 { 2527 {
2963 case C0_ESC: 2528 case C0_ESC:
… …
2999 process_dcs_seq (); 2564 process_dcs_seq ();
3000 break; 2565 break;
3001 case 0x9b: /* CSI */ 2566 case 0x9b: /* CSI */
3002 process_csi_seq (); 2567 process_csi_seq ();
3003 break; 2568 break;
3004 case 0x9d: /* CSI */ 2569 case 0x9d: /* OSC */
3005 process_osc_seq (); 2570 process_osc_seq ();
3006 break; 2571 break;
3007#endif 2572#endif
3008 } 2573 }
3009} 2574}
3010/*}}} */ 2575/*}}} */
3011 2576
3012 2577
3013/*{{{ process VT52 escape sequences */ 2578/*{{{ process VT52 escape sequences */
3014void 2579void ecb_cold
3015rxvt_term::process_escape_vt52 (unicode_t ch) 2580rxvt_term::process_escape_vt52 (unicode_t ch)
3016{ 2581{
3017 int row, col; 2582 int row, col;
3018 2583
3019 switch (ch) 2584 switch (ch)
… …
3053 break; 2618 break;
3054 case 'Z': /* identify the terminal type */ 2619 case 'Z': /* identify the terminal type */
3055 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2620 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3056 break; 2621 break;
3057 case '<': /* turn off VT52 mode */ 2622 case '<': /* turn off VT52 mode */
3058 PrivMode (0, PrivMode_vt52); 2623 priv_modes &= ~PrivMode_vt52;
3059 break; 2624 break;
3060 case 'F': /* use special graphics character set */ 2625 case 'F': /* use special graphics character set */
3061 case 'G': /* use regular character set */ 2626 case 'G': /* use regular character set */
3062 /* unimplemented */ 2627 /* unimplemented */
3063 break; 2628 break;
… …
3069} 2634}
3070/*}}} */ 2635/*}}} */
3071 2636
3072 2637
3073/*{{{ process escape sequences */ 2638/*{{{ process escape sequences */
3074void 2639void ecb_hot
3075rxvt_term::process_escape_seq () 2640rxvt_term::process_escape_seq ()
3076{ 2641{
3077 unicode_t ch = cmd_getc (); 2642 unicode_t ch = cmd_getc ();
3078 2643
3079 if (priv_modes & PrivMode_vt52) 2644 if (priv_modes & PrivMode_vt52)
… …
3082 return; 2647 return;
3083 } 2648 }
3084 2649
3085 switch (ch) 2650 switch (ch)
3086 { 2651 {
3087 /* case 1: do_tek_mode (); break; */
3088 case '#': 2652 case '#':
3089 if (cmd_getc () == '8') 2653 if (cmd_getc () == '8')
3090 scr_E (); 2654 scr_E ();
3091 break; 2655 break;
3092 case '(': 2656 case '(':
… …
3115#if !ENABLE_MINIMAL 2679#if !ENABLE_MINIMAL
3116 case '9': 2680 case '9':
3117 scr_forwardindex (); 2681 scr_forwardindex ();
3118 break; 2682 break;
3119#endif 2683#endif
2684 // DECPAM/DECPNM
3120 case '=': 2685 case '=':
2686 priv_modes |= PrivMode_aplKP;
2687 break;
3121 case '>': 2688 case '>':
3122 PrivMode ((ch == '='), PrivMode_aplKP); 2689 priv_modes &= ~PrivMode_aplKP;
3123 break; 2690 break;
3124 2691
3125 case C1_40: 2692 case C1_40:
3126 cmd_getc (); 2693 cmd_getc ();
3127 break; 2694 break;
… …
3131 2698
3132 /* 8.3.87: NEXT LINE */ 2699 /* 8.3.87: NEXT LINE */
3133 case C1_NEL: /* ESC E */ 2700 case C1_NEL: /* ESC E */
3134 { 2701 {
3135 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
3136 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3137 } 2704 }
3138 break; 2705 break;
3139 2706
3140 /* kidnapped escape sequence: Should be 8.3.48 */ 2707 /* kidnapped escape sequence: Should be 8.3.48 */
3141 case C1_ESA: /* ESC G */ 2708 case C1_ESA: /* ESC G */
3142 process_graphics (); 2709 // used by original rxvt for rob nations own graphics mode
2710 if (cmd_getc () == 'Q')
2711 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3143 break; 2712 break;
3144 2713
3145 /* 8.3.63: CHARACTER TABULATION SET */ 2714 /* 8.3.63: CHARACTER TABULATION SET */
3146 case C1_HTS: /* ESC H */ 2715 case C1_HTS: /* ESC H */
3147 scr_set_tab (1); 2716 scr_set_tab (1);
… …
3151 case C1_RI: /* ESC M */ 2720 case C1_RI: /* ESC M */
3152 scr_index (DN); 2721 scr_index (DN);
3153 break; 2722 break;
3154 2723
3155 /* 8.3.142: SINGLE-SHIFT TWO */ 2724 /* 8.3.142: SINGLE-SHIFT TWO */
3156 /*case C1_SS2: scr_single_shift (2); break; */ 2725 /* case C1_SS2: break; */
3157 2726
3158 /* 8.3.143: SINGLE-SHIFT THREE */ 2727 /* 8.3.143: SINGLE-SHIFT THREE */
3159 /*case C1_SS3: scr_single_shift (3); break; */ 2728 /* case C1_SS3: break; */
3160 2729
3161 /* 8.3.27: DEVICE CONTROL STRING */ 2730 /* 8.3.27: DEVICE CONTROL STRING */
3162 case C1_DCS: /* ESC P */ 2731 case C1_DCS: /* ESC P */
3163 process_dcs_seq (); 2732 process_dcs_seq ();
3164 break; 2733 break;
… …
3166 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2735 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3167 case C1_SCI: /* ESC Z */ 2736 case C1_SCI: /* ESC Z */
3168 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2737 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3169 break; /* steal obsolete ESC [ c */ 2738 break; /* steal obsolete ESC [ c */
3170 2739
3171 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2740 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3172 case C1_CSI: /* ESC [ */ 2741 case C1_CSI: /* ESC [ */
3173 process_csi_seq (); 2742 process_csi_seq ();
3174 break; 2743 break;
3175 2744
3176 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2745 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3177 case C1_OSC: /* ESC ] */ 2746 case C1_OSC: /* ESC ] */
3178 process_osc_seq (); 2747 process_osc_seq ();
3179 break; 2748 break;
3180 2749
3181 /* 8.3.106: RESET TO INITIAL STATE */ 2750 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3182 case 'c': 2751 case 'c':
3183 mbstate.reset (); 2752 mbstate.reset ();
3184 scr_poweron (); 2753 scr_poweron ();
3185 scrollbar_show (1); 2754 scrollBar.show (1);
3186 break; 2755 break;
3187 2756
3188 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2757 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3189 case 'n': 2758 case 'n':
3190 scr_charset_choose (2); 2759 scr_charset_choose (2);
… …
3197 } 2766 }
3198} 2767}
3199/*}}} */ 2768/*}}} */
3200 2769
3201/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2770/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3202/* *INDENT-OFF* */
3203enum { 2771enum {
3204 CSI_ICH = 0x40, 2772 CSI_ICH = 0x40,
3205 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2773 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3206 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2774 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3207 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2775 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3210 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2778 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3211 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2779 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3212 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2780 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3213}; 2781};
3214 2782
3215#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2783#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3216 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2784 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3217 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2785 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3218#define get_byte_array_bit(array, bit) \ 2786#define get_byte_array_bit(array, bit) \
3219 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2787 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3220 2788
3221const unsigned char csi_defaults[] = 2789static const unsigned char csi_defaults[] =
3222 { 2790 {
3223 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2791 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3224 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2792 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3225 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2793 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3226 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2794 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3227 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2795 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3228 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2796 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3229 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2797 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3230 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2798 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3231 }; 2799 };
3232/* *INDENT-ON* */
3233 2800
3234void 2801void ecb_hot
3235rxvt_term::process_csi_seq () 2802rxvt_term::process_csi_seq ()
3236{ 2803{
3237 unicode_t ch, priv, i; 2804 unicode_t ch, priv, prev_ch, i;
3238 unsigned int nargs, p; 2805 unsigned int nargs, p;
3239 int n, ndef; 2806 int n, ndef;
3240 int arg[ESC_ARGS]; 2807 int arg[ESC_ARGS] = { };
3241 2808
3242 for (nargs = ESC_ARGS; nargs > 0;) 2809 nargs = 0;
3243 arg[--nargs] = 0;
3244 2810
3245 priv = 0; 2811 priv = 0;
3246 ch = cmd_getc (); 2812 ch = cmd_getc ();
3247 if (ch >= '<' && ch <= '?') 2813 if ((ch >= '<' && ch <= '?') || ch == '!')
2814 {
3248 { /* '<' '=' '>' '?' */ 2815 /* '<' '=' '>' '?' '!' */
3249 priv = ch; 2816 priv = ch;
3250 ch = cmd_getc (); 2817 ch = cmd_getc ();
3251 } 2818 }
3252 2819
2820 prev_ch = 0;
3253 /* read any numerical arguments */ 2821 /* read any numerical arguments */
3254 for (n = -1; ch < CSI_ICH; ) 2822 for (n = -1; ch < CSI_ICH; )
3255 { 2823 {
3256 if (isdigit (ch)) 2824 if (isdigit (ch))
3257 { 2825 {
… …
3267 n = -1; 2835 n = -1;
3268 } 2836 }
3269 else if (IS_CONTROL (ch)) 2837 else if (IS_CONTROL (ch))
3270 process_nonprinting (ch); 2838 process_nonprinting (ch);
3271 2839
2840 prev_ch = ch;
3272 ch = cmd_getc (); 2841 ch = cmd_getc ();
3273 } 2842 }
3274 2843
3275 if (ch > CSI_7F) 2844 if (ch > CSI_7F)
3276 return; 2845 return;
… …
3292 switch (priv) 2861 switch (priv)
3293 { 2862 {
3294 case '>': 2863 case '>':
3295 if (ch == CSI_DA) /* secondary device attributes */ 2864 if (ch == CSI_DA) /* secondary device attributes */
3296 { 2865 {
3297 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2866 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3298 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2867 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3299 // 2868 //
3300 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2869 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3301 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2870 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3302 // that we do not support xterm mouse reporting (should be 95 when we do). 2871 // versions.
3303 // 2872 //
3304 tt_printf ("\033[>%d;94;0c", 'U'); 2873 tt_printf ("\033[>%d;95;0c", 'U');
3305 } 2874 }
3306 break; 2875 break;
2876
3307 case '?': 2877 case '?':
3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3309 process_terminal_mode (ch, priv, nargs, arg); 2879 process_terminal_mode (ch, priv, nargs, arg);
3310 break; 2880 break;
2881
2882 case '!':
2883 if (ch == CSI_70)
2884 {
2885 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2886 scr_soft_reset ();
2887
2888 static const int pm_h[] = { 7, 25 };
2889 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2890
2891 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2892 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3311 } 2893 }
2894 break;
2895 }
2896
3312 return; 2897 return;
3313 } 2898 }
3314 2899
3315 switch (ch) 2900 switch (ch)
3316 { 2901 {
… …
3330 } 2915 }
3331 break; 2916 break;
3332#endif 2917#endif
3333 2918
3334 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2919 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3335 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3336 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
3337 /* FALLTHROUGH */ 2922 /* FALLTHROUGH */
3338 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2923 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3339 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2924 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3340 scr_gotorc (arg[0], 0, RELATIVE); 2925 scr_gotorc (arg[0], 0, RELATIVE);
3341 break; 2926 break;
3342 2927
3343 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2928 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3344 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2929 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3436 break; 3021 break;
3437 case 6: /* CPR requested */ 3022 case 6: /* CPR requested */
3438 scr_report_position (); 3023 scr_report_position ();
3439 break; 3024 break;
3440 case 7: /* unofficial extension */ 3025 case 7: /* unofficial extension */
3441 if (OPTION (Opt_insecure)) 3026 if (option (Opt_insecure))
3442 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3027 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3443 break; 3028 break;
3444 case 8: /* unofficial extension */ 3029 case 8: /* unofficial extension */
3445 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3030 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3446 break; 3031 break;
… …
3494 scr_insert_mode (1); 3079 scr_insert_mode (1);
3495 else if (arg[0] == 20) 3080 else if (arg[0] == 20)
3496 priv_modes |= PrivMode_LFNL; 3081 priv_modes |= PrivMode_LFNL;
3497 break; 3082 break;
3498 3083
3084 case CSI_71: // DESCUSR: set cursor style
3085 if (prev_ch == ' ')
3086 set_cursor_style (arg[0]);
3087 break;
3088
3499 /* 3089 /*
3500 * PRIVATE USE beyond this point. All CSI_7? sequences here 3090 * PRIVATE USE beyond this point. All CSI_7? sequences here
3501 */ 3091 */
3502 case CSI_72: /* DECSTBM: set top and bottom margins */ 3092 case CSI_72: /* DECSTBM: set top and bottom margins */
3503 if (nargs == 1) 3093 if (nargs == 1)
… …
3531 } 3121 }
3532} 3122}
3533/*}}} */ 3123/*}}} */
3534 3124
3535#if !ENABLE_MINIMAL 3125#if !ENABLE_MINIMAL
3536/* ARGSUSED */
3537void 3126void
3538rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3127rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3539{ 3128{
3540 int x, y; 3129 int x, y;
3541 XWindowAttributes wattr; 3130 XWindowAttributes wattr;
… …
3550 { 3139 {
3551 /* 3140 /*
3552 * commands 3141 * commands
3553 */ 3142 */
3554 case 1: /* deiconify window */ 3143 case 1: /* deiconify window */
3555 XMapWindow (dpy, parent[0]); 3144 XMapWindow (dpy, parent);
3556 break; 3145 break;
3557 case 2: /* iconify window */ 3146 case 2: /* iconify window */
3558 XIconifyWindow (dpy, parent[0], display->screen); 3147 XIconifyWindow (dpy, parent, display->screen);
3559 break; 3148 break;
3560 case 3: /* set position (pixels) */ 3149 case 3: /* set position (pixels) */
3561 XMoveWindow (dpy, parent[0], args[1], args[2]); 3150 XMoveWindow (dpy, parent, args[1], args[2]);
3562 break; 3151 break;
3563 case 4: /* set size (pixels) */ 3152 case 4: /* set size (pixels) */
3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3153 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3565 break; 3154 break;
3566 case 5: /* raise window */ 3155 case 5: /* raise window */
3567 XRaiseWindow (dpy, parent[0]); 3156 XRaiseWindow (dpy, parent);
3568 break; 3157 break;
3569 case 6: /* lower window */ 3158 case 6: /* lower window */
3570 XLowerWindow (dpy, parent[0]); 3159 XLowerWindow (dpy, parent);
3571 break; 3160 break;
3572 case 7: /* refresh window */ 3161 case 7: /* refresh window */
3573 scr_touch (true); 3162 scr_touch (true);
3574 break; 3163 break;
3575 case 8: /* set size (chars) */ 3164 case 8: /* set size (chars) */
… …
3578 break; 3167 break;
3579 3168
3580 //case 9: NYI, TODO, restore maximized window or maximize window 3169 //case 9: NYI, TODO, restore maximized window or maximize window
3581 default: 3170 default:
3582 if (args[0] >= 24) /* set height (chars) */ 3171 if (args[0] >= 24) /* set height (chars) */
3583 set_widthheight ((unsigned int)width, 3172 set_widthheight ((unsigned int)vt_width,
3584 (unsigned int) (args[1] * fheight)); 3173 (unsigned int) (args[1] * fheight));
3585 break; 3174 break;
3586 3175
3587 /* 3176 /*
3588 * reports - some output format copied from XTerm 3177 * reports - some output format copied from XTerm
3589 */ 3178 */
3590 case 11: /* report window state */ 3179 case 11: /* report window state */
3591 XGetWindowAttributes (dpy, parent[0], &wattr); 3180 XGetWindowAttributes (dpy, parent, &wattr);
3592 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3181 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3593 break; 3182 break;
3594 case 13: /* report window position */ 3183 case 13: /* report window position */
3595 XGetWindowAttributes (dpy, parent[0], &wattr); 3184 XGetWindowAttributes (dpy, parent, &wattr);
3596 XTranslateCoordinates (dpy, parent[0], wattr.root, 3185 XTranslateCoordinates (dpy, parent, wattr.root,
3597 -wattr.border_width, -wattr.border_width, 3186 -wattr.border_width, -wattr.border_width,
3598 &x, &y, &wdummy); 3187 &x, &y, &wdummy);
3599 tt_printf ("\033[3;%d;%dt", x, y); 3188 tt_printf ("\033[3;%d;%dt", x, y);
3600 break; 3189 break;
3601 case 14: /* report window size (pixels) */ 3190 case 14: /* report window size (pixels) */
3602 XGetWindowAttributes (dpy, parent[0], &wattr); 3191 XGetWindowAttributes (dpy, parent, &wattr);
3603 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3192 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3604 break; 3193 break;
3605 case 18: /* report text area size (chars) */ 3194 case 18: /* report text area size (chars) */
3606 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3195 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3607 break; 3196 break;
… …
3609 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3198 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3610 break; 3199 break;
3611 case 20: /* report icon label */ 3200 case 20: /* report icon label */
3612 { 3201 {
3613 char *s; 3202 char *s;
3614 XGetIconName (dpy, parent[0], &s); 3203 XGetIconName (dpy, parent, &s);
3615 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3616 XFree (s); 3205 XFree (s);
3617 } 3206 }
3618 break; 3207 break;
3619 case 21: /* report window title */ 3208 case 21: /* report window title */
3620 { 3209 {
3621 char *s; 3210 char *s;
3622 XFetchName (dpy, parent[0], &s); 3211 XFetchName (dpy, parent, &s);
3623 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3212 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624 XFree (s); 3213 XFree (s);
3625 } 3214 }
3626 break; 3215 break;
3627 } 3216 }
3628} 3217}
… …
3655 seen_esc = true; 3244 seen_esc = true;
3656 continue; 3245 continue;
3657 } 3246 }
3658 else if (ch == C0_BEL || ch == CHAR_ST) 3247 else if (ch == C0_BEL || ch == CHAR_ST)
3659 break; 3248 break;
3249 else if (ch == C0_SYN)
3250 ch = cmd_get8 ();
3660 else if (ch < 0x20) 3251 else if (ch < 0x20)
3661 return NULL; /* other control character - exit */ 3252 return NULL; /* other control character - exit */
3662 3253
3663 seen_esc = false; 3254 seen_esc = false;
3664 3255
3665 if (n >= STRING_MAX - 1) 3256 if (n >= STRING_MAX - 1)
3666 // stop at some sane length 3257 // stop at some sane length
3667 return NULL; 3258 return NULL;
3668 3259
3669 if (ch == C0_SYN)
3670 string[n++] = cmd_get8 ();
3671 else
3672 string[n++] = ch; 3260 string[n++] = ch;
3673 } 3261 }
3674 3262
3675 string[n++] = '\0'; 3263 string[n++] = '\0';
3676 3264
3677 ends_how = (ch == 0x5c ? C0_ESC : ch); 3265 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3684 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3272 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3685 */ 3273 */
3686void 3274void
3687rxvt_term::process_dcs_seq () 3275rxvt_term::process_dcs_seq ()
3688{ 3276{
3689 char *s;
3690 unicode_t eh;
3691
3692 /* 3277 /*
3693 * Not handled yet 3278 * Not handled yet
3694 */ 3279 */
3280
3281 unicode_t eh;
3695 s = get_to_st (eh); 3282 char *s = get_to_st (eh);
3696 if (s) 3283 if (s)
3697 free (s); 3284 free (s);
3698 3285
3699 return; 3286 return;
3700} 3287}
… …
3704 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3291 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3705 */ 3292 */
3706void 3293void
3707rxvt_term::process_osc_seq () 3294rxvt_term::process_osc_seq ()
3708{ 3295{
3709 unicode_t ch, eh;
3710 int arg; 3296 int arg;
3711 3297
3712 ch = cmd_getc (); 3298 unicode_t ch = cmd_getc ();
3713 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3299 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3714 arg = arg * 10 + (ch - '0'); 3300 arg = arg * 10 + (ch - '0');
3715 3301
3716 if (ch == ';') 3302 if (ch == ';')
3717 { 3303 {
3304 unicode_t eh;
3718 char *s = get_to_st (eh); 3305 char *s = get_to_st (eh);
3719 3306
3720 if (s) 3307 if (s)
3721 { 3308 {
3722 process_xterm_seq (arg, s, eh); 3309 process_xterm_seq (arg, s, eh);
… …
3746 3333
3747/* 3334/*
3748 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3335 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3749 */ 3336 */
3750void 3337void
3751rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3338rxvt_term::process_xterm_seq (int op, char *str, char resp)
3752{ 3339{
3753 int color; 3340 int color;
3754 char *buf, *name; 3341 char *buf, *name;
3755 bool query = str[0] == '?' && !str[1]; 3342 bool query = str[0] == '?' && !str[1];
3756 int saveop = op; 3343 int saveop = op;
3757 3344
3758 dLocal (Display *, dpy); 3345 dLocal (Display *, dpy);
3759 3346
3760 assert (str != NULL); 3347 assert (str != NULL);
3761 3348
3762 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3349 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3763 return; 3350 return;
3764 3351
3765 switch (op) 3352 switch (op)
3766 { 3353 {
… …
3783 unsigned long bytes_after; 3370 unsigned long bytes_after;
3784 unsigned char *value = 0; 3371 unsigned char *value = 0;
3785 const char *str = ""; 3372 const char *str = "";
3786 3373
3787 if (prop 3374 if (prop
3788 && XGetWindowProperty (dpy, parent[0], 3375 && XGetWindowProperty (dpy, parent,
3789 prop, 0, 1<<16, 0, AnyPropertyType, 3376 prop, 0, 1<<16, 0, AnyPropertyType,
3790 &actual_type, &actual_format, 3377 &actual_type, &actual_format,
3791 &nitems, &bytes_after, &value) == Success 3378 &nitems, &bytes_after, &value) == Success
3792 && actual_type != None 3379 && actual_type != None
3793 && actual_format == 8) 3380 && actual_format == 8)
… …
3797 3384
3798 XFree (value); 3385 XFree (value);
3799 } 3386 }
3800 else 3387 else
3801 { 3388 {
3802 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3389 char *eq = strchr (str, '=');
3803 3390
3804 if (eq) 3391 if (eq)
3805 { 3392 {
3806 *eq = 0; 3393 *eq = 0;
3807 set_utf8_property (display->atom (str), eq + 1); 3394 set_utf8_property (display->atom (str), eq + 1);
3808 } 3395 }
3809 else 3396 else
3810 XDeleteProperty (dpy, parent[0], 3397 XDeleteProperty (dpy, parent,
3811 display->atom (str)); 3398 display->atom (str));
3812 } 3399 }
3813 break; 3400 break;
3814 3401
3815 case XTerm_Color: 3402 case XTerm_Color:
… …
3828 *buf++ = '\0'; 3415 *buf++ = '\0';
3829 3416
3830 process_color_seq (op, color, name, resp); 3417 process_color_seq (op, color, name, resp);
3831 } 3418 }
3832 break; 3419 break;
3420 case Rxvt_restoreFG:
3833 case XTerm_Color00: 3421 case XTerm_Color00:
3834 process_color_seq (op, Color_fg, str, resp); 3422 process_color_seq (op, Color_fg, str, resp);
3835 break; 3423 break;
3424 case Rxvt_restoreBG:
3836 case XTerm_Color01: 3425 case XTerm_Color01:
3837 process_color_seq (op, Color_bg, str, resp); 3426 process_color_seq (op, Color_bg, str, resp);
3838 break; 3427 break;
3839#ifndef NO_CURSORCOLOR 3428#ifndef NO_CURSORCOLOR
3840 case XTerm_Color_cursor: 3429 case XTerm_Color_cursor:
… …
3845 process_color_seq (op, Color_pointer_fg, str, resp); 3434 process_color_seq (op, Color_pointer_fg, str, resp);
3846 break; 3435 break;
3847 case XTerm_Color_pointer_bg: 3436 case XTerm_Color_pointer_bg:
3848 process_color_seq (op, Color_pointer_bg, str, resp); 3437 process_color_seq (op, Color_pointer_bg, str, resp);
3849 break; 3438 break;
3439#ifdef OPTION_HC
3440 case XTerm_Color_HC:
3441 process_color_seq (op, Color_HC, str, resp);
3442 break;
3443 case XTerm_Color_HTC:
3444 process_color_seq (op, Color_HTC, str, resp);
3445 break;
3446#endif
3850#ifndef NO_BOLD_UNDERLINE_REVERSE 3447#ifndef NO_BOLD_UNDERLINE_REVERSE
3851 case XTerm_Color_RV:
3852 process_color_seq (op, Color_RV, str, resp);
3853 break;
3854 case Rxvt_Color_BD:
3855 case URxvt_Color_BD: 3448 case URxvt_Color_BD:
3856 process_color_seq (op, Color_BD, str, resp); 3449 process_color_seq (op, Color_BD, str, resp);
3857 break; 3450 break;
3858 case Rxvt_Color_UL:
3859 case URxvt_Color_UL: 3451 case URxvt_Color_UL:
3860 process_color_seq (op, Color_UL, str, resp); 3452 process_color_seq (op, Color_UL, str, resp);
3861 break; 3453 break;
3862 case URxvt_Color_IT: 3454 case URxvt_Color_IT:
3863 process_color_seq (op, Color_IT, str, resp); 3455 process_color_seq (op, Color_IT, str, resp);
3864 break; 3456 break;
3865#endif 3457#endif
3866#if TRANSPARENT && TINTING 3458 case URxvt_Color_border:
3459 process_color_seq (op, Color_border, str, resp);
3460 break;
3461
3462#if BG_IMAGE_FROM_ROOT
3867 case URxvt_Color_tint: 3463 case URxvt_Color_tint:
3868 process_color_seq (op, Color_tint, str, resp); 3464 process_color_seq (op, Color_tint, str, resp);
3465 {
3466 bool changed = false;
3869 3467
3870 check_our_parents (); 3468 if (ISSET_PIXCOLOR (Color_tint))
3469 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3871 3470
3872 if (am_transparent) 3471 if (changed)
3873 want_full_refresh = want_refresh = 1; 3472 update_background ();
3473 }
3874 3474
3875 break; 3475 break;
3876#endif 3476#endif
3877 3477
3478#if BG_IMAGE_FROM_FILE
3878 case Rxvt_Pixmap: 3479 case Rxvt_Pixmap:
3480 if (!strcmp (str, "?"))
3879 { 3481 {
3482 char str[256];
3483 int h_scale = fimage.h_scale;
3484 int v_scale = fimage.v_scale;
3485 int h_align = fimage.h_align;
3486 int v_align = fimage.v_align;
3487
3488 sprintf (str, "[%dx%d+%d+%d]",
3489 h_scale, v_scale,
3490 h_align, v_align);
3491 process_xterm_seq (XTerm_title, str, CHAR_ST);
3492 }
3493 else
3494 {
3495 bool changed = false;
3496
3880 if (*str != ';') 3497 if (*str != ';')
3881 { 3498 {
3882#if XPM_BACKGROUND 3499 try
3883 scale_pixmap (""); /* reset to default scaling */ 3500 {
3884 set_bgPixmap (str); /* change pixmap */ 3501 fimage.set_file_geometry (this, str);
3885 scr_touch (true); 3502 changed = true;
3886#endif 3503 }
3504 catch (const class rxvt_failure_exception &e)
3505 {
3506 }
3887 } 3507 }
3888 3508 else
3889 int changed = 0;
3890
3891 while ((str = strchr (str, ';')) != NULL)
3892 { 3509 {
3893 str++; 3510 str++;
3894#if XPM_BACKGROUND 3511 if (fimage.set_geometry (str, true))
3895 changed += scale_pixmap (str); 3512 changed = true;
3896#endif
3897 } 3513 }
3898 3514
3899 if (changed) 3515 if (changed)
3900 { 3516 {
3901#ifdef XPM_BACKGROUND 3517 if (bg_window_position_sensitive ())
3902 resize_pixmap (); 3518 {
3903 scr_touch (true); 3519 int x, y;
3904#endif 3520 get_window_origin (x, y);
3521 parent_x = x;
3522 parent_y = y;
3523 }
3524 update_background ();
3905 } 3525 }
3906 } 3526 }
3907 break; 3527 break;
3908 3528#endif
3909 case Rxvt_restoreFG:
3910 set_window_color (Color_fg, str);
3911 break;
3912 case Rxvt_restoreBG:
3913 set_window_color (Color_bg, str);
3914 break;
3915 3529
3916 case XTerm_logfile: 3530 case XTerm_logfile:
3917 // TODO, when secure mode? 3531 // TODO, when secure mode?
3918 break; 3532 break;
3919 3533
… …
3937 case URxvt_italicFont: 3551 case URxvt_italicFont:
3938 case URxvt_boldItalicFont: 3552 case URxvt_boldItalicFont:
3939#endif 3553#endif
3940 if (query) 3554 if (query)
3941 tt_printf ("\33]%d;%-.250s%c", saveop, 3555 tt_printf ("\33]%d;%-.250s%c", saveop,
3942 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3556 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3943 ? fontset[op - URxvt_font]->fontdesc : "", 3557 ? fontset[op - URxvt_font]->fontdesc : "",
3944 resp); 3558 resp);
3945 else 3559 else
3946 { 3560 {
3947 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3561 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3961 break; 3575 break;
3962 3576
3963#if !ENABLE_MINIMAL 3577#if !ENABLE_MINIMAL
3964 case URxvt_locale: 3578 case URxvt_locale:
3965 if (query) 3579 if (query)
3966 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3580 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3967 else 3581 else
3968 { 3582 {
3969 set_locale (str); 3583 set_locale (str);
3970 pty->set_utf8_mode (enc_utf8); 3584 pty->set_utf8_mode (enc_utf8);
3971 init_xlocale (); 3585 init_xlocale ();
… …
3986 break; 3600 break;
3987#endif 3601#endif
3988 3602
3989#if ENABLE_PERL 3603#if ENABLE_PERL
3990 case URxvt_perl: 3604 case URxvt_perl:
3991 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3605 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3992 ; // no responses yet
3993 break; 3606 break;
3994#endif 3607#endif
3995 } 3608 }
3996} 3609}
3997/*----------------------------------------------------------------------*/ 3610/*----------------------------------------------------------------------*/
… …
4004 * 's' = save 3617 * 's' = save
4005 * 'r' = restore 3618 * 'r' = restore
4006 * 't' = toggle 3619 * 't' = toggle
4007 * so no need for fancy checking 3620 * so no need for fancy checking
4008 */ 3621 */
4009int 3622int ecb_cold
4010rxvt_term::privcases (int mode, unsigned long bit) 3623rxvt_term::privcases (int mode, unsigned long bit)
4011{ 3624{
4012 int state; 3625 int state;
4013 3626
4014 if (mode == 's') 3627 if (mode == 's')
4015 { 3628 {
4016 SavedModes |= (priv_modes & bit); 3629 if (priv_modes & bit)
3630 SavedModes |= bit;
3631 else
3632 SavedModes &= ~bit;
4017 return -1; 3633 return -1;
4018 } 3634 }
4019 else 3635 else
4020 { 3636 {
4021 if (mode == 'r') 3637 if (mode == 'r')
4022 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3638 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4023 else 3639 else
4024 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3640 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4025 PrivMode (state, bit); 3641
3642 if (state)
3643 priv_modes |= bit;
3644 else
3645 priv_modes &= ~bit;
4026 } 3646 }
4027 3647
4028 return state; 3648 return state;
4029} 3649}
4030 3650
4031/* we're not using priv _yet_ */ 3651/* we're not using priv _yet_ */
4032void 3652void
4033rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3653rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4034{ 3654{
4035 unsigned int i, j; 3655 unsigned int i, j;
4036 int state; 3656 int state;
4037 3657
4038 static const struct 3658 static const struct
4039 { 3659 {
4040 const int argval; 3660 const int argval;
4041 const unsigned long bit; 3661 const unsigned long bit;
4042 }
4043
4044 argtopriv[] = { 3662 } argtopriv[] = {
4045 { 1, PrivMode_aplCUR }, 3663 { 1, PrivMode_aplCUR }, // DECCKM
4046 { 2, PrivMode_vt52 }, 3664 { 2, PrivMode_vt52 }, // DECANM
4047 { 3, PrivMode_132 }, 3665 { 3, PrivMode_132 }, // DECCOLM
4048 { 4, PrivMode_smoothScroll }, 3666 { 4, PrivMode_smoothScroll }, // DECSCLM
4049 { 5, PrivMode_rVideo }, 3667 { 5, PrivMode_rVideo }, // DECSCNM
4050 { 6, PrivMode_relOrigin }, 3668 { 6, PrivMode_relOrigin }, // DECOM
4051 { 7, PrivMode_Autowrap }, 3669 { 7, PrivMode_Autowrap }, // DECAWM
4052 // 8, bi-directional support mode 3670 // 8, auto-repeat keys // DECARM
4053 { 9, PrivMode_MouseX10 }, 3671 { 9, PrivMode_MouseX10 },
4054 // 18, 19 printing-related 3672 // 18 end FF to printer after print screen
3673 // 19 Print screen prints full screen/scroll region
4055 { 25, PrivMode_VisibleCursor }, 3674 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4056#ifdef scrollBar_esc 3675#ifdef scrollBar_esc
4057 { scrollBar_esc, PrivMode_scrollBar }, 3676 { scrollBar_esc, PrivMode_scrollBar },
4058#endif 3677#endif
4059 { 35, PrivMode_ShiftKeys }, // rxvt extension 3678 { 35, PrivMode_ShiftKeys }, // rxvt extension
3679 // 38, tektronix mode // DECTEK
4060 { 40, PrivMode_132OK }, 3680 { 40, PrivMode_132OK },
4061 // 41 xterm more fixes NYI 3681 // 41 xterm more fixes NYI
4062 // 45 margin bell NYI 3682 // 45 margin bell NYI
4063 // 46 start logging 3683 // 46 start logging
4064 { 47, PrivMode_Screen }, 3684 { 47, PrivMode_Screen },
4065 { 66, PrivMode_aplKP }, 3685 { 66, PrivMode_aplKP }, // DECNKM
4066#ifndef NO_BACKSPACE_KEY 3686#ifndef NO_BACKSPACE_KEY
4067 { 67, PrivMode_BackSpace }, 3687 { 67, PrivMode_BackSpace }, // DECBKM
4068#endif 3688#endif
4069 { 1000, PrivMode_MouseX11 }, 3689 { 1000, PrivMode_MouseX11 },
4070 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3690 { 1002, PrivMode_MouseBtnEvent },
4071 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3691 { 1003, PrivMode_MouseAnyEvent },
4072 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3692#if ENABLE_FRILLS
3693 { 1005, PrivMode_ExtModeMouse },
3694#endif
4073 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3695 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4074 { 1011, PrivMode_Keypress }, // rxvt extension 3696 { 1011, PrivMode_Keypress }, // rxvt extension
3697#if ENABLE_FRILLS
3698 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3699#endif
4075 // 1035 enable modifiers for alt, numlock NYI 3700 // 1035 enable modifiers for alt, numlock NYI
4076 // 1036 send ESC for meta keys NYI 3701 // 1036 send ESC for meta keys NYI
4077 // 1037 send DEL for keypad delete NYI 3702 // 1037 send DEL for keypad delete NYI
4078 { 1047, PrivMode_Screen }, 3703 { 1047, PrivMode_Screen },
4079 // 1048 save and restore cursor 3704 // 1048 save and restore cursor, implemented in code
4080 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3705 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4081 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3706 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3707 { 2004, PrivMode_BracketPaste },
4082 }; 3708 };
4083 3709
4084 if (nargs == 0) 3710 if (nargs == 0)
4085 return; 3711 return;
4086 3712
… …
4093 for (i = 0; i < nargs; i++) 3719 for (i = 0; i < nargs; i++)
4094 { 3720 {
4095 state = -1; 3721 state = -1;
4096 3722
4097 /* basic handling */ 3723 /* basic handling */
4098 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3724 for (j = 0; j < ecb_array_length (argtopriv); j++)
4099 if (argtopriv[j].argval == arg[i]) 3725 if (argtopriv[j].argval == arg[i])
4100 { 3726 {
4101 state = privcases (mode, argtopriv[j].bit); 3727 state = privcases (mode, argtopriv[j].bit);
4102 break; 3728 break;
4103 } 3729 }
… …
4111 3737
4112 scr_touch (true); 3738 scr_touch (true);
4113 break; 3739 break;
4114#endif 3740#endif
4115 case 1048: /* alternative cursor save */ 3741 case 1048: /* alternative cursor save */
4116 case 1049:
4117 if (OPTION (Opt_secondaryScreen)) 3742 if (option (Opt_secondaryScreen))
4118 if (mode == 0) 3743 if (mode == 0)
4119 scr_cursor (RESTORE); 3744 scr_cursor (RESTORE);
4120 else if (mode == 1) 3745 else if (mode == 1)
4121 scr_cursor (SAVE); 3746 scr_cursor (SAVE);
4122 break; 3747 break;
… …
4130 case 2: /* VT52 mode */ 3755 case 2: /* VT52 mode */
4131 /* oddball mode. should be set regardless of set/reset 3756 /* oddball mode. should be set regardless of set/reset
4132 * parameter. Return from VT52 mode with an ESC < from 3757 * parameter. Return from VT52 mode with an ESC < from
4133 * within VT52 mode 3758 * within VT52 mode
4134 */ 3759 */
4135 PrivMode (1, PrivMode_vt52); 3760 priv_modes |= PrivMode_vt52;
4136 break; 3761 break;
4137 case 3: /* 80/132 */ 3762 case 3: /* 80/132 */
4138 if (priv_modes & PrivMode_132OK) 3763 if (priv_modes & PrivMode_132OK)
4139 set_widthheight (((state ? 132 : 80) * fwidth), height); 3764 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4140 break; 3765 break;
4141 case 4: /* smooth scrolling */ 3766 case 4: /* smooth scrolling */
4142 set_option (Opt_jumpScroll, !state); 3767 set_option (Opt_jumpScroll, !state);
4143 break; 3768 break;
4144 case 5: /* reverse video */ 3769 case 5: /* reverse video */
… …
4151 scr_autowrap (state); 3776 scr_autowrap (state);
4152 break; 3777 break;
4153 /* case 8: - auto repeat, can't do on a per window basis */ 3778 /* case 8: - auto repeat, can't do on a per window basis */
4154 case 9: /* X10 mouse reporting */ 3779 case 9: /* X10 mouse reporting */
4155 if (state) /* orthogonal */ 3780 if (state) /* orthogonal */
4156 priv_modes &= ~PrivMode_MouseX11; 3781 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4157 break; 3782 break;
4158#ifdef scrollBar_esc 3783#ifdef scrollBar_esc
4159 case scrollBar_esc: 3784 case scrollBar_esc:
4160 if (scrollbar_mapping (state)) 3785 scrollBar.map (state);
4161 {
4162 resize_all_windows (0, 0, 0); 3786 resize_all_windows (0, 0, 0);
4163 scr_touch (true); 3787 scr_touch (true);
4164 }
4165 break; 3788 break;
4166#endif 3789#endif
4167 case 25: /* visible/invisible cursor */ 3790 case 25: /* visible/invisible cursor */
4168 scr_cursor_visible (state); 3791 scr_cursor_visible (state);
4169 break; 3792 break;
… …
4174 break; 3797 break;
4175 /* case 66: - application key pad */ 3798 /* case 66: - application key pad */
4176 /* case 67: - backspace key */ 3799 /* case 67: - backspace key */
4177 case 1000: /* X11 mouse reporting */ 3800 case 1000: /* X11 mouse reporting */
4178 if (state) /* orthogonal */ 3801 if (state) /* orthogonal */
4179 priv_modes &= ~PrivMode_MouseX10; 3802 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4180 break; 3803 break;
4181#if 0
4182 case 1001: 3804 case 1002:
4183 break; /* X11 mouse highlighting */ 3805 case 1003:
4184#endif 3806 if (state)
3807 {
3808 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3809 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3810 mouse_row = mouse_col = 0;
3811 vt_emask_mouse = PointerMotionMask;
3812 }
3813 else
3814 vt_emask_mouse = NoEventMask;
3815
3816 vt_select_input ();
3817 break;
4185 case 1010: /* scroll to bottom on TTY output inhibit */ 3818 case 1010: /* scroll to bottom on TTY output inhibit */
4186 set_option (Opt_scrollTtyOutput, !state); 3819 set_option (Opt_scrollTtyOutput, !state);
4187 break; 3820 break;
4188 case 1011: /* scroll to bottom on key press */ 3821 case 1011: /* scroll to bottom on key press */
4189 set_option (Opt_scrollTtyKeypress, state); 3822 set_option (Opt_scrollTtyKeypress, state);
4190 break; 3823 break;
4191 case 1047: /* secondary screen w/ clearing last */ 3824 case 1047: /* secondary screen w/ clearing last */
4192 if (OPTION (Opt_secondaryScreen)) 3825 if (option (Opt_secondaryScreen))
4193 if (current_screen != PRIMARY) 3826 if (!state)
4194 scr_erase_screen (2); 3827 scr_erase_screen (2);
3828
4195 scr_change_screen (state); 3829 scr_change_screen (state);
4196 break; 3830 break;
4197 case 1049: /* secondary screen w/ clearing first */ 3831 case 1049: /* secondary screen w/ clearing first */
3832 if (option (Opt_secondaryScreen))
3833 if (state)
3834 scr_cursor (SAVE);
3835
4198 scr_change_screen (state); 3836 scr_change_screen (state);
3837
4199 if (OPTION (Opt_secondaryScreen)) 3838 if (option (Opt_secondaryScreen))
4200 if (current_screen != PRIMARY) 3839 if (state)
4201 scr_erase_screen (2); 3840 scr_erase_screen (2);
3841 else
3842 scr_cursor (RESTORE);
4202 break; 3843 break;
4203 default: 3844 default:
4204 break; 3845 break;
4205 } 3846 }
4206 } 3847 }
4207} 3848}
4208/*}}} */ 3849/*}}} */
4209 3850
4210/*{{{ process sgr sequences */ 3851/*{{{ process sgr sequences */
4211void 3852void ecb_hot
4212rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3853rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4213{ 3854{
4214 unsigned int i; 3855 unsigned int i;
4215 short rendset; 3856 short rendset;
4216 int rendstyle; 3857 int rendstyle;
… …
4357 break; 3998 break;
4358#endif 3999#endif
4359 } 4000 }
4360 } 4001 }
4361} 4002}
4362/*}}} */
4363 4003
4364/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4365void 4004void
4366rxvt_term::process_graphics () 4005rxvt_term::set_cursor_style (int style)
4367{ 4006{
4368 unicode_t ch, cmd = cmd_getc (); 4007 if (!IN_RANGE_INC (style, 0, 4))
4369
4370 if (cmd == 'Q')
4371 { /* query graphics */
4372 tt_printf ("\033G0\012"); /* no graphics */
4373 return; 4008 return;
4374 } 4009
4375 /* swallow other graphics sequences until terminating ':' */ 4010 set_option (Opt_cursorUnderline, style >= 3);
4376 do 4011
4377 ch = cmd_getc (); 4012#ifdef CURSOR_BLINK
4378 while (ch != ':'); 4013 set_option (Opt_cursorBlink, !style || (style & 1));
4014 cursor_blink_reset ();
4015#endif
4016
4017 want_refresh = 1;
4379} 4018}
4380/*}}} */ 4019/*}}} */
4381 4020
4382/* ------------------------------------------------------------------------- */ 4021/* ------------------------------------------------------------------------- */
4383 4022
… …
4399 4038
4400/* ---------------------------------------------------------------------- */ 4039/* ---------------------------------------------------------------------- */
4401/* Write data to the pty as typed by the user, pasted with the mouse, 4040/* Write data to the pty as typed by the user, pasted with the mouse,
4402 * or generated by us in response to a query ESC sequence. 4041 * or generated by us in response to a query ESC sequence.
4403 */ 4042 */
4404const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4043static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4405 4044
4406void 4045void
4407rxvt_term::tt_write (const char *data, unsigned int len) 4046rxvt_term::tt_write (const char *data, unsigned int len)
4408{ 4047{
4409 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4048 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4414 4053
4415 if (v_buflen == 0) 4054 if (v_buflen == 0)
4416 { 4055 {
4417 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4056 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4418 4057
4058 max_it (written, 0);
4059
4419 if ((unsigned int)written == len) 4060 if (written == len)
4420 return; 4061 return;
4421 4062
4422 data += written; 4063 data += written;
4423 len -= written; 4064 len -= written;
4424 } 4065 }
4425 4066
4426 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4067 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4427 4068
4428 memcpy (v_buffer + v_buflen, data, len); 4069 memcpy (v_buffer + v_buflen, data, len);
4429 v_buflen += len; 4070 v_buflen += len;
4430 4071
4431 pty_ev.set (EVENT_READ | EVENT_WRITE); 4072 pty_ev.set (ev::READ | ev::WRITE);
4432} 4073}
4433 4074
4434void rxvt_term::pty_write () 4075void rxvt_term::pty_write ()
4435{ 4076{
4436 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4077 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4441 4082
4442 if (v_buflen == 0) 4083 if (v_buflen == 0)
4443 { 4084 {
4444 free (v_buffer); 4085 free (v_buffer);
4445 v_buffer = 0; 4086 v_buffer = 0;
4446 v_buflen = 0;
4447 4087
4448 pty_ev.set (EVENT_READ); 4088 pty_ev.set (ev::READ);
4449 return; 4089 return;
4450 } 4090 }
4451 4091
4452 memmove (v_buffer, v_buffer + written, v_buflen); 4092 memmove (v_buffer, v_buffer + written, v_buflen);
4453 } 4093 }
4454 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4094 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4455 pty_ev.set (EVENT_READ); 4095 pty_ev.set (ev::READ);
4456} 4096}
4457 4097
4458/*----------------------- end-of-file (C source) -----------------------*/ 4098/*----------------------- end-of-file (C source) -----------------------*/
4459 4099

Diff Legend

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