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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.231 by root, Wed Jan 4 00:13:22 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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 {
672 scr_refresh (refresh_type); 971 scr_refresh (refresh_type);
673 scrollbar_show (1); 972 scrollbar_show (1);
674#ifdef USE_XIM 973#ifdef USE_XIM
675 IMSendSpot (); 974 IMSendSpot ();
676#endif 975#endif
677
678 } 976 }
679 977
680 display->flush (); 978 display->flush ();
681} 979}
682 980
… …
684rxvt_term::check_cb (check_watcher &w) 982rxvt_term::check_cb (check_watcher &w)
685{ 983{
686 SET_R (this); 984 SET_R (this);
687 SET_LOCALE (locale); 985 SET_LOCALE (locale);
688 986
987 display->flush ();
988
989 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991}
992
993void
994rxvt_term::flush_cb (time_watcher &w)
995{
996 SET_R (this);
997 SET_LOCALE (locale);
998
999 refresh_limit = 1;
1000 refresh_count = 0;
689 flush (); 1001 flush ();
690} 1002}
691 1003
692#ifdef CURSOR_BLINK 1004#ifdef CURSOR_BLINK
693void 1005void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1023 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 1024 }
713} 1025}
714#endif 1026#endif
715 1027
1028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1029void
1030rxvt_term::cont_scroll_cb (time_watcher &w)
1031{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 }
1039}
1040#endif
1041
1042#ifdef SELECTION_SCROLLING
1043void
1044rxvt_term::sel_scroll_cb (time_watcher &w)
1045{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 }
1053}
1054#endif
1055
1056#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1057void
1058rxvt_term::slip_wheel_cb (time_watcher &w)
1059{
1060 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed))
1063 {
1064 if (view_start == nsaved ||
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0;
1067
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 }
1072}
1073#endif
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
716bool 1093bool
717rxvt_term::pty_fill () 1094rxvt_term::pty_fill ()
718{ 1095{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097
1098 if (CBUFSIZ == n)
1099 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0;
1102 }
720 1103
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1104 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1105 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1106 cmdbuf_endp = cmdbuf_ptr + n;
724 1107
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1109
727 if (n > 0) 1110 if (r > 0)
728 { 1111 {
729 cmdbuf_endp += n; 1112 cmdbuf_endp += r;
730 return true; 1113 return true;
731 } 1114 }
732 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))
733 destroy (); 1127 destroy ();
1128 }
734 1129
735 return false; 1130 return false;
736} 1131}
737 1132
738void 1133void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1134rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1135{
741 SET_R (this); 1136 SET_R (this);
742 SET_LOCALE (locale); 1137 SET_LOCALE (locale);
743 1138
1139 if (revents & EVENT_READ)
1140 // loop, but don't allow a single term to monopolize us
1141 while (pty_fill ())
1142 if (cmd_parse ())
1143 break;
1144
744 if (revents & EVENT_WRITE) 1145 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1146 pty_write ();
746 else if (revents & EVENT_READ) 1147}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1148
760 if (cmd_parse ()) 1149void
761 break; 1150rxvt_term::pointer_unblank ()
762 } 1151{
763 } 1152 XDefineCursor (display->display, vt, TermWin_cursor);
1153 recolour_cursor ();
1154
1155#ifdef POINTER_BLANK
1156 hidden_pointer = 0;
1157
1158 if (OPTION (Opt_pointerBlank))
1159 pointer_ev.start (NOW + pointerBlankDelay);
1160#endif
764} 1161}
765 1162
766#ifdef POINTER_BLANK 1163#ifdef POINTER_BLANK
767void 1164void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1165rxvt_term::pointer_blank ()
781{ 1166{
782 if (! (Options & Opt_pointerBlank)) 1167 if (! OPTION (Opt_pointerBlank))
783 return; 1168 return;
784 1169
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1170 XDefineCursor (display->display, vt, display->blank_cursor);
786 XFlush (display->display); 1171 XFlush (display->display);
787 1172
788 hidden_pointer = 1; 1173 hidden_pointer = 1;
789} 1174}
790 1175
… …
807 x = ev.x; 1192 x = ev.x;
808 y = ev.y; 1193 y = ev.y;
809 pixel_position (&x, &y); 1194 pixel_position (&x, &y);
810 1195
811 if (MEvent.button == AnyButton) 1196 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1197 button_number = 3;
814 }
815 else 1198 else
816 { 1199 {
817 button_number = MEvent.button - Button1; 1200 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1201 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1202 if (button_number >= 3)
820 button_number += (64 - 3); 1203 button_number += (64 - 3);
821 } 1204 }
822 1205
823 if (PrivateModes & PrivMode_MouseX10) 1206 if (priv_modes & PrivMode_MouseX10)
824 { 1207 {
825 /* 1208 /*
826 * do not report ButtonRelease 1209 * do not report ButtonRelease
827 * no state info allowed 1210 * no state info allowed
828 */ 1211 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1226 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1227 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1228#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1229 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1230#endif
848
849 } 1231 }
850 1232
851#ifdef DEBUG_MOUSEREPORT 1233#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1234 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1235 if (key_state & 16)
854 fputc ('C', stderr); 1236 fputc ('C', stderr);
855 if (key_state & 4) 1237 if (key_state & 4)
856 fputc ('S', stderr); 1238 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1242 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1243 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1244 button_number,
863 x + 1, 1245 x + 1,
864 y + 1); 1246 y + 1);
865#else 1247#endif
1248
866 tt_printf ("\033[M%c%c%c", 1249 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
868 (32 + x + 1), 1251 (32 + x + 1),
869 (32 + y + 1)); 1252 (32 + y + 1));
870#endif
871} 1253}
872 1254
873#ifdef USING_W11LIB 1255#ifdef USING_W11LIB
874void 1256void
875rxvt_W11_process_x_event (XEvent *ev) 1257rxvt_W11_process_x_event (XEvent *ev)
… …
882 1264
883/*{{{ process an X event */ 1265/*{{{ process an X event */
884void 1266void
885rxvt_term::x_cb (XEvent &ev) 1267rxvt_term::x_cb (XEvent &ev)
886{ 1268{
1269 dDisp;
1270
887 SET_R (this); 1271 SET_R (this);
888 SET_LOCALE (locale); 1272 SET_LOCALE (locale);
889 1273
890#if defined(CURSOR_BLINK) 1274#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
892 { 1276 {
893 if (hidden_cursor) 1277 if (hidden_cursor)
894 { 1278 {
895 hidden_cursor = 0; 1279 hidden_cursor = 0;
896 want_refresh = 1; 1280 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1284 }
901#endif 1285#endif
902 1286
903#if defined(POINTER_BLANK) 1287#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1289 {
906 if (ev.type == MotionNotify 1290 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1291 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1292 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1293 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1296 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1297 pointer_blank ();
914 } 1298 }
915#endif 1299#endif
916 1300
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1301 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1302 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1303 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 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));
973#endif
974 1304
975 switch (ev.type) 1305 switch (ev.type)
976 { 1306 {
977 case KeyPress: 1307 case KeyPress:
1308#if ISO_14755
1309 if (!(iso14755buf & ISO_14755_52))
1310#endif
978 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;
979 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
980 1376
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1378 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1381 mouse_slip_wheel_speed = 0;
986 else 1382#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1383 break;
995 } 1384 }
996#endif
997 1385
998 case ButtonPress: 1386 case ButtonPress:
999 button_press (ev.xbutton); 1387 button_press (ev.xbutton);
1000 break; 1388 break;
1001 1389
… …
1003 button_release (ev.xbutton); 1391 button_release (ev.xbutton);
1004 break; 1392 break;
1005 1393
1006 case ClientMessage: 1394 case ClientMessage:
1007 if (ev.xclient.format == 32 1395 if (ev.xclient.format == 32
1396 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1397 {
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1398 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1009 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
1010#ifdef OFFIX_DND 1416#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */ 1417 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1418 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile 1419 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1420 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1421 || ev.xclient.data.l[0] == DndLink))
1016 { 1422 {
1017 /* Get Dnd data */ 1423 /* Get Dnd data */
1018 Atom ActualType; 1424 Atom ActualType;
1019 int ActualFormat; 1425 int ActualFormat;
1020 unsigned char *data; 1426 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1427 unsigned long Size, RemainingBytes;
1022 1428
1023 XGetWindowProperty (display->display, display->root, 1429 XGetWindowProperty (disp, display->root,
1024 xa[XA_DNDSELECTION], 1430 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1431 0L, 1000000L,
1026 False, AnyPropertyType, 1432 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1433 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1434 &Size, &RemainingBytes,
1029 &data); 1435 &data);
1030 XChangeProperty (display->display, display->root, 1436 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1437 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1438 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1439 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1036 } 1440 }
1037#endif /* OFFIX_DND */ 1441#endif /* OFFIX_DND */
1038 break; 1442 break;
1039 1443
1040 case MappingNotify: 1444 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1445 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1446 break;
1043 1447
1044 /* 1448 /*
1045 * XXX: this is not the _current_ arrangement 1449 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1450 * Here's my conclusion:
… …
1065 break; 1469 break;
1066 } 1470 }
1067 break; 1471 break;
1068 1472
1069 case FocusIn: 1473 case FocusIn:
1070 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])
1071 { 1483 {
1072 TermWin.focus = 1; 1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1; 1485 ;
1074#ifdef USE_XIM
1075 if (Input_Context != NULL)
1076 XSetICFocus (Input_Context);
1077#endif
1078#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif
1082 1486
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 {
1489 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 }
1492
1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1494 if (OPTION (Opt_transparent))
1495 check_our_parents ();
1496#endif
1083 } 1497 }
1084 break; 1498 break;
1085 1499
1086 case FocusOut:
1087 if (TermWin.focus)
1088 {
1089 TermWin.focus = 0;
1090 want_refresh = 1;
1091#ifdef USE_XIM
1092 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context);
1094#endif
1095#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop ();
1098 hidden_cursor = 0;
1099#endif
1100
1101 }
1102 break;
1103
1104 case ConfigureNotify: 1500 case PropertyNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1501 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1106 { 1502 && ev.xproperty.state == PropertyNewValue)
1107 int height, width; 1503 selection_property (ev.xproperty.window, ev.xproperty.atom);
1108 1504
1109 do
1110 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116
1117 if (szHint.width != width || szHint.height != height)
1118 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1120 resize_all_windows (width, height, 1);
1121 }
1122#ifdef DEBUG_SIZE
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent)
1130 {
1131 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif
1136
1137 }
1138 break; 1505 break;
1139 1506
1140 case SelectionClear: 1507 case SelectionClear:
1141 selection_clear (); 1508 selection_clear ();
1142 break; 1509 break;
1143 1510
1144 case SelectionNotify: 1511 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1512 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1513 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1514 break;
1149 1515
1150 case SelectionRequest: 1516 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1517 selection_send (ev.xselectionrequest);
1152 break; 1518 break;
1153 1519
1154 case UnmapNotify: 1520 case UnmapNotify:
1155 TermWin.mapped = 0; 1521 mapped = 0;
1156#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1157 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1158#endif 1524#endif
1159 break; 1525 break;
1160 1526
1161 case MapNotify: 1527 case MapNotify:
1162 TermWin.mapped = 1; 1528 mapped = 1;
1163#ifdef TEXT_BLINK 1529#ifdef TEXT_BLINK
1164 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1165#endif 1531#endif
1166 break; 1532 break;
1167 1533
… …
1171 break; 1537 break;
1172#endif /* TRANSPARENT */ 1538#endif /* TRANSPARENT */
1173 1539
1174 case GraphicsExpose: 1540 case GraphicsExpose:
1175 case Expose: 1541 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1542 if (ev.xany.window == vt)
1177 { 1543 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1544 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1548
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1554
1186 // ev.xexpose.width, TermWin.height, False); 1555 scr_refresh (refresh_type);
1187#endif
1188 want_refresh = 1;
1189 } 1556 }
1190 else 1557 else
1191 { 1558 {
1192 XEvent unused_event; 1559 XEvent unused_event;
1193 1560
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1195 Expose, 1562 ;
1196 &unused_event)) ; 1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1564 ;
1198 GraphicsExpose, 1565
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1201 { 1567 {
1202 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1203 scrollbar_show (0); 1569 scrollbar_show (0);
1204 } 1570 }
1205#ifdef MENUBAR 1571#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose (); 1573 menubar_expose ();
1208#endif 1574#endif
1575
1576#ifdef TRANSPARENT
1577 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window);
1579#endif
1209 } 1580 }
1210 break; 1581 break;
1211 1582
1212 case MotionNotify: 1583 case MotionNotify:
1213#ifdef POINTER_BLANK 1584#ifdef POINTER_BLANK
… …
1219 { 1590 {
1220 menubar_control (ev.xbutton); 1591 menubar_control (ev.xbutton);
1221 break; 1592 break;
1222 } 1593 }
1223#endif 1594#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1225 break; 1596 break;
1226 1597
1227 if (ev.xany.window == TermWin.vt) 1598 if (ev.xany.window == vt)
1228 { 1599 {
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1600 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1601 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1232 ; 1603 ;
1233 1604
1234 XQueryPointer (display->display, TermWin.vt, 1605 XQueryPointer (disp, vt,
1235 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1608 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1609 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1613 {
1243#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
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1623 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1624 ev.xbutton.state & Button3Mask ? 2 : 0);
1625
1246#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1249 { 1629 {
1250 int dist; 1630 int dist;
1251
1252 pending_scroll_selection=1;
1253 1631
1254 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
1256 */ 1634 */
1257 if (scroll_selection_delay<=0) 1635 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1637
1260 /* save the event params so we can highlight 1638 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1639 * the selection in the pending-scroll loop
1262 */ 1640 */
1263 selection_save_x=ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1642 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1643 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1644
1268 /* calc number of lines to scroll */ 1645 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1646 if (ev.xbutton.y < int_bwidth)
1270 { 1647 {
1271 scroll_selection_dir = UP; 1648 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1273 } 1650 }
1274 else 1651 else
1275 { 1652 {
1276 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y - 1654 dist = ev.xbutton.y - (int_bwidth + height);
1278 (TermWin.int_bwidth + TermWin.height);
1279 } 1655 }
1656
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1657 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1659 + 1;
1282 MIN_IT (scroll_selection_lines, 1660 min_it (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1661 SELECTION_SCROLL_MAX_LINES);
1284 } 1662 }
1285 else 1663 else
1286 { 1664 {
1287 /* we are within the text window, so we 1665 /* we are within the text window, so we
1288 * shouldn't be scrolling 1666 * shouldn't be scrolling
1289 */ 1667 */
1290 pending_scroll_selection = 0; 1668 if (sel_scroll_ev.active)
1669 sel_scroll_ev.stop();
1291 } 1670 }
1292#endif 1671#endif
1293#ifdef MOUSE_THRESHOLD 1672#ifdef MOUSE_THRESHOLD
1294
1295 } 1673 }
1296#endif 1674#endif
1297
1298 } 1675 }
1299 } 1676 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1678 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1679 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1303 MotionNotify, &ev)) ; 1680 MotionNotify, &ev))
1681 ;
1682
1304 XQueryPointer (display->display, scrollBar.win, 1683 XQueryPointer (disp, scrollBar.win,
1305 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1686 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1687 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1689 scrollbar_size ());
1311 scr_refresh (refresh_type); 1690 scr_refresh (refresh_type);
1312 refresh_limit = 0; 1691 refresh_limit = 0;
… …
1315 break; 1694 break;
1316 } 1695 }
1317} 1696}
1318 1697
1319void 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
1320rxvt_term::rootwin_cb (XEvent &ev) 1769rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1770{
1322 SET_R (this); 1771 SET_R (this);
1323 SET_LOCALE (locale); 1772 SET_LOCALE (locale);
1324 1773
1325 switch (ev.type) 1774 switch (ev.type)
1326 { 1775 {
1327 case PropertyNotify: 1776 case PropertyNotify:
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1329 {
1330 if (ev.xproperty.state == PropertyNewValue)
1331 selection_property (ev.xproperty.window, ev.xproperty.atom);
1332 break;
1333 }
1334#ifdef TRANSPARENT
1335 else
1336 {
1337 /* 1777 /*
1338 * 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,
1339 * 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.
1340 */ 1780 */
1341 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343
1344 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])
1345 return; 1783 return;
1346 }
1347 1784
1348 /* FALLTHROUGH */ 1785 /* FALLTHROUGH */
1349 case ReparentNotify: 1786 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1788 want_refresh = want_full_refresh = 1;
1353 break; 1789 break;
1354#endif
1355 } 1790 }
1356} 1791}
1792#endif
1357 1793
1358void 1794void
1359rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
1360{ 1796{
1361 int reportmode = 0, clickintime; 1797 int reportmode = 0, clickintime;
1362 1798
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1800
1364 if (!bypass_keystate) 1801 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1802 reportmode = !! (priv_modes & PrivMode_mouse_report);
1803
1366 /* 1804 /*
1367 * VT window processing of button press 1805 * VT window processing of button press
1368 */ 1806 */
1369 if (ev.window == TermWin.vt) 1807 if (ev.window == vt)
1370 { 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
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1818 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1819
1372 if (reportmode) 1820 if (reportmode)
1373 { 1821 {
1374 /* mouse report from vt window */ 1822 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1823 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1824 MEvent.state = ev.state;
… …
1405 } 1853 }
1406 else 1854 else
1407 { 1855 {
1408 if (ev.button != MEvent.button) 1856 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1857 MEvent.clicks = 0;
1858
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1410 switch (ev.button) 1860 switch (ev.button)
1411 { 1861 {
1412 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
1413 /* allow shift+left click to extend selection */ 1871 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1415 { 1873 {
1416 if (MEvent.button == Button1 && clickintime) 1874 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1875 selection_rotate (ev.x, ev.y);
1418 else 1876 else
1419 selection_extend (ev.x, ev.y, 1); 1877 selection_extend (ev.x, ev.y, 1);
1420 } 1878 }
1421 else 1879 else
1422 { 1880 {
1423 if (MEvent.button == Button1 && clickintime) 1881 if (MEvent.button == Button1 && clickintime)
1424 MEvent.clicks++; 1882 MEvent.clicks++;
1425 else 1883 else
1426 MEvent.clicks = 1; 1884 MEvent.clicks = 1;
1427 1885
1428 selection_click (MEvent.clicks, ev.x, ev.y); 1886 selection_click (MEvent.clicks, ev.x, ev.y);
1429 } 1887 }
1430 1888
1431 MEvent.button = Button1; 1889 MEvent.button = Button1;
1432 break; 1890 break;
1433 1891
1434 case Button3: 1892 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1893 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1894 selection_rotate (ev.x, ev.y);
1437 else 1895 else
1438 selection_extend (ev.x, ev.y, 1); 1896 selection_extend (ev.x, ev.y, 1);
1897
1439 MEvent.button = Button3; 1898 MEvent.button = Button3;
1440 break; 1899 break;
1441 } 1900 }
1442 } 1901 }
1902
1443 MEvent.time = ev.time; 1903 MEvent.time = ev.time;
1444 return; 1904 return;
1445 } 1905 }
1446 1906
1447 /* 1907 /*
… …
1513 upordown = 1; /* down */ 1973 upordown = 1; /* down */
1514 } 1974 }
1515 if (upordown) 1975 if (upordown)
1516 { 1976 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1977#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1978 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 1979#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1980 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 1981 {
1522 if (upordown < 0) 1982 if (upordown < 0)
1523 scrollBar.setUp (); 1983 scrollBar.setUp ();
… …
1539 break; 1999 break;
1540 case R_SB_ALIGN_BOTTOM: 2000 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 2001 csrO = scrollBar.bot - scrollBar.top;
1542 break; 2002 break;
1543 } 2003 }
2004
1544 if (scrollBar.style == R_SB_XTERM 2005 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 2006 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 2007 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 2008 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 2009
1549 scrollBar.setMotion (); 2010 scrollBar.setMotion ();
1550 break; 2011 break;
1551 2012
1552 case Button1: 2013 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2014 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1557 case Button3: 2018 case Button3:
1558 if (scrollBar.style != R_SB_XTERM) 2019 if (scrollBar.style != R_SB_XTERM)
1559 { 2020 {
1560 if (scrollbar_above_slider (ev.y)) 2021 if (scrollbar_above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL 2022# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1); 2023 scr_page (UP, nrow - 1);
1563# else 2024# else
1564 scr_page (UP, TermWin.nrow / 4); 2025 scr_page (UP, nrow / 4);
1565# endif 2026# endif
1566 else if (scrollbar_below_slider (ev.y)) 2027 else if (scrollbar_below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL 2028# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1); 2029 scr_page (DN, nrow - 1);
1569# else 2030# else
1570 scr_page (DN, TermWin.nrow / 4); 2031 scr_page (DN, nrow / 4);
1571# endif 2032# endif
1572 else 2033 else
1573 scrollBar.setMotion (); 2034 scrollBar.setMotion ();
1574 } 2035 }
1575 else 2036 else
1576 { 2037 {
1577 scr_page ((ev.button == Button1 ? DN : UP), 2038 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 2039 (nrow
1579 * scrollbar_position (ev.y) 2040 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 2041 / scrollbar_size ()));
1581 } 2042 }
2043
1582 break; 2044 break;
1583 } 2045 }
1584 } 2046 }
1585 return; 2047 return;
1586 } 2048 }
… …
1598{ 2060{
1599 int reportmode = 0; 2061 int reportmode = 0;
1600 2062
1601 csrO = 0; /* reset csr Offset */ 2063 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2064 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2065 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2066
1605 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
1606 { 2068 {
1607 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
1608 scrollbar_show (0); 2070 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH; 2072 refresh_type &= ~SMOOTH_REFRESH;
1611#endif 2073#endif
1612
1613 } 2074 }
2075
1614#ifdef SELECTION_SCROLLING 2076#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2077 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop();
1616#endif 2079#endif
2080
1617 if (ev.window == TermWin.vt) 2081 if (ev.window == vt)
1618 { 2082 {
2083#if ISO_14755
2084 // 5.4
2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2086 return;
2087#endif
1619 if (reportmode) 2088 if (reportmode)
1620 { 2089 {
1621 /* mouse report from vt window */ 2090 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2091 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2092 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
1638 mouse_report (ev); 2107 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2109 return;
1641 } 2110 }
2111
1642 /* 2112 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2114 * when overriding mouse reporting
1645 */ 2115 */
1646 if (PrivateModes & PrivMode_mouse_report 2116 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2117 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2118 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2119 selection_extend (ev.x, ev.y, 0);
1650 2120
1651 switch (ev.button) 2121 switch (ev.button)
… …
1662 case Button5: 2132 case Button5:
1663 { 2133 {
1664 int i; 2134 int i;
1665 page_dirn v; 2135 page_dirn v;
1666 2136
1667 v = (ev.button == Button4) ? UP : DN; 2137 v = ev.button == Button4 ? UP : DN;
2138
1668 if (ev.state & ShiftMask) 2139 if (ev.state & ShiftMask)
1669 i = 1; 2140 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2141 else if (OPTION (Opt_mouseWheelScrollPage))
1671 i = TermWin.nrow - 1; 2142 i = nrow - 1;
1672 else 2143 else
1673 i = 5; 2144 i = 5;
2145
1674# ifdef MOUSE_SLIP_WHEELING 2146# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2147 if (ev.state & ControlMask)
1676 { 2148 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2149 mouse_slip_wheel_speed += v ? -1 : 1;
2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2152
2153 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2154 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2155
2156 slip_wheel_ev.start ();
1679 } 2157 }
2158 else
2159 {
1680# endif 2160# endif
1681# ifdef JUMP_MOUSE_WHEEL 2161# ifdef JUMP_MOUSE_WHEEL
1682 scr_page (v, i);
1683 scr_refresh (SMOOTH_REFRESH);
1684 scrollbar_show (1);
1685# else
1686 while (i--)
1687 {
1688 scr_page (v, 1); 2162 scr_page (v, i);
1689 scr_refresh (SMOOTH_REFRESH); 2163 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 2164 scrollbar_show (1);
2165# else
2166 while (i--)
2167 {
2168 scr_page (v, 1);
2169 scr_refresh (SMOOTH_REFRESH);
2170 scrollbar_show (1);
2171 }
2172# endif
2173# ifdef MOUSE_SLIP_WHEELING
1691 } 2174 }
1692# endif 2175#endif
1693
1694 } 2176 }
1695 break; 2177 break;
1696#endif 2178#endif
1697
1698 } 2179 }
1699 } 2180 }
1700#ifdef MENUBAR 2181#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window)) 2182 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev); 2183 menubar_control (ev);
1703#endif 2184#endif
1704} 2185}
1705 2186
1706
1707#ifdef TRANSPARENT 2187#ifdef TRANSPARENT
2188#if TINTING
2189/* taken from aterm-0.4.2 */
2190
2191typedef uint32_t RUINT32T;
2192
2193void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2194{
2195 int sh_r, sh_g, sh_b;
2196 RUINT32T mask_r, mask_g, mask_b;
2197 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2198 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2199 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2200 int i;
2201
2202 Visual *visual = display->visual;
2203
2204 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2205
2206 /* for convenience */
2207 mask_r = visual->red_mask;
2208 mask_g = visual->green_mask;
2209 mask_b = visual->blue_mask;
2210
2211 /* boring lookup table pre-initialization */
2212 switch (srcImage->bits_per_pixel) {
2213 case 15:
2214 if ((mask_r != 0x7c00) ||
2215 (mask_g != 0x03e0) ||
2216 (mask_b != 0x001f))
2217 return;
2218 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2219 lookup_r = lookup;
2220 lookup_g = lookup+32;
2221 lookup_b = lookup+32+32;
2222 sh_r = 10;
2223 sh_g = 5;
2224 sh_b = 0;
2225 break;
2226 case 16:
2227 if ((mask_r != 0xf800) ||
2228 (mask_g != 0x07e0) ||
2229 (mask_b != 0x001f))
2230 return;
2231 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2232 lookup_r = lookup;
2233 lookup_g = lookup+32;
2234 lookup_b = lookup+32+64;
2235 sh_r = 11;
2236 sh_g = 5;
2237 sh_b = 0;
2238 break;
2239 case 24:
2240 if ((mask_r != 0xff0000) ||
2241 (mask_g != 0x00ff00) ||
2242 (mask_b != 0x0000ff))
2243 return;
2244 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2245 lookup_r = lookup;
2246 lookup_g = lookup+256;
2247 lookup_b = lookup+256+256;
2248 sh_r = 16;
2249 sh_g = 8;
2250 sh_b = 0;
2251 break;
2252 case 32:
2253 if ((mask_r != 0xff0000) ||
2254 (mask_g != 0x00ff00) ||
2255 (mask_b != 0x0000ff))
2256 return;
2257 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2258 lookup_r = lookup;
2259 lookup_g = lookup+256;
2260 lookup_b = lookup+256+256;
2261 sh_r = 16;
2262 sh_g = 8;
2263 sh_b = 0;
2264 break;
2265 default:
2266 return; /* we do not support this color depth */
2267 }
2268
2269 /* prepare limits for color transformation (each channel is handled separately) */
2270 if (shade < 0) {
2271 shade = -shade;
2272 if (shade < 0) shade = 0;
2273 if (shade > 100) shade = 100;
2274
2275 lower_lim_r = 65535-rm;
2276 lower_lim_g = 65535-gm;
2277 lower_lim_b = 65535-bm;
2278
2279 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2280 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2281 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2282
2283 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2284 } else {
2285 if (shade < 0) shade = 0;
2286 if (shade > 100) shade = 100;
2287
2288 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2289
2290 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2291 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2292 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2293 }
2294
2295 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2296 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2297 {
2298 unsigned int tmp;
2299
2300 tmp = lower_lim_r;
2301 lower_lim_r = lower_lim_b;
2302 lower_lim_b = tmp;
2303
2304 tmp = upper_lim_r;
2305 upper_lim_r = upper_lim_b;
2306 upper_lim_b = tmp;
2307 }
2308
2309 /* fill our lookup tables */
2310 for (i = 0; i <= mask_r>>sh_r; i++)
2311 {
2312 RUINT32T tmp;
2313 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2314 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2315 lookup_r[i] = (tmp/65535)<<sh_r;
2316 }
2317 for (i = 0; i <= mask_g>>sh_g; i++)
2318 {
2319 RUINT32T tmp;
2320 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2321 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2322 lookup_g[i] = (tmp/65535)<<sh_g;
2323 }
2324 for (i = 0; i <= mask_b>>sh_b; i++)
2325 {
2326 RUINT32T tmp;
2327 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2328 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2329 lookup_b[i] = (tmp/65535)<<sh_b;
2330 }
2331
2332 /* apply table to input image (replacing colors by newly calculated ones) */
2333 switch (srcImage->bits_per_pixel)
2334 {
2335 case 15:
2336 {
2337 unsigned short *p1, *pf, *p, *pl;
2338 p1 = (unsigned short *) srcImage->data;
2339 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2340 while (p1 < pf)
2341 {
2342 p = p1;
2343 pl = p1 + srcImage->width;
2344 for (; p < pl; p++)
2345 {
2346 *p = lookup_r[(*p & 0x7c00)>>10] |
2347 lookup_g[(*p & 0x03e0)>> 5] |
2348 lookup_b[(*p & 0x001f)];
2349 }
2350 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2351 }
2352 break;
2353 }
2354 case 16:
2355 {
2356 unsigned short *p1, *pf, *p, *pl;
2357 p1 = (unsigned short *) srcImage->data;
2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2359 while (p1 < pf)
2360 {
2361 p = p1;
2362 pl = p1 + srcImage->width;
2363 for (; p < pl; p++)
2364 {
2365 *p = lookup_r[(*p & 0xf800)>>11] |
2366 lookup_g[(*p & 0x07e0)>> 5] |
2367 lookup_b[(*p & 0x001f)];
2368 }
2369 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 case 24:
2374 {
2375 unsigned char *p1, *pf, *p, *pl;
2376 p1 = (unsigned char *) srcImage->data;
2377 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2378 while (p1 < pf)
2379 {
2380 p = p1;
2381 pl = p1 + srcImage->width * 3;
2382 for (; p < pl; p += 3)
2383 {
2384 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2385 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2386 p[2] = lookup_r[(p[2] & 0x0000ff)];
2387 }
2388 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2389 }
2390 break;
2391 }
2392 case 32:
2393 {
2394 RUINT32T *p1, *pf, *p, *pl;
2395 p1 = (RUINT32T *) srcImage->data;
2396 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397
2398 while (p1 < pf)
2399 {
2400 p = p1;
2401 pl = p1 + srcImage->width;
2402 for (; p < pl; p++)
2403 {
2404 *p = lookup_r[(*p & 0xff0000)>>16] |
2405 lookup_g[(*p & 0x00ff00)>> 8] |
2406 lookup_b[(*p & 0x0000ff)] |
2407 (*p & ~0xffffff);
2408 }
2409 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2410 }
2411 break;
2412 }
2413 }
2414
2415 free (lookup);
2416}
2417#endif
2418
1708/* 2419/*
1709 * Check our parents are still who we think they are. 2420 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2421 * Do transparency updates if required
1711 */ 2422 */
1712int 2423int
1713rxvt_term::check_our_parents () 2424rxvt_term::check_our_parents ()
1714{ 2425{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2426 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2427 unsigned long nitems, bytes_after;
1717 Atom atype; 2428 Atom atype;
1718 unsigned char *prop = NULL; 2429 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2430 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2431 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2432 XWindowAttributes wattr, wrootattr;
2433 dDisp;
1722 2434
1723 pchanged = 0; 2435 pchanged = 0;
1724 2436
1725 if (! (Options & Opt_transparent)) 2437 if (!OPTION (Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
1727 2439
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2440 XGetWindowAttributes (disp, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2441 rootdepth = wrootattr.depth;
1730 2442
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2443 XGetWindowAttributes (disp, parent[0], &wattr);
2444
1732 if (rootdepth != wattr.depth) 2445 if (rootdepth != wattr.depth)
1733 { 2446 {
1734 if (am_transparent) 2447 if (am_transparent)
1735 { 2448 {
1736 pchanged = 1; 2449 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2450 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2451 am_transparent = am_pixmap_trans = 0;
1740 } 2452 }
2453
1741 return pchanged; /* Don't try any more */ 2454 return pchanged; /* Don't try any more */
1742 } 2455 }
1743 2456
1744 /* 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. */
1745 XSync (display->display, False); 2458 XSync (disp, False);
1746 2459
1747 /* 2460 /*
1748 * Make the frame window set by the window manager have 2461 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2462 * the root background. Some window managers put multiple nested frame
1750 * 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.
1751 */ 2464 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2465 i = (xa[XA_XROOTPMAP_ID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2466 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2468 &nitems, &bytes_after, &prop) == Success);
2469
1756 if (!i || prop == NULL) 2470 if (!i || prop == NULL)
2471 i = (xa[XA_ESETROOT_PMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success);
2475
2476 if (!i || prop == NULL
2477#if TINTING
2478 || !rs[Rs_color + Color_tint]
2479#endif
2480 )
1757 have_pixmap = 0; 2481 have_pixmap = 0;
1758 else 2482 else
1759 { 2483 {
1760 have_pixmap = 1; 2484 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2485 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2486 XFree (prop);
1763 } 2487 }
2488
1764 if (have_pixmap) 2489 if (have_pixmap)
1765 { 2490 {
1766 /* 2491 /*
1767 * Copy display->root pixmap transparency 2492 * Copy display->root pixmap transparency
1768 */ 2493 */
… …
1771 Window cr; 2496 Window cr;
1772 XImage *image; 2497 XImage *image;
1773 GC gc; 2498 GC gc;
1774 XGCValues gcvalue; 2499 XGCValues gcvalue;
1775 2500
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2501 XTranslateCoordinates (disp, parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2502 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2503 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2504 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2505 nx = ny = 0;
1781 2506
1782 if (sx < 0) 2507 if (sx < 0)
… …
1791 nh += sy; 2516 nh += sy;
1792 ny = -sy; 2517 ny = -sy;
1793 sy = 0; 2518 sy = 0;
1794 } 2519 }
1795 2520
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2521 min_it (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2522 min_it (nh, (unsigned int) (wrootattr.height - sy));
2523
2524 XSync (disp, False);
1798 allowedxerror = -1; 2525 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2526 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2527
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2528 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2529 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2530 allowedxerror = 0;
2531
1804 if (image == NULL) 2532 if (image == NULL)
1805 { 2533 {
1806 if (am_transparent && am_pixmap_trans) 2534 if (am_transparent && am_pixmap_trans)
1807 { 2535 {
1808 pchanged = 1; 2536 pchanged = 1;
1809 if (TermWin.pixmap != None) 2537 if (pixmap != None)
1810 { 2538 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2539 XFreePixmap (disp, pixmap);
1812 TermWin.pixmap = None; 2540 pixmap = None;
1813 } 2541 }
1814 } 2542 }
2543
1815 am_pixmap_trans = 0; 2544 am_pixmap_trans = 0;
1816 } 2545 }
1817 else 2546 else
1818 { 2547 {
1819 if (TermWin.pixmap != None) 2548 if (pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2549 XFreePixmap (disp, pixmap);
2550
2551#if TINTING
2552 if (ISSET_PIXCOLOR (Color_tint))
2553 {
2554 unsigned short rm, gm, bm;
2555 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2556
2557 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2558
2559 ShadeXImage (display, image, shade, rm, gm, bm);
2560 }
2561#endif
2562
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2563 pixmap = XCreatePixmap (disp, vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2564 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2565 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2566 XPutImage (disp, pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2567 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2568 XFreeGC (disp, gc);
1830 XDestroyImage (image); 2569 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2570 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
1832 TermWin.pixmap); 2571 XClearWindow (disp, parent[0]);
2572
1833 if (!am_transparent || !am_pixmap_trans) 2573 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2574 pchanged = 1;
2575
1835 am_transparent = am_pixmap_trans = 1; 2576 am_transparent = am_pixmap_trans = 1;
1836 } 2577 }
1837 } 2578 }
1838 2579
1839 if (!am_pixmap_trans) 2580 if (am_pixmap_trans)
2581 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2582 else
1840 { 2583 {
1841 unsigned int n; 2584 unsigned int n;
1842 /* 2585 /*
1843 * InheritPixmap transparency 2586 * InheritPixmap transparency
1844 */ 2587 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2588 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2589 {
1849 oldp = TermWin.parent[i]; 2590 oldp = parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2591 XQueryTree (disp, parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2592 &parent[i], &list, &n);
1852 XFree (list); 2593 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2594
1854 if (TermWin.parent[i] == display->root) 2595 if (parent[i] == display->root)
1855 { 2596 {
1856 if (oldp != None) 2597 if (oldp != None)
1857 pchanged = 1; 2598 pchanged = 1;
2599
1858 break; 2600 break;
1859 } 2601 }
2602
1860 if (oldp != TermWin.parent[i]) 2603 if (oldp != parent[i])
1861 pchanged = 1; 2604 pchanged = 1;
1862 } 2605 }
1863 2606
1864 n = 0; 2607 n = 0;
1865 2608
1866 if (pchanged) 2609 if (pchanged)
1867 { 2610 {
1868 for (; n < (unsigned int)i; n++) 2611 for (; n < (unsigned int)i; n++)
1869 { 2612 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2613 XGetWindowAttributes (disp, parent[n], &wattr);
1871 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
1872 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2614 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2615 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2616 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
1875 break; 2617 break;
1876 } 2618 }
1877 } 2619 }
1878 } 2620 }
1879 2621
1880 if (n > (int) (sizeof (TermWin.parent) 2622 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2623 {
1883 D_X ((stderr, "InheritPixmap Turning off")); 2624 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2625 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt,
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2626 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2627 /* XXX: also turn off Opt_transparent? */
1890 } 2628 }
1891 else 2629 else
1892 { 2630 {
2631#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2632 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2633 * needed for fvwm2.2.2 (and before?) */
1895# ifdef HAVE_NANOSLEEP
1896 struct timespec rqt;
1897
1898 rqt.tv_sec = 1;
1899 rqt.tv_nsec = 0;
1900 nanosleep (&rqt, NULL);
1901# else
1902 sleep (1); 2634 sleep (1);
1903# endif 2635#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2636 for (n = 0; n < (unsigned int)i; n++)
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2637 {
1907 ParentRelative); 2638 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2639 XClearWindow (disp, parent[n]);
1909 ParentRelative); 2640 }
2641
2642 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
1910 am_transparent = 1; 2643 am_transparent = 1;
1911 } 2644 }
1912 2645
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2646 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2647 parent[i] = None;
2648 }
2649
2650 if (scrollBar.win)
1915 } 2651 {
2652 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2653 scrollBar.setIdle ();
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 ();
2662 }
2663
1916 return pchanged; 2664 return pchanged;
1917} 2665}
1918#endif 2666#endif
1919 2667
1920/*}}} */ 2668/*}}} */
… …
1935 } 2683 }
1936 2684
1937 if (ch == NOCHAR) // TODO: improve 2685 if (ch == NOCHAR) // TODO: improve
1938 break; 2686 break;
1939 2687
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2688 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2689 {
2690 if (!seen_input)
1941 { 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
1942 /* Read a text string from the input buffer */ 2704 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2705 unicode_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2706 bool refreshnow = false;
1945 int nlines = 0; 2707 int nlines = 0;
1946 unicode_t *str = buf; 2708 unicode_t *str = buf;
1947 2709 unicode_t *eol = str + min (ncol, UBUFSIZ);
1948 *str++ = ch;
1949 2710
1950 for (;;) 2711 for (;;)
1951 { 2712 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2713 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2714 break;
1957 2715
1958 *str++ = ch; 2716 *str++ = ch;
1959 2717
1960 if (ch == '\n') 2718 if (ch == C0_LF || str >= eol)
1961 { 2719 {
2720 if (ch == C0_LF)
1962 nlines++; 2721 nlines++;
2722
1963 refresh_count++; 2723 refresh_count++;
1964 2724
1965 if (! (Options & Opt_jumpScroll) 2725 if (!OPTION (Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2726 || (refresh_count >= refresh_limit * (nrow - 1)))
1967 { 2727 {
1968 refreshnow = true; 2728 refreshnow = true;
1969 flag = true; 2729 refresh_count = 0;
1970 ch = NOCHAR; 2730 ch = NOCHAR;
1971 break; 2731 break;
1972 } 2732 }
1973 2733
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2734 // scr_add_lines only works for nlines <= nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2735 if (nlines >= nrow - 1)
1976 { 2736 {
1977 scr_add_lines (buf, nlines, str - buf); 2737 scr_add_lines (buf, nlines, str - buf);
1978 nlines = 0; 2738 nlines = 0;
1979 str = buf; 2739 str = buf;
2740 eol = str + min (ncol, UBUFSIZ);
1980 } 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
1981 } 2754 }
1982 2755
1983 if (str >= buf + UBUFSIZ) 2756 seq_begin = cmdbuf_ptr;
1984 { 2757 ch = next_char ();
1985 ch = NOCHAR;
1986 break;
1987 }
1988 } 2758 }
1989 2759
1990 scr_add_lines (buf, nlines, str - buf); 2760 scr_add_lines (buf, nlines, str - buf);
1991 2761
1992 /* 2762 /*
1993 * If there have been a lot of new lines, then update the screen 2763 * If there have been a lot of new lines, then update the screen
1994 * What the heck I'll cheat and only refresh less than every page-full. 2764 * What the heck I'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which 2765 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2766 * is incremented here because we must be doing flat-out scrolling.
1997 *
1998 * refreshing should be correct for small scrolls, because of the
1999 * time-out
2000 */ 2767 */
2001 if (refreshnow) 2768 if (refreshnow)
2002 { 2769 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2770 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2771 refresh_limit++;
2005 2772 else
2773 {
2774 flag = true;
2006 scr_refresh (refresh_type); 2775 scr_refresh (refresh_type);
2776 flush_ev.stop ();
2777 }
2007 } 2778 }
2008 2779
2009 } 2780 }
2010 else 2781 else
2011 { 2782 {
… …
2025 } 2796 }
2026 2797
2027 return flag; 2798 return flag;
2028} 2799}
2029 2800
2801// read the next octet
2802unicode_t
2803rxvt_term::next_octet ()
2804{
2805 return cmdbuf_ptr < cmdbuf_endp
2806 ? *cmdbuf_ptr++
2807 : NOCHAR;
2808}
2809
2030// read the next character 2810// read the next character
2031unicode_t 2811unicode_t
2032rxvt_term::next_char () 2812rxvt_term::next_char ()
2033{ 2813{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2814 while (cmdbuf_ptr < cmdbuf_endp)
… …
2050 if (len == (size_t)-1) 2830 if (len == (size_t)-1)
2051 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
2052 2832
2053 // assume wchar == unicode 2833 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2834 cmdbuf_ptr += len;
2055 return wc; 2835 return wc & UNICODE_MASK;
2056 } 2836 }
2057 2837
2058 return NOCHAR; 2838 return NOCHAR;
2059} 2839}
2060 2840
… …
2065 */ 2845 */
2066unicode_t 2846unicode_t
2067rxvt_term::cmd_getc () 2847rxvt_term::cmd_getc ()
2068{ 2848{
2069 unicode_t c = next_char (); 2849 unicode_t c = next_char ();
2850
2851 if (c == NOCHAR)
2852 throw out_of_input;
2853
2854 return c;
2855}
2856
2857unicode_t
2858rxvt_term::cmd_get8 ()
2859{
2860 unicode_t c = next_octet ();
2070 2861
2071 if (c == NOCHAR) 2862 if (c == NOCHAR)
2072 throw out_of_input; 2863 throw out_of_input;
2073 2864
2074 return c; 2865 return c;
… …
2156/*}}} */ 2947/*}}} */
2157 2948
2158/* *INDENT-OFF* */ 2949/* *INDENT-OFF* */
2159enum { 2950enum {
2160 C1_40 = 0x40, 2951 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2952 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2162 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2953 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2163 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2954 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2955 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2956};
2166/* *INDENT-ON* */ 2957/* *INDENT-ON* */
2167 2958
2168/*{{{ process non-printing single characters */ 2959/*{{{ process non-printing single characters */
2169void 2960void
… …
2174 case C0_ESC: 2965 case C0_ESC:
2175 process_escape_seq (); 2966 process_escape_seq ();
2176 break; 2967 break;
2177 case C0_ENQ: /* terminal Status */ 2968 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2969 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2970 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2971 (unsigned int)strlen (rs[Rs_answerbackstring]));
2182 else 2972 else
2183 tt_write ((unsigned char *)VT100_ANS, 2973 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2974 (unsigned int)strlen (VT100_ANS));
2185 break; 2975 break;
2186 case C0_BEL: /* bell */ 2976 case C0_BEL: /* bell */
2187 scr_bell (); 2977 scr_bell ();
2188 break; 2978 break;
2189 case C0_BS: /* backspace */ 2979 case C0_BS: /* backspace */
… …
2205 break; 2995 break;
2206 case C0_SI: /* shift in - acs */ 2996 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2997 scr_charset_choose (0);
2208 break; 2998 break;
2209 2999
3000#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 3001 // 8-bit controls
2211 case 0x90: /* DCS */ 3002 case 0x90: /* DCS */
2212 process_dcs_seq (); 3003 process_dcs_seq ();
2213 break; 3004 break;
2214 case 0x9b: /* CSI */ 3005 case 0x9b: /* CSI */
2215 process_csi_seq (); 3006 process_csi_seq ();
2216 break; 3007 break;
2217 case 0x9d: /* CSI */ 3008 case 0x9d: /* CSI */
2218 process_osc_seq (); 3009 process_osc_seq ();
2219 break; 3010 break;
3011#endif
2220 } 3012 }
2221} 3013}
2222/*}}} */ 3014/*}}} */
2223 3015
2224 3016
… …
2286void 3078void
2287rxvt_term::process_escape_seq () 3079rxvt_term::process_escape_seq ()
2288{ 3080{
2289 unicode_t ch = cmd_getc (); 3081 unicode_t ch = cmd_getc ();
2290 3082
2291 if (PrivateModes & PrivMode_vt52) 3083 if (priv_modes & PrivMode_vt52)
2292 { 3084 {
2293 process_escape_vt52 (ch); 3085 process_escape_vt52 (ch);
2294 return; 3086 return;
2295 } 3087 }
2296 3088
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 3103 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 3104 break;
2313 case '+': 3105 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 3106 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 3107 break;
2316#ifndef NO_FRILLS 3108#if ENABLE_FRILLS
2317 case '6': 3109 case '6':
2318 scr_backindex (); 3110 scr_backindex ();
2319 break; 3111 break;
2320#endif 3112#endif
2321 case '7': 3113 case '7':
2322 scr_cursor (SAVE); 3114 scr_cursor (SAVE);
2323 break; 3115 break;
2324 case '8': 3116 case '8':
2325 scr_cursor (RESTORE); 3117 scr_cursor (RESTORE);
2326 break; 3118 break;
2327#ifndef NO_FRILLS 3119#if ENABLE_FRILLS
2328 case '9': 3120 case '9':
2329 scr_forwardindex (); 3121 scr_forwardindex ();
2330 break; 3122 break;
2331#endif 3123#endif
2332 case '=': 3124 case '=':
… …
2342 break; 3134 break;
2343 3135
2344 /* 8.3.87: NEXT LINE */ 3136 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 3137 case C1_NEL: /* ESC E */
2346 { 3138 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 3139 unicode_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 3140 scr_add_lines (nlcr, 1, 2);
2349 } 3141 }
2350 break; 3142 break;
2351 3143
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 3144 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2363 case C1_RI: /* ESC M */ 3155 case C1_RI: /* ESC M */
2364 scr_index (DN); 3156 scr_index (DN);
2365 break; 3157 break;
2366 3158
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3159 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3160 /*case C1_SS2: scr_single_shift (2); break; */
2369 3161
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3162 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3163 /*case C1_SS3: scr_single_shift (3); break; */
2372 3164
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3165 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3166 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3167 process_dcs_seq ();
2376 break; 3168 break;
… …
2391 process_osc_seq (); 3183 process_osc_seq ();
2392 break; 3184 break;
2393 3185
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3186 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3187 case 'c':
3188 mbstate.reset ();
2396 scr_poweron (); 3189 scr_poweron ();
2397 scrollbar_show (1); 3190 scrollbar_show (1);
2398 break; 3191 break;
2399 3192
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3193 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3205
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3206/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3207/* *INDENT-OFF* */
2415enum { 3208enum {
2416 CSI_ICH = 0x40, 3209 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3210 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2418 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3211 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2419 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3212 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2420 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3213 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2421 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3214 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2422 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3215 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2437 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3230 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2438 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3231 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2439 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3232 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2440 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3233 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2441 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3234 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2442 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3235 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3236 };
2444/* *INDENT-ON* */ 3237/* *INDENT-ON* */
2445 3238
2446void 3239void
2447rxvt_term::process_csi_seq () 3240rxvt_term::process_csi_seq ()
… …
2510 { 3303 {
2511 switch (priv) 3304 switch (priv)
2512 { 3305 {
2513 case '>': 3306 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 3307 if (ch == CSI_DA) /* secondary device attributes */
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3308 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2516 break; 3309 break;
2517 case '?': 3310 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3311 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 3312 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 3313 break;
… …
2625 3418
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3419 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 3420 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 3421 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2631 break; 3424 break;
2632 3425
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3427 tt_write ((const unsigned char *)VT100_ANS,
2635 (unsigned int) (sizeof (VT100_ANS) - 1)); 3428 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3429 break;
2637 3430
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3431 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3432 process_sgr_mode (nargs, arg);
2640 break; 3433 break;
… …
2646 tt_printf ("\033[0n"); 3439 tt_printf ("\033[0n");
2647 break; 3440 break;
2648 case 6: /* CPR requested */ 3441 case 6: /* CPR requested */
2649 scr_report_position (); 3442 scr_report_position ();
2650 break; 3443 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3444 case 7: /* unofficial extension */
3445 if (OPTION (Opt_insecure))
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3446 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3447 break;
2655#endif
2656 case 8: /* unofficial extension */ 3448 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3449 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3450 break;
2659 } 3451 }
2660 break; 3452 break;
2661 3453
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3454 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3487 break;
2696 3488
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3489 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3490 if (arg[0] == 4)
2699 scr_insert_mode (0); 3491 scr_insert_mode (0);
3492 else if (arg[0] == 20)
3493 priv_modes &= ~PrivMode_LFNL;
2700 break; 3494 break;
2701 3495
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3496 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3497 if (arg[0] == 4)
2704 scr_insert_mode (1); 3498 scr_insert_mode (1);
3499 else if (arg[0] == 20)
3500 priv_modes |= PrivMode_LFNL;
2705 break; 3501 break;
2706 3502
2707 /* 3503 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3504 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3505 */
… …
2721 break; 3517 break;
2722 case CSI_75: 3518 case CSI_75:
2723 scr_cursor (RESTORE); 3519 scr_cursor (RESTORE);
2724 break; 3520 break;
2725 3521
2726#ifndef NO_FRILLS 3522#if ENABLE_FRILLS
2727 case CSI_74: 3523 case CSI_74:
2728 process_window_ops (arg, nargs); 3524 process_window_ops (arg, nargs);
2729 break; 3525 break;
2730#endif 3526#endif
2731 3527
… …
2738 break; 3534 break;
2739 } 3535 }
2740} 3536}
2741/*}}} */ 3537/*}}} */
2742 3538
2743#ifndef NO_FRILLS 3539#if ENABLE_FRILLS
2744/* ARGSUSED */ 3540/* ARGSUSED */
2745void 3541void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3542rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3543{
2748 int x, y; 3544 int x, y;
2749 XWindowAttributes wattr; 3545 XWindowAttributes wattr;
2750 Window wdummy; 3546 Window wdummy;
3547 dDisp;
2751 3548
2752 if (nargs == 0) 3549 if (nargs == 0)
2753 return; 3550 return;
2754 3551
2755 switch (args[0]) 3552 switch (args[0])
2756 { 3553 {
2757 /* 3554 /*
2758 * commands 3555 * commands
2759 */ 3556 */
2760 case 1: /* deiconify window */ 3557 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3558 XMapWindow (disp, parent[0]);
2762 break; 3559 break;
2763 case 2: /* iconify window */ 3560 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3561 XIconifyWindow (disp, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3562 break;
2767 case 3: /* set position (pixels) */ 3563 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3564 XMoveWindow (disp, parent[0], args[1], args[2]);
2769 break; 3565 break;
2770 case 4: /* set size (pixels) */ 3566 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3567 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3568 break;
2773 case 5: /* raise window */ 3569 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3570 XRaiseWindow (disp, parent[0]);
2775 break; 3571 break;
2776 case 6: /* lower window */ 3572 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3573 XLowerWindow (disp, parent[0]);
2778 break; 3574 break;
2779 case 7: /* refresh window */ 3575 case 7: /* refresh window */
2780 scr_touch (true); 3576 scr_touch (true);
2781 break; 3577 break;
2782 case 8: /* set size (chars) */ 3578 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3579 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3580 (unsigned int) (args[1] * fheight));
2785 break; 3581 break;
2786 3582
2787 //case 9: NYI, TODO, restore maximized window or maximize window 3583 //case 9: NYI, TODO, restore maximized window or maximize window
2788 default: 3584 default:
2789 if (args[0] >= 24) /* set height (chars) */ 3585 if (args[0] >= 24) /* set height (chars) */
2790 set_widthheight ((unsigned int)TermWin.width, 3586 set_widthheight ((unsigned int)width,
2791 (unsigned int) (args[1] * TermWin.fheight)); 3587 (unsigned int) (args[1] * fheight));
2792 break; 3588 break;
2793 3589
2794 3590
2795 /* 3591 /*
2796 * reports - some output format copied from XTerm 3592 * reports - some output format copied from XTerm
2797 */ 3593 */
2798 case 11: /* report window state */ 3594 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3595 XGetWindowAttributes (disp, parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3596 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3597 break;
2802 case 13: /* report window position */ 3598 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3599 XGetWindowAttributes (disp, parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3600 XTranslateCoordinates (disp, parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3601 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3602 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3603 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3604 break;
2809 case 14: /* report window size (pixels) */ 3605 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3606 XGetWindowAttributes (disp, parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3607 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3608 break;
2813 case 18: /* report text area size (chars) */ 3609 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[8;%d;%dt", nrow, ncol);
2815 break; 3611 break;
2816 case 19: /* report window size (chars) */ 3612 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3613 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3614 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3615 case 20: /* report icon label */
3616 {
3617 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3618 XGetIconName (disp, parent[0], &s);
2822 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);
3621 }
2823 break; 3622 break;
2824 case 21: /* report window title */ 3623 case 21: /* report window title */
3624 {
3625 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3626 XFetchName (disp, parent[0], &s);
2826 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);
3629 }
2827 break; 3630 break;
2828#endif
2829 } 3631 }
2830} 3632}
2831#endif 3633#endif
2832 3634
2833/*----------------------------------------------------------------------*/ 3635/*----------------------------------------------------------------------*/
2834/* 3636/*
2835 * get input up until STRING TERMINATOR (or BEL) 3637 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3638 * ends_how is terminator used. returned input must be free()'d
2837 */ 3639 */
2838unsigned char * 3640unsigned char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3641rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3642{
2841 int seen_esc = 0; /* seen escape? */ 3643 unicode_t ch;
3644 bool seen_esc = false;
2842 unsigned int n = 0; 3645 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3646 wchar_t string[STRING_MAX];
2846 3647
2847 while ((ch = cmd_getc ())) 3648 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3649 {
2849 if (ch == C0_BEL 3650 if (seen_esc)
2850 || ch == CHAR_ST 3651 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3652 if (ch == 0x5c) /* 7bit ST */
2852 break; 3653 break;
2853 3654 else
3655 return NULL;
3656 }
2854 if (ch == C0_ESC) 3657 else if (ch == C0_ESC)
2855 { 3658 {
2856 seen_esc = 1; 3659 seen_esc = true;
2857 continue; 3660 continue;
2858 } 3661 }
2859 else if (ch == '\t') 3662 else if (ch == C0_BEL || ch == CHAR_ST)
2860 ch = ' '; /* translate '\t' to space */ 3663 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3664 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3665 return NULL; /* other control character - exit */
2863 3666
2864 if (n < sizeof (string) - 1) 3667 seen_esc = false;
3668
3669 if (n >= STRING_MAX - 1)
3670 // stop at some sane length
3671 return NULL;
3672
3673 if (ch == C0_SYN)
3674 string[n++] = cmd_get8 ();
3675 else
2865 string[n++] = ch; 3676 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3677 }
2869 3678
2870 string[n++] = '\0'; 3679 string[n++] = '\0';
2871 3680
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3681 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3682
2877 return s; 3683 return (unsigned char *)rxvt_wcstombs (string);
2878} 3684}
2879 3685
2880/*----------------------------------------------------------------------*/ 3686/*----------------------------------------------------------------------*/
2881/* 3687/*
2882 * 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)'
… …
2915 { 3721 {
2916 unsigned char *s = get_to_st (eh); 3722 unsigned char *s = get_to_st (eh);
2917 3723
2918 if (s) 3724 if (s)
2919 { 3725 {
2920 /*
2921 * rxvt_menubar_dispatch () violates the constness of the string,
2922 * so do it here
2923 */
2924 if (arg == XTerm_Menu)
2925#if 0 /* XXX: currently disabled due to security concerns */
2926 menubar_dispatch ((char *)s);
2927#else
2928 (void)0;
2929#endif
2930 else
2931 xterm_seq (arg, (char *)s, eh); 3726 process_xterm_seq (arg, (char *)s, eh);
2932
2933 free (s); 3727 free (s);
2934 } 3728 }
2935 } 3729 }
2936} 3730}
3731
3732void
3733rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3734{
3735 if (str[0] == '?' && !str[1])
3736 {
3737 unsigned short r, g, b;
3738 pix_colors_focused[color].get (display, r, g, b);
3739 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3740 }
3741 else
3742 set_window_color (color, str);
3743}
3744
2937/* 3745/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title
2940 * 1 = change iconName
2941 * 2 = change title
2942 * 4 = change color
2943 * 12 = change text color
2944 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour
2946 * 18 = change bold character color
2947 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented)
2949 * 50 = change font
2950 *
2951 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap
2954 * 39 = change default fg color
2955 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale
2958 * 702 = find font
2959 */ 3747 */
2960void 3748void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3749rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2962{ 3750{
2963 int changed = 0; 3751 int changed = 0;
2964 int color; 3752 int color;
2965 char *buf, *name; 3753 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1];
3755 int saveop = op;
3756 dDisp;
2966 3757
2967 assert (str != NULL); 3758 assert (str != NULL);
2968 switch (op) 3759 switch (op)
2969 { 3760 {
2970 case XTerm_name: 3761 case XTerm_name:
… …
2974 set_icon_name (str); 3765 set_icon_name (str);
2975 break; 3766 break;
2976 case XTerm_title: 3767 case XTerm_title:
2977 set_title (str); 3768 set_title (str);
2978 break; 3769 break;
3770 case XTerm_property:
3771 if (str[0] == '?')
3772 {
3773 Atom prop = display->atom (str + 1);
3774 Atom actual_type;
3775 int actual_format;
3776 unsigned long nitems;
3777 unsigned long bytes_after;
3778 unsigned char *value = 0;
3779 const char *str = "";
3780
3781 if (prop
3782 && XGetWindowProperty (disp, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None
3787 && actual_format == 8)
3788 str = (const char *)(value);
3789
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3791
3792 XFree (value);
3793 }
3794 else
3795 {
3796 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3797
3798 if (eq)
3799 {
3800 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1);
3802 }
3803 else
3804 XDeleteProperty (disp, parent[0],
3805 display->atom (str));
3806 }
3807 break;
3808
2979 case XTerm_Color: 3809 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3810 for (buf = (char *)str; buf && *buf;)
2981 { 3811 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3812 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3813 break;
2984 3814
2985 *name++ = '\0'; 3815 *name++ = '\0';
2986 color = atoi (buf); 3816 color = atoi (buf);
2987 3817
2988 if (color < 0 || color >= TOTAL_COLORS) 3818 if (color < 0 || color >= TOTAL_COLORS)
2989 break; 3819 break;
2990 3820
2991 if ((buf = STRCHR (name, ';')) != NULL) 3821 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3822 *buf++ = '\0';
2993 3823
3824 if (name[0] == '?' && !name[1])
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
2994 set_window_color (color + minCOLOR, name); 3831 set_window_color (color + minCOLOR, name);
2995 } 3832 }
3833 break;
3834 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3836 break;
3837 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3839 break;
2997#ifndef NO_CURSORCOLOR 3840#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3841 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3843 break;
3001#endif 3844#endif
3002 case XTerm_Color_pointer: 3845 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3847 break;
3848 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3850 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3851#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3852 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3853 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3008 break; 3854 break;
3009 case XTerm_Color_UL: 3855 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3857 break;
3012 case XTerm_Color_RV: 3858 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3860 break;
3015#endif 3861 case URxvt_Color_IT:
3016 3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3017 case XTerm_Menu:
3018 /*
3019 * rxvt_menubar_dispatch () violates the constness of the string,
3020 * so DON'T do it here
3021 */
3022 break; 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;
3871 break;
3872#endif
3873
3023 case XTerm_Pixmap: 3874 case XTerm_Pixmap:
3024 if (*str != ';') 3875 if (*str != ';')
3025 { 3876 {
3026#if XPM_BACKGROUND 3877#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3878 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3879 set_bgPixmap (str); /* change pixmap */
3029#endif 3880#endif
3030 scr_touch (true); 3881 scr_touch (true);
3031 } 3882 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3883 while ((str = strchr (str, ';')) != NULL)
3033 { 3884 {
3034 str++; 3885 str++;
3035#if XPM_BACKGROUND 3886#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3887 changed += scale_pixmap (str);
3037#endif 3888#endif
3038
3039 } 3889 }
3890
3040 if (changed) 3891 if (changed)
3041 { 3892 {
3042#ifdef XPM_BACKGROUND 3893#ifdef XPM_BACKGROUND
3043 resize_pixmap (); 3894 resize_pixmap ();
3044#endif 3895#endif
… …
3050 set_window_color (Color_fg, str); 3901 set_window_color (Color_fg, str);
3051 break; 3902 break;
3052 case XTerm_restoreBG: 3903 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3904 set_window_color (Color_bg, str);
3054 break; 3905 break;
3906
3055 case XTerm_logfile: 3907 case XTerm_logfile:
3056 // TODO, when secure mode? 3908 // TODO, when secure mode?
3057 break; 3909 break;
3058 case XTerm_font: 3910
3059 change_font (str); 3911#ifdef MENUBAR
3912 case URxvt_Menu:
3913 if (OPTION (Opt_insecure))
3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3060 break; 3915 break;
3061#ifndef NO_FRILLS
3062 case XTerm_locale:
3063 if (str[0] == '?' && !str[1])
3064 tt_printf ("%-.250s\n", locale);
3065 else
3066 {
3067 set_locale (str);
3068# ifdef USE_XIM
3069 im_cb ();
3070# endif
3071 }
3072 break;
3073 case XTerm_findfont:
3074 {
3075 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3077 }
3078 break;
3079#endif 3916#endif
3080#if 0 3917#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3918 case XTerm_dumpscreen: /* no error notices */
3082 { 3919 {
3083 int fd; 3920 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3921 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3922 {
3086 scr_dump (fd); 3923 scr_dump (fd);
3087 close (fd); 3924 close (fd);
3088 } 3925 }
3089 } 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
3090 break; 3982 break;
3091#endif 3983#endif
3092 } 3984 }
3093} 3985}
3094/*----------------------------------------------------------------------*/ 3986/*----------------------------------------------------------------------*/
… …
3108{ 4000{
3109 int state; 4001 int state;
3110 4002
3111 if (mode == 's') 4003 if (mode == 's')
3112 { 4004 {
3113 SavedModes |= (PrivateModes & bit); 4005 SavedModes |= (priv_modes & bit);
3114 return -1; 4006 return -1;
3115 } 4007 }
3116 else 4008 else
3117 { 4009 {
3118 if (mode == 'r') 4010 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4011 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 4012 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4013 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 4014 PrivMode (state, bit);
3123 } 4015 }
3124 4016
3125 return state; 4017 return state;
3126} 4018}
… …
3144 { 3, PrivMode_132 }, 4036 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 4037 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 4038 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 4039 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 4040 { 7, PrivMode_Autowrap },
4041 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 4042 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 4043#ifdef menuBar_esc
3151 { menuBar_esc, PrivMode_menuBar }, 4044 { menuBar_esc, PrivMode_menuBar },
3152#endif 4045#endif
4046 // 18, 19 printing-related
4047 { 25, PrivMode_VisibleCursor },
3153#ifdef scrollBar_esc 4048#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 4049 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 4050#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 4051 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 4052 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 4053 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 4054 // 45 margin bell NYI
3163 // 46 start logging 4055 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 4067 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 4068 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 4069 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 4070 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 4071 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4072 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 4073 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 4074 };
3183 4075
3184 if (nargs == 0) 4076 if (nargs == 0)
3185 return; 4077 return;
… …
3203 } 4095 }
3204 4096
3205 /* extra handling for values with state unkept */ 4097 /* extra handling for values with state unkept */
3206 switch (arg[i]) 4098 switch (arg[i])
3207 { 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
3208 case 1048: /* alternative cursor save */ 4110 case 1048: /* alternative cursor save */
3209 case 1049: 4111 case 1049:
4112 if (OPTION (Opt_secondaryScreen))
3210 if (mode == 0) 4113 if (mode == 0)
3211 scr_cursor (RESTORE); 4114 scr_cursor (RESTORE);
3212 else if (mode == 1) 4115 else if (mode == 1)
3213 scr_cursor (SAVE); 4116 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 4117 break;
3215 } 4118 }
3216 4119
3217 if (state >= 0) 4120 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 4121 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 4122 switch (arg[i])
… …
3225 * within VT52 mode 4128 * within VT52 mode
3226 */ 4129 */
3227 PrivMode (1, PrivMode_vt52); 4130 PrivMode (1, PrivMode_vt52);
3228 break; 4131 break;
3229 case 3: /* 80/132 */ 4132 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 4133 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4134 set_widthheight (((state ? 132 : 80) * fwidth), height);
3232 break; 4135 break;
3233 case 4: /* smooth scrolling */ 4136 case 4: /* smooth scrolling */
3234 if (state) 4137 if (!state)
3235 Options &= ~Opt_jumpScroll; 4138 SET_OPTION (Opt_jumpScroll);
3236 else 4139 else
3237 Options |= Opt_jumpScroll; 4140 CLR_OPTION (Opt_jumpScroll);
3238 break; 4141 break;
3239 case 5: /* reverse video */ 4142 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 4143 scr_rvideo_mode (state);
3241 break; 4144 break;
3242 case 6: /* relative/absolute origins */ 4145 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 4146 scr_relative_origin (state);
3244 break; 4147 break;
3245 case 7: /* autowrap */ 4148 case 7: /* autowrap */
3246 scr_autowrap (state); 4149 scr_autowrap (state);
3247 break; 4150 break;
3248 /* 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 */
3249 case 9: /* X10 mouse reporting */ 4152 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 4153 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 4154 priv_modes &= ~PrivMode_MouseX11;
3252 break; 4155 break;
3253#ifdef menuBar_esc 4156#ifdef menuBar_esc
3254 case menuBar_esc: 4157 case menuBar_esc:
3255#ifdef MENUBAR 4158#ifdef MENUBAR
3256 map_menuBar (state); 4159 map_menuBar (state);
… …
3267 break; 4170 break;
3268#endif 4171#endif
3269 case 25: /* visible/invisible cursor */ 4172 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4173 scr_cursor_visible (state);
3271 break; 4174 break;
3272 /* case 35: - shift keys */ 4175 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4176 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4177 case 47: /* secondary screen */
3275 scr_change_screen (state); 4178 scr_change_screen (state);
3276 break; 4179 break;
3277 /* case 66: - application key pad */ 4180 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4181 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4182 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4183 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4184 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4185 break;
3283#if 0 4186#if 0
3284 case 1001: 4187 case 1001:
3285 break; /* X11 mouse highlighting */ 4188 break; /* X11 mouse highlighting */
3286#endif 4189#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4190 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state) 4191 if (!state)
3289 Options &= ~Opt_scrollTtyOutput; 4192 SET_OPTION (Opt_scrollTtyOutput);
3290 else 4193 else
3291 Options |= Opt_scrollTtyOutput; 4194 CLR_OPTION (Opt_scrollTtyOutput);
3292 break; 4195 break;
3293 case 1011: /* scroll to bottom on key press */ 4196 case 1011: /* scroll to bottom on key press */
3294 if (state) 4197 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4198 SET_OPTION (Opt_scrollTtyKeypress);
3296 else 4199 else
3297 Options &= ~Opt_scrollTtyKeypress; 4200 CLR_OPTION (Opt_scrollTtyKeypress);
3298 break; 4201 break;
3299 case 1047: /* secondary screen w/ clearing */ 4202 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4203 if (OPTION (Opt_secondaryScreen))
3301 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4205 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4206 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4207 break;
4208 case 1049: /* secondary screen w/ clearing first */
4209 scr_change_screen (state);
4210 if (OPTION (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY)
4212 scr_erase_screen (2);
4213 break;
3306 default: 4214 default:
3307 break; 4215 break;
3308 } 4216 }
3309 } 4217 }
3310} 4218}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4241 rendset = 0, rendstyle = ~RS_None;
3334 break; 4242 break;
3335 case 1: 4243 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4244 rendset = 1, rendstyle = RS_Bold;
3337 break; 4245 break;
4246 //case 2: // low intensity
4247 case 3:
4248 rendset = 1, rendstyle = RS_Italic;
4249 break;
3338 case 4: 4250 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4251 rendset = 1, rendstyle = RS_Uline;
3340 break; 4252 break;
3341 case 5: 4253 case 5: // slowly blinking
4254 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4255 rendset = 1, rendstyle = RS_Blink;
3343 break; 4256 break;
4257 //case 6: // scoansi light background
3344 case 7: 4258 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4259 rendset = 1, rendstyle = RS_RVid;
3346 break; 4260 break;
3347 case 8: 4261 case 8:
3348 // invisible. NYI 4262 // invisible. NYI
3349 break; 4263 break;
3350 case 22: 4264 //case 9: // crossed out
4265 //case 10: // scoansi acs off, primary font
4266 //case 11: // scoansi acs on, first alt font
4267 //case 12: // scoansi acs on, |0x80, second alt font
4268 //...
4269 //case 19: // ninth alt font
4270 //case 20: // gothic
4271 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 4272 rendset = 0, rendstyle = RS_Bold;
4273 break;
4274 case 22: // normal intensity
4275 rendset = 0, rendstyle = RS_Bold;
4276 break;
4277 case 23: // disable italic
4278 rendset = 0, rendstyle = RS_Italic;
3352 break; 4279 break;
3353 case 24: 4280 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4281 rendset = 0, rendstyle = RS_Uline;
3355 break; 4282 break;
3356 case 25: 4283 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4284 rendset = 0, rendstyle = RS_Blink;
3358 break; 4285 break;
4286 case 26: // variable spacing (iso 8613)
4287 rendset = 0, rendstyle = RS_Blink;
4288 break;
3359 case 27: 4289 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4290 rendset = 0, rendstyle = RS_RVid;
3361 break; 4291 break;
3362 case 28:
3363 // visible. NYI 4292 //case 28: // visible. NYI
3364 break; 4293 //case 29: // not crossed-out
3365 } 4294 }
3366 4295
3367 if (rendset != -1) 4296 if (rendset != -1)
3368 { 4297 {
3369 scr_rendition (rendset, rendstyle); 4298 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 4309 case 35:
3381 case 36: 4310 case 36:
3382 case 37: 4311 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4312 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 4313 break;
3385#ifdef TTY_256COLOR 4314 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 4315 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 4316 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4317 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 4318 i += 2;
3391 } 4319 }
3392 break; 4320 break;
3393#endif
3394 case 39: /* default fg */ 4321 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 4322 scr_color (Color_fg, Color_fg);
3396 break; 4323 break;
3397 4324
3398 case 40: 4325 case 40:
… …
3403 case 45: 4330 case 45:
3404 case 46: 4331 case 46:
3405 case 47: 4332 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4333 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 4334 break;
3408#ifdef TTY_256COLOR 4335 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 4336 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 4337 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4338 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 4339 i += 2;
3414 } 4340 }
3415 break; 4341 break;
3416#endif
3417 case 49: /* default bg */ 4342 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 4343 scr_color (Color_bg, Color_bg);
3419 break; 4344 break;
4345
4346 //case 50: // not variable spacing
3420 4347
3421#ifndef NO_BRIGHTCOLOR 4348#ifndef NO_BRIGHTCOLOR
3422 case 90: 4349 case 90:
3423 case 91: /* set bright fg color */ 4350 case 91: /* set bright fg color */
3424 case 92: 4351 case 92:
3425 case 93: 4352 case 93:
3426 case 94: 4353 case 94:
3427 case 95: 4354 case 95:
3428 case 96: 4355 case 96:
3429 case 97: 4356 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4357 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4358 break;
3433 case 100: 4359 case 100:
3434 case 101: /* set bright bg color */ 4360 case 101: /* set bright bg color */
3435 case 102: 4361 case 102:
3436 case 103: 4362 case 103:
3437 case 104: 4363 case 104:
3438 case 105: 4364 case 105:
3439 case 106: 4365 case 106:
3440 case 107: 4366 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4367 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4368 break;
3444#endif 4369#endif
3445
3446 } 4370 }
3447 } 4371 }
3448} 4372}
3449/*}}} */ 4373/*}}} */
3450 4374
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4375/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4376void
3453rxvt_term::process_graphics () 4377rxvt_term::process_graphics ()
3454{ 4378{
3455 unicode_t ch, cmd = cmd_getc (); 4379 unicode_t ch, cmd = cmd_getc ();
3456 4380
3457 if (cmd == 'Q') 4381 if (cmd == 'Q')
3458 { /* query graphics */ 4382 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4383 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4384 return;
3461 } 4385 }
3462 /* swallow other graphics sequences until terminating ':' */ 4386 /* swallow other graphics sequences until terminating ':' */
3463 do 4387 do
3464 ch = cmd_getc (); 4388 ch = cmd_getc ();
… …
3479 unsigned char buf[256]; 4403 unsigned char buf[256];
3480 4404
3481 va_start (arg_ptr, fmt); 4405 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4406 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4407 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4408 tt_write (buf, strlen (buf));
3485} 4409}
3486 4410
3487/* ---------------------------------------------------------------------- */ 4411/* ---------------------------------------------------------------------- */
3488/* 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,
3489 * or generated by us in response to a query ESC sequence. 4413 * or generated by us in response to a query ESC sequence.
3490 */ 4414 */
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416
3491void 4417void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4418rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3493{ 4419{
3494 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));
3495 4423
3496 if (len) 4424 if ((unsigned int)written == len)
4425 return;
4426
4427 data += written;
4428 len -= written;
3497 { 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
3498 if (v_buflen == 0) 4447 if (v_buflen == 0)
3499 { 4448 {
3500 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3501
3502 if ((unsigned int)written == len)
3503 return;
3504
3505 data += written;
3506 len -= written;
3507 }
3508
3509
3510 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3511
3512 memcpy (v_buffer + v_buflen, data, len);
3513 v_buflen += len;
3514 }
3515
3516 for (;;)
3517 {
3518 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3519
3520 if (written > 0)
3521 {
3522 v_buflen -= written;
3523
3524 if (v_buflen == 0)
3525 {
3526 free (v_buffer); 4449 free (v_buffer);
3527 v_buffer = 0; 4450 v_buffer = 0;
3528 v_buflen = 0; 4451 v_buflen = 0;
3529 4452
3530 pty_ev.set (EVENT_READ); 4453 pty_ev.set (EVENT_READ);
3531 return;
3532 }
3533
3534 memmove (v_buffer, v_buffer + written, v_buflen);
3535 }
3536 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3537 // original code just ignores this...
3538 destroy ();
3539 else
3540 {
3541 pty_ev.set (EVENT_READ | EVENT_WRITE);
3542 return; 4454 return;
3543 } 4455 }
4456
4457 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4458 }
4459 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4460 pty_ev.set (EVENT_READ);
3545} 4461}
3546 4462
3547/*----------------------- end-of-file (C source) -----------------------*/ 4463/*----------------------- end-of-file (C source) -----------------------*/
3548 4464

Diff Legend

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