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

Diff Legend

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