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

Diff Legend

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