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.408 by ayin, Sat Feb 16 13:36:10 2008 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC

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

Diff Legend

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