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

Diff Legend

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