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

Diff Legend

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