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

Diff Legend

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