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

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

Diff Legend

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