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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.297 by root, Tue Jan 31 16:43:55 2006 UTC

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

Diff Legend

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