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.228 by root, Mon Jan 2 16:08:34 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);
1362 if (!bypass_keystate) 1800 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1801 reportmode = !! (priv_modes & PrivMode_mouse_report);
1802
1364 /* 1803 /*
1365 * VT window processing of button press 1804 * VT window processing of button press
1366 */ 1805 */
1367 if (ev.window == TermWin.vt) 1806 if (ev.window == vt)
1368 { 1807 {
1808#if ISO_14755
1809 // 5.4
1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1811 {
1812 iso14755_54 (ev.x, ev.y);
1813 return;
1814 }
1815#endif
1816
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1817 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1818
1370 if (reportmode) 1819 if (reportmode)
1371 { 1820 {
1372 /* mouse report from vt window */ 1821 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1822 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state; 1823 MEvent.state = ev.state;
… …
1403 } 1852 }
1404 else 1853 else
1405 { 1854 {
1406 if (ev.button != MEvent.button) 1855 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1856 MEvent.clicks = 0;
1857
1408 switch (ev.button) 1858 switch (ev.button)
1409 { 1859 {
1410 case Button1: 1860 case Button1:
1861 /* allow meta + click to select rectangular areas */
1862 /* should be done in screen.C */
1863#if ENABLE_FRILLS
1864 selection.rect = !!(ev.state & ModMetaMask);
1865#else
1866 selection.rect = false;
1867#endif
1868
1411 /* allow shift+left click to extend selection */ 1869 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1870 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1413 { 1871 {
1414 if (MEvent.button == Button1 && clickintime) 1872 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1873 selection_rotate (ev.x, ev.y);
1416 else 1874 else
1417 selection_extend (ev.x, ev.y, 1); 1875 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1890 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1891 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1892 selection_rotate (ev.x, ev.y);
1435 else 1893 else
1436 selection_extend (ev.x, ev.y, 1); 1894 selection_extend (ev.x, ev.y, 1);
1895
1437 MEvent.button = Button3; 1896 MEvent.button = Button3;
1438 break; 1897 break;
1439 } 1898 }
1440 } 1899 }
1900
1441 MEvent.time = ev.time; 1901 MEvent.time = ev.time;
1442 return; 1902 return;
1443 } 1903 }
1444 1904
1445 /* 1905 /*
… …
1511 upordown = 1; /* down */ 1971 upordown = 1; /* down */
1512 } 1972 }
1513 if (upordown) 1973 if (upordown)
1514 { 1974 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1975#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1976 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 1977#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 1978 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 1979 {
1520 if (upordown < 0) 1980 if (upordown < 0)
1521 scrollBar.setUp (); 1981 scrollBar.setUp ();
… …
1537 break; 1997 break;
1538 case R_SB_ALIGN_BOTTOM: 1998 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 1999 csrO = scrollBar.bot - scrollBar.top;
1540 break; 2000 break;
1541 } 2001 }
2002
1542 if (scrollBar.style == R_SB_XTERM 2003 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 2004 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 2005 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 2006 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 2007
1547 scrollBar.setMotion (); 2008 scrollBar.setMotion ();
1548 break; 2009 break;
1549 2010
1550 case Button1: 2011 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2012 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1555 case Button3: 2016 case Button3:
1556 if (scrollBar.style != R_SB_XTERM) 2017 if (scrollBar.style != R_SB_XTERM)
1557 { 2018 {
1558 if (scrollbar_above_slider (ev.y)) 2019 if (scrollbar_above_slider (ev.y))
1559# ifdef RXVT_SCROLL_FULL 2020# ifdef RXVT_SCROLL_FULL
1560 scr_page (UP, TermWin.nrow - 1); 2021 scr_page (UP, nrow - 1);
1561# else 2022# else
1562 scr_page (UP, TermWin.nrow / 4); 2023 scr_page (UP, nrow / 4);
1563# endif 2024# endif
1564 else if (scrollbar_below_slider (ev.y)) 2025 else if (scrollbar_below_slider (ev.y))
1565# ifdef RXVT_SCROLL_FULL 2026# ifdef RXVT_SCROLL_FULL
1566 scr_page (DN, TermWin.nrow - 1); 2027 scr_page (DN, nrow - 1);
1567# else 2028# else
1568 scr_page (DN, TermWin.nrow / 4); 2029 scr_page (DN, nrow / 4);
1569# endif 2030# endif
1570 else 2031 else
1571 scrollBar.setMotion (); 2032 scrollBar.setMotion ();
1572 } 2033 }
1573 else 2034 else
1574 { 2035 {
1575 scr_page ((ev.button == Button1 ? DN : UP), 2036 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 2037 (nrow
1577 * scrollbar_position (ev.y) 2038 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 2039 / scrollbar_size ()));
1579 } 2040 }
2041
1580 break; 2042 break;
1581 } 2043 }
1582 } 2044 }
1583 return; 2045 return;
1584 } 2046 }
… …
1596{ 2058{
1597 int reportmode = 0; 2059 int reportmode = 0;
1598 2060
1599 csrO = 0; /* reset csr Offset */ 2061 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 2062 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2063 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 2064
1603 if (scrollbar_isUpDn ()) 2065 if (scrollbar_isUpDn ())
1604 { 2066 {
1605 scrollBar.setIdle (); 2067 scrollBar.setIdle ();
1606 scrollbar_show (0); 2068 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2069#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH; 2070 refresh_type &= ~SMOOTH_REFRESH;
1609#endif 2071#endif
1610
1611 } 2072 }
2073
1612#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 2075 if (sel_scroll_ev.active)
2076 sel_scroll_ev.stop();
1614#endif 2077#endif
2078
1615 if (ev.window == TermWin.vt) 2079 if (ev.window == vt)
1616 { 2080 {
2081#if ISO_14755
2082 // 5.4
2083 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2084 return;
2085#endif
1617 if (reportmode) 2086 if (reportmode)
1618 { 2087 {
1619 /* mouse report from vt window */ 2088 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 2089 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 2090 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
1636 mouse_report (ev); 2105 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 2107 return;
1639 } 2108 }
2109
1640 /* 2110 /*
1641 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 2112 * when overriding mouse reporting
1643 */ 2113 */
1644 if (PrivateModes & PrivMode_mouse_report 2114 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2115 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2116 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2117 selection_extend (ev.x, ev.y, 0);
1648 2118
1649 switch (ev.button) 2119 switch (ev.button)
… …
1660 case Button5: 2130 case Button5:
1661 { 2131 {
1662 int i; 2132 int i;
1663 page_dirn v; 2133 page_dirn v;
1664 2134
1665 v = (ev.button == Button4) ? UP : DN; 2135 v = ev.button == Button4 ? UP : DN;
2136
1666 if (ev.state & ShiftMask) 2137 if (ev.state & ShiftMask)
1667 i = 1; 2138 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2139 else if (OPTION (Opt_mouseWheelScrollPage))
1669 i = TermWin.nrow - 1; 2140 i = nrow - 1;
1670 else 2141 else
1671 i = 5; 2142 i = 5;
2143
1672# ifdef MOUSE_SLIP_WHEELING 2144# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2145 if (ev.state & ControlMask)
1674 { 2146 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2147 mouse_slip_wheel_speed += v ? -1 : 1;
2148 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2149 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2150
2151 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2152 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2153
2154 slip_wheel_ev.start ();
1677 } 2155 }
2156 else
2157 {
1678# endif 2158# endif
1679# ifdef JUMP_MOUSE_WHEEL 2159# 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); 2160 scr_page (v, i);
1687 scr_refresh (SMOOTH_REFRESH); 2161 scr_refresh (SMOOTH_REFRESH);
1688 scrollbar_show (1); 2162 scrollbar_show (1);
2163# else
2164 while (i--)
2165 {
2166 scr_page (v, 1);
2167 scr_refresh (SMOOTH_REFRESH);
2168 scrollbar_show (1);
2169 }
2170# endif
2171# ifdef MOUSE_SLIP_WHEELING
1689 } 2172 }
1690# endif 2173#endif
1691
1692 } 2174 }
1693 break; 2175 break;
1694#endif 2176#endif
1695
1696 } 2177 }
1697 } 2178 }
1698#ifdef MENUBAR 2179#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window)) 2180 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev); 2181 menubar_control (ev);
1701#endif 2182#endif
1702} 2183}
1703 2184
1704#ifdef TRANSPARENT 2185#ifdef TRANSPARENT
1705#if TINTING 2186#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2187/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2188
1709static void 2189typedef 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 2190
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2191void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2192{
1717 /* No saturation */ 2193 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2194 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2195 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 int r, g, b; 2196 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2197 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2198 int i;
1721 2199
1722 b = ((uint16_t *) ptr)[x]; 2200 Visual *visual = display->visual;
1723 r = (b & 0x7c00) * rm; 2201
1724 g = (b & 0x3e0) * gm; 2202 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2203
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2204 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2205 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2206 mask_g = visual->green_mask;
1729 } 2207 mask_b = visual->blue_mask;
1730 ptr += bpl; 2208
1731 } 2209 /* boring lookup table pre-initialization */
2210 switch (srcImage->bits_per_pixel) {
2211 case 15:
2212 if ((mask_r != 0x7c00) ||
2213 (mask_g != 0x03e0) ||
2214 (mask_b != 0x001f))
2215 return;
2216 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2217 lookup_r = lookup;
2218 lookup_g = lookup+32;
2219 lookup_b = lookup+32+32;
2220 sh_r = 10;
2221 sh_g = 5;
2222 sh_b = 0;
2223 break;
2224 case 16:
2225 if ((mask_r != 0xf800) ||
2226 (mask_g != 0x07e0) ||
2227 (mask_b != 0x001f))
2228 return;
2229 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2230 lookup_r = lookup;
2231 lookup_g = lookup+32;
2232 lookup_b = lookup+32+64;
2233 sh_r = 11;
2234 sh_g = 5;
2235 sh_b = 0;
2236 break;
2237 case 24:
2238 if ((mask_r != 0xff0000) ||
2239 (mask_g != 0x00ff00) ||
2240 (mask_b != 0x0000ff))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2243 lookup_r = lookup;
2244 lookup_g = lookup+256;
2245 lookup_b = lookup+256+256;
2246 sh_r = 16;
2247 sh_g = 8;
2248 sh_b = 0;
2249 break;
2250 case 32:
2251 if ((mask_r != 0xff0000) ||
2252 (mask_g != 0x00ff00) ||
2253 (mask_b != 0x0000ff))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2256 lookup_r = lookup;
2257 lookup_g = lookup+256;
2258 lookup_b = lookup+256+256;
2259 sh_r = 16;
2260 sh_g = 8;
2261 sh_b = 0;
2262 break;
2263 default:
2264 return; /* we do not support this color depth */
2265 }
2266
2267 /* prepare limits for color transformation (each channel is handled separately) */
2268 if (shade < 0) {
2269 shade = -shade;
2270 if (shade < 0) shade = 0;
2271 if (shade > 100) shade = 100;
2272
2273 lower_lim_r = 65535-rm;
2274 lower_lim_g = 65535-gm;
2275 lower_lim_b = 65535-bm;
2276
2277 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2278 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2279 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2280
2281 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1732 } else { 2282 } else {
1733 for (y = h; --y >= 0;) { 2283 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2284 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2285
1737 b = ((uint16_t *) ptr)[x]; 2286 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2287
1739 g = (b & 0x3e0) * gm; 2288 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2289 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2290 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2291 }
1743 b |= (!(b >> 5) - 1); 2292
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2293 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745 | ((g >> 8) & 0x3e0) 2294 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2295 {
1747 } 2296 unsigned int tmp;
1748 ptr += bpl; 2297
2298 tmp = lower_lim_r;
2299 lower_lim_r = lower_lim_b;
2300 lower_lim_b = tmp;
2301
2302 tmp = upper_lim_r;
2303 upper_lim_r = upper_lim_b;
2304 upper_lim_b = tmp;
2305 }
2306
2307 /* fill our lookup tables */
2308 for (i = 0; i <= mask_r>>sh_r; i++)
2309 {
2310 RUINT32T tmp;
2311 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2312 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2313 lookup_r[i] = (tmp/65535)<<sh_r;
2314 }
2315 for (i = 0; i <= mask_g>>sh_g; i++)
2316 {
2317 RUINT32T tmp;
2318 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2319 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2320 lookup_g[i] = (tmp/65535)<<sh_g;
2321 }
2322 for (i = 0; i <= mask_b>>sh_b; i++)
2323 {
2324 RUINT32T tmp;
2325 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2326 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2327 lookup_b[i] = (tmp/65535)<<sh_b;
2328 }
2329
2330 /* apply table to input image (replacing colors by newly calculated ones) */
2331 switch (srcImage->bits_per_pixel)
2332 {
2333 case 15:
2334 {
2335 unsigned short *p1, *pf, *p, *pl;
2336 p1 = (unsigned short *) srcImage->data;
2337 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2338 while (p1 < pf)
2339 {
2340 p = p1;
2341 pl = p1 + srcImage->width;
2342 for (; p < pl; p++)
1749 } 2343 {
2344 *p = lookup_r[(*p & 0x7c00)>>10] |
2345 lookup_g[(*p & 0x03e0)>> 5] |
2346 lookup_b[(*p & 0x001f)];
2347 }
2348 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1750 } 2349 }
1751} 2350 break;
1752 2351 }
1753/* RGB 16 */ 2352 case 16:
1754static void 2353 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2354 unsigned short *p1, *pf, *p, *pl;
1756{ 2355 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2356 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2357 while (p1 < pf)
1759 2358 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2359 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2360 pl = p1 + srcImage->width;
1762 /* No saturation */ 2361 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 } 2362 {
1777 } else { 2363 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2364 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2365 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 } 2366 }
1793 ptr += bpl; 2367 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2368 }
2369 break;
2370 }
2371 case 24:
2372 {
2373 unsigned char *p1, *pf, *p, *pl;
2374 p1 = (unsigned char *) srcImage->data;
2375 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2376 while (p1 < pf)
2377 {
2378 p = p1;
2379 pl = p1 + srcImage->width * 3;
2380 for (; p < pl; p += 3)
1794 } 2381 {
2382 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2383 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2384 p[2] = lookup_r[(p[2] & 0x0000ff)];
2385 }
2386 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1795 } 2387 }
1796} 2388 break;
2389 }
2390 case 32:
2391 {
2392 RUINT32T *p1, *pf, *p, *pl;
2393 p1 = (RUINT32T *) srcImage->data;
2394 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1797 2395
1798/* RGB 24 */ 2396 while (p1 < pf)
1799static void 2397 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2398 p = p1;
1801{ 2399 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2400 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 } 2401 {
1830 } else { 2402 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2403 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2404 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2405 (*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 } 2406 }
1861 ptr += bpl; 2407 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2408 }
2409 break;
2410 }
1863 } 2411 }
1864}
1865 2412
1866/* RGB 32 */ 2413 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} 2414}
1937
1938#endif 2415#endif
1939 2416
1940/* 2417/*
1941 * Check our parents are still who we think they are. 2418 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2419 * Do transparency updates if required
… …
1949 Atom atype; 2426 Atom atype;
1950 unsigned char *prop = NULL; 2427 unsigned char *prop = NULL;
1951 Window root, oldp, *list; 2428 Window root, oldp, *list;
1952 Pixmap rootpixmap = None; 2429 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2430 XWindowAttributes wattr, wrootattr;
2431 dDisp;
1954 2432
1955 pchanged = 0; 2433 pchanged = 0;
1956 2434
1957 if (!(Options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
1959 2437
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2438 XGetWindowAttributes (disp, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
1962 2440
1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2441 XGetWindowAttributes (disp, parent[0], &wattr);
1964 2442
1965 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
1966 { 2444 {
1967 if (am_transparent) 2445 if (am_transparent)
1968 { 2446 {
1969 pchanged = 1; 2447 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2448 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
1972 } 2450 }
1973 2451
1974 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
1975 } 2453 }
1976 2454
1977 /* Get all X ops out of the queue so that our information is up-to-date. */ 2455 /* Get all X ops out of the queue so that our information is up-to-date. */
1978 XSync (display->display, False); 2456 XSync (disp, False);
1979 2457
1980 /* 2458 /*
1981 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
1982 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
1983 * windows for each client, so we have to take care about that. 2461 * windows for each client, so we have to take care about that.
1984 */ 2462 */
1985 i = (xa[XA_XROOTPMAPID] 2463 i = (xa[XA_XROOTPMAP_ID]
1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2464 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1988 &nitems, &bytes_after, &prop) == Success); 2466 &nitems, &bytes_after, &prop) == Success);
1989 2467
1990 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID] 2469 i = (xa[XA_ESETROOT_PMAP_ID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2470 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2472 &nitems, &bytes_after, &prop) == Success);
1995 2473
1996 if (!i || prop == NULL) 2474 if (!i || prop == NULL
2475#if TINTING
2476 || !rs[Rs_color + Color_tint]
2477#endif
2478 )
1997 have_pixmap = 0; 2479 have_pixmap = 0;
1998 else 2480 else
1999 { 2481 {
2000 have_pixmap = 1; 2482 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2483 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2484 XFree (prop);
2003 } 2485 }
2004 2486
2005 if (have_pixmap) 2487 if (have_pixmap)
2006 { 2488 {
… …
2012 Window cr; 2494 Window cr;
2013 XImage *image; 2495 XImage *image;
2014 GC gc; 2496 GC gc;
2015 XGCValues gcvalue; 2497 XGCValues gcvalue;
2016 2498
2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2499 XTranslateCoordinates (disp, parent[0], display->root,
2018 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2019 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2020 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2021 nx = ny = 0; 2503 nx = ny = 0;
2022 2504
… …
2032 nh += sy; 2514 nh += sy;
2033 ny = -sy; 2515 ny = -sy;
2034 sy = 0; 2516 sy = 0;
2035 } 2517 }
2036 2518
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (disp, False);
2039 allowedxerror = -1; 2523 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 2525
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 2528 allowedxerror = 0;
2045 2529
2046 if (image == NULL) 2530 if (image == NULL)
2047 { 2531 {
2048 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2049 { 2533 {
2050 pchanged = 1; 2534 pchanged = 1;
2051 if (TermWin.pixmap != None) 2535 if (pixmap != None)
2052 { 2536 {
2053 XFreePixmap (display->display, TermWin.pixmap); 2537 XFreePixmap (disp, pixmap);
2054 TermWin.pixmap = None; 2538 pixmap = None;
2055 } 2539 }
2056 } 2540 }
2057 2541
2058 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2059 } 2543 }
2060 else 2544 else
2061 { 2545 {
2062 if (TermWin.pixmap != None) 2546 if (pixmap != None)
2063 XFreePixmap (display->display, TermWin.pixmap); 2547 XFreePixmap (disp, pixmap);
2064 2548
2065#if TINTING 2549#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2551 {
2068 unsigned short shade, rm, gm, bm; 2552 unsigned short rm, gm, bm;
2553 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2554
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2555 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2071 2556
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2557 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 } 2558 }
2083#endif 2559#endif
2084 2560
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2561 pixmap = XCreatePixmap (disp, vt,
2086 szHint.width, szHint.height, image->depth); 2562 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2563 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2564 XPutImage (disp, pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2565 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2566 XFreeGC (disp, gc);
2091 XDestroyImage (image); 2567 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2568 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2093 TermWin.pixmap); 2569 XClearWindow (disp, parent[0]);
2094 2570
2095 if (!am_transparent || !am_pixmap_trans) 2571 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2572 pchanged = 1;
2097 2573
2098 am_transparent = am_pixmap_trans = 1; 2574 am_transparent = am_pixmap_trans = 1;
2099 } 2575 }
2100 } 2576 }
2101 2577
2102 if (!am_pixmap_trans) 2578 if (am_pixmap_trans)
2579 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2580 else
2103 { 2581 {
2104 unsigned int n; 2582 unsigned int n;
2105 /* 2583 /*
2106 * InheritPixmap transparency 2584 * InheritPixmap transparency
2107 */ 2585 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2586 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2110 { 2587 {
2111 oldp = TermWin.parent[i]; 2588 oldp = parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2589 XQueryTree (disp, parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n); 2590 &parent[i], &list, &n);
2114 XFree (list); 2591 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2592
2117 if (TermWin.parent[i] == display->root) 2593 if (parent[i] == display->root)
2118 { 2594 {
2119 if (oldp != None) 2595 if (oldp != None)
2120 pchanged = 1; 2596 pchanged = 1;
2121 2597
2122 break; 2598 break;
2123 } 2599 }
2124 2600
2125 if (oldp != TermWin.parent[i]) 2601 if (oldp != parent[i])
2126 pchanged = 1; 2602 pchanged = 1;
2127 } 2603 }
2128 2604
2129 n = 0; 2605 n = 0;
2130 2606
2131 if (pchanged) 2607 if (pchanged)
2132 { 2608 {
2133 for (; n < (unsigned int)i; n++) 2609 for (; n < (unsigned int)i; n++)
2134 { 2610 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2611 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) 2612 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2613 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2614 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2140 break; 2615 break;
2141 } 2616 }
2142 } 2617 }
2143 } 2618 }
2144 2619
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2620 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2146 { 2621 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2622 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2623 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2624 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2625 /* XXX: also turn off Opt_transparent? */
2152 } 2626 }
2153 else 2627 else
2154 { 2628 {
2155#if WAIT_FOR_WM 2629#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing 2630 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */ 2631 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1); 2632 sleep (1);
2159#endif 2633#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2634 for (n = 0; n < (unsigned int)i; n++)
2635 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2637 XClearWindow (disp, parent[n]);
2638 }
2163 2639
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2165 am_transparent = 1; 2641 am_transparent = 1;
2166 } 2642 }
2167 2643
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None; 2645 parent[i] = None;
2646 }
2647
2648 if (scrollBar.win)
2649 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle ();
2652 scrollbar_show (0);
2653 }
2654
2655 if (am_transparent)
2656 {
2657 want_refresh = want_full_refresh = 1;
2658 if (am_pixmap_trans)
2659 flush ();
2170 } 2660 }
2171 2661
2172 return pchanged; 2662 return pchanged;
2173} 2663}
2174#endif 2664#endif
… …
2191 } 2681 }
2192 2682
2193 if (ch == NOCHAR) // TODO: improve 2683 if (ch == NOCHAR) // TODO: improve
2194 break; 2684 break;
2195 2685
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2686 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2687 {
2688 if (!seen_input)
2197 { 2689 {
2690 seen_input = 1;
2691 // many badly-written programs (e.g. jed) contain a race condition:
2692 // they first read the screensize and then install a SIGWINCH handler.
2693 // some window managers resize the window early, and these programs
2694 // then sometimes get the size wrong.
2695 // unfortunately other programs are even more buggy and dislike
2696 // being sent SIGWINCH, so only do it when we were in fact being
2697 // resized.
2698 if (seen_resize && cmd_pid)
2699 kill (-cmd_pid, SIGWINCH);
2700 }
2701
2198 /* Read a text string from the input buffer */ 2702 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2703 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2704 bool refreshnow = false;
2201 int nlines = 0; 2705 int nlines = 0;
2202 unicode_t *str = buf; 2706 unicode_t *str = buf;
2203 2707 unicode_t *eol = str + min (ncol, UBUFSIZ);
2204 *str++ = ch;
2205 2708
2206 for (;;) 2709 for (;;)
2207 { 2710 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212 break; 2712 break;
2213 2713
2214 *str++ = ch; 2714 *str++ = ch;
2215 2715
2216 if (ch == '\n') 2716 if (ch == C0_LF || str >= eol)
2217 { 2717 {
2718 if (ch == C0_LF)
2218 nlines++; 2719 nlines++;
2720
2219 refresh_count++; 2721 refresh_count++;
2220 2722
2221 if (! (Options & Opt_jumpScroll) 2723 if (!OPTION (Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2223 { 2725 {
2224 refreshnow = true; 2726 refreshnow = true;
2225 flag = true; 2727 refresh_count = 0;
2226 ch = NOCHAR; 2728 ch = NOCHAR;
2227 break; 2729 break;
2228 } 2730 }
2229 2731
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2732 // scr_add_lines only works for nlines <= nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2733 if (nlines >= nrow - 1)
2232 { 2734 {
2233 scr_add_lines (buf, nlines, str - buf); 2735 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0; 2736 nlines = 0;
2235 str = buf; 2737 str = buf;
2738 eol = str + min (ncol, UBUFSIZ);
2236 } 2739 }
2740
2741 if (str >= eol)
2742 {
2743 if (eol >= buf + UBUFSIZ)
2744 {
2745 ch = NOCHAR;
2746 break;
2747 }
2748 else
2749 eol = min (eol + ncol, buf + UBUFSIZ);
2750 }
2751
2237 } 2752 }
2238 2753
2239 if (str >= buf + UBUFSIZ) 2754 seq_begin = cmdbuf_ptr;
2240 { 2755 ch = next_char ();
2241 ch = NOCHAR;
2242 break;
2243 }
2244 } 2756 }
2245 2757
2246 scr_add_lines (buf, nlines, str - buf); 2758 scr_add_lines (buf, nlines, str - buf);
2247 2759
2248 /* 2760 /*
2249 * If there have been a lot of new lines, then update the screen 2761 * 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. 2762 * 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 2763 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2764 * 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 */ 2765 */
2257 if (refreshnow) 2766 if (refreshnow)
2258 { 2767 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2768 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2769 refresh_limit++;
2261 2770 else
2771 {
2772 flag = true;
2262 scr_refresh (refresh_type); 2773 scr_refresh (refresh_type);
2774 flush_ev.stop ();
2775 }
2263 } 2776 }
2264 2777
2265 } 2778 }
2266 else 2779 else
2267 { 2780 {
… …
2281 } 2794 }
2282 2795
2283 return flag; 2796 return flag;
2284} 2797}
2285 2798
2799// read the next octet
2800unicode_t
2801rxvt_term::next_octet ()
2802{
2803 return cmdbuf_ptr < cmdbuf_endp
2804 ? *cmdbuf_ptr++
2805 : NOCHAR;
2806}
2807
2286// read the next character 2808// read the next character
2287unicode_t 2809unicode_t
2288rxvt_term::next_char () 2810rxvt_term::next_char ()
2289{ 2811{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2812 while (cmdbuf_ptr < cmdbuf_endp)
… …
2306 if (len == (size_t)-1) 2828 if (len == (size_t)-1)
2307 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2829 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2308 2830
2309 // assume wchar == unicode 2831 // assume wchar == unicode
2310 cmdbuf_ptr += len; 2832 cmdbuf_ptr += len;
2311 return wc; 2833 return wc & UNICODE_MASK;
2312 } 2834 }
2313 2835
2314 return NOCHAR; 2836 return NOCHAR;
2315} 2837}
2316 2838
… …
2321 */ 2843 */
2322unicode_t 2844unicode_t
2323rxvt_term::cmd_getc () 2845rxvt_term::cmd_getc ()
2324{ 2846{
2325 unicode_t c = next_char (); 2847 unicode_t c = next_char ();
2848
2849 if (c == NOCHAR)
2850 throw out_of_input;
2851
2852 return c;
2853}
2854
2855unicode_t
2856rxvt_term::cmd_get8 ()
2857{
2858 unicode_t c = next_octet ();
2326 2859
2327 if (c == NOCHAR) 2860 if (c == NOCHAR)
2328 throw out_of_input; 2861 throw out_of_input;
2329 2862
2330 return c; 2863 return c;
… …
2431 process_escape_seq (); 2964 process_escape_seq ();
2432 break; 2965 break;
2433 case C0_ENQ: /* terminal Status */ 2966 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2967 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2968 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2969 (unsigned int)strlen (rs[Rs_answerbackstring]));
2437 else 2970 else
2438 tt_write ((unsigned char *)VT100_ANS, 2971 tt_write ((unsigned char *)VT100_ANS,
2439 (unsigned int)STRLEN (VT100_ANS)); 2972 (unsigned int)strlen (VT100_ANS));
2440 break; 2973 break;
2441 case C0_BEL: /* bell */ 2974 case C0_BEL: /* bell */
2442 scr_bell (); 2975 scr_bell ();
2443 break; 2976 break;
2444 case C0_BS: /* backspace */ 2977 case C0_BS: /* backspace */
… …
2460 break; 2993 break;
2461 case C0_SI: /* shift in - acs */ 2994 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2995 scr_charset_choose (0);
2463 break; 2996 break;
2464 2997
2998#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2999 // 8-bit controls
2466 case 0x90: /* DCS */ 3000 case 0x90: /* DCS */
2467 process_dcs_seq (); 3001 process_dcs_seq ();
2468 break; 3002 break;
2469 case 0x9b: /* CSI */ 3003 case 0x9b: /* CSI */
2470 process_csi_seq (); 3004 process_csi_seq ();
2471 break; 3005 break;
2472 case 0x9d: /* CSI */ 3006 case 0x9d: /* CSI */
2473 process_osc_seq (); 3007 process_osc_seq ();
2474 break; 3008 break;
3009#endif
2475 } 3010 }
2476} 3011}
2477/*}}} */ 3012/*}}} */
2478 3013
2479 3014
… …
2541void 3076void
2542rxvt_term::process_escape_seq () 3077rxvt_term::process_escape_seq ()
2543{ 3078{
2544 unicode_t ch = cmd_getc (); 3079 unicode_t ch = cmd_getc ();
2545 3080
2546 if (PrivateModes & PrivMode_vt52) 3081 if (priv_modes & PrivMode_vt52)
2547 { 3082 {
2548 process_escape_vt52 (ch); 3083 process_escape_vt52 (ch);
2549 return; 3084 return;
2550 } 3085 }
2551 3086
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 3101 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 3102 break;
2568 case '+': 3103 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 3104 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 3105 break;
2571#ifndef NO_FRILLS 3106#if ENABLE_FRILLS
2572 case '6': 3107 case '6':
2573 scr_backindex (); 3108 scr_backindex ();
2574 break; 3109 break;
2575#endif 3110#endif
2576 case '7': 3111 case '7':
2577 scr_cursor (SAVE); 3112 scr_cursor (SAVE);
2578 break; 3113 break;
2579 case '8': 3114 case '8':
2580 scr_cursor (RESTORE); 3115 scr_cursor (RESTORE);
2581 break; 3116 break;
2582#ifndef NO_FRILLS 3117#if ENABLE_FRILLS
2583 case '9': 3118 case '9':
2584 scr_forwardindex (); 3119 scr_forwardindex ();
2585 break; 3120 break;
2586#endif 3121#endif
2587 case '=': 3122 case '=':
… …
2597 break; 3132 break;
2598 3133
2599 /* 8.3.87: NEXT LINE */ 3134 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 3135 case C1_NEL: /* ESC E */
2601 { 3136 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 3137 unicode_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 3138 scr_add_lines (nlcr, 1, 2);
2604 } 3139 }
2605 break; 3140 break;
2606 3141
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 3142 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2668 3203
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3204/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3205/* *INDENT-OFF* */
2671enum { 3206enum {
2672 CSI_ICH = 0x40, 3207 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3208 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 , 3209 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, 3210 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, 3211 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, 3212 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, 3213 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2766 { 3301 {
2767 switch (priv) 3302 switch (priv)
2768 { 3303 {
2769 case '>': 3304 case '>':
2770 if (ch == CSI_DA) /* secondary device attributes */ 3305 if (ch == CSI_DA) /* secondary device attributes */
2771 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3306 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2772 break; 3307 break;
2773 case '?': 3308 case '?':
2774 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3309 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2775 process_terminal_mode (ch, priv, nargs, arg); 3310 process_terminal_mode (ch, priv, nargs, arg);
2776 break; 3311 break;
… …
2881 3416
2882 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3417 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2883 arg[0] = -arg[0]; 3418 arg[0] = -arg[0];
2884 /* FALLTHROUGH */ 3419 /* FALLTHROUGH */
2885 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2887 break; 3422 break;
2888 3423
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3425 tt_write ((const unsigned char *)VT100_ANS,
2891 (unsigned int) (sizeof (VT100_ANS) - 1)); 3426 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3427 break;
2893 3428
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3429 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3430 process_sgr_mode (nargs, arg);
2896 break; 3431 break;
… …
2903 break; 3438 break;
2904 case 6: /* CPR requested */ 3439 case 6: /* CPR requested */
2905 scr_report_position (); 3440 scr_report_position ();
2906 break; 3441 break;
2907 case 7: /* unofficial extension */ 3442 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3443 if (OPTION (Opt_insecure))
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3444 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3445 break;
2911 case 8: /* unofficial extension */ 3446 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3447 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3448 break;
2914 } 3449 }
… …
2950 break; 3485 break;
2951 3486
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3487 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3488 if (arg[0] == 4)
2954 scr_insert_mode (0); 3489 scr_insert_mode (0);
3490 else if (arg[0] == 20)
3491 priv_modes &= ~PrivMode_LFNL;
2955 break; 3492 break;
2956 3493
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3494 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3495 if (arg[0] == 4)
2959 scr_insert_mode (1); 3496 scr_insert_mode (1);
3497 else if (arg[0] == 20)
3498 priv_modes |= PrivMode_LFNL;
2960 break; 3499 break;
2961 3500
2962 /* 3501 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3502 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3503 */
… …
2976 break; 3515 break;
2977 case CSI_75: 3516 case CSI_75:
2978 scr_cursor (RESTORE); 3517 scr_cursor (RESTORE);
2979 break; 3518 break;
2980 3519
2981#ifndef NO_FRILLS 3520#if ENABLE_FRILLS
2982 case CSI_74: 3521 case CSI_74:
2983 process_window_ops (arg, nargs); 3522 process_window_ops (arg, nargs);
2984 break; 3523 break;
2985#endif 3524#endif
2986 3525
… …
2993 break; 3532 break;
2994 } 3533 }
2995} 3534}
2996/*}}} */ 3535/*}}} */
2997 3536
2998#ifndef NO_FRILLS 3537#if ENABLE_FRILLS
2999/* ARGSUSED */ 3538/* ARGSUSED */
3000void 3539void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3540rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3541{
3003 int x, y; 3542 int x, y;
3004 XWindowAttributes wattr; 3543 XWindowAttributes wattr;
3005 Window wdummy; 3544 Window wdummy;
3545 dDisp;
3006 3546
3007 if (nargs == 0) 3547 if (nargs == 0)
3008 return; 3548 return;
3009 3549
3010 switch (args[0]) 3550 switch (args[0])
3011 { 3551 {
3012 /* 3552 /*
3013 * commands 3553 * commands
3014 */ 3554 */
3015 case 1: /* deiconify window */ 3555 case 1: /* deiconify window */
3016 XMapWindow (display->display, TermWin.parent[0]); 3556 XMapWindow (disp, parent[0]);
3017 break; 3557 break;
3018 case 2: /* iconify window */ 3558 case 2: /* iconify window */
3019 XIconifyWindow (display->display, TermWin.parent[0], 3559 XIconifyWindow (disp, parent[0], display->screen);
3020 DefaultScreen (display->display));
3021 break; 3560 break;
3022 case 3: /* set position (pixels) */ 3561 case 3: /* set position (pixels) */
3023 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3562 XMoveWindow (disp, parent[0], args[1], args[2]);
3024 break; 3563 break;
3025 case 4: /* set size (pixels) */ 3564 case 4: /* set size (pixels) */
3026 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3565 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3027 break; 3566 break;
3028 case 5: /* raise window */ 3567 case 5: /* raise window */
3029 XRaiseWindow (display->display, TermWin.parent[0]); 3568 XRaiseWindow (disp, parent[0]);
3030 break; 3569 break;
3031 case 6: /* lower window */ 3570 case 6: /* lower window */
3032 XLowerWindow (display->display, TermWin.parent[0]); 3571 XLowerWindow (disp, parent[0]);
3033 break; 3572 break;
3034 case 7: /* refresh window */ 3573 case 7: /* refresh window */
3035 scr_touch (true); 3574 scr_touch (true);
3036 break; 3575 break;
3037 case 8: /* set size (chars) */ 3576 case 8: /* set size (chars) */
3038 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3577 set_widthheight ((unsigned int) (args[2] * fwidth),
3039 (unsigned int) (args[1] * TermWin.fheight)); 3578 (unsigned int) (args[1] * fheight));
3040 break; 3579 break;
3041 3580
3042 //case 9: NYI, TODO, restore maximized window or maximize window 3581 //case 9: NYI, TODO, restore maximized window or maximize window
3043 default: 3582 default:
3044 if (args[0] >= 24) /* set height (chars) */ 3583 if (args[0] >= 24) /* set height (chars) */
3045 set_widthheight ((unsigned int)TermWin.width, 3584 set_widthheight ((unsigned int)width,
3046 (unsigned int) (args[1] * TermWin.fheight)); 3585 (unsigned int) (args[1] * fheight));
3047 break; 3586 break;
3048 3587
3049 3588
3050 /* 3589 /*
3051 * reports - some output format copied from XTerm 3590 * reports - some output format copied from XTerm
3052 */ 3591 */
3053 case 11: /* report window state */ 3592 case 11: /* report window state */
3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3593 XGetWindowAttributes (disp, parent[0], &wattr);
3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3594 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3056 break; 3595 break;
3057 case 13: /* report window position */ 3596 case 13: /* report window position */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3597 XGetWindowAttributes (disp, parent[0], &wattr);
3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3598 XTranslateCoordinates (disp, parent[0], wattr.root,
3060 -wattr.border_width, -wattr.border_width, 3599 -wattr.border_width, -wattr.border_width,
3061 &x, &y, &wdummy); 3600 &x, &y, &wdummy);
3062 tt_printf ("\033[3;%d;%dt", x, y); 3601 tt_printf ("\033[3;%d;%dt", x, y);
3063 break; 3602 break;
3064 case 14: /* report window size (pixels) */ 3603 case 14: /* report window size (pixels) */
3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3604 XGetWindowAttributes (disp, parent[0], &wattr);
3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3605 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3067 break; 3606 break;
3068 case 18: /* report text area size (chars) */ 3607 case 18: /* report text area size (chars) */
3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3608 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3070 break; 3609 break;
3071 case 19: /* report window size (chars) */ 3610 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3611 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3073 break; 3612 break;
3074 case 20: /* report icon label */ 3613 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3614 {
3077 char *s; 3615 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3616 XGetIconName (disp, parent[0], &s);
3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3617 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3618 XFree (s);
3080 } 3619 }
3081 break; 3620 break;
3082 case 21: /* report window title */ 3621 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3622 {
3085 char *s; 3623 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3624 XFetchName (disp, parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3625 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3626 XFree (s);
3088 } 3627 }
3089 break; 3628 break;
3090 } 3629 }
3091} 3630}
3092#endif 3631#endif
3093 3632
3094/*----------------------------------------------------------------------*/ 3633/*----------------------------------------------------------------------*/
3095/* 3634/*
3096 * get input up until STRING TERMINATOR (or BEL) 3635 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3636 * ends_how is terminator used. returned input must be free()'d
3098 */ 3637 */
3099unsigned char * 3638unsigned char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3639rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3640{
3102 int seen_esc = 0; /* seen escape? */ 3641 unicode_t ch;
3642 bool seen_esc = false;
3103 unsigned int n = 0; 3643 unsigned int n = 0;
3104 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3644 wchar_t string[STRING_MAX];
3107 3645
3108 while ((ch = cmd_getc ())) 3646 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3647 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3648 if (seen_esc)
3649 {
3114 if (ch == 0x5c) /* 7bit ST */ 3650 if (ch == 0x5c) /* 7bit ST */
3115 break; 3651 break;
3116 else 3652 else
3117 return NULL; 3653 return NULL;
3118 3654 }
3119 if (ch == C0_ESC) 3655 else if (ch == C0_ESC)
3120 { 3656 {
3121 seen_esc = 1; 3657 seen_esc = true;
3122 continue; 3658 continue;
3123 } 3659 }
3124 else if (ch == '\t') 3660 else if (ch == C0_BEL || ch == CHAR_ST)
3125 ch = ' '; /* translate '\t' to space */ 3661 break;
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3662 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3663 return NULL; /* other control character - exit */
3128 3664
3129 if (n >= sizeof (string) - 1) 3665 seen_esc = false;
3666
3667 if (n >= STRING_MAX - 1)
3130 // stop at some sane length 3668 // stop at some sane length
3131 return NULL; 3669 return NULL;
3132 3670
3671 if (ch == C0_SYN)
3672 string[n++] = cmd_get8 ();
3673 else
3133 string[n++] = ch; 3674 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3675 }
3136 3676
3137 string[n++] = '\0'; 3677 string[n++] = '\0';
3138 3678
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL;
3141
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3679 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3680
3144 return s; 3681 return (unsigned char *)rxvt_wcstombs (string);
3145} 3682}
3146 3683
3147/*----------------------------------------------------------------------*/ 3684/*----------------------------------------------------------------------*/
3148/* 3685/*
3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3686 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3193void 3730void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3731rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{ 3732{
3196 if (str[0] == '?' && !str[1]) 3733 if (str[0] == '?' && !str[1])
3197 { 3734 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b; 3735 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b); 3736 pix_colors_focused[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3737 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 } 3738 }
3205 else 3739 else
3206 set_window_color (color, str); 3740 set_window_color (color, str);
3207} 3741}
3208 3742
3209/* 3743/*
3210 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3744 * 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 */ 3745 */
3234void 3746void
3235rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3747rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3236{ 3748{
3237 int changed = 0; 3749 int changed = 0;
3238 int color; 3750 int color;
3239 char *buf, *name; 3751 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3752 bool query = str[0] == '?' && !str[1];
3753 int saveop = op;
3754 dDisp;
3241 3755
3242 assert (str != NULL); 3756 assert (str != NULL);
3243 switch (op) 3757 switch (op)
3244 { 3758 {
3245 case XTerm_name: 3759 case XTerm_name:
… …
3252 set_title (str); 3766 set_title (str);
3253 break; 3767 break;
3254 case XTerm_property: 3768 case XTerm_property:
3255 if (str[0] == '?') 3769 if (str[0] == '?')
3256 { 3770 {
3257 Atom prop = XInternAtom (display->display, str + 1, True); 3771 Atom prop = display->atom (str + 1);
3258 Atom actual_type; 3772 Atom actual_type;
3259 int actual_format; 3773 int actual_format;
3260 unsigned long nitems; 3774 unsigned long nitems;
3261 unsigned long bytes_after; 3775 unsigned long bytes_after;
3262 unsigned char *value = 0; 3776 unsigned char *value = 0;
3263 const char *str = ""; 3777 const char *str = "";
3264 3778
3265 if (prop 3779 if (prop
3266 && XGetWindowProperty (display->display, TermWin.parent[0], 3780 && XGetWindowProperty (disp, parent[0],
3267 prop, 0, 1<<16, 0, AnyPropertyType, 3781 prop, 0, 1<<16, 0, AnyPropertyType,
3268 &actual_type, &actual_format, 3782 &actual_type, &actual_format,
3269 &nitems, &bytes_after, &value) == Success 3783 &nitems, &bytes_after, &value) == Success
3270 && actual_type != None 3784 && actual_type != None
3271 && actual_format == 8) 3785 && actual_format == 8)
… …
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3794 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281 3795
3282 if (eq) 3796 if (eq)
3283 { 3797 {
3284 *eq = 0; 3798 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0], 3799 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 } 3800 }
3290 else 3801 else
3291 XDeleteProperty (display->display, TermWin.parent[0], 3802 XDeleteProperty (disp, parent[0],
3292 display->atom (str)); 3803 display->atom (str));
3293 } 3804 }
3294 break; 3805 break;
3295 3806
3296 case XTerm_Color: 3807 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3808 for (buf = (char *)str; buf && *buf;)
3298 { 3809 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3810 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3811 break;
3301 3812
3302 *name++ = '\0'; 3813 *name++ = '\0';
3303 color = atoi (buf); 3814 color = atoi (buf);
3304 3815
3305 if (color < 0 || color >= TOTAL_COLORS) 3816 if (color < 0 || color >= TOTAL_COLORS)
3306 break; 3817 break;
3307 3818
3308 if ((buf = STRCHR (name, ';')) != NULL) 3819 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3820 *buf++ = '\0';
3310 3821
3311 if (name[0] == '?' && !name[1]) 3822 if (name[0] == '?' && !name[1])
3312 { 3823 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b; 3824 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b); 3825 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); 3826 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 } 3827 }
3320 else 3828 else
3321 set_window_color (color + minCOLOR, name); 3829 set_window_color (color + minCOLOR, name);
3322 } 3830 }
3323 break; 3831 break;
… …
3345 case XTerm_Color_UL: 3853 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3854 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break; 3855 break;
3348 case XTerm_Color_RV: 3856 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3857 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3858 break;
3859 case URxvt_Color_IT:
3860 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3861 break;
3862#endif
3863#if TRANSPARENT && TINTING
3864 case URxvt_Color_tint:
3865 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3866 check_our_parents ();
3867 if (am_transparent)
3868 want_full_refresh = want_refresh = 1;
3350 break; 3869 break;
3351#endif 3870#endif
3352 3871
3353 case XTerm_Pixmap: 3872 case XTerm_Pixmap:
3354 if (*str != ';') 3873 if (*str != ';')
… …
3357 scale_pixmap (""); /* reset to default scaling */ 3876 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3877 set_bgPixmap (str); /* change pixmap */
3359#endif 3878#endif
3360 scr_touch (true); 3879 scr_touch (true);
3361 } 3880 }
3362 while ((str = STRCHR (str, ';')) != NULL) 3881 while ((str = strchr (str, ';')) != NULL)
3363 { 3882 {
3364 str++; 3883 str++;
3365#if XPM_BACKGROUND 3884#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3885 changed += scale_pixmap (str);
3367#endif 3886#endif
3368
3369 } 3887 }
3888
3370 if (changed) 3889 if (changed)
3371 { 3890 {
3372#ifdef XPM_BACKGROUND 3891#ifdef XPM_BACKGROUND
3373 resize_pixmap (); 3892 resize_pixmap ();
3374#endif 3893#endif
… …
3385 3904
3386 case XTerm_logfile: 3905 case XTerm_logfile:
3387 // TODO, when secure mode? 3906 // TODO, when secure mode?
3388 break; 3907 break;
3389 3908
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 3909#ifdef MENUBAR
3431 case XTerm_Menu: 3910 case URxvt_Menu:
3432 if (Options & Opt_insecure) 3911 if (OPTION (Opt_insecure))
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3912 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3913 break;
3435#endif 3914#endif
3436#if 0 3915#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3916 case XTerm_dumpscreen: /* no error notices */
… …
3441 { 3920 {
3442 scr_dump (fd); 3921 scr_dump (fd);
3443 close (fd); 3922 close (fd);
3444 } 3923 }
3445 } 3924 }
3925 break;
3926#endif
3927 case XTerm_font:
3928 op = URxvt_font;
3929 case URxvt_font:
3930#if ENABLE_STYLES
3931 case URxvt_boldFont:
3932 case URxvt_italicFont:
3933 case URxvt_boldItalicFont:
3934#endif
3935 if (query)
3936 tt_printf ("\33]%d;%-.250s%c", saveop,
3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3938 ? fontset[op - URxvt_font]->fontdesc : "",
3939 resp);
3940 else
3941 {
3942 const char *&res = rs[Rs_font + (op - URxvt_font)];
3943
3944 res = strdup (str);
3945 allocated.push_back ((void *)res);
3946 set_fonts ();
3947 }
3948 break;
3949
3950#if ENABLE_FRILLS
3951 case URxvt_locale:
3952 if (query)
3953 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3954 else
3955 {
3956 set_locale (str);
3957 pty.set_utf8_mode (enc_utf8);
3958 init_xlocale ();
3959 }
3960 break;
3961
3962 case URxvt_view_up:
3963 case URxvt_view_down:
3964 int lines = atoi (str);
3965
3966 if (lines)
3967 scr_page (op == URxvt_view_up ? UP : DN, lines);
3968 else
3969 {
3970 scr_erase_savelines ();
3971 }
3972
3446 break; 3973 break;
3447#endif 3974#endif
3448 } 3975 }
3449} 3976}
3450/*----------------------------------------------------------------------*/ 3977/*----------------------------------------------------------------------*/
… …
3464{ 3991{
3465 int state; 3992 int state;
3466 3993
3467 if (mode == 's') 3994 if (mode == 's')
3468 { 3995 {
3469 SavedModes |= (PrivateModes & bit); 3996 SavedModes |= (priv_modes & bit);
3470 return -1; 3997 return -1;
3471 } 3998 }
3472 else 3999 else
3473 { 4000 {
3474 if (mode == 'r') 4001 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4002 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 4003 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4004 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 4005 PrivMode (state, bit);
3479 } 4006 }
3480 4007
3481 return state; 4008 return state;
3482} 4009}
… …
3500 { 3, PrivMode_132 }, 4027 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 4028 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 4029 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 4030 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 4031 { 7, PrivMode_Autowrap },
4032 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 4033 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 4034#ifdef menuBar_esc
3507 { menuBar_esc, PrivMode_menuBar }, 4035 { menuBar_esc, PrivMode_menuBar },
3508#endif 4036#endif
4037 // 18, 19 printing-related
4038 { 25, PrivMode_VisibleCursor },
3509#ifdef scrollBar_esc 4039#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 4040 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 4041#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 4042 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 4043 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 4044 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 4045 // 45 margin bell NYI
3519 // 46 start logging 4046 // 46 start logging
… …
3559 } 4086 }
3560 4087
3561 /* extra handling for values with state unkept */ 4088 /* extra handling for values with state unkept */
3562 switch (arg[i]) 4089 switch (arg[i])
3563 { 4090 {
4091#if ENABLE_STYLES
4092 case 1021:
4093 if (mode)
4094 SET_OPTION (Opt_intensityStyles);
4095 else
4096 CLR_OPTION (Opt_intensityStyles);
4097
4098 scr_touch (true);
4099 break;
4100#endif
3564 case 1048: /* alternative cursor save */ 4101 case 1048: /* alternative cursor save */
4102 case 1049:
3565 if (Options & Opt_secondaryScreen) 4103 if (OPTION (Opt_secondaryScreen))
3566 if (mode == 0) 4104 if (mode == 0)
3567 scr_cursor (RESTORE); 4105 scr_cursor (RESTORE);
3568 else if (mode == 1) 4106 else if (mode == 1)
3569 scr_cursor (SAVE); 4107 scr_cursor (SAVE);
3570 break; 4108 break;
… …
3581 * within VT52 mode 4119 * within VT52 mode
3582 */ 4120 */
3583 PrivMode (1, PrivMode_vt52); 4121 PrivMode (1, PrivMode_vt52);
3584 break; 4122 break;
3585 case 3: /* 80/132 */ 4123 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 4124 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4125 set_widthheight (((state ? 132 : 80) * fwidth), height);
3588 break; 4126 break;
3589 case 4: /* smooth scrolling */ 4127 case 4: /* smooth scrolling */
3590 if (state) 4128 if (!state)
3591 Options &= ~Opt_jumpScroll; 4129 SET_OPTION (Opt_jumpScroll);
3592 else 4130 else
3593 Options |= Opt_jumpScroll; 4131 CLR_OPTION (Opt_jumpScroll);
3594 break; 4132 break;
3595 case 5: /* reverse video */ 4133 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 4134 scr_rvideo_mode (state);
3597 break; 4135 break;
3598 case 6: /* relative/absolute origins */ 4136 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 4140 scr_autowrap (state);
3603 break; 4141 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 4142 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 4143 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 4144 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 4145 priv_modes &= ~PrivMode_MouseX11;
3608 break; 4146 break;
3609#ifdef menuBar_esc 4147#ifdef menuBar_esc
3610 case menuBar_esc: 4148 case menuBar_esc:
3611#ifdef MENUBAR 4149#ifdef MENUBAR
3612 map_menuBar (state); 4150 map_menuBar (state);
… …
3632 break; 4170 break;
3633 /* case 66: - application key pad */ 4171 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4172 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4173 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4174 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4175 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4176 break;
3639#if 0 4177#if 0
3640 case 1001: 4178 case 1001:
3641 break; /* X11 mouse highlighting */ 4179 break; /* X11 mouse highlighting */
3642#endif 4180#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4181 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state) 4182 if (!state)
3645 Options &= ~Opt_scrollTtyOutput; 4183 SET_OPTION (Opt_scrollTtyOutput);
3646 else 4184 else
3647 Options |= Opt_scrollTtyOutput; 4185 CLR_OPTION (Opt_scrollTtyOutput);
3648 break; 4186 break;
3649 case 1011: /* scroll to bottom on key press */ 4187 case 1011: /* scroll to bottom on key press */
3650 if (state) 4188 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4189 SET_OPTION (Opt_scrollTtyKeypress);
3652 else 4190 else
3653 Options &= ~Opt_scrollTtyKeypress; 4191 CLR_OPTION (Opt_scrollTtyKeypress);
3654 break; 4192 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4193 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4194 if (OPTION (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 4195 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4196 scr_erase_screen (2);
3659 scr_change_screen (state); 4197 scr_change_screen (state);
3660 break; 4198 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4199 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4200 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4201 if (OPTION (Opt_secondaryScreen))
3664 if (current_screen != PRIMARY) 4202 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4203 scr_erase_screen (2);
3666 break; 4204 break;
3667 default: 4205 default:
3668 break; 4206 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4232 rendset = 0, rendstyle = ~RS_None;
3695 break; 4233 break;
3696 case 1: 4234 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4235 rendset = 1, rendstyle = RS_Bold;
3698 break; 4236 break;
4237 //case 2: // low intensity
4238 case 3:
4239 rendset = 1, rendstyle = RS_Italic;
4240 break;
3699 case 4: 4241 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4242 rendset = 1, rendstyle = RS_Uline;
3701 break; 4243 break;
3702 case 5: 4244 case 5: // slowly blinking
4245 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4246 rendset = 1, rendstyle = RS_Blink;
3704 break; 4247 break;
4248 //case 6: // scoansi light background
3705 case 7: 4249 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4250 rendset = 1, rendstyle = RS_RVid;
3707 break; 4251 break;
3708 case 8: 4252 case 8:
3709 // invisible. NYI 4253 // invisible. NYI
3710 break; 4254 break;
3711 case 22: 4255 //case 9: // crossed out
4256 //case 10: // scoansi acs off, primary font
4257 //case 11: // scoansi acs on, first alt font
4258 //case 12: // scoansi acs on, |0x80, second alt font
4259 //...
4260 //case 19: // ninth alt font
4261 //case 20: // gothic
4262 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 4263 rendset = 0, rendstyle = RS_Bold;
4264 break;
4265 case 22: // normal intensity
4266 rendset = 0, rendstyle = RS_Bold;
4267 break;
4268 case 23: // disable italic
4269 rendset = 0, rendstyle = RS_Italic;
3713 break; 4270 break;
3714 case 24: 4271 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4272 rendset = 0, rendstyle = RS_Uline;
3716 break; 4273 break;
3717 case 25: 4274 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4275 rendset = 0, rendstyle = RS_Blink;
3719 break; 4276 break;
4277 case 26: // variable spacing (iso 8613)
4278 rendset = 0, rendstyle = RS_Blink;
4279 break;
3720 case 27: 4280 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4281 rendset = 0, rendstyle = RS_RVid;
3722 break; 4282 break;
3723 case 28:
3724 // visible. NYI 4283 //case 28: // visible. NYI
3725 break; 4284 //case 29: // not crossed-out
3726 } 4285 }
3727 4286
3728 if (rendset != -1) 4287 if (rendset != -1)
3729 { 4288 {
3730 scr_rendition (rendset, rendstyle); 4289 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4300 case 35:
3742 case 36: 4301 case 36:
3743 case 37: 4302 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4303 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4304 break;
3746#ifdef TTY_256COLOR 4305 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4306 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4307 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4308 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4309 i += 2;
3752 } 4310 }
3753 break; 4311 break;
3754#endif
3755 case 39: /* default fg */ 4312 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4313 scr_color (Color_fg, Color_fg);
3757 break; 4314 break;
3758 4315
3759 case 40: 4316 case 40:
… …
3764 case 45: 4321 case 45:
3765 case 46: 4322 case 46:
3766 case 47: 4323 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4324 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4325 break;
3769#ifdef TTY_256COLOR 4326 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4327 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4328 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4329 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4330 i += 2;
3775 } 4331 }
3776 break; 4332 break;
3777#endif
3778 case 49: /* default bg */ 4333 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4334 scr_color (Color_bg, Color_bg);
3780 break; 4335 break;
4336
4337 //case 50: // not variable spacing
3781 4338
3782#ifndef NO_BRIGHTCOLOR 4339#ifndef NO_BRIGHTCOLOR
3783 case 90: 4340 case 90:
3784 case 91: /* set bright fg color */ 4341 case 91: /* set bright fg color */
3785 case 92: 4342 case 92:
3786 case 93: 4343 case 93:
3787 case 94: 4344 case 94:
3788 case 95: 4345 case 95:
3789 case 96: 4346 case 96:
3790 case 97: 4347 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4348 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4349 break;
3794 case 100: 4350 case 100:
3795 case 101: /* set bright bg color */ 4351 case 101: /* set bright bg color */
3796 case 102: 4352 case 102:
3797 case 103: 4353 case 103:
3798 case 104: 4354 case 104:
3799 case 105: 4355 case 105:
3800 case 106: 4356 case 106:
3801 case 107: 4357 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4358 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4359 break;
3805#endif 4360#endif
3806
3807 } 4361 }
3808 } 4362 }
3809} 4363}
3810/*}}} */ 4364/*}}} */
3811 4365
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4366/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4367void
3814rxvt_term::process_graphics () 4368rxvt_term::process_graphics ()
3815{ 4369{
3816 unicode_t ch, cmd = cmd_getc (); 4370 unicode_t ch, cmd = cmd_getc ();
3817 4371
3818 if (cmd == 'Q') 4372 if (cmd == 'Q')
3819 { /* query graphics */ 4373 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4374 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4375 return;
3822 } 4376 }
3823 /* swallow other graphics sequences until terminating ':' */ 4377 /* swallow other graphics sequences until terminating ':' */
3824 do 4378 do
3825 ch = cmd_getc (); 4379 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4394 unsigned char buf[256];
3841 4395
3842 va_start (arg_ptr, fmt); 4396 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4397 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4398 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4399 tt_write (buf, strlen (buf));
3846} 4400}
3847 4401
3848/* ---------------------------------------------------------------------- */ 4402/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4403/* 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. 4404 * or generated by us in response to a query ESC sequence.
3851 */ 4405 */
4406const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4407
3852void 4408void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4409rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4410{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4411 if (v_buflen == 0)
4412 {
4413 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3856 4414
3857 if (len) 4415 if ((unsigned int)written == len)
4416 return;
4417
4418 data += written;
4419 len -= written;
3858 { 4420 }
4421
4422 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4423
4424 memcpy (v_buffer + v_buflen, data, len);
4425 v_buflen += len;
4426
4427 pty_ev.set (EVENT_READ | EVENT_WRITE);
4428}
4429
4430void rxvt_term::pty_write ()
4431{
4432 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4433
4434 if (written > 0)
4435 {
4436 v_buflen -= written;
4437
3859 if (v_buflen == 0) 4438 if (v_buflen == 0)
3860 { 4439 {
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); 4440 free (v_buffer);
3888 v_buffer = 0; 4441 v_buffer = 0;
3889 v_buflen = 0; 4442 v_buflen = 0;
3890 4443
3891 pty_ev.set (EVENT_READ); 4444 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; 4445 return;
3904 } 4446 }
4447
4448 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4449 }
4450 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4451 pty_ev.set (EVENT_READ);
3906} 4452}
3907 4453
3908/*----------------------- end-of-file (C source) -----------------------*/ 4454/*----------------------- end-of-file (C source) -----------------------*/
3909 4455

Diff Legend

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