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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.356 by root, Mon Sep 17 08:31:54 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
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
… …
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-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 67
59// exception thrown when the command parser runs out of input data 68#if ENABLE_FRILLS || ISO_14755
60class out_of_input { } out_of_input;
61 69
62/*{{{ Convert the keypress event into a string */ 70#define ISO_14755_STARTED 0x80000000UL
71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
72#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
73#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
74#define ISO_14755_MASK 0x0fffffffUL
75
76#if ISO_14755
77static unsigned short iso14755_symtab[] = {
78 // keysym, unicode
79 XK_Left, 0x2190,
80 XK_KP_Left, 0x2190,
81 XK_Up, 0x2191,
82 XK_KP_Up, 0x2191,
83 XK_Right, 0x2192,
84 XK_KP_Right, 0x2192,
85 XK_Down, 0x2193,
86 XK_KP_Down, 0x2193,
87 XK_Linefeed, 0x21b4,
88 XK_Return, 0x21b5,
89 XK_KP_Enter, 0x21b5,
90
91 XK_Prior, 0x21de,
92 XK_Next, 0x21df,
93 XK_Tab, 0x21e5,
94 XK_ISO_Left_Tab, 0x21e6,
95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7,
97
98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_Caps_Lock, 0x21ec,
101 XK_Num_Lock, 0x21ed,
102 XK_ISO_Level3_Shift, 0x21ee,
103 XK_ISO_Level3_Lock, 0x21ef,
104 XK_ISO_Group_Lock, 0x21f0,
105 XK_Home, 0x21f1,
106 XK_End, 0x21f2,
107
108 XK_Execute, 0x2318,
109 XK_Begin, 0x2320,
110 XK_Delete, 0x2326,
111 XK_Clear, 0x2327,
112 XK_BackSpace, 0x232b,
113 XK_Insert, 0x2380,
114 XK_Control_L, 0x2388,
115 XK_Control_R, 0x2388,
116 XK_Pause, 0x2389,
117 XK_Break, 0x238a,
118 XK_Escape, 0x238b,
119 XK_Undo, 0x238c,
120 XK_Print, 0x2399,
121
122 XK_space, 0x2423,
123
124#ifdef XK_KP_Begin
125 XK_KP_Prior, 0x21de,
126 XK_KP_Next, 0x21df,
127 XK_KP_Begin, 0x2320,
128 XK_KP_Insert, 0x2380,
129 XK_KP_Delete, 0x2326,
130 XK_KP_Space, 0x2422,
131#endif
132 0,
133};
134
63void 135void
136rxvt_term::iso14755_54 (int x, int y)
137{
138 x = Pixel2Col (x);
139 y = Pixel2Row (y);
140
141 if (!IN_RANGE_EXC (x, 0, ncol)
142 || !IN_RANGE_EXC (y, 0, nrow))
143 return;
144
145 for (;;)
146 {
147 const line_t &l = ROW(y + view_start);
148
149 text_t t = l.t[x];
150
151 if (t != NOCHAR || !x)
152 {
153 iso14755_51 (l.t[x], l.r[x], x, y);
154 iso14755buf = ISO_14755_54;
155 break;
156 }
157
158 x--;
159 }
160}
161
162void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{
165 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname;
168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171
172# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch))
174 {
175 len = rxvt_composite.expand (ch, 0);
176 alloc = chr = new wchar_t[len];
177 rxvt_composite.expand (ch, chr);
178 }
179 else
180# endif
181 {
182 ch2 = ch;
183
184 alloc = 0;
185 chr = &ch2;
186 len = 1;
187 }
188
189 char attr[80]; // plenty
190
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r,
193 fgcolor_of (r), bgcolor_of (r),
194 r & RS_Bold ? " bold" : "",
195 r & RS_Italic ? " italic" : "",
196 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : "");
200
201 int width = wcswidth (fname, wcslen (fname));
202
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
213
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215
216 for (int y = 0; y < len; y++)
217 {
218 char buf[9];
219
220 ch = *chr++;
221
222 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '=');
225# if !UNICODE3
226 if (ch >= 0x10000)
227 ch = 0xfffd;
228# endif
229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r);
233 }
234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
240 scr_overlay_set (0, len , attr);
241 scr_overlay_set (0, len + 1, fname);
242
243 free (fname);
244
245# if ENABLE_COMBINING
246 if (alloc)
247 delete [] alloc;
248# endif
249}
250#endif
251
252void
253rxvt_term::commit_iso14755 ()
254{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259
260 if (iso14755buf & ISO_14755_51)
261 {
262 char mb[16];
263 int len;
264
265 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20)
267 len = wcstombs (mb, ch, 16);
268 else
269 {
270 mb[0] = ch[0];
271 len = 1;
272 }
273
274 if (len > 0)
275 tt_write (mb, len);
276 else
277 scr_bell ();
278 }
279
280 iso14755buf = 0;
281}
282
283int
64rxvt_term::lookup_key (XKeyEvent &ev) 284rxvt_term::hex_keyval (XKeyEvent &ev)
285{
286 // check wether this event corresponds to a hex digit
287 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++)
289 {
290 KeySym k = XLookupKeysym (&ev, index);
291
292 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
293 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
294 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
295 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
296 }
297
298 return -1;
299}
300#endif
301
302void
303rxvt_term::key_press (XKeyEvent &ev)
65{ 304{
66 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
67 unsigned int newlen; 306 unsigned int newlen;
68 KeySym keysym; 307 KeySym keysym;
69#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */
71#endif
72 int valid_keysym; 308 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
74 315
75 /* 316 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
78 * 319 *
79 * Always permit `shift' to override the current setting 320 * Always permit `shift' to override the current setting
80 */ 321 */
81 shft = (ev.state & ShiftMask); 322 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 323 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 324 meta = ev.state & ModMetaMask;
84 325
85 if (numlock_state || (ev.state & ModNumLockMask)) 326 if (numlock_state || (ev.state & ModNumLockMask))
86 { 327 {
87 numlock_state = (ev.state & ModNumLockMask); 328 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 329 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 337 Status status_return;
97 338
98#if 0 339#if 0
99#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
103 else 344 else
104#endif 345#endif
105#endif 346#endif
106 { 347 {
… …
108 349
109 // the XOpenIM manpage lies about hardcoding the locale 350 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 351 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 353 SET_LOCALE (rs[Rs_imLocale]);
354
113 // assume wchar_t == unicode or better 355 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 356 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 357 KBUFSZ, &keysym, &status_return);
358
116 if (rs[Rs_imLocale]) 359 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 360 SET_LOCALE (locale);
118 361
119 if (status_return == XLookupChars 362 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 363 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
142 } 385 }
143 else 386 else
144#endif 387#endif
145 { 388 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
148 } 391 }
149 392
150 if (valid_keysym) 393 if (valid_keysym)
151 { 394 {
395#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state))
397 return;
398#endif
399
152 if (TermWin.saveLines) 400 if (saveLines)
153 { 401 {
154#ifdef UNSHIFTED_SCROLLKEYS 402#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 403 if (!ctrl && !meta)
156 {
157#else 404#else
158 if (IS_SCROLL_MOD) 405 if (IS_SCROLL_MOD)
406#endif
159 { 407 {
160#endif
161 int lnsppg; 408 int lnsppg;
162 409
163#ifdef PAGING_CONTEXT_LINES 410#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 411 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 412#else
166 lnsppg = TermWin.nrow * 4 / 5; 413 lnsppg = nrow * 4 / 5;
167#endif 414#endif
168 if (keysym == XK_Prior) 415 if (keysym == XK_Prior)
169 { 416 {
170 scr_page (UP, lnsppg); 417 scr_page (UP, lnsppg);
171 return; 418 return;
… …
199 scr_move_to (0, 1); 446 scr_move_to (0, 1);
200 return; 447 return;
201 } 448 }
202 else if (keysym == XK_End) 449 else if (keysym == XK_End)
203 { 450 {
204 scr_move_to (1, 0); 451 scr_move_to (1, 1);
205 return; 452 return;
206 } 453 }
207 } 454 }
208#endif 455#endif
209 } 456 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 461 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 462 {
216 keysym += (XK_F11 - XK_F1); 463 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 464 shft = 0; /* turn off Shift */
218 } 465 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 467 {
221 switch (keysym) 468 switch (keysym)
222 { 469 {
223 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
226 return; 473 return;
474#if TODO
227 /* rxvt extras */ 475 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 477 change_font (FONT_UP);
230 return; 478 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 480 change_font (FONT_DN);
233 return; 481 return;
482#endif
234 } 483 }
235 } 484 }
236 } 485 }
237#ifdef PRINTPIPE 486
238 if (keysym == XK_Print) 487#if ENABLE_FRILLS || ISO_14755
239 { 488 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 489 if (shft && ctrl)
241 return;
242 } 490 {
243#endif 491 int hv;
244 492
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 493 if (iso14755buf & ISO_14755_51
246 { 494 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 495 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 496 {
250 unsigned int l; 497 commit_iso14755 ();
251 const unsigned char *kbuf0; 498 iso14755buf = ISO_14755_51;
252 499# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 500 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 501# endif
261 ) 502 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 503 }
266 504 else if (keysym == XK_BackSpace)
267 tt_write (kbuf0, l); 505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
512 else if ((hv = hex_keyval (ev)) >= 0)
513 {
514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
515 | hv | ISO_14755_51;
516# if ISO_14755
517 iso14755_51 (iso14755buf & ISO_14755_MASK);
518# endif
268 return; 519 return;
269 } 520 }
270 else 521 else
271#endif
272 { 522 {
523# if ISO_14755
524 scr_overlay_off ();
525# endif
526 iso14755buf = 0;
527 }
528 }
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
531 if (!(iso14755buf & ISO_14755_STARTED))
532 {
533 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
536 scr_overlay_set (0, 0, "ISO 14755 mode");
537# endif
538 }
539#endif
540
541#ifdef PRINTPIPE
542 if (keysym == XK_Print)
543 {
544 scr_printscreen (ctrl | shft);
545 return;
546 }
547#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
273 newlen = 1; 553 newlen = 1;
274 switch (keysym) 554 switch (keysym)
275 { 555 {
276#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 557 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 558 if (priv_modes & PrivMode_HaveBackSpace)
279 { 559 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
283 } 563 }
284 else 564 else
285 STRCPY (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
286 break; 566 break;
287#endif 567#endif
288#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
289 case XK_Delete: 579 case XK_Delete:
290 STRCPY (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
291 break; 581 break;
292#endif 582#endif
293 case XK_Tab: 583 case XK_Tab:
294 if (shft) 584 if (shft)
295 STRCPY (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
296 else 586 else
297 { 587 {
298#ifdef CTRL_TAB_MAKES_META 588#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 589 if (ctrl)
300 meta = 1; 590 meta = 1;
… …
306 newlen = 0; 596 newlen = 0;
307 } 597 }
308 break; 598 break;
309 599
310#ifdef XK_KP_Left 600#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
316 { 606 {
317 STRCPY (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 609 break;
320 } 610 }
321 else 611 else
322 /* translate to std. cursor key */ 612 /* translate to std. cursor key */
… …
325#endif 615#endif
326 case XK_Up: /* "\033[A" */ 616 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 617 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 618 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 619 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 620 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 621 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 622 /* do Shift first */
333 if (shft) 623 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 624 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 625 else if (ctrl)
336 { 626 {
337 kbuf[1] = 'O'; 627 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 628 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 629 }
340 else if (PrivateModes & PrivMode_aplCUR) 630 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 631 kbuf[1] = 'O';
342 break; 632 break;
343 633
344#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
346 case XK_KP_Prior: 636 case XK_KP_Prior:
347 /* allow shift to override */ 637 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
349 { 639 {
350 STRCPY (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
351 break; 641 break;
352 } 642 }
353 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
354# endif 644# endif
355 case XK_Prior: 645 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
357 break; 647 break;
358# ifdef XK_KP_Next 648# ifdef XK_KP_Next
359 case XK_KP_Next: 649 case XK_KP_Next:
360 /* allow shift to override */ 650 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
362 { 652 {
363 STRCPY (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
364 break; 654 break;
365 } 655 }
366 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
367# endif 657# endif
368 case XK_Next: 658 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
370 break; 660 break;
371#endif 661#endif
372 case XK_KP_Enter: 662 case XK_KP_Enter:
373 /* allow shift to override */ 663 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
375 { 665 {
376 STRCPY (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
377 } 678 }
378 else 679 else
379 { 680 {
380 kbuf[0] = '\r'; 681 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 682 kbuf[1] = '\0';
382 } 683 }
383 break; 684 break;
384 685
385#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
386 case XK_KP_Begin: 687 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
388 break; 689 break;
389 690
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 691#endif
398 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 696 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 697 kbuf[2] += (keysym - XK_KP_F1);
404 break; 698 break;
405 699
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 700 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 701 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 716 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
424 { 718 {
425 STRCPY (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 721 }
428 else 722 else
429 { 723 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 725 kbuf[1] = '\0';
432 } 726 }
433 break; 727 break;
434 728
435 case XK_Find: 729 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
437 break; 731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
438 case XK_Insert: 743 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
440 break; 745 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 747 case DXK_Remove:
443 /* FALLTHROUGH */ 748 /* FALLTHROUGH */
444#endif 749#endif
445 case XK_Execute: 750 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 751 strcpy (kbuf, "\033[3~");
447 break; 752 break;
448 case XK_Select: 753 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
450 break; 755 break;
451#ifdef XK_KP_End 756#ifdef XK_KP_End
452 case XK_KP_End: 757 case XK_KP_End:
453 /* allow shift to override */ 758 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
455 { 760 {
456 STRCPY (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
457 break; 762 break;
458 } 763 }
459 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
460#endif 765#endif
461 case XK_End: 766 case XK_End:
462 STRCPY (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
463 break; 768 break;
464#ifdef XK_KP_Home 769#ifdef XK_KP_Home
465 case XK_KP_Home: 770 case XK_KP_Home:
466 /* allow shift to override */ 771 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
468 { 773 {
469 STRCPY (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
470 break; 775 break;
471 } 776 }
472 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
473#endif 778#endif
474 case XK_Home: 779 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 780 strcpy (kbuf, KS_HOME);
476 break; 781 break;
477 782
478#define FKEY(n, fkey) \ 783#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 785
… …
532#undef FKEY 837#undef FKEY
533 default: 838 default:
534 newlen = 0; 839 newlen = 0;
535 break; 840 break;
536 } 841 }
842
537 if (newlen) 843 if (newlen)
538 len = STRLEN (kbuf); 844 len = strlen (kbuf);
539 } 845 }
540 846
541 /* 847 /*
542 * Pass meta for all function keys, if 'meta' option set 848 * Pass meta for all function keys, if 'meta' option set
543 */ 849 */
… …
550 else if (ctrl && keysym == XK_minus) 856 else if (ctrl && keysym == XK_minus)
551 { 857 {
552 len = 1; 858 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
555 else 866 else
556 { 867 {
557#ifdef META8_OPTION 868#ifdef META8_OPTION
558 /* set 8-bit on */ 869 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
560 { 871 {
561 unsigned char *ch; 872 char *ch;
562 873
563 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 875 *ch |= 0x80;
565 876
566 meta = 0; 877 meta = 0;
… …
568#endif 879#endif
569 /* nil */ ; 880 /* nil */ ;
570 } 881 }
571 } 882 }
572 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
573 if (len <= 0) 887 if (len <= 0)
574 return; /* not mapped */ 888 return; /* not mapped */
575 889
576 if (Options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 891 if (view_start)
578 { 892 {
579 TermWin.view_start = 0; 893 view_start = 0;
580 want_refresh = 1; 894 want_refresh = 1;
581 } 895 }
582 896
583 /* 897 /*
584 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 913#ifdef META8_OPTION
600 && meta_char == C0_ESC 914 && meta_char == C0_ESC
601#endif 915#endif
602 ) 916 )
603 { 917 {
604 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
605 tt_write (&ch, 1); 919 tt_write (&ch, 1);
606 } 920 }
607 921
608#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */
610 unsigned char *p;
611 int i;
612
613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
614 for (i = 0, p = kbuf; i < len; i++, p++)
615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
616 fprintf (stderr, "'\n");
617#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
619} 923}
620/*}}} */
621 924
622#if (MENUBAR_MAX) 925void
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 926rxvt_term::key_release (XKeyEvent &ev)
624/* attempt to `write' count to the input buffer */ 927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
1002#if defined (KEYSYM_RESOURCE)
625unsigned int 1003unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 1005{
628 unsigned int n, s; 1006 unsigned int n, s;
629 1007
630 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 1010
633 if (n > 0 && s < count) 1011 if (n > 0 && s < count)
634 { 1012 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 1013 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 1015 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 1016 cmdbuf_endp -= n;
639 s += n; 1017 s += n;
640 } 1018 }
… …
650 1028
651 cmd_parse (); 1029 cmd_parse ();
652 1030
653 return 0; 1031 return 0;
654} 1032}
655#endif /* MENUBAR_MAX */ 1033#endif
656 1034
657void 1035void
658rxvt_term::flush () 1036rxvt_term::flush ()
659{ 1037{
660#ifdef TRANSPARENT 1038 flush_ev.stop ();
661 if (want_full_refresh)
662 {
663 want_full_refresh = 0;
664 scr_clear ();
665 scr_touch (false);
666 want_refresh = 1;
667 }
668#endif
669 1039
670 if (want_refresh) 1040 if (want_refresh)
671 { 1041 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 {
1044 int row = view_start;
1045 int end_row = row + nrow;
1046
1047 while (row > top_row && ROW (row - 1).is_longer ())
1048 --row;
1049
1050 do
1051 {
1052 int start_row = row;
1053 line_t *l;
1054
1055 do
1056 {
1057 l = &ROW (row++);
1058
1059 if (!(l->f & LINE_FILTERED))
1060 {
1061 // line not filtered, mark it as filtered
1062 l->f |= LINE_FILTERED;
1063 while (l->is_longer ())
1064 {
1065 l = &ROW (row++);
1066 l->f |= LINE_FILTERED;
1067 }
1068
1069 // and filter it
1070 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1071
1072 break;
1073 }
1074 }
1075 while (l->is_longer () && row < end_row);
1076 }
1077 while (row < end_row);
1078 }
1079
672 scr_refresh (refresh_type); 1080 scr_refresh ();
673 scrollbar_show (1); 1081 scrollbar_show (1);
674#ifdef USE_XIM 1082#ifdef USE_XIM
675 IMSendSpot (); 1083 IMSendSpot ();
676#endif 1084#endif
677
678 } 1085 }
679 1086
680 display->flush (); 1087 display->flush ();
681} 1088}
682 1089
683void 1090void
684rxvt_term::check_cb (check_watcher &w) 1091rxvt_term::check_cb (check_watcher &w)
685{ 1092{
686 SET_R (this); 1093 make_current ();
687 SET_LOCALE (locale);
688 1094
1095 display->flush ();
1096
1097 if (want_refresh && !flush_ev.active)
1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1099}
1100
1101void
1102rxvt_term::flush_cb (time_watcher &w)
1103{
1104 make_current ();
1105
1106 refresh_count = 0;
689 flush (); 1107 flush ();
690} 1108}
691 1109
692#ifdef CURSOR_BLINK 1110#ifdef CURSOR_BLINK
693void 1111void
694rxvt_term::cursor_blink_cb (time_watcher &w) 1112rxvt_term::cursor_blink_cb (time_watcher &w)
695{ 1113{
696 hidden_cursor = !hidden_cursor; 1114 hidden_cursor = !hidden_cursor;
697 want_refresh = 1; 1115 want_refresh = 1;
698 1116
699 w.start (w.at + BLINK_INTERVAL); 1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
700} 1118}
701#endif 1119#endif
702 1120
703#ifdef TEXT_BLINK 1121#ifdef TEXT_BLINK
704void 1122void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1129 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 1130 }
713} 1131}
714#endif 1132#endif
715 1133
1134#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135void
1136rxvt_term::cont_scroll_cb (time_watcher &w)
1137{
1138 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1139 scr_page (scrollbar_isUp() ? UP : DN, 1))
1140 {
1141 want_refresh = 1;
1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1143 }
1144}
1145#endif
1146
1147#ifdef SELECTION_SCROLLING
1148void
1149rxvt_term::sel_scroll_cb (time_watcher &w)
1150{
1151 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152 {
1153 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154 want_refresh = 1;
1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1156 }
1157}
1158#endif
1159
1160#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161void
1162rxvt_term::slip_wheel_cb (time_watcher &w)
1163{
1164 if (mouse_slip_wheel_speed == 0
1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166 : scr_page (UP, mouse_slip_wheel_speed))
1167 {
1168 if (view_start == top_row || view_start == 0)
1169 mouse_slip_wheel_speed = 0;
1170
1171 want_refresh = 1;
1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1173 }
1174}
1175#endif
1176
1177#if LINUX_YIELD_HACK
1178static struct event_handler
1179{
1180 check_watcher yield_ev;
1181
1182 void yield_cb (check_watcher &w)
1183 {
1184 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS.
1188
1189 struct timespec ts = { 0, 0 };
1190 nanosleep (&ts, 0);
1191
1192 w.stop ();
1193 }
1194
1195 event_handler ()
1196 : yield_ev (this, &event_handler::yield_cb)
1197 {
1198 }
1199} event_handler;
1200#endif
1201
716bool 1202bool
717rxvt_term::pty_fill () 1203rxvt_term::pty_fill ()
718{ 1204{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1205 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1206
1207 if (CBUFSIZ == n)
1208 {
1209 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1210 n = 0;
1211 }
720 1212
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1214 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1215 cmdbuf_endp = cmdbuf_ptr + n;
724 1216
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
726 1218
727 if (n > 0) 1219 if (r > 0)
728 { 1220 {
729 cmdbuf_endp += n; 1221 cmdbuf_endp += r;
730 return true; 1222 return true;
731 } 1223 }
732 else if (n < 0 && errno != EAGAIN) 1224 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1225 {
1226#if LINUX_YIELD_HACK
1227 if (display->is_local)
1228 event_handler.yield_ev.start ();
1229#endif
1230 }
1231 else
1232 {
1233 pty_ev.stop ();
1234
1235 if (!option (Opt_hold))
733 destroy (); 1236 destroy ();
734 1237 }
1238
735 return false; 1239 return false;
736} 1240}
737 1241
738void 1242void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1243rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1244{
741 SET_R (this); 1245 make_current ();
742 SET_LOCALE (locale); 1246
1247 if (revents & EVENT_READ)
1248 // loop, but don't allow a single term to monopolize us
1249 while (pty_fill ())
1250 if (cmd_parse ())
1251 break;
743 1252
744 if (revents & EVENT_WRITE) 1253 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1254 pty_write ();
746 else if (revents & EVENT_READ) 1255}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1256
760 if (cmd_parse ()) 1257void
761 break; 1258rxvt_term::pointer_unblank ()
762 } 1259{
763 } 1260 XDefineCursor (dpy, vt, TermWin_cursor);
1261 recolour_cursor ();
1262
1263#ifdef POINTER_BLANK
1264 hidden_pointer = 0;
1265
1266 if (option (Opt_pointerBlank))
1267 pointer_ev.start (NOW + pointerBlankDelay);
1268#endif
764} 1269}
765 1270
766#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
767void 1272void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1273rxvt_term::pointer_blank ()
781{ 1274{
782 if (! (Options & Opt_pointerBlank)) 1275 if (!option (Opt_pointerBlank))
783 return; 1276 return;
784 1277
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1278 XDefineCursor (dpy, vt, display->blank_cursor);
786 XFlush (display->display); 1279 XFlush (dpy);
787 1280
788 hidden_pointer = 1; 1281 hidden_pointer = 1;
789} 1282}
790 1283
791void 1284void
792rxvt_term::pointer_cb (time_watcher &w) 1285rxvt_term::pointer_cb (time_watcher &w)
793{ 1286{
794 SET_R (this); 1287 make_current ();
795 SET_LOCALE (locale);
796 1288
797 pointer_blank (); 1289 pointer_blank ();
798} 1290}
799#endif 1291#endif
800 1292
… …
807 x = ev.x; 1299 x = ev.x;
808 y = ev.y; 1300 y = ev.y;
809 pixel_position (&x, &y); 1301 pixel_position (&x, &y);
810 1302
811 if (MEvent.button == AnyButton) 1303 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1304 button_number = 3;
814 }
815 else 1305 else
816 { 1306 {
817 button_number = MEvent.button - Button1; 1307 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1308 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1309 if (button_number >= 3)
820 button_number += (64 - 3); 1310 button_number += (64 - 3);
821 } 1311 }
822 1312
823 if (PrivateModes & PrivMode_MouseX10) 1313 if (priv_modes & PrivMode_MouseX10)
824 { 1314 {
825 /* 1315 /*
826 * do not report ButtonRelease 1316 * do not report ButtonRelease
827 * no state info allowed 1317 * no state info allowed
828 */ 1318 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1333 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1334 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1335#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1336 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1337#endif
848
849 } 1338 }
850 1339
851#ifdef DEBUG_MOUSEREPORT 1340#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1341 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1342 if (key_state & 16)
854 fputc ('C', stderr); 1343 fputc ('C', stderr);
855 if (key_state & 4) 1344 if (key_state & 4)
856 fputc ('S', stderr); 1345 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1349 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1350 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1351 button_number,
863 x + 1, 1352 x + 1,
864 y + 1); 1353 y + 1);
865#else 1354#endif
1355
866 tt_printf ("\033[M%c%c%c", 1356 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1357 (32 + button_number + key_state),
868 (32 + x + 1), 1358 (32 + x + 1),
869 (32 + y + 1)); 1359 (32 + y + 1));
870#endif
871} 1360}
872
873#ifdef USING_W11LIB
874void
875rxvt_W11_process_x_event (XEvent *ev)
876{
877 rxvt_t *r = rxvt_get_r ();
878
879 x_cb (*ev);
880}
881#endif
882 1361
883/*{{{ process an X event */ 1362/*{{{ process an X event */
884void 1363void
885rxvt_term::x_cb (XEvent &ev) 1364rxvt_term::x_cb (XEvent &ev)
886{ 1365{
887 SET_R (this); 1366 make_current ();
888 SET_LOCALE (locale);
889 1367
890#if defined(CURSOR_BLINK) 1368 dLocal (Display *, dpy);
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
892 {
893 if (hidden_cursor)
894 {
895 hidden_cursor = 0;
896 want_refresh = 1;
897 }
898 1369
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1370 if (ev.xany.window == vt
900 } 1371 && SHOULD_INVOKE (HOOK_X_EVENT)
901#endif 1372 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
902
903#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 {
906 if (ev.type == MotionNotify
907 || ev.type == ButtonPress
908 || ev.type == ButtonRelease)
909 if (hidden_pointer)
910 pointer_unblank ();
911
912 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank ();
914 }
915#endif
916
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return; 1373 return;
920#endif
921 1374
1375 // for XQueryPointer
922 Window unused_root, unused_child; 1376 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1377 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1378 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
973#endif
974 1379
975 switch (ev.type) 1380 switch (ev.type)
976 { 1381 {
977 case KeyPress: 1382 case KeyPress:
978 lookup_key (ev.xkey); 1383 key_press (ev.xkey);
979 break; 1384 break;
980 1385
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease: 1386 case KeyRelease:
983 { 1387 key_release (ev.xkey);
984 if (! (ev.xkey.state & ControlMask))
985 mouse_slip_wheel_speed = 0;
986 else
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1388 break;
995 }
996#endif
997 1389
998 case ButtonPress: 1390 case ButtonPress:
999 button_press (ev.xbutton); 1391 button_press (ev.xbutton);
1000 break; 1392 break;
1001 1393
… …
1003 button_release (ev.xbutton); 1395 button_release (ev.xbutton);
1004 break; 1396 break;
1005 1397
1006 case ClientMessage: 1398 case ClientMessage:
1007 if (ev.xclient.format == 32 1399 if (ev.xclient.format == 32
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1400 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1009 destroy ();
1010#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink))
1016 { 1401 {
1017 /* Get Dnd data */ 1402 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1018 Atom ActualType; 1403 {
1019 int ActualFormat; 1404 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1020 unsigned char *data; 1405 {
1021 unsigned long Size, RemainingBytes; 1406 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1022 1407 {
1023 XGetWindowProperty (display->display, display->root, 1408 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1024 xa[XA_DNDSELECTION], 1409 destroy ();
1025 0L, 1000000L, 1410 }
1026 False, AnyPropertyType, 1411#if ENABLE_EWMH
1027 &ActualType, &ActualFormat, 1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1028 &Size, &RemainingBytes, 1413 XSendEvent (dpy, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1029 &data); 1415 &ev);
1030 XChangeProperty (display->display, display->root, 1416#endif
1031 XA_CUT_BUFFER0, XA_STRING, 1417 }
1032 8, PropModeReplace, 1418 }
1033 data, STRLEN (data)); 1419#if ENABLE_XEMBED
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1420 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1421 {
1422 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1423 focus_in ();
1424 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1425 focus_out ();
1426 }
1427#endif
1036 } 1428 }
1037#endif /* OFFIX_DND */
1038 break;
1039
1040 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping));
1042 break; 1429 break;
1043 1430
1044 /* 1431 /*
1045 * XXX: this is not the _current_ arrangement 1432 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1433 * Here's my conclusion:
… …
1065 break; 1452 break;
1066 } 1453 }
1067 break; 1454 break;
1068 1455
1069 case FocusIn: 1456 case FocusIn:
1070 if (!TermWin.focus) 1457 if (ev.xfocus.detail != NotifyInferior
1458 && ev.xfocus.detail != NotifyPointer
1459 && ev.xfocus.mode != NotifyGrab)
1460 focus_in ();
1461 break;
1462
1463 case FocusOut:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1467 focus_out ();
1468 break;
1469
1470 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1474 if (ev.xconfigure.window == parent[0])
1071 { 1475 {
1072 TermWin.focus = 1; 1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1;
1074#ifdef USE_XIM
1075 if (Input_Context != NULL)
1076 XSetICFocus (Input_Context);
1077#endif
1078#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif
1082
1083 } 1477 ;
1084 break;
1085 1478
1086 case FocusOut: 1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1087 if (TermWin.focus)
1088 { 1480 {
1089 TermWin.focus = 0; 1481 seen_resize = 1;
1090 want_refresh = 1; 1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1091#ifdef USE_XIM
1092 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context);
1094#endif
1095#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop ();
1098 hidden_cursor = 0;
1099#endif
1100
1101 }
1102 break;
1103
1104 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0])
1106 {
1107 int height, width;
1108
1109 do
1110 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 } 1483 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116
1117 if (szHint.width != width || szHint.height != height)
1118 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1120 resize_all_windows (width, height, 1);
1121 }
1122#ifdef DEBUG_SIZE
1123 else 1484 else
1124 { 1485 {
1125 D_SIZE ((stderr, "Size: Not resizing")); 1486#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ())
1488 update_background ();
1489#endif
1126 } 1490 }
1127#endif 1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent)
1130 {
1131 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif
1136 } 1492 }
1493 break;
1494
1495 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1498 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500
1137 break; 1501 break;
1138 1502
1139 case SelectionClear: 1503 case SelectionClear:
1140 selection_clear (); 1504 selection_clear ();
1141 break; 1505 break;
1142 1506
1143 case SelectionNotify: 1507 case SelectionNotify:
1144 if (selection_wait == Sel_normal) 1508 if (selection_wait == Sel_normal)
1145 selection_paste (ev.xselection.requestor, 1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1146 ev.xselection.property, True);
1147 break; 1510 break;
1148 1511
1149 case SelectionRequest: 1512 case SelectionRequest:
1150 selection_send (ev.xselectionrequest); 1513 selection_send (ev.xselectionrequest);
1151 break; 1514 break;
1152 1515
1516 case MapNotify:
1517 mapped = 1;
1518#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1520#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break;
1523
1153 case UnmapNotify: 1524 case UnmapNotify:
1154 TermWin.mapped = 0; 1525 mapped = 0;
1155#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1156 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1157#endif 1528#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1158 break; 1530 break;
1159
1160 case MapNotify:
1161 TermWin.mapped = 1;
1162#ifdef TEXT_BLINK
1163 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1164#endif
1165 break;
1166
1167#ifdef TRANSPARENT
1168 case ReparentNotify:
1169 rootwin_cb (ev);
1170 break;
1171#endif /* TRANSPARENT */
1172 1531
1173 case GraphicsExpose: 1532 case GraphicsExpose:
1174 case Expose: 1533 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1534 if (ev.xany.window == vt)
1176 { 1535 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1536 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1181 // don't understand this, so commented it out 1540
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1546
1185 // ev.xexpose.width, TermWin.height, False);
1186#endif
1187 want_refresh = 1; 1547 want_refresh = 1;
1188 } 1548 }
1189 else 1549 else
1190 { 1550 {
1191 XEvent unused_event; 1551 XEvent unused_event;
1192 1552
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1194 Expose, 1554 ;
1195 &unused_event)) ; 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1556 ;
1197 GraphicsExpose, 1557
1198 &unused_event)) ;
1199 if (isScrollbarWindow (ev.xany.window)) 1558 if (isScrollbarWindow (ev.xany.window))
1200 { 1559 {
1201 scrollBar.setIdle (); 1560 scrollBar.setIdle ();
1202 scrollbar_show (0); 1561 scrollbar_show (0);
1203 } 1562 }
1204#ifdef MENUBAR
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206 menubar_expose ();
1207#endif
1208 } 1563 }
1209 break; 1564 break;
1210 1565
1211 case MotionNotify: 1566 case MotionNotify:
1212#ifdef POINTER_BLANK 1567#ifdef POINTER_BLANK
1213 if (hidden_pointer) 1568 if (hidden_pointer)
1214 pointer_unblank (); 1569 pointer_unblank ();
1215#endif 1570#endif
1216#if MENUBAR 1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1217 if (isMenuBarWindow (ev.xany.window)) 1572 break;
1573
1574 if (ev.xany.window == vt)
1218 { 1575 {
1219 menubar_control (ev.xbutton); 1576 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1220 break; 1577 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1221 } 1578 ; // nop
1222#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1224 break;
1225
1226 if (ev.xany.window == TermWin.vt)
1227 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1579 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1580 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1581 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1231 ; 1582 ;
1232 1583
1233 XQueryPointer (display->display, TermWin.vt, 1584 XQueryPointer (dpy, vt,
1234 &unused_root, &unused_child, 1585 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1586 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1587 &ev.xbutton.x, &ev.xbutton.y,
1237 &unused_mask); 1588 &ev.xbutton.state);
1238#ifdef MOUSE_THRESHOLD 1589#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1590 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1591 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1592 {
1242#endif 1593#endif
1594#if ISO_14755
1595 // 5.4
1596 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1597 {
1598 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1599 break;
1600 }
1601#endif
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1602 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1603 ev.xbutton.state & Button3Mask ? 2 : 0);
1604
1245#ifdef SELECTION_SCROLLING 1605#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1606 if (ev.xbutton.y < int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1607 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1248 { 1608 {
1249 int dist; 1609 int dist;
1250
1251 pending_scroll_selection=1;
1252 1610
1253 /* don't clobber the current delay if we are 1611 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1612 * already in the middle of scrolling.
1255 */ 1613 */
1256 if (scroll_selection_delay<=0) 1614 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1616
1259 /* save the event params so we can highlight 1617 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1618 * the selection in the pending-scroll loop
1261 */ 1619 */
1262 selection_save_x=ev.xbutton.x; 1620 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1621 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1622 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1623
1267 /* calc number of lines to scroll */ 1624 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1625 if (ev.xbutton.y < int_bwidth)
1269 { 1626 {
1270 scroll_selection_dir = UP; 1627 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1628 dist = int_bwidth - ev.xbutton.y;
1272 } 1629 }
1273 else 1630 else
1274 { 1631 {
1275 scroll_selection_dir = DN; 1632 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y - 1633 dist = ev.xbutton.y - (int_bwidth + height);
1277 (TermWin.int_bwidth + TermWin.height);
1278 } 1634 }
1635
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1636 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1637 / SELECTION_SCROLL_LINE_SPEEDUP
1638 + 1;
1281 MIN_IT (scroll_selection_lines, 1639 min_it (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1640 SELECTION_SCROLL_MAX_LINES);
1283 } 1641 }
1284 else 1642 else
1285 { 1643 {
1286 /* we are within the text window, so we 1644 /* we are within the text window, so we
1287 * shouldn't be scrolling 1645 * shouldn't be scrolling
1288 */ 1646 */
1289 pending_scroll_selection = 0; 1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop();
1290 } 1649 }
1291#endif 1650#endif
1292#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1293
1294 } 1652 }
1295#endif 1653#endif
1296
1297 } 1654 }
1298 } 1655 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1657 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1302 MotionNotify, &ev)) ; 1659 MotionNotify, &ev))
1660 ;
1661
1303 XQueryPointer (display->display, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1304 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1665 &ev.xbutton.x, &ev.xbutton.y,
1307 &unused_mask); 1666 &unused_mask);
1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1309 scrollbar_size ()); 1668 scrollbar_size ());
1310 scr_refresh (refresh_type);
1311 refresh_limit = 0; 1669 want_refresh = 1;
1312 scrollbar_show (1); 1670 scrollbar_show (1);
1313 } 1671 }
1314 break; 1672 break;
1315 } 1673 }
1316}
1317 1674
1675#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685 }
1686#endif
1687
1688#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 {
1691 if (ev.type == MotionNotify
1692 || ev.type == ButtonPress
1693 || ev.type == ButtonRelease)
1694 if (hidden_pointer)
1695 pointer_unblank ();
1696
1697 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank ();
1699 }
1700#endif
1701}
1702
1703void
1704rxvt_term::focus_in ()
1705{
1706 if (!focus)
1707 {
1708 focus = 1;
1709 want_refresh = 1;
1710
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1713#if USE_XIM
1714 if (Input_Context != NULL)
1715 {
1716 IMSetPosition ();
1717 XSetICFocus (Input_Context);
1718 }
1719#endif
1720#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1723#endif
1724#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade])
1726 {
1727 pix_colors = pix_colors_focused;
1728 scr_recolour ();
1729 }
1730#endif
1731#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell))
1733 {
1734 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1735 {
1736 h->flags &= ~XUrgencyHint;
1737 XSetWMHints (dpy, parent[0], h);
1738 }
1739 }
1740#endif
1741 }
1742}
1743
1744void
1745rxvt_term::focus_out ()
1746{
1747 if (focus)
1748 {
1749 focus = 0;
1750 want_refresh = 1;
1751
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1753
1754#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf)
1756 {
1757 iso14755buf = 0;
1758# if ISO_14755
1759 scr_overlay_off ();
1760# endif
1761 }
1762#endif
1763#if USE_XIM
1764 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context);
1766#endif
1767#if CURSOR_BLINK
1768 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop ();
1770 hidden_cursor = 0;
1771#endif
1772#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade])
1774 {
1775 pix_colors = pix_colors_unfocused;
1776 scr_recolour ();
1777 }
1778#endif
1779 }
1780}
1781
1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if ENABLE_TRANSPARENCY || ENABLE_PERL
1318void 1796void
1319rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1798{
1321 SET_R (this); 1799 make_current ();
1322 SET_LOCALE (locale);
1323 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if ENABLE_TRANSPARENCY
1324 switch (ev.type) 1806 switch (ev.type)
1325 { 1807 {
1326 case PropertyNotify: 1808 case PropertyNotify:
1809 /*
1810 * if user used some Esetroot compatible prog to set the root bg,
1811 * use the property to determine the pixmap. We use it later on.
1812 */
1327 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1328 { 1815 {
1329 if (ev.xproperty.state == PropertyNewValue) 1816 bgPixmap.set_root_pixmap ();
1330 selection_property (ev.xproperty.window, ev.xproperty.atom); 1817 update_background ();
1331 break;
1332 } 1818 }
1333#ifdef TRANSPARENT
1334 else
1335 {
1336 /*
1337 * if user used some Esetroot compatible prog to set the root bg,
1338 * use the property to determine the pixmap. We use it later on.
1339 */
1340 if (xa[XA_XROOTPMAPID] == 0)
1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1342
1343 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1344 return;
1345 }
1346
1347 /* FALLTHROUGH */
1348 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1;
1351 break; 1819 break;
1820 }
1352#endif 1821# endif
1353 }
1354} 1822}
1823#endif
1355 1824
1356void 1825void
1357rxvt_term::button_press (XButtonEvent &ev) 1826rxvt_term::button_press (XButtonEvent &ev)
1358{ 1827{
1359 int reportmode = 0, clickintime; 1828 int reportmode = 0, clickintime;
1360 1829
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1830 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1831
1362 if (!bypass_keystate) 1832 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1833 reportmode = !! (priv_modes & PrivMode_mouse_report);
1834
1364 /* 1835 /*
1365 * VT window processing of button press 1836 * VT window processing of button press
1366 */ 1837 */
1367 if (ev.window == TermWin.vt) 1838 if (ev.window == vt)
1368 { 1839 {
1840 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1841 return;
1842
1843#if ISO_14755
1844 // 5.4
1845 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1846 {
1847 iso14755_54 (ev.x, ev.y);
1848 return;
1849 }
1850#endif
1851
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1852 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1853
1370 if (reportmode) 1854 if (reportmode)
1371 { 1855 {
1372 /* mouse report from vt window */ 1856 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1857 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state; 1858 MEvent.state = ev.state;
1375#ifdef MOUSE_REPORT_DOUBLECLICK 1859#ifdef MOUSE_REPORT_DOUBLECLICK
1376 if (ev.button == MEvent.button && clickintime) 1860 if (ev.button == MEvent.button && clickintime)
1377 { 1861 {
1378 /* same button, within alloted time */ 1862 /* same button, within alloted time */
1379 MEvent.clicks++; 1863 MEvent.clicks++;
1864
1380 if (MEvent.clicks > 1) 1865 if (MEvent.clicks > 1)
1381 { 1866 {
1382 /* only report double clicks */ 1867 /* only report double clicks */
1383 MEvent.clicks = 2; 1868 MEvent.clicks = 2;
1384 mouse_report (ev); 1869 mouse_report (ev);
… …
1403 } 1888 }
1404 else 1889 else
1405 { 1890 {
1406 if (ev.button != MEvent.button) 1891 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1892 MEvent.clicks = 0;
1893
1408 switch (ev.button) 1894 switch (ev.button)
1409 { 1895 {
1410 case Button1: 1896 case Button1:
1897 /* allow meta + click to select rectangular areas */
1898 /* should be done in screen.C */
1899#if ENABLE_FRILLS
1900 selection.rect = !!(ev.state & ModMetaMask);
1901#else
1902 selection.rect = false;
1903#endif
1904
1411 /* allow shift+left click to extend selection */ 1905 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1906 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1413 { 1907 {
1414 if (MEvent.button == Button1 && clickintime) 1908 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1416 else 1910 else
1417 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1926 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1927 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1435 else 1929 else
1436 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1931
1437 MEvent.button = Button3; 1932 MEvent.button = Button3;
1438 break; 1933 break;
1439 } 1934 }
1440 } 1935 }
1936
1441 MEvent.time = ev.time; 1937 MEvent.time = ev.time;
1442 return; 1938 return;
1443 } 1939 }
1444 1940
1445 /* 1941 /*
… …
1511 upordown = 1; /* down */ 2007 upordown = 1; /* down */
1512 } 2008 }
1513 if (upordown) 2009 if (upordown)
1514 { 2010 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2012 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 2013#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 2014 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 2015 {
1520 if (upordown < 0) 2016 if (upordown < 0)
1521 scrollBar.setUp (); 2017 scrollBar.setUp ();
… …
1537 break; 2033 break;
1538 case R_SB_ALIGN_BOTTOM: 2034 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 2035 csrO = scrollBar.bot - scrollBar.top;
1540 break; 2036 break;
1541 } 2037 }
2038
1542 if (scrollBar.style == R_SB_XTERM 2039 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 2040 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 2041 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 2042 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 2043
1547 scrollBar.setMotion (); 2044 scrollBar.setMotion ();
1548 break; 2045 break;
1549 2046
1550 case Button1: 2047 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2048 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1555 case Button3: 2052 case Button3:
1556 if (scrollBar.style != R_SB_XTERM) 2053 if (scrollBar.style != R_SB_XTERM)
1557 { 2054 {
1558 if (scrollbar_above_slider (ev.y)) 2055 if (scrollbar_above_slider (ev.y))
1559# ifdef RXVT_SCROLL_FULL 2056# ifdef RXVT_SCROLL_FULL
1560 scr_page (UP, TermWin.nrow - 1); 2057 scr_page (UP, nrow - 1);
1561# else 2058# else
1562 scr_page (UP, TermWin.nrow / 4); 2059 scr_page (UP, nrow / 4);
1563# endif 2060# endif
1564 else if (scrollbar_below_slider (ev.y)) 2061 else if (scrollbar_below_slider (ev.y))
1565# ifdef RXVT_SCROLL_FULL 2062# ifdef RXVT_SCROLL_FULL
1566 scr_page (DN, TermWin.nrow - 1); 2063 scr_page (DN, nrow - 1);
1567# else 2064# else
1568 scr_page (DN, TermWin.nrow / 4); 2065 scr_page (DN, nrow / 4);
1569# endif 2066# endif
1570 else 2067 else
1571 scrollBar.setMotion (); 2068 scrollBar.setMotion ();
1572 } 2069 }
1573 else 2070 else
1574 { 2071 {
1575 scr_page ((ev.button == Button1 ? DN : UP), 2072 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 2073 (nrow
1577 * scrollbar_position (ev.y) 2074 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 2075 / scrollbar_size ()));
1579 } 2076 }
2077
1580 break; 2078 break;
1581 } 2079 }
1582 } 2080 }
2081
1583 return; 2082 return;
1584 } 2083 }
1585#if MENUBAR
1586 /*
1587 * Menubar window processing of button press
1588 */
1589 if (isMenuBarWindow (ev.window))
1590 menubar_control (ev);
1591#endif
1592} 2084}
1593 2085
1594void 2086void
1595rxvt_term::button_release (XButtonEvent &ev) 2087rxvt_term::button_release (XButtonEvent &ev)
1596{ 2088{
1597 int reportmode = 0; 2089 int reportmode = 0;
1598 2090
1599 csrO = 0; /* reset csr Offset */ 2091 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 2092 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2093 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 2094
1603 if (scrollbar_isUpDn ()) 2095 if (scrollbar_isUpDn ())
1604 { 2096 {
1605 scrollBar.setIdle (); 2097 scrollBar.setIdle ();
1606 scrollbar_show (0); 2098 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH;
1609#endif
1610
1611 } 2099 }
2100
1612#ifdef SELECTION_SCROLLING 2101#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 2102 if (sel_scroll_ev.active)
2103 sel_scroll_ev.stop();
1614#endif 2104#endif
2105
1615 if (ev.window == TermWin.vt) 2106 if (ev.window == vt)
1616 { 2107 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2109 return;
2110
2111#if ISO_14755
2112 // 5.4
2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2114 return;
2115#endif
2116
1617 if (reportmode) 2117 if (reportmode)
1618 { 2118 {
1619 /* mouse report from vt window */ 2119 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 2120 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 2121 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 2135 MEvent.button = AnyButton;
1636 mouse_report (ev); 2136 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 2137#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 2138 return;
1639 } 2139 }
2140
1640 /* 2141 /*
1641 * dumb hack to compensate for the failure of click-and-drag 2142 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 2143 * when overriding mouse reporting
1643 */ 2144 */
1644 if (PrivateModes & PrivMode_mouse_report 2145 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2146 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2147 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2148 selection_extend (ev.x, ev.y, 0);
1648 2149
1649 switch (ev.button) 2150 switch (ev.button)
1650 { 2151 {
1651 case Button1: 2152 case Button1:
1652 case Button3: 2153 case Button3:
1653 selection_make (ev.time); 2154 selection_make (ev.time);
1654 break; 2155 break;
2156
1655 case Button2: 2157 case Button2:
1656 selection_request (ev.time, ev.x, ev.y); 2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1657 break; 2160 break;
2161
1658#ifdef MOUSE_WHEEL 2162#ifdef MOUSE_WHEEL
1659 case Button4: 2163 case Button4:
1660 case Button5: 2164 case Button5:
1661 { 2165 {
1662 int i; 2166 int i;
1663 page_dirn v; 2167 page_dirn v;
1664 2168
1665 v = (ev.button == Button4) ? UP : DN; 2169 v = ev.button == Button4 ? UP : DN;
2170
1666 if (ev.state & ShiftMask) 2171 if (ev.state & ShiftMask)
1667 i = 1; 2172 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2173 else if (option (Opt_mouseWheelScrollPage))
1669 i = TermWin.nrow - 1; 2174 i = nrow - 1;
1670 else 2175 else
1671 i = 5; 2176 i = 5;
2177
1672# ifdef MOUSE_SLIP_WHEELING 2178# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2179 if (ev.state & ControlMask)
1674 { 2180 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2181 mouse_slip_wheel_speed += v ? -1 : 1;
2182 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2183 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2184
2185 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2186 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2187
2188 slip_wheel_ev.start ();
2189 }
2190 else
2191 {
2192# endif
2193 scr_page (v, i);
2194 scrollbar_show (1);
2195# ifdef MOUSE_SLIP_WHEELING
1677 } 2196 }
1678# endif 2197# endif
1679# ifdef JUMP_MOUSE_WHEEL
1680 scr_page (v, i);
1681 scr_refresh (SMOOTH_REFRESH);
1682 scrollbar_show (1);
1683# else
1684 while (i--)
1685 {
1686 scr_page (v, 1);
1687 scr_refresh (SMOOTH_REFRESH);
1688 scrollbar_show (1);
1689 }
1690# endif
1691
1692 } 2198 }
1693 break; 2199 break;
1694#endif 2200#endif
1695
1696 }
1697 }
1698#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev);
1701#endif
1702}
1703
1704#ifdef TRANSPARENT
1705#if TINTING
1706/* shading taken from eterm-0.9.2 */
1707/* RGB 15 */
1708
1709static void
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1717 /* No saturation */
1718 for (y = h; --y >= 0;) {
1719 for (x = -w; x < 0; x++) {
1720 int r, g, b;
1721
1722 b = ((uint16_t *) ptr)[x];
1723 r = (b & 0x7c00) * rm;
1724 g = (b & 0x3e0) * gm;
1725 b = (b & 0x1f) * bm;
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1727 | ((g >> 8) & 0x3e0)
1728 | ((b >> 8) & 0x1f);
1729 }
1730 ptr += bpl;
1731 }
1732 } else {
1733 for (y = h; --y >= 0;) {
1734 for (x = -w; x < 0; x++) {
1735 int r, g, b;
1736
1737 b = ((uint16_t *) ptr)[x];
1738 r = (b & 0x7c00) * rm;
1739 g = (b & 0x3e0) * gm;
1740 b = (b & 0x1f) * bm;
1741 r |= (!(r >> 15) - 1);
1742 g |= (!(g >> 10) - 1);
1743 b |= (!(b >> 5) - 1);
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1745 | ((g >> 8) & 0x3e0)
1746 | ((b >> 8) & 0x1f);
1747 }
1748 ptr += bpl;
1749 }
1750 }
1751}
1752
1753/* RGB 16 */
1754static void
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1756{
1757 unsigned char *ptr;
1758 int x, y;
1759
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1762 /* No saturation */
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 }
1777 } else {
1778 for (y = h; --y >= 0;) {
1779 for (x = -w; x < 0; x++) {
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 }
1793 ptr += bpl;
1794 }
1795 }
1796}
1797
1798/* RGB 24 */
1799static void
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1801{
1802 unsigned char *ptr;
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1826 }
1827 }
1828 ptr += bpl;
1829 }
1830 } else {
1831 for (y = h; --y >= 0;) {
1832 for (x = -(w * 3); x < 0; x += 3) {
1833 int r, g, b;
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1860 }
1861 ptr += bpl;
1862 }
1863 }
1864}
1865
1866/* RGB 32 */
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1872
1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936}
1937
1938#endif
1939
1940/*
1941 * Check our parents are still who we think they are.
1942 * Do transparency updates if required
1943 */
1944int
1945rxvt_term::check_our_parents ()
1946{
1947 int i, pchanged, aformat, have_pixmap, rootdepth;
1948 unsigned long nitems, bytes_after;
1949 Atom atype;
1950 unsigned char *prop = NULL;
1951 Window root, oldp, *list;
1952 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr;
1954
1955 pchanged = 0;
1956
1957 if (!(Options & Opt_transparent))
1958 return pchanged; /* Don't try any more */
1959
1960 XGetWindowAttributes (display->display, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth;
1962
1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1964
1965 if (rootdepth != wattr.depth)
1966 {
1967 if (am_transparent)
1968 { 2201 }
1969 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0;
1972 }
1973
1974 return pchanged; /* Don't try any more */
1975 }
1976
1977 /* Get all X ops out of the queue so that our information is up-to-date. */
1978 XSync (display->display, False);
1979
1980 /*
1981 * Make the frame window set by the window manager have
1982 * the root background. Some window managers put multiple nested frame
1983 * windows for each client, so we have to take care about that.
1984 */
1985 i = (xa[XA_XROOTPMAPID]
1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1988 &nitems, &bytes_after, &prop) == Success);
1989
1990 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success);
1995
1996 if (!i || prop == NULL)
1997 have_pixmap = 0;
1998 else
1999 { 2202 }
2000 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop);
2002 XFree (prop);
2003 }
2004
2005 if (have_pixmap)
2006 {
2007 /*
2008 * Copy display->root pixmap transparency
2009 */
2010 int sx, sy, nx, ny;
2011 unsigned int nw, nh;
2012 Window cr;
2013 XImage *image;
2014 GC gc;
2015 XGCValues gcvalue;
2016
2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2018 0, 0, &sx, &sy, &cr);
2019 nw = (unsigned int)szHint.width;
2020 nh = (unsigned int)szHint.height;
2021 nx = ny = 0;
2022
2023 if (sx < 0)
2024 {
2025 nw += sx;
2026 nx = -sx;
2027 sx = 0;
2028 }
2029
2030 if (sy < 0)
2031 {
2032 nh += sy;
2033 ny = -sy;
2034 sy = 0;
2035 }
2036
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2039 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */
2044 allowedxerror = 0;
2045
2046 if (image == NULL)
2047 {
2048 if (am_transparent && am_pixmap_trans)
2049 {
2050 pchanged = 1;
2051 if (TermWin.pixmap != None)
2052 {
2053 XFreePixmap (display->display, TermWin.pixmap);
2054 TermWin.pixmap = None;
2055 }
2056 }
2057
2058 am_pixmap_trans = 0;
2059 }
2060 else
2061 {
2062 if (TermWin.pixmap != None)
2063 XFreePixmap (display->display, TermWin.pixmap);
2064
2065#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint))
2067 {
2068 unsigned short shade, rm, gm, bm;
2069
2070 PixColors[Color_tint].get (display, rm, gm, bm);
2071
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 }
2083#endif
2084
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2086 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc);
2091 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2093 TermWin.pixmap);
2094
2095 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1;
2097
2098 am_transparent = am_pixmap_trans = 1;
2099 }
2100 }
2101
2102 if (!am_pixmap_trans)
2103 {
2104 unsigned int n;
2105 /*
2106 * InheritPixmap transparency
2107 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2110 {
2111 oldp = TermWin.parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n);
2114 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116
2117 if (TermWin.parent[i] == display->root)
2118 {
2119 if (oldp != None)
2120 pchanged = 1;
2121
2122 break;
2123 }
2124
2125 if (oldp != TermWin.parent[i])
2126 pchanged = 1;
2127 }
2128
2129 n = 0;
2130
2131 if (pchanged)
2132 {
2133 for (; n < (unsigned int)i; n++)
2134 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2136 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2137 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2140 break;
2141 }
2142 }
2143 }
2144
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2146 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2150 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */
2152 }
2153 else
2154 {
2155#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1);
2159#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++)
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2163
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2165 am_transparent = 1;
2166 }
2167
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None;
2170 }
2171
2172 return pchanged;
2173} 2203}
2174#endif
2175 2204
2176/*}}} */ 2205/*}}} */
2177 2206
2178bool 2207bool
2179rxvt_term::cmd_parse () 2208rxvt_term::cmd_parse ()
2180{ 2209{
2181 bool flag = false; 2210 bool flag = false;
2182 unicode_t ch = NOCHAR; 2211 wchar_t ch = NOCHAR;
2183 unsigned char *seq_begin; // remember start of esc-sequence here 2212 char *seq_begin; // remember start of esc-sequence here
2184 2213
2185 for (;;) 2214 for (;;)
2186 { 2215 {
2187 if (ch == NOCHAR) 2216 if (ch == NOCHAR)
2188 { 2217 {
2189 seq_begin = cmdbuf_ptr; 2218 seq_begin = cmdbuf_ptr;
2190 ch = next_char (); 2219 ch = next_char ();
2191 }
2192 2220
2193 if (ch == NOCHAR) // TODO: improve 2221 if (ch == NOCHAR)
2194 break; 2222 break;
2195
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
2197 { 2223 }
2224
2225 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2226 {
2227 if (!seen_input)
2228 {
2229 seen_input = 1;
2230 // many badly-written programs (e.g. jed) contain a race condition:
2231 // they first read the screensize and then install a SIGWINCH handler.
2232 // some window managers resize the window early, and these programs
2233 // then sometimes get the size wrong.
2234 // unfortunately other programs are even more buggy and dislike
2235 // being sent SIGWINCH, so only do it when we were in fact being
2236 // resized.
2237 if (seen_resize && cmd_pid)
2238 kill (-cmd_pid, SIGWINCH);
2239 }
2240
2198 /* Read a text string from the input buffer */ 2241 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2242 wchar_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2243 bool refreshnow = false;
2201 int nlines = 0; 2244 int nlines = 0;
2202 unicode_t *str = buf; 2245 wchar_t *str = buf;
2203 2246 wchar_t *eol = str + min (ncol, UBUFSIZ);
2204 *str++ = ch;
2205 2247
2206 for (;;) 2248 for (;;)
2207 { 2249 {
2250 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2251 break;
2252
2253 *str++ = ch;
2254
2255 if (ch == C0_LF || str >= eol)
2256 {
2257 if (ch == C0_LF)
2258 nlines++;
2259
2260 refresh_count++;
2261
2262 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2263 {
2264 refresh_count = 0;
2265
2266 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2267 {
2268 refreshnow = true;
2269 ch = NOCHAR;
2270 break;
2271 }
2272 }
2273
2274 // scr_add_lines only works for nlines <= nrow - 1.
2275 if (nlines >= nrow - 1)
2276 {
2277 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2278 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2279 scr_add_lines (buf, str - buf, nlines);
2280
2281 nlines = 0;
2282 str = buf;
2283 eol = str + min (ncol, UBUFSIZ);
2284 }
2285
2286 if (str >= eol)
2287 {
2288 if (eol >= buf + UBUFSIZ)
2289 {
2290 ch = NOCHAR;
2291 break;
2292 }
2293 else
2294 eol = min (eol + ncol, buf + UBUFSIZ);
2295 }
2296
2297 }
2298
2208 seq_begin = cmdbuf_ptr; 2299 seq_begin = cmdbuf_ptr;
2209 ch = next_char (); 2300 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r'))
2212 break;
2213
2214 *str++ = ch;
2215
2216 if (ch == '\n')
2217 {
2218 nlines++;
2219 refresh_count++;
2220
2221 if (! (Options & Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2223 {
2224 refreshnow = true;
2225 flag = true;
2226 ch = NOCHAR;
2227 break;
2228 }
2229
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2231 if (nlines >= TermWin.nrow - 1)
2232 {
2233 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0;
2235 str = buf;
2236 }
2237 }
2238
2239 if (str >= buf + UBUFSIZ)
2240 {
2241 ch = NOCHAR;
2242 break;
2243 }
2244 } 2301 }
2245 2302
2303 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2304 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2246 scr_add_lines (buf, nlines, str - buf); 2305 scr_add_lines (buf, str - buf, nlines);
2247 2306
2248 /* 2307 /*
2249 * If there have been a lot of new lines, then update the screen 2308 * If there have been a lot of new lines, then update the screen
2250 * What the heck I'll cheat and only refresh less than every page-full. 2309 * What the heck we'll cheat and only refresh less than every page-full.
2251 * the number of pages between refreshes is refresh_limit, which 2310 * if skipScroll is enabled.
2252 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */ 2311 */
2257 if (refreshnow) 2312 if (refreshnow)
2258 { 2313 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2314 flag = true;
2260 refresh_limit++;
2261
2262 scr_refresh (refresh_type); 2315 scr_refresh ();
2316 want_refresh = 1;
2263 } 2317 }
2264 2318
2265 } 2319 }
2266 else 2320 else
2267 { 2321 {
… …
2282 2336
2283 return flag; 2337 return flag;
2284} 2338}
2285 2339
2286// read the next character 2340// read the next character
2287unicode_t 2341wchar_t
2288rxvt_term::next_char () 2342rxvt_term::next_char () NOTHROW
2289{ 2343{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2344 while (cmdbuf_ptr < cmdbuf_endp)
2291 { 2345 {
2292 // assume 7-bit to be ascii ALWAYS 2346 // assume 7-bit to be ascii ALWAYS
2293 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2347 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2294 return *cmdbuf_ptr++; 2348 return *cmdbuf_ptr++;
2295 2349
2296 wchar_t wc; 2350 wchar_t wc;
2297 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2351 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2298 2352
2299 if (len == (size_t)-2) 2353 if (len == (size_t)-2)
2300 { 2354 {
2301 // the mbstate stores incomplete sequences. didn't know this :/ 2355 // the mbstate stores incomplete sequences. didn't know this :/
2302 cmdbuf_ptr = cmdbuf_endp; 2356 cmdbuf_ptr = cmdbuf_endp;
2303 break; 2357 break;
2304 } 2358 }
2305 2359
2306 if (len == (size_t)-1) 2360 if (len == (size_t)-1)
2307 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2361 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2308 2362
2309 // assume wchar == unicode 2363 // assume wchar == unicode
2310 cmdbuf_ptr += len; 2364 cmdbuf_ptr += len;
2311 return wc; 2365 return wc & UNICODE_MASK;
2312 } 2366 }
2313 2367
2314 return NOCHAR; 2368 return NOCHAR;
2315} 2369}
2370
2371// read the next octet
2372uint32_t
2373rxvt_term::next_octet () NOTHROW
2374{
2375 return cmdbuf_ptr < cmdbuf_endp
2376 ? (unsigned char)*cmdbuf_ptr++
2377 : NOCHAR;
2378}
2379
2380static class out_of_input out_of_input;
2316 2381
2317/* rxvt_cmd_getc () - Return next input character */ 2382/* rxvt_cmd_getc () - Return next input character */
2318/* 2383/*
2319 * Return the next input character after first passing any keyboard input 2384 * Return the next input character after first passing any keyboard input
2320 * to the command. 2385 * to the command.
2321 */ 2386 */
2322unicode_t 2387wchar_t
2323rxvt_term::cmd_getc () 2388rxvt_term::cmd_getc () THROW ((class out_of_input))
2324{ 2389{
2325 unicode_t c = next_char (); 2390 wchar_t c = next_char ();
2391
2392 if (c == NOCHAR)
2393 throw out_of_input;
2394
2395 return c;
2396}
2397
2398uint32_t
2399rxvt_term::cmd_get8 () THROW ((class out_of_input))
2400{
2401 uint32_t c = next_octet ();
2326 2402
2327 if (c == NOCHAR) 2403 if (c == NOCHAR)
2328 throw out_of_input; 2404 throw out_of_input;
2329 2405
2330 return c; 2406 return c;
… …
2394 { 2470 {
2395 if ((buf[len++] = cmd_getc ()) == 'i') 2471 if ((buf[len++] = cmd_getc ()) == 'i')
2396 break; /* done = 1 */ 2472 break; /* done = 1 */
2397 } 2473 }
2398 } 2474 }
2399 2475
2400 for (i = 0; i < len; i++) 2476 for (i = 0; i < len; i++)
2401 if (putc (buf[i], fd) == EOF) 2477 if (putc (buf[i], fd) == EOF)
2402 { 2478 {
2403 done = 1; 2479 done = 1;
2404 break; 2480 break;
… …
2430 case C0_ESC: 2506 case C0_ESC:
2431 process_escape_seq (); 2507 process_escape_seq ();
2432 break; 2508 break;
2433 case C0_ENQ: /* terminal Status */ 2509 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2510 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2511 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2437 else 2512 else
2438 tt_write ((unsigned char *)VT100_ANS, 2513 tt_write (VT100_ANS, strlen (VT100_ANS));
2439 (unsigned int)STRLEN (VT100_ANS));
2440 break; 2514 break;
2441 case C0_BEL: /* bell */ 2515 case C0_BEL: /* bell */
2442 scr_bell (); 2516 scr_bell ();
2443 break; 2517 break;
2444 case C0_BS: /* backspace */ 2518 case C0_BS: /* backspace */
… …
2460 break; 2534 break;
2461 case C0_SI: /* shift in - acs */ 2535 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2536 scr_charset_choose (0);
2463 break; 2537 break;
2464 2538
2539#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2540 // 8-bit controls
2466 case 0x90: /* DCS */ 2541 case 0x90: /* DCS */
2467 process_dcs_seq (); 2542 process_dcs_seq ();
2468 break; 2543 break;
2469 case 0x9b: /* CSI */ 2544 case 0x9b: /* CSI */
2470 process_csi_seq (); 2545 process_csi_seq ();
2471 break; 2546 break;
2472 case 0x9d: /* CSI */ 2547 case 0x9d: /* OSC */
2473 process_osc_seq (); 2548 process_osc_seq ();
2474 break; 2549 break;
2550#endif
2475 } 2551 }
2476} 2552}
2477/*}}} */ 2553/*}}} */
2478 2554
2479 2555
… …
2541void 2617void
2542rxvt_term::process_escape_seq () 2618rxvt_term::process_escape_seq ()
2543{ 2619{
2544 unicode_t ch = cmd_getc (); 2620 unicode_t ch = cmd_getc ();
2545 2621
2546 if (PrivateModes & PrivMode_vt52) 2622 if (priv_modes & PrivMode_vt52)
2547 { 2623 {
2548 process_escape_vt52 (ch); 2624 process_escape_vt52 (ch);
2549 return; 2625 return;
2550 } 2626 }
2551 2627
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 2642 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 2643 break;
2568 case '+': 2644 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 2645 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 2646 break;
2571#ifndef NO_FRILLS 2647#if !ENABLE_MINIMAL
2572 case '6': 2648 case '6':
2573 scr_backindex (); 2649 scr_backindex ();
2574 break; 2650 break;
2575#endif 2651#endif
2576 case '7': 2652 case '7':
2577 scr_cursor (SAVE); 2653 scr_cursor (SAVE);
2578 break; 2654 break;
2579 case '8': 2655 case '8':
2580 scr_cursor (RESTORE); 2656 scr_cursor (RESTORE);
2581 break; 2657 break;
2582#ifndef NO_FRILLS 2658#if !ENABLE_MINIMAL
2583 case '9': 2659 case '9':
2584 scr_forwardindex (); 2660 scr_forwardindex ();
2585 break; 2661 break;
2586#endif 2662#endif
2587 case '=': 2663 case '=':
… …
2597 break; 2673 break;
2598 2674
2599 /* 8.3.87: NEXT LINE */ 2675 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 2676 case C1_NEL: /* ESC E */
2601 { 2677 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 2678 wchar_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 2679 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2604 } 2680 }
2605 break; 2681 break;
2606 2682
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 2683 /* kidnapped escape sequence: Should be 8.3.48 */
2608 case C1_ESA: /* ESC G */ 2684 case C1_ESA: /* ESC G */
… …
2630 process_dcs_seq (); 2706 process_dcs_seq ();
2631 break; 2707 break;
2632 2708
2633 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2709 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2634 case C1_SCI: /* ESC Z */ 2710 case C1_SCI: /* ESC Z */
2635 tt_write ((const unsigned char *)ESCZ_ANSWER, 2711 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2636 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2637 break; /* steal obsolete ESC [ c */ 2712 break; /* steal obsolete ESC [ c */
2638 2713
2639 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2714 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2640 case C1_CSI: /* ESC [ */ 2715 case C1_CSI: /* ESC [ */
2641 process_csi_seq (); 2716 process_csi_seq ();
… …
2668 2743
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 2745/* *INDENT-OFF* */
2671enum { 2746enum {
2672 CSI_ICH = 0x40, 2747 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2748 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2674 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2749 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2675 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2750 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2676 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2751 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2677 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2752 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2678 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2753 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2703rxvt_term::process_csi_seq () 2778rxvt_term::process_csi_seq ()
2704{ 2779{
2705 unicode_t ch, priv, i; 2780 unicode_t ch, priv, i;
2706 unsigned int nargs, p; 2781 unsigned int nargs, p;
2707 int n, ndef; 2782 int n, ndef;
2708 int arg[ESC_ARGS]; 2783 int arg[ESC_ARGS] = { };
2709 2784
2710 for (nargs = ESC_ARGS; nargs > 0;) 2785 nargs = 0;
2711 arg[--nargs] = 0;
2712 2786
2713 priv = 0; 2787 priv = 0;
2714 ch = cmd_getc (); 2788 ch = cmd_getc ();
2715 if (ch >= '<' && ch <= '?') 2789 if (ch >= '<' && ch <= '?')
2716 { /* '<' '=' '>' '?' */ 2790 { /* '<' '=' '>' '?' */
… …
2750 ndef = get_byte_array_bit (csi_defaults, i); 2824 ndef = get_byte_array_bit (csi_defaults, i);
2751 for (p = 0; p < nargs; p++) 2825 for (p = 0; p < nargs; p++)
2752 if (arg[p] == -1) 2826 if (arg[p] == -1)
2753 arg[p] = ndef; 2827 arg[p] = ndef;
2754 2828
2755#ifdef DEBUG_CMD
2756 fprintf (stderr, "CSI ");
2757 for (p = 0; p < nargs; p++)
2758 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2759 fprintf (stderr, "%c\n", ch);
2760#endif
2761
2762 /* 2829 /*
2763 * private mode handling 2830 * private mode handling
2764 */ 2831 */
2765 if (priv) 2832 if (priv)
2766 { 2833 {
2767 switch (priv) 2834 switch (priv)
2768 { 2835 {
2769 case '>': 2836 case '>':
2770 if (ch == CSI_DA) /* secondary device attributes */ 2837 if (ch == CSI_DA) /* secondary device attributes */
2838 {
2839 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2840 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2841 //
2842 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2843 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2844 // that we do not support xterm mouse reporting (should be 95 when we do).
2845 //
2771 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2846 tt_printf ("\033[>%d;94;0c", 'U');
2847 }
2772 break; 2848 break;
2773 case '?': 2849 case '?':
2774 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2775 process_terminal_mode (ch, priv, nargs, arg); 2851 process_terminal_mode (ch, priv, nargs, arg);
2776 break; 2852 break;
… …
2881 2957
2882 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2958 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2883 arg[0] = -arg[0]; 2959 arg[0] = -arg[0];
2884 /* FALLTHROUGH */ 2960 /* FALLTHROUGH */
2885 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2961 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2962 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2887 break; 2963 break;
2888 2964
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2965 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 2966 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2891 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 2967 break;
2893 2968
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2969 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 2970 process_sgr_mode (nargs, arg);
2896 break; 2971 break;
… …
2903 break; 2978 break;
2904 case 6: /* CPR requested */ 2979 case 6: /* CPR requested */
2905 scr_report_position (); 2980 scr_report_position ();
2906 break; 2981 break;
2907 case 7: /* unofficial extension */ 2982 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 2983 if (option (Opt_insecure))
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2984 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 2985 break;
2911 case 8: /* unofficial extension */ 2986 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2987 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 2988 break;
2914 } 2989 }
… …
2950 break; 3025 break;
2951 3026
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3027 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3028 if (arg[0] == 4)
2954 scr_insert_mode (0); 3029 scr_insert_mode (0);
3030 else if (arg[0] == 20)
3031 priv_modes &= ~PrivMode_LFNL;
2955 break; 3032 break;
2956 3033
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3034 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3035 if (arg[0] == 4)
2959 scr_insert_mode (1); 3036 scr_insert_mode (1);
3037 else if (arg[0] == 20)
3038 priv_modes |= PrivMode_LFNL;
2960 break; 3039 break;
2961 3040
2962 /* 3041 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3042 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3043 */
… …
2976 break; 3055 break;
2977 case CSI_75: 3056 case CSI_75:
2978 scr_cursor (RESTORE); 3057 scr_cursor (RESTORE);
2979 break; 3058 break;
2980 3059
2981#ifndef NO_FRILLS 3060#if !ENABLE_MINIMAL
2982 case CSI_74: 3061 case CSI_74:
2983 process_window_ops (arg, nargs); 3062 process_window_ops (arg, nargs);
2984 break; 3063 break;
2985#endif 3064#endif
2986 3065
… …
2993 break; 3072 break;
2994 } 3073 }
2995} 3074}
2996/*}}} */ 3075/*}}} */
2997 3076
2998#ifndef NO_FRILLS 3077#if !ENABLE_MINIMAL
2999/* ARGSUSED */ 3078/* ARGSUSED */
3000void 3079void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3080rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3081{
3003 int x, y; 3082 int x, y;
3004 XWindowAttributes wattr; 3083 XWindowAttributes wattr;
3005 Window wdummy; 3084 Window wdummy;
3085
3086 dLocal (Display *, dpy);
3006 3087
3007 if (nargs == 0) 3088 if (nargs == 0)
3008 return; 3089 return;
3009 3090
3010 switch (args[0]) 3091 switch (args[0])
3011 { 3092 {
3012 /* 3093 /*
3013 * commands 3094 * commands
3014 */ 3095 */
3015 case 1: /* deiconify window */ 3096 case 1: /* deiconify window */
3016 XMapWindow (display->display, TermWin.parent[0]); 3097 XMapWindow (dpy, parent[0]);
3017 break; 3098 break;
3018 case 2: /* iconify window */ 3099 case 2: /* iconify window */
3019 XIconifyWindow (display->display, TermWin.parent[0], 3100 XIconifyWindow (dpy, parent[0], display->screen);
3020 DefaultScreen (display->display));
3021 break; 3101 break;
3022 case 3: /* set position (pixels) */ 3102 case 3: /* set position (pixels) */
3023 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3103 XMoveWindow (dpy, parent[0], args[1], args[2]);
3024 break; 3104 break;
3025 case 4: /* set size (pixels) */ 3105 case 4: /* set size (pixels) */
3026 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3106 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3027 break; 3107 break;
3028 case 5: /* raise window */ 3108 case 5: /* raise window */
3029 XRaiseWindow (display->display, TermWin.parent[0]); 3109 XRaiseWindow (dpy, parent[0]);
3030 break; 3110 break;
3031 case 6: /* lower window */ 3111 case 6: /* lower window */
3032 XLowerWindow (display->display, TermWin.parent[0]); 3112 XLowerWindow (dpy, parent[0]);
3033 break; 3113 break;
3034 case 7: /* refresh window */ 3114 case 7: /* refresh window */
3035 scr_touch (true); 3115 scr_touch (true);
3036 break; 3116 break;
3037 case 8: /* set size (chars) */ 3117 case 8: /* set size (chars) */
3038 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3118 set_widthheight ((unsigned int) (args[2] * fwidth),
3039 (unsigned int) (args[1] * TermWin.fheight)); 3119 (unsigned int) (args[1] * fheight));
3040 break; 3120 break;
3041 3121
3042 //case 9: NYI, TODO, restore maximized window or maximize window 3122 //case 9: NYI, TODO, restore maximized window or maximize window
3043 default: 3123 default:
3044 if (args[0] >= 24) /* set height (chars) */ 3124 if (args[0] >= 24) /* set height (chars) */
3045 set_widthheight ((unsigned int)TermWin.width, 3125 set_widthheight ((unsigned int)width,
3046 (unsigned int) (args[1] * TermWin.fheight)); 3126 (unsigned int) (args[1] * fheight));
3047 break; 3127 break;
3048
3049 3128
3050 /* 3129 /*
3051 * reports - some output format copied from XTerm 3130 * reports - some output format copied from XTerm
3052 */ 3131 */
3053 case 11: /* report window state */ 3132 case 11: /* report window state */
3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3133 XGetWindowAttributes (dpy, parent[0], &wattr);
3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3134 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3056 break; 3135 break;
3057 case 13: /* report window position */ 3136 case 13: /* report window position */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3137 XGetWindowAttributes (dpy, parent[0], &wattr);
3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3138 XTranslateCoordinates (dpy, parent[0], wattr.root,
3060 -wattr.border_width, -wattr.border_width, 3139 -wattr.border_width, -wattr.border_width,
3061 &x, &y, &wdummy); 3140 &x, &y, &wdummy);
3062 tt_printf ("\033[3;%d;%dt", x, y); 3141 tt_printf ("\033[3;%d;%dt", x, y);
3063 break; 3142 break;
3064 case 14: /* report window size (pixels) */ 3143 case 14: /* report window size (pixels) */
3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3144 XGetWindowAttributes (dpy, parent[0], &wattr);
3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3145 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3067 break; 3146 break;
3068 case 18: /* report text area size (chars) */ 3147 case 18: /* report text area size (chars) */
3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3148 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3070 break; 3149 break;
3071 case 19: /* report window size (chars) */ 3150 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3151 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3073 break; 3152 break;
3074 case 20: /* report icon label */ 3153 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3154 {
3077 char *s; 3155 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3156 XGetIconName (dpy, parent[0], &s);
3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3157 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3158 XFree (s);
3080 } 3159 }
3081 break; 3160 break;
3082 case 21: /* report window title */ 3161 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3162 {
3085 char *s; 3163 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3164 XFetchName (dpy, parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3165 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3166 XFree (s);
3088 } 3167 }
3089 break; 3168 break;
3090 } 3169 }
3091} 3170}
3092#endif 3171#endif
3093 3172
3094/*----------------------------------------------------------------------*/ 3173/*----------------------------------------------------------------------*/
3095/* 3174/*
3096 * get input up until STRING TERMINATOR (or BEL) 3175 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3176 * ends_how is terminator used. returned input must be free()'d
3098 */ 3177 */
3099unsigned char * 3178char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3179rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3180{
3102 int seen_esc = 0; /* seen escape? */ 3181 unicode_t ch;
3182 bool seen_esc = false;
3103 unsigned int n = 0; 3183 unsigned int n = 0;
3104 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3184 wchar_t string[STRING_MAX];
3107 3185
3108 while ((ch = cmd_getc ())) 3186 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3187 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3188 if (seen_esc)
3189 {
3114 if (ch == 0x5c) /* 7bit ST */ 3190 if (ch == 0x5c) /* 7bit ST */
3115 break; 3191 break;
3116 else 3192 else
3117 return NULL; 3193 return NULL;
3118 3194 }
3119 if (ch == C0_ESC) 3195 else if (ch == C0_ESC)
3120 { 3196 {
3121 seen_esc = 1; 3197 seen_esc = true;
3122 continue; 3198 continue;
3123 } 3199 }
3200 else if (ch == C0_BEL || ch == CHAR_ST)
3201 break;
3124 else if (ch == '\t') 3202 else if (ch == C0_SYN)
3125 ch = ' '; /* translate '\t' to space */ 3203 ch = cmd_get8 ();
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3204 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3205 return NULL; /* other control character - exit */
3128 3206
3129 if (n >= sizeof (string) - 1) 3207 seen_esc = false;
3208
3209 if (n >= STRING_MAX - 1)
3130 // stop at some sane length 3210 // stop at some sane length
3131 return NULL; 3211 return NULL;
3132 3212
3133 string[n++] = ch; 3213 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3214 }
3136 3215
3137 string[n++] = '\0'; 3216 string[n++] = '\0';
3138 3217
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL;
3141
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3218 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3219
3144 return s; 3220 return rxvt_wcstombs (string);
3145} 3221}
3146 3222
3147/*----------------------------------------------------------------------*/ 3223/*----------------------------------------------------------------------*/
3148/* 3224/*
3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3225 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3150 */ 3226 */
3151void 3227void
3152rxvt_term::process_dcs_seq () 3228rxvt_term::process_dcs_seq ()
3153{ 3229{
3154 unsigned char *s; 3230 char *s;
3155 unicode_t eh; 3231 unicode_t eh;
3156 3232
3157 /* 3233 /*
3158 * Not handled yet 3234 * Not handled yet
3159 */ 3235 */
… …
3178 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3254 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3179 arg = arg * 10 + (ch - '0'); 3255 arg = arg * 10 + (ch - '0');
3180 3256
3181 if (ch == ';') 3257 if (ch == ';')
3182 { 3258 {
3183 unsigned char *s = get_to_st (eh); 3259 char *s = get_to_st (eh);
3184 3260
3185 if (s) 3261 if (s)
3186 { 3262 {
3187 process_xterm_seq (arg, (char *)s, eh); 3263 process_xterm_seq (arg, s, eh);
3188 free (s); 3264 free (s);
3189 } 3265 }
3190 } 3266 }
3191} 3267}
3192 3268
3193void 3269void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3270rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3195{ 3271{
3196 if (str[0] == '?' && !str[1]) 3272 if (str[0] == '?' && !str[1])
3197 { 3273 {
3198 if (Options & Opt_insecure) 3274 rgba c;
3199 { 3275 pix_colors_focused[color].get (c);
3200 unsigned short r, g, b; 3276
3201 PixColors[color].get (display, r, g, b); 3277#if XFT
3278 if (c.a != rgba::MAX_CC)
3279 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3280 else
3281#endif
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3282 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3203 }
3204 } 3283 }
3205 else 3284 else
3206 set_window_color (color, str); 3285 set_window_color (color, str);
3207} 3286}
3208 3287
3209/* 3288/*
3210 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3289 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3211 * 0 = change iconName/title
3212 * 1 = change iconName
3213 * 2 = change title
3214 * 4 = change color
3215 * 10 = change fg color
3216 * 11 = change bg color
3217 * 12 = change text color
3218 * 13 = change mouse foreground color
3219 * 17 = change highlight character colour
3220 * 18 = change bold character color
3221 * 19 = change underlined character color
3222 * 46 = change logfile (not implemented)
3223 * 50 = change font
3224 *
3225 * rxvt extensions:
3226 * 20 = bg pixmap
3227 * 39 = change default fg color
3228 * 49 = change default bg color
3229 * 55 = dump scrollback buffer and all of screen
3230 * 701 = change locale
3231 * 702 = find font
3232 * 703 = menu
3233 */ 3290 */
3234void 3291void
3235rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3292rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3236{ 3293{
3237 int changed = 0;
3238 int color; 3294 int color;
3239 char *buf, *name; 3295 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3296 bool query = str[0] == '?' && !str[1];
3297 int saveop = op;
3298
3299 dLocal (Display *, dpy);
3241 3300
3242 assert (str != NULL); 3301 assert (str != NULL);
3302
3303 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3304 return;
3305
3243 switch (op) 3306 switch (op)
3244 { 3307 {
3245 case XTerm_name: 3308 case XTerm_name:
3246 set_title (str); 3309 set_title (str);
3247 /* FALLTHROUGH */ 3310 /* FALLTHROUGH */
… …
3252 set_title (str); 3315 set_title (str);
3253 break; 3316 break;
3254 case XTerm_property: 3317 case XTerm_property:
3255 if (str[0] == '?') 3318 if (str[0] == '?')
3256 { 3319 {
3257 Atom prop = XInternAtom (display->display, str + 1, True); 3320 Atom prop = display->atom (str + 1);
3258 Atom actual_type; 3321 Atom actual_type;
3259 int actual_format; 3322 int actual_format;
3260 unsigned long nitems; 3323 unsigned long nitems;
3261 unsigned long bytes_after; 3324 unsigned long bytes_after;
3262 unsigned char *value = 0; 3325 unsigned char *value = 0;
3263 const char *str = ""; 3326 const char *str = "";
3264 3327
3265 if (prop 3328 if (prop
3266 && XGetWindowProperty (display->display, TermWin.parent[0], 3329 && XGetWindowProperty (dpy, parent[0],
3267 prop, 0, 1<<16, 0, AnyPropertyType, 3330 prop, 0, 1<<16, 0, AnyPropertyType,
3268 &actual_type, &actual_format, 3331 &actual_type, &actual_format,
3269 &nitems, &bytes_after, &value) == Success 3332 &nitems, &bytes_after, &value) == Success
3270 && actual_type != None 3333 && actual_type != None
3271 && actual_format == 8) 3334 && actual_format == 8)
3272 str = (const char *)(value); 3335 str = (const char *)(value);
3273 3336
3274 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3337 tt_printf ("\033]%d;%s%c", op, str, resp);
3275 3338
3276 XFree (value); 3339 XFree (value);
3277 } 3340 }
3278 else 3341 else
3279 { 3342 {
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3343 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281 3344
3282 if (eq) 3345 if (eq)
3283 { 3346 {
3284 *eq = 0; 3347 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0], 3348 set_utf8_property (display->atom (str), eq + 1);
3286 display->atom (str), XA_STRING, 8,
3287 PropModeReplace, (unsigned char *)eq + 1,
3288 strlen (eq + 1));
3289 } 3349 }
3290 else 3350 else
3291 XDeleteProperty (display->display, TermWin.parent[0], 3351 XDeleteProperty (dpy, parent[0],
3292 display->atom (str)); 3352 display->atom (str));
3293 } 3353 }
3294 break; 3354 break;
3295 3355
3296 case XTerm_Color: 3356 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3357 for (buf = (char *)str; buf && *buf;)
3298 { 3358 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3359 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3360 break;
3301 3361
3302 *name++ = '\0'; 3362 *name++ = '\0';
3303 color = atoi (buf); 3363 color = atoi (buf) + minCOLOR;
3304 3364
3305 if (color < 0 || color >= TOTAL_COLORS) 3365 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3306 break; 3366 break;
3307 3367
3308 if ((buf = STRCHR (name, ';')) != NULL) 3368 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3369 *buf++ = '\0';
3310 3370
3311 if (name[0] == '?' && !name[1]) 3371 process_color_seq (op, color, name, resp);
3312 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 }
3320 else
3321 set_window_color (color + minCOLOR, name);
3322 } 3372 }
3323 break; 3373 break;
3324 case XTerm_Color00: 3374 case XTerm_Color00:
3325 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3375 process_color_seq (op, Color_fg, str, resp);
3326 break; 3376 break;
3327 case XTerm_Color01: 3377 case XTerm_Color01:
3328 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3378 process_color_seq (op, Color_bg, str, resp);
3329 break; 3379 break;
3330#ifndef NO_CURSORCOLOR 3380#ifndef NO_CURSORCOLOR
3331 case XTerm_Color_cursor: 3381 case XTerm_Color_cursor:
3332 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3382 process_color_seq (op, Color_cursor, str, resp);
3333 break; 3383 break;
3334#endif 3384#endif
3335 case XTerm_Color_pointer_fg: 3385 case XTerm_Color_pointer_fg:
3336 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3386 process_color_seq (op, Color_pointer_fg, str, resp);
3337 break; 3387 break;
3338 case XTerm_Color_pointer_bg: 3388 case XTerm_Color_pointer_bg:
3339 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3389 process_color_seq (op, Color_pointer_bg, str, resp);
3340 break; 3390 break;
3341#ifndef NO_BOLD_UNDERLINE_REVERSE 3391#ifndef NO_BOLD_UNDERLINE_REVERSE
3342 case XTerm_Color_BD:
3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3344 break;
3345 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break;
3348 case XTerm_Color_RV: 3392 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3393 process_color_seq (op, Color_RV, str, resp);
3350 break; 3394 break;
3395 case Rxvt_Color_BD:
3396 case URxvt_Color_BD:
3397 process_color_seq (op, Color_BD, str, resp);
3398 break;
3399 case Rxvt_Color_UL:
3400 case URxvt_Color_UL:
3401 process_color_seq (op, Color_UL, str, resp);
3402 break;
3403 case URxvt_Color_IT:
3404 process_color_seq (op, Color_IT, str, resp);
3405 break;
3351#endif 3406#endif
3407#if ENABLE_TRANSPARENCY
3408 case URxvt_Color_tint:
3409 process_color_seq (op, Color_tint, str, resp);
3410 {
3411 bool changed = false;
3412 if (ISSET_PIXCOLOR (Color_tint))
3413 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3414 else
3415 changed = bgPixmap.unset_tint ();
3416 if (changed)
3417 update_background ();
3418 }
3352 3419
3420 break;
3421#endif
3422
3423#if BG_IMAGE_FROM_FILE
3353 case XTerm_Pixmap: 3424 case Rxvt_Pixmap:
3354 if (*str != ';') 3425 if (!strcmp (str, "?"))
3355 { 3426 {
3356#if XPM_BACKGROUND 3427 char str[256];
3357 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */
3359#endif
3360 scr_touch (true);
3361 }
3362 while ((str = STRCHR (str, ';')) != NULL)
3363 {
3364 str++;
3365#if XPM_BACKGROUND
3366 changed += scale_pixmap (str);
3367#endif
3368 3428
3369 } 3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3370 if (changed) 3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3371 { 3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3372#ifdef XPM_BACKGROUND 3432 process_xterm_seq (XTerm_title, str, CHAR_ST);
3373 resize_pixmap ();
3374#endif
3375 scr_touch (true);
3376 }
3377 break;
3378
3379 case XTerm_restoreFG:
3380 set_window_color (Color_fg, str);
3381 break;
3382 case XTerm_restoreBG:
3383 set_window_color (Color_bg, str);
3384 break;
3385
3386 case XTerm_logfile:
3387 // TODO, when secure mode?
3388 break;
3389
3390 case XTerm_font:
3391 if (query)
3392 {
3393 if (Options & Opt_insecure)
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3395 TermWin.fontset->fontdesc
3396 ? TermWin.fontset->fontdesc
3397 : "",
3398 resp);
3399 }
3400 else
3401 change_font (str);
3402 break;
3403
3404#ifndef NO_FRILLS
3405 case XTerm_locale:
3406 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3410 } 3433 }
3411 else 3434 else
3412 { 3435 {
3436 int changed = 0;
3437
3438 if (*str != ';')
3439 {
3440 /* reset to default scaling :*/
3441 bgPixmap.unset_geometry ();
3442 if (bgPixmap.set_file (str)) /* change pixmap */
3443 changed++;
3444 str = strchr (str, ';');
3445 if (str == NULL)
3446 bgPixmap.set_defaultGeometry ();
3447 }
3413 set_locale (str); 3448 while (str)
3414# ifdef USE_XIM 3449 {
3415 im_cb (); 3450 str++;
3416# endif 3451 if (bgPixmap.set_geometry (str))
3452 changed++;
3453 str = strchr (str, ';');
3454 }
3455 if (changed)
3456 update_background ();
3417 } 3457 }
3418 break; 3458 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif 3459#endif
3429 3460
3430#ifdef MENUBAR 3461 case Rxvt_restoreFG:
3431 case XTerm_Menu: 3462 set_window_color (Color_fg, str);
3432 if (Options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3463 break;
3435#endif 3464 case Rxvt_restoreBG:
3465 set_window_color (Color_bg, str);
3466 break;
3467
3468 case XTerm_logfile:
3469 // TODO, when secure mode?
3470 break;
3471
3436#if 0 3472#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3473 case Rxvt_dumpscreen: /* no error notices */
3438 { 3474 {
3439 int fd; 3475 int fd;
3440 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3476 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3441 { 3477 {
3442 scr_dump (fd); 3478 scr_dump (fd);
3443 close (fd); 3479 close (fd);
3444 } 3480 }
3445 } 3481 }
3482 break;
3483#endif
3484 case XTerm_font:
3485 op = URxvt_font;
3486 case URxvt_font:
3487#if ENABLE_STYLES
3488 case URxvt_boldFont:
3489 case URxvt_italicFont:
3490 case URxvt_boldItalicFont:
3491#endif
3492 if (query)
3493 tt_printf ("\33]%d;%-.250s%c", saveop,
3494 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3495 ? fontset[op - URxvt_font]->fontdesc : "",
3496 resp);
3497 else
3498 {
3499 const char *&res = rs[Rs_font + (op - URxvt_font)];
3500
3501 res = strdup (str);
3502 allocated.push_back ((void *)res);
3503 set_fonts ();
3504 }
3505 break;
3506
3507 case URxvt_version:
3508 if (query)
3509 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3510 op,
3511 rs[Rs_name], VERSION[0], VERSION[2],
3512 resp);
3513 break;
3514
3515#if !ENABLE_MINIMAL
3516 case URxvt_locale:
3517 if (query)
3518 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3519 else
3520 {
3521 set_locale (str);
3522 pty->set_utf8_mode (enc_utf8);
3523 init_xlocale ();
3524 }
3525 break;
3526
3527 case URxvt_view_up:
3528 case URxvt_view_down:
3529 {
3530 int lines = atoi (str);
3531
3532 if (lines)
3533 scr_page (op == URxvt_view_up ? UP : DN, lines);
3534 else
3535 scr_erase_savelines ();
3536 }
3537
3538 break;
3539#endif
3540
3541#if ENABLE_PERL
3542 case URxvt_perl:
3543 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3544 ; // no responses yet
3446 break; 3545 break;
3447#endif 3546#endif
3448 } 3547 }
3449} 3548}
3450/*----------------------------------------------------------------------*/ 3549/*----------------------------------------------------------------------*/
… …
3464{ 3563{
3465 int state; 3564 int state;
3466 3565
3467 if (mode == 's') 3566 if (mode == 's')
3468 { 3567 {
3469 SavedModes |= (PrivateModes & bit); 3568 SavedModes |= (priv_modes & bit);
3470 return -1; 3569 return -1;
3471 } 3570 }
3472 else 3571 else
3473 { 3572 {
3474 if (mode == 'r') 3573 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 3575 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3576 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 3577 PrivMode (state, bit);
3479 } 3578 }
3480 3579
3481 return state; 3580 return state;
3482} 3581}
3483 3582
3484/* we're not using priv _yet_ */ 3583/* we're not using priv _yet_ */
3485void 3584void
3486rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3585rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3487{ 3586{
3488 unsigned int i, j; 3587 unsigned int i, j;
3489 int state; 3588 int state;
3490 3589
3491 static const struct 3590 static const struct
3492 { 3591 {
3493 const int argval; 3592 const int argval;
3494 const unsigned long bit; 3593 const unsigned long bit;
3495 }
3496
3497 argtopriv[] = { 3594 } argtopriv[] = {
3498 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR },
3499 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
3500 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap },
3602 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 3604 // 18, 19 printing-related
3507 { menuBar_esc, PrivMode_menuBar }, 3605 { 25, PrivMode_VisibleCursor },
3508#endif
3509#ifdef scrollBar_esc 3606#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 3607 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 3608#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 3609 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 3610 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 3611 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 3612 // 45 margin bell NYI
3519 // 46 start logging 3613 // 46 start logging
… …
3559 } 3653 }
3560 3654
3561 /* extra handling for values with state unkept */ 3655 /* extra handling for values with state unkept */
3562 switch (arg[i]) 3656 switch (arg[i])
3563 { 3657 {
3658#if ENABLE_STYLES
3659 case 1021:
3660 set_option (Opt_intensityStyles, mode);
3661
3662 scr_touch (true);
3663 break;
3664#endif
3564 case 1048: /* alternative cursor save */ 3665 case 1048: /* alternative cursor save */
3666 case 1049:
3565 if (Options & Opt_secondaryScreen) 3667 if (option (Opt_secondaryScreen))
3566 if (mode == 0) 3668 if (mode == 0)
3567 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
3568 else if (mode == 1) 3670 else if (mode == 1)
3569 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
3570 break; 3672 break;
… …
3581 * within VT52 mode 3683 * within VT52 mode
3582 */ 3684 */
3583 PrivMode (1, PrivMode_vt52); 3685 PrivMode (1, PrivMode_vt52);
3584 break; 3686 break;
3585 case 3: /* 80/132 */ 3687 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 3688 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3689 set_widthheight (((state ? 132 : 80) * fwidth), height);
3588 break; 3690 break;
3589 case 4: /* smooth scrolling */ 3691 case 4: /* smooth scrolling */
3590 if (state) 3692 set_option (Opt_jumpScroll, !state);
3591 Options &= ~Opt_jumpScroll;
3592 else
3593 Options |= Opt_jumpScroll;
3594 break; 3693 break;
3595 case 5: /* reverse video */ 3694 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 3695 scr_rvideo_mode (state);
3597 break; 3696 break;
3598 case 6: /* relative/absolute origins */ 3697 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 3701 scr_autowrap (state);
3603 break; 3702 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 3703 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 3704 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 3705 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 3706 priv_modes &= ~PrivMode_MouseX11;
3608 break; 3707 break;
3609#ifdef menuBar_esc
3610 case menuBar_esc:
3611#ifdef MENUBAR
3612 map_menuBar (state);
3613#endif
3614 break;
3615#endif
3616#ifdef scrollBar_esc 3708#ifdef scrollBar_esc
3617 case scrollBar_esc: 3709 case scrollBar_esc:
3618 if (scrollbar_mapping (state)) 3710 if (scrollbar_mapping (state))
3619 { 3711 {
3620 resize_all_windows (0, 0, 0); 3712 resize_all_windows (0, 0, 0);
… …
3632 break; 3724 break;
3633 /* case 66: - application key pad */ 3725 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 3726 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 3727 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 3728 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 3729 priv_modes &= ~PrivMode_MouseX10;
3638 break; 3730 break;
3639#if 0 3731#if 0
3640 case 1001: 3732 case 1001:
3641 break; /* X11 mouse highlighting */ 3733 break; /* X11 mouse highlighting */
3642#endif 3734#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 3735 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state)
3645 Options &= ~Opt_scrollTtyOutput;
3646 else
3647 Options |= Opt_scrollTtyOutput; 3736 set_option (Opt_scrollTtyOutput, !state);
3648 break; 3737 break;
3649 case 1011: /* scroll to bottom on key press */ 3738 case 1011: /* scroll to bottom on key press */
3650 if (state)
3651 Options |= Opt_scrollTtyKeypress; 3739 set_option (Opt_scrollTtyKeypress, state);
3652 else
3653 Options &= ~Opt_scrollTtyKeypress;
3654 break; 3740 break;
3655 case 1047: /* secondary screen w/ clearing last */ 3741 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 3742 if (option (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 3743 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 3744 scr_erase_screen (2);
3659 scr_change_screen (state); 3745 scr_change_screen (state);
3660 break; 3746 break;
3661 case 1049: /* secondary screen w/ clearing first */ 3747 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 3748 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 3749 if (option (Opt_secondaryScreen))
3664 if (current_screen != PRIMARY) 3750 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 3751 scr_erase_screen (2);
3666 break; 3752 break;
3667 default: 3753 default:
3668 break; 3754 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 3780 rendset = 0, rendstyle = ~RS_None;
3695 break; 3781 break;
3696 case 1: 3782 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 3783 rendset = 1, rendstyle = RS_Bold;
3698 break; 3784 break;
3785 //case 2: // low intensity
3786 case 3:
3787 rendset = 1, rendstyle = RS_Italic;
3788 break;
3699 case 4: 3789 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 3790 rendset = 1, rendstyle = RS_Uline;
3701 break; 3791 break;
3702 case 5: 3792 case 5: // slowly blinking
3793 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 3794 rendset = 1, rendstyle = RS_Blink;
3704 break; 3795 break;
3796 //case 6: // scoansi light background
3705 case 7: 3797 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 3798 rendset = 1, rendstyle = RS_RVid;
3707 break; 3799 break;
3708 case 8: 3800 case 8:
3709 // invisible. NYI 3801 // invisible. NYI
3710 break; 3802 break;
3711 case 22: 3803 //case 9: // crossed out
3804 //case 10: // scoansi acs off, primary font
3805 //case 11: // scoansi acs on, first alt font
3806 //case 12: // scoansi acs on, |0x80, second alt font
3807 //...
3808 //case 19: // ninth alt font
3809 //case 20: // gothic
3810 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 3811 rendset = 0, rendstyle = RS_Bold;
3812 break;
3813 case 22: // normal intensity
3814 rendset = 0, rendstyle = RS_Bold;
3815 break;
3816 case 23: // disable italic
3817 rendset = 0, rendstyle = RS_Italic;
3713 break; 3818 break;
3714 case 24: 3819 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 3820 rendset = 0, rendstyle = RS_Uline;
3716 break; 3821 break;
3717 case 25: 3822 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 3823 rendset = 0, rendstyle = RS_Blink;
3719 break; 3824 break;
3825 case 26: // variable spacing (iso 8613)
3826 rendset = 0, rendstyle = RS_Blink;
3827 break;
3720 case 27: 3828 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 3829 rendset = 0, rendstyle = RS_RVid;
3722 break; 3830 break;
3723 case 28:
3724 // visible. NYI 3831 //case 28: // visible. NYI
3725 break; 3832 //case 29: // not crossed-out
3726 } 3833 }
3727 3834
3728 if (rendset != -1) 3835 if (rendset != -1)
3729 { 3836 {
3730 scr_rendition (rendset, rendstyle); 3837 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 3848 case 35:
3742 case 36: 3849 case 36:
3743 case 37: 3850 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3851 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 3852 break;
3746#ifdef TTY_256COLOR 3853 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 3854 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 3855 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3856 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 3857 i += 2;
3752 } 3858 }
3753 break; 3859 break;
3754#endif
3755 case 39: /* default fg */ 3860 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 3861 scr_color (Color_fg, Color_fg);
3757 break; 3862 break;
3758 3863
3759 case 40: 3864 case 40:
… …
3764 case 45: 3869 case 45:
3765 case 46: 3870 case 46:
3766 case 47: 3871 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3872 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 3873 break;
3769#ifdef TTY_256COLOR 3874 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 3875 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 3876 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3877 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 3878 i += 2;
3775 } 3879 }
3776 break; 3880 break;
3777#endif
3778 case 49: /* default bg */ 3881 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 3882 scr_color (Color_bg, Color_bg);
3780 break; 3883 break;
3781 3884
3782#ifndef NO_BRIGHTCOLOR 3885 //case 50: // not variable spacing
3886
3887#if !ENABLE_MINIMAL
3783 case 90: 3888 case 90:
3784 case 91: /* set bright fg color */ 3889 case 91: /* set bright fg color */
3785 case 92: 3890 case 92:
3786 case 93: 3891 case 93:
3787 case 94: 3892 case 94:
3788 case 95: 3893 case 95:
3789 case 96: 3894 case 96:
3790 case 97: 3895 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3896 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 3897 break;
3794 case 100: 3898 case 100:
3795 case 101: /* set bright bg color */ 3899 case 101: /* set bright bg color */
3796 case 102: 3900 case 102:
3797 case 103: 3901 case 103:
3798 case 104: 3902 case 104:
3799 case 105: 3903 case 105:
3800 case 106: 3904 case 106:
3801 case 107: 3905 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 3907 break;
3805#endif 3908#endif
3806
3807 } 3909 }
3808 } 3910 }
3809} 3911}
3810/*}}} */ 3912/*}}} */
3811 3913
3812/*{{{ process Rob Nation's own graphics mode sequences */ 3914/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 3915void
3814rxvt_term::process_graphics () 3916rxvt_term::process_graphics ()
3815{ 3917{
3816 unicode_t ch, cmd = cmd_getc (); 3918 unicode_t ch, cmd = cmd_getc ();
3817 3919
3818 if (cmd == 'Q') 3920 if (cmd == 'Q')
3819 { /* query graphics */ 3921 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 3922 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 3923 return;
3822 } 3924 }
3823 /* swallow other graphics sequences until terminating ':' */ 3925 /* swallow other graphics sequences until terminating ':' */
3824 do 3926 do
3825 ch = cmd_getc (); 3927 ch = cmd_getc ();
… …
3835 */ 3937 */
3836void 3938void
3837rxvt_term::tt_printf (const char *fmt,...) 3939rxvt_term::tt_printf (const char *fmt,...)
3838{ 3940{
3839 va_list arg_ptr; 3941 va_list arg_ptr;
3840 unsigned char buf[256]; 3942 char buf[256];
3841 3943
3842 va_start (arg_ptr, fmt); 3944 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3945 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 3946 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 3947 tt_write (buf, strlen (buf));
3846} 3948}
3847 3949
3848/* ---------------------------------------------------------------------- */ 3950/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 3951/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 3952 * or generated by us in response to a query ESC sequence.
3851 */ 3953 */
3954const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3955
3852void 3956void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3957rxvt_term::tt_write (const char *data, unsigned int len)
3854{ 3958{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3959 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3960 return;
3856 3961
3857 if (len) 3962 if (pty->pty < 0)
3963 return;
3964
3965 if (v_buflen == 0)
3966 {
3967 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3968
3969 if ((unsigned int)written == len)
3970 return;
3971
3972 data += written;
3973 len -= written;
3858 { 3974 }
3975
3976 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3977
3978 memcpy (v_buffer + v_buflen, data, len);
3979 v_buflen += len;
3980
3981 pty_ev.set (EVENT_READ | EVENT_WRITE);
3982}
3983
3984void rxvt_term::pty_write ()
3985{
3986 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3987
3988 if (written > 0)
3989 {
3990 v_buflen -= written;
3991
3859 if (v_buflen == 0) 3992 if (v_buflen == 0)
3860 { 3993 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 3994 free (v_buffer);
3888 v_buffer = 0; 3995 v_buffer = 0;
3889 v_buflen = 0;
3890 3996
3891 pty_ev.set (EVENT_READ); 3997 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 3998 return;
3904 } 3999 }
4000
4001 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4002 }
4003 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4004 pty_ev.set (EVENT_READ);
3906} 4005}
3907 4006
3908/*----------------------- end-of-file (C source) -----------------------*/ 4007/*----------------------- end-of-file (C source) -----------------------*/
3909 4008

Diff Legend

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