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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.229 by root, Tue Jan 3 17:34:44 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 break; 1505 break;
1138 1506
1139 case SelectionClear: 1507 case SelectionClear:
1140 selection_clear (); 1508 selection_clear ();
1141 break; 1509 break;
1142 1510
1143 case SelectionNotify: 1511 case SelectionNotify:
1144 if (selection_wait == Sel_normal) 1512 if (selection_wait == Sel_normal)
1145 selection_paste (ev.xselection.requestor, 1513 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1146 ev.xselection.property, True);
1147 break; 1514 break;
1148 1515
1149 case SelectionRequest: 1516 case SelectionRequest:
1150 selection_send (ev.xselectionrequest); 1517 selection_send (ev.xselectionrequest);
1151 break; 1518 break;
1152 1519
1153 case UnmapNotify: 1520 case UnmapNotify:
1154 TermWin.mapped = 0; 1521 mapped = 0;
1155#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1156 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1157#endif 1524#endif
1158 break; 1525 break;
1159 1526
1160 case MapNotify: 1527 case MapNotify:
1161 TermWin.mapped = 1; 1528 mapped = 1;
1162#ifdef TEXT_BLINK 1529#ifdef TEXT_BLINK
1163 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1164#endif 1531#endif
1165 break; 1532 break;
1166 1533
… …
1170 break; 1537 break;
1171#endif /* TRANSPARENT */ 1538#endif /* TRANSPARENT */
1172 1539
1173 case GraphicsExpose: 1540 case GraphicsExpose:
1174 case Expose: 1541 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1542 if (ev.xany.window == vt)
1176 { 1543 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1544 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1181 // 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))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1554
1185 // ev.xexpose.width, TermWin.height, False); 1555 scr_refresh (refresh_type);
1186#endif
1187 want_refresh = 1;
1188 } 1556 }
1189 else 1557 else
1190 { 1558 {
1191 XEvent unused_event; 1559 XEvent unused_event;
1192 1560
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1194 Expose, 1562 ;
1195 &unused_event)) ; 1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1564 ;
1197 GraphicsExpose, 1565
1198 &unused_event)) ;
1199 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1200 { 1567 {
1201 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1202 scrollbar_show (0); 1569 scrollbar_show (0);
1203 } 1570 }
1204#ifdef MENUBAR 1571#ifdef MENUBAR
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206 menubar_expose (); 1573 menubar_expose ();
1207#endif 1574#endif
1575
1576#ifdef TRANSPARENT
1577 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window);
1579#endif
1208 } 1580 }
1209 break; 1581 break;
1210 1582
1211 case MotionNotify: 1583 case MotionNotify:
1212#ifdef POINTER_BLANK 1584#ifdef POINTER_BLANK
… …
1218 { 1590 {
1219 menubar_control (ev.xbutton); 1591 menubar_control (ev.xbutton);
1220 break; 1592 break;
1221 } 1593 }
1222#endif 1594#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1224 break; 1596 break;
1225 1597
1226 if (ev.xany.window == TermWin.vt) 1598 if (ev.xany.window == vt)
1227 { 1599 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1600 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1601 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1231 ; 1603 ;
1232 1604
1233 XQueryPointer (display->display, TermWin.vt, 1605 XQueryPointer (disp, vt,
1234 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1608 &ev.xbutton.x, &ev.xbutton.y,
1237 &unused_mask); 1609 &ev.xbutton.state);
1238#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1613 {
1242#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
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1623 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1624 ev.xbutton.state & Button3Mask ? 2 : 0);
1625
1245#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1248 { 1629 {
1249 int dist; 1630 int dist;
1250
1251 pending_scroll_selection=1;
1252 1631
1253 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
1255 */ 1634 */
1256 if (scroll_selection_delay<=0) 1635 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1637
1259 /* save the event params so we can highlight 1638 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1639 * the selection in the pending-scroll loop
1261 */ 1640 */
1262 selection_save_x=ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1642 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1643 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1644
1267 /* calc number of lines to scroll */ 1645 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1646 if (ev.xbutton.y < int_bwidth)
1269 { 1647 {
1270 scroll_selection_dir = UP; 1648 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1272 } 1650 }
1273 else 1651 else
1274 { 1652 {
1275 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y - 1654 dist = ev.xbutton.y - (int_bwidth + height);
1277 (TermWin.int_bwidth + TermWin.height);
1278 } 1655 }
1656
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1657 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1659 + 1;
1281 MIN_IT (scroll_selection_lines, 1660 min_it (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1661 SELECTION_SCROLL_MAX_LINES);
1283 } 1662 }
1284 else 1663 else
1285 { 1664 {
1286 /* we are within the text window, so we 1665 /* we are within the text window, so we
1287 * shouldn't be scrolling 1666 * shouldn't be scrolling
1288 */ 1667 */
1289 pending_scroll_selection = 0; 1668 if (sel_scroll_ev.active)
1669 sel_scroll_ev.stop();
1290 } 1670 }
1291#endif 1671#endif
1292#ifdef MOUSE_THRESHOLD 1672#ifdef MOUSE_THRESHOLD
1293
1294 } 1673 }
1295#endif 1674#endif
1296
1297 } 1675 }
1298 } 1676 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1678 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1679 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1302 MotionNotify, &ev)) ; 1680 MotionNotify, &ev))
1681 ;
1682
1303 XQueryPointer (display->display, scrollBar.win, 1683 XQueryPointer (disp, scrollBar.win,
1304 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1686 &ev.xbutton.x, &ev.xbutton.y,
1307 &unused_mask); 1687 &unused_mask);
1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1309 scrollbar_size ()); 1689 scrollbar_size ());
1310 scr_refresh (refresh_type); 1690 scr_refresh (refresh_type);
1311 refresh_limit = 0; 1691 refresh_limit = 0;
… …
1314 break; 1694 break;
1315 } 1695 }
1316} 1696}
1317 1697
1318void 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
1319rxvt_term::rootwin_cb (XEvent &ev) 1769rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1770{
1321 SET_R (this); 1771 SET_R (this);
1322 SET_LOCALE (locale); 1772 SET_LOCALE (locale);
1323 1773
1324 switch (ev.type) 1774 switch (ev.type)
1325 { 1775 {
1326 case PropertyNotify: 1776 case PropertyNotify:
1327 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1328 {
1329 if (ev.xproperty.state == PropertyNewValue)
1330 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 break;
1332 }
1333#ifdef TRANSPARENT
1334 else
1335 {
1336 /* 1777 /*
1337 * 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,
1338 * 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.
1339 */ 1780 */
1340 if (xa[XA_XROOTPMAPID] == 0)
1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1342
1343 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])
1344 return; 1783 return;
1345 }
1346 1784
1347 /* FALLTHROUGH */ 1785 /* FALLTHROUGH */
1348 case ReparentNotify: 1786 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1; 1788 want_refresh = want_full_refresh = 1;
1351 break; 1789 break;
1352#endif
1353 } 1790 }
1354} 1791}
1792#endif
1355 1793
1356void 1794void
1357rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
1358{ 1796{
1359 int reportmode = 0, clickintime; 1797 int reportmode = 0, clickintime;
1360 1798
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1800
1362 if (!bypass_keystate) 1801 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1802 reportmode = !! (priv_modes & PrivMode_mouse_report);
1803
1364 /* 1804 /*
1365 * VT window processing of button press 1805 * VT window processing of button press
1366 */ 1806 */
1367 if (ev.window == TermWin.vt) 1807 if (ev.window == vt)
1368 { 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
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1818 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1819
1370 if (reportmode) 1820 if (reportmode)
1371 { 1821 {
1372 /* mouse report from vt window */ 1822 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1823 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state; 1824 MEvent.state = ev.state;
… …
1403 } 1853 }
1404 else 1854 else
1405 { 1855 {
1406 if (ev.button != MEvent.button) 1856 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1857 MEvent.clicks = 0;
1858
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1408 switch (ev.button) 1860 switch (ev.button)
1409 { 1861 {
1410 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
1411 /* allow shift+left click to extend selection */ 1871 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1413 { 1873 {
1414 if (MEvent.button == Button1 && clickintime) 1874 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1875 selection_rotate (ev.x, ev.y);
1416 else 1876 else
1417 selection_extend (ev.x, ev.y, 1); 1877 selection_extend (ev.x, ev.y, 1);
1418 } 1878 }
1419 else 1879 else
1420 { 1880 {
1421 if (MEvent.button == Button1 && clickintime) 1881 if (MEvent.button == Button1 && clickintime)
1422 MEvent.clicks++; 1882 MEvent.clicks++;
1423 else 1883 else
1424 MEvent.clicks = 1; 1884 MEvent.clicks = 1;
1425 1885
1426 selection_click (MEvent.clicks, ev.x, ev.y); 1886 selection_click (MEvent.clicks, ev.x, ev.y);
1427 } 1887 }
1428 1888
1429 MEvent.button = Button1; 1889 MEvent.button = Button1;
1430 break; 1890 break;
1431 1891
1432 case Button3: 1892 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1893 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1894 selection_rotate (ev.x, ev.y);
1435 else 1895 else
1436 selection_extend (ev.x, ev.y, 1); 1896 selection_extend (ev.x, ev.y, 1);
1897
1437 MEvent.button = Button3; 1898 MEvent.button = Button3;
1438 break; 1899 break;
1439 } 1900 }
1440 } 1901 }
1902
1441 MEvent.time = ev.time; 1903 MEvent.time = ev.time;
1442 return; 1904 return;
1443 } 1905 }
1444 1906
1445 /* 1907 /*
… …
1511 upordown = 1; /* down */ 1973 upordown = 1; /* down */
1512 } 1974 }
1513 if (upordown) 1975 if (upordown)
1514 { 1976 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1977#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1978 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 1979#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 1980 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 1981 {
1520 if (upordown < 0) 1982 if (upordown < 0)
1521 scrollBar.setUp (); 1983 scrollBar.setUp ();
… …
1537 break; 1999 break;
1538 case R_SB_ALIGN_BOTTOM: 2000 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 2001 csrO = scrollBar.bot - scrollBar.top;
1540 break; 2002 break;
1541 } 2003 }
2004
1542 if (scrollBar.style == R_SB_XTERM 2005 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 2006 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 2007 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 2008 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 2009
1547 scrollBar.setMotion (); 2010 scrollBar.setMotion ();
1548 break; 2011 break;
1549 2012
1550 case Button1: 2013 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2014 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1555 case Button3: 2018 case Button3:
1556 if (scrollBar.style != R_SB_XTERM) 2019 if (scrollBar.style != R_SB_XTERM)
1557 { 2020 {
1558 if (scrollbar_above_slider (ev.y)) 2021 if (scrollbar_above_slider (ev.y))
1559# ifdef RXVT_SCROLL_FULL 2022# ifdef RXVT_SCROLL_FULL
1560 scr_page (UP, TermWin.nrow - 1); 2023 scr_page (UP, nrow - 1);
1561# else 2024# else
1562 scr_page (UP, TermWin.nrow / 4); 2025 scr_page (UP, nrow / 4);
1563# endif 2026# endif
1564 else if (scrollbar_below_slider (ev.y)) 2027 else if (scrollbar_below_slider (ev.y))
1565# ifdef RXVT_SCROLL_FULL 2028# ifdef RXVT_SCROLL_FULL
1566 scr_page (DN, TermWin.nrow - 1); 2029 scr_page (DN, nrow - 1);
1567# else 2030# else
1568 scr_page (DN, TermWin.nrow / 4); 2031 scr_page (DN, nrow / 4);
1569# endif 2032# endif
1570 else 2033 else
1571 scrollBar.setMotion (); 2034 scrollBar.setMotion ();
1572 } 2035 }
1573 else 2036 else
1574 { 2037 {
1575 scr_page ((ev.button == Button1 ? DN : UP), 2038 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 2039 (nrow
1577 * scrollbar_position (ev.y) 2040 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 2041 / scrollbar_size ()));
1579 } 2042 }
2043
1580 break; 2044 break;
1581 } 2045 }
1582 } 2046 }
1583 return; 2047 return;
1584 } 2048 }
… …
1596{ 2060{
1597 int reportmode = 0; 2061 int reportmode = 0;
1598 2062
1599 csrO = 0; /* reset csr Offset */ 2063 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 2064 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2065 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 2066
1603 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
1604 { 2068 {
1605 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
1606 scrollbar_show (0); 2070 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH; 2072 refresh_type &= ~SMOOTH_REFRESH;
1609#endif 2073#endif
1610
1611 } 2074 }
2075
1612#ifdef SELECTION_SCROLLING 2076#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 2077 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop();
1614#endif 2079#endif
2080
1615 if (ev.window == TermWin.vt) 2081 if (ev.window == vt)
1616 { 2082 {
2083#if ISO_14755
2084 // 5.4
2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2086 return;
2087#endif
1617 if (reportmode) 2088 if (reportmode)
1618 { 2089 {
1619 /* mouse report from vt window */ 2090 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 2091 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 2092 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
1636 mouse_report (ev); 2107 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 2109 return;
1639 } 2110 }
2111
1640 /* 2112 /*
1641 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 2114 * when overriding mouse reporting
1643 */ 2115 */
1644 if (PrivateModes & PrivMode_mouse_report 2116 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2117 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2118 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2119 selection_extend (ev.x, ev.y, 0);
1648 2120
1649 switch (ev.button) 2121 switch (ev.button)
… …
1660 case Button5: 2132 case Button5:
1661 { 2133 {
1662 int i; 2134 int i;
1663 page_dirn v; 2135 page_dirn v;
1664 2136
1665 v = (ev.button == Button4) ? UP : DN; 2137 v = ev.button == Button4 ? UP : DN;
2138
1666 if (ev.state & ShiftMask) 2139 if (ev.state & ShiftMask)
1667 i = 1; 2140 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2141 else if (OPTION (Opt_mouseWheelScrollPage))
1669 i = TermWin.nrow - 1; 2142 i = nrow - 1;
1670 else 2143 else
1671 i = 5; 2144 i = 5;
2145
1672# ifdef MOUSE_SLIP_WHEELING 2146# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2147 if (ev.state & ControlMask)
1674 { 2148 {
1675 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)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2154 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2155
2156 slip_wheel_ev.start ();
1677 } 2157 }
2158 else
2159 {
1678# endif 2160# endif
1679# ifdef JUMP_MOUSE_WHEEL 2161# ifdef JUMP_MOUSE_WHEEL
1680 scr_page (v, i);
1681 scr_refresh (SMOOTH_REFRESH);
1682 scrollbar_show (1);
1683# else
1684 while (i--)
1685 {
1686 scr_page (v, 1); 2162 scr_page (v, i);
1687 scr_refresh (SMOOTH_REFRESH); 2163 scr_refresh (SMOOTH_REFRESH);
1688 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
1689 } 2174 }
1690# endif 2175#endif
1691
1692 } 2176 }
1693 break; 2177 break;
1694#endif 2178#endif
1695
1696 } 2179 }
1697 } 2180 }
1698#ifdef MENUBAR 2181#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window)) 2182 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev); 2183 menubar_control (ev);
1701#endif 2184#endif
1702} 2185}
1703 2186
1704#ifdef TRANSPARENT 2187#ifdef TRANSPARENT
1705#if TINTING 2188#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2189/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2190
1709static void 2191typedef uint32_t RUINT32T;
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714 2192
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2193void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2194{
1717 /* No saturation */ 2195 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2196 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2197 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 int r, g, 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;
1721 2201
1722 b = ((uint16_t *) ptr)[x]; 2202 Visual *visual = display->visual;
1723 r = (b & 0x7c00) * rm; 2203
1724 g = (b & 0x3e0) * gm; 2204 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2205
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2206 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2207 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2208 mask_g = visual->green_mask;
1729 } 2209 mask_b = visual->blue_mask;
1730 ptr += bpl; 2210
1731 } 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;
1732 } else { 2284 } else {
1733 for (y = h; --y >= 0;) { 2285 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2286 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2287
1737 b = ((uint16_t *) ptr)[x]; 2288 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2289
1739 g = (b & 0x3e0) * gm; 2290 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2291 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2292 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2293 }
1743 b |= (!(b >> 5) - 1); 2294
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2295 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745 | ((g >> 8) & 0x3e0) 2296 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2297 {
1747 } 2298 unsigned int tmp;
1748 ptr += bpl; 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++)
1749 } 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);
1750 } 2351 }
1751} 2352 break;
1752 2353 }
1753/* RGB 16 */ 2354 case 16:
1754static void 2355 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2356 unsigned short *p1, *pf, *p, *pl;
1756{ 2357 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2359 while (p1 < pf)
1759 2360 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2361 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2362 pl = p1 + srcImage->width;
1762 /* No saturation */ 2363 for (; p < pl; p++)
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 } 2364 {
1777 } else { 2365 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2366 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2367 lookup_b[(*p & 0x001f)];
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 } 2368 }
1793 ptr += bpl; 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)
1794 } 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);
1795 } 2389 }
1796} 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);
1797 2397
1798/* RGB 24 */ 2398 while (p1 < pf)
1799static void 2399 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2400 p = p1;
1801{ 2401 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2402 for (; p < pl; p++)
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1826 }
1827 }
1828 ptr += bpl;
1829 } 2403 {
1830 } else { 2404 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2405 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2406 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2407 (*p & ~0xffffff);
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1860 } 2408 }
1861 ptr += bpl; 2409 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2410 }
2411 break;
2412 }
1863 } 2413 }
1864}
1865 2414
1866/* RGB 32 */ 2415 free (lookup);
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1872
1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936} 2416}
1937
1938#endif 2417#endif
1939 2418
1940/* 2419/*
1941 * Check our parents are still who we think they are. 2420 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2421 * Do transparency updates if required
… …
1949 Atom atype; 2428 Atom atype;
1950 unsigned char *prop = NULL; 2429 unsigned char *prop = NULL;
1951 Window root, oldp, *list; 2430 Window root, oldp, *list;
1952 Pixmap rootpixmap = None; 2431 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2432 XWindowAttributes wattr, wrootattr;
2433 dDisp;
1954 2434
1955 pchanged = 0; 2435 pchanged = 0;
1956 2436
1957 if (!(Options & Opt_transparent)) 2437 if (!OPTION (Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
1959 2439
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2440 XGetWindowAttributes (disp, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2441 rootdepth = wrootattr.depth;
1962 2442
1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2443 XGetWindowAttributes (disp, parent[0], &wattr);
1964 2444
1965 if (rootdepth != wattr.depth) 2445 if (rootdepth != wattr.depth)
1966 { 2446 {
1967 if (am_transparent) 2447 if (am_transparent)
1968 { 2448 {
1969 pchanged = 1; 2449 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2450 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2451 am_transparent = am_pixmap_trans = 0;
1972 } 2452 }
1973 2453
1974 return pchanged; /* Don't try any more */ 2454 return pchanged; /* Don't try any more */
1975 } 2455 }
1976 2456
1977 /* 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. */
1978 XSync (display->display, False); 2458 XSync (disp, False);
1979 2459
1980 /* 2460 /*
1981 * Make the frame window set by the window manager have 2461 * Make the frame window set by the window manager have
1982 * the root background. Some window managers put multiple nested frame 2462 * the root background. Some window managers put multiple nested frame
1983 * 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.
1984 */ 2464 */
1985 i = (xa[XA_XROOTPMAPID] 2465 i = (xa[XA_XROOTPMAP_ID]
1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2466 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1988 &nitems, &bytes_after, &prop) == Success); 2468 &nitems, &bytes_after, &prop) == Success);
1989 2469
1990 if (!i || prop == NULL) 2470 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID] 2471 i = (xa[XA_ESETROOT_PMAP_ID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2472 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2474 &nitems, &bytes_after, &prop) == Success);
1995 2475
1996 if (!i || prop == NULL) 2476 if (!i || prop == NULL
2477#if TINTING
2478 || !rs[Rs_color + Color_tint]
2479#endif
2480 )
1997 have_pixmap = 0; 2481 have_pixmap = 0;
1998 else 2482 else
1999 { 2483 {
2000 have_pixmap = 1; 2484 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2485 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2486 XFree (prop);
2003 } 2487 }
2004 2488
2005 if (have_pixmap) 2489 if (have_pixmap)
2006 { 2490 {
… …
2012 Window cr; 2496 Window cr;
2013 XImage *image; 2497 XImage *image;
2014 GC gc; 2498 GC gc;
2015 XGCValues gcvalue; 2499 XGCValues gcvalue;
2016 2500
2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2501 XTranslateCoordinates (disp, parent[0], display->root,
2018 0, 0, &sx, &sy, &cr); 2502 0, 0, &sx, &sy, &cr);
2019 nw = (unsigned int)szHint.width; 2503 nw = (unsigned int)szHint.width;
2020 nh = (unsigned int)szHint.height; 2504 nh = (unsigned int)szHint.height;
2021 nx = ny = 0; 2505 nx = ny = 0;
2022 2506
… …
2032 nh += sy; 2516 nh += sy;
2033 ny = -sy; 2517 ny = -sy;
2034 sy = 0; 2518 sy = 0;
2035 } 2519 }
2036 2520
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2521 min_it (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2522 min_it (nh, (unsigned int) (wrootattr.height - sy));
2523
2524 XSync (disp, False);
2039 allowedxerror = -1; 2525 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2526 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 2527
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2528 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2529 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 2530 allowedxerror = 0;
2045 2531
2046 if (image == NULL) 2532 if (image == NULL)
2047 { 2533 {
2048 if (am_transparent && am_pixmap_trans) 2534 if (am_transparent && am_pixmap_trans)
2049 { 2535 {
2050 pchanged = 1; 2536 pchanged = 1;
2051 if (TermWin.pixmap != None) 2537 if (pixmap != None)
2052 { 2538 {
2053 XFreePixmap (display->display, TermWin.pixmap); 2539 XFreePixmap (disp, pixmap);
2054 TermWin.pixmap = None; 2540 pixmap = None;
2055 } 2541 }
2056 } 2542 }
2057 2543
2058 am_pixmap_trans = 0; 2544 am_pixmap_trans = 0;
2059 } 2545 }
2060 else 2546 else
2061 { 2547 {
2062 if (TermWin.pixmap != None) 2548 if (pixmap != None)
2063 XFreePixmap (display->display, TermWin.pixmap); 2549 XFreePixmap (disp, pixmap);
2064 2550
2065#if TINTING 2551#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2552 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2553 {
2068 unsigned short shade, rm, gm, bm; 2554 unsigned short rm, gm, bm;
2555 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2556
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2557 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2071 2558
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2559 ShadeXImage (display, image, shade, rm, gm, bm);
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 } 2560 }
2083#endif 2561#endif
2084 2562
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2563 pixmap = XCreatePixmap (disp, vt,
2086 szHint.width, szHint.height, image->depth); 2564 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2565 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2566 XPutImage (disp, pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2567 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2568 XFreeGC (disp, gc);
2091 XDestroyImage (image); 2569 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2570 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2093 TermWin.pixmap); 2571 XClearWindow (disp, parent[0]);
2094 2572
2095 if (!am_transparent || !am_pixmap_trans) 2573 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2574 pchanged = 1;
2097 2575
2098 am_transparent = am_pixmap_trans = 1; 2576 am_transparent = am_pixmap_trans = 1;
2099 } 2577 }
2100 } 2578 }
2101 2579
2102 if (!am_pixmap_trans) 2580 if (am_pixmap_trans)
2581 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2582 else
2103 { 2583 {
2104 unsigned int n; 2584 unsigned int n;
2105 /* 2585 /*
2106 * InheritPixmap transparency 2586 * InheritPixmap transparency
2107 */ 2587 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2588 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2110 { 2589 {
2111 oldp = TermWin.parent[i]; 2590 oldp = parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2591 XQueryTree (disp, parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n); 2592 &parent[i], &list, &n);
2114 XFree (list); 2593 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2594
2117 if (TermWin.parent[i] == display->root) 2595 if (parent[i] == display->root)
2118 { 2596 {
2119 if (oldp != None) 2597 if (oldp != None)
2120 pchanged = 1; 2598 pchanged = 1;
2121 2599
2122 break; 2600 break;
2123 } 2601 }
2124 2602
2125 if (oldp != TermWin.parent[i]) 2603 if (oldp != parent[i])
2126 pchanged = 1; 2604 pchanged = 1;
2127 } 2605 }
2128 2606
2129 n = 0; 2607 n = 0;
2130 2608
2131 if (pchanged) 2609 if (pchanged)
2132 { 2610 {
2133 for (; n < (unsigned int)i; n++) 2611 for (; n < (unsigned int)i; n++)
2134 { 2612 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2613 XGetWindowAttributes (disp, parent[n], &wattr);
2136 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2137 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2614 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2615 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2616 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2140 break; 2617 break;
2141 } 2618 }
2142 } 2619 }
2143 } 2620 }
2144 2621
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2622 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2146 { 2623 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2624 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2625 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2626 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2627 /* XXX: also turn off Opt_transparent? */
2152 } 2628 }
2153 else 2629 else
2154 { 2630 {
2155#if WAIT_FOR_WM 2631#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing 2632 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */ 2633 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1); 2634 sleep (1);
2159#endif 2635#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2636 for (n = 0; n < (unsigned int)i; n++)
2637 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2638 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2639 XClearWindow (disp, parent[n]);
2640 }
2163 2641
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2642 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2165 am_transparent = 1; 2643 am_transparent = 1;
2166 } 2644 }
2167 2645
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2646 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None; 2647 parent[i] = None;
2648 }
2649
2650 if (scrollBar.win)
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 ();
2170 } 2662 }
2171 2663
2172 return pchanged; 2664 return pchanged;
2173} 2665}
2174#endif 2666#endif
… …
2191 } 2683 }
2192 2684
2193 if (ch == NOCHAR) // TODO: improve 2685 if (ch == NOCHAR) // TODO: improve
2194 break; 2686 break;
2195 2687
2196 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)
2197 { 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
2198 /* Read a text string from the input buffer */ 2704 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2705 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2706 bool refreshnow = false;
2201 int nlines = 0; 2707 int nlines = 0;
2202 unicode_t *str = buf; 2708 unicode_t *str = buf;
2203 2709 unicode_t *eol = str + min (ncol, UBUFSIZ);
2204 *str++ = ch;
2205 2710
2206 for (;;) 2711 for (;;)
2207 { 2712 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 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))
2212 break; 2714 break;
2213 2715
2214 *str++ = ch; 2716 *str++ = ch;
2215 2717
2216 if (ch == '\n') 2718 if (ch == C0_LF || str >= eol)
2217 { 2719 {
2720 if (ch == C0_LF)
2218 nlines++; 2721 nlines++;
2722
2219 refresh_count++; 2723 refresh_count++;
2220 2724
2221 if (! (Options & Opt_jumpScroll) 2725 if (!OPTION (Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2726 || (refresh_count >= refresh_limit * (nrow - 1)))
2223 { 2727 {
2224 refreshnow = true; 2728 refreshnow = true;
2225 flag = true; 2729 refresh_count = 0;
2226 ch = NOCHAR; 2730 ch = NOCHAR;
2227 break; 2731 break;
2228 } 2732 }
2229 2733
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2734 // scr_add_lines only works for nlines <= nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2735 if (nlines >= nrow - 1)
2232 { 2736 {
2233 scr_add_lines (buf, nlines, str - buf); 2737 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0; 2738 nlines = 0;
2235 str = buf; 2739 str = buf;
2740 eol = str + min (ncol, UBUFSIZ);
2236 } 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
2237 } 2754 }
2238 2755
2239 if (str >= buf + UBUFSIZ) 2756 seq_begin = cmdbuf_ptr;
2240 { 2757 ch = next_char ();
2241 ch = NOCHAR;
2242 break;
2243 }
2244 } 2758 }
2245 2759
2246 scr_add_lines (buf, nlines, str - buf); 2760 scr_add_lines (buf, nlines, str - buf);
2247 2761
2248 /* 2762 /*
2249 * 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
2250 * 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.
2251 * the number of pages between refreshes is refresh_limit, which 2765 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2766 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */ 2767 */
2257 if (refreshnow) 2768 if (refreshnow)
2258 { 2769 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2770 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2771 refresh_limit++;
2261 2772 else
2773 {
2774 flag = true;
2262 scr_refresh (refresh_type); 2775 scr_refresh (refresh_type);
2776 flush_ev.stop ();
2777 }
2263 } 2778 }
2264 2779
2265 } 2780 }
2266 else 2781 else
2267 { 2782 {
… …
2281 } 2796 }
2282 2797
2283 return flag; 2798 return flag;
2284} 2799}
2285 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
2286// read the next character 2810// read the next character
2287unicode_t 2811unicode_t
2288rxvt_term::next_char () 2812rxvt_term::next_char ()
2289{ 2813{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2814 while (cmdbuf_ptr < cmdbuf_endp)
… …
2306 if (len == (size_t)-1) 2830 if (len == (size_t)-1)
2307 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
2308 2832
2309 // assume wchar == unicode 2833 // assume wchar == unicode
2310 cmdbuf_ptr += len; 2834 cmdbuf_ptr += len;
2311 return wc; 2835 return wc & UNICODE_MASK;
2312 } 2836 }
2313 2837
2314 return NOCHAR; 2838 return NOCHAR;
2315} 2839}
2316 2840
… …
2321 */ 2845 */
2322unicode_t 2846unicode_t
2323rxvt_term::cmd_getc () 2847rxvt_term::cmd_getc ()
2324{ 2848{
2325 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 ();
2326 2861
2327 if (c == NOCHAR) 2862 if (c == NOCHAR)
2328 throw out_of_input; 2863 throw out_of_input;
2329 2864
2330 return c; 2865 return c;
… …
2431 process_escape_seq (); 2966 process_escape_seq ();
2432 break; 2967 break;
2433 case C0_ENQ: /* terminal Status */ 2968 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2969 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2970 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2971 (unsigned int)strlen (rs[Rs_answerbackstring]));
2437 else 2972 else
2438 tt_write ((unsigned char *)VT100_ANS, 2973 tt_write ((unsigned char *)VT100_ANS,
2439 (unsigned int)STRLEN (VT100_ANS)); 2974 (unsigned int)strlen (VT100_ANS));
2440 break; 2975 break;
2441 case C0_BEL: /* bell */ 2976 case C0_BEL: /* bell */
2442 scr_bell (); 2977 scr_bell ();
2443 break; 2978 break;
2444 case C0_BS: /* backspace */ 2979 case C0_BS: /* backspace */
… …
2460 break; 2995 break;
2461 case C0_SI: /* shift in - acs */ 2996 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2997 scr_charset_choose (0);
2463 break; 2998 break;
2464 2999
3000#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 3001 // 8-bit controls
2466 case 0x90: /* DCS */ 3002 case 0x90: /* DCS */
2467 process_dcs_seq (); 3003 process_dcs_seq ();
2468 break; 3004 break;
2469 case 0x9b: /* CSI */ 3005 case 0x9b: /* CSI */
2470 process_csi_seq (); 3006 process_csi_seq ();
2471 break; 3007 break;
2472 case 0x9d: /* CSI */ 3008 case 0x9d: /* CSI */
2473 process_osc_seq (); 3009 process_osc_seq ();
2474 break; 3010 break;
3011#endif
2475 } 3012 }
2476} 3013}
2477/*}}} */ 3014/*}}} */
2478 3015
2479 3016
… …
2541void 3078void
2542rxvt_term::process_escape_seq () 3079rxvt_term::process_escape_seq ()
2543{ 3080{
2544 unicode_t ch = cmd_getc (); 3081 unicode_t ch = cmd_getc ();
2545 3082
2546 if (PrivateModes & PrivMode_vt52) 3083 if (priv_modes & PrivMode_vt52)
2547 { 3084 {
2548 process_escape_vt52 (ch); 3085 process_escape_vt52 (ch);
2549 return; 3086 return;
2550 } 3087 }
2551 3088
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 3103 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 3104 break;
2568 case '+': 3105 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 3106 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 3107 break;
2571#ifndef NO_FRILLS 3108#if ENABLE_FRILLS
2572 case '6': 3109 case '6':
2573 scr_backindex (); 3110 scr_backindex ();
2574 break; 3111 break;
2575#endif 3112#endif
2576 case '7': 3113 case '7':
2577 scr_cursor (SAVE); 3114 scr_cursor (SAVE);
2578 break; 3115 break;
2579 case '8': 3116 case '8':
2580 scr_cursor (RESTORE); 3117 scr_cursor (RESTORE);
2581 break; 3118 break;
2582#ifndef NO_FRILLS 3119#if ENABLE_FRILLS
2583 case '9': 3120 case '9':
2584 scr_forwardindex (); 3121 scr_forwardindex ();
2585 break; 3122 break;
2586#endif 3123#endif
2587 case '=': 3124 case '=':
… …
2597 break; 3134 break;
2598 3135
2599 /* 8.3.87: NEXT LINE */ 3136 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 3137 case C1_NEL: /* ESC E */
2601 { 3138 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 3139 unicode_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 3140 scr_add_lines (nlcr, 1, 2);
2604 } 3141 }
2605 break; 3142 break;
2606 3143
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 3144 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2668 3205
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3206/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3207/* *INDENT-OFF* */
2671enum { 3208enum {
2672 CSI_ICH = 0x40, 3209 CSI_ICH = 0x40,
2673 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,
2674 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 ,
2675 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,
2676 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,
2677 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,
2678 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,
… …
2766 { 3303 {
2767 switch (priv) 3304 switch (priv)
2768 { 3305 {
2769 case '>': 3306 case '>':
2770 if (ch == CSI_DA) /* secondary device attributes */ 3307 if (ch == CSI_DA) /* secondary device attributes */
2771 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3308 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2772 break; 3309 break;
2773 case '?': 3310 case '?':
2774 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3311 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2775 process_terminal_mode (ch, priv, nargs, arg); 3312 process_terminal_mode (ch, priv, nargs, arg);
2776 break; 3313 break;
… …
2881 3418
2882 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3419 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2883 arg[0] = -arg[0]; 3420 arg[0] = -arg[0];
2884 /* FALLTHROUGH */ 3421 /* FALLTHROUGH */
2885 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2887 break; 3424 break;
2888 3425
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3427 tt_write ((const unsigned char *)VT100_ANS,
2891 (unsigned int) (sizeof (VT100_ANS) - 1)); 3428 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3429 break;
2893 3430
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3431 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3432 process_sgr_mode (nargs, arg);
2896 break; 3433 break;
… …
2903 break; 3440 break;
2904 case 6: /* CPR requested */ 3441 case 6: /* CPR requested */
2905 scr_report_position (); 3442 scr_report_position ();
2906 break; 3443 break;
2907 case 7: /* unofficial extension */ 3444 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3445 if (OPTION (Opt_insecure))
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3446 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3447 break;
2911 case 8: /* unofficial extension */ 3448 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3449 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3450 break;
2914 } 3451 }
… …
2950 break; 3487 break;
2951 3488
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3489 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3490 if (arg[0] == 4)
2954 scr_insert_mode (0); 3491 scr_insert_mode (0);
3492 else if (arg[0] == 20)
3493 priv_modes &= ~PrivMode_LFNL;
2955 break; 3494 break;
2956 3495
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3496 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3497 if (arg[0] == 4)
2959 scr_insert_mode (1); 3498 scr_insert_mode (1);
3499 else if (arg[0] == 20)
3500 priv_modes |= PrivMode_LFNL;
2960 break; 3501 break;
2961 3502
2962 /* 3503 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3504 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3505 */
… …
2976 break; 3517 break;
2977 case CSI_75: 3518 case CSI_75:
2978 scr_cursor (RESTORE); 3519 scr_cursor (RESTORE);
2979 break; 3520 break;
2980 3521
2981#ifndef NO_FRILLS 3522#if ENABLE_FRILLS
2982 case CSI_74: 3523 case CSI_74:
2983 process_window_ops (arg, nargs); 3524 process_window_ops (arg, nargs);
2984 break; 3525 break;
2985#endif 3526#endif
2986 3527
… …
2993 break; 3534 break;
2994 } 3535 }
2995} 3536}
2996/*}}} */ 3537/*}}} */
2997 3538
2998#ifndef NO_FRILLS 3539#if ENABLE_FRILLS
2999/* ARGSUSED */ 3540/* ARGSUSED */
3000void 3541void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3542rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3543{
3003 int x, y; 3544 int x, y;
3004 XWindowAttributes wattr; 3545 XWindowAttributes wattr;
3005 Window wdummy; 3546 Window wdummy;
3547 dDisp;
3006 3548
3007 if (nargs == 0) 3549 if (nargs == 0)
3008 return; 3550 return;
3009 3551
3010 switch (args[0]) 3552 switch (args[0])
3011 { 3553 {
3012 /* 3554 /*
3013 * commands 3555 * commands
3014 */ 3556 */
3015 case 1: /* deiconify window */ 3557 case 1: /* deiconify window */
3016 XMapWindow (display->display, TermWin.parent[0]); 3558 XMapWindow (disp, parent[0]);
3017 break; 3559 break;
3018 case 2: /* iconify window */ 3560 case 2: /* iconify window */
3019 XIconifyWindow (display->display, TermWin.parent[0], 3561 XIconifyWindow (disp, parent[0], display->screen);
3020 DefaultScreen (display->display));
3021 break; 3562 break;
3022 case 3: /* set position (pixels) */ 3563 case 3: /* set position (pixels) */
3023 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3564 XMoveWindow (disp, parent[0], args[1], args[2]);
3024 break; 3565 break;
3025 case 4: /* set size (pixels) */ 3566 case 4: /* set size (pixels) */
3026 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3567 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3027 break; 3568 break;
3028 case 5: /* raise window */ 3569 case 5: /* raise window */
3029 XRaiseWindow (display->display, TermWin.parent[0]); 3570 XRaiseWindow (disp, parent[0]);
3030 break; 3571 break;
3031 case 6: /* lower window */ 3572 case 6: /* lower window */
3032 XLowerWindow (display->display, TermWin.parent[0]); 3573 XLowerWindow (disp, parent[0]);
3033 break; 3574 break;
3034 case 7: /* refresh window */ 3575 case 7: /* refresh window */
3035 scr_touch (true); 3576 scr_touch (true);
3036 break; 3577 break;
3037 case 8: /* set size (chars) */ 3578 case 8: /* set size (chars) */
3038 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3579 set_widthheight ((unsigned int) (args[2] * fwidth),
3039 (unsigned int) (args[1] * TermWin.fheight)); 3580 (unsigned int) (args[1] * fheight));
3040 break; 3581 break;
3041 3582
3042 //case 9: NYI, TODO, restore maximized window or maximize window 3583 //case 9: NYI, TODO, restore maximized window or maximize window
3043 default: 3584 default:
3044 if (args[0] >= 24) /* set height (chars) */ 3585 if (args[0] >= 24) /* set height (chars) */
3045 set_widthheight ((unsigned int)TermWin.width, 3586 set_widthheight ((unsigned int)width,
3046 (unsigned int) (args[1] * TermWin.fheight)); 3587 (unsigned int) (args[1] * fheight));
3047 break; 3588 break;
3048 3589
3049 3590
3050 /* 3591 /*
3051 * reports - some output format copied from XTerm 3592 * reports - some output format copied from XTerm
3052 */ 3593 */
3053 case 11: /* report window state */ 3594 case 11: /* report window state */
3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3595 XGetWindowAttributes (disp, parent[0], &wattr);
3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3596 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3056 break; 3597 break;
3057 case 13: /* report window position */ 3598 case 13: /* report window position */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3599 XGetWindowAttributes (disp, parent[0], &wattr);
3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3600 XTranslateCoordinates (disp, parent[0], wattr.root,
3060 -wattr.border_width, -wattr.border_width, 3601 -wattr.border_width, -wattr.border_width,
3061 &x, &y, &wdummy); 3602 &x, &y, &wdummy);
3062 tt_printf ("\033[3;%d;%dt", x, y); 3603 tt_printf ("\033[3;%d;%dt", x, y);
3063 break; 3604 break;
3064 case 14: /* report window size (pixels) */ 3605 case 14: /* report window size (pixels) */
3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3606 XGetWindowAttributes (disp, parent[0], &wattr);
3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3607 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3067 break; 3608 break;
3068 case 18: /* report text area size (chars) */ 3609 case 18: /* report text area size (chars) */
3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3070 break; 3611 break;
3071 case 19: /* report window size (chars) */ 3612 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3613 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3073 break; 3614 break;
3074 case 20: /* report icon label */ 3615 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3616 {
3077 char *s; 3617 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3618 XGetIconName (disp, parent[0], &s);
3079 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);
3080 } 3621 }
3081 break; 3622 break;
3082 case 21: /* report window title */ 3623 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3624 {
3085 char *s; 3625 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3626 XFetchName (disp, parent[0], &s);
3087 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);
3088 } 3629 }
3089 break; 3630 break;
3090 } 3631 }
3091} 3632}
3092#endif 3633#endif
3093 3634
3094/*----------------------------------------------------------------------*/ 3635/*----------------------------------------------------------------------*/
3095/* 3636/*
3096 * get input up until STRING TERMINATOR (or BEL) 3637 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3638 * ends_how is terminator used. returned input must be free()'d
3098 */ 3639 */
3099unsigned char * 3640unsigned char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3641rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3642{
3102 int seen_esc = 0; /* seen escape? */ 3643 unicode_t ch;
3644 bool seen_esc = false;
3103 unsigned int n = 0; 3645 unsigned int n = 0;
3104 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3646 wchar_t string[STRING_MAX];
3107 3647
3108 while ((ch = cmd_getc ())) 3648 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3649 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3650 if (seen_esc)
3651 {
3114 if (ch == 0x5c) /* 7bit ST */ 3652 if (ch == 0x5c) /* 7bit ST */
3115 break; 3653 break;
3116 else 3654 else
3117 return NULL; 3655 return NULL;
3118 3656 }
3119 if (ch == C0_ESC) 3657 else if (ch == C0_ESC)
3120 { 3658 {
3121 seen_esc = 1; 3659 seen_esc = true;
3122 continue; 3660 continue;
3123 } 3661 }
3124 else if (ch == '\t') 3662 else if (ch == C0_BEL || ch == CHAR_ST)
3125 ch = ' '; /* translate '\t' to space */ 3663 break;
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3664 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3665 return NULL; /* other control character - exit */
3128 3666
3129 if (n >= sizeof (string) - 1) 3667 seen_esc = false;
3668
3669 if (n >= STRING_MAX - 1)
3130 // stop at some sane length 3670 // stop at some sane length
3131 return NULL; 3671 return NULL;
3132 3672
3673 if (ch == C0_SYN)
3674 string[n++] = cmd_get8 ();
3675 else
3133 string[n++] = ch; 3676 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3677 }
3136 3678
3137 string[n++] = '\0'; 3679 string[n++] = '\0';
3138 3680
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL;
3141
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3681 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3682
3144 return s; 3683 return (unsigned char *)rxvt_wcstombs (string);
3145} 3684}
3146 3685
3147/*----------------------------------------------------------------------*/ 3686/*----------------------------------------------------------------------*/
3148/* 3687/*
3149 * 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)'
… …
3193void 3732void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3733rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{ 3734{
3196 if (str[0] == '?' && !str[1]) 3735 if (str[0] == '?' && !str[1])
3197 { 3736 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b; 3737 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b); 3738 pix_colors_focused[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3739 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 } 3740 }
3205 else 3741 else
3206 set_window_color (color, str); 3742 set_window_color (color, str);
3207} 3743}
3208 3744
3209/* 3745/*
3210 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3211 * 0 = change iconName/title
3212 * 1 = change iconName
3213 * 2 = change title
3214 * 4 = change color
3215 * 10 = change fg color
3216 * 11 = change bg color
3217 * 12 = change text color
3218 * 13 = change mouse foreground color
3219 * 17 = change highlight character colour
3220 * 18 = change bold character color
3221 * 19 = change underlined character color
3222 * 46 = change logfile (not implemented)
3223 * 50 = change font
3224 *
3225 * rxvt extensions:
3226 * 20 = bg pixmap
3227 * 39 = change default fg color
3228 * 49 = change default bg color
3229 * 55 = dump scrollback buffer and all of screen
3230 * 701 = change locale
3231 * 702 = find font
3232 * 703 = menu
3233 */ 3747 */
3234void 3748void
3235rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3749rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3236{ 3750{
3237 int changed = 0; 3751 int changed = 0;
3238 int color; 3752 int color;
3239 char *buf, *name; 3753 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3755 int saveop = op;
3756 dDisp;
3241 3757
3242 assert (str != NULL); 3758 assert (str != NULL);
3243 switch (op) 3759 switch (op)
3244 { 3760 {
3245 case XTerm_name: 3761 case XTerm_name:
… …
3252 set_title (str); 3768 set_title (str);
3253 break; 3769 break;
3254 case XTerm_property: 3770 case XTerm_property:
3255 if (str[0] == '?') 3771 if (str[0] == '?')
3256 { 3772 {
3257 Atom prop = XInternAtom (display->display, str + 1, True); 3773 Atom prop = display->atom (str + 1);
3258 Atom actual_type; 3774 Atom actual_type;
3259 int actual_format; 3775 int actual_format;
3260 unsigned long nitems; 3776 unsigned long nitems;
3261 unsigned long bytes_after; 3777 unsigned long bytes_after;
3262 unsigned char *value = 0; 3778 unsigned char *value = 0;
3263 const char *str = ""; 3779 const char *str = "";
3264 3780
3265 if (prop 3781 if (prop
3266 && XGetWindowProperty (display->display, TermWin.parent[0], 3782 && XGetWindowProperty (disp, parent[0],
3267 prop, 0, 1<<16, 0, AnyPropertyType, 3783 prop, 0, 1<<16, 0, AnyPropertyType,
3268 &actual_type, &actual_format, 3784 &actual_type, &actual_format,
3269 &nitems, &bytes_after, &value) == Success 3785 &nitems, &bytes_after, &value) == Success
3270 && actual_type != None 3786 && actual_type != None
3271 && actual_format == 8) 3787 && actual_format == 8)
… …
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3796 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281 3797
3282 if (eq) 3798 if (eq)
3283 { 3799 {
3284 *eq = 0; 3800 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0], 3801 set_utf8_property (display->atom (str), eq + 1);
3286 display->atom (str), XA_STRING, 8,
3287 PropModeReplace, (unsigned char *)eq + 1,
3288 strlen (eq + 1));
3289 } 3802 }
3290 else 3803 else
3291 XDeleteProperty (display->display, TermWin.parent[0], 3804 XDeleteProperty (disp, parent[0],
3292 display->atom (str)); 3805 display->atom (str));
3293 } 3806 }
3294 break; 3807 break;
3295 3808
3296 case XTerm_Color: 3809 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3810 for (buf = (char *)str; buf && *buf;)
3298 { 3811 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3812 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3813 break;
3301 3814
3302 *name++ = '\0'; 3815 *name++ = '\0';
3303 color = atoi (buf); 3816 color = atoi (buf);
3304 3817
3305 if (color < 0 || color >= TOTAL_COLORS) 3818 if (color < 0 || color >= TOTAL_COLORS)
3306 break; 3819 break;
3307 3820
3308 if ((buf = STRCHR (name, ';')) != NULL) 3821 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3822 *buf++ = '\0';
3310 3823
3311 if (name[0] == '?' && !name[1]) 3824 if (name[0] == '?' && !name[1])
3312 { 3825 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b; 3826 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b); 3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 } 3829 }
3320 else 3830 else
3321 set_window_color (color + minCOLOR, name); 3831 set_window_color (color + minCOLOR, name);
3322 } 3832 }
3323 break; 3833 break;
… …
3345 case XTerm_Color_UL: 3855 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break; 3857 break;
3348 case XTerm_Color_RV: 3858 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3860 break;
3861 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3863 break;
3864#endif
3865#if TRANSPARENT && TINTING
3866 case URxvt_Color_tint:
3867 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3868 check_our_parents ();
3869 if (am_transparent)
3870 want_full_refresh = want_refresh = 1;
3350 break; 3871 break;
3351#endif 3872#endif
3352 3873
3353 case XTerm_Pixmap: 3874 case XTerm_Pixmap:
3354 if (*str != ';') 3875 if (*str != ';')
… …
3357 scale_pixmap (""); /* reset to default scaling */ 3878 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3879 set_bgPixmap (str); /* change pixmap */
3359#endif 3880#endif
3360 scr_touch (true); 3881 scr_touch (true);
3361 } 3882 }
3362 while ((str = STRCHR (str, ';')) != NULL) 3883 while ((str = strchr (str, ';')) != NULL)
3363 { 3884 {
3364 str++; 3885 str++;
3365#if XPM_BACKGROUND 3886#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3887 changed += scale_pixmap (str);
3367#endif 3888#endif
3368
3369 } 3889 }
3890
3370 if (changed) 3891 if (changed)
3371 { 3892 {
3372#ifdef XPM_BACKGROUND 3893#ifdef XPM_BACKGROUND
3373 resize_pixmap (); 3894 resize_pixmap ();
3374#endif 3895#endif
… …
3385 3906
3386 case XTerm_logfile: 3907 case XTerm_logfile:
3387 // TODO, when secure mode? 3908 // TODO, when secure mode?
3388 break; 3909 break;
3389 3910
3390 case XTerm_font:
3391 if (query)
3392 {
3393 if (Options & Opt_insecure)
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3395 TermWin.fontset->fontdesc
3396 ? TermWin.fontset->fontdesc
3397 : "",
3398 resp);
3399 }
3400 else
3401 change_font (str);
3402 break;
3403
3404#ifndef NO_FRILLS
3405 case XTerm_locale:
3406 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3410 }
3411 else
3412 {
3413 set_locale (str);
3414# ifdef USE_XIM
3415 im_cb ();
3416# endif
3417 }
3418 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif
3429
3430#ifdef MENUBAR 3911#ifdef MENUBAR
3431 case XTerm_Menu: 3912 case URxvt_Menu:
3432 if (Options & Opt_insecure) 3913 if (OPTION (Opt_insecure))
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3915 break;
3435#endif 3916#endif
3436#if 0 3917#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3918 case XTerm_dumpscreen: /* no error notices */
… …
3441 { 3922 {
3442 scr_dump (fd); 3923 scr_dump (fd);
3443 close (fd); 3924 close (fd);
3444 } 3925 }
3445 } 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 int lines = atoi (str);
3967
3968 if (lines)
3969 scr_page (op == URxvt_view_up ? UP : DN, lines);
3970 else
3971 {
3972 scr_erase_savelines ();
3973 }
3974
3446 break; 3975 break;
3447#endif 3976#endif
3448 } 3977 }
3449} 3978}
3450/*----------------------------------------------------------------------*/ 3979/*----------------------------------------------------------------------*/
… …
3464{ 3993{
3465 int state; 3994 int state;
3466 3995
3467 if (mode == 's') 3996 if (mode == 's')
3468 { 3997 {
3469 SavedModes |= (PrivateModes & bit); 3998 SavedModes |= (priv_modes & bit);
3470 return -1; 3999 return -1;
3471 } 4000 }
3472 else 4001 else
3473 { 4002 {
3474 if (mode == 'r') 4003 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4004 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 4005 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4006 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 4007 PrivMode (state, bit);
3479 } 4008 }
3480 4009
3481 return state; 4010 return state;
3482} 4011}
… …
3500 { 3, PrivMode_132 }, 4029 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 4030 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 4031 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 4032 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 4033 { 7, PrivMode_Autowrap },
4034 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 4035 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 4036#ifdef menuBar_esc
3507 { menuBar_esc, PrivMode_menuBar }, 4037 { menuBar_esc, PrivMode_menuBar },
3508#endif 4038#endif
4039 // 18, 19 printing-related
4040 { 25, PrivMode_VisibleCursor },
3509#ifdef scrollBar_esc 4041#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 4042 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 4043#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 4044 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 4045 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 4046 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 4047 // 45 margin bell NYI
3519 // 46 start logging 4048 // 46 start logging
… …
3559 } 4088 }
3560 4089
3561 /* extra handling for values with state unkept */ 4090 /* extra handling for values with state unkept */
3562 switch (arg[i]) 4091 switch (arg[i])
3563 { 4092 {
4093#if ENABLE_STYLES
4094 case 1021:
4095 if (mode)
4096 SET_OPTION (Opt_intensityStyles);
4097 else
4098 CLR_OPTION (Opt_intensityStyles);
4099
4100 scr_touch (true);
4101 break;
4102#endif
3564 case 1048: /* alternative cursor save */ 4103 case 1048: /* alternative cursor save */
4104 case 1049:
3565 if (Options & Opt_secondaryScreen) 4105 if (OPTION (Opt_secondaryScreen))
3566 if (mode == 0) 4106 if (mode == 0)
3567 scr_cursor (RESTORE); 4107 scr_cursor (RESTORE);
3568 else if (mode == 1) 4108 else if (mode == 1)
3569 scr_cursor (SAVE); 4109 scr_cursor (SAVE);
3570 break; 4110 break;
… …
3581 * within VT52 mode 4121 * within VT52 mode
3582 */ 4122 */
3583 PrivMode (1, PrivMode_vt52); 4123 PrivMode (1, PrivMode_vt52);
3584 break; 4124 break;
3585 case 3: /* 80/132 */ 4125 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 4126 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4127 set_widthheight (((state ? 132 : 80) * fwidth), height);
3588 break; 4128 break;
3589 case 4: /* smooth scrolling */ 4129 case 4: /* smooth scrolling */
3590 if (state) 4130 if (!state)
3591 Options &= ~Opt_jumpScroll; 4131 SET_OPTION (Opt_jumpScroll);
3592 else 4132 else
3593 Options |= Opt_jumpScroll; 4133 CLR_OPTION (Opt_jumpScroll);
3594 break; 4134 break;
3595 case 5: /* reverse video */ 4135 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 4136 scr_rvideo_mode (state);
3597 break; 4137 break;
3598 case 6: /* relative/absolute origins */ 4138 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 4142 scr_autowrap (state);
3603 break; 4143 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 4144 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 4145 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 4146 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 4147 priv_modes &= ~PrivMode_MouseX11;
3608 break; 4148 break;
3609#ifdef menuBar_esc 4149#ifdef menuBar_esc
3610 case menuBar_esc: 4150 case menuBar_esc:
3611#ifdef MENUBAR 4151#ifdef MENUBAR
3612 map_menuBar (state); 4152 map_menuBar (state);
… …
3632 break; 4172 break;
3633 /* case 66: - application key pad */ 4173 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4174 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4175 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4176 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4177 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4178 break;
3639#if 0 4179#if 0
3640 case 1001: 4180 case 1001:
3641 break; /* X11 mouse highlighting */ 4181 break; /* X11 mouse highlighting */
3642#endif 4182#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4183 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state) 4184 if (!state)
3645 Options &= ~Opt_scrollTtyOutput; 4185 SET_OPTION (Opt_scrollTtyOutput);
3646 else 4186 else
3647 Options |= Opt_scrollTtyOutput; 4187 CLR_OPTION (Opt_scrollTtyOutput);
3648 break; 4188 break;
3649 case 1011: /* scroll to bottom on key press */ 4189 case 1011: /* scroll to bottom on key press */
3650 if (state) 4190 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4191 SET_OPTION (Opt_scrollTtyKeypress);
3652 else 4192 else
3653 Options &= ~Opt_scrollTtyKeypress; 4193 CLR_OPTION (Opt_scrollTtyKeypress);
3654 break; 4194 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4195 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4196 if (OPTION (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 4197 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4198 scr_erase_screen (2);
3659 scr_change_screen (state); 4199 scr_change_screen (state);
3660 break; 4200 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4201 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4202 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4203 if (OPTION (Opt_secondaryScreen))
3664 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4205 scr_erase_screen (2);
3666 break; 4206 break;
3667 default: 4207 default:
3668 break; 4208 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4234 rendset = 0, rendstyle = ~RS_None;
3695 break; 4235 break;
3696 case 1: 4236 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4237 rendset = 1, rendstyle = RS_Bold;
3698 break; 4238 break;
4239 //case 2: // low intensity
4240 case 3:
4241 rendset = 1, rendstyle = RS_Italic;
4242 break;
3699 case 4: 4243 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4244 rendset = 1, rendstyle = RS_Uline;
3701 break; 4245 break;
3702 case 5: 4246 case 5: // slowly blinking
4247 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4248 rendset = 1, rendstyle = RS_Blink;
3704 break; 4249 break;
4250 //case 6: // scoansi light background
3705 case 7: 4251 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4252 rendset = 1, rendstyle = RS_RVid;
3707 break; 4253 break;
3708 case 8: 4254 case 8:
3709 // invisible. NYI 4255 // invisible. NYI
3710 break; 4256 break;
3711 case 22: 4257 //case 9: // crossed out
4258 //case 10: // scoansi acs off, primary font
4259 //case 11: // scoansi acs on, first alt font
4260 //case 12: // scoansi acs on, |0x80, second alt font
4261 //...
4262 //case 19: // ninth alt font
4263 //case 20: // gothic
4264 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 4265 rendset = 0, rendstyle = RS_Bold;
4266 break;
4267 case 22: // normal intensity
4268 rendset = 0, rendstyle = RS_Bold;
4269 break;
4270 case 23: // disable italic
4271 rendset = 0, rendstyle = RS_Italic;
3713 break; 4272 break;
3714 case 24: 4273 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4274 rendset = 0, rendstyle = RS_Uline;
3716 break; 4275 break;
3717 case 25: 4276 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4277 rendset = 0, rendstyle = RS_Blink;
3719 break; 4278 break;
4279 case 26: // variable spacing (iso 8613)
4280 rendset = 0, rendstyle = RS_Blink;
4281 break;
3720 case 27: 4282 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4283 rendset = 0, rendstyle = RS_RVid;
3722 break; 4284 break;
3723 case 28:
3724 // visible. NYI 4285 //case 28: // visible. NYI
3725 break; 4286 //case 29: // not crossed-out
3726 } 4287 }
3727 4288
3728 if (rendset != -1) 4289 if (rendset != -1)
3729 { 4290 {
3730 scr_rendition (rendset, rendstyle); 4291 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4302 case 35:
3742 case 36: 4303 case 36:
3743 case 37: 4304 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4305 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4306 break;
3746#ifdef TTY_256COLOR 4307 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4308 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4309 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4310 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4311 i += 2;
3752 } 4312 }
3753 break; 4313 break;
3754#endif
3755 case 39: /* default fg */ 4314 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4315 scr_color (Color_fg, Color_fg);
3757 break; 4316 break;
3758 4317
3759 case 40: 4318 case 40:
… …
3764 case 45: 4323 case 45:
3765 case 46: 4324 case 46:
3766 case 47: 4325 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4326 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4327 break;
3769#ifdef TTY_256COLOR 4328 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4329 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4330 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4331 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4332 i += 2;
3775 } 4333 }
3776 break; 4334 break;
3777#endif
3778 case 49: /* default bg */ 4335 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4336 scr_color (Color_bg, Color_bg);
3780 break; 4337 break;
4338
4339 //case 50: // not variable spacing
3781 4340
3782#ifndef NO_BRIGHTCOLOR 4341#ifndef NO_BRIGHTCOLOR
3783 case 90: 4342 case 90:
3784 case 91: /* set bright fg color */ 4343 case 91: /* set bright fg color */
3785 case 92: 4344 case 92:
3786 case 93: 4345 case 93:
3787 case 94: 4346 case 94:
3788 case 95: 4347 case 95:
3789 case 96: 4348 case 96:
3790 case 97: 4349 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4350 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4351 break;
3794 case 100: 4352 case 100:
3795 case 101: /* set bright bg color */ 4353 case 101: /* set bright bg color */
3796 case 102: 4354 case 102:
3797 case 103: 4355 case 103:
3798 case 104: 4356 case 104:
3799 case 105: 4357 case 105:
3800 case 106: 4358 case 106:
3801 case 107: 4359 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4360 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4361 break;
3805#endif 4362#endif
3806
3807 } 4363 }
3808 } 4364 }
3809} 4365}
3810/*}}} */ 4366/*}}} */
3811 4367
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4368/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4369void
3814rxvt_term::process_graphics () 4370rxvt_term::process_graphics ()
3815{ 4371{
3816 unicode_t ch, cmd = cmd_getc (); 4372 unicode_t ch, cmd = cmd_getc ();
3817 4373
3818 if (cmd == 'Q') 4374 if (cmd == 'Q')
3819 { /* query graphics */ 4375 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4376 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4377 return;
3822 } 4378 }
3823 /* swallow other graphics sequences until terminating ':' */ 4379 /* swallow other graphics sequences until terminating ':' */
3824 do 4380 do
3825 ch = cmd_getc (); 4381 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4396 unsigned char buf[256];
3841 4397
3842 va_start (arg_ptr, fmt); 4398 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4399 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4400 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4401 tt_write (buf, strlen (buf));
3846} 4402}
3847 4403
3848/* ---------------------------------------------------------------------- */ 4404/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4405/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4406 * or generated by us in response to a query ESC sequence.
3851 */ 4407 */
4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4409
3852void 4410void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4411rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4412{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4413 if (v_buflen == 0)
4414 {
4415 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3856 4416
3857 if (len) 4417 if ((unsigned int)written == len)
4418 return;
4419
4420 data += written;
4421 len -= written;
3858 { 4422 }
4423
4424 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4425
4426 memcpy (v_buffer + v_buflen, data, len);
4427 v_buflen += len;
4428
4429 pty_ev.set (EVENT_READ | EVENT_WRITE);
4430}
4431
4432void rxvt_term::pty_write ()
4433{
4434 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4435
4436 if (written > 0)
4437 {
4438 v_buflen -= written;
4439
3859 if (v_buflen == 0) 4440 if (v_buflen == 0)
3860 { 4441 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4442 free (v_buffer);
3888 v_buffer = 0; 4443 v_buffer = 0;
3889 v_buflen = 0; 4444 v_buflen = 0;
3890 4445
3891 pty_ev.set (EVENT_READ); 4446 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4447 return;
3904 } 4448 }
4449
4450 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4451 }
4452 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4453 pty_ev.set (EVENT_READ);
3906} 4454}
3907 4455
3908/*----------------------- end-of-file (C source) -----------------------*/ 4456/*----------------------- end-of-file (C source) -----------------------*/
3909 4457

Diff Legend

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