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.231 by root, Wed Jan 4 00:13:22 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
53#include <wchar.h> 55# include <sched.h>
56#endif
57
58#ifdef KEYSYM_RESOURCE
59# include "keyboard.h"
60#endif
61
62#include <csignal>
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 67
59// exception thrown when the command parser runs out of input data 68// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 69class out_of_input { } out_of_input;
70
71#if ENABLE_FRILLS || ISO_14755
72
73#define ISO_14755_STARTED 0x80000000UL
74#define ISO_14755_51 0x40000000UL // basic (section 5.1)
75#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
76#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
77#define ISO_14755_MASK 0x0fffffffUL
78
79#if ISO_14755
80static unsigned short iso14755_symtab[] = {
81 // keysym, unicode
82 XK_Left, 0x2190,
83 XK_KP_Left, 0x2190,
84 XK_Up, 0x2191,
85 XK_KP_Up, 0x2191,
86 XK_Right, 0x2192,
87 XK_KP_Right, 0x2192,
88 XK_Down, 0x2193,
89 XK_KP_Down, 0x2193,
90 XK_Linefeed, 0x21b4,
91 XK_Return, 0x21b5,
92 XK_KP_Enter, 0x21b5,
93
94 XK_Prior, 0x21de,
95 XK_Next, 0x21df,
96 XK_Tab, 0x21e5,
97 XK_ISO_Left_Tab, 0x21e6,
98 XK_Shift_L, 0x21e7,
99 XK_Shift_R, 0x21e7,
100
101 XK_Shift_Lock, 0x21eb,
102 XK_ISO_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb,
104 XK_Caps_Lock, 0x21ec,
105 XK_Num_Lock, 0x21ed,
106 XK_ISO_Level3_Shift, 0x21ee,
107 XK_ISO_Level3_Lock, 0x21ef,
108 XK_ISO_Group_Lock, 0x21f0,
109 XK_Home, 0x21f1,
110 XK_End, 0x21f2,
111
112 XK_Execute, 0x2318,
113 XK_Begin, 0x2320,
114 XK_Delete, 0x2326,
115 XK_Clear, 0x2327,
116 XK_BackSpace, 0x232b,
117 XK_Insert, 0x2380,
118 XK_Control_L, 0x2388,
119 XK_Control_R, 0x2388,
120 XK_Pause, 0x2389,
121 XK_Break, 0x238a,
122 XK_Escape, 0x238b,
123 XK_Undo, 0x238c,
124 XK_Print, 0x2399,
125
126 XK_space, 0x2423,
127
128#ifdef XK_KP_Begin
129 XK_KP_Prior, 0x21de,
130 XK_KP_Next, 0x21df,
131 XK_KP_Begin, 0x2320,
132 XK_KP_Insert, 0x2380,
133 XK_KP_Delete, 0x2326,
134 XK_KP_Space, 0x2422,
135#endif
136 0,
137};
138
139void
140rxvt_term::iso14755_54 (int x, int y)
141{
142 x = Pixel2Col (x);
143 y = Pixel2Row (y);
144
145 if (!IN_RANGE_EXC (x, 0, ncol)
146 || !IN_RANGE_EXC (y, 0, nrow))
147 return;
148
149 for (;;)
150 {
151 const line_t &l = ROW(y - view_start);
152
153 text_t t = l.t[x];
154
155 if (t != NOCHAR || !x)
156 {
157 iso14755_51 (l.t[x], l.r[x], x, y);
158 iso14755buf = ISO_14755_54;
159 break;
160 }
161
162 x--;
163 }
164}
165
166void
167rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
168{
169 rxvt_fontset *fs = FONTSET (r);
170 rxvt_font *f = (*fs)[fs->find_font (ch)];
171 wchar_t *chr, *alloc, ch2, *fname;
172 int len;
173
174 fname = rxvt_utf8towcs (f->name);
175
176# if ENABLE_COMBINING
177 if (IS_COMPOSE (ch))
178 {
179 len = rxvt_composite.expand (ch, 0);
180 alloc = chr = new wchar_t[len];
181 rxvt_composite.expand (ch, chr);
182 }
183 else
184# endif
185 {
186 ch2 = ch;
187
188 alloc = 0;
189 chr = &ch2;
190 len = 1;
191 }
192
193 char attr[80]; // plenty
194
195 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
196 (int)r,
197 fgcolor_of (r), bgcolor_of (r),
198 r & RS_Bold ? " bold" : "",
199 r & RS_Italic ? " italic" : "",
200 r & RS_Blink ? " blink" : "",
201 r & RS_RVid ? " rvid" : "",
202 r & RS_Uline ? " uline" : "",
203 r & RS_Careful ? " careful" : "");
204
205 int width = wcswidth (fname, wcslen (fname));
206
207 max_it (width, 8+5); // for char + hey
208 max_it (width, strlen (attr));
209
210 if (y >= 0)
211 {
212 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
213 x = 0;
214 }
215
216 scr_overlay_new (x, y, width, len + 2);
217
218 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
219
220 for (int y = 0; y < len; y++)
221 {
222 char buf[9];
223
224 ch = *chr++;
225
226 sprintf (buf, "%8x", ch);
227 scr_overlay_set (0, y, buf);
228 scr_overlay_set (9, y, '=');
229# if !UNICODE3
230 if (ch >= 0x10000)
231 ch = 0xfffd;
232# endif
233 scr_overlay_set (11, y, ch, r);
234 scr_overlay_set (12, y, NOCHAR, r);
235 }
236
237 scr_overlay_set (0, len , attr);
238 scr_overlay_set (0, len + 1, fname);
239
240 free (fname);
241
242# if ENABLE_COMBINING
243 if (alloc)
244 delete [] alloc;
245# endif
246}
247#endif
248
249void
250rxvt_term::commit_iso14755 ()
251{
252 wchar_t ch[2];
253
254 ch[0] = iso14755buf & ISO_14755_MASK;
255 ch[1] = 0;
256
257 if (iso14755buf & ISO_14755_51)
258 {
259 char mb[16];
260 int len;
261
262 // allow verbatim 0-bytes and control-bytes to be entered
263 if (ch[0] >= 0x20)
264 len = wcstombs (mb, ch, 16);
265 else
266 {
267 mb[0] = ch[0];
268 len = 1;
269 }
270
271 if (len > 0)
272 tt_write ((unsigned char *)mb, len);
273 else
274 scr_bell ();
275 }
276
277 iso14755buf = 0;
278}
279
280int
281rxvt_term::hex_keyval (XKeyEvent &ev)
282{
283 // check wether this event corresponds to a hex digit
284 // if the modifiers had not been pressed.
285 for (int index = 0; index < 8; index++)
286 {
287 KeySym k = XLookupKeysym (&ev, index);
288
289 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
290 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
291 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
292 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
293 }
294
295 return -1;
296}
297#endif
61 298
62/*{{{ Convert the keypress event into a string */ 299/*{{{ Convert the keypress event into a string */
63void 300void
64rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
65{ 302{
… …
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 314 * escape sequence to toggle the Keypad.
78 * 315 *
79 * Always permit `shift' to override the current setting 316 * Always permit `shift' to override the current setting
80 */ 317 */
81 shft = (ev.state & ShiftMask); 318 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 319 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 320 meta = ev.state & ModMetaMask;
84 321
85 if (numlock_state || (ev.state & ModNumLockMask)) 322 if (numlock_state || (ev.state & ModNumLockMask))
86 { 323 {
87 numlock_state = (ev.state & ModNumLockMask); 324 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 325 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
108 345
109 // the XOpenIM manpage lies about hardcoding the locale 346 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 347 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 348 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 349 SET_LOCALE (rs[Rs_imLocale]);
350
113 // assume wchar_t == unicode or better 351 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 352 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 353 KBUFSZ, &keysym, &status_return);
354
116 if (rs[Rs_imLocale]) 355 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 356 SET_LOCALE (locale);
118 357
119 if (status_return == XLookupChars 358 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 359 || status_return == XLookupBoth)
… …
147 valid_keysym = keysym != NoSymbol; 386 valid_keysym = keysym != NoSymbol;
148 } 387 }
149 388
150 if (valid_keysym) 389 if (valid_keysym)
151 { 390 {
391#ifdef KEYSYM_RESOURCE
392 if (keyboard->dispatch (this, keysym, ev.state))
393 return;
394#endif
395
152 if (TermWin.saveLines) 396 if (saveLines)
153 { 397 {
154#ifdef UNSHIFTED_SCROLLKEYS 398#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 399 if (!ctrl && !meta)
156 {
157#else 400#else
158 if (IS_SCROLL_MOD) 401 if (IS_SCROLL_MOD)
402#endif
159 { 403 {
160#endif
161 int lnsppg; 404 int lnsppg;
162 405
163#ifdef PAGING_CONTEXT_LINES 406#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 407 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 408#else
166 lnsppg = TermWin.nrow * 4 / 5; 409 lnsppg = nrow * 4 / 5;
167#endif 410#endif
168 if (keysym == XK_Prior) 411 if (keysym == XK_Prior)
169 { 412 {
170 scr_page (UP, lnsppg); 413 scr_page (UP, lnsppg);
171 return; 414 return;
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 457 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 458 {
216 keysym += (XK_F11 - XK_F1); 459 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 460 shft = 0; /* turn off Shift */
218 } 461 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 462 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 463 {
221 switch (keysym) 464 switch (keysym)
222 { 465 {
223 /* normal XTerm key bindings */ 466 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 467 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 468 selection_request (ev.time, 0, 0);
226 return; 469 return;
470#if TODO
227 /* rxvt extras */ 471 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 472 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 473 change_font (FONT_UP);
230 return; 474 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 475 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 476 change_font (FONT_DN);
233 return; 477 return;
478#endif
234 } 479 }
235 } 480 }
236 } 481 }
237#ifdef PRINTPIPE 482
238 if (keysym == XK_Print) 483#if ENABLE_FRILLS || ISO_14755
239 { 484 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 485 if (shft && ctrl)
241 return;
242 } 486 {
243#endif 487 int hv;
244 488
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 489 if (iso14755buf & ISO_14755_51
246 { 490 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 491 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 492 {
250 unsigned int l; 493 commit_iso14755 ();
251 const unsigned char *kbuf0; 494 iso14755buf = ISO_14755_51;
252 495# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 496 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 497# endif
261 ) 498 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 499 }
266 500 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 501 {
502 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
503 | hv | ISO_14755_51;
504# if ISO_14755
505 iso14755_51 (iso14755buf & ISO_14755_MASK);
506# endif
268 return; 507 return;
269 } 508 }
270 else 509 else
510 {
511# if ENABLE_OVERLAY
512 scr_overlay_off ();
271#endif 513# endif
514 iso14755buf = 0;
515 }
516 }
517 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
518 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
519 if (!(iso14755buf & ISO_14755_STARTED))
520 {
521 iso14755buf |= ISO_14755_STARTED;
522# if ENABLE_OVERLAY
523 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
524 scr_overlay_set (0, 0, "ISO 14755 mode");
525# endif
526 }
527#endif
528
529#ifdef PRINTPIPE
530 if (keysym == XK_Print)
531 {
532 scr_printscreen (ctrl | shft);
533 return;
534 }
535#endif
536
537 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
538 {
272 { 539 {
273 newlen = 1; 540 newlen = 1;
274 switch (keysym) 541 switch (keysym)
275 { 542 {
276#ifndef NO_BACKSPACE_KEY 543#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 544 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 545 if (priv_modes & PrivMode_HaveBackSpace)
279 { 546 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 547 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 548 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 549 kbuf[1] = '\0';
283 } 550 }
284 else 551 else
285 STRCPY (kbuf, key_backspace); 552 strcpy (kbuf, key_backspace);
286 break; 553 break;
287#endif 554#endif
288#ifndef NO_DELETE_KEY 555#ifndef NO_DELETE_KEY
556# ifdef XK_KP_Prior
557 case XK_KP_Delete:
558 /* allow shift to override */
559 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
560 {
561 strcpy (kbuf, "\033On");
562 break;
563 }
564 /* FALLTHROUGH */
565# endif
289 case XK_Delete: 566 case XK_Delete:
290 STRCPY (kbuf, key_delete); 567 strcpy (kbuf, key_delete);
291 break; 568 break;
292#endif 569#endif
293 case XK_Tab: 570 case XK_Tab:
294 if (shft) 571 if (shft)
295 STRCPY (kbuf, "\033[Z"); 572 strcpy (kbuf, "\033[Z");
296 else 573 else
297 { 574 {
298#ifdef CTRL_TAB_MAKES_META 575#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 576 if (ctrl)
300 meta = 1; 577 meta = 1;
… …
306 newlen = 0; 583 newlen = 0;
307 } 584 }
308 break; 585 break;
309 586
310#ifdef XK_KP_Left 587#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 588 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 589 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 590 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 591 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 592 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 593 {
317 STRCPY (kbuf, "\033OZ"); 594 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 595 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 596 break;
320 } 597 }
321 else 598 else
322 /* translate to std. cursor key */ 599 /* translate to std. cursor key */
… …
325#endif 602#endif
326 case XK_Up: /* "\033[A" */ 603 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 604 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 605 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 606 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 607 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 608 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 609 /* do Shift first */
333 if (shft) 610 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 611 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 612 else if (ctrl)
336 { 613 {
337 kbuf[1] = 'O'; 614 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 615 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 616 }
340 else if (PrivateModes & PrivMode_aplCUR) 617 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 618 kbuf[1] = 'O';
342 break; 619 break;
343 620
344#ifndef UNSHIFTED_SCROLLKEYS 621#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 622# ifdef XK_KP_Prior
346 case XK_KP_Prior: 623 case XK_KP_Prior:
347 /* allow shift to override */ 624 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 625 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 626 {
350 STRCPY (kbuf, "\033Oy"); 627 strcpy (kbuf, "\033Oy");
351 break; 628 break;
352 } 629 }
353 /* FALLTHROUGH */ 630 /* FALLTHROUGH */
354# endif 631# endif
355 case XK_Prior: 632 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 633 strcpy (kbuf, "\033[5~");
357 break; 634 break;
358# ifdef XK_KP_Next 635# ifdef XK_KP_Next
359 case XK_KP_Next: 636 case XK_KP_Next:
360 /* allow shift to override */ 637 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 639 {
363 STRCPY (kbuf, "\033Os"); 640 strcpy (kbuf, "\033Os");
364 break; 641 break;
365 } 642 }
366 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
367# endif 644# endif
368 case XK_Next: 645 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 646 strcpy (kbuf, "\033[6~");
370 break; 647 break;
371#endif 648#endif
372 case XK_KP_Enter: 649 case XK_KP_Enter:
373 /* allow shift to override */ 650 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 652 {
376 STRCPY (kbuf, "\033OM"); 653 strcpy (kbuf, "\033OM");
654 break;
655 }
656
657 /* FALLTHROUGH */
658
659 case XK_Return:
660 if (priv_modes & PrivMode_LFNL)
661 {
662 kbuf[0] = '\015';
663 kbuf[1] = '\012';
664 kbuf[2] = '\0';
377 } 665 }
378 else 666 else
379 { 667 {
380 kbuf[0] = '\r'; 668 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 669 kbuf[1] = '\0';
382 } 670 }
383 break; 671 break;
384 672
385#ifdef XK_KP_Begin 673#ifdef XK_KP_Begin
386 case XK_KP_Begin: 674 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 675 strcpy (kbuf, "\033Ou");
388 break; 676 break;
389 677
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 678#endif
398 case XK_KP_F1: /* "\033OP" */ 679 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 680 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 681 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 682 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 683 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 684 kbuf[2] += (keysym - XK_KP_F1);
404 break; 685 break;
405 686
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 687 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 688 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 699 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 700 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 701 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 702 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 703 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 704 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 705 {
425 STRCPY (kbuf, "\033Oj"); 706 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 707 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 708 }
428 else 709 else
429 { 710 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 711 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 712 kbuf[1] = '\0';
432 } 713 }
433 break; 714 break;
434 715
435 case XK_Find: 716 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 717 strcpy (kbuf, "\033[1~");
437 break; 718 break;
719
720#ifdef XK_KP_End
721 case XK_KP_Insert:
722 /* allow shift to override */
723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
724 {
725 strcpy (kbuf, "\033Op");
726 break;
727 }
728 /* FALLTHROUGH */
729#endif
438 case XK_Insert: 730 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 731 strcpy (kbuf, "\033[2~");
440 break; 732 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 733#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 734 case DXK_Remove:
443 /* FALLTHROUGH */ 735 /* FALLTHROUGH */
444#endif 736#endif
445 case XK_Execute: 737 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 738 strcpy (kbuf, "\033[3~");
447 break; 739 break;
448 case XK_Select: 740 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 741 strcpy (kbuf, "\033[4~");
450 break; 742 break;
451#ifdef XK_KP_End 743#ifdef XK_KP_End
452 case XK_KP_End: 744 case XK_KP_End:
453 /* allow shift to override */ 745 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 746 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 747 {
456 STRCPY (kbuf, "\033Oq"); 748 strcpy (kbuf, "\033Oq");
457 break; 749 break;
458 } 750 }
459 /* FALLTHROUGH */ 751 /* FALLTHROUGH */
460#endif 752#endif
461 case XK_End: 753 case XK_End:
462 STRCPY (kbuf, KS_END); 754 strcpy (kbuf, KS_END);
463 break; 755 break;
464#ifdef XK_KP_Home 756#ifdef XK_KP_Home
465 case XK_KP_Home: 757 case XK_KP_Home:
466 /* allow shift to override */ 758 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 760 {
469 STRCPY (kbuf, "\033Ow"); 761 strcpy (kbuf, "\033Ow");
470 break; 762 break;
471 } 763 }
472 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
473#endif 765#endif
474 case XK_Home: 766 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 767 strcpy (kbuf, KS_HOME);
476 break; 768 break;
477 769
478#define FKEY(n, fkey) \ 770#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 771 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 772
… …
532#undef FKEY 824#undef FKEY
533 default: 825 default:
534 newlen = 0; 826 newlen = 0;
535 break; 827 break;
536 } 828 }
829
537 if (newlen) 830 if (newlen)
538 len = STRLEN (kbuf); 831 len = strlen (kbuf);
539 } 832 }
540 833
541 /* 834 /*
542 * Pass meta for all function keys, if 'meta' option set 835 * Pass meta for all function keys, if 'meta' option set
543 */ 836 */
… …
550 else if (ctrl && keysym == XK_minus) 843 else if (ctrl && keysym == XK_minus)
551 { 844 {
552 len = 1; 845 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 846 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 847 }
848 else if (keysym == XK_ISO_Left_Tab)
849 {
850 strcpy (kbuf, "\033[Z");
851 len = 3;
852 }
555 else 853 else
556 { 854 {
557#ifdef META8_OPTION 855#ifdef META8_OPTION
558 /* set 8-bit on */ 856 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 857 if (meta && (meta_char == 0x80))
… …
571 } 869 }
572 870
573 if (len <= 0) 871 if (len <= 0)
574 return; /* not mapped */ 872 return; /* not mapped */
575 873
576 if (Options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 875 if (view_start)
578 { 876 {
579 TermWin.view_start = 0; 877 view_start = 0;
580 want_refresh = 1; 878 want_refresh = 1;
581 } 879 }
582 880
583 /* 881 /*
584 * these modifications only affect the static keybuffer 882 * these modifications only affect the static keybuffer
… …
617#endif /* DEBUG_CMD */ 915#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 916 tt_write (kbuf, (unsigned int)len);
619} 917}
620/*}}} */ 918/*}}} */
621 919
622#if (MENUBAR_MAX) 920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 922/* attempt to `write' count to the input buffer */
625unsigned int 923unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 924rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 925{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 928 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 930
633 if (n > 0 && s < count) 931 if (n > 0 && s < count)
634 { 932 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 933 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 934 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 935 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 936 cmdbuf_endp -= n;
639 s += n; 937 s += n;
640 } 938 }
… …
650 948
651 cmd_parse (); 949 cmd_parse ();
652 950
653 return 0; 951 return 0;
654} 952}
655#endif /* MENUBAR_MAX */ 953#endif
656 954
657void 955void
658rxvt_term::flush () 956rxvt_term::flush ()
659{ 957{
958 flush_ev.stop ();
959
660#ifdef TRANSPARENT 960#ifdef TRANSPARENT
661 if (want_full_refresh) 961 if (want_full_refresh)
662 { 962 {
663 want_full_refresh = 0; 963 want_full_refresh = 0;
664 scr_clear (); 964 scr_clear ();
665 scr_touch (false); 965 scr_touch (false);
666 want_refresh = 1;
667 } 966 }
668#endif 967#endif
669 968
670 if (want_refresh) 969 if (want_refresh)
671 { 970 {
… …
675 IMSendSpot (); 974 IMSendSpot ();
676#endif 975#endif
677 } 976 }
678 977
679 display->flush (); 978 display->flush ();
680
681 flush_ev.stop ();
682} 979}
683 980
684void 981void
685rxvt_term::check_cb (check_watcher &w) 982rxvt_term::check_cb (check_watcher &w)
686{ 983{
687 SET_R (this); 984 SET_R (this);
688 SET_LOCALE (locale); 985 SET_LOCALE (locale);
689 986
690 display->flush (); 987 display->flush ();
691 988
692 if (!flush_ev.active) 989 if (want_refresh && !flush_ev.active)
693 flush_ev.start (NOW + 0.01); 990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
694} 991}
695 992
696void 993void
697rxvt_term::flush_cb (time_watcher &w) 994rxvt_term::flush_cb (time_watcher &w)
698{ 995{
… …
762{ 1059{
763 if (mouse_slip_wheel_speed == 0 1060 if (mouse_slip_wheel_speed == 0
764 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
765 : scr_page (UP, mouse_slip_wheel_speed)) 1062 : scr_page (UP, mouse_slip_wheel_speed))
766 { 1063 {
1064 if (view_start == nsaved ||
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0;
1067
767 refresh_type |= SMOOTH_REFRESH; 1068 refresh_type |= SMOOTH_REFRESH;
768 want_refresh = 1; 1069 want_refresh = 1;
769 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
770 } 1071 }
771} 1072}
772#endif 1073#endif
773 1074
1075#if HAVE_SCHED_YIELD
1076static struct event_handler
1077{
1078 check_watcher cw_yield;
1079
1080 void yield (check_watcher &w)
1081 {
1082 sched_yield ();
1083 w.stop ();
1084 }
1085
1086 event_handler ()
1087 : cw_yield (this, &event_handler::yield)
1088 {
1089 }
1090} event_handler;
1091#endif
1092
774bool 1093bool
775rxvt_term::pty_fill () 1094rxvt_term::pty_fill ()
776{ 1095{
777 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
778 1097
… …
784 1103
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 1104 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 1105 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 1106 cmdbuf_endp = cmdbuf_ptr + n;
788 1107
789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
790 1109
791 if (n > 0) 1110 if (r > 0)
792 { 1111 {
793 cmdbuf_endp += n; 1112 cmdbuf_endp += r;
794 return true; 1113 return true;
795 } 1114 }
796 else if (n < 0 && errno != EAGAIN) 1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 {
1117#if HAVE_SCHED_YIELD
1118 if (display->is_local)
1119 event_handler.cw_yield.start ();
1120#endif
1121 }
1122 else
1123 {
1124 pty_ev.stop ();
1125
1126 if (!OPTION (Opt_hold))
797 destroy (); 1127 destroy ();
1128 }
798 1129
799 return false; 1130 return false;
800} 1131}
801 1132
802void 1133void
803rxvt_term::pty_cb (io_watcher &w, short revents) 1134rxvt_term::pty_cb (io_watcher &w, short revents)
804{ 1135{
805 SET_R (this); 1136 SET_R (this);
806 SET_LOCALE (locale); 1137 SET_LOCALE (locale);
807 1138
808 if (revents & EVENT_WRITE)
809 tt_write (0, 0);
810 else if (revents & EVENT_READ) 1139 if (revents & EVENT_READ)
811 // loop, but don't allow a single term to monopolize us 1140 // loop, but don't allow a single term to monopolize us
812 while (pty_fill ()) 1141 while (pty_fill ())
813 if (cmd_parse ()) 1142 if (cmd_parse ())
814 break; 1143 break;
1144
1145 if (revents & EVENT_WRITE)
1146 pty_write ();
815} 1147}
816 1148
817void 1149void
818rxvt_term::pointer_unblank () 1150rxvt_term::pointer_unblank ()
819{ 1151{
820 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1152 XDefineCursor (display->display, vt, TermWin_cursor);
821 recolour_cursor (); 1153 recolour_cursor ();
822 1154
823#ifdef POINTER_BLANK 1155#ifdef POINTER_BLANK
824 hidden_pointer = 0; 1156 hidden_pointer = 0;
825 1157
826 if (Options & Opt_pointerBlank) 1158 if (OPTION (Opt_pointerBlank))
827 pointer_ev.start (NOW + pointerBlankDelay); 1159 pointer_ev.start (NOW + pointerBlankDelay);
828#endif 1160#endif
829} 1161}
830 1162
831#ifdef POINTER_BLANK 1163#ifdef POINTER_BLANK
832void 1164void
833rxvt_term::pointer_blank () 1165rxvt_term::pointer_blank ()
834{ 1166{
835 if (! (Options & Opt_pointerBlank)) 1167 if (! OPTION (Opt_pointerBlank))
836 return; 1168 return;
837 1169
838 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1170 XDefineCursor (display->display, vt, display->blank_cursor);
839 XFlush (display->display); 1171 XFlush (display->display);
840 1172
841 hidden_pointer = 1; 1173 hidden_pointer = 1;
842} 1174}
843 1175
… …
860 x = ev.x; 1192 x = ev.x;
861 y = ev.y; 1193 y = ev.y;
862 pixel_position (&x, &y); 1194 pixel_position (&x, &y);
863 1195
864 if (MEvent.button == AnyButton) 1196 if (MEvent.button == AnyButton)
865 {
866 button_number = 3; 1197 button_number = 3;
867 }
868 else 1198 else
869 { 1199 {
870 button_number = MEvent.button - Button1; 1200 button_number = MEvent.button - Button1;
871 /* add 0x3D for wheel events, like xterm does */ 1201 /* add 0x3D for wheel events, like xterm does */
872 if (button_number >= 3) 1202 if (button_number >= 3)
873 button_number += (64 - 3); 1203 button_number += (64 - 3);
874 } 1204 }
875 1205
876 if (PrivateModes & PrivMode_MouseX10) 1206 if (priv_modes & PrivMode_MouseX10)
877 { 1207 {
878 /* 1208 /*
879 * do not report ButtonRelease 1209 * do not report ButtonRelease
880 * no state info allowed 1210 * no state info allowed
881 */ 1211 */
… …
896 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1226 + ((MEvent.state & ModMetaMask) ? 8 : 0)
897 + ((MEvent.state & ControlMask) ? 16 : 0); 1227 + ((MEvent.state & ControlMask) ? 16 : 0);
898#ifdef MOUSE_REPORT_DOUBLECLICK 1228#ifdef MOUSE_REPORT_DOUBLECLICK
899 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1229 key_state += ((MEvent.clicks > 1) ? 32 : 0);
900#endif 1230#endif
901
902 } 1231 }
903 1232
904#ifdef DEBUG_MOUSEREPORT 1233#if DEBUG_MOUSEREPORT
905 fprintf (stderr, "Mouse ["); 1234 fprintf (stderr, "Mouse [");
906 if (key_state & 16) 1235 if (key_state & 16)
907 fputc ('C', stderr); 1236 fputc ('C', stderr);
908 if (key_state & 4) 1237 if (key_state & 4)
909 fputc ('S', stderr); 1238 fputc ('S', stderr);
… …
913 fputc ('2', stderr); 1242 fputc ('2', stderr);
914 fprintf (stderr, "]: <%d>, %d/%d\n", 1243 fprintf (stderr, "]: <%d>, %d/%d\n",
915 button_number, 1244 button_number,
916 x + 1, 1245 x + 1,
917 y + 1); 1246 y + 1);
918#else 1247#endif
1248
919 tt_printf ("\033[M%c%c%c", 1249 tt_printf ("\033[M%c%c%c",
920 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
921 (32 + x + 1), 1251 (32 + x + 1),
922 (32 + y + 1)); 1252 (32 + y + 1));
923#endif
924} 1253}
925 1254
926#ifdef USING_W11LIB 1255#ifdef USING_W11LIB
927void 1256void
928rxvt_W11_process_x_event (XEvent *ev) 1257rxvt_W11_process_x_event (XEvent *ev)
… …
935 1264
936/*{{{ process an X event */ 1265/*{{{ process an X event */
937void 1266void
938rxvt_term::x_cb (XEvent &ev) 1267rxvt_term::x_cb (XEvent &ev)
939{ 1268{
1269 dDisp;
1270
940 SET_R (this); 1271 SET_R (this);
941 SET_LOCALE (locale); 1272 SET_LOCALE (locale);
942 1273
943#if defined(CURSOR_BLINK) 1274#if defined(CURSOR_BLINK)
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
945 { 1276 {
946 if (hidden_cursor) 1277 if (hidden_cursor)
947 { 1278 {
948 hidden_cursor = 0; 1279 hidden_cursor = 0;
949 want_refresh = 1; 1280 want_refresh = 1;
… …
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
953 } 1284 }
954#endif 1285#endif
955 1286
956#if defined(POINTER_BLANK) 1287#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
958 { 1289 {
959 if (ev.type == MotionNotify 1290 if (ev.type == MotionNotify
960 || ev.type == ButtonPress 1291 || ev.type == ButtonPress
961 || ev.type == ButtonRelease) 1292 || ev.type == ButtonRelease)
962 if (hidden_pointer) 1293 if (hidden_pointer)
… …
965 if (ev.type == KeyPress && hidden_pointer == 0) 1296 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank (); 1297 pointer_blank ();
967 } 1298 }
968#endif 1299#endif
969 1300
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return;
973#endif
974
975 Window unused_root, unused_child; 1301 Window unused_root, unused_child;
976 int unused_root_x, unused_root_y; 1302 int unused_root_x, unused_root_y;
977 unsigned int unused_mask; 1303 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 1304
1028 switch (ev.type) 1305 switch (ev.type)
1029 { 1306 {
1030 case KeyPress: 1307 case KeyPress:
1308#if ISO_14755
1309 if (!(iso14755buf & ISO_14755_52))
1310#endif
1031 lookup_key (ev.xkey); 1311 lookup_key (ev.xkey);
1312
1313 break;
1314
1315 case KeyRelease:
1316 {
1317#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1318 KeySym ks;
1319
1320 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1321#endif
1322
1323#if ENABLE_FRILLS || ISO_14755
1324 // ISO 14755 support
1325 if (iso14755buf)
1326 if (iso14755buf & ISO_14755_52)
1327 {
1328# if ENABLE_OVERLAY
1329 scr_overlay_off ();
1330# endif
1331# if ISO_14755
1332 // iso14755 part 5.2 handling: release time
1333 // first: controls
1334 if ((ev.xkey.state & ControlMask)
1335 && ((ks >= 0x40 && ks <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f)))
1337 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1339 commit_iso14755 ();
1340 return; // case-break;
1341 }
1342
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks)
1345 {
1346 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 ();
1348 return; // case-break;
1349 }
1350
1351 scr_bell ();
1352# endif
1353 iso14755buf = 0;
1032 break; 1354 break;
1355 }
1356 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1357 {
1358# if ENABLE_OVERLAY
1359 scr_overlay_off ();
1360# endif
1361 if (iso14755buf & ISO_14755_51)
1362 commit_iso14755 ();
1363#if ISO_14755
1364 else if (iso14755buf & ISO_14755_STARTED)
1365 {
1366 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1367
1368 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1369 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1370 }
1371# endif
1372 else
1373 iso14755buf = 0;
1374 }
1375#endif
1033 1376
1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1035 case KeyRelease:
1036 {
1037 if (!(ev.xkey.state & ControlMask)) 1378 if (!(ev.xkey.state & ControlMask))
1038 slip_wheel_ev.stop (); 1379 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) 1380 else if (ks == XK_Control_L || ks == XK_Control_R)
1045 mouse_slip_wheel_speed = 0; 1381 mouse_slip_wheel_speed = 0;
1046 } 1382#endif
1047 break; 1383 break;
1048 } 1384 }
1049#endif
1050 1385
1051 case ButtonPress: 1386 case ButtonPress:
1052 button_press (ev.xbutton); 1387 button_press (ev.xbutton);
1053 break; 1388 break;
1054 1389
… …
1056 button_release (ev.xbutton); 1391 button_release (ev.xbutton);
1057 break; 1392 break;
1058 1393
1059 case ClientMessage: 1394 case ClientMessage:
1060 if (ev.xclient.format == 32 1395 if (ev.xclient.format == 32
1396 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1397 {
1061 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1398 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1062 destroy (); 1399 destroy ();
1400#if ENABLE_EWMH
1401 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1402 XSendEvent (disp, ev.xclient.window = display->root,
1403 False, SubstructureRedirectMask | SubstructureNotifyMask,
1404 &ev);
1405#endif
1406 }
1407#if ENABLE_XEMBED
1408 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1409 {
1410 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1411 focus_in ();
1412 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1413 focus_out ();
1414 }
1415#endif
1063#ifdef OFFIX_DND 1416#ifdef OFFIX_DND
1064 /* OffiX Dnd (drag 'n' drop) protocol */ 1417 /* OffiX Dnd (drag 'n' drop) protocol */
1065 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1418 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1066 && (ev.xclient.data.l[0] == DndFile 1419 && (ev.xclient.data.l[0] == DndFile
1067 || ev.xclient.data.l[0] == DndDir 1420 || ev.xclient.data.l[0] == DndDir
1068 || ev.xclient.data.l[0] == DndLink)) 1421 || ev.xclient.data.l[0] == DndLink))
1069 { 1422 {
1070 /* Get Dnd data */ 1423 /* Get Dnd data */
1071 Atom ActualType; 1424 Atom ActualType;
1072 int ActualFormat; 1425 int ActualFormat;
1073 unsigned char *data; 1426 unsigned char *data;
1074 unsigned long Size, RemainingBytes; 1427 unsigned long Size, RemainingBytes;
1075 1428
1076 XGetWindowProperty (display->display, display->root, 1429 XGetWindowProperty (disp, display->root,
1077 xa[XA_DNDSELECTION], 1430 xa[XA_DNDSELECTION],
1078 0L, 1000000L, 1431 0L, 1000000L,
1079 False, AnyPropertyType, 1432 False, AnyPropertyType,
1080 &ActualType, &ActualFormat, 1433 &ActualType, &ActualFormat,
1081 &Size, &RemainingBytes, 1434 &Size, &RemainingBytes,
1082 &data); 1435 &data);
1083 XChangeProperty (display->display, display->root, 1436 set_string_property (XA_CUT_BUFFER0, data);
1084 XA_CUT_BUFFER0, XA_STRING,
1085 8, PropModeReplace,
1086 data, STRLEN (data));
1087 XFree (data); 1437 XFree (data);
1088 selection_paste (display->root, XA_CUT_BUFFER0, True); 1438 selection_paste (display->root, XA_CUT_BUFFER0, true);
1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1439 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1090 } 1440 }
1091#endif /* OFFIX_DND */ 1441#endif /* OFFIX_DND */
1092 break; 1442 break;
1093 1443
1094 case MappingNotify: 1444 case MappingNotify:
… …
1119 break; 1469 break;
1120 } 1470 }
1121 break; 1471 break;
1122 1472
1123 case FocusIn: 1473 case FocusIn:
1124 if (!TermWin.focus) 1474 focus_in ();
1475 break;
1476
1477 case FocusOut:
1478 focus_out ();
1479 break;
1480
1481 case ConfigureNotify:
1482 if (ev.xconfigure.window == parent[0])
1125 { 1483 {
1126 TermWin.focus = 1; 1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1127 want_refresh = 1; 1485 ;
1128#ifdef USE_XIM 1486
1129 if (Input_Context != NULL) 1487 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 { 1488 {
1139 PixColors = PixColorsFocused; 1489 seen_resize = 1;
1140 set_colorfgbg (); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1141 scr_clear ();
1142 scr_touch (true);
1143 } 1491 }
1144#endif
1145 1492
1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1494 if (OPTION (Opt_transparent))
1495 check_our_parents ();
1496#endif
1146 } 1497 }
1147 break; 1498 break;
1148 1499
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: 1500 case PropertyNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1501 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1178 { 1502 && ev.xproperty.state == PropertyNewValue)
1179 int height, width; 1503 selection_property (ev.xproperty.window, ev.xproperty.atom);
1180 1504
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; 1505 break;
1202 1506
1203 case SelectionClear: 1507 case SelectionClear:
1204 selection_clear (); 1508 selection_clear ();
1205 break; 1509 break;
1206 1510
1207 case SelectionNotify: 1511 case SelectionNotify:
1208 if (selection_wait == Sel_normal) 1512 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor, 1513 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1210 ev.xselection.property, True);
1211 break; 1514 break;
1212 1515
1213 case SelectionRequest: 1516 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1517 selection_send (ev.xselectionrequest);
1215 break; 1518 break;
1216 1519
1217 case UnmapNotify: 1520 case UnmapNotify:
1218 TermWin.mapped = 0; 1521 mapped = 0;
1219#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1220 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1221#endif 1524#endif
1222 break; 1525 break;
1223 1526
1224 case MapNotify: 1527 case MapNotify:
1225 TermWin.mapped = 1; 1528 mapped = 1;
1226#ifdef TEXT_BLINK 1529#ifdef TEXT_BLINK
1227 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1228#endif 1531#endif
1229 break; 1532 break;
1230 1533
… …
1234 break; 1537 break;
1235#endif /* TRANSPARENT */ 1538#endif /* TRANSPARENT */
1236 1539
1237 case GraphicsExpose: 1540 case GraphicsExpose:
1238 case Expose: 1541 case Expose:
1239 if (ev.xany.window == TermWin.vt) 1542 if (ev.xany.window == vt)
1240 { 1543 {
1241 do 1544 do
1242 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1243 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1245 1548
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247 1550
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1249 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1250 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1251 1554
1252 scr_refresh (refresh_type); 1555 scr_refresh (refresh_type);
1253 } 1556 }
1254 else 1557 else
1255 { 1558 {
1256 XEvent unused_event; 1559 XEvent unused_event;
1257 1560
1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1259 ; 1562 ;
1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1261 ; 1564 ;
1262 1565
1263 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1264 { 1567 {
1265 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
… …
1269 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1270 menubar_expose (); 1573 menubar_expose ();
1271#endif 1574#endif
1272 1575
1273#ifdef TRANSPARENT 1576#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1577 if (am_transparent && ev.xany.window == parent[0])
1275 XClearWindow (display->display, ev.xany.window); 1578 XClearWindow (disp, ev.xany.window);
1276#endif 1579#endif
1277 } 1580 }
1278 break; 1581 break;
1279 1582
1280 case MotionNotify: 1583 case MotionNotify:
… …
1287 { 1590 {
1288 menubar_control (ev.xbutton); 1591 menubar_control (ev.xbutton);
1289 break; 1592 break;
1290 } 1593 }
1291#endif 1594#endif
1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1293 break; 1596 break;
1294 1597
1295 if (ev.xany.window == TermWin.vt) 1598 if (ev.xany.window == vt)
1296 { 1599 {
1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1600 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1601 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1300 ; 1603 ;
1301 1604
1302 XQueryPointer (display->display, TermWin.vt, 1605 XQueryPointer (disp, vt,
1303 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1608 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1609 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1613 {
1311#endif 1614#endif
1615#if ISO_14755
1616 // 5.4
1617 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1618 {
1619 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1620 break;
1621 }
1622#endif
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1623 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1624 ev.xbutton.state & Button3Mask ? 2 : 0);
1625
1314#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1317 { 1629 {
1318 int dist; 1630 int dist;
1319 1631
1320 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1321 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
… …
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1325 1637
1326 /* save the event params so we can highlight 1638 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1639 * the selection in the pending-scroll loop
1328 */ 1640 */
1329 selection_save_x=ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1642 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1643 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1644
1334 /* calc number of lines to scroll */ 1645 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1646 if (ev.xbutton.y < int_bwidth)
1336 { 1647 {
1337 scroll_selection_dir = UP; 1648 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1339 } 1650 }
1340 else 1651 else
1341 { 1652 {
1342 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y - 1654 dist = ev.xbutton.y - (int_bwidth + height);
1344 (TermWin.int_bwidth + TermWin.height);
1345 } 1655 }
1656
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1657 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1659 + 1;
1348 MIN_IT (scroll_selection_lines, 1660 min_it (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1661 SELECTION_SCROLL_MAX_LINES);
1350 } 1662 }
1351 else 1663 else
1352 { 1664 {
1353 /* we are within the text window, so we 1665 /* we are within the text window, so we
1354 * shouldn't be scrolling 1666 * shouldn't be scrolling
… …
1356 if (sel_scroll_ev.active) 1668 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1669 sel_scroll_ev.stop();
1358 } 1670 }
1359#endif 1671#endif
1360#ifdef MOUSE_THRESHOLD 1672#ifdef MOUSE_THRESHOLD
1361
1362 } 1673 }
1363#endif 1674#endif
1364
1365 } 1675 }
1366 } 1676 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1368 { 1678 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1679 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1370 MotionNotify, &ev)) ; 1680 MotionNotify, &ev))
1681 ;
1682
1371 XQueryPointer (display->display, scrollBar.win, 1683 XQueryPointer (disp, scrollBar.win,
1372 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1686 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1687 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1689 scrollbar_size ());
1378 scr_refresh (refresh_type); 1690 scr_refresh (refresh_type);
1379 refresh_limit = 0; 1691 refresh_limit = 0;
… …
1382 break; 1694 break;
1383 } 1695 }
1384} 1696}
1385 1697
1386void 1698void
1699rxvt_term::focus_in ()
1700{
1701 if (!focus)
1702 {
1703 focus = 1;
1704 want_refresh = 1;
1705
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707
1708#if USE_XIM
1709 if (Input_Context != NULL)
1710 {
1711 IMSetStatusPosition ();
1712 XSetICFocus (Input_Context);
1713 }
1714#endif
1715#if CURSOR_BLINK
1716 if (OPTION (Opt_cursorBlink))
1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1718#endif
1719#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade])
1721 {
1722 pix_colors = pix_colors_focused;
1723 scr_recolour ();
1724 }
1725#endif
1726 }
1727}
1728
1729void
1730rxvt_term::focus_out ()
1731{
1732 if (focus)
1733 {
1734 focus = 0;
1735 want_refresh = 1;
1736
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738
1739#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf)
1741 {
1742 iso14755buf = 0;
1743# if ENABLE_OVERLAY
1744 scr_overlay_off ();
1745# endif
1746 }
1747#endif
1748#if USE_XIM
1749 if (Input_Context != NULL)
1750 XUnsetICFocus (Input_Context);
1751#endif
1752#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink))
1754 cursor_blink_ev.stop ();
1755 hidden_cursor = 0;
1756#endif
1757#if OFF_FOCUS_FADING
1758 if (rs[Rs_fade])
1759 {
1760 pix_colors = pix_colors_unfocused;
1761 scr_recolour ();
1762 }
1763#endif
1764 }
1765}
1766
1767#if TRANSPARENT
1768void
1387rxvt_term::rootwin_cb (XEvent &ev) 1769rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1770{
1389 SET_R (this); 1771 SET_R (this);
1390 SET_LOCALE (locale); 1772 SET_LOCALE (locale);
1391 1773
1392 switch (ev.type) 1774 switch (ev.type)
1393 { 1775 {
1394 case PropertyNotify: 1776 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 /* 1777 /*
1405 * if user used some Esetroot compatible prog to set the root bg, 1778 * 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. 1779 * use the property to determine the pixmap. We use it later on.
1407 */ 1780 */
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]) 1781 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1782 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1412 return; 1783 return;
1413 }
1414 1784
1415 /* FALLTHROUGH */ 1785 /* FALLTHROUGH */
1416 case ReparentNotify: 1786 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1; 1788 want_refresh = want_full_refresh = 1;
1419 break; 1789 break;
1420#endif
1421 } 1790 }
1422} 1791}
1792#endif
1423 1793
1424void 1794void
1425rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
1426{ 1796{
1427 int reportmode = 0, clickintime; 1797 int reportmode = 0, clickintime;
1428 1798
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1800
1430 if (!bypass_keystate) 1801 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1802 reportmode = !! (priv_modes & PrivMode_mouse_report);
1803
1432 /* 1804 /*
1433 * VT window processing of button press 1805 * VT window processing of button press
1434 */ 1806 */
1435 if (ev.window == TermWin.vt) 1807 if (ev.window == vt)
1436 { 1808 {
1809#if ISO_14755
1810 // 5.4
1811 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1812 {
1813 iso14755_54 (ev.x, ev.y);
1814 return;
1815 }
1816#endif
1817
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1818 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1819
1438 if (reportmode) 1820 if (reportmode)
1439 { 1821 {
1440 /* mouse report from vt window */ 1822 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1823 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1824 MEvent.state = ev.state;
… …
1471 } 1853 }
1472 else 1854 else
1473 { 1855 {
1474 if (ev.button != MEvent.button) 1856 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1857 MEvent.clicks = 0;
1858
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1476 switch (ev.button) 1860 switch (ev.button)
1477 { 1861 {
1478 case Button1: 1862 case Button1:
1863 /* allow meta + click to select rectangular areas */
1864 /* should be done in screen.C */
1865#if ENABLE_FRILLS
1866 selection.rect = !!(ev.state & ModMetaMask);
1867#else
1868 selection.rect = false;
1869#endif
1870
1479 /* allow shift+left click to extend selection */ 1871 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1481 { 1873 {
1482 if (MEvent.button == Button1 && clickintime) 1874 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1875 selection_rotate (ev.x, ev.y);
1484 else 1876 else
1485 selection_extend (ev.x, ev.y, 1); 1877 selection_extend (ev.x, ev.y, 1);
1486 } 1878 }
1487 else 1879 else
1488 { 1880 {
1489 if (MEvent.button == Button1 && clickintime) 1881 if (MEvent.button == Button1 && clickintime)
1490 MEvent.clicks++; 1882 MEvent.clicks++;
1491 else 1883 else
1492 MEvent.clicks = 1; 1884 MEvent.clicks = 1;
1493 1885
1494 selection_click (MEvent.clicks, ev.x, ev.y); 1886 selection_click (MEvent.clicks, ev.x, ev.y);
1495 } 1887 }
1496 1888
1497 MEvent.button = Button1; 1889 MEvent.button = Button1;
1498 break; 1890 break;
1499 1891
1500 case Button3: 1892 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1893 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1894 selection_rotate (ev.x, ev.y);
1503 else 1895 else
1504 selection_extend (ev.x, ev.y, 1); 1896 selection_extend (ev.x, ev.y, 1);
1897
1505 MEvent.button = Button3; 1898 MEvent.button = Button3;
1506 break; 1899 break;
1507 } 1900 }
1508 } 1901 }
1902
1509 MEvent.time = ev.time; 1903 MEvent.time = ev.time;
1510 return; 1904 return;
1511 } 1905 }
1512 1906
1513 /* 1907 /*
… …
1605 break; 1999 break;
1606 case R_SB_ALIGN_BOTTOM: 2000 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 2001 csrO = scrollBar.bot - scrollBar.top;
1608 break; 2002 break;
1609 } 2003 }
2004
1610 if (scrollBar.style == R_SB_XTERM 2005 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y) 2006 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y)) 2007 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO, 2008 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1614 scrollbar_size ()); 2009
1615 scrollBar.setMotion (); 2010 scrollBar.setMotion ();
1616 break; 2011 break;
1617 2012
1618 case Button1: 2013 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2014 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1623 case Button3: 2018 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 2019 if (scrollBar.style != R_SB_XTERM)
1625 { 2020 {
1626 if (scrollbar_above_slider (ev.y)) 2021 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 2022# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 2023 scr_page (UP, nrow - 1);
1629# else 2024# else
1630 scr_page (UP, TermWin.nrow / 4); 2025 scr_page (UP, nrow / 4);
1631# endif 2026# endif
1632 else if (scrollbar_below_slider (ev.y)) 2027 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 2028# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 2029 scr_page (DN, nrow - 1);
1635# else 2030# else
1636 scr_page (DN, TermWin.nrow / 4); 2031 scr_page (DN, nrow / 4);
1637# endif 2032# endif
1638 else 2033 else
1639 scrollBar.setMotion (); 2034 scrollBar.setMotion ();
1640 } 2035 }
1641 else 2036 else
1642 { 2037 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 2038 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 2039 (nrow
1645 * scrollbar_position (ev.y) 2040 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 2041 / scrollbar_size ()));
1647 } 2042 }
2043
1648 break; 2044 break;
1649 } 2045 }
1650 } 2046 }
1651 return; 2047 return;
1652 } 2048 }
… …
1664{ 2060{
1665 int reportmode = 0; 2061 int reportmode = 0;
1666 2062
1667 csrO = 0; /* reset csr Offset */ 2063 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 2064 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2065 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 2066
1671 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
1672 { 2068 {
1673 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
1674 scrollbar_show (0); 2070 scrollbar_show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH; 2072 refresh_type &= ~SMOOTH_REFRESH;
1677#endif 2073#endif
1678
1679 } 2074 }
2075
1680#ifdef SELECTION_SCROLLING 2076#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active) 2077 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 2078 sel_scroll_ev.stop();
1683#endif 2079#endif
2080
1684 if (ev.window == TermWin.vt) 2081 if (ev.window == vt)
1685 { 2082 {
2083#if ISO_14755
2084 // 5.4
2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2086 return;
2087#endif
1686 if (reportmode) 2088 if (reportmode)
1687 { 2089 {
1688 /* mouse report from vt window */ 2090 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 2091 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 2092 if (ev.button >= 4)
… …
1704 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
1705 mouse_report (ev); 2107 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 2109 return;
1708 } 2110 }
2111
1709 /* 2112 /*
1710 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 2114 * when overriding mouse reporting
1712 */ 2115 */
1713 if (PrivateModes & PrivMode_mouse_report 2116 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2117 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2118 && ev.button == Button1 && MEvent.clicks <= 1)
1716 selection_extend (ev.x, ev.y, 0); 2119 selection_extend (ev.x, ev.y, 0);
1717 2120
1718 switch (ev.button) 2121 switch (ev.button)
… …
1733 2136
1734 v = ev.button == Button4 ? UP : DN; 2137 v = ev.button == Button4 ? UP : DN;
1735 2138
1736 if (ev.state & ShiftMask) 2139 if (ev.state & ShiftMask)
1737 i = 1; 2140 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2141 else if (OPTION (Opt_mouseWheelScrollPage))
1739 i = TermWin.nrow - 1; 2142 i = nrow - 1;
1740 else 2143 else
1741 i = 5; 2144 i = 5;
1742 2145
1743# ifdef MOUSE_SLIP_WHEELING 2146# ifdef MOUSE_SLIP_WHEELING
1744 if (ev.state & ControlMask) 2147 if (ev.state & ControlMask)
1745 { 2148 {
1746 mouse_slip_wheel_speed += v ? -1 : 1; 2149 mouse_slip_wheel_speed += v ? -1 : 1;
1747 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2150 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; 2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1749 2152
1750 if (slip_wheel_ev.at < NOW) 2153 if (slip_wheel_ev.at < NOW)
1751 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2154 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1752 2155
1753 slip_wheel_ev.start (); 2156 slip_wheel_ev.start ();
… …
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2197 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2198 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2199 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i; 2200 int i;
1798 2201
1799 Visual* visual = display->visual; 2202 Visual *visual = display->visual;
1800 2203
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2204 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802 2205
1803 /* for convenience */ 2206 /* for convenience */
1804 mask_r = visual->red_mask; 2207 mask_r = visual->red_mask;
… …
2025 Atom atype; 2428 Atom atype;
2026 unsigned char *prop = NULL; 2429 unsigned char *prop = NULL;
2027 Window root, oldp, *list; 2430 Window root, oldp, *list;
2028 Pixmap rootpixmap = None; 2431 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr; 2432 XWindowAttributes wattr, wrootattr;
2433 dDisp;
2030 2434
2031 pchanged = 0; 2435 pchanged = 0;
2032 2436
2033 if (!(Options & Opt_transparent)) 2437 if (!OPTION (Opt_transparent))
2034 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
2035 2439
2036 XGetWindowAttributes (display->display, display->root, &wrootattr); 2440 XGetWindowAttributes (disp, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth; 2441 rootdepth = wrootattr.depth;
2038 2442
2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2443 XGetWindowAttributes (disp, parent[0], &wattr);
2040 2444
2041 if (rootdepth != wattr.depth) 2445 if (rootdepth != wattr.depth)
2042 { 2446 {
2043 if (am_transparent) 2447 if (am_transparent)
2044 { 2448 {
2045 pchanged = 1; 2449 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2450 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0; 2451 am_transparent = am_pixmap_trans = 0;
2048 } 2452 }
2049 2453
2050 return pchanged; /* Don't try any more */ 2454 return pchanged; /* Don't try any more */
2051 } 2455 }
2052 2456
2053 /* Get all X ops out of the queue so that our information is up-to-date. */ 2457 /* Get all X ops out of the queue so that our information is up-to-date. */
2054 XSync (display->display, False); 2458 XSync (disp, False);
2055 2459
2056 /* 2460 /*
2057 * Make the frame window set by the window manager have 2461 * Make the frame window set by the window manager have
2058 * the root background. Some window managers put multiple nested frame 2462 * the root background. Some window managers put multiple nested frame
2059 * windows for each client, so we have to take care about that. 2463 * windows for each client, so we have to take care about that.
2060 */ 2464 */
2061 i = (xa[XA_XROOTPMAPID] 2465 i = (xa[XA_XROOTPMAP_ID]
2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2466 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2064 &nitems, &bytes_after, &prop) == Success); 2468 &nitems, &bytes_after, &prop) == Success);
2065 2469
2066 if (!i || prop == NULL) 2470 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID] 2471 i = (xa[XA_ESETROOT_PMAP_ID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2472 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success); 2474 &nitems, &bytes_after, &prop) == Success);
2071 2475
2072 if (!i || prop == NULL 2476 if (!i || prop == NULL
2073#if TINTING 2477#if TINTING
… …
2092 Window cr; 2496 Window cr;
2093 XImage *image; 2497 XImage *image;
2094 GC gc; 2498 GC gc;
2095 XGCValues gcvalue; 2499 XGCValues gcvalue;
2096 2500
2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2501 XTranslateCoordinates (disp, parent[0], display->root,
2098 0, 0, &sx, &sy, &cr); 2502 0, 0, &sx, &sy, &cr);
2099 nw = (unsigned int)szHint.width; 2503 nw = (unsigned int)szHint.width;
2100 nh = (unsigned int)szHint.height; 2504 nh = (unsigned int)szHint.height;
2101 nx = ny = 0; 2505 nx = ny = 0;
2102 2506
… …
2112 nh += sy; 2516 nh += sy;
2113 ny = -sy; 2517 ny = -sy;
2114 sy = 0; 2518 sy = 0;
2115 } 2519 }
2116 2520
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2521 min_it (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2522 min_it (nh, (unsigned int) (wrootattr.height - sy));
2523
2524 XSync (disp, False);
2119 allowedxerror = -1; 2525 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2526 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121 2527
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2528 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */ 2529 /* XXX: may need a delay here? */
2124 allowedxerror = 0; 2530 allowedxerror = 0;
2125 2531
2126 if (image == NULL) 2532 if (image == NULL)
2127 { 2533 {
2128 if (am_transparent && am_pixmap_trans) 2534 if (am_transparent && am_pixmap_trans)
2129 { 2535 {
2130 pchanged = 1; 2536 pchanged = 1;
2131 if (TermWin.pixmap != None) 2537 if (pixmap != None)
2132 { 2538 {
2133 XFreePixmap (display->display, TermWin.pixmap); 2539 XFreePixmap (disp, pixmap);
2134 TermWin.pixmap = None; 2540 pixmap = None;
2135 } 2541 }
2136 } 2542 }
2137 2543
2138 am_pixmap_trans = 0; 2544 am_pixmap_trans = 0;
2139 } 2545 }
2140 else 2546 else
2141 { 2547 {
2142 if (TermWin.pixmap != None) 2548 if (pixmap != None)
2143 XFreePixmap (display->display, TermWin.pixmap); 2549 XFreePixmap (disp, pixmap);
2144 2550
2145#if TINTING 2551#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint)) 2552 if (ISSET_PIXCOLOR (Color_tint))
2147 { 2553 {
2148 unsigned short rm, gm, bm; 2554 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2555 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150 2556
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2557 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2152 2558
2153 ShadeXImage (display, image, shade, rm, gm, bm); 2559 ShadeXImage (display, image, shade, rm, gm, bm);
2154 } 2560 }
2155#endif 2561#endif
2156 2562
2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2563 pixmap = XCreatePixmap (disp, vt,
2158 szHint.width, szHint.height, image->depth); 2564 szHint.width, szHint.height, image->depth);
2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2565 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2566 XPutImage (disp, pixmap, gc, image, 0, 0,
2161 nx, ny, image->width, image->height); 2567 nx, ny, image->width, image->height);
2162 XFreeGC (display->display, gc); 2568 XFreeGC (disp, gc);
2163 XDestroyImage (image); 2569 XDestroyImage (image);
2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2570 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2165 XClearWindow (display->display, TermWin.parent[0]); 2571 XClearWindow (disp, parent[0]);
2166 2572
2167 if (!am_transparent || !am_pixmap_trans) 2573 if (!am_transparent || !am_pixmap_trans)
2168 pchanged = 1; 2574 pchanged = 1;
2169 2575
2170 am_transparent = am_pixmap_trans = 1; 2576 am_transparent = am_pixmap_trans = 1;
2171 } 2577 }
2172 } 2578 }
2173 2579
2174 if (!am_pixmap_trans) 2580 if (am_pixmap_trans)
2581 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2582 else
2175 { 2583 {
2176 unsigned int n; 2584 unsigned int n;
2177 /* 2585 /*
2178 * InheritPixmap transparency 2586 * InheritPixmap transparency
2179 */ 2587 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2588 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2182 { 2589 {
2183 oldp = TermWin.parent[i]; 2590 oldp = parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2591 XQueryTree (disp, parent[i - 1], &root,
2185 &TermWin.parent[i], &list, &n); 2592 &parent[i], &list, &n);
2186 XFree (list); 2593 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188 2594
2189 if (TermWin.parent[i] == display->root) 2595 if (parent[i] == display->root)
2190 { 2596 {
2191 if (oldp != None) 2597 if (oldp != None)
2192 pchanged = 1; 2598 pchanged = 1;
2193 2599
2194 break; 2600 break;
2195 } 2601 }
2196 2602
2197 if (oldp != TermWin.parent[i]) 2603 if (oldp != parent[i])
2198 pchanged = 1; 2604 pchanged = 1;
2199 } 2605 }
2200 2606
2201 n = 0; 2607 n = 0;
2202 2608
2203 if (pchanged) 2609 if (pchanged)
2204 { 2610 {
2205 for (; n < (unsigned int)i; n++) 2611 for (; n < (unsigned int)i; n++)
2206 { 2612 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2613 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) 2614 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 { 2615 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2616 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2212 break; 2617 break;
2213 } 2618 }
2214 } 2619 }
2215 } 2620 }
2216 2621
2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2622 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2218 { 2623 {
2219 D_X ((stderr, "InheritPixmap Turning off"));
2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2624 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2625 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2222 am_transparent = 0; 2626 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */ 2627 /* XXX: also turn off Opt_transparent? */
2224 } 2628 }
2225 else 2629 else
2226 { 2630 {
2227#if WAIT_FOR_WM 2631#if WAIT_FOR_WM
2228 /* wait (an arbitrary period) for the WM to do its thing 2632 /* wait (an arbitrary period) for the WM to do its thing
2229 * needed for fvwm2.2.2 (and before?) */ 2633 * needed for fvwm2.2.2 (and before?) */
2230 sleep (1); 2634 sleep (1);
2231#endif 2635#endif
2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2233 for (n = 0; n < (unsigned int)i; n++) 2636 for (n = 0; n < (unsigned int)i; n++)
2234 { 2637 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2638 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]); 2639 XClearWindow (disp, parent[n]);
2237 } 2640 }
2238 2641
2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2642 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2240 am_transparent = 1; 2643 am_transparent = 1;
2241 } 2644 }
2242 2645
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2646 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None; 2647 parent[i] = None;
2245 } 2648 }
2246 2649
2247 // this is experimental
2248 if (scrollBar.win) 2650 if (scrollBar.win)
2249 { 2651 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2652 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle (); 2653 scrollBar.setIdle ();
2253 scrollbar_show (0); 2654 scrollbar_show (0);
2655 }
2656
2657 if (am_transparent)
2658 {
2659 want_refresh = want_full_refresh = 1;
2660 if (am_pixmap_trans)
2661 flush ();
2254 } 2662 }
2255 2663
2256 return pchanged; 2664 return pchanged;
2257} 2665}
2258#endif 2666#endif
… …
2277 if (ch == NOCHAR) // TODO: improve 2685 if (ch == NOCHAR) // TODO: improve
2278 break; 2686 break;
2279 2687
2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2688 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2281 { 2689 {
2690 if (!seen_input)
2691 {
2692 seen_input = 1;
2693 // many badly-written programs (e.g. jed) contain a race condition:
2694 // they first read the screensize and then install a SIGWINCH handler.
2695 // some window managers resize the window early, and these programs
2696 // then sometimes get the size wrong.
2697 // unfortunately other programs are even more buggy and dislike
2698 // being sent SIGWINCH, so only do it when we were in fact being
2699 // resized.
2700 if (seen_resize && cmd_pid)
2701 kill (-cmd_pid, SIGWINCH);
2702 }
2703
2282 /* Read a text string from the input buffer */ 2704 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2705 unicode_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2706 bool refreshnow = false;
2285 int nlines = 0; 2707 int nlines = 0;
2286 unicode_t *str = buf; 2708 unicode_t *str = buf;
2287 2709 unicode_t *eol = str + min (ncol, UBUFSIZ);
2288 *str++ = ch;
2289 2710
2290 for (;;) 2711 for (;;)
2291 { 2712 {
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)) 2713 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break; 2714 break;
2297 2715
2298 *str++ = ch; 2716 *str++ = ch;
2299 2717
2300 if (ch == C0_LF) 2718 if (ch == C0_LF || str >= eol)
2301 { 2719 {
2720 if (ch == C0_LF)
2302 nlines++; 2721 nlines++;
2722
2303 refresh_count++; 2723 refresh_count++;
2304 2724
2305 if (! (Options & Opt_jumpScroll) 2725 if (!OPTION (Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2726 || (refresh_count >= refresh_limit * (nrow - 1)))
2307 { 2727 {
2308 refreshnow = true; 2728 refreshnow = true;
2729 refresh_count = 0;
2309 ch = NOCHAR; 2730 ch = NOCHAR;
2310 break; 2731 break;
2311 } 2732 }
2312 2733
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2734 // scr_add_lines only works for nlines <= nrow - 1.
2314 if (nlines >= TermWin.nrow - 1) 2735 if (nlines >= nrow - 1)
2315 { 2736 {
2316 scr_add_lines (buf, nlines, str - buf); 2737 scr_add_lines (buf, nlines, str - buf);
2317 nlines = 0; 2738 nlines = 0;
2318 str = buf; 2739 str = buf;
2740 eol = str + min (ncol, UBUFSIZ);
2319 } 2741 }
2742
2743 if (str >= eol)
2744 {
2745 if (eol >= buf + UBUFSIZ)
2746 {
2747 ch = NOCHAR;
2748 break;
2749 }
2750 else
2751 eol = min (eol + ncol, buf + UBUFSIZ);
2752 }
2753
2320 } 2754 }
2321 2755
2322 if (str >= buf + UBUFSIZ) 2756 seq_begin = cmdbuf_ptr;
2323 { 2757 ch = next_char ();
2324 ch = NOCHAR;
2325 break;
2326 }
2327 } 2758 }
2328 2759
2329 scr_add_lines (buf, nlines, str - buf); 2760 scr_add_lines (buf, nlines, str - buf);
2330 2761
2331 /* 2762 /*
… …
2334 * the number of pages between refreshes is refresh_limit, which 2765 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling. 2766 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2767 */
2337 if (refreshnow) 2768 if (refreshnow)
2338 { 2769 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2770 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++; 2771 refresh_limit++;
2341 else 2772 else
2342 { 2773 {
2343 flag = true; 2774 flag = true;
2344 scr_refresh (refresh_type); 2775 scr_refresh (refresh_type);
2776 flush_ev.stop ();
2345 } 2777 }
2346 } 2778 }
2347 2779
2348 } 2780 }
2349 else 2781 else
… …
2398 if (len == (size_t)-1) 2830 if (len == (size_t)-1)
2399 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2831 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2400 2832
2401 // assume wchar == unicode 2833 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2834 cmdbuf_ptr += len;
2403 return wc; 2835 return wc & UNICODE_MASK;
2404 } 2836 }
2405 2837
2406 return NOCHAR; 2838 return NOCHAR;
2407} 2839}
2408 2840
… …
2534 process_escape_seq (); 2966 process_escape_seq ();
2535 break; 2967 break;
2536 case C0_ENQ: /* terminal Status */ 2968 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 2969 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2970 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2971 (unsigned int)strlen (rs[Rs_answerbackstring]));
2540 else 2972 else
2541 tt_write ((unsigned char *)VT100_ANS, 2973 tt_write ((unsigned char *)VT100_ANS,
2542 (unsigned int)STRLEN (VT100_ANS)); 2974 (unsigned int)strlen (VT100_ANS));
2543 break; 2975 break;
2544 case C0_BEL: /* bell */ 2976 case C0_BEL: /* bell */
2545 scr_bell (); 2977 scr_bell ();
2546 break; 2978 break;
2547 case C0_BS: /* backspace */ 2979 case C0_BS: /* backspace */
… …
2646void 3078void
2647rxvt_term::process_escape_seq () 3079rxvt_term::process_escape_seq ()
2648{ 3080{
2649 unicode_t ch = cmd_getc (); 3081 unicode_t ch = cmd_getc ();
2650 3082
2651 if (PrivateModes & PrivMode_vt52) 3083 if (priv_modes & PrivMode_vt52)
2652 { 3084 {
2653 process_escape_vt52 (ch); 3085 process_escape_vt52 (ch);
2654 return; 3086 return;
2655 } 3087 }
2656 3088
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 3103 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 3104 break;
2673 case '+': 3105 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 3106 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 3107 break;
2676#ifndef NO_FRILLS 3108#if ENABLE_FRILLS
2677 case '6': 3109 case '6':
2678 scr_backindex (); 3110 scr_backindex ();
2679 break; 3111 break;
2680#endif 3112#endif
2681 case '7': 3113 case '7':
2682 scr_cursor (SAVE); 3114 scr_cursor (SAVE);
2683 break; 3115 break;
2684 case '8': 3116 case '8':
2685 scr_cursor (RESTORE); 3117 scr_cursor (RESTORE);
2686 break; 3118 break;
2687#ifndef NO_FRILLS 3119#if ENABLE_FRILLS
2688 case '9': 3120 case '9':
2689 scr_forwardindex (); 3121 scr_forwardindex ();
2690 break; 3122 break;
2691#endif 3123#endif
2692 case '=': 3124 case '=':
… …
2871 { 3303 {
2872 switch (priv) 3304 switch (priv)
2873 { 3305 {
2874 case '>': 3306 case '>':
2875 if (ch == CSI_DA) /* secondary device attributes */ 3307 if (ch == CSI_DA) /* secondary device attributes */
2876 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3308 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2877 break; 3309 break;
2878 case '?': 3310 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3311 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 3312 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 3313 break;
… …
2986 3418
2987 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3419 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2988 arg[0] = -arg[0]; 3420 arg[0] = -arg[0];
2989 /* FALLTHROUGH */ 3421 /* FALLTHROUGH */
2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2992 break; 3424 break;
2993 3425
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 3427 tt_write ((const unsigned char *)VT100_ANS,
2996 (unsigned int) (sizeof (VT100_ANS) - 1)); 3428 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 3429 break;
2998 3430
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3431 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 3432 process_sgr_mode (nargs, arg);
3001 break; 3433 break;
… …
3008 break; 3440 break;
3009 case 6: /* CPR requested */ 3441 case 6: /* CPR requested */
3010 scr_report_position (); 3442 scr_report_position ();
3011 break; 3443 break;
3012 case 7: /* unofficial extension */ 3444 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 3445 if (OPTION (Opt_insecure))
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3446 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3447 break;
3016 case 8: /* unofficial extension */ 3448 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3449 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3450 break;
3019 } 3451 }
… …
3055 break; 3487 break;
3056 3488
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3489 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3490 if (arg[0] == 4)
3059 scr_insert_mode (0); 3491 scr_insert_mode (0);
3492 else if (arg[0] == 20)
3493 priv_modes &= ~PrivMode_LFNL;
3060 break; 3494 break;
3061 3495
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3496 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3497 if (arg[0] == 4)
3064 scr_insert_mode (1); 3498 scr_insert_mode (1);
3499 else if (arg[0] == 20)
3500 priv_modes |= PrivMode_LFNL;
3065 break; 3501 break;
3066 3502
3067 /* 3503 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3504 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3505 */
… …
3081 break; 3517 break;
3082 case CSI_75: 3518 case CSI_75:
3083 scr_cursor (RESTORE); 3519 scr_cursor (RESTORE);
3084 break; 3520 break;
3085 3521
3086#ifndef NO_FRILLS 3522#if ENABLE_FRILLS
3087 case CSI_74: 3523 case CSI_74:
3088 process_window_ops (arg, nargs); 3524 process_window_ops (arg, nargs);
3089 break; 3525 break;
3090#endif 3526#endif
3091 3527
… …
3098 break; 3534 break;
3099 } 3535 }
3100} 3536}
3101/*}}} */ 3537/*}}} */
3102 3538
3103#ifndef NO_FRILLS 3539#if ENABLE_FRILLS
3104/* ARGSUSED */ 3540/* ARGSUSED */
3105void 3541void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3542rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3543{
3108 int x, y; 3544 int x, y;
3109 XWindowAttributes wattr; 3545 XWindowAttributes wattr;
3110 Window wdummy; 3546 Window wdummy;
3547 dDisp;
3111 3548
3112 if (nargs == 0) 3549 if (nargs == 0)
3113 return; 3550 return;
3114 3551
3115 switch (args[0]) 3552 switch (args[0])
3116 { 3553 {
3117 /* 3554 /*
3118 * commands 3555 * commands
3119 */ 3556 */
3120 case 1: /* deiconify window */ 3557 case 1: /* deiconify window */
3121 XMapWindow (display->display, TermWin.parent[0]); 3558 XMapWindow (disp, parent[0]);
3122 break; 3559 break;
3123 case 2: /* iconify window */ 3560 case 2: /* iconify window */
3124 XIconifyWindow (display->display, TermWin.parent[0], 3561 XIconifyWindow (disp, parent[0], display->screen);
3125 DefaultScreen (display->display));
3126 break; 3562 break;
3127 case 3: /* set position (pixels) */ 3563 case 3: /* set position (pixels) */
3128 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3564 XMoveWindow (disp, parent[0], args[1], args[2]);
3129 break; 3565 break;
3130 case 4: /* set size (pixels) */ 3566 case 4: /* set size (pixels) */
3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3567 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3132 break; 3568 break;
3133 case 5: /* raise window */ 3569 case 5: /* raise window */
3134 XRaiseWindow (display->display, TermWin.parent[0]); 3570 XRaiseWindow (disp, parent[0]);
3135 break; 3571 break;
3136 case 6: /* lower window */ 3572 case 6: /* lower window */
3137 XLowerWindow (display->display, TermWin.parent[0]); 3573 XLowerWindow (disp, parent[0]);
3138 break; 3574 break;
3139 case 7: /* refresh window */ 3575 case 7: /* refresh window */
3140 scr_touch (true); 3576 scr_touch (true);
3141 break; 3577 break;
3142 case 8: /* set size (chars) */ 3578 case 8: /* set size (chars) */
3143 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3579 set_widthheight ((unsigned int) (args[2] * fwidth),
3144 (unsigned int) (args[1] * TermWin.fheight)); 3580 (unsigned int) (args[1] * fheight));
3145 break; 3581 break;
3146 3582
3147 //case 9: NYI, TODO, restore maximized window or maximize window 3583 //case 9: NYI, TODO, restore maximized window or maximize window
3148 default: 3584 default:
3149 if (args[0] >= 24) /* set height (chars) */ 3585 if (args[0] >= 24) /* set height (chars) */
3150 set_widthheight ((unsigned int)TermWin.width, 3586 set_widthheight ((unsigned int)width,
3151 (unsigned int) (args[1] * TermWin.fheight)); 3587 (unsigned int) (args[1] * fheight));
3152 break; 3588 break;
3153 3589
3154 3590
3155 /* 3591 /*
3156 * reports - some output format copied from XTerm 3592 * reports - some output format copied from XTerm
3157 */ 3593 */
3158 case 11: /* report window state */ 3594 case 11: /* report window state */
3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3595 XGetWindowAttributes (disp, parent[0], &wattr);
3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3596 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3161 break; 3597 break;
3162 case 13: /* report window position */ 3598 case 13: /* report window position */
3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3599 XGetWindowAttributes (disp, parent[0], &wattr);
3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3600 XTranslateCoordinates (disp, parent[0], wattr.root,
3165 -wattr.border_width, -wattr.border_width, 3601 -wattr.border_width, -wattr.border_width,
3166 &x, &y, &wdummy); 3602 &x, &y, &wdummy);
3167 tt_printf ("\033[3;%d;%dt", x, y); 3603 tt_printf ("\033[3;%d;%dt", x, y);
3168 break; 3604 break;
3169 case 14: /* report window size (pixels) */ 3605 case 14: /* report window size (pixels) */
3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3606 XGetWindowAttributes (disp, parent[0], &wattr);
3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3607 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3172 break; 3608 break;
3173 case 18: /* report text area size (chars) */ 3609 case 18: /* report text area size (chars) */
3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3175 break; 3611 break;
3176 case 19: /* report window size (chars) */ 3612 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3613 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3178 break; 3614 break;
3179 case 20: /* report icon label */ 3615 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3616 {
3182 char *s; 3617 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3618 XGetIconName (disp, parent[0], &s);
3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3619 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s);
3185 } 3621 }
3186 break; 3622 break;
3187 case 21: /* report window title */ 3623 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3624 {
3190 char *s; 3625 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3626 XFetchName (disp, parent[0], &s);
3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3627 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3628 XFree (s);
3193 } 3629 }
3194 break; 3630 break;
3195 } 3631 }
3196} 3632}
3197#endif 3633#endif
3198 3634
… …
3202 * ends_how is terminator used. returned input must be free()'d 3638 * ends_how is terminator used. returned input must be free()'d
3203 */ 3639 */
3204unsigned char * 3640unsigned char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3641rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3642{
3207 unicode_t prev = 0, ch; 3643 unicode_t ch;
3644 bool seen_esc = false;
3208 unsigned int n = 0; 3645 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3646 wchar_t string[STRING_MAX];
3211 3647
3212 while ((ch = cmd_getc ()) != NOCHAR) 3648 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3649 {
3214 if (prev == C0_ESC) 3650 if (seen_esc)
3215 { 3651 {
3216 if (ch == 0x5c) /* 7bit ST */ 3652 if (ch == 0x5c) /* 7bit ST */
3217 break; 3653 break;
3218 else 3654 else
3219 return NULL; 3655 return NULL;
3220 } 3656 }
3657 else if (ch == C0_ESC)
3658 {
3659 seen_esc = true;
3660 continue;
3661 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3662 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3663 break;
3223 else if (ch < 0x20) 3664 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3665 return NULL; /* other control character - exit */
3225 3666
3226 if (n >= sizeof (string) - 1) 3667 seen_esc = false;
3668
3669 if (n >= STRING_MAX - 1)
3227 // stop at some sane length 3670 // stop at some sane length
3228 return NULL; 3671 return NULL;
3229 3672
3230 if (ch == C0_SYN) 3673 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 (); 3674 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else 3675 else
3236 string[n++] = prev = ch; 3676 string[n++] = ch;
3237 } 3677 }
3238 3678
3239 string[n++] = '\0'; 3679 string[n++] = '\0';
3240 3680
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3681 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3682
3246 return s; 3683 return (unsigned char *)rxvt_wcstombs (string);
3247} 3684}
3248 3685
3249/*----------------------------------------------------------------------*/ 3686/*----------------------------------------------------------------------*/
3250/* 3687/*
3251 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3688 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3295void 3732void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3733rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3297{ 3734{
3298 if (str[0] == '?' && !str[1]) 3735 if (str[0] == '?' && !str[1])
3299 { 3736 {
3300 if (Options & Opt_insecure)
3301 {
3302 unsigned short r, g, b; 3737 unsigned short r, g, b;
3303 PixColorsFocused[color].get (display, r, g, b); 3738 pix_colors_focused[color].get (display, r, g, b);
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3739 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3305 }
3306 } 3740 }
3307 else 3741 else
3308 set_window_color (color, str); 3742 set_window_color (color, str);
3309} 3743}
3310 3744
3311/* 3745/*
3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3746 * 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 */ 3747 */
3336void 3748void
3337rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3749rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3338{ 3750{
3339 int changed = 0; 3751 int changed = 0;
3340 int color; 3752 int color;
3341 char *buf, *name; 3753 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3755 int saveop = op;
3756 dDisp;
3343 3757
3344 assert (str != NULL); 3758 assert (str != NULL);
3345 switch (op) 3759 switch (op)
3346 { 3760 {
3347 case XTerm_name: 3761 case XTerm_name:
… …
3354 set_title (str); 3768 set_title (str);
3355 break; 3769 break;
3356 case XTerm_property: 3770 case XTerm_property:
3357 if (str[0] == '?') 3771 if (str[0] == '?')
3358 { 3772 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3773 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3774 Atom actual_type;
3361 int actual_format; 3775 int actual_format;
3362 unsigned long nitems; 3776 unsigned long nitems;
3363 unsigned long bytes_after; 3777 unsigned long bytes_after;
3364 unsigned char *value = 0; 3778 unsigned char *value = 0;
3365 const char *str = ""; 3779 const char *str = "";
3366 3780
3367 if (prop 3781 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0], 3782 && XGetWindowProperty (disp, parent[0],
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3783 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3784 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3785 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3786 && actual_type != None
3373 && actual_format == 8) 3787 && actual_format == 8)
… …
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3796 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383 3797
3384 if (eq) 3798 if (eq)
3385 { 3799 {
3386 *eq = 0; 3800 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3801 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 } 3802 }
3392 else 3803 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3804 XDeleteProperty (disp, parent[0],
3394 display->atom (str)); 3805 display->atom (str));
3395 } 3806 }
3396 break; 3807 break;
3397 3808
3398 case XTerm_Color: 3809 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3810 for (buf = (char *)str; buf && *buf;)
3400 { 3811 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3812 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3813 break;
3403 3814
3404 *name++ = '\0'; 3815 *name++ = '\0';
3405 color = atoi (buf); 3816 color = atoi (buf);
3406 3817
3407 if (color < 0 || color >= TOTAL_COLORS) 3818 if (color < 0 || color >= TOTAL_COLORS)
3408 break; 3819 break;
3409 3820
3410 if ((buf = STRCHR (name, ';')) != NULL) 3821 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3822 *buf++ = '\0';
3412 3823
3413 if (name[0] == '?' && !name[1]) 3824 if (name[0] == '?' && !name[1])
3414 { 3825 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b; 3826 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3827 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); 3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3420 }
3421 } 3829 }
3422 else 3830 else
3423 set_window_color (color + minCOLOR, name); 3831 set_window_color (color + minCOLOR, name);
3424 } 3832 }
3425 break; 3833 break;
… …
3447 case XTerm_Color_UL: 3855 case XTerm_Color_UL:
3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3449 break; 3857 break;
3450 case XTerm_Color_RV: 3858 case XTerm_Color_RV:
3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3860 break;
3861 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3863 break;
3864#endif
3865#if TRANSPARENT && TINTING
3866 case URxvt_Color_tint:
3867 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3868 check_our_parents ();
3869 if (am_transparent)
3870 want_full_refresh = want_refresh = 1;
3452 break; 3871 break;
3453#endif 3872#endif
3454 3873
3455 case XTerm_Pixmap: 3874 case XTerm_Pixmap:
3456 if (*str != ';') 3875 if (*str != ';')
… …
3459 scale_pixmap (""); /* reset to default scaling */ 3878 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */ 3879 set_bgPixmap (str); /* change pixmap */
3461#endif 3880#endif
3462 scr_touch (true); 3881 scr_touch (true);
3463 } 3882 }
3464 while ((str = STRCHR (str, ';')) != NULL) 3883 while ((str = strchr (str, ';')) != NULL)
3465 { 3884 {
3466 str++; 3885 str++;
3467#if XPM_BACKGROUND 3886#if XPM_BACKGROUND
3468 changed += scale_pixmap (str); 3887 changed += scale_pixmap (str);
3469#endif 3888#endif
3470
3471 } 3889 }
3890
3472 if (changed) 3891 if (changed)
3473 { 3892 {
3474#ifdef XPM_BACKGROUND 3893#ifdef XPM_BACKGROUND
3475 resize_pixmap (); 3894 resize_pixmap ();
3476#endif 3895#endif
… …
3487 3906
3488 case XTerm_logfile: 3907 case XTerm_logfile:
3489 // TODO, when secure mode? 3908 // TODO, when secure mode?
3490 break; 3909 break;
3491 3910
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 3911#ifdef MENUBAR
3533 case XTerm_Menu: 3912 case URxvt_Menu:
3534 if (Options & Opt_insecure) 3913 if (OPTION (Opt_insecure))
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break; 3915 break;
3537#endif 3916#endif
3538#if 0 3917#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3918 case XTerm_dumpscreen: /* no error notices */
… …
3543 { 3922 {
3544 scr_dump (fd); 3923 scr_dump (fd);
3545 close (fd); 3924 close (fd);
3546 } 3925 }
3547 } 3926 }
3927 break;
3928#endif
3929 case XTerm_font:
3930 op = URxvt_font;
3931 case URxvt_font:
3932#if ENABLE_STYLES
3933 case URxvt_boldFont:
3934 case URxvt_italicFont:
3935 case URxvt_boldItalicFont:
3936#endif
3937 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", saveop,
3939 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3940 ? fontset[op - URxvt_font]->fontdesc : "",
3941 resp);
3942 else
3943 {
3944 const char *&res = rs[Rs_font + (op - URxvt_font)];
3945
3946 res = strdup (str);
3947 allocated.push_back ((void *)res);
3948 set_fonts ();
3949 }
3950 break;
3951
3952#if ENABLE_FRILLS
3953 case URxvt_locale:
3954 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3956 else
3957 {
3958 set_locale (str);
3959 pty.set_utf8_mode (enc_utf8);
3960 init_xlocale ();
3961 }
3962 break;
3963
3964 case URxvt_view_up:
3965 case URxvt_view_down:
3966 {
3967 int lines = atoi (str);
3968
3969 if (lines)
3970 scr_page (op == URxvt_view_up ? UP : DN, lines);
3971 else
3972 scr_erase_savelines ();
3973 }
3974
3975 break;
3976#endif
3977
3978#if ENABLE_PERL
3979 case URxvt_perl:
3980 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3981 ; // no responses yet
3548 break; 3982 break;
3549#endif 3983#endif
3550 } 3984 }
3551} 3985}
3552/*----------------------------------------------------------------------*/ 3986/*----------------------------------------------------------------------*/
… …
3566{ 4000{
3567 int state; 4001 int state;
3568 4002
3569 if (mode == 's') 4003 if (mode == 's')
3570 { 4004 {
3571 SavedModes |= (PrivateModes & bit); 4005 SavedModes |= (priv_modes & bit);
3572 return -1; 4006 return -1;
3573 } 4007 }
3574 else 4008 else
3575 { 4009 {
3576 if (mode == 'r') 4010 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4011 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 4012 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4013 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 4014 PrivMode (state, bit);
3581 } 4015 }
3582 4016
3583 return state; 4017 return state;
3584} 4018}
… …
3602 { 3, PrivMode_132 }, 4036 { 3, PrivMode_132 },
3603 { 4, PrivMode_smoothScroll }, 4037 { 4, PrivMode_smoothScroll },
3604 { 5, PrivMode_rVideo }, 4038 { 5, PrivMode_rVideo },
3605 { 6, PrivMode_relOrigin }, 4039 { 6, PrivMode_relOrigin },
3606 { 7, PrivMode_Autowrap }, 4040 { 7, PrivMode_Autowrap },
4041 // 8, bi-directional support mode
3607 { 9, PrivMode_MouseX10 }, 4042 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 4043#ifdef menuBar_esc
3609 { menuBar_esc, PrivMode_menuBar }, 4044 { menuBar_esc, PrivMode_menuBar },
3610#endif 4045#endif
4046 // 18, 19 printing-related
4047 { 25, PrivMode_VisibleCursor },
3611#ifdef scrollBar_esc 4048#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 4049 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 4050#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 4051 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 { 40, PrivMode_132OK }, 4052 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 4053 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 4054 // 45 margin bell NYI
3621 // 46 start logging 4055 // 46 start logging
… …
3661 } 4095 }
3662 4096
3663 /* extra handling for values with state unkept */ 4097 /* extra handling for values with state unkept */
3664 switch (arg[i]) 4098 switch (arg[i])
3665 { 4099 {
4100#if ENABLE_STYLES
4101 case 1021:
4102 if (mode)
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106
4107 scr_touch (true);
4108 break;
4109#endif
3666 case 1048: /* alternative cursor save */ 4110 case 1048: /* alternative cursor save */
4111 case 1049:
3667 if (Options & Opt_secondaryScreen) 4112 if (OPTION (Opt_secondaryScreen))
3668 if (mode == 0) 4113 if (mode == 0)
3669 scr_cursor (RESTORE); 4114 scr_cursor (RESTORE);
3670 else if (mode == 1) 4115 else if (mode == 1)
3671 scr_cursor (SAVE); 4116 scr_cursor (SAVE);
3672 break; 4117 break;
… …
3683 * within VT52 mode 4128 * within VT52 mode
3684 */ 4129 */
3685 PrivMode (1, PrivMode_vt52); 4130 PrivMode (1, PrivMode_vt52);
3686 break; 4131 break;
3687 case 3: /* 80/132 */ 4132 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 4133 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4134 set_widthheight (((state ? 132 : 80) * fwidth), height);
3690 break; 4135 break;
3691 case 4: /* smooth scrolling */ 4136 case 4: /* smooth scrolling */
3692 if (state) 4137 if (!state)
3693 Options &= ~Opt_jumpScroll; 4138 SET_OPTION (Opt_jumpScroll);
3694 else 4139 else
3695 Options |= Opt_jumpScroll; 4140 CLR_OPTION (Opt_jumpScroll);
3696 break; 4141 break;
3697 case 5: /* reverse video */ 4142 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 4143 scr_rvideo_mode (state);
3699 break; 4144 break;
3700 case 6: /* relative/absolute origins */ 4145 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 4149 scr_autowrap (state);
3705 break; 4150 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 4151 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 4152 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 4153 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 4154 priv_modes &= ~PrivMode_MouseX11;
3710 break; 4155 break;
3711#ifdef menuBar_esc 4156#ifdef menuBar_esc
3712 case menuBar_esc: 4157 case menuBar_esc:
3713#ifdef MENUBAR 4158#ifdef MENUBAR
3714 map_menuBar (state); 4159 map_menuBar (state);
… …
3734 break; 4179 break;
3735 /* case 66: - application key pad */ 4180 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 4181 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 4182 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 4183 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 4184 priv_modes &= ~PrivMode_MouseX10;
3740 break; 4185 break;
3741#if 0 4186#if 0
3742 case 1001: 4187 case 1001:
3743 break; /* X11 mouse highlighting */ 4188 break; /* X11 mouse highlighting */
3744#endif 4189#endif
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 4190 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state) 4191 if (!state)
3747 Options &= ~Opt_scrollTtyOutput; 4192 SET_OPTION (Opt_scrollTtyOutput);
3748 else 4193 else
3749 Options |= Opt_scrollTtyOutput; 4194 CLR_OPTION (Opt_scrollTtyOutput);
3750 break; 4195 break;
3751 case 1011: /* scroll to bottom on key press */ 4196 case 1011: /* scroll to bottom on key press */
3752 if (state) 4197 if (state)
3753 Options |= Opt_scrollTtyKeypress; 4198 SET_OPTION (Opt_scrollTtyKeypress);
3754 else 4199 else
3755 Options &= ~Opt_scrollTtyKeypress; 4200 CLR_OPTION (Opt_scrollTtyKeypress);
3756 break; 4201 break;
3757 case 1047: /* secondary screen w/ clearing last */ 4202 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 4203 if (OPTION (Opt_secondaryScreen))
3759 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
3760 scr_erase_screen (2); 4205 scr_erase_screen (2);
3761 scr_change_screen (state); 4206 scr_change_screen (state);
3762 break; 4207 break;
3763 case 1049: /* secondary screen w/ clearing first */ 4208 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state); 4209 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen) 4210 if (OPTION (Opt_secondaryScreen))
3766 if (current_screen != PRIMARY) 4211 if (current_screen != PRIMARY)
3767 scr_erase_screen (2); 4212 scr_erase_screen (2);
3768 break; 4213 break;
3769 default: 4214 default:
3770 break; 4215 break;
… …
3796 rendset = 0, rendstyle = ~RS_None; 4241 rendset = 0, rendstyle = ~RS_None;
3797 break; 4242 break;
3798 case 1: 4243 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 4244 rendset = 1, rendstyle = RS_Bold;
3800 break; 4245 break;
3801 //case 2: // faint or second colour 4246 //case 2: // low intensity
4247 case 3:
4248 rendset = 1, rendstyle = RS_Italic;
4249 break;
3802 case 4: 4250 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 4251 rendset = 1, rendstyle = RS_Uline;
3804 break; 4252 break;
3805 case 5: // slowly blinking 4253 case 5: // slowly blinking
3806 case 6: // rapidly blinking 4254 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 4266 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 4267 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 4268 //...
3821 //case 19: // ninth alt font 4269 //case 19: // ninth alt font
3822 //case 20: // gothic 4270 //case 20: // gothic
3823 case 21: // disable bold, faint 4271 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 4272 rendset = 0, rendstyle = RS_Bold;
3825 break; 4273 break;
3826 case 22: 4274 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 4275 rendset = 0, rendstyle = RS_Bold;
3828 break; 4276 break;
3829 //case 23: disable italic 4277 case 23: // disable italic
4278 rendset = 0, rendstyle = RS_Italic;
4279 break;
3830 case 24: 4280 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 4281 rendset = 0, rendstyle = RS_Uline;
3832 break; 4282 break;
3833 case 25: 4283 case 25:
4284 rendset = 0, rendstyle = RS_Blink;
4285 break;
4286 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 4287 rendset = 0, rendstyle = RS_Blink;
3835 break; 4288 break;
3836 case 27: 4289 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 4290 rendset = 0, rendstyle = RS_RVid;
3838 break; 4291 break;
… …
3856 case 35: 4309 case 35:
3857 case 36: 4310 case 36:
3858 case 37: 4311 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4312 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 4313 break;
3861#ifdef TTY_256COLOR 4314 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 4315 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 4316 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4317 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 4318 i += 2;
3867 } 4319 }
3868 break; 4320 break;
3869#endif
3870 case 39: /* default fg */ 4321 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 4322 scr_color (Color_fg, Color_fg);
3872 break; 4323 break;
3873 4324
3874 case 40: 4325 case 40:
… …
3879 case 45: 4330 case 45:
3880 case 46: 4331 case 46:
3881 case 47: 4332 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4333 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 4334 break;
3884#ifdef TTY_256COLOR 4335 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 4336 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 4337 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4338 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 4339 i += 2;
3890 } 4340 }
3891 break; 4341 break;
3892#endif
3893 case 49: /* default bg */ 4342 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 4343 scr_color (Color_bg, Color_bg);
3895 break; 4344 break;
4345
4346 //case 50: // not variable spacing
3896 4347
3897#ifndef NO_BRIGHTCOLOR 4348#ifndef NO_BRIGHTCOLOR
3898 case 90: 4349 case 90:
3899 case 91: /* set bright fg color */ 4350 case 91: /* set bright fg color */
3900 case 92: 4351 case 92:
3901 case 93: 4352 case 93:
3902 case 94: 4353 case 94:
3903 case 95: 4354 case 95:
3904 case 96: 4355 case 96:
3905 case 97: 4356 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4357 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 4358 break;
3909 case 100: 4359 case 100:
3910 case 101: /* set bright bg color */ 4360 case 101: /* set bright bg color */
3911 case 102: 4361 case 102:
3912 case 103: 4362 case 103:
3913 case 104: 4363 case 104:
3914 case 105: 4364 case 105:
3915 case 106: 4365 case 106:
3916 case 107: 4366 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4367 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 4368 break;
3920#endif 4369#endif
3921
3922 } 4370 }
3923 } 4371 }
3924} 4372}
3925/*}}} */ 4373/*}}} */
3926 4374
… …
3930{ 4378{
3931 unicode_t ch, cmd = cmd_getc (); 4379 unicode_t ch, cmd = cmd_getc ();
3932 4380
3933 if (cmd == 'Q') 4381 if (cmd == 'Q')
3934 { /* query graphics */ 4382 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */ 4383 tt_printf ("\033G0\012"); /* no graphics */
3936 return; 4384 return;
3937 } 4385 }
3938 /* swallow other graphics sequences until terminating ':' */ 4386 /* swallow other graphics sequences until terminating ':' */
3939 do 4387 do
3940 ch = cmd_getc (); 4388 ch = cmd_getc ();
… …
3955 unsigned char buf[256]; 4403 unsigned char buf[256];
3956 4404
3957 va_start (arg_ptr, fmt); 4405 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4406 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 4407 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 4408 tt_write (buf, strlen (buf));
3961} 4409}
3962 4410
3963/* ---------------------------------------------------------------------- */ 4411/* ---------------------------------------------------------------------- */
3964/* Write data to the pty as typed by the user, pasted with the mouse, 4412/* 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. 4413 * or generated by us in response to a query ESC sequence.
3966 */ 4414 */
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416
3967void 4417void
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4418rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3969{ 4419{
3970 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4420 if (v_buflen == 0)
4421 {
4422 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3971 4423
3972 if (len) 4424 if ((unsigned int)written == len)
4425 return;
4426
4427 data += written;
4428 len -= written;
3973 { 4429 }
4430
4431 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4432
4433 memcpy (v_buffer + v_buflen, data, len);
4434 v_buflen += len;
4435
4436 pty_ev.set (EVENT_READ | EVENT_WRITE);
4437}
4438
4439void rxvt_term::pty_write ()
4440{
4441 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4442
4443 if (written > 0)
4444 {
4445 v_buflen -= written;
4446
3974 if (v_buflen == 0) 4447 if (v_buflen == 0)
3975 { 4448 {
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); 4449 free (v_buffer);
4003 v_buffer = 0; 4450 v_buffer = 0;
4004 v_buflen = 0; 4451 v_buflen = 0;
4005 4452
4006 pty_ev.set (EVENT_READ); 4453 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; 4454 return;
4019 } 4455 }
4456
4457 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4458 }
4459 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4460 pty_ev.set (EVENT_READ);
4021} 4461}
4022 4462
4023/*----------------------- end-of-file (C source) -----------------------*/ 4463/*----------------------- end-of-file (C source) -----------------------*/
4024 4464

Diff Legend

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