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.338 by ayin, Tue Jul 31 17:39:39 2007 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284int 291static int ecb_cold
285rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin
329 };
330
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
332 {
333 unsigned int index = keysym - XK_KP_Home;
334 keysym = kp ? keypadtrans[index] : XK_Home + index;
335 }
336 else if (keysym == XK_KP_Insert)
337 keysym = kp ? XK_KP_0 : XK_Insert;
338# ifndef NO_DELETE_KEY
339 else if (keysym == XK_KP_Delete)
340 keysym = kp ? XK_KP_Decimal : XK_Delete;
341# endif
342#endif
343 return keysym;
344}
345
346static inline int ecb_cold
347map_function_key (KeySym keysym)
348{
349 int param = 0;
350
351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
352 {
353 param = 11 + keysym - XK_F1;
354 if (keysym >= XK_F17)
355 param += 4;
356 else if (keysym >= XK_F15)
357 param += 3;
358 else if (keysym >= XK_F11)
359 param += 2;
360 else if (keysym >= XK_F6)
361 param += 1;
362 }
363 else
364 switch (keysym)
365 {
366 case XK_Find:
367 param = 1;
368 break;
369 case XK_Insert:
370 param = 2;
371 break;
372#ifdef DXK_Remove
373 case DXK_Remove:
374#endif
375 case XK_Execute:
376 param = 3;
377 break;
378 case XK_Select:
379 param = 4;
380 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior:
383 param = 5;
384 break;
385 case XK_Next:
386 param = 6;
387 break;
388 case XK_Home:
389 param = 7;
390 break;
391 case XK_End:
392 param = 8;
393 break;
394#endif
395 case XK_Help:
396 param = 28;
397 break;
398 case XK_Menu:
399 param = 29;
400 break;
401 }
402 return param;
403}
404
405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
304rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
305{ 416{
306 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 418 KeySym keysym;
309 int valid_keysym; 419 int valid_keysym;
310 char kbuf[KBUFSZ]; 420 char kbuf[KBUFSZ];
311 421
312#if ISO_14755 422#if ISO_14755
… …
322 */ 432 */
323 shft = ev.state & ShiftMask; 433 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 434 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 435 meta = ev.state & ModMetaMask;
326 436
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332
333 kbuf[0] = 0; 437 kbuf[0] = 0;
334 438
335#ifdef USE_XIM 439#if USE_XIM
336 if (Input_Context) 440 if (Input_Context)
337 { 441 {
338 Status status_return; 442 Status status_return;
339 443
340#if 0 444#if 0
… …
411#ifdef PAGING_CONTEXT_LINES 515#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 516 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 517#else
414 lnsppg = nrow * 4 / 5; 518 lnsppg = nrow * 4 / 5;
415#endif 519#endif
520 max_it (lnsppg, 1);
521
416 if (keysym == XK_Prior) 522 if (keysym == XK_Prior)
417 { 523 {
418 scr_page (UP, lnsppg); 524 scr_page (lnsppg);
419 return; 525 return;
420 } 526 }
421 else if (keysym == XK_Next) 527 else if (keysym == XK_Next)
422 { 528 {
423 scr_page (DN, lnsppg); 529 scr_page (-lnsppg);
424 return; 530 return;
425 } 531 }
426 } 532 }
427#ifdef SCROLL_ON_UPDOWN_KEYS 533#ifdef SCROLL_ON_UPDOWN_KEYS
428 if (IS_SCROLL_MOD) 534 if (IS_SCROLL_MOD)
429 { 535 {
430 if (keysym == XK_Up) 536 if (keysym == XK_Up)
431 { 537 {
432 scr_page (UP, 1); 538 scr_page (1);
433 return; 539 return;
434 } 540 }
435 else if (keysym == XK_Down) 541 else if (keysym == XK_Down)
436 { 542 {
437 scr_page (DN, 1); 543 scr_page (-1);
438 return; 544 return;
439 } 545 }
440 } 546 }
441#endif 547#endif
442#ifdef SCROLL_ON_HOMEEND_KEYS 548#ifdef SCROLL_ON_HOMEEND_KEYS
443 if (IS_SCROLL_MOD) 549 if (IS_SCROLL_MOD)
444 { 550 {
445 if (keysym == XK_Home) 551 if (keysym == XK_Home)
446 { 552 {
447 scr_move_to (0, 1); 553 scr_changeview (top_row);
448 return; 554 return;
449 } 555 }
450 else if (keysym == XK_End) 556 else if (keysym == XK_End)
451 { 557 {
452 scr_move_to (1, 1); 558 scr_changeview (0);
453 return; 559 return;
454 } 560 }
455 } 561 }
456#endif 562#endif
457 } 563 }
… …
473 selection_request (ev.time); 579 selection_request (ev.time);
474 return; 580 return;
475#if TODO 581#if TODO
476 /* rxvt extras */ 582 /* rxvt extras */
477 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 583 case XK_KP_Add: /* Shift+KP_Add = bigger font */
478 change_font (FONT_UP);
479 return; 584 return;
480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 585 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
481 change_font (FONT_DN);
482 return; 586 return;
483#endif 587#endif
484 } 588 }
485 } 589 }
486 } 590 }
487 591
592 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
593 {
594 if (keysym == XK_v)
595 selection_request (ev.time, Sel_Clipboard);
596 else if (selection.len > 0)
597 {
598 free (selection.clip_text);
599 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
600 selection.clip_len = selection.len;
601 selection_grab (CurrentTime, true);
602 }
603
604 return;
605 }
606
488#if ENABLE_FRILLS || ISO_14755 607#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 608 // ISO 14755 support
490 if (shft && ctrl) 609 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 610 {
492 int hv; 611 int hv;
493 612
494 if (iso14755buf & ISO_14755_51 613 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 614 && (keysym == XK_space || keysym == XK_KP_Space
… …
525 scr_overlay_off (); 644 scr_overlay_off ();
526# endif 645# endif
527 iso14755buf = 0; 646 iso14755buf = 0;
528 } 647 }
529 } 648 }
649 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 650 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 651 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 652 if (!(iso14755buf & ISO_14755_STARTED))
533 { 653 {
534 iso14755buf |= ISO_14755_STARTED; 654 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755 655# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 656 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
547 } 667 }
548#endif 668#endif
549 669
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 670 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 671 {
672 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
673 unsigned int newlen = 1;
674
675 if (ev.state & ModNumLockMask)
676 kp = false;
677
678 keysym = translate_keypad (keysym, kp);
679
680 switch (keysym)
552 { 681 {
682#ifndef NO_BACKSPACE_KEY
683 case XK_BackSpace:
684 if (priv_modes & PrivMode_HaveBackSpace)
685 {
686 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
687 ^ !!ctrl) ? '\b' : '\177';
688 kbuf[1] = '\0';
689 }
690 else
691 strcpy (kbuf, rs[Rs_backspace_key]);
692 break;
693#endif
694#ifndef NO_DELETE_KEY
695 case XK_Delete:
696 strcpy (kbuf, rs[Rs_delete_key]);
697 break;
698#endif
699 case XK_Tab:
700 if (shft)
701 strcpy (kbuf, "\033[Z");
702 else
703 {
704#ifdef CTRL_TAB_MAKES_META
705 if (ctrl)
706 meta = 1;
707#endif
708#ifdef MOD4_TAB_MAKES_META
709 if (ev.state & Mod4Mask)
710 meta = 1;
711#endif
553 newlen = 1; 712 newlen = 0;
554 switch (keysym) 713 }
714 break;
715
716 case XK_Up: /* "\033[A" */
717 case XK_Down: /* "\033[B" */
718 case XK_Right: /* "\033[C" */
719 case XK_Left: /* "\033[D" */
720 strcpy (kbuf, "\033[Z");
721 kbuf[2] = "DACB"[keysym - XK_Left];
722 /* do Shift first */
723 if (shft)
724 kbuf[2] = "dacb"[keysym - XK_Left];
725 else if (ctrl)
726 {
727 kbuf[1] = 'O';
728 kbuf[2] = "dacb"[keysym - XK_Left];
729 }
730 else if (priv_modes & PrivMode_aplCUR)
731 kbuf[1] = 'O';
732 break;
733
734 case XK_KP_Enter:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033OM");
739 break;
740 }
741
742 /* FALLTHROUGH */
743
744 case XK_Return:
745 if (priv_modes & PrivMode_LFNL)
746 {
747 kbuf[0] = '\015';
748 kbuf[1] = '\012';
749 kbuf[2] = '\0';
750 }
751 else
752 {
753 kbuf[0] = '\015';
754 kbuf[1] = '\0';
755 }
756 break;
757
758 case XK_KP_F1: /* "\033OP" */
759 case XK_KP_F2: /* "\033OQ" */
760 case XK_KP_F3: /* "\033OR" */
761 case XK_KP_F4: /* "\033OS" */
762 strcpy (kbuf, "\033OP");
763 kbuf[2] += (keysym - XK_KP_F1);
764 break;
765
766 case XK_KP_Multiply: /* "\033Oj" : "*" */
767 case XK_KP_Add: /* "\033Ok" : "+" */
768 case XK_KP_Separator: /* "\033Ol" : "," */
769 case XK_KP_Subtract: /* "\033Om" : "-" */
770 case XK_KP_Decimal: /* "\033On" : "." */
771 case XK_KP_Divide: /* "\033Oo" : "/" */
772 case XK_KP_0: /* "\033Op" : "0" */
773 case XK_KP_1: /* "\033Oq" : "1" */
774 case XK_KP_2: /* "\033Or" : "2" */
775 case XK_KP_3: /* "\033Os" : "3" */
776 case XK_KP_4: /* "\033Ot" : "4" */
777 case XK_KP_5: /* "\033Ou" : "5" */
778 case XK_KP_6: /* "\033Ov" : "6" */
779 case XK_KP_7: /* "\033Ow" : "7" */
780 case XK_KP_8: /* "\033Ox" : "8" */
781 case XK_KP_9: /* "\033Oy" : "9" */
782 /* allow shift to override */
783 if (kp)
784 {
785 strcpy (kbuf, "\033Oj");
786 kbuf[2] += (keysym - XK_KP_Multiply);
787 }
788 else
789 {
790 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
791 kbuf[1] = '\0';
792 }
793 break;
794
795 default:
555 { 796 {
556#ifndef NO_BACKSPACE_KEY 797 int param = map_function_key (keysym);
557 case XK_BackSpace: 798 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 799 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 800 else
565 strcpy (kbuf, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 801 newlen = 0;
840 break;
841 } 802 }
842 803 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 804 }
846 805
806 if (newlen)
807 len = strlen (kbuf);
808
809 if (len > 0)
810 {
847 /* 811 /*
812 * pass Shift/Control indicators for function keys ending with `~'
813 *
814 * eg,
815 * Prior = "ESC[5~"
816 * Shift+Prior = "ESC[5$"
817 * Ctrl+Prior = "ESC[5^"
818 * Ctrl+Shift+Prior = "ESC[5@"
819 */
820 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
821 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
822
823 /*
848 * Pass meta for all function keys, if 'meta' option set 824 * Pass meta for all function keys, if 'meta' option set
849 */ 825 */
850#ifdef META8_OPTION 826#ifdef META8_OPTION
851 if (meta && (meta_char == 0x80) && len > 0) 827 if (meta && (meta_char == 0x80))
852 kbuf[len - 1] |= 0x80; 828 kbuf[len - 1] |= 0x80;
853#endif 829#endif
830 }
854 831
855 } 832 }
856 else if (ctrl && keysym == XK_minus) 833 else if (ctrl && keysym == XK_minus)
857 { 834 {
858 len = 1; 835 len = 1;
… …
892 { 869 {
893 view_start = 0; 870 view_start = 0;
894 want_refresh = 1; 871 want_refresh = 1;
895 } 872 }
896 873
897 /*
898 * these modifications only affect the static keybuffer
899 * pass Shift/Control indicators for function keys ending with `~'
900 *
901 * eg,
902 * Prior = "ESC[5~"
903 * Shift+Prior = "ESC[5$"
904 * Ctrl+Prior = "ESC[5^"
905 * Ctrl+Shift+Prior = "ESC[5@"
906 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
907 */
908 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
909 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
910
911 /* escape prefix */ 874 /* escape prefix */
912 if (meta 875 if (meta
913#ifdef META8_OPTION 876#ifdef META8_OPTION
914 && meta_char == C0_ESC 877 && meta_char == C0_ESC
915#endif 878#endif
… …
920 } 883 }
921 884
922 tt_write (kbuf, (unsigned int)len); 885 tt_write (kbuf, (unsigned int)len);
923} 886}
924 887
925void 888void ecb_cold
926rxvt_term::key_release (XKeyEvent &ev) 889rxvt_term::key_release (XKeyEvent &ev)
927{ 890{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 891#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym; 892 KeySym keysym;
930 893
… …
950 commit_iso14755 (); 913 commit_iso14755 ();
951 914
952 return; 915 return;
953 } 916 }
954 917
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 918 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 919 if (i[0] == keysym)
957 { 920 {
958 iso14755buf = ISO_14755_51 | i[1]; 921 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 922 commit_iso14755 ();
960 923
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 960 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 961 mouse_slip_wheel_speed = 0;
999#endif 962#endif
1000} 963}
1001 964
1002#if defined (KEYSYM_RESOURCE)
1003unsigned int
1004rxvt_term::cmd_write (const char *str, unsigned int count)
1005{
1006 unsigned int n, s;
1007
1008 n = cmdbuf_ptr - cmdbuf_base;
1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
1011 if (n > 0 && s < count)
1012 {
1013 memmove (cmdbuf_base, cmdbuf_ptr,
1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1015 cmdbuf_ptr = cmdbuf_base;
1016 cmdbuf_endp -= n;
1017 s += n;
1018 }
1019
1020 if (count > s)
1021 {
1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1023 count = s;
1024 }
1025
1026 for (; count--;)
1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
1031 return 0;
1032}
1033#endif
1034
1035void 965void
1036rxvt_term::flush () 966rxvt_term::flush ()
1037{ 967{
1038 flush_ev.stop (); 968 flush_ev.stop ();
1039 969
1040#ifdef ENABLE_TRANSPARENCY 970#ifdef HAVE_IMG
1041 if (want_full_refresh) 971 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 972 {
1043 want_full_refresh = 0; 973 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_clear ();
1045 scr_touch (false); 974 scr_touch (false);
1046 } 975 }
1047#endif 976#endif
1048 977
1049 if (want_refresh) 978 if (want_refresh)
… …
1085 } 1014 }
1086 while (row < end_row); 1015 while (row < end_row);
1087 } 1016 }
1088 1017
1089 scr_refresh (); 1018 scr_refresh ();
1090 scrollbar_show (1); 1019 scrollBar.show (1);
1091#ifdef USE_XIM 1020#if USE_XIM
1092 IMSendSpot (); 1021 im_send_spot ();
1093#endif 1022#endif
1094 } 1023 }
1095 1024
1096 display->flush (); 1025 display->flush ();
1097} 1026}
1098 1027
1028/* checks whether a refresh is requested and starts the refresh timer */
1099void 1029void
1100rxvt_term::check_cb (check_watcher &w) 1030rxvt_term::refresh_check ()
1101{ 1031{
1102 make_current (); 1032 if (want_refresh && !flush_ev.is_active ())
1033 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103 1034
1104 display->flush (); 1035 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1036}
1109 1037
1110void 1038void
1111rxvt_term::flush_cb (time_watcher &w) 1039rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1040{
1113 make_current (); 1041 make_current ();
1114 1042
1115 refresh_count = 0; 1043 refresh_count = 0;
1116 flush (); 1044 flush ();
1117} 1045}
1118 1046
1119#ifdef CURSOR_BLINK 1047#ifdef CURSOR_BLINK
1120void 1048void
1049rxvt_term::cursor_blink_reset ()
1050{
1051 if (hidden_cursor)
1052 {
1053 hidden_cursor = 0;
1054 want_refresh = 1;
1055 }
1056
1057 if (option (Opt_cursorBlink))
1058 cursor_blink_ev.again ();
1059 else
1060 cursor_blink_ev.stop ();
1061}
1062
1063void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1064rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1065{
1123 hidden_cursor = !hidden_cursor; 1066 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1067 want_refresh = 1;
1125 1068 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1069}
1128#endif 1070#endif
1129 1071
1130#ifdef TEXT_BLINK 1072#ifdef TEXT_BLINK
1131void 1073void
1132rxvt_term::text_blink_cb (time_watcher &w) 1074rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1075{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1076 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1077 {
1136 hidden_text = !hidden_text; 1078 hidden_text = !hidden_text;
1137 want_refresh = 1; 1079 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1080 refresh_check ();
1139 } 1081 }
1082 else
1083 w.stop ();
1140} 1084}
1141#endif 1085#endif
1142 1086
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1088void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1090{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1149 { 1093 {
1150 want_refresh = 1; 1094 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1095 refresh_check ();
1152 } 1096 }
1097 else
1098 w.stop ();
1153} 1099}
1154#endif 1100#endif
1155 1101
1156#ifdef SELECTION_SCROLLING 1102#ifdef SELECTION_SCROLLING
1157void 1103void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1104rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1105{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1106 if (scr_page (scroll_selection_lines))
1161 { 1107 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1108 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1109 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 refresh_check ();
1165 } 1111 }
1112 else
1113 w.stop ();
1166} 1114}
1167#endif 1115#endif
1168 1116
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1117#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1118void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1119rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1120{
1173 if (mouse_slip_wheel_speed == 0 1121 if (scr_page (mouse_slip_wheel_speed))
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 { 1122 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1123 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1124 refresh_check ();
1125 }
1126
1127 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1128 {
1129 mouse_slip_wheel_speed = 0;
1130 w.stop ();
1182 } 1131 }
1183} 1132}
1184#endif 1133#endif
1185 1134
1186#if LINUX_YIELD_HACK 1135#if LINUX_YIELD_HACK
1187static struct event_handler 1136static struct event_handler
1188{ 1137{
1189 check_watcher yield_ev; 1138 ev::prepare yield_ev;
1190 1139
1191 void yield_cb (check_watcher &w) 1140 void yield_cb (ev::prepare &w, int revents)
1192 { 1141 {
1193 // this should really be sched_yield(), but the linux guys thought 1142 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1143 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is 1144 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS. 1145 // allowed by the sus... as is returning ENOSYS.
1146 // since the linux guys additionally thought that breaking the only
1147 // known workaround against their unusable sched_yield hack is cool,
1148 // we just nanosleep a bit and hope for the best.
1197 1149
1198 struct timespec ts = { 0, 0 }; 1150 struct timespec ts = { 0, 1000 };
1199 nanosleep (&ts, 0); 1151 nanosleep (&ts, 0);
1200 1152
1201 w.stop (); 1153 w.stop ();
1202 } 1154 }
1203 1155
… …
1206 { 1158 {
1207 } 1159 }
1208} event_handler; 1160} event_handler;
1209#endif 1161#endif
1210 1162
1163/* make sure all the cmd data is at beginning of cmdbuf */
1164void
1165rxvt_term::cmdbuf_reify ()
1166{
1167 if (cmdbuf_ptr == cmdbuf_base)
1168 return;
1169
1170 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1171
1172 memmove (cmdbuf_base, cmdbuf_ptr, used);
1173 cmdbuf_ptr = cmdbuf_base;
1174 cmdbuf_endp = cmdbuf_ptr + used;
1175
1176}
1177
1178#if defined (KEYSYM_RESOURCE)
1179void
1180rxvt_term::cmdbuf_append (const char *str, size_t count)
1181{
1182 cmdbuf_reify ();
1183
1184 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1185
1186 if (count > avail)
1187 return;
1188
1189 memcpy (cmdbuf_endp, str, count);
1190 cmdbuf_endp += count;
1191
1192 cmd_parse ();
1193}
1194#endif
1195
1211bool 1196bool
1212rxvt_term::pty_fill () 1197rxvt_term::pty_fill ()
1213{ 1198{
1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1199 cmdbuf_reify ();
1215 1200
1216 if (CBUFSIZ == n) 1201 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1217 { 1202
1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1203 if (!avail)
1219 n = 0;
1220 } 1204 {
1221 1205 // normally this indicates a "too long" command sequence - just drop the data we have
1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1223 cmdbuf_ptr = cmdbuf_base; 1206 cmdbuf_ptr = cmdbuf_base;
1224 cmdbuf_endp = cmdbuf_ptr + n; 1207 cmdbuf_endp = cmdbuf_ptr;
1208 avail = CBUFSIZ;
1209 }
1225 1210
1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1211 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1227 1212
1228 if (r > 0) 1213 if (r > 0)
1229 { 1214 {
1230 cmdbuf_endp += r; 1215 cmdbuf_endp += r;
1231 return true; 1216 return true;
… …
1247 1232
1248 return false; 1233 return false;
1249} 1234}
1250 1235
1251void 1236void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1237rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1238{
1254 make_current (); 1239 make_current ();
1255 1240
1256 if (revents & EVENT_READ) 1241 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1242 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1243 for (int i = CBUFCNT; i-- && pty_fill (); )
1259 if (cmd_parse ()) 1244 cmd_parse ();
1260 break;
1261 1245
1262 if (revents & EVENT_WRITE) 1246 if (revents & ev::WRITE)
1263 pty_write (); 1247 pty_write ();
1264}
1265 1248
1266void 1249 refresh_check ();
1250}
1251
1252void ecb_cold
1267rxvt_term::pointer_unblank () 1253rxvt_term::pointer_unblank ()
1268{ 1254{
1269 XDefineCursor (dpy, vt, TermWin_cursor); 1255 XDefineCursor (dpy, vt, TermWin_cursor);
1270 recolour_cursor (); 1256 recolour_cursor ();
1271 1257
1272#ifdef POINTER_BLANK 1258#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1259 hidden_pointer = 0;
1274 1260
1275 if (option (Opt_pointerBlank)) 1261 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1262 pointer_ev.start (pointerBlankDelay);
1277#endif 1263#endif
1278} 1264}
1279 1265
1280#ifdef POINTER_BLANK 1266#ifdef POINTER_BLANK
1281void 1267void ecb_cold
1282rxvt_term::pointer_blank () 1268rxvt_term::pointer_blank ()
1283{ 1269{
1284 if (!option (Opt_pointerBlank)) 1270 if (!option (Opt_pointerBlank))
1285 return; 1271 return;
1286 1272
… …
1288 XFlush (dpy); 1274 XFlush (dpy);
1289 1275
1290 hidden_pointer = 1; 1276 hidden_pointer = 1;
1291} 1277}
1292 1278
1293void 1279void ecb_cold
1294rxvt_term::pointer_cb (time_watcher &w) 1280rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1281{
1296 make_current (); 1282 make_current ();
1297 1283
1298 pointer_blank (); 1284 pointer_blank ();
1299} 1285}
… …
1302void 1288void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1289rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1290{
1305 int button_number, key_state = 0; 1291 int button_number, key_state = 0;
1306 int x, y; 1292 int x, y;
1293 int code = 32;
1307 1294
1308 x = ev.x; 1295 x = Pixel2Col (ev.x) + 1;
1309 y = ev.y; 1296 y = Pixel2Row (ev.y) + 1;
1310 pixel_position (&x, &y); 1297
1298 if (ev.type == MotionNotify)
1299 {
1300 if (x == mouse_row && y == mouse_col)
1301 return;
1302
1303 mouse_row = x;
1304 mouse_col = y;
1305 code += 32;
1306 }
1311 1307
1312 if (MEvent.button == AnyButton) 1308 if (MEvent.button == AnyButton)
1313 button_number = 3; 1309 button_number = 3;
1314 else 1310 else
1315 { 1311 {
1316 button_number = MEvent.button - Button1; 1312 button_number = MEvent.button - Button1;
1317 /* add 0x3D for wheel events, like xterm does */ 1313 /* add 0x3D for wheel events, like xterm does */
1318 if (button_number >= 3) 1314 if (button_number >= 3)
1319 button_number += (64 - 3); 1315 button_number += 64 - 3;
1320 } 1316 }
1321 1317
1322 if (priv_modes & PrivMode_MouseX10) 1318 if (priv_modes & PrivMode_MouseX10)
1323 { 1319 {
1324 /* 1320 /*
… …
1356 fputc ('A', stderr); 1352 fputc ('A', stderr);
1357 if (key_state & 32) 1353 if (key_state & 32)
1358 fputc ('2', stderr); 1354 fputc ('2', stderr);
1359 fprintf (stderr, "]: <%d>, %d/%d\n", 1355 fprintf (stderr, "]: <%d>, %d/%d\n",
1360 button_number, 1356 button_number,
1361 x + 1, 1357 x,
1362 y + 1); 1358 y);
1363#endif 1359#endif
1364 1360
1361#if ENABLE_FRILLS
1362 if (priv_modes & PrivMode_ExtMouseRight)
1363 tt_printf ("\033[%d;%d;%dM",
1364 code + button_number + key_state,
1365 x,
1366 y);
1367 else if (priv_modes & PrivMode_ExtModeMouse)
1368 tt_printf ("\033[M%c%lc%lc",
1369 code + button_number + key_state,
1370 wint_t (32 + x),
1371 wint_t (32 + y));
1372 else
1373#endif
1365 tt_printf ("\033[M%c%c%c", 1374 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1375 code + button_number + key_state,
1367 (32 + x + 1), 1376 32 + x,
1368 (32 + y + 1)); 1377 32 + y);
1369} 1378}
1370 1379
1371/*{{{ process an X event */ 1380/*{{{ process an X event */
1372void 1381void ecb_hot
1373rxvt_term::x_cb (XEvent &ev) 1382rxvt_term::x_cb (XEvent &ev)
1374{ 1383{
1375 make_current (); 1384 make_current ();
1376 1385
1377 dLocal (Display *, dpy); 1386 dLocal (Display *, dpy);
… …
1475 && ev.xfocus.mode != NotifyGrab) 1484 && ev.xfocus.mode != NotifyGrab)
1476 focus_out (); 1485 focus_out ();
1477 break; 1486 break;
1478 1487
1479 case ConfigureNotify: 1488 case ConfigureNotify:
1480 if (ev.xconfigure.window == parent[0]) 1489 if (ev.xconfigure.window == parent)
1481 { 1490 {
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1492 ;
1493
1494 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1495
1496 bool moved = false;
1497#ifdef HAVE_BG_PIXMAP
1498 if (bg_window_position_sensitive ())
1499 {
1500 want_position_change = true;
1501 if (bg_img == 0)
1502 moved = true;
1503 }
1504#endif
1505
1506 if (want_position_change)
1507 {
1508 int x, y;
1509
1510 if (ev.xconfigure.send_event)
1511 {
1512 x = ev.xconfigure.x;
1513 y = ev.xconfigure.y;
1514 }
1515 else
1516 get_window_origin (x, y);
1517
1518 if (x != parent_x || y != parent_y)
1519 {
1520 parent_x = x;
1521 parent_y = y;
1522 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1523 moved = true;
1524 }
1525 }
1484 1526
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1527 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1528 {
1487 seen_resize = 1; 1529 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1491 {
1492 resize_pixmap ();
1493 scr_touch (true);
1494 }
1495#endif
1496 } 1531 }
1532 else
1533 {
1534#ifdef HAVE_BG_PIXMAP
1535 if (moved)
1536 update_background ();
1537#endif
1538 }
1497 1539
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1540 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent))
1502 check_our_parents ();
1503#endif
1504 } 1541 }
1505 break; 1542 break;
1506 1543
1507 case PropertyNotify: 1544 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1545 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1509 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1510 && ev.xproperty.state == PropertyNewValue)
1511 selection_property (ev.xproperty.window, ev.xproperty.atom);
1512
1513 break; 1546 break;
1514 1547
1515 case SelectionClear: 1548 case SelectionClear:
1516 selection_clear (); 1549 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1517 break;
1518
1519 case SelectionNotify:
1520 if (selection_wait == Sel_normal)
1521 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1522 break; 1550 break;
1523 1551
1524 case SelectionRequest: 1552 case SelectionRequest:
1525 selection_send (ev.xselectionrequest); 1553 selection_send (ev.xselectionrequest);
1526 break; 1554 break;
1527 1555
1528 case MapNotify: 1556 case MapNotify:
1557#ifdef HAVE_BG_PIXMAP
1558 // This is needed at startup for the case of no window manager
1559 // or a non-reparenting window manager and also because we
1560 // defer bg image updates if the window is not mapped. The
1561 // short delay is to optimize for multiple ConfigureNotify
1562 // events at startup when the window manager reparents the
1563 // window, so as to perform the computation after we have
1564 // received all of them.
1565 if (bg_img == 0)
1566 update_background_ev.start (0.025);
1567#endif
1529 mapped = 1; 1568 mapped = 1;
1530#ifdef TEXT_BLINK 1569#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1570 text_blink_ev.start ();
1532#endif 1571#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1572 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1534 break; 1573 break;
1535 1574
1536 case UnmapNotify: 1575 case UnmapNotify:
… …
1538#ifdef TEXT_BLINK 1577#ifdef TEXT_BLINK
1539 text_blink_ev.stop (); 1578 text_blink_ev.stop ();
1540#endif 1579#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1580 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1581 break;
1543
1544#ifdef ENABLE_TRANSPARENCY
1545 case ReparentNotify:
1546 rootwin_cb (ev);
1547 break;
1548#endif /* ENABLE_TRANSPARENCY */
1549 1582
1550 case GraphicsExpose: 1583 case GraphicsExpose:
1551 case Expose: 1584 case Expose:
1552 if (ev.xany.window == vt) 1585 if (ev.xany.window == vt)
1553 { 1586 {
1554 do 1587 do
1588 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1591 }
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1592 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1558 1593
1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1594 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1560 1595
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1596 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1597 {
1562 scr_expose (ev.xexpose.x, ev.xexpose.y, 1598 scr_expose (ev.xexpose.x, ev.xexpose.y,
1563 ev.xexpose.width, ev.xexpose.height, False); 1599 ev.xexpose.width, ev.xexpose.height, false);
1600 }
1564 1601
1565 want_refresh = 1; 1602 want_refresh = 1;
1566 } 1603 }
1567 else 1604 else
1568 { 1605 {
… …
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1608 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1572 ; 1609 ;
1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1610 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1574 ; 1611 ;
1575 1612
1576 if (isScrollbarWindow (ev.xany.window)) 1613 if (scrollBar.state && ev.xany.window == scrollBar.win)
1577 { 1614 {
1578 scrollBar.setIdle (); 1615 scrollBar.state = SB_STATE_IDLE;
1579 scrollbar_show (0); 1616 scrollBar.show (0);
1580 } 1617 }
1581
1582#ifdef ENABLE_TRANSPARENCY
1583 if (am_transparent && ev.xany.window == parent[0])
1584 XClearWindow (dpy, ev.xany.window);
1585#endif
1586 } 1618 }
1587 break; 1619 break;
1588 1620
1589 case MotionNotify: 1621 case MotionNotify:
1590#ifdef POINTER_BLANK 1622#ifdef POINTER_BLANK
1591 if (hidden_pointer) 1623 if (hidden_pointer)
1592 pointer_unblank (); 1624 pointer_unblank ();
1593#endif 1625#endif
1626 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1627 || priv_modes & PrivMode_MouseAnyEvent)
1628 mouse_report (ev.xbutton);
1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1629 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1595 break; 1630 break;
1596 1631
1597 if (ev.xany.window == vt) 1632 if (ev.xany.window == vt)
1598 { 1633 {
… …
1627 1662
1628#ifdef SELECTION_SCROLLING 1663#ifdef SELECTION_SCROLLING
1629 if (ev.xbutton.y < int_bwidth 1664 if (ev.xbutton.y < int_bwidth
1630 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1665 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1631 { 1666 {
1667 page_dirn scroll_selection_dir;
1632 int dist; 1668 int dist;
1633 1669
1634 /* don't clobber the current delay if we are 1670 /* don't clobber the current delay if we are
1635 * already in the middle of scrolling. 1671 * already in the middle of scrolling.
1636 */ 1672 */
1637 if (!sel_scroll_ev.active) 1673 if (!sel_scroll_ev.is_active ())
1638 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1674 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1639 1675
1640 /* save the event params so we can highlight 1676 /* save the event params so we can highlight
1641 * the selection in the pending-scroll loop 1677 * the selection in the pending-scroll loop
1642 */ 1678 */
1643 selection_save_x = ev.xbutton.x; 1679 selection_save_x = ev.xbutton.x;
… …
1651 dist = int_bwidth - ev.xbutton.y; 1687 dist = int_bwidth - ev.xbutton.y;
1652 } 1688 }
1653 else 1689 else
1654 { 1690 {
1655 scroll_selection_dir = DN; 1691 scroll_selection_dir = DN;
1656 dist = ev.xbutton.y - (int_bwidth + height); 1692 dist = ev.xbutton.y - (int_bwidth + vt_height);
1657 } 1693 }
1658 1694
1659 scroll_selection_lines = Pixel2Height (dist) 1695 scroll_selection_lines = Pixel2Height (dist)
1660 / SELECTION_SCROLL_LINE_SPEEDUP 1696 / SELECTION_SCROLL_LINE_SPEEDUP
1661 + 1; 1697 + 1;
1662 min_it (scroll_selection_lines, 1698 min_it (scroll_selection_lines,
1663 SELECTION_SCROLL_MAX_LINES); 1699 SELECTION_SCROLL_MAX_LINES);
1700 scroll_selection_lines *= scroll_selection_dir;
1664 } 1701 }
1665 else 1702 else
1666 { 1703 {
1667 /* we are within the text window, so we 1704 /* we are within the text window, so we
1668 * shouldn't be scrolling 1705 * shouldn't be scrolling
1669 */ 1706 */
1670 if (sel_scroll_ev.active)
1671 sel_scroll_ev.stop(); 1707 sel_scroll_ev.stop();
1672 } 1708 }
1673#endif 1709#endif
1674#ifdef MOUSE_THRESHOLD 1710#ifdef MOUSE_THRESHOLD
1675 } 1711 }
1676#endif 1712#endif
1677 } 1713 }
1678 } 1714 }
1679 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1715 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1680 { 1716 {
1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1717 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1682 MotionNotify, &ev)) 1718 MotionNotify, &ev))
1683 ; 1719 ;
1684 1720
1685 XQueryPointer (dpy, scrollBar.win, 1721 XQueryPointer (dpy, scrollBar.win,
1686 &unused_root, &unused_child, 1722 &unused_root, &unused_child,
1687 &unused_root_x, &unused_root_y, 1723 &unused_root_x, &unused_root_y,
1688 &ev.xbutton.x, &ev.xbutton.y, 1724 &ev.xbutton.x, &ev.xbutton.y,
1689 &unused_mask); 1725 &unused_mask);
1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1726 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1691 scrollbar_size ()); 1727 scrollBar.size ());
1692 want_refresh = 1; 1728 want_refresh = 1;
1693 scrollbar_show (1); 1729 scrollBar.show (1);
1694 } 1730 }
1695 break; 1731 break;
1696 } 1732 }
1697 1733
1698#if defined(CURSOR_BLINK) 1734#if defined(CURSOR_BLINK)
1699 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1735 if (ev.type == KeyPress)
1700 { 1736 cursor_blink_reset ();
1701 if (hidden_cursor)
1702 {
1703 hidden_cursor = 0;
1704 want_refresh = 1;
1705 }
1706
1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1708 }
1709#endif 1737#endif
1710 1738
1711#if defined(POINTER_BLANK) 1739#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1740 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1713 { 1741 {
… …
1719 1747
1720 if (ev.type == KeyPress && hidden_pointer == 0) 1748 if (ev.type == KeyPress && hidden_pointer == 0)
1721 pointer_blank (); 1749 pointer_blank ();
1722 } 1750 }
1723#endif 1751#endif
1724}
1725 1752
1726void 1753 refresh_check ();
1754}
1755
1756#if ENABLE_FRILLS
1757void ecb_cold
1758rxvt_term::set_urgency (bool enable)
1759{
1760 if (enable == urgency_hint)
1761 return;
1762
1763 if (XWMHints *h = XGetWMHints (dpy, parent))
1764 {
1765 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1766 XSetWMHints (dpy, parent, h);
1767 urgency_hint = enable;
1768 XFree (h);
1769 }
1770}
1771#endif
1772
1773void ecb_cold
1727rxvt_term::focus_in () 1774rxvt_term::focus_in ()
1728{ 1775{
1729 if (!focus) 1776 if (!focus)
1730 { 1777 {
1731 focus = 1; 1778 focus = 1;
1732 want_refresh = 1; 1779 want_refresh = 1;
1733 1780
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1735
1736#if USE_XIM 1781#if USE_XIM
1737 if (Input_Context != NULL) 1782 if (Input_Context != NULL)
1738 { 1783 {
1739 IMSetPosition (); 1784 im_set_position ();
1740 XSetICFocus (Input_Context); 1785 XSetICFocus (Input_Context);
1741 } 1786 }
1742#endif 1787#endif
1743#if CURSOR_BLINK 1788#if CURSOR_BLINK
1744 if (option (Opt_cursorBlink)) 1789 if (option (Opt_cursorBlink))
1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1790 cursor_blink_ev.again ();
1746#endif 1791#endif
1747#if OFF_FOCUS_FADING 1792#if OFF_FOCUS_FADING
1748 if (rs[Rs_fade]) 1793 if (rs[Rs_fade])
1749 { 1794 {
1750 pix_colors = pix_colors_focused; 1795 pix_colors = pix_colors_focused;
1751 scr_recolour (); 1796 scr_recolour ();
1752 } 1797 }
1753#endif 1798#endif
1754#if ENABLE_FRILLS 1799#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell)) 1800 if (option (Opt_urgentOnBell))
1756 { 1801 set_urgency (0);
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]);
1760 if (h != NULL)
1761 {
1762 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h);
1764 }
1765 }
1766#endif 1802#endif
1767 }
1768}
1769 1803
1770void 1804 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1805 }
1806}
1807
1808void ecb_cold
1771rxvt_term::focus_out () 1809rxvt_term::focus_out ()
1772{ 1810{
1773 if (focus) 1811 if (focus)
1774 { 1812 {
1775 focus = 0; 1813 focus = 0;
1776 want_refresh = 1; 1814 want_refresh = 1;
1777 1815
1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1816#if ENABLE_FRILLS
1779 1817 if (option (Opt_urgentOnBell))
1818 set_urgency (0);
1819#endif
1780#if ENABLE_FRILLS || ISO_14755 1820#if ENABLE_FRILLS || ISO_14755
1781 if (iso14755buf) 1821 if (iso14755buf)
1782 { 1822 {
1783 iso14755buf = 0; 1823 iso14755buf = 0;
1784# if ISO_14755 1824# if ISO_14755
… …
1791 XUnsetICFocus (Input_Context); 1831 XUnsetICFocus (Input_Context);
1792#endif 1832#endif
1793#if CURSOR_BLINK 1833#if CURSOR_BLINK
1794 if (option (Opt_cursorBlink)) 1834 if (option (Opt_cursorBlink))
1795 cursor_blink_ev.stop (); 1835 cursor_blink_ev.stop ();
1836
1796 hidden_cursor = 0; 1837 hidden_cursor = 0;
1797#endif 1838#endif
1798#if OFF_FOCUS_FADING 1839#if OFF_FOCUS_FADING
1799 if (rs[Rs_fade]) 1840 if (rs[Rs_fade])
1800 { 1841 {
1801 pix_colors = pix_colors_unfocused; 1842 pix_colors = pix_colors_unfocused;
1802 scr_recolour (); 1843 scr_recolour ();
1803 } 1844 }
1804#endif 1845#endif
1805 }
1806}
1807 1846
1808void 1847 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1848 }
1849}
1850
1851void ecb_cold
1809rxvt_term::update_fade_color (unsigned int idx) 1852rxvt_term::update_fade_color (unsigned int idx)
1810{ 1853{
1811#if OFF_FOCUS_FADING 1854#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1855 if (rs[Rs_fade])
1813 { 1856 {
… …
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1859 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 } 1860 }
1818#endif 1861#endif
1819} 1862}
1820 1863
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL 1864#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1822void 1865void ecb_hot
1823rxvt_term::rootwin_cb (XEvent &ev) 1866rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1867{
1825 make_current (); 1868 make_current ();
1826 1869
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1870 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1871 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return; 1872 return;
1830 1873
1831# if ENABLE_TRANSPARENCY
1832 switch (ev.type) 1874 switch (ev.type)
1833 { 1875 {
1834 case PropertyNotify: 1876 case PropertyNotify:
1835 /* 1877 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1878 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1879 * use the property to determine the pixmap. We use it later on.
1838 */ 1880 */
1839 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1881 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1882 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 return; 1883 {
1842 1884#if BG_IMAGE_FROM_ROOT
1843 /* FALLTHROUGH */
1844 case ReparentNotify:
1845 if (option (Opt_transparent)) 1885 if (option (Opt_transparent))
1846 check_our_parents (); 1886 {
1847 break; 1887 rxvt_img::new_from_root (this)->replace (root_img);
1848 } 1888 update_background ();
1889 }
1849# endif 1890#endif
1891 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1892 }
1893
1894 break;
1895 }
1896
1897 refresh_check ();
1850} 1898}
1851#endif 1899#endif
1852 1900
1853void 1901void
1854rxvt_term::button_press (XButtonEvent &ev) 1902rxvt_term::button_press (XButtonEvent &ev)
… …
1885 /* save the xbutton state (for ButtonRelease) */ 1933 /* save the xbutton state (for ButtonRelease) */
1886 MEvent.state = ev.state; 1934 MEvent.state = ev.state;
1887#ifdef MOUSE_REPORT_DOUBLECLICK 1935#ifdef MOUSE_REPORT_DOUBLECLICK
1888 if (ev.button == MEvent.button && clickintime) 1936 if (ev.button == MEvent.button && clickintime)
1889 { 1937 {
1890 /* same button, within alloted time */ 1938 /* same button, within allowed time */
1891 MEvent.clicks++; 1939 MEvent.clicks++;
1892 1940
1893 if (MEvent.clicks > 1) 1941 if (MEvent.clicks > 1)
1894 { 1942 {
1895 /* only report double clicks */ 1943 /* only report double clicks */
… …
1909 mouse_report (ev); 1957 mouse_report (ev);
1910 } 1958 }
1911#else 1959#else
1912 MEvent.button = ev.button; 1960 MEvent.button = ev.button;
1913 mouse_report (ev); 1961 mouse_report (ev);
1914#endif /* MOUSE_REPORT_DOUBLECLICK */ 1962#endif /* MOUSE_REPORT_DOUBLECLICK */
1915 1963
1916 } 1964 }
1917 else 1965 else
1918 { 1966 {
1919 if (ev.button != MEvent.button) 1967 if (ev.button != MEvent.button)
… …
1967 } 2015 }
1968 2016
1969 /* 2017 /*
1970 * Scrollbar window processing of button press 2018 * Scrollbar window processing of button press
1971 */ 2019 */
1972 if (isScrollbarWindow (ev.window)) 2020 if (scrollBar.state && ev.window == scrollBar.win)
1973 { 2021 {
1974 scrollBar.setIdle (); 2022 page_dirn direction = NO_DIR;
2023
2024 if (scrollBar.upButton (ev.y))
2025 direction = UP; /* up */
2026 else if (scrollBar.dnButton (ev.y))
2027 direction = DN; /* down */
2028
2029 scrollBar.state = SB_STATE_IDLE;
1975 /* 2030 /*
1976 * Rxvt-style scrollbar: 2031 * Rxvt-style scrollbar:
1977 * move up if mouse is above slider 2032 * move up if mouse is above slider
1978 * move dn if mouse is below slider 2033 * move dn if mouse is below slider
1979 * 2034 *
… …
1988 /* 2043 /*
1989 * Mouse report disabled scrollbar: 2044 * Mouse report disabled scrollbar:
1990 * arrow buttons - send up/down 2045 * arrow buttons - send up/down
1991 * click on scrollbar - send pageup/down 2046 * click on scrollbar - send pageup/down
1992 */ 2047 */
1993 if ((scrollBar.style == R_SB_NEXT 2048 if (direction == UP)
1994 && scrollbarnext_upButton (ev.y))
1995 || (scrollBar.style == R_SB_RXVT
1996 && scrollbarrxvt_upButton (ev.y)))
1997 tt_printf ("\033[A"); 2049 tt_printf ("\033[A");
1998 else if ((scrollBar.style == R_SB_NEXT 2050 else if (direction == DN)
1999 && scrollbarnext_dnButton (ev.y))
2000 || (scrollBar.style == R_SB_RXVT
2001 && scrollbarrxvt_dnButton (ev.y)))
2002 tt_printf ("\033[B"); 2051 tt_printf ("\033[B");
2003 else 2052 else
2004 switch (ev.button) 2053 switch (ev.button)
2005 { 2054 {
2006 case Button2: 2055 case Button2:
… …
2013 tt_printf ("\033[5~"); 2062 tt_printf ("\033[5~");
2014 break; 2063 break;
2015 } 2064 }
2016 } 2065 }
2017 else 2066 else
2018#endif /* NO_SCROLLBAR_REPORT */ 2067#endif /* NO_SCROLLBAR_REPORT */
2019
2020 {
2021 char upordown = 0;
2022
2023 if (scrollBar.style == R_SB_NEXT)
2024 { 2068 {
2025 if (scrollbarnext_upButton (ev.y)) 2069 if (direction != NO_DIR)
2026 upordown = -1; /* up */
2027 else if (scrollbarnext_dnButton (ev.y))
2028 upordown = 1; /* down */
2029 }
2030 else if (scrollBar.style == R_SB_RXVT)
2031 {
2032 if (scrollbarrxvt_upButton (ev.y))
2033 upordown = -1; /* up */
2034 else if (scrollbarrxvt_dnButton (ev.y))
2035 upordown = 1; /* down */
2036 }
2037 if (upordown)
2038 { 2070 {
2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2072 if (!cont_scroll_ev.is_active ())
2040 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2073 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2041#endif 2074#endif
2042 if (scr_page (upordown < 0 ? UP : DN, 1)) 2075 if (scr_page (direction, 1))
2043 { 2076 {
2044 if (upordown < 0) 2077 if (direction == UP)
2045 scrollBar.setUp (); 2078 scrollBar.state = SB_STATE_UP;
2046 else 2079 else
2047 scrollBar.setDn (); 2080 scrollBar.state = SB_STATE_DOWN;
2048 } 2081 }
2049 } 2082 }
2050 else 2083 else
2051 switch (ev.button) 2084 switch (ev.button)
2052 { 2085 {
2053 case Button2: 2086 case Button2:
2054 switch (scrollbar_align) 2087 switch (scrollBar.align)
2055 { 2088 {
2056 case R_SB_ALIGN_TOP: 2089 case SB_ALIGN_TOP:
2057 csrO = 0; 2090 csrO = 0;
2058 break; 2091 break;
2059 case R_SB_ALIGN_CENTRE: 2092 case SB_ALIGN_CENTRE:
2060 csrO = (scrollBar.bot - scrollBar.top) / 2; 2093 csrO = (scrollBar.bot - scrollBar.top) / 2;
2061 break; 2094 break;
2062 case R_SB_ALIGN_BOTTOM: 2095 case SB_ALIGN_BOTTOM:
2063 csrO = scrollBar.bot - scrollBar.top; 2096 csrO = scrollBar.bot - scrollBar.top;
2064 break; 2097 break;
2065 } 2098 }
2066 2099
2067 if (scrollBar.style == R_SB_XTERM 2100 if (scrollBar.style == SB_STYLE_XTERM
2068 || scrollbar_above_slider (ev.y) 2101 || scrollBar.above_slider (ev.y)
2069 || scrollbar_below_slider (ev.y)) 2102 || scrollBar.below_slider (ev.y))
2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2103 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2071 2104
2072 scrollBar.setMotion (); 2105 scrollBar.state = SB_STATE_MOTION;
2073 break; 2106 break;
2074 2107
2075 case Button1: 2108 case Button1:
2076 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2109 if (scrollBar.align == SB_ALIGN_CENTRE)
2077 csrO = ev.y - scrollBar.top; 2110 csrO = ev.y - scrollBar.top;
2078 /* FALLTHROUGH */ 2111 /* FALLTHROUGH */
2079 2112
2080 case Button3: 2113 case Button3:
2081 if (scrollBar.style != R_SB_XTERM) 2114 if (scrollBar.style != SB_STYLE_XTERM)
2082 { 2115 {
2083 if (scrollbar_above_slider (ev.y)) 2116 if (scrollBar.above_slider (ev.y))
2084# ifdef RXVT_SCROLL_FULL 2117# ifdef RXVT_SCROLL_FULL
2085 scr_page (UP, nrow - 1); 2118 scr_page (UP, nrow - 1);
2086# else 2119# else
2087 scr_page (UP, nrow / 4); 2120 scr_page (UP, nrow / 4);
2088# endif 2121# endif
2089 else if (scrollbar_below_slider (ev.y)) 2122 else if (scrollBar.below_slider (ev.y))
2090# ifdef RXVT_SCROLL_FULL 2123# ifdef RXVT_SCROLL_FULL
2091 scr_page (DN, nrow - 1); 2124 scr_page (DN, nrow - 1);
2092# else 2125# else
2093 scr_page (DN, nrow / 4); 2126 scr_page (DN, nrow / 4);
2094# endif 2127# endif
2095 else 2128 else
2096 scrollBar.setMotion (); 2129 scrollBar.state = SB_STATE_MOTION;
2097 } 2130 }
2098 else 2131 else
2099 { 2132 {
2100 scr_page ((ev.button == Button1 ? DN : UP), 2133 scr_page ((ev.button == Button1 ? DN : UP),
2101 (nrow 2134 (nrow
2102 * scrollbar_position (ev.y) 2135 * scrollBar.position (ev.y)
2103 / scrollbar_size ())); 2136 / scrollBar.size ()));
2104 } 2137 }
2105 2138
2106 break; 2139 break;
2107 } 2140 }
2108 } 2141 }
… …
2118 2151
2119 csrO = 0; /* reset csr Offset */ 2152 csrO = 0; /* reset csr Offset */
2120 if (!bypass_keystate) 2153 if (!bypass_keystate)
2121 reportmode = !! (priv_modes & PrivMode_mouse_report); 2154 reportmode = !! (priv_modes & PrivMode_mouse_report);
2122 2155
2123 if (scrollbar_isUpDn ()) 2156 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2124 { 2157 {
2125 scrollBar.setIdle (); 2158 scrollBar.state = SB_STATE_IDLE;
2126 scrollbar_show (0); 2159 scrollBar.show (0);
2127 } 2160 }
2128 2161
2129#ifdef SELECTION_SCROLLING 2162#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2163 sel_scroll_ev.stop();
2132#endif 2164#endif
2133 2165
2134 if (ev.window == vt) 2166 if (ev.window == vt)
2135 { 2167 {
2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2168 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2160 mouse_report (ev); 2192 mouse_report (ev);
2161 } 2193 }
2162#else /* MOUSE_REPORT_DOUBLECLICK */ 2194#else /* MOUSE_REPORT_DOUBLECLICK */
2163 MEvent.button = AnyButton; 2195 MEvent.button = AnyButton;
2164 mouse_report (ev); 2196 mouse_report (ev);
2165#endif /* MOUSE_REPORT_DOUBLECLICK */ 2197#endif /* MOUSE_REPORT_DOUBLECLICK */
2166 return; 2198 return;
2167 } 2199 }
2168 2200
2169 /* 2201 /*
2170 * dumb hack to compensate for the failure of click-and-drag 2202 * dumb hack to compensate for the failure of click-and-drag
… …
2181 case Button3: 2213 case Button3:
2182 selection_make (ev.time); 2214 selection_make (ev.time);
2183 break; 2215 break;
2184 2216
2185 case Button2: 2217 case Button2:
2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2218 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2219 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2188 break; 2220 break;
2189 2221
2190#ifdef MOUSE_WHEEL 2222#ifdef MOUSE_WHEEL
2191 case Button4: 2223 case Button4:
2192 case Button5: 2224 case Button5:
2193 { 2225 {
2194 int i; 2226 int lines;
2195 page_dirn v; 2227 page_dirn dirn;
2196 2228
2197 v = ev.button == Button4 ? UP : DN; 2229 dirn = ev.button == Button4 ? UP : DN;
2198 2230
2199 if (ev.state & ShiftMask) 2231 if (ev.state & ShiftMask)
2200 i = 1; 2232 lines = 1;
2201 else if (option (Opt_mouseWheelScrollPage)) 2233 else if (option (Opt_mouseWheelScrollPage))
2202 i = nrow - 1; 2234 lines = nrow - 1;
2203 else 2235 else
2204 i = 5; 2236 lines = 5;
2205 2237
2206# ifdef MOUSE_SLIP_WHEELING 2238# ifdef MOUSE_SLIP_WHEELING
2207 if (ev.state & ControlMask) 2239 if (ev.state & ControlMask)
2208 { 2240 {
2209 mouse_slip_wheel_speed += v ? -1 : 1; 2241 mouse_slip_wheel_speed += dirn;
2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2242 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2212 2243
2213 if (slip_wheel_ev.at < NOW) 2244 if (!slip_wheel_ev.is_active ())
2214 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2245 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2215
2216 slip_wheel_ev.start ();
2217 } 2246 }
2218 else 2247 else
2248# endif
2219 { 2249 {
2220# endif
2221 scr_page (v, i); 2250 scr_page (dirn, lines);
2222 scrollbar_show (1); 2251 scrollBar.show (1);
2223# ifdef MOUSE_SLIP_WHEELING
2224 } 2252 }
2225# endif
2226 } 2253 }
2227 break; 2254 break;
2228#endif 2255#endif
2229 } 2256 }
2230 } 2257 }
2231} 2258}
2232 2259
2233/*}}} */ 2260/*}}} */
2234 2261
2235bool 2262void ecb_hot
2236rxvt_term::cmd_parse () 2263rxvt_term::cmd_parse ()
2237{ 2264{
2238 bool flag = false;
2239 wchar_t ch = NOCHAR; 2265 wchar_t ch = NOCHAR;
2240 char *seq_begin; // remember start of esc-sequence here 2266 char *seq_begin; // remember start of esc-sequence here
2241 2267
2242 for (;;) 2268 for (;;)
2243 { 2269 {
2244 if (ch == NOCHAR) 2270 if (ecb_unlikely (ch == NOCHAR))
2245 { 2271 {
2246 seq_begin = cmdbuf_ptr; 2272 seq_begin = cmdbuf_ptr;
2247 ch = next_char (); 2273 ch = next_char ();
2248 2274
2249 if (ch == NOCHAR) 2275 if (ch == NOCHAR)
2250 break; 2276 break;
2251 } 2277 }
2252 2278
2253 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2279 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2254 { 2280 {
2255 if (!seen_input) 2281 if (ecb_unlikely (!seen_input))
2256 { 2282 {
2257 seen_input = 1; 2283 seen_input = 1;
2258 // many badly-written programs (e.g. jed) contain a race condition: 2284 // many badly-written programs (e.g. jed) contain a race condition:
2259 // they first read the screensize and then install a SIGWINCH handler. 2285 // they first read the screensize and then install a SIGWINCH handler.
2260 // some window managers resize the window early, and these programs 2286 // some window managers resize the window early, and these programs
… …
2273 wchar_t *str = buf; 2299 wchar_t *str = buf;
2274 wchar_t *eol = str + min (ncol, UBUFSIZ); 2300 wchar_t *eol = str + min (ncol, UBUFSIZ);
2275 2301
2276 for (;;) 2302 for (;;)
2277 { 2303 {
2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2304 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2279 break; 2305 break;
2280 2306
2281 *str++ = ch; 2307 *str++ = ch;
2282 2308
2283 if (ch == C0_LF || str >= eol) 2309 if (ecb_unlikely (ch == C0_LF || str >= eol))
2284 { 2310 {
2285 if (ch == C0_LF) 2311 if (ch == C0_LF)
2286 nlines++; 2312 nlines++;
2287 2313
2288 refresh_count++; 2314 refresh_count++;
2289 2315
2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2316 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2291 { 2317 {
2292 refresh_count = 0; 2318 refresh_count = 0;
2293 2319
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2320 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2295 { 2321 {
2296 refreshnow = true; 2322 refreshnow = true;
2297 ch = NOCHAR; 2323 ch = NOCHAR;
2298 break; 2324 break;
2299 } 2325 }
… …
2337 * What the heck we'll cheat and only refresh less than every page-full. 2363 * What the heck we'll cheat and only refresh less than every page-full.
2338 * if skipScroll is enabled. 2364 * if skipScroll is enabled.
2339 */ 2365 */
2340 if (refreshnow) 2366 if (refreshnow)
2341 { 2367 {
2342 flag = true;
2343 scr_refresh (); 2368 scr_refresh ();
2344 want_refresh = 1; 2369 want_refresh = 1;
2345 } 2370 }
2346
2347 } 2371 }
2348 else 2372 else
2349 { 2373 {
2350 try 2374 try
2351 { 2375 {
… …
2359 } 2383 }
2360 2384
2361 ch = NOCHAR; 2385 ch = NOCHAR;
2362 } 2386 }
2363 } 2387 }
2364
2365 return flag;
2366} 2388}
2367 2389
2368// read the next character 2390// read the next character
2369wchar_t 2391wchar_t ecb_hot
2370rxvt_term::next_char () NOTHROW 2392rxvt_term::next_char () NOTHROW
2371{ 2393{
2372 while (cmdbuf_ptr < cmdbuf_endp) 2394 while (cmdbuf_ptr < cmdbuf_endp)
2373 { 2395 {
2374 // assume 7-bit to be ascii ALWAYS 2396 // assume 7-bit to be ascii ALWAYS
2375 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2397 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2376 return *cmdbuf_ptr++; 2398 return *cmdbuf_ptr++;
2377 2399
2378 wchar_t wc; 2400 wchar_t wc;
2379 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2401 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2380 2402
… …
2384 cmdbuf_ptr = cmdbuf_endp; 2406 cmdbuf_ptr = cmdbuf_endp;
2385 break; 2407 break;
2386 } 2408 }
2387 2409
2388 if (len == (size_t)-1) 2410 if (len == (size_t)-1)
2411 {
2412 mbstate.reset (); // reset now undefined conversion state
2413 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2414 // in which case we "erroneously" return the next byte which might be valid.
2389 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2415 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2416 }
2390 2417
2391 // assume wchar == unicode 2418 // assume wchar == unicode
2392 cmdbuf_ptr += len; 2419 cmdbuf_ptr += len;
2393 return wc & UNICODE_MASK; 2420 return wc & UNICODE_MASK;
2394 } 2421 }
2395 2422
2396 return NOCHAR; 2423 return NOCHAR;
2397} 2424}
2398 2425
2399// read the next octet 2426// read the next octet
2400uint32_t 2427uint32_t ecb_hot
2401rxvt_term::next_octet () NOTHROW 2428rxvt_term::next_octet () NOTHROW
2402{ 2429{
2403 return cmdbuf_ptr < cmdbuf_endp 2430 return cmdbuf_ptr < cmdbuf_endp
2404 ? (unsigned char)*cmdbuf_ptr++ 2431 ? (unsigned char)*cmdbuf_ptr++
2405 : NOCHAR; 2432 : NOCHAR;
2406} 2433}
2407 2434
2408static class out_of_input out_of_input; 2435static class out_of_input out_of_input;
2409 2436
2410/* rxvt_cmd_getc () - Return next input character */ 2437wchar_t ecb_hot
2411/*
2412 * Return the next input character after first passing any keyboard input
2413 * to the command.
2414 */
2415wchar_t
2416rxvt_term::cmd_getc () THROW ((class out_of_input)) 2438rxvt_term::cmd_getc () THROW ((class out_of_input))
2417{ 2439{
2418 wchar_t c = next_char (); 2440 wchar_t c = next_char ();
2419 2441
2420 if (c == NOCHAR) 2442 if (c == NOCHAR)
2421 throw out_of_input; 2443 throw out_of_input;
2422 2444
2423 return c; 2445 return c;
2424} 2446}
2425 2447
2426uint32_t 2448uint32_t ecb_hot
2427rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2449rxvt_term::cmd_get8 () THROW ((class out_of_input))
2428{ 2450{
2429 uint32_t c = next_octet (); 2451 uint32_t c = next_octet ();
2430 2452
2431 if (c == NOCHAR) 2453 if (c == NOCHAR)
… …
2435} 2457}
2436 2458
2437/*{{{ print pipe */ 2459/*{{{ print pipe */
2438/*----------------------------------------------------------------------*/ 2460/*----------------------------------------------------------------------*/
2439#ifdef PRINTPIPE 2461#ifdef PRINTPIPE
2440FILE * 2462FILE * ecb_cold
2441rxvt_term::popen_printer () 2463rxvt_term::popen_printer ()
2442{ 2464{
2443 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2465 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2444 2466
2445 if (stream == NULL) 2467 if (stream == NULL)
2446 rxvt_warn ("can't open printer pipe, not printing.\n"); 2468 rxvt_warn ("can't open printer pipe, not printing.\n");
2447 2469
2448 return stream; 2470 return stream;
2449} 2471}
2450 2472
2451int 2473int ecb_cold
2452rxvt_term::pclose_printer (FILE *stream) 2474rxvt_term::pclose_printer (FILE *stream)
2453{ 2475{
2454 fflush (stream); 2476 fflush (stream);
2455 return pclose (stream); 2477 return pclose (stream);
2456} 2478}
2457 2479
2458/* 2480/*
2459 * simulate attached vt100 printer 2481 * simulate attached vt100 printer
2460 */ 2482 */
2461void 2483void ecb_cold
2462rxvt_term::process_print_pipe () 2484rxvt_term::process_print_pipe ()
2463{ 2485{
2464 int done; 2486 FILE *fd = popen_printer ();
2465 FILE *fd;
2466 2487
2467 if ((fd = popen_printer ()) == NULL) 2488 if (!fd)
2468 return; 2489 return;
2469 2490
2470 /* 2491 /*
2471 * Send all input to the printer until either ESC[4i or ESC[?4i 2492 * Send all input to the printer until either ESC[4i or ESC[?4i
2472 * is received. 2493 * is received.
2473 */ 2494 */
2474 for (done = 0; !done;) 2495 for (int done = 0; !done; )
2475 { 2496 {
2476 unsigned char buf[8]; 2497 unsigned char buf[8];
2477 unicode_t ch; 2498 unicode_t ch;
2478 unsigned int i, len; 2499 unsigned int i, len;
2479 2500
… …
2510 } 2531 }
2511 } 2532 }
2512 2533
2513 pclose_printer (fd); 2534 pclose_printer (fd);
2514} 2535}
2515#endif /* PRINTPIPE */ 2536#endif /* PRINTPIPE */
2516/*}}} */ 2537/*}}} */
2517 2538
2518/* *INDENT-OFF* */
2519enum { 2539enum {
2520 C1_40 = 0x40, 2540 C1_40 = 0x40,
2521 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2541 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2522 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2542 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2523 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2543 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2524 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2544 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2525}; 2545};
2526/* *INDENT-ON* */
2527 2546
2528/*{{{ process non-printing single characters */ 2547/*{{{ process non-printing single characters */
2529void 2548void ecb_hot
2530rxvt_term::process_nonprinting (unicode_t ch) 2549rxvt_term::process_nonprinting (unicode_t ch)
2531{ 2550{
2532 switch (ch) 2551 switch (ch)
2533 { 2552 {
2534 case C0_ESC: 2553 case C0_ESC:
… …
2580} 2599}
2581/*}}} */ 2600/*}}} */
2582 2601
2583 2602
2584/*{{{ process VT52 escape sequences */ 2603/*{{{ process VT52 escape sequences */
2585void 2604void ecb_cold
2586rxvt_term::process_escape_vt52 (unicode_t ch) 2605rxvt_term::process_escape_vt52 (unicode_t ch)
2587{ 2606{
2588 int row, col; 2607 int row, col;
2589 2608
2590 switch (ch) 2609 switch (ch)
… …
2624 break; 2643 break;
2625 case 'Z': /* identify the terminal type */ 2644 case 'Z': /* identify the terminal type */
2626 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2645 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2627 break; 2646 break;
2628 case '<': /* turn off VT52 mode */ 2647 case '<': /* turn off VT52 mode */
2629 PrivMode (0, PrivMode_vt52); 2648 priv_modes &= ~PrivMode_vt52;
2630 break; 2649 break;
2631 case 'F': /* use special graphics character set */ 2650 case 'F': /* use special graphics character set */
2632 case 'G': /* use regular character set */ 2651 case 'G': /* use regular character set */
2633 /* unimplemented */ 2652 /* unimplemented */
2634 break; 2653 break;
… …
2640} 2659}
2641/*}}} */ 2660/*}}} */
2642 2661
2643 2662
2644/*{{{ process escape sequences */ 2663/*{{{ process escape sequences */
2645void 2664void ecb_hot
2646rxvt_term::process_escape_seq () 2665rxvt_term::process_escape_seq ()
2647{ 2666{
2648 unicode_t ch = cmd_getc (); 2667 unicode_t ch = cmd_getc ();
2649 2668
2650 if (priv_modes & PrivMode_vt52) 2669 if (priv_modes & PrivMode_vt52)
… …
2653 return; 2672 return;
2654 } 2673 }
2655 2674
2656 switch (ch) 2675 switch (ch)
2657 { 2676 {
2658 /* case 1: do_tek_mode (); break; */
2659 case '#': 2677 case '#':
2660 if (cmd_getc () == '8') 2678 if (cmd_getc () == '8')
2661 scr_E (); 2679 scr_E ();
2662 break; 2680 break;
2663 case '(': 2681 case '(':
… …
2686#if !ENABLE_MINIMAL 2704#if !ENABLE_MINIMAL
2687 case '9': 2705 case '9':
2688 scr_forwardindex (); 2706 scr_forwardindex ();
2689 break; 2707 break;
2690#endif 2708#endif
2709 // DECPAM/DECPNM
2691 case '=': 2710 case '=':
2711 priv_modes |= PrivMode_aplKP;
2712 break;
2692 case '>': 2713 case '>':
2693 PrivMode ((ch == '='), PrivMode_aplKP); 2714 priv_modes &= ~PrivMode_aplKP;
2694 break; 2715 break;
2695 2716
2696 case C1_40: 2717 case C1_40:
2697 cmd_getc (); 2718 cmd_getc ();
2698 break; 2719 break;
… …
2702 2723
2703 /* 8.3.87: NEXT LINE */ 2724 /* 8.3.87: NEXT LINE */
2704 case C1_NEL: /* ESC E */ 2725 case C1_NEL: /* ESC E */
2705 { 2726 {
2706 wchar_t nlcr[] = { C0_LF, C0_CR }; 2727 wchar_t nlcr[] = { C0_LF, C0_CR };
2707 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2728 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2708 } 2729 }
2709 break; 2730 break;
2710 2731
2711 /* kidnapped escape sequence: Should be 8.3.48 */ 2732 /* kidnapped escape sequence: Should be 8.3.48 */
2712 case C1_ESA: /* ESC G */ 2733 case C1_ESA: /* ESC G */
2713 process_graphics (); 2734 // used by original rxvt for rob nations own graphics mode
2735 if (cmd_getc () == 'Q')
2736 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2714 break; 2737 break;
2715 2738
2716 /* 8.3.63: CHARACTER TABULATION SET */ 2739 /* 8.3.63: CHARACTER TABULATION SET */
2717 case C1_HTS: /* ESC H */ 2740 case C1_HTS: /* ESC H */
2718 scr_set_tab (1); 2741 scr_set_tab (1);
… …
2722 case C1_RI: /* ESC M */ 2745 case C1_RI: /* ESC M */
2723 scr_index (DN); 2746 scr_index (DN);
2724 break; 2747 break;
2725 2748
2726 /* 8.3.142: SINGLE-SHIFT TWO */ 2749 /* 8.3.142: SINGLE-SHIFT TWO */
2727 /*case C1_SS2: scr_single_shift (2); break; */ 2750 /* case C1_SS2: break; */
2728 2751
2729 /* 8.3.143: SINGLE-SHIFT THREE */ 2752 /* 8.3.143: SINGLE-SHIFT THREE */
2730 /*case C1_SS3: scr_single_shift (3); break; */ 2753 /* case C1_SS3: break; */
2731 2754
2732 /* 8.3.27: DEVICE CONTROL STRING */ 2755 /* 8.3.27: DEVICE CONTROL STRING */
2733 case C1_DCS: /* ESC P */ 2756 case C1_DCS: /* ESC P */
2734 process_dcs_seq (); 2757 process_dcs_seq ();
2735 break; 2758 break;
… …
2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2760 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2738 case C1_SCI: /* ESC Z */ 2761 case C1_SCI: /* ESC Z */
2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2762 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2740 break; /* steal obsolete ESC [ c */ 2763 break; /* steal obsolete ESC [ c */
2741 2764
2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2765 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2743 case C1_CSI: /* ESC [ */ 2766 case C1_CSI: /* ESC [ */
2744 process_csi_seq (); 2767 process_csi_seq ();
2745 break; 2768 break;
2746 2769
2747 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2770 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2748 case C1_OSC: /* ESC ] */ 2771 case C1_OSC: /* ESC ] */
2749 process_osc_seq (); 2772 process_osc_seq ();
2750 break; 2773 break;
2751 2774
2752 /* 8.3.106: RESET TO INITIAL STATE */ 2775 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2753 case 'c': 2776 case 'c':
2754 mbstate.reset (); 2777 mbstate.reset ();
2755 scr_poweron (); 2778 scr_poweron ();
2756 scrollbar_show (1); 2779 scrollBar.show (1);
2757 break; 2780 break;
2758 2781
2759 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2782 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2760 case 'n': 2783 case 'n':
2761 scr_charset_choose (2); 2784 scr_charset_choose (2);
… …
2768 } 2791 }
2769} 2792}
2770/*}}} */ 2793/*}}} */
2771 2794
2772/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2795/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2773/* *INDENT-OFF* */
2774enum { 2796enum {
2775 CSI_ICH = 0x40, 2797 CSI_ICH = 0x40,
2776 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2798 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2777 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2799 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2778 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2800 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2781 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2803 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2782 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2804 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2783 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2805 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2784}; 2806};
2785 2807
2786#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2808#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2787 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2809 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2788 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2810 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2789#define get_byte_array_bit(array, bit) \ 2811#define get_byte_array_bit(array, bit) \
2790 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2812 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2791 2813
2792const unsigned char csi_defaults[] = 2814static const unsigned char csi_defaults[] =
2793 { 2815 {
2794 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2816 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2795 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2817 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2796 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2818 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2797 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2819 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2798 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2820 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2799 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2821 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2800 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2822 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2801 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2823 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2802 }; 2824 };
2803/* *INDENT-ON* */
2804 2825
2805void 2826void ecb_hot
2806rxvt_term::process_csi_seq () 2827rxvt_term::process_csi_seq ()
2807{ 2828{
2808 unicode_t ch, priv, i; 2829 unicode_t ch, priv, prev_ch, i;
2809 unsigned int nargs, p; 2830 unsigned int nargs, p;
2810 int n, ndef; 2831 int n, ndef;
2811 int arg[ESC_ARGS]; 2832 int arg[ESC_ARGS] = { };
2812 2833
2813 memset (arg, 0, sizeof (arg));
2814 nargs = 0; 2834 nargs = 0;
2815 2835
2816 priv = 0; 2836 priv = 0;
2817 ch = cmd_getc (); 2837 ch = cmd_getc ();
2818 if (ch >= '<' && ch <= '?') 2838 if ((ch >= '<' && ch <= '?') || ch == '!')
2839 {
2819 { /* '<' '=' '>' '?' */ 2840 /* '<' '=' '>' '?' '!' */
2820 priv = ch; 2841 priv = ch;
2821 ch = cmd_getc (); 2842 ch = cmd_getc ();
2822 } 2843 }
2823 2844
2845 prev_ch = 0;
2824 /* read any numerical arguments */ 2846 /* read any numerical arguments */
2825 for (n = -1; ch < CSI_ICH; ) 2847 for (n = -1; ch < CSI_ICH; )
2826 { 2848 {
2827 if (isdigit (ch)) 2849 if (isdigit (ch))
2828 { 2850 {
… …
2838 n = -1; 2860 n = -1;
2839 } 2861 }
2840 else if (IS_CONTROL (ch)) 2862 else if (IS_CONTROL (ch))
2841 process_nonprinting (ch); 2863 process_nonprinting (ch);
2842 2864
2865 prev_ch = ch;
2843 ch = cmd_getc (); 2866 ch = cmd_getc ();
2844 } 2867 }
2845 2868
2846 if (ch > CSI_7F) 2869 if (ch > CSI_7F)
2847 return; 2870 return;
… …
2867 { 2890 {
2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2891 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2892 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870 // 2893 //
2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2894 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2895 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2873 // that we do not support xterm mouse reporting (should be 95 when we do). 2896 // versions.
2874 // 2897 //
2875 tt_printf ("\033[>%d;94;0c", 'U'); 2898 tt_printf ("\033[>%d;95;0c", 'U');
2876 } 2899 }
2877 break; 2900 break;
2901
2878 case '?': 2902 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2903 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 2904 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 2905 break;
2906
2907 case '!':
2908 if (ch == CSI_70)
2909 {
2910 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2911 scr_soft_reset ();
2912
2913 static const int pm_h[] = { 7, 25 };
2914 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2915
2916 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2917 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2882 } 2918 }
2919 break;
2920 }
2921
2883 return; 2922 return;
2884 } 2923 }
2885 2924
2886 switch (ch) 2925 switch (ch)
2887 { 2926 {
… …
2901 } 2940 }
2902 break; 2941 break;
2903#endif 2942#endif
2904 2943
2905 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2944 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2906 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2945 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2907 arg[0] = -arg[0]; 2946 arg[0] = -arg[0];
2908 /* FALLTHROUGH */ 2947 /* FALLTHROUGH */
2909 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2948 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2910 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2949 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2911 scr_gotorc (arg[0], 0, RELATIVE); 2950 scr_gotorc (arg[0], 0, RELATIVE);
2912 break; 2951 break;
2913 2952
2914 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2953 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2915 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2954 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3065 scr_insert_mode (1); 3104 scr_insert_mode (1);
3066 else if (arg[0] == 20) 3105 else if (arg[0] == 20)
3067 priv_modes |= PrivMode_LFNL; 3106 priv_modes |= PrivMode_LFNL;
3068 break; 3107 break;
3069 3108
3109 case CSI_71: // DESCUSR: set cursor style
3110 if (prev_ch == ' ')
3111 set_cursor_style (arg[0]);
3112 break;
3113
3070 /* 3114 /*
3071 * PRIVATE USE beyond this point. All CSI_7? sequences here 3115 * PRIVATE USE beyond this point. All CSI_7? sequences here
3072 */ 3116 */
3073 case CSI_72: /* DECSTBM: set top and bottom margins */ 3117 case CSI_72: /* DECSTBM: set top and bottom margins */
3074 if (nargs == 1) 3118 if (nargs == 1)
… …
3102 } 3146 }
3103} 3147}
3104/*}}} */ 3148/*}}} */
3105 3149
3106#if !ENABLE_MINIMAL 3150#if !ENABLE_MINIMAL
3107/* ARGSUSED */
3108void 3151void
3109rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3152rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3110{ 3153{
3111 int x, y; 3154 int x, y;
3112 XWindowAttributes wattr; 3155 XWindowAttributes wattr;
… …
3121 { 3164 {
3122 /* 3165 /*
3123 * commands 3166 * commands
3124 */ 3167 */
3125 case 1: /* deiconify window */ 3168 case 1: /* deiconify window */
3126 XMapWindow (dpy, parent[0]); 3169 XMapWindow (dpy, parent);
3127 break; 3170 break;
3128 case 2: /* iconify window */ 3171 case 2: /* iconify window */
3129 XIconifyWindow (dpy, parent[0], display->screen); 3172 XIconifyWindow (dpy, parent, display->screen);
3130 break; 3173 break;
3131 case 3: /* set position (pixels) */ 3174 case 3: /* set position (pixels) */
3132 XMoveWindow (dpy, parent[0], args[1], args[2]); 3175 XMoveWindow (dpy, parent, args[1], args[2]);
3133 break; 3176 break;
3134 case 4: /* set size (pixels) */ 3177 case 4: /* set size (pixels) */
3135 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3178 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3136 break; 3179 break;
3137 case 5: /* raise window */ 3180 case 5: /* raise window */
3138 XRaiseWindow (dpy, parent[0]); 3181 XRaiseWindow (dpy, parent);
3139 break; 3182 break;
3140 case 6: /* lower window */ 3183 case 6: /* lower window */
3141 XLowerWindow (dpy, parent[0]); 3184 XLowerWindow (dpy, parent);
3142 break; 3185 break;
3143 case 7: /* refresh window */ 3186 case 7: /* refresh window */
3144 scr_touch (true); 3187 scr_touch (true);
3145 break; 3188 break;
3146 case 8: /* set size (chars) */ 3189 case 8: /* set size (chars) */
… …
3149 break; 3192 break;
3150 3193
3151 //case 9: NYI, TODO, restore maximized window or maximize window 3194 //case 9: NYI, TODO, restore maximized window or maximize window
3152 default: 3195 default:
3153 if (args[0] >= 24) /* set height (chars) */ 3196 if (args[0] >= 24) /* set height (chars) */
3154 set_widthheight ((unsigned int)width, 3197 set_widthheight ((unsigned int)vt_width,
3155 (unsigned int) (args[1] * fheight)); 3198 (unsigned int) (args[1] * fheight));
3156 break; 3199 break;
3157 3200
3158 /* 3201 /*
3159 * reports - some output format copied from XTerm 3202 * reports - some output format copied from XTerm
3160 */ 3203 */
3161 case 11: /* report window state */ 3204 case 11: /* report window state */
3162 XGetWindowAttributes (dpy, parent[0], &wattr); 3205 XGetWindowAttributes (dpy, parent, &wattr);
3163 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3206 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3164 break; 3207 break;
3165 case 13: /* report window position */ 3208 case 13: /* report window position */
3166 XGetWindowAttributes (dpy, parent[0], &wattr); 3209 XGetWindowAttributes (dpy, parent, &wattr);
3167 XTranslateCoordinates (dpy, parent[0], wattr.root, 3210 XTranslateCoordinates (dpy, parent, wattr.root,
3168 -wattr.border_width, -wattr.border_width, 3211 -wattr.border_width, -wattr.border_width,
3169 &x, &y, &wdummy); 3212 &x, &y, &wdummy);
3170 tt_printf ("\033[3;%d;%dt", x, y); 3213 tt_printf ("\033[3;%d;%dt", x, y);
3171 break; 3214 break;
3172 case 14: /* report window size (pixels) */ 3215 case 14: /* report window size (pixels) */
3173 XGetWindowAttributes (dpy, parent[0], &wattr); 3216 XGetWindowAttributes (dpy, parent, &wattr);
3174 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3217 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3175 break; 3218 break;
3176 case 18: /* report text area size (chars) */ 3219 case 18: /* report text area size (chars) */
3177 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3220 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3178 break; 3221 break;
… …
3180 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3223 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3181 break; 3224 break;
3182 case 20: /* report icon label */ 3225 case 20: /* report icon label */
3183 { 3226 {
3184 char *s; 3227 char *s;
3185 XGetIconName (dpy, parent[0], &s); 3228 XGetIconName (dpy, parent, &s);
3186 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3229 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3187 XFree (s); 3230 XFree (s);
3188 } 3231 }
3189 break; 3232 break;
3190 case 21: /* report window title */ 3233 case 21: /* report window title */
3191 { 3234 {
3192 char *s; 3235 char *s;
3193 XFetchName (dpy, parent[0], &s); 3236 XFetchName (dpy, parent, &s);
3194 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3237 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3195 XFree (s); 3238 XFree (s);
3196 } 3239 }
3197 break; 3240 break;
3198 } 3241 }
… …
3208rxvt_term::get_to_st (unicode_t &ends_how) 3251rxvt_term::get_to_st (unicode_t &ends_how)
3209{ 3252{
3210 unicode_t ch; 3253 unicode_t ch;
3211 bool seen_esc = false; 3254 bool seen_esc = false;
3212 unsigned int n = 0; 3255 unsigned int n = 0;
3213 wchar_t string[STRING_MAX]; 3256 wchar_t string[CBUFSIZ];
3214 3257
3215 while ((ch = cmd_getc ()) != NOCHAR) 3258 while ((ch = cmd_getc ()) != NOCHAR)
3216 { 3259 {
3217 if (seen_esc) 3260 if (seen_esc)
3218 { 3261 {
… …
3233 else if (ch < 0x20) 3276 else if (ch < 0x20)
3234 return NULL; /* other control character - exit */ 3277 return NULL; /* other control character - exit */
3235 3278
3236 seen_esc = false; 3279 seen_esc = false;
3237 3280
3238 if (n >= STRING_MAX - 1) 3281 if (n >= sizeof (string) - 1)
3239 // stop at some sane length 3282 // stop at some sane length
3240 return NULL; 3283 return NULL;
3241 3284
3242 string[n++] = ch; 3285 string[n++] = ch;
3243 } 3286 }
… …
3254 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3297 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3255 */ 3298 */
3256void 3299void
3257rxvt_term::process_dcs_seq () 3300rxvt_term::process_dcs_seq ()
3258{ 3301{
3259 char *s;
3260 unicode_t eh;
3261
3262 /* 3302 /*
3263 * Not handled yet 3303 * Not handled yet
3264 */ 3304 */
3305
3306 unicode_t eh;
3265 s = get_to_st (eh); 3307 char *s = get_to_st (eh);
3266 if (s) 3308 if (s)
3267 free (s); 3309 free (s);
3268 3310
3269 return; 3311 return;
3270} 3312}
… …
3274 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3316 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3275 */ 3317 */
3276void 3318void
3277rxvt_term::process_osc_seq () 3319rxvt_term::process_osc_seq ()
3278{ 3320{
3279 unicode_t ch, eh;
3280 int arg; 3321 int arg;
3281 3322
3282 ch = cmd_getc (); 3323 unicode_t ch = cmd_getc ();
3283 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3324 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3284 arg = arg * 10 + (ch - '0'); 3325 arg = arg * 10 + (ch - '0');
3285 3326
3286 if (ch == ';') 3327 if (ch == ';')
3287 { 3328 {
3329 unicode_t eh;
3288 char *s = get_to_st (eh); 3330 char *s = get_to_st (eh);
3289 3331
3290 if (s) 3332 if (s)
3291 { 3333 {
3292 process_xterm_seq (arg, s, eh); 3334 process_xterm_seq (arg, s, eh);
… …
3316 3358
3317/* 3359/*
3318 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3360 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3319 */ 3361 */
3320void 3362void
3321rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3363rxvt_term::process_xterm_seq (int op, char *str, char resp)
3322{ 3364{
3323 int color; 3365 int color;
3324 char *buf, *name; 3366 char *buf, *name;
3325 bool query = str[0] == '?' && !str[1]; 3367 bool query = str[0] == '?' && !str[1];
3326 int saveop = op; 3368 int saveop = op;
… …
3353 unsigned long bytes_after; 3395 unsigned long bytes_after;
3354 unsigned char *value = 0; 3396 unsigned char *value = 0;
3355 const char *str = ""; 3397 const char *str = "";
3356 3398
3357 if (prop 3399 if (prop
3358 && XGetWindowProperty (dpy, parent[0], 3400 && XGetWindowProperty (dpy, parent,
3359 prop, 0, 1<<16, 0, AnyPropertyType, 3401 prop, 0, 1<<16, 0, AnyPropertyType,
3360 &actual_type, &actual_format, 3402 &actual_type, &actual_format,
3361 &nitems, &bytes_after, &value) == Success 3403 &nitems, &bytes_after, &value) == Success
3362 && actual_type != None 3404 && actual_type != None
3363 && actual_format == 8) 3405 && actual_format == 8)
3364 str = (const char *)(value); 3406 str = (const char *)(value);
3365 3407
3366 tt_printf ("\033]%d;%s%c", op, str, resp); 3408 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3367 3409
3368 XFree (value); 3410 XFree (value);
3369 } 3411 }
3370 else 3412 else
3371 { 3413 {
3372 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3414 char *eq = strchr (str, '=');
3373 3415
3374 if (eq) 3416 if (eq)
3375 { 3417 {
3376 *eq = 0; 3418 *eq = 0;
3377 set_utf8_property (display->atom (str), eq + 1); 3419 set_utf8_property (display->atom (str), eq + 1);
3378 } 3420 }
3379 else 3421 else
3380 XDeleteProperty (dpy, parent[0], 3422 XDeleteProperty (dpy, parent,
3381 display->atom (str)); 3423 display->atom (str));
3382 } 3424 }
3383 break; 3425 break;
3384 3426
3385 case XTerm_Color: 3427 case XTerm_Color:
… …
3398 *buf++ = '\0'; 3440 *buf++ = '\0';
3399 3441
3400 process_color_seq (op, color, name, resp); 3442 process_color_seq (op, color, name, resp);
3401 } 3443 }
3402 break; 3444 break;
3445 case Rxvt_restoreFG:
3403 case XTerm_Color00: 3446 case XTerm_Color00:
3404 process_color_seq (op, Color_fg, str, resp); 3447 process_color_seq (op, Color_fg, str, resp);
3405 break; 3448 break;
3449 case Rxvt_restoreBG:
3406 case XTerm_Color01: 3450 case XTerm_Color01:
3407 process_color_seq (op, Color_bg, str, resp); 3451 process_color_seq (op, Color_bg, str, resp);
3408 break; 3452 break;
3409#ifndef NO_CURSORCOLOR 3453#ifndef NO_CURSORCOLOR
3410 case XTerm_Color_cursor: 3454 case XTerm_Color_cursor:
… …
3415 process_color_seq (op, Color_pointer_fg, str, resp); 3459 process_color_seq (op, Color_pointer_fg, str, resp);
3416 break; 3460 break;
3417 case XTerm_Color_pointer_bg: 3461 case XTerm_Color_pointer_bg:
3418 process_color_seq (op, Color_pointer_bg, str, resp); 3462 process_color_seq (op, Color_pointer_bg, str, resp);
3419 break; 3463 break;
3464#ifdef OPTION_HC
3465 case XTerm_Color_HC:
3466 process_color_seq (op, Color_HC, str, resp);
3467 break;
3468 case XTerm_Color_HTC:
3469 process_color_seq (op, Color_HTC, str, resp);
3470 break;
3471#endif
3420#ifndef NO_BOLD_UNDERLINE_REVERSE 3472#ifndef NO_BOLD_UNDERLINE_REVERSE
3421 case XTerm_Color_RV:
3422 process_color_seq (op, Color_RV, str, resp);
3423 break;
3424 case Rxvt_Color_BD:
3425 case URxvt_Color_BD: 3473 case URxvt_Color_BD:
3426 process_color_seq (op, Color_BD, str, resp); 3474 process_color_seq (op, Color_BD, str, resp);
3427 break; 3475 break;
3428 case Rxvt_Color_UL:
3429 case URxvt_Color_UL: 3476 case URxvt_Color_UL:
3430 process_color_seq (op, Color_UL, str, resp); 3477 process_color_seq (op, Color_UL, str, resp);
3431 break; 3478 break;
3432 case URxvt_Color_IT: 3479 case URxvt_Color_IT:
3433 process_color_seq (op, Color_IT, str, resp); 3480 process_color_seq (op, Color_IT, str, resp);
3434 break; 3481 break;
3435#endif 3482#endif
3436#if ENABLE_TRANSPARENCY && TINTING 3483 case URxvt_Color_border:
3484 process_color_seq (op, Color_border, str, resp);
3485 break;
3486
3487#if BG_IMAGE_FROM_ROOT
3437 case URxvt_Color_tint: 3488 case URxvt_Color_tint:
3438 process_color_seq (op, Color_tint, str, resp); 3489 process_color_seq (op, Color_tint, str, resp);
3490 {
3491 bool changed = false;
3439 3492
3440 check_our_parents (); 3493 if (ISSET_PIXCOLOR (Color_tint))
3494 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3441 3495
3442 if (am_transparent) 3496 if (changed)
3443 want_full_refresh = want_refresh = 1; 3497 update_background ();
3498 }
3444 3499
3445 break; 3500 break;
3446#endif 3501#endif
3447 3502
3503#if BG_IMAGE_FROM_FILE
3448 case Rxvt_Pixmap: 3504 case Rxvt_Pixmap:
3505 if (!strcmp (str, "?"))
3449 { 3506 {
3507 char str[256];
3508 int h_scale = fimage.h_scale;
3509 int v_scale = fimage.v_scale;
3510 int h_align = fimage.h_align;
3511 int v_align = fimage.v_align;
3512
3513 sprintf (str, "[%dx%d+%d+%d]",
3514 h_scale, v_scale,
3515 h_align, v_align);
3516 process_xterm_seq (XTerm_title, str, CHAR_ST);
3517 }
3518 else
3519 {
3520 bool changed = false;
3521
3450 if (*str != ';') 3522 if (*str != ';')
3451 { 3523 {
3452#if XPM_BACKGROUND 3524 try
3453 scale_pixmap (""); /* reset to default scaling */ 3525 {
3454 set_bgPixmap (str); /* change pixmap */ 3526 fimage.set_file_geometry (this, str);
3455 scr_touch (true); 3527 changed = true;
3456#endif 3528 }
3529 catch (const class rxvt_failure_exception &e)
3530 {
3531 }
3457 } 3532 }
3458 3533 else
3459 int changed = 0;
3460
3461 while ((str = strchr (str, ';')) != NULL)
3462 { 3534 {
3463 str++; 3535 str++;
3464#if XPM_BACKGROUND 3536 if (fimage.set_geometry (str, true))
3465 changed += scale_pixmap (str); 3537 changed = true;
3466#endif
3467 } 3538 }
3468 3539
3469 if (changed) 3540 if (changed)
3470 { 3541 {
3471#ifdef XPM_BACKGROUND 3542 if (bg_window_position_sensitive ())
3472 resize_pixmap (); 3543 {
3473 scr_touch (true); 3544 int x, y;
3474#endif 3545 get_window_origin (x, y);
3546 parent_x = x;
3547 parent_y = y;
3548 }
3549 update_background ();
3475 } 3550 }
3476#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3477 if (option (Opt_transparent))
3478 check_our_parents ();
3479#endif
3480 } 3551 }
3481 break; 3552 break;
3482 3553#endif
3483 case Rxvt_restoreFG:
3484 set_window_color (Color_fg, str);
3485 break;
3486 case Rxvt_restoreBG:
3487 set_window_color (Color_bg, str);
3488 break;
3489 3554
3490 case XTerm_logfile: 3555 case XTerm_logfile:
3491 // TODO, when secure mode? 3556 // TODO, when secure mode?
3492 break; 3557 break;
3493 3558
… …
3560 break; 3625 break;
3561#endif 3626#endif
3562 3627
3563#if ENABLE_PERL 3628#if ENABLE_PERL
3564 case URxvt_perl: 3629 case URxvt_perl:
3565 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3630 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3566 ; // no responses yet
3567 break; 3631 break;
3568#endif 3632#endif
3569 } 3633 }
3570} 3634}
3571/*----------------------------------------------------------------------*/ 3635/*----------------------------------------------------------------------*/
… …
3578 * 's' = save 3642 * 's' = save
3579 * 'r' = restore 3643 * 'r' = restore
3580 * 't' = toggle 3644 * 't' = toggle
3581 * so no need for fancy checking 3645 * so no need for fancy checking
3582 */ 3646 */
3583int 3647int ecb_cold
3584rxvt_term::privcases (int mode, unsigned long bit) 3648rxvt_term::privcases (int mode, unsigned long bit)
3585{ 3649{
3586 int state; 3650 int state;
3587 3651
3588 if (mode == 's') 3652 if (mode == 's')
3589 { 3653 {
3590 SavedModes |= (priv_modes & bit); 3654 if (priv_modes & bit)
3655 SavedModes |= bit;
3656 else
3657 SavedModes &= ~bit;
3591 return -1; 3658 return -1;
3592 } 3659 }
3593 else 3660 else
3594 { 3661 {
3595 if (mode == 'r') 3662 if (mode == 'r')
3596 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3663 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3597 else 3664 else
3598 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3665 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3599 PrivMode (state, bit); 3666
3667 if (state)
3668 priv_modes |= bit;
3669 else
3670 priv_modes &= ~bit;
3600 } 3671 }
3601 3672
3602 return state; 3673 return state;
3603} 3674}
3604 3675
3605/* we're not using priv _yet_ */ 3676/* we're not using priv _yet_ */
3606void 3677void
3607rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3678rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3608{ 3679{
3609 unsigned int i, j; 3680 unsigned int i, j;
3610 int state; 3681 int state;
3611 3682
3612 static const struct 3683 static const struct
3613 { 3684 {
3614 const int argval; 3685 const int argval;
3615 const unsigned long bit; 3686 const unsigned long bit;
3616 }
3617
3618 argtopriv[] = { 3687 } argtopriv[] = {
3619 { 1, PrivMode_aplCUR }, 3688 { 1, PrivMode_aplCUR }, // DECCKM
3620 { 2, PrivMode_vt52 }, 3689 { 2, PrivMode_vt52 }, // DECANM
3621 { 3, PrivMode_132 }, 3690 { 3, PrivMode_132 }, // DECCOLM
3622 { 4, PrivMode_smoothScroll }, 3691 { 4, PrivMode_smoothScroll }, // DECSCLM
3623 { 5, PrivMode_rVideo }, 3692 { 5, PrivMode_rVideo }, // DECSCNM
3624 { 6, PrivMode_relOrigin }, 3693 { 6, PrivMode_relOrigin }, // DECOM
3625 { 7, PrivMode_Autowrap }, 3694 { 7, PrivMode_Autowrap }, // DECAWM
3626 // 8, bi-directional support mode 3695 // 8, auto-repeat keys // DECARM
3627 { 9, PrivMode_MouseX10 }, 3696 { 9, PrivMode_MouseX10 },
3628 // 18, 19 printing-related 3697 // 18 end FF to printer after print screen
3698 // 19 Print screen prints full screen/scroll region
3629 { 25, PrivMode_VisibleCursor }, 3699 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3630#ifdef scrollBar_esc 3700#ifdef scrollBar_esc
3631 { scrollBar_esc, PrivMode_scrollBar }, 3701 { scrollBar_esc, PrivMode_scrollBar },
3632#endif 3702#endif
3633 { 35, PrivMode_ShiftKeys }, // rxvt extension 3703 { 35, PrivMode_ShiftKeys }, // rxvt extension
3704 // 38, tektronix mode // DECTEK
3634 { 40, PrivMode_132OK }, 3705 { 40, PrivMode_132OK },
3635 // 41 xterm more fixes NYI 3706 // 41 xterm more fixes NYI
3636 // 45 margin bell NYI 3707 // 45 margin bell NYI
3637 // 46 start logging 3708 // 46 start logging
3638 { 47, PrivMode_Screen }, 3709 { 47, PrivMode_Screen },
3639 { 66, PrivMode_aplKP }, 3710 { 66, PrivMode_aplKP }, // DECNKM
3640#ifndef NO_BACKSPACE_KEY 3711#ifndef NO_BACKSPACE_KEY
3641 { 67, PrivMode_BackSpace }, 3712 { 67, PrivMode_BackSpace }, // DECBKM
3642#endif 3713#endif
3643 { 1000, PrivMode_MouseX11 }, 3714 { 1000, PrivMode_MouseX11 },
3644 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3715 { 1002, PrivMode_MouseBtnEvent },
3645 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3716 { 1003, PrivMode_MouseAnyEvent },
3646 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3717#if ENABLE_FRILLS
3718 { 1005, PrivMode_ExtModeMouse },
3719#endif
3647 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3720 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3648 { 1011, PrivMode_Keypress }, // rxvt extension 3721 { 1011, PrivMode_Keypress }, // rxvt extension
3722#if ENABLE_FRILLS
3723 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3724#endif
3649 // 1035 enable modifiers for alt, numlock NYI 3725 // 1035 enable modifiers for alt, numlock NYI
3650 // 1036 send ESC for meta keys NYI 3726 // 1036 send ESC for meta keys NYI
3651 // 1037 send DEL for keypad delete NYI 3727 // 1037 send DEL for keypad delete NYI
3652 { 1047, PrivMode_Screen }, 3728 { 1047, PrivMode_Screen },
3653 // 1048 save and restore cursor 3729 // 1048 save and restore cursor, implemented in code
3654 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3730 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3655 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3731 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3732 { 2004, PrivMode_BracketPaste },
3656 }; 3733 };
3657 3734
3658 if (nargs == 0) 3735 if (nargs == 0)
3659 return; 3736 return;
3660 3737
… …
3667 for (i = 0; i < nargs; i++) 3744 for (i = 0; i < nargs; i++)
3668 { 3745 {
3669 state = -1; 3746 state = -1;
3670 3747
3671 /* basic handling */ 3748 /* basic handling */
3672 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3749 for (j = 0; j < ecb_array_length (argtopriv); j++)
3673 if (argtopriv[j].argval == arg[i]) 3750 if (argtopriv[j].argval == arg[i])
3674 { 3751 {
3675 state = privcases (mode, argtopriv[j].bit); 3752 state = privcases (mode, argtopriv[j].bit);
3676 break; 3753 break;
3677 } 3754 }
… …
3685 3762
3686 scr_touch (true); 3763 scr_touch (true);
3687 break; 3764 break;
3688#endif 3765#endif
3689 case 1048: /* alternative cursor save */ 3766 case 1048: /* alternative cursor save */
3690 case 1049:
3691 if (option (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
3692 if (mode == 0) 3768 if (mode == 0)
3693 scr_cursor (RESTORE); 3769 scr_cursor (RESTORE);
3694 else if (mode == 1) 3770 else if (mode == 1)
3695 scr_cursor (SAVE); 3771 scr_cursor (SAVE);
… …
3704 case 2: /* VT52 mode */ 3780 case 2: /* VT52 mode */
3705 /* oddball mode. should be set regardless of set/reset 3781 /* oddball mode. should be set regardless of set/reset
3706 * parameter. Return from VT52 mode with an ESC < from 3782 * parameter. Return from VT52 mode with an ESC < from
3707 * within VT52 mode 3783 * within VT52 mode
3708 */ 3784 */
3709 PrivMode (1, PrivMode_vt52); 3785 priv_modes |= PrivMode_vt52;
3710 break; 3786 break;
3711 case 3: /* 80/132 */ 3787 case 3: /* 80/132 */
3712 if (priv_modes & PrivMode_132OK) 3788 if (priv_modes & PrivMode_132OK)
3713 set_widthheight (((state ? 132 : 80) * fwidth), height); 3789 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3714 break; 3790 break;
3715 case 4: /* smooth scrolling */ 3791 case 4: /* smooth scrolling */
3716 set_option (Opt_jumpScroll, !state); 3792 set_option (Opt_jumpScroll, !state);
3717 break; 3793 break;
3718 case 5: /* reverse video */ 3794 case 5: /* reverse video */
… …
3725 scr_autowrap (state); 3801 scr_autowrap (state);
3726 break; 3802 break;
3727 /* case 8: - auto repeat, can't do on a per window basis */ 3803 /* case 8: - auto repeat, can't do on a per window basis */
3728 case 9: /* X10 mouse reporting */ 3804 case 9: /* X10 mouse reporting */
3729 if (state) /* orthogonal */ 3805 if (state) /* orthogonal */
3730 priv_modes &= ~PrivMode_MouseX11; 3806 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3731 break; 3807 break;
3732#ifdef scrollBar_esc 3808#ifdef scrollBar_esc
3733 case scrollBar_esc: 3809 case scrollBar_esc:
3734 if (scrollbar_mapping (state)) 3810 scrollBar.map (state);
3735 {
3736 resize_all_windows (0, 0, 0); 3811 resize_all_windows (0, 0, 0);
3737 scr_touch (true); 3812 scr_touch (true);
3738 }
3739 break; 3813 break;
3740#endif 3814#endif
3741 case 25: /* visible/invisible cursor */ 3815 case 25: /* visible/invisible cursor */
3742 scr_cursor_visible (state); 3816 scr_cursor_visible (state);
3743 break; 3817 break;
… …
3748 break; 3822 break;
3749 /* case 66: - application key pad */ 3823 /* case 66: - application key pad */
3750 /* case 67: - backspace key */ 3824 /* case 67: - backspace key */
3751 case 1000: /* X11 mouse reporting */ 3825 case 1000: /* X11 mouse reporting */
3752 if (state) /* orthogonal */ 3826 if (state) /* orthogonal */
3753 priv_modes &= ~PrivMode_MouseX10; 3827 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3754 break; 3828 break;
3755#if 0
3756 case 1001: 3829 case 1002:
3757 break; /* X11 mouse highlighting */ 3830 case 1003:
3758#endif 3831 if (state)
3832 {
3833 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3834 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3835 mouse_row = mouse_col = 0;
3836 vt_emask_mouse = PointerMotionMask;
3837 }
3838 else
3839 vt_emask_mouse = NoEventMask;
3840
3841 vt_select_input ();
3842 break;
3759 case 1010: /* scroll to bottom on TTY output inhibit */ 3843 case 1010: /* scroll to bottom on TTY output inhibit */
3760 set_option (Opt_scrollTtyOutput, !state); 3844 set_option (Opt_scrollTtyOutput, !state);
3761 break; 3845 break;
3762 case 1011: /* scroll to bottom on key press */ 3846 case 1011: /* scroll to bottom on key press */
3763 set_option (Opt_scrollTtyKeypress, state); 3847 set_option (Opt_scrollTtyKeypress, state);
3764 break; 3848 break;
3765 case 1047: /* secondary screen w/ clearing last */ 3849 case 1047: /* secondary screen w/ clearing last */
3766 if (option (Opt_secondaryScreen)) 3850 if (option (Opt_secondaryScreen))
3767 if (current_screen != PRIMARY) 3851 if (!state)
3768 scr_erase_screen (2); 3852 scr_erase_screen (2);
3853
3769 scr_change_screen (state); 3854 scr_change_screen (state);
3770 break; 3855 break;
3771 case 1049: /* secondary screen w/ clearing first */ 3856 case 1049: /* secondary screen w/ clearing first */
3857 if (option (Opt_secondaryScreen))
3858 if (state)
3859 scr_cursor (SAVE);
3860
3772 scr_change_screen (state); 3861 scr_change_screen (state);
3862
3773 if (option (Opt_secondaryScreen)) 3863 if (option (Opt_secondaryScreen))
3774 if (current_screen != PRIMARY) 3864 if (state)
3775 scr_erase_screen (2); 3865 scr_erase_screen (2);
3866 else
3867 scr_cursor (RESTORE);
3776 break; 3868 break;
3777 default: 3869 default:
3778 break; 3870 break;
3779 } 3871 }
3780 } 3872 }
3781} 3873}
3782/*}}} */ 3874/*}}} */
3783 3875
3784/*{{{ process sgr sequences */ 3876/*{{{ process sgr sequences */
3785void 3877void ecb_hot
3786rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3878rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3787{ 3879{
3788 unsigned int i; 3880 unsigned int i;
3789 short rendset; 3881 short rendset;
3790 int rendstyle; 3882 int rendstyle;
… …
3931 break; 4023 break;
3932#endif 4024#endif
3933 } 4025 }
3934 } 4026 }
3935} 4027}
3936/*}}} */
3937 4028
3938/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3939void 4029void
3940rxvt_term::process_graphics () 4030rxvt_term::set_cursor_style (int style)
3941{ 4031{
3942 unicode_t ch, cmd = cmd_getc (); 4032 if (!IN_RANGE_INC (style, 0, 4))
3943
3944 if (cmd == 'Q')
3945 { /* query graphics */
3946 tt_printf ("\033G0\012"); /* no graphics */
3947 return; 4033 return;
3948 } 4034
3949 /* swallow other graphics sequences until terminating ':' */ 4035 set_option (Opt_cursorUnderline, style >= 3);
3950 do 4036
3951 ch = cmd_getc (); 4037#ifdef CURSOR_BLINK
3952 while (ch != ':'); 4038 set_option (Opt_cursorBlink, !style || (style & 1));
4039 cursor_blink_reset ();
4040#endif
4041
4042 want_refresh = 1;
3953} 4043}
3954/*}}} */ 4044/*}}} */
3955 4045
3956/* ------------------------------------------------------------------------- */ 4046/* ------------------------------------------------------------------------- */
3957 4047
… …
3973 4063
3974/* ---------------------------------------------------------------------- */ 4064/* ---------------------------------------------------------------------- */
3975/* Write data to the pty as typed by the user, pasted with the mouse, 4065/* Write data to the pty as typed by the user, pasted with the mouse,
3976 * or generated by us in response to a query ESC sequence. 4066 * or generated by us in response to a query ESC sequence.
3977 */ 4067 */
3978const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4068static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3979 4069
3980void 4070void
3981rxvt_term::tt_write (const char *data, unsigned int len) 4071rxvt_term::tt_write (const char *data, unsigned int len)
3982{ 4072{
3983 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4073 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3988 4078
3989 if (v_buflen == 0) 4079 if (v_buflen == 0)
3990 { 4080 {
3991 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4081 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3992 4082
4083 max_it (written, 0);
4084
3993 if ((unsigned int)written == len) 4085 if (written == len)
3994 return; 4086 return;
3995 4087
3996 data += written; 4088 data += written;
3997 len -= written; 4089 len -= written;
3998 } 4090 }
3999 4091
4000 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4092 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4001 4093
4002 memcpy (v_buffer + v_buflen, data, len); 4094 memcpy (v_buffer + v_buflen, data, len);
4003 v_buflen += len; 4095 v_buflen += len;
4004 4096
4005 pty_ev.set (EVENT_READ | EVENT_WRITE); 4097 pty_ev.set (ev::READ | ev::WRITE);
4006} 4098}
4007 4099
4008void rxvt_term::pty_write () 4100void rxvt_term::pty_write ()
4009{ 4101{
4010 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4102 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4015 4107
4016 if (v_buflen == 0) 4108 if (v_buflen == 0)
4017 { 4109 {
4018 free (v_buffer); 4110 free (v_buffer);
4019 v_buffer = 0; 4111 v_buffer = 0;
4020 v_buflen = 0;
4021 4112
4022 pty_ev.set (EVENT_READ); 4113 pty_ev.set (ev::READ);
4023 return; 4114 return;
4024 } 4115 }
4025 4116
4026 memmove (v_buffer, v_buffer + written, v_buflen); 4117 memmove (v_buffer, v_buffer + written, v_buflen);
4027 } 4118 }
4028 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4119 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4029 pty_ev.set (EVENT_READ); 4120 pty_ev.set (ev::READ);
4030} 4121}
4031 4122
4032/*----------------------- end-of-file (C source) -----------------------*/ 4123/*----------------------- end-of-file (C source) -----------------------*/
4033 4124

Diff Legend

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