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

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

Diff Legend

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