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

Diff Legend

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