ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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