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.359 by ayin, Mon Oct 15 14:56:06 2007 UTC vs.
Revision 1.538 by sf-exg, Thu Apr 11 08:13:43 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)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
148 149
149 text_t t = l.t[x]; 150 text_t t = l.t[x];
150 151
151 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
152 { 153 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
155 break; 156 break;
156 } 157 }
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
183 181
184 alloc = 0; 182 alloc = 0;
185 chr = &ch2; 183 chr = &ch2;
186 len = 1; 184 len = 1;
187 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 189
189 char attr[80]; // plenty 190 char attr[80]; // plenty
190 191
191 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",
192 (int)r, 193 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
202 210
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
205 212
206 if (y >= 0) 213 if (y >= 0)
207 { 214 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 216 x = 0;
210 } 217 }
211 218
212 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);
213 222
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 224
216 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
217 { 226 {
218 char buf[9]; 227 char buf[9];
219 228
220 ch = *chr++; 229 ch = *chr++;
221 230
222 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 234# if !UNICODE_3
226 if (ch >= 0x10000) 235 if (ch >= 0x10000)
227 ch = 0xfffd; 236 ch = 0xfffd;
228# endif 237# endif
229 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
230 239
231 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 242 }
234 243
235// { 244// {
236// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
239// } 248// }
240 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
241 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 253 free (fname[i]);
254 }
244 255
245# if ENABLE_COMBINING 256# if ENABLE_COMBINING
246 if (alloc) 257 if (alloc)
247 delete [] alloc; 258 delete [] alloc;
248# endif 259# endif
249} 260}
250#endif 261#endif
251 262
252void 263void ecb_cold
253rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
254{ 265{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 267
260 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
261 { 269 {
262 char mb[16]; 270 char mb[MB_LEN_MAX];
263 int len; 271 int len;
264 272
265 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
268 else 276 else
269 { 277 {
270 mb[0] = ch[0]; 278 mb[0] = ch;
271 len = 1; 279 len = 1;
272 } 280 }
273 281
274 if (len > 0) 282 if (len > 0)
275 tt_write (mb, len); 283 tt_write (mb, len);
… …
278 } 286 }
279 287
280 iso14755buf = 0; 288 iso14755buf = 0;
281} 289}
282 290
283int 291static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
285{ 293{
286 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
289 { 297 {
290 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
291 299
… …
297 305
298 return -1; 306 return -1;
299} 307}
300#endif 308#endif
301 309
302void 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
303rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
304{ 407{
305 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 409 KeySym keysym;
308 int valid_keysym; 410 int valid_keysym;
309 char kbuf[KBUFSZ]; 411 char kbuf[KBUFSZ];
310 412
311#if ISO_14755 413#if ISO_14755
… …
321 */ 423 */
322 shft = ev.state & ShiftMask; 424 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
325 427
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 428 kbuf[0] = 0;
333 429
334#ifdef USE_XIM 430#if USE_XIM
335 if (Input_Context) 431 if (Input_Context)
336 { 432 {
337 Status status_return; 433 Status status_return;
338 434
339#if 0 435#if 0
… …
410#ifdef PAGING_CONTEXT_LINES 506#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 507 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 508#else
413 lnsppg = nrow * 4 / 5; 509 lnsppg = nrow * 4 / 5;
414#endif 510#endif
511 max_it (lnsppg, 1);
512
415 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
416 { 514 {
417 scr_page (UP, lnsppg); 515 scr_page (lnsppg);
418 return; 516 return;
419 } 517 }
420 else if (keysym == XK_Next) 518 else if (keysym == XK_Next)
421 { 519 {
422 scr_page (DN, lnsppg); 520 scr_page (-lnsppg);
423 return; 521 return;
424 } 522 }
425 } 523 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 524#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 525 if (IS_SCROLL_MOD)
428 { 526 {
429 if (keysym == XK_Up) 527 if (keysym == XK_Up)
430 { 528 {
431 scr_page (UP, 1); 529 scr_page (1);
432 return; 530 return;
433 } 531 }
434 else if (keysym == XK_Down) 532 else if (keysym == XK_Down)
435 { 533 {
436 scr_page (DN, 1); 534 scr_page (-1);
437 return; 535 return;
438 } 536 }
439 } 537 }
440#endif 538#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 539#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 540 if (IS_SCROLL_MOD)
443 { 541 {
444 if (keysym == XK_Home) 542 if (keysym == XK_Home)
445 { 543 {
446 scr_move_to (0, 1); 544 scr_changeview (top_row);
447 return; 545 return;
448 } 546 }
449 else if (keysym == XK_End) 547 else if (keysym == XK_End)
450 { 548 {
451 scr_move_to (1, 1); 549 scr_changeview (0);
452 return; 550 return;
453 } 551 }
454 } 552 }
455#endif 553#endif
456 } 554 }
… …
472 selection_request (ev.time); 570 selection_request (ev.time);
473 return; 571 return;
474#if TODO 572#if TODO
475 /* rxvt extras */ 573 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 575 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 577 return;
482#endif 578#endif
483 } 579 }
484 } 580 }
485 } 581 }
486 582
487#if ENABLE_FRILLS || ISO_14755 583#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 584 // ISO 14755 support
489 if (shft && ctrl) 585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 586 {
491 int hv; 587 int hv;
492 588
493 if (iso14755buf & ISO_14755_51 589 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 590 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 620 scr_overlay_off ();
525# endif 621# endif
526 iso14755buf = 0; 622 iso14755buf = 0;
527 } 623 }
528 } 624 }
625 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 626 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 627 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 628 if (!(iso14755buf & ISO_14755_STARTED))
532 { 629 {
533 iso14755buf |= ISO_14755_STARTED; 630 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 631# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 632 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 643 }
547#endif 644#endif
548 645
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 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)
551 { 657 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 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, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
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 (kp)
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 (kp)
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
… …
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
… …
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 HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
1041 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 948 {
1043// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_touch (false); 950 scr_touch (false);
1045 } 951 }
1046#endif 952#endif
1047 953
1048 if (want_refresh) 954 if (want_refresh)
… …
1084 } 990 }
1085 while (row < end_row); 991 while (row < end_row);
1086 } 992 }
1087 993
1088 scr_refresh (); 994 scr_refresh ();
1089 scrollbar_show (1); 995 scrollBar.show (1);
1090#ifdef USE_XIM 996#if USE_XIM
1091 IMSendSpot (); 997 im_send_spot ();
1092#endif 998#endif
1093 } 999 }
1094 1000
1095 display->flush (); 1001 display->flush ();
1096} 1002}
1097 1003
1004/* checks whether a refresh is requested and starts the refresh timer */
1098void 1005void
1099rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::refresh_check ()
1100{ 1007{
1101 make_current (); 1008 if (want_refresh && !flush_ev.is_active ())
1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1010
1103 display->flush (); 1011 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1012}
1108 1013
1109void 1014void
1110rxvt_term::flush_cb (time_watcher &w) 1015rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1016{
1112 make_current (); 1017 make_current ();
1113 1018
1114 refresh_count = 0; 1019 refresh_count = 0;
1115 flush (); 1020 flush ();
1116} 1021}
1117 1022
1118#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1119void 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
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1041{
1122 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1043 want_refresh = 1;
1124 1044 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1045}
1127#endif 1046#endif
1128 1047
1129#ifdef TEXT_BLINK 1048#ifdef TEXT_BLINK
1130void 1049void
1131rxvt_term::text_blink_cb (time_watcher &w) 1050rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1051{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1052 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1053 {
1135 hidden_text = !hidden_text; 1054 hidden_text = !hidden_text;
1136 want_refresh = 1; 1055 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1056 refresh_check ();
1138 } 1057 }
1058 else
1059 w.stop ();
1139} 1060}
1140#endif 1061#endif
1141 1062
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1064void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1066{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1148 { 1069 {
1149 want_refresh = 1; 1070 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 refresh_check ();
1151 } 1072 }
1073 else
1074 w.stop ();
1152} 1075}
1153#endif 1076#endif
1154 1077
1155#ifdef SELECTION_SCROLLING 1078#ifdef SELECTION_SCROLLING
1156void 1079void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1081{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1082 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1083 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1084 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1085 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1086 refresh_check ();
1164 } 1087 }
1088 else
1089 w.stop ();
1165} 1090}
1166#endif 1091#endif
1167 1092
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1094void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1096{
1172 if (mouse_slip_wheel_speed == 0 1097 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1098 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1099 want_refresh = 1;
1180 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 ();
1181 } 1107 }
1182} 1108}
1183#endif 1109#endif
1184 1110
1185#if LINUX_YIELD_HACK 1111#if LINUX_YIELD_HACK
1186static struct event_handler 1112static struct event_handler
1187{ 1113{
1188 check_watcher yield_ev; 1114 ev::prepare yield_ev;
1189 1115
1190 void yield_cb (check_watcher &w) 1116 void yield_cb (ev::prepare &w, int revents)
1191 { 1117 {
1192 // this should really be sched_yield(), but the linux guys thought 1118 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1119 // that giving a process calling sched_yield () less cpu time than
1194 // 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
1195 // 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.
1196 1125
1197 struct timespec ts = { 0, 0 }; 1126 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1199 1128
1200 w.stop (); 1129 w.stop ();
1201 } 1130 }
1202 1131
… …
1205 { 1134 {
1206 } 1135 }
1207} event_handler; 1136} event_handler;
1208#endif 1137#endif
1209 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
1210bool 1172bool
1211rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1212{ 1174{
1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1214 1176
1215 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1216 { 1178
1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1218 n = 0;
1219 } 1180 {
1220 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1222 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1223 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1224 1186
1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1226 1188
1227 if (r > 0) 1189 if (r > 0)
1228 { 1190 {
1229 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1230 return true; 1192 return true;
… …
1246 1208
1247 return false; 1209 return false;
1248} 1210}
1249 1211
1250void 1212void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1213rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1214{
1253 make_current (); 1215 make_current ();
1254 1216
1255 if (revents & EVENT_READ) 1217 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1218 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1219 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1220 cmd_parse ();
1259 break;
1260 1221
1261 if (revents & EVENT_WRITE) 1222 if (revents & ev::WRITE)
1262 pty_write (); 1223 pty_write ();
1263}
1264 1224
1265void 1225 refresh_check ();
1226}
1227
1228void ecb_cold
1266rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1267{ 1230{
1268 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1269 recolour_cursor (); 1232 recolour_cursor ();
1270 1233
1271#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1235 hidden_pointer = 0;
1273 1236
1274 if (option (Opt_pointerBlank)) 1237 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1276#endif 1239#endif
1277} 1240}
1278 1241
1279#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1280void 1243void ecb_cold
1281rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1282{ 1245{
1283 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1284 return; 1247 return;
1285 1248
… …
1287 XFlush (dpy); 1250 XFlush (dpy);
1288 1251
1289 hidden_pointer = 1; 1252 hidden_pointer = 1;
1290} 1253}
1291 1254
1292void 1255void ecb_cold
1293rxvt_term::pointer_cb (time_watcher &w) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1257{
1295 make_current (); 1258 make_current ();
1296 1259
1297 pointer_blank (); 1260 pointer_blank ();
1298} 1261}
… …
1301void 1264void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1265rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1266{
1304 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1305 int x, y; 1268 int x, y;
1269 int code = 32;
1306 1270
1307 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1308 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
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 }
1309 1283
1310 if (MEvent.button == AnyButton) 1284 if (MEvent.button == AnyButton)
1311 button_number = 3; 1285 button_number = 3;
1312 else 1286 else
1313 { 1287 {
1314 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1315 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1316 if (button_number >= 3) 1290 if (button_number >= 3)
1317 button_number += (64 - 3); 1291 button_number += 64 - 3;
1318 } 1292 }
1319 1293
1320 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1321 { 1295 {
1322 /* 1296 /*
… …
1354 fputc ('A', stderr); 1328 fputc ('A', stderr);
1355 if (key_state & 32) 1329 if (key_state & 32)
1356 fputc ('2', stderr); 1330 fputc ('2', stderr);
1357 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1358 button_number, 1332 button_number,
1359 x + 1, 1333 x,
1360 y + 1); 1334 y);
1361#endif 1335#endif
1362 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
1363 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1364 (32 + button_number + key_state), 1351 code + button_number + key_state,
1365 (32 + x + 1), 1352 32 + x,
1366 (32 + y + 1)); 1353 32 + y);
1367} 1354}
1368 1355
1369/*{{{ process an X event */ 1356/*{{{ process an X event */
1370void 1357void ecb_hot
1371rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1372{ 1359{
1373 make_current (); 1360 make_current ();
1374 1361
1375 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1473 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1474 focus_out (); 1461 focus_out ();
1475 break; 1462 break;
1476 1463
1477 case ConfigureNotify: 1464 case ConfigureNotify:
1478 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1479 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1480 szHint.width, szHint.height); */
1481 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1482 { 1466 {
1483 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1484 ; 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 }
1485 1502
1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1487 { 1504 {
1488 seen_resize = 1; 1505 seen_resize = 1;
1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1490 } 1507 }
1491 else 1508 else
1492 { 1509 {
1493#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1494 if (bgPixmap.window_position_sensitive ()) 1511 if (moved)
1495 update_background (); 1512 update_background ();
1496#endif 1513#endif
1497 } 1514 }
1515
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499 } 1517 }
1500 break; 1518 break;
1501 1519
1502 case PropertyNotify: 1520 case PropertyNotify:
1503 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1504 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1505 && ev.xproperty.state == PropertyNewValue)
1506 selection_property (ev.xproperty.window, ev.xproperty.atom);
1507
1508 break; 1522 break;
1509 1523
1510 case SelectionClear: 1524 case SelectionClear:
1511 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1512 break;
1513
1514 case SelectionNotify:
1515 if (selection_wait == Sel_normal)
1516 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1517 break; 1526 break;
1518 1527
1519 case SelectionRequest: 1528 case SelectionRequest:
1520 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1521 break; 1530 break;
1522 1531
1523 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
1524 mapped = 1; 1544 mapped = 1;
1525#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1526 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1546 text_blink_ev.start ();
1527#endif 1547#endif
1528 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1529 break; 1549 break;
1530 1550
1531 case UnmapNotify: 1551 case UnmapNotify:
… …
1541 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1542 { 1562 {
1543 do 1563 do
1544 { 1564 {
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1547 } 1567 }
1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1549 1569
1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1551 1571
1552 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 { 1573 {
1554 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1555 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1556 } 1576 }
1577
1557 want_refresh = 1; 1578 want_refresh = 1;
1558 } 1579 }
1559 else 1580 else
1560 { 1581 {
1561 XEvent unused_event; 1582 XEvent unused_event;
… …
1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1584 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1564 ; 1585 ;
1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566 ; 1587 ;
1567 1588
1568 if (isScrollbarWindow (ev.xany.window)) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1569 { 1590 {
1570 scrollBar.setIdle (); 1591 scrollBar.state = SB_STATE_IDLE;
1571 scrollbar_show (0); 1592 scrollBar.show (0);
1572 } 1593 }
1573 } 1594 }
1574 break; 1595 break;
1575 1596
1576 case MotionNotify: 1597 case MotionNotify:
1577#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1578 if (hidden_pointer) 1599 if (hidden_pointer)
1579 pointer_unblank (); 1600 pointer_unblank ();
1580#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);
1581 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1605 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1582 break; 1606 break;
1583 1607
1584 if (ev.xany.window == vt) 1608 if (ev.xany.window == vt)
1585 { 1609 {
… …
1619 int dist; 1643 int dist;
1620 1644
1621 /* don't clobber the current delay if we are 1645 /* don't clobber the current delay if we are
1622 * already in the middle of scrolling. 1646 * already in the middle of scrolling.
1623 */ 1647 */
1624 if (!sel_scroll_ev.active) 1648 if (!sel_scroll_ev.is_active ())
1625 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1649 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1626 1650
1627 /* save the event params so we can highlight 1651 /* save the event params so we can highlight
1628 * the selection in the pending-scroll loop 1652 * the selection in the pending-scroll loop
1629 */ 1653 */
1630 selection_save_x = ev.xbutton.x; 1654 selection_save_x = ev.xbutton.x;
… …
1638 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1639 } 1663 }
1640 else 1664 else
1641 { 1665 {
1642 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1643 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1644 } 1668 }
1645 1669
1646 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1647 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1; 1672 + 1;
… …
1652 else 1676 else
1653 { 1677 {
1654 /* we are within the text window, so we 1678 /* we are within the text window, so we
1655 * shouldn't be scrolling 1679 * shouldn't be scrolling
1656 */ 1680 */
1657 if (sel_scroll_ev.active)
1658 sel_scroll_ev.stop(); 1681 sel_scroll_ev.stop();
1659 } 1682 }
1660#endif 1683#endif
1661#ifdef MOUSE_THRESHOLD 1684#ifdef MOUSE_THRESHOLD
1662 } 1685 }
1663#endif 1686#endif
1664 } 1687 }
1665 } 1688 }
1666 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1667 { 1690 {
1668 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1669 MotionNotify, &ev)) 1692 MotionNotify, &ev))
1670 ; 1693 ;
1671 1694
1672 XQueryPointer (dpy, scrollBar.win, 1695 XQueryPointer (dpy, scrollBar.win,
1673 &unused_root, &unused_child, 1696 &unused_root, &unused_child,
1674 &unused_root_x, &unused_root_y, 1697 &unused_root_x, &unused_root_y,
1675 &ev.xbutton.x, &ev.xbutton.y, 1698 &ev.xbutton.x, &ev.xbutton.y,
1676 &unused_mask); 1699 &unused_mask);
1677 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1700 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1678 scrollbar_size ()); 1701 scrollBar.size ());
1679 want_refresh = 1; 1702 want_refresh = 1;
1680 scrollbar_show (1); 1703 scrollBar.show (1);
1681 } 1704 }
1682 break; 1705 break;
1683 } 1706 }
1684 1707
1685#if defined(CURSOR_BLINK) 1708#if defined(CURSOR_BLINK)
1686 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1709 if (ev.type == KeyPress)
1687 { 1710 cursor_blink_reset ();
1688 if (hidden_cursor)
1689 {
1690 hidden_cursor = 0;
1691 want_refresh = 1;
1692 }
1693
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 }
1696#endif 1711#endif
1697 1712
1698#if defined(POINTER_BLANK) 1713#if defined(POINTER_BLANK)
1699 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1714 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 { 1715 {
… …
1706 1721
1707 if (ev.type == KeyPress && hidden_pointer == 0) 1722 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank (); 1723 pointer_blank ();
1709 } 1724 }
1710#endif 1725#endif
1711}
1712 1726
1713void 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
1714rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1715{ 1749{
1716 if (!focus) 1750 if (!focus)
1717 { 1751 {
1718 focus = 1; 1752 focus = 1;
1719 want_refresh = 1; 1753 want_refresh = 1;
1720 1754
1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722
1723#if USE_XIM 1755#if USE_XIM
1724 if (Input_Context != NULL) 1756 if (Input_Context != NULL)
1725 { 1757 {
1726 IMSetPosition (); 1758 im_set_position ();
1727 XSetICFocus (Input_Context); 1759 XSetICFocus (Input_Context);
1728 } 1760 }
1729#endif 1761#endif
1730#if CURSOR_BLINK 1762#if CURSOR_BLINK
1731 if (option (Opt_cursorBlink)) 1763 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1764 cursor_blink_ev.again ();
1733#endif 1765#endif
1734#if OFF_FOCUS_FADING 1766#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade]) 1767 if (rs[Rs_fade])
1736 { 1768 {
1737 pix_colors = pix_colors_focused; 1769 pix_colors = pix_colors_focused;
1738 scr_recolour (); 1770 scr_recolour ();
1739 } 1771 }
1740#endif 1772#endif
1741#if ENABLE_FRILLS 1773#if ENABLE_FRILLS
1742 if (option (Opt_urgentOnBell)) 1774 if (option (Opt_urgentOnBell))
1743 { 1775 set_urgency (0);
1744 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1745 {
1746 h->flags &= ~XUrgencyHint;
1747 XSetWMHints (dpy, parent[0], h);
1748 }
1749 }
1750#endif 1776#endif
1751 }
1752}
1753 1777
1754void 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1779 }
1780}
1781
1782void ecb_cold
1755rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1756{ 1784{
1757 if (focus) 1785 if (focus)
1758 { 1786 {
1759 focus = 0; 1787 focus = 0;
1760 want_refresh = 1; 1788 want_refresh = 1;
1761 1789
1762 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1790#if ENABLE_FRILLS
1763 1791 if (option (Opt_urgentOnBell))
1792 set_urgency (0);
1793#endif
1764#if ENABLE_FRILLS || ISO_14755 1794#if ENABLE_FRILLS || ISO_14755
1765 if (iso14755buf) 1795 if (iso14755buf)
1766 { 1796 {
1767 iso14755buf = 0; 1797 iso14755buf = 0;
1768# if ISO_14755 1798# if ISO_14755
… …
1775 XUnsetICFocus (Input_Context); 1805 XUnsetICFocus (Input_Context);
1776#endif 1806#endif
1777#if CURSOR_BLINK 1807#if CURSOR_BLINK
1778 if (option (Opt_cursorBlink)) 1808 if (option (Opt_cursorBlink))
1779 cursor_blink_ev.stop (); 1809 cursor_blink_ev.stop ();
1810
1780 hidden_cursor = 0; 1811 hidden_cursor = 0;
1781#endif 1812#endif
1782#if OFF_FOCUS_FADING 1813#if OFF_FOCUS_FADING
1783 if (rs[Rs_fade]) 1814 if (rs[Rs_fade])
1784 { 1815 {
1785 pix_colors = pix_colors_unfocused; 1816 pix_colors = pix_colors_unfocused;
1786 scr_recolour (); 1817 scr_recolour ();
1787 } 1818 }
1788#endif 1819#endif
1789 }
1790}
1791 1820
1792void 1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1822 }
1823}
1824
1825void ecb_cold
1793rxvt_term::update_fade_color (unsigned int idx) 1826rxvt_term::update_fade_color (unsigned int idx)
1794{ 1827{
1795#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1796 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1797 { 1830 {
… …
1800 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);
1801 } 1834 }
1802#endif 1835#endif
1803} 1836}
1804 1837
1805#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1806void 1839void ecb_hot
1807rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1808{ 1841{
1809 make_current (); 1842 make_current ();
1810 1843
1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1813 return; 1846 return;
1814 1847
1815# if ENABLE_TRANSPARENCY
1816 switch (ev.type) 1848 switch (ev.type)
1817 { 1849 {
1818 case PropertyNotify: 1850 case PropertyNotify:
1819 /* 1851 /*
1820 * 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,
1821 * 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.
1822 */ 1854 */
1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1825 { 1857 {
1826 bgPixmap.set_root_pixmap (); 1858#if BG_IMAGE_FROM_ROOT
1859 if (option (Opt_transparent))
1860 {
1861 rxvt_img::new_from_root (this)->replace (root_img);
1827 update_background (); 1862 update_background ();
1863 }
1864#endif
1865 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1828 } 1866 }
1867
1829 break; 1868 break;
1830 } 1869 }
1831# endif 1870
1871 refresh_check ();
1832} 1872}
1833#endif 1873#endif
1834 1874
1835void 1875void
1836rxvt_term::button_press (XButtonEvent &ev) 1876rxvt_term::button_press (XButtonEvent &ev)
… …
1867 /* save the xbutton state (for ButtonRelease) */ 1907 /* save the xbutton state (for ButtonRelease) */
1868 MEvent.state = ev.state; 1908 MEvent.state = ev.state;
1869#ifdef MOUSE_REPORT_DOUBLECLICK 1909#ifdef MOUSE_REPORT_DOUBLECLICK
1870 if (ev.button == MEvent.button && clickintime) 1910 if (ev.button == MEvent.button && clickintime)
1871 { 1911 {
1872 /* same button, within alloted time */ 1912 /* same button, within allowed time */
1873 MEvent.clicks++; 1913 MEvent.clicks++;
1874 1914
1875 if (MEvent.clicks > 1) 1915 if (MEvent.clicks > 1)
1876 { 1916 {
1877 /* only report double clicks */ 1917 /* only report double clicks */
… …
1891 mouse_report (ev); 1931 mouse_report (ev);
1892 } 1932 }
1893#else 1933#else
1894 MEvent.button = ev.button; 1934 MEvent.button = ev.button;
1895 mouse_report (ev); 1935 mouse_report (ev);
1896#endif /* MOUSE_REPORT_DOUBLECLICK */ 1936#endif /* MOUSE_REPORT_DOUBLECLICK */
1897 1937
1898 } 1938 }
1899 else 1939 else
1900 { 1940 {
1901 if (ev.button != MEvent.button) 1941 if (ev.button != MEvent.button)
… …
1949 } 1989 }
1950 1990
1951 /* 1991 /*
1952 * Scrollbar window processing of button press 1992 * Scrollbar window processing of button press
1953 */ 1993 */
1954 if (isScrollbarWindow (ev.window)) 1994 if (scrollBar.state && ev.window == scrollBar.win)
1955 { 1995 {
1956 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;
1957 /* 2004 /*
1958 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1959 * move up if mouse is above slider 2006 * move up if mouse is above slider
1960 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1961 * 2008 *
… …
1970 /* 2017 /*
1971 * Mouse report disabled scrollbar: 2018 * Mouse report disabled scrollbar:
1972 * arrow buttons - send up/down 2019 * arrow buttons - send up/down
1973 * click on scrollbar - send pageup/down 2020 * click on scrollbar - send pageup/down
1974 */ 2021 */
1975 if ((scrollBar.style == R_SB_NEXT 2022 if (direction == UP)
1976 && scrollbarnext_upButton (ev.y))
1977 || (scrollBar.style == R_SB_RXVT
1978 && scrollbarrxvt_upButton (ev.y)))
1979 tt_printf ("\033[A"); 2023 tt_printf ("\033[A");
1980 else if ((scrollBar.style == R_SB_NEXT 2024 else if (direction == DN)
1981 && scrollbarnext_dnButton (ev.y))
1982 || (scrollBar.style == R_SB_RXVT
1983 && scrollbarrxvt_dnButton (ev.y)))
1984 tt_printf ("\033[B"); 2025 tt_printf ("\033[B");
1985 else 2026 else
1986 switch (ev.button) 2027 switch (ev.button)
1987 { 2028 {
1988 case Button2: 2029 case Button2:
… …
1995 tt_printf ("\033[5~"); 2036 tt_printf ("\033[5~");
1996 break; 2037 break;
1997 } 2038 }
1998 } 2039 }
1999 else 2040 else
2000#endif /* NO_SCROLLBAR_REPORT */ 2041#endif /* NO_SCROLLBAR_REPORT */
2001
2002 {
2003 char upordown = 0;
2004
2005 if (scrollBar.style == R_SB_NEXT)
2006 { 2042 {
2007 if (scrollbarnext_upButton (ev.y)) 2043 if (direction != NO_DIR)
2008 upordown = -1; /* up */
2009 else if (scrollbarnext_dnButton (ev.y))
2010 upordown = 1; /* down */
2011 }
2012 else if (scrollBar.style == R_SB_RXVT)
2013 {
2014 if (scrollbarrxvt_upButton (ev.y))
2015 upordown = -1; /* up */
2016 else if (scrollbarrxvt_dnButton (ev.y))
2017 upordown = 1; /* down */
2018 }
2019 if (upordown)
2020 { 2044 {
2021#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2046 if (!cont_scroll_ev.is_active ())
2022 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2023#endif 2048#endif
2024 if (scr_page (upordown < 0 ? UP : DN, 1)) 2049 if (scr_page (direction, 1))
2025 { 2050 {
2026 if (upordown < 0) 2051 if (direction == UP)
2027 scrollBar.setUp (); 2052 scrollBar.state = SB_STATE_UP;
2028 else 2053 else
2029 scrollBar.setDn (); 2054 scrollBar.state = SB_STATE_DOWN;
2030 } 2055 }
2031 } 2056 }
2032 else 2057 else
2033 switch (ev.button) 2058 switch (ev.button)
2034 { 2059 {
2035 case Button2: 2060 case Button2:
2036 switch (scrollbar_align) 2061 switch (scrollBar.align)
2037 { 2062 {
2038 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2039 csrO = 0; 2064 csrO = 0;
2040 break; 2065 break;
2041 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2042 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2043 break; 2068 break;
2044 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2045 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2046 break; 2071 break;
2047 } 2072 }
2048 2073
2049 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2050 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2051 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2052 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2053 2078
2054 scrollBar.setMotion (); 2079 scrollBar.state = SB_STATE_MOTION;
2055 break; 2080 break;
2056 2081
2057 case Button1: 2082 case Button1:
2058 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2059 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2060 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2061 2086
2062 case Button3: 2087 case Button3:
2063 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2064 { 2089 {
2065 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2066# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2067 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2068# else 2093# else
2069 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2070# endif 2095# endif
2071 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2072# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2073 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2074# else 2099# else
2075 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2076# endif 2101# endif
2077 else 2102 else
2078 scrollBar.setMotion (); 2103 scrollBar.state = SB_STATE_MOTION;
2079 } 2104 }
2080 else 2105 else
2081 { 2106 {
2082 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2083 (nrow 2108 (nrow
2084 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2085 / scrollbar_size ())); 2110 / scrollBar.size ()));
2086 } 2111 }
2087 2112
2088 break; 2113 break;
2089 } 2114 }
2090 } 2115 }
… …
2100 2125
2101 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2102 if (!bypass_keystate) 2127 if (!bypass_keystate)
2103 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2104 2129
2105 if (scrollbar_isUpDn ()) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2106 { 2131 {
2107 scrollBar.setIdle (); 2132 scrollBar.state = SB_STATE_IDLE;
2108 scrollbar_show (0); 2133 scrollBar.show (0);
2109 } 2134 }
2110 2135
2111#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2112 if (sel_scroll_ev.active)
2113 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2114#endif 2138#endif
2115 2139
2116 if (ev.window == vt) 2140 if (ev.window == vt)
2117 { 2141 {
2118 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)))
… …
2142 mouse_report (ev); 2166 mouse_report (ev);
2143 } 2167 }
2144#else /* MOUSE_REPORT_DOUBLECLICK */ 2168#else /* MOUSE_REPORT_DOUBLECLICK */
2145 MEvent.button = AnyButton; 2169 MEvent.button = AnyButton;
2146 mouse_report (ev); 2170 mouse_report (ev);
2147#endif /* MOUSE_REPORT_DOUBLECLICK */ 2171#endif /* MOUSE_REPORT_DOUBLECLICK */
2148 return; 2172 return;
2149 } 2173 }
2150 2174
2151 /* 2175 /*
2152 * dumb hack to compensate for the failure of click-and-drag 2176 * dumb hack to compensate for the failure of click-and-drag
… …
2163 case Button3: 2187 case Button3:
2164 selection_make (ev.time); 2188 selection_make (ev.time);
2165 break; 2189 break;
2166 2190
2167 case Button2: 2191 case Button2:
2168 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?
2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2170 break; 2194 break;
2171 2195
2172#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2173 case Button4: 2197 case Button4:
2174 case Button5: 2198 case Button5:
2175 { 2199 {
2176 int i; 2200 int lines;
2177 page_dirn v; 2201 page_dirn dirn;
2178 2202
2179 v = ev.button == Button4 ? UP : DN; 2203 dirn = ev.button == Button4 ? UP : DN;
2180 2204
2181 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2182 i = 1; 2206 lines = 1;
2183 else if (option (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2184 i = nrow - 1; 2208 lines = nrow - 1;
2185 else 2209 else
2186 i = 5; 2210 lines = 5;
2187 2211
2188# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2189 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
2190 { 2214 {
2191 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += dirn;
2192 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2193 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2194 2218
2195 if (slip_wheel_ev.at < NOW) 2219 if (!slip_wheel_ev.is_active ())
2196 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2197
2198 slip_wheel_ev.start ();
2199 } 2221 }
2200 else 2222 else
2223# endif
2201 { 2224 {
2202# endif
2203 scr_page (v, i); 2225 scr_page (dirn, lines);
2204 scrollbar_show (1); 2226 scrollBar.show (1);
2205# ifdef MOUSE_SLIP_WHEELING
2206 } 2227 }
2207# endif
2208 } 2228 }
2209 break; 2229 break;
2210#endif 2230#endif
2211 } 2231 }
2212 } 2232 }
2213} 2233}
2214 2234
2215/*}}} */ 2235/*}}} */
2216 2236
2217bool 2237void ecb_hot
2218rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2219{ 2239{
2220 bool flag = false;
2221 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2222 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2223 2242
2224 for (;;) 2243 for (;;)
2225 { 2244 {
2226 if (ch == NOCHAR) 2245 if (ecb_unlikely (ch == NOCHAR))
2227 { 2246 {
2228 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2229 ch = next_char (); 2248 ch = next_char ();
2230 2249
2231 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2232 break; 2251 break;
2233 } 2252 }
2234 2253
2235 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2236 { 2255 {
2237 if (!seen_input) 2256 if (ecb_unlikely (!seen_input))
2238 { 2257 {
2239 seen_input = 1; 2258 seen_input = 1;
2240 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2241 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2242 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2255 wchar_t *str = buf; 2274 wchar_t *str = buf;
2256 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2257 2276
2258 for (;;) 2277 for (;;)
2259 { 2278 {
2260 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2261 break; 2280 break;
2262 2281
2263 *str++ = ch; 2282 *str++ = ch;
2264 2283
2265 if (ch == C0_LF || str >= eol) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2266 { 2285 {
2267 if (ch == C0_LF) 2286 if (ch == C0_LF)
2268 nlines++; 2287 nlines++;
2269 2288
2270 refresh_count++; 2289 refresh_count++;
2271 2290
2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2291 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2273 { 2292 {
2274 refresh_count = 0; 2293 refresh_count = 0;
2275 2294
2276 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2295 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2277 { 2296 {
2278 refreshnow = true; 2297 refreshnow = true;
2279 ch = NOCHAR; 2298 ch = NOCHAR;
2280 break; 2299 break;
2281 } 2300 }
… …
2319 * What the heck we'll cheat and only refresh less than every page-full. 2338 * What the heck we'll cheat and only refresh less than every page-full.
2320 * if skipScroll is enabled. 2339 * if skipScroll is enabled.
2321 */ 2340 */
2322 if (refreshnow) 2341 if (refreshnow)
2323 { 2342 {
2324 flag = true;
2325 scr_refresh (); 2343 scr_refresh ();
2326 want_refresh = 1; 2344 want_refresh = 1;
2327 } 2345 }
2328
2329 } 2346 }
2330 else 2347 else
2331 { 2348 {
2332 try 2349 try
2333 { 2350 {
… …
2341 } 2358 }
2342 2359
2343 ch = NOCHAR; 2360 ch = NOCHAR;
2344 } 2361 }
2345 } 2362 }
2346
2347 return flag;
2348} 2363}
2349 2364
2350// read the next character 2365// read the next character
2351wchar_t 2366wchar_t ecb_hot
2352rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2353{ 2368{
2354 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2355 { 2370 {
2356 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2357 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2358 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2359 2374
2360 wchar_t wc; 2375 wchar_t wc;
2361 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2362 2377
… …
2366 cmdbuf_ptr = cmdbuf_endp; 2381 cmdbuf_ptr = cmdbuf_endp;
2367 break; 2382 break;
2368 } 2383 }
2369 2384
2370 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2386 {
2387 mbstate.reset (); // reset now undefined conversion state
2388 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2389 // in which case we "erroneously" return the next byte which might be valid.
2371 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2391 }
2372 2392
2373 // assume wchar == unicode 2393 // assume wchar == unicode
2374 cmdbuf_ptr += len; 2394 cmdbuf_ptr += len;
2375 return wc & UNICODE_MASK; 2395 return wc & UNICODE_MASK;
2376 } 2396 }
2377 2397
2378 return NOCHAR; 2398 return NOCHAR;
2379} 2399}
2380 2400
2381// read the next octet 2401// read the next octet
2382uint32_t 2402uint32_t ecb_hot
2383rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () NOTHROW
2384{ 2404{
2385 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2386 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2387 : NOCHAR; 2407 : NOCHAR;
2388} 2408}
2389 2409
2390static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2391 2411
2392/* rxvt_cmd_getc () - Return next input character */ 2412wchar_t ecb_hot
2393/*
2394 * Return the next input character after first passing any keyboard input
2395 * to the command.
2396 */
2397wchar_t
2398rxvt_term::cmd_getc () THROW ((class out_of_input)) 2413rxvt_term::cmd_getc () THROW ((class out_of_input))
2399{ 2414{
2400 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2401 2416
2402 if (c == NOCHAR) 2417 if (c == NOCHAR)
2403 throw out_of_input; 2418 throw out_of_input;
2404 2419
2405 return c; 2420 return c;
2406} 2421}
2407 2422
2408uint32_t 2423uint32_t ecb_hot
2409rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 () THROW ((class out_of_input))
2410{ 2425{
2411 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2412 2427
2413 if (c == NOCHAR) 2428 if (c == NOCHAR)
… …
2417} 2432}
2418 2433
2419/*{{{ print pipe */ 2434/*{{{ print pipe */
2420/*----------------------------------------------------------------------*/ 2435/*----------------------------------------------------------------------*/
2421#ifdef PRINTPIPE 2436#ifdef PRINTPIPE
2422FILE * 2437FILE * ecb_cold
2423rxvt_term::popen_printer () 2438rxvt_term::popen_printer ()
2424{ 2439{
2425 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2440 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2426 2441
2427 if (stream == NULL) 2442 if (stream == NULL)
2428 rxvt_warn ("can't open printer pipe, not printing.\n"); 2443 rxvt_warn ("can't open printer pipe, not printing.\n");
2429 2444
2430 return stream; 2445 return stream;
2431} 2446}
2432 2447
2433int 2448int ecb_cold
2434rxvt_term::pclose_printer (FILE *stream) 2449rxvt_term::pclose_printer (FILE *stream)
2435{ 2450{
2436 fflush (stream); 2451 fflush (stream);
2437 return pclose (stream); 2452 return pclose (stream);
2438} 2453}
2439 2454
2440/* 2455/*
2441 * simulate attached vt100 printer 2456 * simulate attached vt100 printer
2442 */ 2457 */
2443void 2458void ecb_cold
2444rxvt_term::process_print_pipe () 2459rxvt_term::process_print_pipe ()
2445{ 2460{
2446 int done; 2461 FILE *fd = popen_printer ();
2447 FILE *fd;
2448 2462
2449 if ((fd = popen_printer ()) == NULL) 2463 if (!fd)
2450 return; 2464 return;
2451 2465
2452 /* 2466 /*
2453 * Send all input to the printer until either ESC[4i or ESC[?4i 2467 * Send all input to the printer until either ESC[4i or ESC[?4i
2454 * is received. 2468 * is received.
2455 */ 2469 */
2456 for (done = 0; !done;) 2470 for (int done = 0; !done; )
2457 { 2471 {
2458 unsigned char buf[8]; 2472 unsigned char buf[8];
2459 unicode_t ch; 2473 unicode_t ch;
2460 unsigned int i, len; 2474 unsigned int i, len;
2461 2475
… …
2492 } 2506 }
2493 } 2507 }
2494 2508
2495 pclose_printer (fd); 2509 pclose_printer (fd);
2496} 2510}
2497#endif /* PRINTPIPE */ 2511#endif /* PRINTPIPE */
2498/*}}} */ 2512/*}}} */
2499 2513
2500/* *INDENT-OFF* */
2501enum { 2514enum {
2502 C1_40 = 0x40, 2515 C1_40 = 0x40,
2503 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2516 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2504 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2517 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2505 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2518 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2506 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2519 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2507}; 2520};
2508/* *INDENT-ON* */
2509 2521
2510/*{{{ process non-printing single characters */ 2522/*{{{ process non-printing single characters */
2511void 2523void ecb_hot
2512rxvt_term::process_nonprinting (unicode_t ch) 2524rxvt_term::process_nonprinting (unicode_t ch)
2513{ 2525{
2514 switch (ch) 2526 switch (ch)
2515 { 2527 {
2516 case C0_ESC: 2528 case C0_ESC:
… …
2562} 2574}
2563/*}}} */ 2575/*}}} */
2564 2576
2565 2577
2566/*{{{ process VT52 escape sequences */ 2578/*{{{ process VT52 escape sequences */
2567void 2579void ecb_cold
2568rxvt_term::process_escape_vt52 (unicode_t ch) 2580rxvt_term::process_escape_vt52 (unicode_t ch)
2569{ 2581{
2570 int row, col; 2582 int row, col;
2571 2583
2572 switch (ch) 2584 switch (ch)
… …
2606 break; 2618 break;
2607 case 'Z': /* identify the terminal type */ 2619 case 'Z': /* identify the terminal type */
2608 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2620 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2609 break; 2621 break;
2610 case '<': /* turn off VT52 mode */ 2622 case '<': /* turn off VT52 mode */
2611 PrivMode (0, PrivMode_vt52); 2623 priv_modes &= ~PrivMode_vt52;
2612 break; 2624 break;
2613 case 'F': /* use special graphics character set */ 2625 case 'F': /* use special graphics character set */
2614 case 'G': /* use regular character set */ 2626 case 'G': /* use regular character set */
2615 /* unimplemented */ 2627 /* unimplemented */
2616 break; 2628 break;
… …
2622} 2634}
2623/*}}} */ 2635/*}}} */
2624 2636
2625 2637
2626/*{{{ process escape sequences */ 2638/*{{{ process escape sequences */
2627void 2639void ecb_hot
2628rxvt_term::process_escape_seq () 2640rxvt_term::process_escape_seq ()
2629{ 2641{
2630 unicode_t ch = cmd_getc (); 2642 unicode_t ch = cmd_getc ();
2631 2643
2632 if (priv_modes & PrivMode_vt52) 2644 if (priv_modes & PrivMode_vt52)
… …
2635 return; 2647 return;
2636 } 2648 }
2637 2649
2638 switch (ch) 2650 switch (ch)
2639 { 2651 {
2640 /* case 1: do_tek_mode (); break; */
2641 case '#': 2652 case '#':
2642 if (cmd_getc () == '8') 2653 if (cmd_getc () == '8')
2643 scr_E (); 2654 scr_E ();
2644 break; 2655 break;
2645 case '(': 2656 case '(':
… …
2668#if !ENABLE_MINIMAL 2679#if !ENABLE_MINIMAL
2669 case '9': 2680 case '9':
2670 scr_forwardindex (); 2681 scr_forwardindex ();
2671 break; 2682 break;
2672#endif 2683#endif
2684 // DECPAM/DECPNM
2673 case '=': 2685 case '=':
2686 priv_modes |= PrivMode_aplKP;
2687 break;
2674 case '>': 2688 case '>':
2675 PrivMode ((ch == '='), PrivMode_aplKP); 2689 priv_modes &= ~PrivMode_aplKP;
2676 break; 2690 break;
2677 2691
2678 case C1_40: 2692 case C1_40:
2679 cmd_getc (); 2693 cmd_getc ();
2680 break; 2694 break;
… …
2684 2698
2685 /* 8.3.87: NEXT LINE */ 2699 /* 8.3.87: NEXT LINE */
2686 case C1_NEL: /* ESC E */ 2700 case C1_NEL: /* ESC E */
2687 { 2701 {
2688 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
2689 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2690 } 2704 }
2691 break; 2705 break;
2692 2706
2693 /* kidnapped escape sequence: Should be 8.3.48 */ 2707 /* kidnapped escape sequence: Should be 8.3.48 */
2694 case C1_ESA: /* ESC G */ 2708 case C1_ESA: /* ESC G */
2695 process_graphics (); 2709 // used by original rxvt for rob nations own graphics mode
2710 if (cmd_getc () == 'Q')
2711 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2696 break; 2712 break;
2697 2713
2698 /* 8.3.63: CHARACTER TABULATION SET */ 2714 /* 8.3.63: CHARACTER TABULATION SET */
2699 case C1_HTS: /* ESC H */ 2715 case C1_HTS: /* ESC H */
2700 scr_set_tab (1); 2716 scr_set_tab (1);
… …
2704 case C1_RI: /* ESC M */ 2720 case C1_RI: /* ESC M */
2705 scr_index (DN); 2721 scr_index (DN);
2706 break; 2722 break;
2707 2723
2708 /* 8.3.142: SINGLE-SHIFT TWO */ 2724 /* 8.3.142: SINGLE-SHIFT TWO */
2709 /*case C1_SS2: scr_single_shift (2); break; */ 2725 /* case C1_SS2: break; */
2710 2726
2711 /* 8.3.143: SINGLE-SHIFT THREE */ 2727 /* 8.3.143: SINGLE-SHIFT THREE */
2712 /*case C1_SS3: scr_single_shift (3); break; */ 2728 /* case C1_SS3: break; */
2713 2729
2714 /* 8.3.27: DEVICE CONTROL STRING */ 2730 /* 8.3.27: DEVICE CONTROL STRING */
2715 case C1_DCS: /* ESC P */ 2731 case C1_DCS: /* ESC P */
2716 process_dcs_seq (); 2732 process_dcs_seq ();
2717 break; 2733 break;
… …
2719 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2735 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2720 case C1_SCI: /* ESC Z */ 2736 case C1_SCI: /* ESC Z */
2721 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2737 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2722 break; /* steal obsolete ESC [ c */ 2738 break; /* steal obsolete ESC [ c */
2723 2739
2724 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2740 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2725 case C1_CSI: /* ESC [ */ 2741 case C1_CSI: /* ESC [ */
2726 process_csi_seq (); 2742 process_csi_seq ();
2727 break; 2743 break;
2728 2744
2729 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2745 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2730 case C1_OSC: /* ESC ] */ 2746 case C1_OSC: /* ESC ] */
2731 process_osc_seq (); 2747 process_osc_seq ();
2732 break; 2748 break;
2733 2749
2734 /* 8.3.106: RESET TO INITIAL STATE */ 2750 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2735 case 'c': 2751 case 'c':
2736 mbstate.reset (); 2752 mbstate.reset ();
2737 scr_poweron (); 2753 scr_poweron ();
2738 scrollbar_show (1); 2754 scrollBar.show (1);
2739 break; 2755 break;
2740 2756
2741 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2757 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2742 case 'n': 2758 case 'n':
2743 scr_charset_choose (2); 2759 scr_charset_choose (2);
… …
2750 } 2766 }
2751} 2767}
2752/*}}} */ 2768/*}}} */
2753 2769
2754/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2770/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2755/* *INDENT-OFF* */
2756enum { 2771enum {
2757 CSI_ICH = 0x40, 2772 CSI_ICH = 0x40,
2758 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2773 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2759 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2774 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2760 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2775 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2763 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2778 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2764 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2779 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2765 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2780 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2766}; 2781};
2767 2782
2768#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2783#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2769 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2784 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2770 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2785 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2771#define get_byte_array_bit(array, bit) \ 2786#define get_byte_array_bit(array, bit) \
2772 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2787 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2773 2788
2774const unsigned char csi_defaults[] = 2789static const unsigned char csi_defaults[] =
2775 { 2790 {
2776 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2791 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2777 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2792 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2778 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2793 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2779 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2794 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2780 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2795 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2781 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2796 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2782 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2797 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2783 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2798 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2784 }; 2799 };
2785/* *INDENT-ON* */
2786 2800
2787void 2801void ecb_hot
2788rxvt_term::process_csi_seq () 2802rxvt_term::process_csi_seq ()
2789{ 2803{
2790 unicode_t ch, priv, i; 2804 unicode_t ch, priv, prev_ch, i;
2791 unsigned int nargs, p; 2805 unsigned int nargs, p;
2792 int n, ndef; 2806 int n, ndef;
2793 int arg[ESC_ARGS] = { }; 2807 int arg[ESC_ARGS] = { };
2794 2808
2795 nargs = 0; 2809 nargs = 0;
2796 2810
2797 priv = 0; 2811 priv = 0;
2798 ch = cmd_getc (); 2812 ch = cmd_getc ();
2799 if (ch >= '<' && ch <= '?') 2813 if ((ch >= '<' && ch <= '?') || ch == '!')
2814 {
2800 { /* '<' '=' '>' '?' */ 2815 /* '<' '=' '>' '?' '!' */
2801 priv = ch; 2816 priv = ch;
2802 ch = cmd_getc (); 2817 ch = cmd_getc ();
2803 } 2818 }
2804 2819
2820 prev_ch = 0;
2805 /* read any numerical arguments */ 2821 /* read any numerical arguments */
2806 for (n = -1; ch < CSI_ICH; ) 2822 for (n = -1; ch < CSI_ICH; )
2807 { 2823 {
2808 if (isdigit (ch)) 2824 if (isdigit (ch))
2809 { 2825 {
… …
2819 n = -1; 2835 n = -1;
2820 } 2836 }
2821 else if (IS_CONTROL (ch)) 2837 else if (IS_CONTROL (ch))
2822 process_nonprinting (ch); 2838 process_nonprinting (ch);
2823 2839
2840 prev_ch = ch;
2824 ch = cmd_getc (); 2841 ch = cmd_getc ();
2825 } 2842 }
2826 2843
2827 if (ch > CSI_7F) 2844 if (ch > CSI_7F)
2828 return; 2845 return;
… …
2848 { 2865 {
2849 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2866 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2850 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2867 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2851 // 2868 //
2852 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2869 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2853 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2870 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2854 // that we do not support xterm mouse reporting (should be 95 when we do). 2871 // versions.
2855 // 2872 //
2856 tt_printf ("\033[>%d;94;0c", 'U'); 2873 tt_printf ("\033[>%d;95;0c", 'U');
2857 } 2874 }
2858 break; 2875 break;
2876
2859 case '?': 2877 case '?':
2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2861 process_terminal_mode (ch, priv, nargs, arg); 2879 process_terminal_mode (ch, priv, nargs, arg);
2862 break; 2880 break;
2881
2882 case '!':
2883 if (ch == CSI_70)
2884 {
2885 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2886 scr_soft_reset ();
2887
2888 static const int pm_h[] = { 7, 25 };
2889 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2890
2891 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2892 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2863 } 2893 }
2894 break;
2895 }
2896
2864 return; 2897 return;
2865 } 2898 }
2866 2899
2867 switch (ch) 2900 switch (ch)
2868 { 2901 {
… …
2882 } 2915 }
2883 break; 2916 break;
2884#endif 2917#endif
2885 2918
2886 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2919 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2887 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2888 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2889 /* FALLTHROUGH */ 2922 /* FALLTHROUGH */
2890 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2923 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2891 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2924 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2892 scr_gotorc (arg[0], 0, RELATIVE); 2925 scr_gotorc (arg[0], 0, RELATIVE);
2893 break; 2926 break;
2894 2927
2895 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2928 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2896 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2929 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3046 scr_insert_mode (1); 3079 scr_insert_mode (1);
3047 else if (arg[0] == 20) 3080 else if (arg[0] == 20)
3048 priv_modes |= PrivMode_LFNL; 3081 priv_modes |= PrivMode_LFNL;
3049 break; 3082 break;
3050 3083
3084 case CSI_71: // DESCUSR: set cursor style
3085 if (prev_ch == ' ')
3086 set_cursor_style (arg[0]);
3087 break;
3088
3051 /* 3089 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3090 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3091 */
3054 case CSI_72: /* DECSTBM: set top and bottom margins */ 3092 case CSI_72: /* DECSTBM: set top and bottom margins */
3055 if (nargs == 1) 3093 if (nargs == 1)
… …
3083 } 3121 }
3084} 3122}
3085/*}}} */ 3123/*}}} */
3086 3124
3087#if !ENABLE_MINIMAL 3125#if !ENABLE_MINIMAL
3088/* ARGSUSED */
3089void 3126void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3127rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3128{
3092 int x, y; 3129 int x, y;
3093 XWindowAttributes wattr; 3130 XWindowAttributes wattr;
… …
3102 { 3139 {
3103 /* 3140 /*
3104 * commands 3141 * commands
3105 */ 3142 */
3106 case 1: /* deiconify window */ 3143 case 1: /* deiconify window */
3107 XMapWindow (dpy, parent[0]); 3144 XMapWindow (dpy, parent);
3108 break; 3145 break;
3109 case 2: /* iconify window */ 3146 case 2: /* iconify window */
3110 XIconifyWindow (dpy, parent[0], display->screen); 3147 XIconifyWindow (dpy, parent, display->screen);
3111 break; 3148 break;
3112 case 3: /* set position (pixels) */ 3149 case 3: /* set position (pixels) */
3113 XMoveWindow (dpy, parent[0], args[1], args[2]); 3150 XMoveWindow (dpy, parent, args[1], args[2]);
3114 break; 3151 break;
3115 case 4: /* set size (pixels) */ 3152 case 4: /* set size (pixels) */
3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3153 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3117 break; 3154 break;
3118 case 5: /* raise window */ 3155 case 5: /* raise window */
3119 XRaiseWindow (dpy, parent[0]); 3156 XRaiseWindow (dpy, parent);
3120 break; 3157 break;
3121 case 6: /* lower window */ 3158 case 6: /* lower window */
3122 XLowerWindow (dpy, parent[0]); 3159 XLowerWindow (dpy, parent);
3123 break; 3160 break;
3124 case 7: /* refresh window */ 3161 case 7: /* refresh window */
3125 scr_touch (true); 3162 scr_touch (true);
3126 break; 3163 break;
3127 case 8: /* set size (chars) */ 3164 case 8: /* set size (chars) */
… …
3130 break; 3167 break;
3131 3168
3132 //case 9: NYI, TODO, restore maximized window or maximize window 3169 //case 9: NYI, TODO, restore maximized window or maximize window
3133 default: 3170 default:
3134 if (args[0] >= 24) /* set height (chars) */ 3171 if (args[0] >= 24) /* set height (chars) */
3135 set_widthheight ((unsigned int)width, 3172 set_widthheight ((unsigned int)vt_width,
3136 (unsigned int) (args[1] * fheight)); 3173 (unsigned int) (args[1] * fheight));
3137 break; 3174 break;
3138 3175
3139 /* 3176 /*
3140 * reports - some output format copied from XTerm 3177 * reports - some output format copied from XTerm
3141 */ 3178 */
3142 case 11: /* report window state */ 3179 case 11: /* report window state */
3143 XGetWindowAttributes (dpy, parent[0], &wattr); 3180 XGetWindowAttributes (dpy, parent, &wattr);
3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3181 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3145 break; 3182 break;
3146 case 13: /* report window position */ 3183 case 13: /* report window position */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3184 XGetWindowAttributes (dpy, parent, &wattr);
3148 XTranslateCoordinates (dpy, parent[0], wattr.root, 3185 XTranslateCoordinates (dpy, parent, wattr.root,
3149 -wattr.border_width, -wattr.border_width, 3186 -wattr.border_width, -wattr.border_width,
3150 &x, &y, &wdummy); 3187 &x, &y, &wdummy);
3151 tt_printf ("\033[3;%d;%dt", x, y); 3188 tt_printf ("\033[3;%d;%dt", x, y);
3152 break; 3189 break;
3153 case 14: /* report window size (pixels) */ 3190 case 14: /* report window size (pixels) */
3154 XGetWindowAttributes (dpy, parent[0], &wattr); 3191 XGetWindowAttributes (dpy, parent, &wattr);
3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3192 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3156 break; 3193 break;
3157 case 18: /* report text area size (chars) */ 3194 case 18: /* report text area size (chars) */
3158 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3195 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3159 break; 3196 break;
… …
3161 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3198 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3162 break; 3199 break;
3163 case 20: /* report icon label */ 3200 case 20: /* report icon label */
3164 { 3201 {
3165 char *s; 3202 char *s;
3166 XGetIconName (dpy, parent[0], &s); 3203 XGetIconName (dpy, parent, &s);
3167 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3168 XFree (s); 3205 XFree (s);
3169 } 3206 }
3170 break; 3207 break;
3171 case 21: /* report window title */ 3208 case 21: /* report window title */
3172 { 3209 {
3173 char *s; 3210 char *s;
3174 XFetchName (dpy, parent[0], &s); 3211 XFetchName (dpy, parent, &s);
3175 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3212 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3176 XFree (s); 3213 XFree (s);
3177 } 3214 }
3178 break; 3215 break;
3179 } 3216 }
… …
3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3272 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3236 */ 3273 */
3237void 3274void
3238rxvt_term::process_dcs_seq () 3275rxvt_term::process_dcs_seq ()
3239{ 3276{
3240 char *s;
3241 unicode_t eh;
3242
3243 /* 3277 /*
3244 * Not handled yet 3278 * Not handled yet
3245 */ 3279 */
3280
3281 unicode_t eh;
3246 s = get_to_st (eh); 3282 char *s = get_to_st (eh);
3247 if (s) 3283 if (s)
3248 free (s); 3284 free (s);
3249 3285
3250 return; 3286 return;
3251} 3287}
… …
3255 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3291 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3256 */ 3292 */
3257void 3293void
3258rxvt_term::process_osc_seq () 3294rxvt_term::process_osc_seq ()
3259{ 3295{
3260 unicode_t ch, eh;
3261 int arg; 3296 int arg;
3262 3297
3263 ch = cmd_getc (); 3298 unicode_t ch = cmd_getc ();
3264 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3299 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3265 arg = arg * 10 + (ch - '0'); 3300 arg = arg * 10 + (ch - '0');
3266 3301
3267 if (ch == ';') 3302 if (ch == ';')
3268 { 3303 {
3304 unicode_t eh;
3269 char *s = get_to_st (eh); 3305 char *s = get_to_st (eh);
3270 3306
3271 if (s) 3307 if (s)
3272 { 3308 {
3273 process_xterm_seq (arg, s, eh); 3309 process_xterm_seq (arg, s, eh);
… …
3297 3333
3298/* 3334/*
3299 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3335 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3300 */ 3336 */
3301void 3337void
3302rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3338rxvt_term::process_xterm_seq (int op, char *str, char resp)
3303{ 3339{
3304 int color; 3340 int color;
3305 char *buf, *name; 3341 char *buf, *name;
3306 bool query = str[0] == '?' && !str[1]; 3342 bool query = str[0] == '?' && !str[1];
3307 int saveop = op; 3343 int saveop = op;
… …
3334 unsigned long bytes_after; 3370 unsigned long bytes_after;
3335 unsigned char *value = 0; 3371 unsigned char *value = 0;
3336 const char *str = ""; 3372 const char *str = "";
3337 3373
3338 if (prop 3374 if (prop
3339 && XGetWindowProperty (dpy, parent[0], 3375 && XGetWindowProperty (dpy, parent,
3340 prop, 0, 1<<16, 0, AnyPropertyType, 3376 prop, 0, 1<<16, 0, AnyPropertyType,
3341 &actual_type, &actual_format, 3377 &actual_type, &actual_format,
3342 &nitems, &bytes_after, &value) == Success 3378 &nitems, &bytes_after, &value) == Success
3343 && actual_type != None 3379 && actual_type != None
3344 && actual_format == 8) 3380 && actual_format == 8)
… …
3348 3384
3349 XFree (value); 3385 XFree (value);
3350 } 3386 }
3351 else 3387 else
3352 { 3388 {
3353 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3389 char *eq = strchr (str, '=');
3354 3390
3355 if (eq) 3391 if (eq)
3356 { 3392 {
3357 *eq = 0; 3393 *eq = 0;
3358 set_utf8_property (display->atom (str), eq + 1); 3394 set_utf8_property (display->atom (str), eq + 1);
3359 } 3395 }
3360 else 3396 else
3361 XDeleteProperty (dpy, parent[0], 3397 XDeleteProperty (dpy, parent,
3362 display->atom (str)); 3398 display->atom (str));
3363 } 3399 }
3364 break; 3400 break;
3365 3401
3366 case XTerm_Color: 3402 case XTerm_Color:
… …
3379 *buf++ = '\0'; 3415 *buf++ = '\0';
3380 3416
3381 process_color_seq (op, color, name, resp); 3417 process_color_seq (op, color, name, resp);
3382 } 3418 }
3383 break; 3419 break;
3420 case Rxvt_restoreFG:
3384 case XTerm_Color00: 3421 case XTerm_Color00:
3385 process_color_seq (op, Color_fg, str, resp); 3422 process_color_seq (op, Color_fg, str, resp);
3386 break; 3423 break;
3424 case Rxvt_restoreBG:
3387 case XTerm_Color01: 3425 case XTerm_Color01:
3388 process_color_seq (op, Color_bg, str, resp); 3426 process_color_seq (op, Color_bg, str, resp);
3389 break; 3427 break;
3390#ifndef NO_CURSORCOLOR 3428#ifndef NO_CURSORCOLOR
3391 case XTerm_Color_cursor: 3429 case XTerm_Color_cursor:
… …
3396 process_color_seq (op, Color_pointer_fg, str, resp); 3434 process_color_seq (op, Color_pointer_fg, str, resp);
3397 break; 3435 break;
3398 case XTerm_Color_pointer_bg: 3436 case XTerm_Color_pointer_bg:
3399 process_color_seq (op, Color_pointer_bg, str, resp); 3437 process_color_seq (op, Color_pointer_bg, str, resp);
3400 break; 3438 break;
3439#ifdef OPTION_HC
3440 case XTerm_Color_HC:
3441 process_color_seq (op, Color_HC, str, resp);
3442 break;
3443 case XTerm_Color_HTC:
3444 process_color_seq (op, Color_HTC, str, resp);
3445 break;
3446#endif
3401#ifndef NO_BOLD_UNDERLINE_REVERSE 3447#ifndef NO_BOLD_UNDERLINE_REVERSE
3402 case XTerm_Color_RV:
3403 process_color_seq (op, Color_RV, str, resp);
3404 break;
3405 case Rxvt_Color_BD:
3406 case URxvt_Color_BD: 3448 case URxvt_Color_BD:
3407 process_color_seq (op, Color_BD, str, resp); 3449 process_color_seq (op, Color_BD, str, resp);
3408 break; 3450 break;
3409 case Rxvt_Color_UL:
3410 case URxvt_Color_UL: 3451 case URxvt_Color_UL:
3411 process_color_seq (op, Color_UL, str, resp); 3452 process_color_seq (op, Color_UL, str, resp);
3412 break; 3453 break;
3413 case URxvt_Color_IT: 3454 case URxvt_Color_IT:
3414 process_color_seq (op, Color_IT, str, resp); 3455 process_color_seq (op, Color_IT, str, resp);
3415 break; 3456 break;
3416#endif 3457#endif
3417#if ENABLE_TRANSPARENCY 3458 case URxvt_Color_border:
3459 process_color_seq (op, Color_border, str, resp);
3460 break;
3461
3462#if BG_IMAGE_FROM_ROOT
3418 case URxvt_Color_tint: 3463 case URxvt_Color_tint:
3419 process_color_seq (op, Color_tint, str, resp); 3464 process_color_seq (op, Color_tint, str, resp);
3420 { 3465 {
3421 bool changed = false; 3466 bool changed = false;
3467
3422 if (ISSET_PIXCOLOR (Color_tint)) 3468 if (ISSET_PIXCOLOR (Color_tint))
3423 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3469 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3424 else 3470
3425 changed = bgPixmap.unset_tint ();
3426 if (changed) 3471 if (changed)
3427 update_background (); 3472 update_background ();
3428 } 3473 }
3429 3474
3430 break; 3475 break;
… …
3433#if BG_IMAGE_FROM_FILE 3478#if BG_IMAGE_FROM_FILE
3434 case Rxvt_Pixmap: 3479 case Rxvt_Pixmap:
3435 if (!strcmp (str, "?")) 3480 if (!strcmp (str, "?"))
3436 { 3481 {
3437 char str[256]; 3482 char str[256];
3483 int h_scale = fimage.h_scale;
3484 int v_scale = fimage.v_scale;
3485 int h_align = fimage.h_align;
3486 int v_align = fimage.v_align;
3438 3487
3439 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3488 sprintf (str, "[%dx%d+%d+%d]",
3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3489 h_scale, v_scale,
3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3490 h_align, v_align);
3442 process_xterm_seq (XTerm_title, str, CHAR_ST); 3491 process_xterm_seq (XTerm_title, str, CHAR_ST);
3443 } 3492 }
3444 else 3493 else
3445 { 3494 {
3446 int changed = 0; 3495 bool changed = false;
3447 3496
3448 if (*str != ';') 3497 if (*str != ';')
3449 { 3498 {
3450 /* reset to default scaling :*/ 3499 try
3451 bgPixmap.unset_geometry (); 3500 {
3452 if (bgPixmap.set_file (str)) /* change pixmap */ 3501 fimage.set_file_geometry (this, str);
3453 changed++; 3502 changed = true;
3454 str = strchr (str, ';'); 3503 }
3455 if (str == NULL) 3504 catch (const class rxvt_failure_exception &e)
3456 bgPixmap.set_defaultGeometry (); 3505 {
3506 }
3457 } 3507 }
3458 while (str) 3508 else
3459 { 3509 {
3460 str++; 3510 str++;
3461 if (bgPixmap.set_geometry (str)) 3511 if (fimage.set_geometry (str, true))
3462 changed++; 3512 changed = true;
3463 str = strchr (str, ';');
3464 } 3513 }
3514
3465 if (changed) 3515 if (changed)
3516 {
3517 if (bg_window_position_sensitive ())
3518 {
3519 int x, y;
3520 get_window_origin (x, y);
3521 parent_x = x;
3522 parent_y = y;
3523 }
3466 update_background (); 3524 update_background ();
3525 }
3467 } 3526 }
3468 break; 3527 break;
3469#endif 3528#endif
3470
3471 case Rxvt_restoreFG:
3472 set_window_color (Color_fg, str);
3473 break;
3474 case Rxvt_restoreBG:
3475 set_window_color (Color_bg, str);
3476 break;
3477 3529
3478 case XTerm_logfile: 3530 case XTerm_logfile:
3479 // TODO, when secure mode? 3531 // TODO, when secure mode?
3480 break; 3532 break;
3481 3533
… …
3548 break; 3600 break;
3549#endif 3601#endif
3550 3602
3551#if ENABLE_PERL 3603#if ENABLE_PERL
3552 case URxvt_perl: 3604 case URxvt_perl:
3553 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3605 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3554 ; // no responses yet
3555 break; 3606 break;
3556#endif 3607#endif
3557 } 3608 }
3558} 3609}
3559/*----------------------------------------------------------------------*/ 3610/*----------------------------------------------------------------------*/
… …
3566 * 's' = save 3617 * 's' = save
3567 * 'r' = restore 3618 * 'r' = restore
3568 * 't' = toggle 3619 * 't' = toggle
3569 * so no need for fancy checking 3620 * so no need for fancy checking
3570 */ 3621 */
3571int 3622int ecb_cold
3572rxvt_term::privcases (int mode, unsigned long bit) 3623rxvt_term::privcases (int mode, unsigned long bit)
3573{ 3624{
3574 int state; 3625 int state;
3575 3626
3576 if (mode == 's') 3627 if (mode == 's')
3577 { 3628 {
3578 SavedModes |= (priv_modes & bit); 3629 if (priv_modes & bit)
3630 SavedModes |= bit;
3631 else
3632 SavedModes &= ~bit;
3579 return -1; 3633 return -1;
3580 } 3634 }
3581 else 3635 else
3582 { 3636 {
3583 if (mode == 'r') 3637 if (mode == 'r')
3584 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3638 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3585 else 3639 else
3586 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3640 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3587 PrivMode (state, bit); 3641
3642 if (state)
3643 priv_modes |= bit;
3644 else
3645 priv_modes &= ~bit;
3588 } 3646 }
3589 3647
3590 return state; 3648 return state;
3591} 3649}
3592 3650
3593/* we're not using priv _yet_ */ 3651/* we're not using priv _yet_ */
3594void 3652void
3595rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3653rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3596{ 3654{
3597 unsigned int i, j; 3655 unsigned int i, j;
3598 int state; 3656 int state;
3599 3657
3600 static const struct 3658 static const struct
3601 { 3659 {
3602 const int argval; 3660 const int argval;
3603 const unsigned long bit; 3661 const unsigned long bit;
3604 } argtopriv[] = { 3662 } argtopriv[] = {
3605 { 1, PrivMode_aplCUR }, 3663 { 1, PrivMode_aplCUR }, // DECCKM
3606 { 2, PrivMode_vt52 }, 3664 { 2, PrivMode_vt52 }, // DECANM
3607 { 3, PrivMode_132 }, 3665 { 3, PrivMode_132 }, // DECCOLM
3608 { 4, PrivMode_smoothScroll }, 3666 { 4, PrivMode_smoothScroll }, // DECSCLM
3609 { 5, PrivMode_rVideo }, 3667 { 5, PrivMode_rVideo }, // DECSCNM
3610 { 6, PrivMode_relOrigin }, 3668 { 6, PrivMode_relOrigin }, // DECOM
3611 { 7, PrivMode_Autowrap }, 3669 { 7, PrivMode_Autowrap }, // DECAWM
3612 // 8, bi-directional support mode 3670 // 8, auto-repeat keys // DECARM
3613 { 9, PrivMode_MouseX10 }, 3671 { 9, PrivMode_MouseX10 },
3614 // 18, 19 printing-related 3672 // 18 end FF to printer after print screen
3673 // 19 Print screen prints full screen/scroll region
3615 { 25, PrivMode_VisibleCursor }, 3674 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3616#ifdef scrollBar_esc 3675#ifdef scrollBar_esc
3617 { scrollBar_esc, PrivMode_scrollBar }, 3676 { scrollBar_esc, PrivMode_scrollBar },
3618#endif 3677#endif
3619 { 35, PrivMode_ShiftKeys }, // rxvt extension 3678 { 35, PrivMode_ShiftKeys }, // rxvt extension
3679 // 38, tektronix mode // DECTEK
3620 { 40, PrivMode_132OK }, 3680 { 40, PrivMode_132OK },
3621 // 41 xterm more fixes NYI 3681 // 41 xterm more fixes NYI
3622 // 45 margin bell NYI 3682 // 45 margin bell NYI
3623 // 46 start logging 3683 // 46 start logging
3624 { 47, PrivMode_Screen }, 3684 { 47, PrivMode_Screen },
3625 { 66, PrivMode_aplKP }, 3685 { 66, PrivMode_aplKP }, // DECNKM
3626#ifndef NO_BACKSPACE_KEY 3686#ifndef NO_BACKSPACE_KEY
3627 { 67, PrivMode_BackSpace }, 3687 { 67, PrivMode_BackSpace }, // DECBKM
3628#endif 3688#endif
3629 { 1000, PrivMode_MouseX11 }, 3689 { 1000, PrivMode_MouseX11 },
3630 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3690 { 1002, PrivMode_MouseBtnEvent },
3631 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3691 { 1003, PrivMode_MouseAnyEvent },
3632 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3692#if ENABLE_FRILLS
3693 { 1005, PrivMode_ExtModeMouse },
3694#endif
3633 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3695 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3634 { 1011, PrivMode_Keypress }, // rxvt extension 3696 { 1011, PrivMode_Keypress }, // rxvt extension
3697#if ENABLE_FRILLS
3698 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3699#endif
3635 // 1035 enable modifiers for alt, numlock NYI 3700 // 1035 enable modifiers for alt, numlock NYI
3636 // 1036 send ESC for meta keys NYI 3701 // 1036 send ESC for meta keys NYI
3637 // 1037 send DEL for keypad delete NYI 3702 // 1037 send DEL for keypad delete NYI
3638 { 1047, PrivMode_Screen }, 3703 { 1047, PrivMode_Screen },
3639 // 1048 save and restore cursor 3704 // 1048 save and restore cursor, implemented in code
3640 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3705 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3641 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3706 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3707 { 2004, PrivMode_BracketPaste },
3642 }; 3708 };
3643 3709
3644 if (nargs == 0) 3710 if (nargs == 0)
3645 return; 3711 return;
3646 3712
… …
3653 for (i = 0; i < nargs; i++) 3719 for (i = 0; i < nargs; i++)
3654 { 3720 {
3655 state = -1; 3721 state = -1;
3656 3722
3657 /* basic handling */ 3723 /* basic handling */
3658 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3724 for (j = 0; j < ecb_array_length (argtopriv); j++)
3659 if (argtopriv[j].argval == arg[i]) 3725 if (argtopriv[j].argval == arg[i])
3660 { 3726 {
3661 state = privcases (mode, argtopriv[j].bit); 3727 state = privcases (mode, argtopriv[j].bit);
3662 break; 3728 break;
3663 } 3729 }
… …
3671 3737
3672 scr_touch (true); 3738 scr_touch (true);
3673 break; 3739 break;
3674#endif 3740#endif
3675 case 1048: /* alternative cursor save */ 3741 case 1048: /* alternative cursor save */
3676 case 1049:
3677 if (option (Opt_secondaryScreen)) 3742 if (option (Opt_secondaryScreen))
3678 if (mode == 0) 3743 if (mode == 0)
3679 scr_cursor (RESTORE); 3744 scr_cursor (RESTORE);
3680 else if (mode == 1) 3745 else if (mode == 1)
3681 scr_cursor (SAVE); 3746 scr_cursor (SAVE);
… …
3690 case 2: /* VT52 mode */ 3755 case 2: /* VT52 mode */
3691 /* oddball mode. should be set regardless of set/reset 3756 /* oddball mode. should be set regardless of set/reset
3692 * parameter. Return from VT52 mode with an ESC < from 3757 * parameter. Return from VT52 mode with an ESC < from
3693 * within VT52 mode 3758 * within VT52 mode
3694 */ 3759 */
3695 PrivMode (1, PrivMode_vt52); 3760 priv_modes |= PrivMode_vt52;
3696 break; 3761 break;
3697 case 3: /* 80/132 */ 3762 case 3: /* 80/132 */
3698 if (priv_modes & PrivMode_132OK) 3763 if (priv_modes & PrivMode_132OK)
3699 set_widthheight (((state ? 132 : 80) * fwidth), height); 3764 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3700 break; 3765 break;
3701 case 4: /* smooth scrolling */ 3766 case 4: /* smooth scrolling */
3702 set_option (Opt_jumpScroll, !state); 3767 set_option (Opt_jumpScroll, !state);
3703 break; 3768 break;
3704 case 5: /* reverse video */ 3769 case 5: /* reverse video */
… …
3711 scr_autowrap (state); 3776 scr_autowrap (state);
3712 break; 3777 break;
3713 /* case 8: - auto repeat, can't do on a per window basis */ 3778 /* case 8: - auto repeat, can't do on a per window basis */
3714 case 9: /* X10 mouse reporting */ 3779 case 9: /* X10 mouse reporting */
3715 if (state) /* orthogonal */ 3780 if (state) /* orthogonal */
3716 priv_modes &= ~PrivMode_MouseX11; 3781 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3717 break; 3782 break;
3718#ifdef scrollBar_esc 3783#ifdef scrollBar_esc
3719 case scrollBar_esc: 3784 case scrollBar_esc:
3720 if (scrollbar_mapping (state)) 3785 scrollBar.map (state);
3721 {
3722 resize_all_windows (0, 0, 0); 3786 resize_all_windows (0, 0, 0);
3723 scr_touch (true); 3787 scr_touch (true);
3724 }
3725 break; 3788 break;
3726#endif 3789#endif
3727 case 25: /* visible/invisible cursor */ 3790 case 25: /* visible/invisible cursor */
3728 scr_cursor_visible (state); 3791 scr_cursor_visible (state);
3729 break; 3792 break;
… …
3734 break; 3797 break;
3735 /* case 66: - application key pad */ 3798 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 3799 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 3800 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 3801 if (state) /* orthogonal */
3739 priv_modes &= ~PrivMode_MouseX10; 3802 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3740 break; 3803 break;
3741#if 0
3742 case 1001: 3804 case 1002:
3743 break; /* X11 mouse highlighting */ 3805 case 1003:
3744#endif 3806 if (state)
3807 {
3808 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3809 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3810 mouse_row = mouse_col = 0;
3811 vt_emask_mouse = PointerMotionMask;
3812 }
3813 else
3814 vt_emask_mouse = NoEventMask;
3815
3816 vt_select_input ();
3817 break;
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 3818 case 1010: /* scroll to bottom on TTY output inhibit */
3746 set_option (Opt_scrollTtyOutput, !state); 3819 set_option (Opt_scrollTtyOutput, !state);
3747 break; 3820 break;
3748 case 1011: /* scroll to bottom on key press */ 3821 case 1011: /* scroll to bottom on key press */
3749 set_option (Opt_scrollTtyKeypress, state); 3822 set_option (Opt_scrollTtyKeypress, state);
3750 break; 3823 break;
3751 case 1047: /* secondary screen w/ clearing last */ 3824 case 1047: /* secondary screen w/ clearing last */
3752 if (option (Opt_secondaryScreen)) 3825 if (option (Opt_secondaryScreen))
3753 if (current_screen != PRIMARY) 3826 if (!state)
3754 scr_erase_screen (2); 3827 scr_erase_screen (2);
3828
3755 scr_change_screen (state); 3829 scr_change_screen (state);
3756 break; 3830 break;
3757 case 1049: /* secondary screen w/ clearing first */ 3831 case 1049: /* secondary screen w/ clearing first */
3832 if (option (Opt_secondaryScreen))
3833 if (state)
3834 scr_cursor (SAVE);
3835
3758 scr_change_screen (state); 3836 scr_change_screen (state);
3837
3759 if (option (Opt_secondaryScreen)) 3838 if (option (Opt_secondaryScreen))
3760 if (current_screen != PRIMARY) 3839 if (state)
3761 scr_erase_screen (2); 3840 scr_erase_screen (2);
3841 else
3842 scr_cursor (RESTORE);
3762 break; 3843 break;
3763 default: 3844 default:
3764 break; 3845 break;
3765 } 3846 }
3766 } 3847 }
3767} 3848}
3768/*}}} */ 3849/*}}} */
3769 3850
3770/*{{{ process sgr sequences */ 3851/*{{{ process sgr sequences */
3771void 3852void ecb_hot
3772rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3853rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3773{ 3854{
3774 unsigned int i; 3855 unsigned int i;
3775 short rendset; 3856 short rendset;
3776 int rendstyle; 3857 int rendstyle;
… …
3917 break; 3998 break;
3918#endif 3999#endif
3919 } 4000 }
3920 } 4001 }
3921} 4002}
3922/*}}} */
3923 4003
3924/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3925void 4004void
3926rxvt_term::process_graphics () 4005rxvt_term::set_cursor_style (int style)
3927{ 4006{
3928 unicode_t ch, cmd = cmd_getc (); 4007 if (!IN_RANGE_INC (style, 0, 4))
3929
3930 if (cmd == 'Q')
3931 { /* query graphics */
3932 tt_printf ("\033G0\012"); /* no graphics */
3933 return; 4008 return;
3934 } 4009
3935 /* swallow other graphics sequences until terminating ':' */ 4010 set_option (Opt_cursorUnderline, style >= 3);
3936 do 4011
3937 ch = cmd_getc (); 4012#ifdef CURSOR_BLINK
3938 while (ch != ':'); 4013 set_option (Opt_cursorBlink, !style || (style & 1));
4014 cursor_blink_reset ();
4015#endif
4016
4017 want_refresh = 1;
3939} 4018}
3940/*}}} */ 4019/*}}} */
3941 4020
3942/* ------------------------------------------------------------------------- */ 4021/* ------------------------------------------------------------------------- */
3943 4022
… …
3959 4038
3960/* ---------------------------------------------------------------------- */ 4039/* ---------------------------------------------------------------------- */
3961/* Write data to the pty as typed by the user, pasted with the mouse, 4040/* Write data to the pty as typed by the user, pasted with the mouse,
3962 * or generated by us in response to a query ESC sequence. 4041 * or generated by us in response to a query ESC sequence.
3963 */ 4042 */
3964const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4043static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3965 4044
3966void 4045void
3967rxvt_term::tt_write (const char *data, unsigned int len) 4046rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 4047{
3969 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4048 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3974 4053
3975 if (v_buflen == 0) 4054 if (v_buflen == 0)
3976 { 4055 {
3977 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4056 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3978 4057
4058 max_it (written, 0);
4059
3979 if ((unsigned int)written == len) 4060 if (written == len)
3980 return; 4061 return;
3981 4062
3982 data += written; 4063 data += written;
3983 len -= written; 4064 len -= written;
3984 } 4065 }
3985 4066
3986 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4067 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3987 4068
3988 memcpy (v_buffer + v_buflen, data, len); 4069 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len; 4070 v_buflen += len;
3990 4071
3991 pty_ev.set (EVENT_READ | EVENT_WRITE); 4072 pty_ev.set (ev::READ | ev::WRITE);
3992} 4073}
3993 4074
3994void rxvt_term::pty_write () 4075void rxvt_term::pty_write ()
3995{ 4076{
3996 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4077 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4002 if (v_buflen == 0) 4083 if (v_buflen == 0)
4003 { 4084 {
4004 free (v_buffer); 4085 free (v_buffer);
4005 v_buffer = 0; 4086 v_buffer = 0;
4006 4087
4007 pty_ev.set (EVENT_READ); 4088 pty_ev.set (ev::READ);
4008 return; 4089 return;
4009 } 4090 }
4010 4091
4011 memmove (v_buffer, v_buffer + written, v_buflen); 4092 memmove (v_buffer, v_buffer + written, v_buflen);
4012 } 4093 }
4013 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4094 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4014 pty_ev.set (EVENT_READ); 4095 pty_ev.set (ev::READ);
4015} 4096}
4016 4097
4017/*----------------------- end-of-file (C source) -----------------------*/ 4098/*----------------------- end-of-file (C source) -----------------------*/
4018 4099

Diff Legend

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