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.120 by root, Tue Aug 10 22:36:30 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;
… …
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 ();
… …
666 } 959 }
667#endif 960#endif
668 961
669 if (want_refresh) 962 if (want_refresh)
670 { 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
671 scr_refresh (refresh_type); 1002 scr_refresh ();
672 scrollbar_show (1); 1003 scrollbar_show (1);
673#ifdef USE_XIM 1004#ifdef USE_XIM
674 IMSendSpot (); 1005 IMSendSpot ();
675#endif 1006#endif
676 } 1007 }
677 1008
678 display->flush (); 1009 display->flush ();
679
680 flush_ev.stop ();
681} 1010}
682 1011
683void 1012void
684rxvt_term::check_cb (check_watcher &w) 1013rxvt_term::check_cb (check_watcher &w)
685{ 1014{
686 SET_R (this); 1015 make_current ();
687 SET_LOCALE (locale);
688 1016
689 display->flush (); 1017 display->flush ();
690 1018
691 if (want_refresh && !flush_ev.active) 1019 if (want_refresh && !flush_ev.active)
692 flush_ev.start (NOW + 0.01); 1020 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
693} 1021}
694 1022
695void 1023void
696rxvt_term::flush_cb (time_watcher &w) 1024rxvt_term::flush_cb (time_watcher &w)
697{ 1025{
698 SET_R (this); 1026 make_current ();
699 SET_LOCALE (locale);
700 1027
701 refresh_limit = 1; 1028 refresh_limit = 1;
702 refresh_count = 0; 1029 refresh_count = 0;
703 flush (); 1030 flush ();
704} 1031}
… …
708rxvt_term::cursor_blink_cb (time_watcher &w) 1035rxvt_term::cursor_blink_cb (time_watcher &w)
709{ 1036{
710 hidden_cursor = !hidden_cursor; 1037 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 1038 want_refresh = 1;
712 1039
713 w.start (w.at + BLINK_INTERVAL); 1040 w.start (w.at + CURSOR_BLINK_INTERVAL);
714} 1041}
715#endif 1042#endif
716 1043
717#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
718void 1045void
… …
732rxvt_term::cont_scroll_cb (time_watcher &w) 1059rxvt_term::cont_scroll_cb (time_watcher &w)
733{ 1060{
734 if ((scrollbar_isUp() || scrollbar_isDn()) && 1061 if ((scrollbar_isUp() || scrollbar_isDn()) &&
735 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1062 scr_page (scrollbar_isUp() ? UP : DN, 1))
736 { 1063 {
737 refresh_type |= SMOOTH_REFRESH;
738 want_refresh = 1; 1064 want_refresh = 1;
739 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
740 } 1066 }
741} 1067}
742#endif 1068#endif
… …
746rxvt_term::sel_scroll_cb (time_watcher &w) 1072rxvt_term::sel_scroll_cb (time_watcher &w)
747{ 1073{
748 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1074 if (scr_page (scroll_selection_dir, scroll_selection_lines))
749 { 1075 {
750 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1076 selection_extend (selection_save_x, selection_save_y, selection_save_state);
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1077 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1078 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1079 }
755} 1080}
756#endif 1081#endif
… …
761{ 1086{
762 if (mouse_slip_wheel_speed == 0 1087 if (mouse_slip_wheel_speed == 0
763 || 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)
764 : scr_page (UP, mouse_slip_wheel_speed)) 1089 : scr_page (UP, mouse_slip_wheel_speed))
765 { 1090 {
766 refresh_type |= SMOOTH_REFRESH; 1091 if (view_start == top_row || view_start == 0)
1092 mouse_slip_wheel_speed = 0;
1093
767 want_refresh = 1; 1094 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
769 } 1096 }
770} 1097}
771#endif 1098#endif
772 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
773bool 1118bool
774rxvt_term::pty_fill () 1119rxvt_term::pty_fill ()
775{ 1120{
776 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1121 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
777 1122
778 if (CBUFSIZ == n) 1123 if (CBUFSIZ == n)
779 { 1124 {
780 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");
781 n = 0; 1126 n = 0;
782 } 1127 }
783 1128
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1129 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1130 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1131 cmdbuf_endp = cmdbuf_ptr + n;
787 1132
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1133 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
789 1134
790 if (n > 0) 1135 if (r > 0)
791 { 1136 {
792 cmdbuf_endp += n; 1137 cmdbuf_endp += r;
793 return true; 1138 return true;
794 } 1139 }
795 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))
796 destroy (); 1152 destroy ();
1153 }
797 1154
798 return false; 1155 return false;
799} 1156}
800 1157
801void 1158void
802rxvt_term::pty_cb (io_watcher &w, short revents) 1159rxvt_term::pty_cb (io_watcher &w, short revents)
803{ 1160{
804 SET_R (this); 1161 make_current ();
805 SET_LOCALE (locale);
806 1162
807 if (revents & EVENT_WRITE)
808 tt_write (0, 0);
809 else if (revents & EVENT_READ) 1163 if (revents & EVENT_READ)
810 // loop, but don't allow a single term to monopolize us 1164 // loop, but don't allow a single term to monopolize us
811 while (pty_fill ()) 1165 while (pty_fill ())
812 if (cmd_parse ()) 1166 if (cmd_parse ())
813 break; 1167 break;
1168
1169 if (revents & EVENT_WRITE)
1170 pty_write ();
814} 1171}
815 1172
816void 1173void
817rxvt_term::pointer_unblank () 1174rxvt_term::pointer_unblank ()
818{ 1175{
819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1176 XDefineCursor (xdisp, vt, TermWin_cursor);
820 recolour_cursor (); 1177 recolour_cursor ();
821 1178
822#ifdef POINTER_BLANK 1179#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1180 hidden_pointer = 0;
824 1181
825 if (Options & Opt_pointerBlank) 1182 if (OPTION (Opt_pointerBlank))
826 pointer_ev.start (NOW + pointerBlankDelay); 1183 pointer_ev.start (NOW + pointerBlankDelay);
827#endif 1184#endif
828} 1185}
829 1186
830#ifdef POINTER_BLANK 1187#ifdef POINTER_BLANK
831void 1188void
832rxvt_term::pointer_blank () 1189rxvt_term::pointer_blank ()
833{ 1190{
834 if (! (Options & Opt_pointerBlank)) 1191 if (!OPTION (Opt_pointerBlank))
835 return; 1192 return;
836 1193
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1194 XDefineCursor (xdisp, vt, display->blank_cursor);
838 XFlush (display->display); 1195 XFlush (xdisp);
839 1196
840 hidden_pointer = 1; 1197 hidden_pointer = 1;
841} 1198}
842 1199
843void 1200void
844rxvt_term::pointer_cb (time_watcher &w) 1201rxvt_term::pointer_cb (time_watcher &w)
845{ 1202{
846 SET_R (this); 1203 make_current ();
847 SET_LOCALE (locale);
848 1204
849 pointer_blank (); 1205 pointer_blank ();
850} 1206}
851#endif 1207#endif
852 1208
… …
859 x = ev.x; 1215 x = ev.x;
860 y = ev.y; 1216 y = ev.y;
861 pixel_position (&x, &y); 1217 pixel_position (&x, &y);
862 1218
863 if (MEvent.button == AnyButton) 1219 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1220 button_number = 3;
866 }
867 else 1221 else
868 { 1222 {
869 button_number = MEvent.button - Button1; 1223 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1224 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1225 if (button_number >= 3)
872 button_number += (64 - 3); 1226 button_number += (64 - 3);
873 } 1227 }
874 1228
875 if (PrivateModes & PrivMode_MouseX10) 1229 if (priv_modes & PrivMode_MouseX10)
876 { 1230 {
877 /* 1231 /*
878 * do not report ButtonRelease 1232 * do not report ButtonRelease
879 * no state info allowed 1233 * no state info allowed
880 */ 1234 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1249 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1250 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1251#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1252 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1253#endif
900
901 } 1254 }
902 1255
903#ifdef DEBUG_MOUSEREPORT 1256#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1257 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1258 if (key_state & 16)
906 fputc ('C', stderr); 1259 fputc ('C', stderr);
907 if (key_state & 4) 1260 if (key_state & 4)
908 fputc ('S', stderr); 1261 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1265 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1266 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1267 button_number,
915 x + 1, 1268 x + 1,
916 y + 1); 1269 y + 1);
917#else 1270#endif
1271
918 tt_printf ("\033[M%c%c%c", 1272 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1273 (32 + button_number + key_state),
920 (32 + x + 1), 1274 (32 + x + 1),
921 (32 + y + 1)); 1275 (32 + y + 1));
922#endif
923} 1276}
924
925#ifdef USING_W11LIB
926void
927rxvt_W11_process_x_event (XEvent *ev)
928{
929 rxvt_t *r = rxvt_get_r ();
930
931 x_cb (*ev);
932}
933#endif
934 1277
935/*{{{ process an X event */ 1278/*{{{ process an X event */
936void 1279void
937rxvt_term::x_cb (XEvent &ev) 1280rxvt_term::x_cb (XEvent &ev)
938{ 1281{
939 SET_R (this); 1282 make_current ();
940 SET_LOCALE (locale);
941 1283
942#if defined(CURSOR_BLINK) 1284 dLocal (Display *, xdisp);
943 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
944 {
945 if (hidden_cursor)
946 {
947 hidden_cursor = 0;
948 want_refresh = 1;
949 }
950 1285
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1286 if (ev.xany.window == vt
952 } 1287 && SHOULD_INVOKE (HOOK_X_EVENT)
953#endif 1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
954
955#if defined(POINTER_BLANK)
956 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
957 {
958 if (ev.type == MotionNotify
959 || ev.type == ButtonPress
960 || ev.type == ButtonRelease)
961 if (hidden_pointer)
962 pointer_unblank ();
963
964 if (ev.type == KeyPress && hidden_pointer == 0)
965 pointer_blank ();
966 }
967#endif
968
969#ifdef USE_XIM
970 if (XFilterEvent (&ev, None))
971 return; 1289 return;
972#endif
973 1290
1291 // for XQueryPointer
974 Window unused_root, unused_child; 1292 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1293 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1294 unsigned int unused_mask;
977
978#ifdef DEBUG_X
979 const char *const eventnames[] =
980 { /* mason - this matches my system */
981 "",
982 "",
983 "KeyPress",
984 "KeyRelease",
985 "ButtonPress",
986 "ButtonRelease",
987 "MotionNotify",
988 "EnterNotify",
989 "LeaveNotify",
990 "FocusIn",
991 "FocusOut",
992 "KeymapNotify",
993 "Expose",
994 "GraphicsExpose",
995 "NoExpose",
996 "VisibilityNotify",
997 "CreateNotify",
998 "DestroyNotify",
999 "UnmapNotify",
1000 "MapNotify",
1001 "MapRequest",
1002 "ReparentNotify",
1003 "ConfigureNotify",
1004 "ConfigureRequest",
1005 "GravityNotify",
1006 "ResizeRequest",
1007 "CirculateNotify",
1008 "CirculateRequest",
1009 "PropertyNotify",
1010 "SelectionClear",
1011 "SelectionRequest",
1012 "SelectionNotify",
1013 "ColormapNotify",
1014 "ClientMessage",
1015 "MappingNotify"
1016 };
1017#endif
1018
1019#ifdef DEBUG_X
1020 struct timeval tp;
1021 struct tm *ltt;
1022 (void)gettimeofday (&tp, NULL);
1023 ltt = localtime (& (tp.tv_sec));
1024 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));
1025#endif
1026 1295
1027 switch (ev.type) 1296 switch (ev.type)
1028 { 1297 {
1029 case KeyPress: 1298 case KeyPress:
1299#if ISO_14755
1300 if (!(iso14755buf & ISO_14755_52))
1301#endif
1030 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)))
1031 break; 1370 break;
1032 1371
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease:
1035 {
1036 if (!(ev.xkey.state & ControlMask)) 1373 if (!(ev.xkey.state & ControlMask))
1037 slip_wheel_ev.stop (); 1374 slip_wheel_ev.stop ();
1038 else
1039 {
1040 KeySym ks;
1041
1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1043 if (ks == XK_Control_L || ks == XK_Control_R) 1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1044 mouse_slip_wheel_speed = 0; 1376 mouse_slip_wheel_speed = 0;
1045 } 1377#endif
1046 break; 1378 break;
1047 } 1379 }
1048#endif
1049 1380
1050 case ButtonPress: 1381 case ButtonPress:
1051 button_press (ev.xbutton); 1382 button_press (ev.xbutton);
1052 break; 1383 break;
1053 1384
… …
1055 button_release (ev.xbutton); 1386 button_release (ev.xbutton);
1056 break; 1387 break;
1057 1388
1058 case ClientMessage: 1389 case ClientMessage:
1059 if (ev.xclient.format == 32 1390 if (ev.xclient.format == 32
1060 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1391 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1061 destroy ();
1062#ifdef OFFIX_DND
1063 /* OffiX Dnd (drag 'n' drop) protocol */
1064 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1065 && (ev.xclient.data.l[0] == DndFile
1066 || ev.xclient.data.l[0] == DndDir
1067 || ev.xclient.data.l[0] == DndLink))
1068 { 1392 {
1069 /* Get Dnd data */ 1393 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1070 Atom ActualType; 1394 {
1071 int ActualFormat; 1395 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1072 unsigned char *data; 1396 {
1073 unsigned long Size, RemainingBytes; 1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1074 1398 {
1075 XGetWindowProperty (display->display, display->root, 1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1076 xa[XA_DNDSELECTION], 1400 destroy ();
1077 0L, 1000000L, 1401 }
1078 False, AnyPropertyType, 1402#if ENABLE_EWMH
1079 &ActualType, &ActualFormat, 1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1080 &Size, &RemainingBytes, 1404 XSendEvent (xdisp, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask,
1081 &data); 1406 &ev);
1082 XChangeProperty (display->display, display->root, 1407#endif
1083 XA_CUT_BUFFER0, XA_STRING, 1408 }
1084 8, PropModeReplace, 1409 }
1085 data, STRLEN (data)); 1410#if ENABLE_XEMBED
1086 XFree (data); 1411 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1412 {
1088 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
1089 } 1419 }
1090#endif /* OFFIX_DND */
1091 break; 1420 break;
1092 1421
1093 case MappingNotify: 1422 case MappingNotify:
1094 XRefreshKeyboardMapping (&ev.xmapping); 1423 XRefreshKeyboardMapping (&ev.xmapping);
1095 break; 1424 break;
… …
1118 break; 1447 break;
1119 } 1448 }
1120 break; 1449 break;
1121 1450
1122 case FocusIn: 1451 case FocusIn:
1123 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])
1124 { 1461 {
1125 TermWin.focus = 1; 1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1126 want_refresh = 1; 1463 ;
1127#ifdef USE_XIM 1464
1128 if (Input_Context != NULL) 1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1129 XSetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1134#endif
1135#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade])
1137 { 1466 {
1138 PixColors = PixColorsFocused; 1467 seen_resize = 1;
1139 set_colorfgbg (); 1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1140 scr_clear ();
1141 scr_touch (true);
1142 } 1469 }
1143#endif
1144 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
1145 } 1477 }
1146 break; 1478 break;
1147 1479
1148 case FocusOut:
1149 if (TermWin.focus)
1150 {
1151 TermWin.focus = 0;
1152 want_refresh = 1;
1153#ifdef USE_XIM
1154 if (Input_Context != NULL)
1155 XUnsetICFocus (Input_Context);
1156#endif
1157#ifdef CURSOR_BLINK
1158 if (Options & Opt_cursorBlink)
1159 cursor_blink_ev.stop ();
1160 hidden_cursor = 0;
1161#endif
1162#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade])
1164 {
1165 PixColors = PixColorsUnFocused;
1166 set_colorfgbg ();
1167 scr_clear ();
1168 scr_touch (true);
1169 }
1170#endif
1171
1172 }
1173 break;
1174
1175 case ConfigureNotify: 1480 case PropertyNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1177 { 1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1178 int height, width; 1483 && ev.xproperty.state == PropertyNewValue)
1484 selection_property (ev.xproperty.window, ev.xproperty.atom);
1179 1485
1180 do
1181 { /* Wrap lots of configures into one */
1182 width = ev.xconfigure.width;
1183 height = ev.xconfigure.height;
1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1185 }
1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1187
1188 if (szHint.width != width || szHint.height != height)
1189 resize_all_windows (width, height, 1);
1190
1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1192 if (Options & Opt_transparent)
1193 {
1194 check_our_parents ();
1195 if (am_transparent)
1196 want_refresh = want_full_refresh = 1;
1197 }
1198#endif
1199 }
1200 break; 1486 break;
1201 1487
1202 case SelectionClear: 1488 case SelectionClear:
1203 selection_clear (); 1489 selection_clear ();
1204 break; 1490 break;
1205 1491
1206 case SelectionNotify: 1492 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1493 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1494 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1495 break;
1211 1496
1212 case SelectionRequest: 1497 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1498 selection_send (ev.xselectionrequest);
1214 break; 1499 break;
1215 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
1216 case UnmapNotify: 1509 case UnmapNotify:
1217 TermWin.mapped = 0; 1510 mapped = 0;
1218#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1219 text_blink_ev.stop (); 1512 text_blink_ev.stop ();
1220#endif 1513#endif
1221 break; 1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1222
1223 case MapNotify:
1224 TermWin.mapped = 1;
1225#ifdef TEXT_BLINK
1226 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1227#endif
1228 break; 1515 break;
1229 1516
1230#ifdef TRANSPARENT 1517#ifdef TRANSPARENT
1231 case ReparentNotify: 1518 case ReparentNotify:
1232 rootwin_cb (ev); 1519 rootwin_cb (ev);
1233 break; 1520 break;
1234#endif /* TRANSPARENT */ 1521#endif /* TRANSPARENT */
1235 1522
1236 case GraphicsExpose: 1523 case GraphicsExpose:
1237 case Expose: 1524 case Expose:
1238 if (ev.xany.window == TermWin.vt) 1525 if (ev.xany.window == vt)
1239 { 1526 {
1240 do 1527 do
1241 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1242 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1244 1531
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246 1533
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1248 scr_expose (ev.xexpose.x, ev.xexpose.y, 1535 scr_expose (ev.xexpose.x, ev.xexpose.y,
1249 ev.xexpose.width, ev.xexpose.height, False); 1536 ev.xexpose.width, ev.xexpose.height, False);
1250 1537
1251 scr_refresh (refresh_type); 1538 want_refresh = 1;
1252 } 1539 }
1253 else 1540 else
1254 { 1541 {
1255 XEvent unused_event; 1542 XEvent unused_event;
1256 1543
1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1258 ; 1545 ;
1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1260 ; 1547 ;
1261 1548
1262 if (isScrollbarWindow (ev.xany.window)) 1549 if (isScrollbarWindow (ev.xany.window))
1263 { 1550 {
1264 scrollBar.setIdle (); 1551 scrollBar.setIdle ();
1265 scrollbar_show (0); 1552 scrollbar_show (0);
1266 } 1553 }
1267#ifdef MENUBAR
1268 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1269 menubar_expose ();
1270#endif
1271 1554
1272#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1556 if (am_transparent && ev.xany.window == parent[0])
1274 XClearWindow (display->display, ev.xany.window); 1557 XClearWindow (xdisp, ev.xany.window);
1275#endif 1558#endif
1276 } 1559 }
1277 break; 1560 break;
1278 1561
1279 case MotionNotify: 1562 case MotionNotify:
1280#ifdef POINTER_BLANK 1563#ifdef POINTER_BLANK
1281 if (hidden_pointer) 1564 if (hidden_pointer)
1282 pointer_unblank (); 1565 pointer_unblank ();
1283#endif 1566#endif
1284#if MENUBAR 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1285 if (isMenuBarWindow (ev.xany.window)) 1568 break;
1569
1570 if (ev.xany.window == vt)
1286 { 1571 {
1287 menubar_control (ev.xbutton); 1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1288 break; 1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1289 } 1574 ; // nop
1290#endif
1291 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1292 break;
1293
1294 if (ev.xany.window == TermWin.vt)
1295 {
1296 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1576 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1299 ; 1578 ;
1300 1579
1301 XQueryPointer (display->display, TermWin.vt, 1580 XQueryPointer (xdisp, vt,
1302 &unused_root, &unused_child, 1581 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1582 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1583 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1584 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1585#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1586 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1587 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1588 {
1310#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
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1598 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1599 ev.xbutton.state & Button3Mask ? 2 : 0);
1600
1313#ifdef SELECTION_SCROLLING 1601#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1602 if (ev.xbutton.y < int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1603 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1316 { 1604 {
1317 int dist; 1605 int dist;
1318 1606
1319 /* don't clobber the current delay if we are 1607 /* don't clobber the current delay if we are
1320 * already in the middle of scrolling. 1608 * already in the middle of scrolling.
… …
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1611 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1324 1612
1325 /* save the event params so we can highlight 1613 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1614 * the selection in the pending-scroll loop
1327 */ 1615 */
1328 selection_save_x=ev.xbutton.x; 1616 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1617 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1618 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1619
1333 /* calc number of lines to scroll */ 1620 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1621 if (ev.xbutton.y < int_bwidth)
1335 { 1622 {
1336 scroll_selection_dir = UP; 1623 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1624 dist = int_bwidth - ev.xbutton.y;
1338 } 1625 }
1339 else 1626 else
1340 { 1627 {
1341 scroll_selection_dir = DN; 1628 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y - 1629 dist = ev.xbutton.y - (int_bwidth + height);
1343 (TermWin.int_bwidth + TermWin.height);
1344 } 1630 }
1631
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1632 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1633 / SELECTION_SCROLL_LINE_SPEEDUP
1634 + 1;
1347 MIN_IT (scroll_selection_lines, 1635 min_it (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1636 SELECTION_SCROLL_MAX_LINES);
1349 } 1637 }
1350 else 1638 else
1351 { 1639 {
1352 /* we are within the text window, so we 1640 /* we are within the text window, so we
1353 * shouldn't be scrolling 1641 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1643 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1644 sel_scroll_ev.stop();
1357 } 1645 }
1358#endif 1646#endif
1359#ifdef MOUSE_THRESHOLD 1647#ifdef MOUSE_THRESHOLD
1360
1361 } 1648 }
1362#endif 1649#endif
1363
1364 } 1650 }
1365 } 1651 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1653 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1369 MotionNotify, &ev)) ; 1655 MotionNotify, &ev))
1656 ;
1657
1370 XQueryPointer (display->display, scrollBar.win, 1658 XQueryPointer (xdisp, scrollBar.win,
1371 &unused_root, &unused_child, 1659 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1660 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1661 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1662 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1664 scrollbar_size ());
1377 scr_refresh (refresh_type); 1665 want_refresh = 1;
1378 refresh_limit = 0; 1666 refresh_limit = 0;
1379 scrollbar_show (1); 1667 scrollbar_show (1);
1380 } 1668 }
1381 break; 1669 break;
1382 } 1670 }
1383}
1384 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
1385void 1772void
1386rxvt_term::rootwin_cb (XEvent &ev) 1773rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1774{
1388 SET_R (this); 1775 make_current ();
1389 SET_LOCALE (locale);
1390 1776
1391 switch (ev.type) 1777 switch (ev.type)
1392 { 1778 {
1393 case PropertyNotify: 1779 case PropertyNotify:
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1395 {
1396 if (ev.xproperty.state == PropertyNewValue)
1397 selection_property (ev.xproperty.window, ev.xproperty.atom);
1398 break;
1399 }
1400#ifdef TRANSPARENT
1401 else
1402 {
1403 /* 1780 /*
1404 * 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,
1405 * 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.
1406 */ 1783 */
1407 if (xa[XA_XROOTPMAPID] == 0)
1408 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1409
1410 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])
1411 return; 1786 return;
1412 }
1413 1787
1414 /* FALLTHROUGH */ 1788 /* FALLTHROUGH */
1415 case ReparentNotify: 1789 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1; 1791 want_refresh = want_full_refresh = 1;
1418 break; 1792 break;
1419#endif
1420 } 1793 }
1421} 1794}
1795#endif
1422 1796
1423void 1797void
1424rxvt_term::button_press (XButtonEvent &ev) 1798rxvt_term::button_press (XButtonEvent &ev)
1425{ 1799{
1426 int reportmode = 0, clickintime; 1800 int reportmode = 0, clickintime;
1427 1801
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1802 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1803
1429 if (!bypass_keystate) 1804 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1805 reportmode = !! (priv_modes & PrivMode_mouse_report);
1806
1431 /* 1807 /*
1432 * VT window processing of button press 1808 * VT window processing of button press
1433 */ 1809 */
1434 if (ev.window == TermWin.vt) 1810 if (ev.window == vt)
1435 { 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
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1824 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1825
1437 if (reportmode) 1826 if (reportmode)
1438 { 1827 {
1439 /* mouse report from vt window */ 1828 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1829 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1830 MEvent.state = ev.state;
1442#ifdef MOUSE_REPORT_DOUBLECLICK 1831#ifdef MOUSE_REPORT_DOUBLECLICK
1443 if (ev.button == MEvent.button && clickintime) 1832 if (ev.button == MEvent.button && clickintime)
1444 { 1833 {
1445 /* same button, within alloted time */ 1834 /* same button, within alloted time */
1446 MEvent.clicks++; 1835 MEvent.clicks++;
1836
1447 if (MEvent.clicks > 1) 1837 if (MEvent.clicks > 1)
1448 { 1838 {
1449 /* only report double clicks */ 1839 /* only report double clicks */
1450 MEvent.clicks = 2; 1840 MEvent.clicks = 2;
1451 mouse_report (ev); 1841 mouse_report (ev);
… …
1470 } 1860 }
1471 else 1861 else
1472 { 1862 {
1473 if (ev.button != MEvent.button) 1863 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1864 MEvent.clicks = 0;
1865
1475 switch (ev.button) 1866 switch (ev.button)
1476 { 1867 {
1477 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
1478 /* allow shift+left click to extend selection */ 1877 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1878 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1480 { 1879 {
1481 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1881 selection_rotate (ev.x, ev.y);
1483 else 1882 else
1484 selection_extend (ev.x, ev.y, 1); 1883 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1898 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1899 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1900 selection_rotate (ev.x, ev.y);
1502 else 1901 else
1503 selection_extend (ev.x, ev.y, 1); 1902 selection_extend (ev.x, ev.y, 1);
1903
1504 MEvent.button = Button3; 1904 MEvent.button = Button3;
1505 break; 1905 break;
1506 } 1906 }
1507 } 1907 }
1908
1508 MEvent.time = ev.time; 1909 MEvent.time = ev.time;
1509 return; 1910 return;
1510 } 1911 }
1511 1912
1512 /* 1913 /*
… …
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 }
1648 2049
1649 break; 2050 break;
1650 } 2051 }
1651 } 2052 }
2053
1652 return; 2054 return;
1653 } 2055 }
1654#if MENUBAR
1655 /*
1656 * Menubar window processing of button press
1657 */
1658 if (isMenuBarWindow (ev.window))
1659 menubar_control (ev);
1660#endif
1661} 2056}
1662 2057
1663void 2058void
1664rxvt_term::button_release (XButtonEvent &ev) 2059rxvt_term::button_release (XButtonEvent &ev)
1665{ 2060{
1666 int reportmode = 0; 2061 int reportmode = 0;
1667 2062
1668 csrO = 0; /* reset csr Offset */ 2063 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 2064 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2065 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 2066
1672 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
1673 { 2068 {
1674 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
1675 scrollbar_show (0); 2070 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH;
1678#endif
1679
1680 } 2071 }
2072
1681#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 2074 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
1684#endif 2076#endif
2077
1685 if (ev.window == TermWin.vt) 2078 if (ev.window == vt)
1686 { 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
1687 if (reportmode) 2089 if (reportmode)
1688 { 2090 {
1689 /* mouse report from vt window */ 2091 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
1705 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
1706 mouse_report (ev); 2108 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2110 return;
1709 } 2111 }
2112
1710 /* 2113 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2115 * when overriding mouse reporting
1713 */ 2116 */
1714 if (PrivateModes & PrivMode_mouse_report 2117 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2118 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2119 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2120 selection_extend (ev.x, ev.y, 0);
1718 2121
1719 switch (ev.button) 2122 switch (ev.button)
1720 { 2123 {
1721 case Button1: 2124 case Button1:
1722 case Button3: 2125 case Button3:
1723 selection_make (ev.time); 2126 selection_make (ev.time);
1724 break; 2127 break;
2128
1725 case Button2: 2129 case Button2:
1726 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);
1727 break; 2132 break;
2133
1728#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
1729 case Button4: 2135 case Button4:
1730 case Button5: 2136 case Button5:
1731 { 2137 {
1732 int i; 2138 int i;
… …
1734 2140
1735 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
1736 2142
1737 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
1738 i = 1; 2144 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2145 else if (OPTION (Opt_mouseWheelScrollPage))
1740 i = TermWin.nrow - 1; 2146 i = nrow - 1;
1741 else 2147 else
1742 i = 5; 2148 i = 5;
1743 2149
1744# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
1745 if (ev.state & ControlMask) 2151 if (ev.state & ControlMask)
1746 { 2152 {
1747 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
1748 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;
1749 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;
1750 2156
1751 if (slip_wheel_ev.at < NOW) 2157 if (slip_wheel_ev.at < NOW)
1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753 2159
1754 slip_wheel_ev.start (); 2160 slip_wheel_ev.start ();
1755 } 2161 }
1756 else 2162 else
1757 { 2163 {
1758# endif 2164# endif
1759# ifdef JUMP_MOUSE_WHEEL
1760 scr_page (v, i); 2165 scr_page (v, i);
1761 scr_refresh (SMOOTH_REFRESH);
1762 scrollbar_show (1); 2166 scrollbar_show (1);
1763# else
1764 while (i--)
1765 {
1766 scr_page (v, 1);
1767 scr_refresh (SMOOTH_REFRESH);
1768 scrollbar_show (1);
1769 }
1770# endif
1771# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
1772 } 2168 }
1773#endif 2169# endif
1774 } 2170 }
1775 break; 2171 break;
1776#endif 2172#endif
1777 } 2173 }
1778 } 2174 }
1779#ifdef MENUBAR
1780 else if (isMenuBarWindow (ev.window))
1781 menubar_control (ev);
1782#endif
1783} 2175}
1784 2176
1785#ifdef TRANSPARENT 2177#ifdef TRANSPARENT
1786#if TINTING 2178#if TINTING
1787/* taken from aterm-0.4.2 */ 2179/* taken from aterm-0.4.2 */
1788 2180
1789typedef uint32_t RUINT32T; 2181typedef uint32_t RUINT32T;
1790 2182
1791void 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)
1792{ 2184{
1793 int sh_r, sh_g, sh_b; 2185 int sh_r, sh_g, sh_b;
1794 RUINT32T mask_r, mask_g, mask_b; 2186 RUINT32T mask_r, mask_g, mask_b;
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i; 2190 int i;
1799 2191
1800 Visual* visual = display->visual; 2192 Visual *visual = term->visual;
1801 2193
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803 2195
1804 /* for convenience */ 2196 /* for convenience */
1805 mask_r = visual->red_mask; 2197 mask_r = visual->red_mask;
… …
2029 Pixmap rootpixmap = None; 2421 Pixmap rootpixmap = None;
2030 XWindowAttributes wattr, wrootattr; 2422 XWindowAttributes wattr, wrootattr;
2031 2423
2032 pchanged = 0; 2424 pchanged = 0;
2033 2425
2034 if (!(Options & Opt_transparent)) 2426 if (!OPTION (Opt_transparent))
2035 return pchanged; /* Don't try any more */ 2427 return pchanged; /* Don't try any more */
2036 2428
2037 XGetWindowAttributes (display->display, display->root, &wrootattr); 2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2038 rootdepth = wrootattr.depth; 2430 rootdepth = wrootattr.depth;
2039 2431
2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2041 2433
2042 if (rootdepth != wattr.depth) 2434 if (rootdepth != wattr.depth)
2043 { 2435 {
2044 if (am_transparent) 2436 if (am_transparent)
2045 { 2437 {
2046 pchanged = 1; 2438 pchanged = 1;
2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2048 am_transparent = am_pixmap_trans = 0; 2440 am_transparent = am_pixmap_trans = 0;
2049 } 2441 }
2050 2442
2051 return pchanged; /* Don't try any more */ 2443 return pchanged; /* Don't try any more */
2052 } 2444 }
2053 2445
2054 /* 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. */
2055 XSync (display->display, False); 2447 XSync (xdisp, False);
2056 2448
2057 /* 2449 /*
2058 * Make the frame window set by the window manager have 2450 * Make the frame window set by the window manager have
2059 * the root background. Some window managers put multiple nested frame 2451 * the root background. Some window managers put multiple nested frame
2060 * 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.
2061 */ 2453 */
2062 i = (xa[XA_XROOTPMAPID] 2454 i = (xa[XA_XROOTPMAP_ID]
2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2065 &nitems, &bytes_after, &prop) == Success); 2457 &nitems, &bytes_after, &prop) == Success);
2066 2458
2067 if (!i || prop == NULL) 2459 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID] 2460 i = (xa[XA_ESETROOT_PMAP_ID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2072 2464
2073 if (!i || prop == NULL 2465 if (!i || prop == NULL
2074#if TINTING 2466#if TINTING
2075 || !rs[Rs_color + Color_tint] 2467 || !ISSET_PIXCOLOR (Color_tint)
2076#endif 2468#endif
2077 ) 2469 )
2078 have_pixmap = 0; 2470 have_pixmap = 0;
2079 else 2471 else
2080 { 2472 {
… …
2093 Window cr; 2485 Window cr;
2094 XImage *image; 2486 XImage *image;
2095 GC gc; 2487 GC gc;
2096 XGCValues gcvalue; 2488 XGCValues gcvalue;
2097 2489
2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2099 0, 0, &sx, &sy, &cr); 2491 0, 0, &sx, &sy, &cr);
2100 nw = (unsigned int)szHint.width; 2492 nw = (unsigned int)szHint.width;
2101 nh = (unsigned int)szHint.height; 2493 nh = (unsigned int)szHint.height;
2102 nx = ny = 0; 2494 nx = ny = 0;
2103 2495
… …
2113 nh += sy; 2505 nh += sy;
2114 ny = -sy; 2506 ny = -sy;
2115 sy = 0; 2507 sy = 0;
2116 } 2508 }
2117 2509
2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2512
2513 XSync (xdisp, False);
2120 allowedxerror = -1; 2514 allowedxerror = -1;
2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2122 2516
2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2124 /* XXX: may need a delay here? */ 2518 /* XXX: may need a delay here? */
2125 allowedxerror = 0; 2519 allowedxerror = 0;
2126 2520
2127 if (image == NULL) 2521 if (image == NULL)
2128 { 2522 {
2129 if (am_transparent && am_pixmap_trans) 2523 if (am_transparent && am_pixmap_trans)
2130 { 2524 {
2131 pchanged = 1; 2525 pchanged = 1;
2132 if (TermWin.pixmap != None) 2526 if (pixmap != None)
2133 { 2527 {
2134 XFreePixmap (display->display, TermWin.pixmap); 2528 XFreePixmap (xdisp, pixmap);
2135 TermWin.pixmap = None; 2529 pixmap = None;
2136 } 2530 }
2137 } 2531 }
2138 2532
2139 am_pixmap_trans = 0; 2533 am_pixmap_trans = 0;
2140 } 2534 }
2141 else 2535 else
2142 { 2536 {
2143 if (TermWin.pixmap != None) 2537 if (pixmap != None)
2144 XFreePixmap (display->display, TermWin.pixmap); 2538 XFreePixmap (xdisp, pixmap);
2145 2539
2146#if TINTING 2540#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint)) 2541 if (ISSET_PIXCOLOR (Color_tint))
2148 { 2542 {
2149 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151 2544
2545 rxvt_rgba c;
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2546 pix_colors_focused [Color_tint].get (this, c);
2153 2547
2154 ShadeXImage (display, image, shade, rm, gm, bm); 2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2155 } 2549 }
2156#endif 2550#endif
2157 2551
2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2159 szHint.width, szHint.height, image->depth);
2160 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2162 nx, ny, image->width, image->height); 2555 nx, ny, image->width, image->height);
2163 XFreeGC (display->display, gc); 2556 XFreeGC (xdisp, gc);
2164 XDestroyImage (image); 2557 XDestroyImage (image);
2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2166 XClearWindow (display->display, TermWin.parent[0]); 2559 XClearWindow (xdisp, parent[0]);
2167 2560
2168 if (!am_transparent || !am_pixmap_trans) 2561 if (!am_transparent || !am_pixmap_trans)
2169 pchanged = 1; 2562 pchanged = 1;
2170 2563
2171 am_transparent = am_pixmap_trans = 1; 2564 am_transparent = am_pixmap_trans = 1;
2172 } 2565 }
2173 } 2566 }
2174 2567
2175 if (!am_pixmap_trans) 2568 if (am_pixmap_trans)
2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2570 else
2176 { 2571 {
2177 unsigned int n; 2572 unsigned int n;
2178 /* 2573 /*
2179 * InheritPixmap transparency 2574 * InheritPixmap transparency
2180 */ 2575 */
2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2183 { 2577 {
2184 oldp = TermWin.parent[i]; 2578 oldp = parent[i];
2185 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2579 XQueryTree (xdisp, parent[i - 1], &root,
2186 &TermWin.parent[i], &list, &n); 2580 &parent[i], &list, &n);
2187 XFree (list); 2581 XFree (list);
2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189 2582
2190 if (TermWin.parent[i] == display->root) 2583 if (parent[i] == display->root)
2191 { 2584 {
2192 if (oldp != None) 2585 if (oldp != None)
2193 pchanged = 1; 2586 pchanged = 1;
2194 2587
2195 break; 2588 break;
2196 } 2589 }
2197 2590
2198 if (oldp != TermWin.parent[i]) 2591 if (oldp != parent[i])
2199 pchanged = 1; 2592 pchanged = 1;
2200 } 2593 }
2201 2594
2202 n = 0; 2595 n = 0;
2203 2596
2204 if (pchanged) 2597 if (pchanged)
2205 { 2598 {
2206 for (; n < (unsigned int)i; n++) 2599 for (; n < (unsigned int)i; n++)
2207 { 2600 {
2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2601 XGetWindowAttributes (xdisp, parent[n], &wattr);
2209 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2211 { 2603 {
2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2213 break; 2605 break;
2214 } 2606 }
2215 } 2607 }
2216 } 2608 }
2217 2609
2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2610 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2219 { 2611 {
2220 D_X ((stderr, "InheritPixmap Turning off"));
2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2223 am_transparent = 0; 2614 am_transparent = 0;
2224 /* XXX: also turn off Opt_transparent? */ 2615 /* XXX: also turn off Opt_transparent? */
2225 } 2616 }
2226 else 2617 else
2227 { 2618 {
2228#if WAIT_FOR_WM
2229 /* wait (an arbitrary period) for the WM to do its thing
2230 * needed for fvwm2.2.2 (and before?) */
2231 sleep (1);
2232#endif
2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2234 for (n = 0; n < (unsigned int)i; n++) 2619 for (n = 0; n < (unsigned int)i; n++)
2235 { 2620 {
2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2237 XClearWindow (display->display, TermWin.parent[n]); 2622 XClearWindow (xdisp, parent[n]);
2238 } 2623 }
2239 2624
2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2241 am_transparent = 1; 2626 am_transparent = 1;
2242 } 2627 }
2243 2628
2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2245 TermWin.parent[i] = None; 2630 parent[i] = None;
2246 } 2631 }
2247 2632
2248 // this is experimental
2249 if (scrollBar.win) 2633 if (scrollBar.win)
2250 { 2634 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle (); 2636 scrollBar.setIdle ();
2254 scrollbar_show (0); 2637 scrollbar_show (0);
2255 } 2638 }
2256 2639
2640 if (am_transparent)
2641 {
2642 want_refresh = want_full_refresh = 1;
2643 if (am_pixmap_trans)
2644 flush ();
2645 }
2646
2257 return pchanged; 2647 return pchanged;
2258} 2648}
2259#endif 2649#endif
2260 2650
2261/*}}} */ 2651/*}}} */
2262 2652
2263bool 2653bool
2264rxvt_term::cmd_parse () 2654rxvt_term::cmd_parse ()
2265{ 2655{
2266 bool flag = false; 2656 bool flag = false;
2267 unicode_t ch = NOCHAR; 2657 wchar_t ch = NOCHAR;
2268 unsigned char *seq_begin; // remember start of esc-sequence here 2658 char *seq_begin; // remember start of esc-sequence here
2269 2659
2270 for (;;) 2660 for (;;)
2271 { 2661 {
2272 if (ch == NOCHAR) 2662 if (ch == NOCHAR)
2273 { 2663 {
2274 seq_begin = cmdbuf_ptr; 2664 seq_begin = cmdbuf_ptr;
2275 ch = next_char (); 2665 ch = next_char ();
2276 }
2277 2666
2278 if (ch == NOCHAR) // TODO: improve 2667 if (ch == NOCHAR)
2279 break; 2668 break;
2669 }
2280 2670
2281 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)
2282 { 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
2283 /* Read a text string from the input buffer */ 2687 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2688 wchar_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2689 bool refreshnow = false;
2286 int nlines = 0; 2690 int nlines = 0;
2287 unicode_t *str = buf; 2691 wchar_t *str = buf;
2692 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 2693
2289 for (;;) 2694 for (;;)
2290 { 2695 {
2291 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))
2292 break; 2697 break;
2293 2698
2294 *str++ = ch; 2699 *str++ = ch;
2295 2700
2296 if (ch == C0_LF) 2701 if (ch == C0_LF || str >= eol)
2297 { 2702 {
2703 if (ch == C0_LF)
2298 nlines++; 2704 nlines++;
2705
2299 refresh_count++; 2706 refresh_count++;
2300 2707
2301 if (!(Options & Opt_jumpScroll) 2708 if (!OPTION (Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2709 || (refresh_count >= refresh_limit * (nrow - 1)))
2303 { 2710 {
2304 refreshnow = true; 2711 refreshnow = true;
2712 refresh_count = 0;
2305 ch = NOCHAR; 2713 ch = NOCHAR;
2306 break; 2714 break;
2307 } 2715 }
2308 2716
2309 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2717 // scr_add_lines only works for nlines <= nrow - 1.
2310 if (nlines >= TermWin.nrow - 1) 2718 if (nlines >= nrow - 1)
2311 { 2719 {
2720 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2721 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2312 scr_add_lines (buf, nlines, str - buf); 2722 scr_add_lines (buf, str - buf, nlines);
2723
2313 nlines = 0; 2724 nlines = 0;
2314 str = buf; 2725 str = buf;
2726 eol = str + min (ncol, UBUFSIZ);
2315 } 2727 }
2316 }
2317 2728
2318 if (str >= buf + UBUFSIZ) 2729 if (str >= eol)
2319 { 2730 {
2731 if (eol >= buf + UBUFSIZ)
2732 {
2320 ch = NOCHAR; 2733 ch = NOCHAR;
2321 break; 2734 break;
2735 }
2736 else
2737 eol = min (eol + ncol, buf + UBUFSIZ);
2738 }
2739
2322 } 2740 }
2323 2741
2324 seq_begin = cmdbuf_ptr; 2742 seq_begin = cmdbuf_ptr;
2325 ch = next_char (); 2743 ch = next_char ();
2326 } 2744 }
2327 2745
2746 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2747 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2328 scr_add_lines (buf, nlines, str - buf); 2748 scr_add_lines (buf, str - buf, nlines);
2329 2749
2330 /* 2750 /*
2331 * 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
2332 * 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.
2333 * the number of pages between refreshes is refresh_limit, which 2753 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling. 2754 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2755 */
2336 if (refreshnow) 2756 if (refreshnow)
2337 { 2757 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2758 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++; 2759 refresh_limit++;
2340 else 2760 else
2341 { 2761 {
2342 flag = true; 2762 flag = true;
2343 scr_refresh (refresh_type); 2763 scr_refresh ();
2764 want_refresh = 1;
2344 } 2765 }
2345 } 2766 }
2346 2767
2347 } 2768 }
2348 else 2769 else
… …
2363 } 2784 }
2364 2785
2365 return flag; 2786 return flag;
2366} 2787}
2367 2788
2368// read the next octet
2369unicode_t
2370rxvt_term::next_octet ()
2371{
2372 return cmdbuf_ptr < cmdbuf_endp
2373 ? *cmdbuf_ptr++
2374 : NOCHAR;
2375}
2376
2377// read the next character 2789// read the next character
2378unicode_t 2790wchar_t
2379rxvt_term::next_char () 2791rxvt_term::next_char () NOTHROW
2380{ 2792{
2381 while (cmdbuf_ptr < cmdbuf_endp) 2793 while (cmdbuf_ptr < cmdbuf_endp)
2382 { 2794 {
2383 // assume 7-bit to be ascii ALWAYS 2795 // assume 7-bit to be ascii ALWAYS
2384 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2796 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2385 return *cmdbuf_ptr++; 2797 return *cmdbuf_ptr++;
2386 2798
2387 wchar_t wc; 2799 wchar_t wc;
2388 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);
2389 2801
2390 if (len == (size_t)-2) 2802 if (len == (size_t)-2)
2391 { 2803 {
2392 // the mbstate stores incomplete sequences. didn't know this :/ 2804 // the mbstate stores incomplete sequences. didn't know this :/
2393 cmdbuf_ptr = cmdbuf_endp; 2805 cmdbuf_ptr = cmdbuf_endp;
2394 break; 2806 break;
2395 } 2807 }
2396 2808
2397 if (len == (size_t)-1) 2809 if (len == (size_t)-1)
2398 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
2399 2811
2400 // assume wchar == unicode 2812 // assume wchar == unicode
2401 cmdbuf_ptr += len; 2813 cmdbuf_ptr += len;
2402 return wc; 2814 return wc & UNICODE_MASK;
2403 } 2815 }
2404 2816
2405 return NOCHAR; 2817 return NOCHAR;
2406} 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;
2407 2830
2408/* rxvt_cmd_getc () - Return next input character */ 2831/* rxvt_cmd_getc () - Return next input character */
2409/* 2832/*
2410 * Return the next input character after first passing any keyboard input 2833 * Return the next input character after first passing any keyboard input
2411 * to the command. 2834 * to the command.
2412 */ 2835 */
2413unicode_t 2836wchar_t
2414rxvt_term::cmd_getc () 2837rxvt_term::cmd_getc () THROW ((class out_of_input))
2415{ 2838{
2416 unicode_t c = next_char (); 2839 wchar_t c = next_char ();
2417 2840
2418 if (c == NOCHAR) 2841 if (c == NOCHAR)
2419 throw out_of_input; 2842 throw out_of_input;
2420 2843
2421 return c; 2844 return c;
2422} 2845}
2423 2846
2424unicode_t 2847uint32_t
2425rxvt_term::cmd_get8 () 2848rxvt_term::cmd_get8 () THROW ((class out_of_input))
2426{ 2849{
2427 unicode_t c = next_octet (); 2850 uint32_t c = next_octet ();
2428 2851
2429 if (c == NOCHAR) 2852 if (c == NOCHAR)
2430 throw out_of_input; 2853 throw out_of_input;
2431 2854
2432 return c; 2855 return c;
… …
2532 case C0_ESC: 2955 case C0_ESC:
2533 process_escape_seq (); 2956 process_escape_seq ();
2534 break; 2957 break;
2535 case C0_ENQ: /* terminal Status */ 2958 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 2959 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2960 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2539 else 2961 else
2540 tt_write ((unsigned char *)VT100_ANS, 2962 tt_write (VT100_ANS, strlen (VT100_ANS));
2541 (unsigned int)STRLEN (VT100_ANS));
2542 break; 2963 break;
2543 case C0_BEL: /* bell */ 2964 case C0_BEL: /* bell */
2544 scr_bell (); 2965 scr_bell ();
2545 break; 2966 break;
2546 case C0_BS: /* backspace */ 2967 case C0_BS: /* backspace */
… …
2645void 3066void
2646rxvt_term::process_escape_seq () 3067rxvt_term::process_escape_seq ()
2647{ 3068{
2648 unicode_t ch = cmd_getc (); 3069 unicode_t ch = cmd_getc ();
2649 3070
2650 if (PrivateModes & PrivMode_vt52) 3071 if (priv_modes & PrivMode_vt52)
2651 { 3072 {
2652 process_escape_vt52 (ch); 3073 process_escape_vt52 (ch);
2653 return; 3074 return;
2654 } 3075 }
2655 3076
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 3091 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 3092 break;
2672 case '+': 3093 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 3094 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 3095 break;
2675#ifndef NO_FRILLS 3096#if !ENABLE_MINIMAL
2676 case '6': 3097 case '6':
2677 scr_backindex (); 3098 scr_backindex ();
2678 break; 3099 break;
2679#endif 3100#endif
2680 case '7': 3101 case '7':
2681 scr_cursor (SAVE); 3102 scr_cursor (SAVE);
2682 break; 3103 break;
2683 case '8': 3104 case '8':
2684 scr_cursor (RESTORE); 3105 scr_cursor (RESTORE);
2685 break; 3106 break;
2686#ifndef NO_FRILLS 3107#if !ENABLE_MINIMAL
2687 case '9': 3108 case '9':
2688 scr_forwardindex (); 3109 scr_forwardindex ();
2689 break; 3110 break;
2690#endif 3111#endif
2691 case '=': 3112 case '=':
… …
2701 break; 3122 break;
2702 3123
2703 /* 8.3.87: NEXT LINE */ 3124 /* 8.3.87: NEXT LINE */
2704 case C1_NEL: /* ESC E */ 3125 case C1_NEL: /* ESC E */
2705 { 3126 {
2706 unicode_t nlcr[] = { C0_LF, C0_CR }; 3127 wchar_t nlcr[] = { C0_LF, C0_CR };
2707 scr_add_lines (nlcr, 1, 2); 3128 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2708 } 3129 }
2709 break; 3130 break;
2710 3131
2711 /* kidnapped escape sequence: Should be 8.3.48 */ 3132 /* kidnapped escape sequence: Should be 8.3.48 */
2712 case C1_ESA: /* ESC G */ 3133 case C1_ESA: /* ESC G */
… …
2734 process_dcs_seq (); 3155 process_dcs_seq ();
2735 break; 3156 break;
2736 3157
2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3158 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2738 case C1_SCI: /* ESC Z */ 3159 case C1_SCI: /* ESC Z */
2739 tt_write ((const unsigned char *)ESCZ_ANSWER, 3160 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2740 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2741 break; /* steal obsolete ESC [ c */ 3161 break; /* steal obsolete ESC [ c */
2742 3162
2743 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3163 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2744 case C1_CSI: /* ESC [ */ 3164 case C1_CSI: /* ESC [ */
2745 process_csi_seq (); 3165 process_csi_seq ();
… …
2854 ndef = get_byte_array_bit (csi_defaults, i); 3274 ndef = get_byte_array_bit (csi_defaults, i);
2855 for (p = 0; p < nargs; p++) 3275 for (p = 0; p < nargs; p++)
2856 if (arg[p] == -1) 3276 if (arg[p] == -1)
2857 arg[p] = ndef; 3277 arg[p] = ndef;
2858 3278
2859#ifdef DEBUG_CMD
2860 fprintf (stderr, "CSI ");
2861 for (p = 0; p < nargs; p++)
2862 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2863 fprintf (stderr, "%c\n", ch);
2864#endif
2865
2866 /* 3279 /*
2867 * private mode handling 3280 * private mode handling
2868 */ 3281 */
2869 if (priv) 3282 if (priv)
2870 { 3283 {
2871 switch (priv) 3284 switch (priv)
2872 { 3285 {
2873 case '>': 3286 case '>':
2874 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 //
2875 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3296 tt_printf ("\033[>%d;94;0c", 'U');
3297 }
2876 break; 3298 break;
2877 case '?': 3299 case '?':
2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3300 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2879 process_terminal_mode (ch, priv, nargs, arg); 3301 process_terminal_mode (ch, priv, nargs, arg);
2880 break; 3302 break;
… …
2985 3407
2986 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3408 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2987 arg[0] = -arg[0]; 3409 arg[0] = -arg[0];
2988 /* FALLTHROUGH */ 3410 /* FALLTHROUGH */
2989 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3411 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3412 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2991 break; 3413 break;
2992 3414
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3415 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 3416 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2995 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 3417 break;
2997 3418
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3419 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 3420 process_sgr_mode (nargs, arg);
3000 break; 3421 break;
… …
3007 break; 3428 break;
3008 case 6: /* CPR requested */ 3429 case 6: /* CPR requested */
3009 scr_report_position (); 3430 scr_report_position ();
3010 break; 3431 break;
3011 case 7: /* unofficial extension */ 3432 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 3433 if (OPTION (Opt_insecure))
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3434 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 3435 break;
3015 case 8: /* unofficial extension */ 3436 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3437 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 3438 break;
3018 } 3439 }
… …
3054 break; 3475 break;
3055 3476
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 3477 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 3478 if (arg[0] == 4)
3058 scr_insert_mode (0); 3479 scr_insert_mode (0);
3480 else if (arg[0] == 20)
3481 priv_modes &= ~PrivMode_LFNL;
3059 break; 3482 break;
3060 3483
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3484 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3485 if (arg[0] == 4)
3063 scr_insert_mode (1); 3486 scr_insert_mode (1);
3487 else if (arg[0] == 20)
3488 priv_modes |= PrivMode_LFNL;
3064 break; 3489 break;
3065 3490
3066 /* 3491 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3492 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3493 */
… …
3080 break; 3505 break;
3081 case CSI_75: 3506 case CSI_75:
3082 scr_cursor (RESTORE); 3507 scr_cursor (RESTORE);
3083 break; 3508 break;
3084 3509
3085#ifndef NO_FRILLS 3510#if !ENABLE_MINIMAL
3086 case CSI_74: 3511 case CSI_74:
3087 process_window_ops (arg, nargs); 3512 process_window_ops (arg, nargs);
3088 break; 3513 break;
3089#endif 3514#endif
3090 3515
… …
3097 break; 3522 break;
3098 } 3523 }
3099} 3524}
3100/*}}} */ 3525/*}}} */
3101 3526
3102#ifndef NO_FRILLS 3527#if !ENABLE_MINIMAL
3103/* ARGSUSED */ 3528/* ARGSUSED */
3104void 3529void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3530rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3531{
3107 int x, y; 3532 int x, y;
3108 XWindowAttributes wattr; 3533 XWindowAttributes wattr;
3109 Window wdummy; 3534 Window wdummy;
3535
3536 dLocal (Display *, xdisp);
3110 3537
3111 if (nargs == 0) 3538 if (nargs == 0)
3112 return; 3539 return;
3113 3540
3114 switch (args[0]) 3541 switch (args[0])
3115 { 3542 {
3116 /* 3543 /*
3117 * commands 3544 * commands
3118 */ 3545 */
3119 case 1: /* deiconify window */ 3546 case 1: /* deiconify window */
3120 XMapWindow (display->display, TermWin.parent[0]); 3547 XMapWindow (xdisp, parent[0]);
3121 break; 3548 break;
3122 case 2: /* iconify window */ 3549 case 2: /* iconify window */
3123 XIconifyWindow (display->display, TermWin.parent[0], 3550 XIconifyWindow (xdisp, parent[0], display->screen);
3124 DefaultScreen (display->display));
3125 break; 3551 break;
3126 case 3: /* set position (pixels) */ 3552 case 3: /* set position (pixels) */
3127 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3553 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3128 break; 3554 break;
3129 case 4: /* set size (pixels) */ 3555 case 4: /* set size (pixels) */
3130 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3131 break; 3557 break;
3132 case 5: /* raise window */ 3558 case 5: /* raise window */
3133 XRaiseWindow (display->display, TermWin.parent[0]); 3559 XRaiseWindow (xdisp, parent[0]);
3134 break; 3560 break;
3135 case 6: /* lower window */ 3561 case 6: /* lower window */
3136 XLowerWindow (display->display, TermWin.parent[0]); 3562 XLowerWindow (xdisp, parent[0]);
3137 break; 3563 break;
3138 case 7: /* refresh window */ 3564 case 7: /* refresh window */
3139 scr_touch (true); 3565 scr_touch (true);
3140 break; 3566 break;
3141 case 8: /* set size (chars) */ 3567 case 8: /* set size (chars) */
3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3568 set_widthheight ((unsigned int) (args[2] * fwidth),
3143 (unsigned int) (args[1] * TermWin.fheight)); 3569 (unsigned int) (args[1] * fheight));
3144 break; 3570 break;
3145 3571
3146 //case 9: NYI, TODO, restore maximized window or maximize window 3572 //case 9: NYI, TODO, restore maximized window or maximize window
3147 default: 3573 default:
3148 if (args[0] >= 24) /* set height (chars) */ 3574 if (args[0] >= 24) /* set height (chars) */
3149 set_widthheight ((unsigned int)TermWin.width, 3575 set_widthheight ((unsigned int)width,
3150 (unsigned int) (args[1] * TermWin.fheight)); 3576 (unsigned int) (args[1] * fheight));
3151 break; 3577 break;
3152 3578
3153 3579
3154 /* 3580 /*
3155 * reports - some output format copied from XTerm 3581 * reports - some output format copied from XTerm
3156 */ 3582 */
3157 case 11: /* report window state */ 3583 case 11: /* report window state */
3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3584 XGetWindowAttributes (xdisp, parent[0], &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3586 break;
3161 case 13: /* report window position */ 3587 case 13: /* report window position */
3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3588 XGetWindowAttributes (xdisp, parent[0], &wattr);
3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3589 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3590 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3591 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3592 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3593 break;
3168 case 14: /* report window size (pixels) */ 3594 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3595 XGetWindowAttributes (xdisp, parent[0], &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3597 break;
3172 case 18: /* report text area size (chars) */ 3598 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3599 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3174 break; 3600 break;
3175 case 19: /* report window size (chars) */ 3601 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3602 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3177 break; 3603 break;
3178 case 20: /* report icon label */ 3604 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3605 {
3181 char *s; 3606 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3607 XGetIconName (xdisp, parent[0], &s);
3183 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);
3184 } 3610 }
3185 break; 3611 break;
3186 case 21: /* report window title */ 3612 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3613 {
3189 char *s; 3614 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3615 XFetchName (xdisp, parent[0], &s);
3191 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);
3192 } 3618 }
3193 break; 3619 break;
3194 } 3620 }
3195} 3621}
3196#endif 3622#endif
3197 3623
3198/*----------------------------------------------------------------------*/ 3624/*----------------------------------------------------------------------*/
3199/* 3625/*
3200 * get input up until STRING TERMINATOR (or BEL) 3626 * get input up until STRING TERMINATOR (or BEL)
3201 * ends_how is terminator used. returned input must be free()'d 3627 * ends_how is terminator used. returned input must be free()'d
3202 */ 3628 */
3203unsigned char * 3629char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3630rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3631{
3206 unicode_t prev = 0, ch; 3632 unicode_t ch;
3633 bool seen_esc = false;
3207 unsigned int n = 0; 3634 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3635 wchar_t string[STRING_MAX];
3210 3636
3211 while ((ch = cmd_getc ()) != NOCHAR) 3637 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3638 {
3213 if (prev == C0_ESC) 3639 if (seen_esc)
3214 { 3640 {
3215 if (ch == 0x5c) /* 7bit ST */ 3641 if (ch == 0x5c) /* 7bit ST */
3216 break; 3642 break;
3217 else 3643 else
3218 return NULL; 3644 return NULL;
3219 } 3645 }
3646 else if (ch == C0_ESC)
3647 {
3648 seen_esc = true;
3649 continue;
3650 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3651 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3652 break;
3222 else if (ch < 0x20) 3653 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3654 return NULL; /* other control character - exit */
3224 3655
3225 if (n >= sizeof (string) - 1) 3656 seen_esc = false;
3657
3658 if (n >= STRING_MAX - 1)
3226 // stop at some sane length 3659 // stop at some sane length
3227 return NULL; 3660 return NULL;
3228 3661
3229 if (ch == C0_SYN) 3662 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 (); 3663 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else 3664 else
3235 string[n++] = prev = ch; 3665 string[n++] = ch;
3236 } 3666 }
3237 3667
3238 string[n++] = '\0'; 3668 string[n++] = '\0';
3239 3669
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3670 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3671
3245 return s; 3672 return rxvt_wcstombs (string);
3246} 3673}
3247 3674
3248/*----------------------------------------------------------------------*/ 3675/*----------------------------------------------------------------------*/
3249/* 3676/*
3250 * 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)'
3251 */ 3678 */
3252void 3679void
3253rxvt_term::process_dcs_seq () 3680rxvt_term::process_dcs_seq ()
3254{ 3681{
3255 unsigned char *s; 3682 char *s;
3256 unicode_t eh; 3683 unicode_t eh;
3257 3684
3258 /* 3685 /*
3259 * Not handled yet 3686 * Not handled yet
3260 */ 3687 */
… …
3279 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3706 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3280 arg = arg * 10 + (ch - '0'); 3707 arg = arg * 10 + (ch - '0');
3281 3708
3282 if (ch == ';') 3709 if (ch == ';')
3283 { 3710 {
3284 unsigned char *s = get_to_st (eh); 3711 char *s = get_to_st (eh);
3285 3712
3286 if (s) 3713 if (s)
3287 { 3714 {
3288 process_xterm_seq (arg, (char *)s, eh); 3715 process_xterm_seq (arg, s, eh);
3289 free (s); 3716 free (s);
3290 } 3717 }
3291 } 3718 }
3292} 3719}
3293 3720
3294void 3721void
3295rxvt_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)
3296{ 3723{
3297 if (str[0] == '?' && !str[1]) 3724 if (str[0] == '?' && !str[1])
3298 { 3725 {
3299 if (Options & Opt_insecure) 3726 rxvt_rgba c;
3300 { 3727 pix_colors_focused[color].get (this, c);
3301 unsigned short r, g, b; 3728
3302 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
3303 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);
3304 }
3305 } 3735 }
3306 else 3736 else
3307 set_window_color (color, str); 3737 set_window_color (color, str);
3308} 3738}
3309 3739
3310/* 3740/*
3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3741 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3312 * 0 = change iconName/title
3313 * 1 = change iconName
3314 * 2 = change title
3315 * 4 = change color
3316 * 10 = change fg color
3317 * 11 = change bg color
3318 * 12 = change text color
3319 * 13 = change mouse foreground color
3320 * 17 = change highlight character colour
3321 * 18 = change bold character color
3322 * 19 = change underlined character color
3323 * 46 = change logfile (not implemented)
3324 * 50 = change font
3325 *
3326 * rxvt extensions:
3327 * 20 = bg pixmap
3328 * 39 = change default fg color
3329 * 49 = change default bg color
3330 * 55 = dump scrollback buffer and all of screen
3331 * 701 = change locale
3332 * 702 = find font
3333 * 703 = menu
3334 */ 3742 */
3335void 3743void
3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3744rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3337{ 3745{
3338 int changed = 0;
3339 int color; 3746 int color;
3340 char *buf, *name; 3747 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3748 bool query = str[0] == '?' && !str[1];
3749 int saveop = op;
3750
3751 dLocal (Display *, xdisp);
3342 3752
3343 assert (str != NULL); 3753 assert (str != NULL);
3344 switch (op) 3754 switch (op)
3345 { 3755 {
3346 case XTerm_name: 3756 case XTerm_name:
… …
3353 set_title (str); 3763 set_title (str);
3354 break; 3764 break;
3355 case XTerm_property: 3765 case XTerm_property:
3356 if (str[0] == '?') 3766 if (str[0] == '?')
3357 { 3767 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3768 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3769 Atom actual_type;
3360 int actual_format; 3770 int actual_format;
3361 unsigned long nitems; 3771 unsigned long nitems;
3362 unsigned long bytes_after; 3772 unsigned long bytes_after;
3363 unsigned char *value = 0; 3773 unsigned char *value = 0;
3364 const char *str = ""; 3774 const char *str = "";
3365 3775
3366 if (prop 3776 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0], 3777 && XGetWindowProperty (xdisp, parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType, 3778 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format, 3779 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success 3780 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None 3781 && actual_type != None
3372 && actual_format == 8) 3782 && actual_format == 8)
3373 str = (const char *)(value); 3783 str = (const char *)(value);
3374 3784
3375 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3785 tt_printf ("\033]%d;%s%c", op, str, resp);
3376 3786
3377 XFree (value); 3787 XFree (value);
3378 } 3788 }
3379 else 3789 else
3380 { 3790 {
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3791 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3792
3383 if (eq) 3793 if (eq)
3384 { 3794 {
3385 *eq = 0; 3795 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3796 set_utf8_property (display->atom (str), eq + 1);
3387 display->atom (str), XA_STRING, 8,
3388 PropModeReplace, (unsigned char *)eq + 1,
3389 strlen (eq + 1));
3390 } 3797 }
3391 else 3798 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3799 XDeleteProperty (xdisp, parent[0],
3393 display->atom (str)); 3800 display->atom (str));
3394 } 3801 }
3395 break; 3802 break;
3396 3803
3397 case XTerm_Color: 3804 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3805 for (buf = (char *)str; buf && *buf;)
3399 { 3806 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3807 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3808 break;
3402 3809
3403 *name++ = '\0'; 3810 *name++ = '\0';
3404 color = atoi (buf); 3811 color = atoi (buf) + minCOLOR;
3405 3812
3406 if (color < 0 || color >= TOTAL_COLORS) 3813 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3407 break; 3814 break;
3408 3815
3409 if ((buf = STRCHR (name, ';')) != NULL) 3816 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3817 *buf++ = '\0';
3411 3818
3412 if (name[0] == '?' && !name[1]) 3819 process_color_seq (op, color, name, resp);
3413 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 }
3421 else
3422 set_window_color (color + minCOLOR, name);
3423 } 3820 }
3424 break; 3821 break;
3425 case XTerm_Color00: 3822 case XTerm_Color00:
3426 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3823 process_color_seq (op, Color_fg, str, resp);
3427 break; 3824 break;
3428 case XTerm_Color01: 3825 case XTerm_Color01:
3429 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3826 process_color_seq (op, Color_bg, str, resp);
3430 break; 3827 break;
3431#ifndef NO_CURSORCOLOR 3828#ifndef NO_CURSORCOLOR
3432 case XTerm_Color_cursor: 3829 case XTerm_Color_cursor:
3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3830 process_color_seq (op, Color_cursor, str, resp);
3434 break; 3831 break;
3435#endif 3832#endif
3436 case XTerm_Color_pointer_fg: 3833 case XTerm_Color_pointer_fg:
3437 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3834 process_color_seq (op, Color_pointer_fg, str, resp);
3438 break; 3835 break;
3439 case XTerm_Color_pointer_bg: 3836 case XTerm_Color_pointer_bg:
3440 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3837 process_color_seq (op, Color_pointer_bg, str, resp);
3441 break; 3838 break;
3442#ifndef NO_BOLD_UNDERLINE_REVERSE 3839#ifndef NO_BOLD_UNDERLINE_REVERSE
3443 case XTerm_Color_BD:
3444 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3445 break;
3446 case XTerm_Color_UL:
3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3448 break;
3449 case XTerm_Color_RV: 3840 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3841 process_color_seq (op, Color_RV, str, resp);
3451 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;
3452#endif 3854#endif
3855#if TRANSPARENT && TINTING
3856 case URxvt_Color_tint:
3857 process_color_seq (op, Color_tint, str, resp);
3453 3858
3859 check_our_parents ();
3860
3861 if (am_transparent)
3862 want_full_refresh = want_refresh = 1;
3863
3864 break;
3865#endif
3866
3454 case XTerm_Pixmap: 3867 case Rxvt_Pixmap:
3868 {
3455 if (*str != ';') 3869 if (*str != ';')
3456 { 3870 {
3457#if XPM_BACKGROUND 3871#if XPM_BACKGROUND
3458 scale_pixmap (""); /* reset to default scaling */ 3872 scale_pixmap (""); /* reset to default scaling */
3459 set_bgPixmap (str); /* change pixmap */ 3873 set_bgPixmap (str); /* change pixmap */
3460#endif
3461 scr_touch (true); 3874 scr_touch (true);
3875#endif
3462 } 3876 }
3877
3878 int changed = 0;
3879
3463 while ((str = STRCHR (str, ';')) != NULL) 3880 while ((str = strchr (str, ';')) != NULL)
3464 { 3881 {
3465 str++; 3882 str++;
3466#if XPM_BACKGROUND 3883#if XPM_BACKGROUND
3467 changed += scale_pixmap (str); 3884 changed += scale_pixmap (str);
3468#endif 3885#endif
3469
3470 } 3886 }
3887
3471 if (changed) 3888 if (changed)
3472 { 3889 {
3473#ifdef XPM_BACKGROUND 3890#ifdef XPM_BACKGROUND
3474 resize_pixmap (); 3891 resize_pixmap ();
3475#endif
3476 scr_touch (true); 3892 scr_touch (true);
3893#endif
3477 } 3894 }
3895 }
3478 break; 3896 break;
3479 3897
3480 case XTerm_restoreFG: 3898 case Rxvt_restoreFG:
3481 set_window_color (Color_fg, str); 3899 set_window_color (Color_fg, str);
3482 break; 3900 break;
3483 case XTerm_restoreBG: 3901 case Rxvt_restoreBG:
3484 set_window_color (Color_bg, str); 3902 set_window_color (Color_bg, str);
3485 break; 3903 break;
3486 3904
3487 case XTerm_logfile: 3905 case XTerm_logfile:
3488 // TODO, when secure mode? 3906 // TODO, when secure mode?
3489 break; 3907 break;
3490 3908
3491 case XTerm_font:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3496 TermWin.fontset->fontdesc
3497 ? TermWin.fontset->fontdesc
3498 : "",
3499 resp);
3500 }
3501 else
3502 change_font (str);
3503 break;
3504
3505#ifndef NO_FRILLS
3506 case XTerm_locale:
3507 if (query)
3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3511 }
3512 else
3513 {
3514 set_locale (str);
3515# ifdef USE_XIM
3516 im_cb ();
3517# endif
3518 }
3519 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 }
3528 break;
3529#endif
3530
3531#ifdef MENUBAR
3532 case XTerm_Menu:
3533 if (Options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3535 break;
3536#endif
3537#if 0 3909#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3910 case Rxvt_dumpscreen: /* no error notices */
3539 { 3911 {
3540 int fd; 3912 int fd;
3541 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)
3542 { 3914 {
3543 scr_dump (fd); 3915 scr_dump (fd);
3544 close (fd); 3916 close (fd);
3545 } 3917 }
3546 } 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
3547 break; 3982 break;
3548#endif 3983#endif
3549 } 3984 }
3550} 3985}
3551/*----------------------------------------------------------------------*/ 3986/*----------------------------------------------------------------------*/
… …
3565{ 4000{
3566 int state; 4001 int state;
3567 4002
3568 if (mode == 's') 4003 if (mode == 's')
3569 { 4004 {
3570 SavedModes |= (PrivateModes & bit); 4005 SavedModes |= (priv_modes & bit);
3571 return -1; 4006 return -1;
3572 } 4007 }
3573 else 4008 else
3574 { 4009 {
3575 if (mode == 'r') 4010 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4011 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 4012 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4013 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 4014 PrivMode (state, bit);
3580 } 4015 }
3581 4016
3582 return state; 4017 return state;
3583} 4018}
3584 4019
3585/* we're not using priv _yet_ */ 4020/* we're not using priv _yet_ */
3586void 4021void
3587rxvt_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)
3588{ 4023{
3589 unsigned int i, j; 4024 unsigned int i, j;
3590 int state; 4025 int state;
3591 4026
3592 static const struct 4027 static const struct
… …
3601 { 3, PrivMode_132 }, 4036 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 4037 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 4038 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 4039 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 4040 { 7, PrivMode_Autowrap },
4041 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 4042 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 4043 // 18, 19 printing-related
3608 { menuBar_esc, PrivMode_menuBar }, 4044 { 25, PrivMode_VisibleCursor },
3609#endif
3610#ifdef scrollBar_esc 4045#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 4046 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 4047#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 4048 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 4049 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 4050 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 4051 // 45 margin bell NYI
3620 // 46 start logging 4052 // 46 start logging
… …
3660 } 4092 }
3661 4093
3662 /* extra handling for values with state unkept */ 4094 /* extra handling for values with state unkept */
3663 switch (arg[i]) 4095 switch (arg[i])
3664 { 4096 {
4097#if ENABLE_STYLES
4098 case 1021:
4099 set_option (Opt_intensityStyles, mode);
4100
4101 scr_touch (true);
4102 break;
4103#endif
3665 case 1048: /* alternative cursor save */ 4104 case 1048: /* alternative cursor save */
4105 case 1049:
3666 if (Options & Opt_secondaryScreen) 4106 if (OPTION (Opt_secondaryScreen))
3667 if (mode == 0) 4107 if (mode == 0)
3668 scr_cursor (RESTORE); 4108 scr_cursor (RESTORE);
3669 else if (mode == 1) 4109 else if (mode == 1)
3670 scr_cursor (SAVE); 4110 scr_cursor (SAVE);
3671 break; 4111 break;
… …
3682 * within VT52 mode 4122 * within VT52 mode
3683 */ 4123 */
3684 PrivMode (1, PrivMode_vt52); 4124 PrivMode (1, PrivMode_vt52);
3685 break; 4125 break;
3686 case 3: /* 80/132 */ 4126 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 4127 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4128 set_widthheight (((state ? 132 : 80) * fwidth), height);
3689 break; 4129 break;
3690 case 4: /* smooth scrolling */ 4130 case 4: /* smooth scrolling */
3691 if (state) 4131 set_option (Opt_jumpScroll, !state);
3692 Options &= ~Opt_jumpScroll;
3693 else
3694 Options |= Opt_jumpScroll;
3695 break; 4132 break;
3696 case 5: /* reverse video */ 4133 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 4134 scr_rvideo_mode (state);
3698 break; 4135 break;
3699 case 6: /* relative/absolute origins */ 4136 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 4140 scr_autowrap (state);
3704 break; 4141 break;
3705 /* 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 */
3706 case 9: /* X10 mouse reporting */ 4143 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 4144 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 4145 priv_modes &= ~PrivMode_MouseX11;
3709 break; 4146 break;
3710#ifdef menuBar_esc
3711 case menuBar_esc:
3712#ifdef MENUBAR
3713 map_menuBar (state);
3714#endif
3715 break;
3716#endif
3717#ifdef scrollBar_esc 4147#ifdef scrollBar_esc
3718 case scrollBar_esc: 4148 case scrollBar_esc:
3719 if (scrollbar_mapping (state)) 4149 if (scrollbar_mapping (state))
3720 { 4150 {
3721 resize_all_windows (0, 0, 0); 4151 resize_all_windows (0, 0, 0);
… …
3733 break; 4163 break;
3734 /* case 66: - application key pad */ 4164 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 4165 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 4166 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 4167 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 4168 priv_modes &= ~PrivMode_MouseX10;
3739 break; 4169 break;
3740#if 0 4170#if 0
3741 case 1001: 4171 case 1001:
3742 break; /* X11 mouse highlighting */ 4172 break; /* X11 mouse highlighting */
3743#endif 4173#endif
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 4174 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state)
3746 Options &= ~Opt_scrollTtyOutput;
3747 else
3748 Options |= Opt_scrollTtyOutput; 4175 set_option (Opt_scrollTtyOutput, !state);
3749 break; 4176 break;
3750 case 1011: /* scroll to bottom on key press */ 4177 case 1011: /* scroll to bottom on key press */
3751 if (state)
3752 Options |= Opt_scrollTtyKeypress; 4178 set_option (Opt_scrollTtyKeypress, state);
3753 else
3754 Options &= ~Opt_scrollTtyKeypress;
3755 break; 4179 break;
3756 case 1047: /* secondary screen w/ clearing last */ 4180 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 4181 if (OPTION (Opt_secondaryScreen))
3758 if (current_screen != PRIMARY) 4182 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 4183 scr_erase_screen (2);
3760 scr_change_screen (state); 4184 scr_change_screen (state);
3761 break; 4185 break;
3762 case 1049: /* secondary screen w/ clearing first */ 4186 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 4187 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 4188 if (OPTION (Opt_secondaryScreen))
3765 if (current_screen != PRIMARY) 4189 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 4190 scr_erase_screen (2);
3767 break; 4191 break;
3768 default: 4192 default:
3769 break; 4193 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 4219 rendset = 0, rendstyle = ~RS_None;
3796 break; 4220 break;
3797 case 1: 4221 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 4222 rendset = 1, rendstyle = RS_Bold;
3799 break; 4223 break;
3800 //case 2: // faint or second colour 4224 //case 2: // low intensity
4225 case 3:
4226 rendset = 1, rendstyle = RS_Italic;
4227 break;
3801 case 4: 4228 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 4229 rendset = 1, rendstyle = RS_Uline;
3803 break; 4230 break;
3804 case 5: // slowly blinking 4231 case 5: // slowly blinking
3805 case 6: // rapidly blinking 4232 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 4244 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 4245 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 4246 //...
3820 //case 19: // ninth alt font 4247 //case 19: // ninth alt font
3821 //case 20: // gothic 4248 //case 20: // gothic
3822 case 21: // disable bold, faint 4249 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 4250 rendset = 0, rendstyle = RS_Bold;
3824 break; 4251 break;
3825 case 22: 4252 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 4253 rendset = 0, rendstyle = RS_Bold;
3827 break; 4254 break;
3828 //case 23: disable italic 4255 case 23: // disable italic
4256 rendset = 0, rendstyle = RS_Italic;
4257 break;
3829 case 24: 4258 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 4259 rendset = 0, rendstyle = RS_Uline;
3831 break; 4260 break;
3832 case 25: 4261 case 25:
4262 rendset = 0, rendstyle = RS_Blink;
4263 break;
4264 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 4265 rendset = 0, rendstyle = RS_Blink;
3834 break; 4266 break;
3835 case 27: 4267 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 4268 rendset = 0, rendstyle = RS_RVid;
3837 break; 4269 break;
… …
3855 case 35: 4287 case 35:
3856 case 36: 4288 case 36:
3857 case 37: 4289 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4290 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 4291 break;
3860#ifdef TTY_256COLOR 4292 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 4293 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 4294 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4295 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 4296 i += 2;
3866 } 4297 }
3867 break; 4298 break;
3868#endif
3869 case 39: /* default fg */ 4299 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 4300 scr_color (Color_fg, Color_fg);
3871 break; 4301 break;
3872 4302
3873 case 40: 4303 case 40:
… …
3878 case 45: 4308 case 45:
3879 case 46: 4309 case 46:
3880 case 47: 4310 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4311 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 4312 break;
3883#ifdef TTY_256COLOR 4313 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 4314 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 4315 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4316 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 4317 i += 2;
3889 } 4318 }
3890 break; 4319 break;
3891#endif
3892 case 49: /* default bg */ 4320 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 4321 scr_color (Color_bg, Color_bg);
3894 break; 4322 break;
3895 4323
3896#ifndef NO_BRIGHTCOLOR 4324 //case 50: // not variable spacing
4325
4326#if !ENABLE_MINIMAL
3897 case 90: 4327 case 90:
3898 case 91: /* set bright fg color */ 4328 case 91: /* set bright fg color */
3899 case 92: 4329 case 92:
3900 case 93: 4330 case 93:
3901 case 94: 4331 case 94:
3902 case 95: 4332 case 95:
3903 case 96: 4333 case 96:
3904 case 97: 4334 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4335 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 4336 break;
3908 case 100: 4337 case 100:
3909 case 101: /* set bright bg color */ 4338 case 101: /* set bright bg color */
3910 case 102: 4339 case 102:
3911 case 103: 4340 case 103:
3912 case 104: 4341 case 104:
3913 case 105: 4342 case 105:
3914 case 106: 4343 case 106:
3915 case 107: 4344 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4345 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 4346 break;
3919#endif 4347#endif
3920
3921 } 4348 }
3922 } 4349 }
3923} 4350}
3924/*}}} */ 4351/*}}} */
3925 4352
… …
3929{ 4356{
3930 unicode_t ch, cmd = cmd_getc (); 4357 unicode_t ch, cmd = cmd_getc ();
3931 4358
3932 if (cmd == 'Q') 4359 if (cmd == 'Q')
3933 { /* query graphics */ 4360 { /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 4361 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 4362 return;
3936 } 4363 }
3937 /* swallow other graphics sequences until terminating ':' */ 4364 /* swallow other graphics sequences until terminating ':' */
3938 do 4365 do
3939 ch = cmd_getc (); 4366 ch = cmd_getc ();
… …
3949 */ 4376 */
3950void 4377void
3951rxvt_term::tt_printf (const char *fmt,...) 4378rxvt_term::tt_printf (const char *fmt,...)
3952{ 4379{
3953 va_list arg_ptr; 4380 va_list arg_ptr;
3954 unsigned char buf[256]; 4381 char buf[256];
3955 4382
3956 va_start (arg_ptr, fmt); 4383 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4384 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 4385 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 4386 tt_write (buf, strlen (buf));
3960} 4387}
3961 4388
3962/* ---------------------------------------------------------------------- */ 4389/* ---------------------------------------------------------------------- */
3963/* 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,
3964 * or generated by us in response to a query ESC sequence. 4391 * or generated by us in response to a query ESC sequence.
3965 */ 4392 */
4393const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4394
3966void 4395void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4396rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 4397{
3969 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;
3970 4400
3971 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;
3972 { 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
3973 if (v_buflen == 0) 4431 if (v_buflen == 0)
3974 { 4432 {
3975 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3976
3977 if ((unsigned int)written == len)
3978 return;
3979
3980 data += written;
3981 len -= written;
3982 }
3983
3984
3985 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3986
3987 memcpy (v_buffer + v_buflen, data, len);
3988 v_buflen += len;
3989 }
3990
3991 for (;;)
3992 {
3993 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3994
3995 if (written > 0)
3996 {
3997 v_buflen -= written;
3998
3999 if (v_buflen == 0)
4000 {
4001 free (v_buffer); 4433 free (v_buffer);
4002 v_buffer = 0; 4434 v_buffer = 0;
4003 v_buflen = 0; 4435 v_buflen = 0;
4004 4436
4005 pty_ev.set (EVENT_READ); 4437 pty_ev.set (EVENT_READ);
4006 return;
4007 }
4008
4009 memmove (v_buffer, v_buffer + written, v_buflen);
4010 }
4011 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4012 // original code just ignores this...
4013 destroy ();
4014 else
4015 {
4016 pty_ev.set (EVENT_READ | EVENT_WRITE);
4017 return; 4438 return;
4018 } 4439 }
4440
4441 memmove (v_buffer, v_buffer + written, v_buflen);
4019 } 4442 }
4443 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4444 pty_ev.set (EVENT_READ);
4020} 4445}
4021 4446
4022/*----------------------- end-of-file (C source) -----------------------*/ 4447/*----------------------- end-of-file (C source) -----------------------*/
4023 4448

Diff Legend

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