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.227 by root, Mon Jan 2 15:35:43 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 event_handler.cw_yield.start ();
1119#endif
1120 }
1121 else
1122 {
1123 pty_ev.stop ();
1124
1125 if (!OPTION (Opt_hold))
733 destroy (); 1126 destroy ();
1127 }
734 1128
735 return false; 1129 return false;
736} 1130}
737 1131
738void 1132void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1133rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1134{
741 SET_R (this); 1135 SET_R (this);
742 SET_LOCALE (locale); 1136 SET_LOCALE (locale);
743 1137
1138 if (revents & EVENT_READ)
1139 // loop, but don't allow a single term to monopolize us
1140 while (pty_fill ())
1141 if (cmd_parse ())
1142 break;
1143
744 if (revents & EVENT_WRITE) 1144 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1145 pty_write ();
746 else if (revents & EVENT_READ) 1146}
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 1147
760 if (cmd_parse ()) 1148void
761 break; 1149rxvt_term::pointer_unblank ()
762 } 1150{
763 } 1151 XDefineCursor (display->display, vt, TermWin_cursor);
1152 recolour_cursor ();
1153
1154#ifdef POINTER_BLANK
1155 hidden_pointer = 0;
1156
1157 if (OPTION (Opt_pointerBlank))
1158 pointer_ev.start (NOW + pointerBlankDelay);
1159#endif
764} 1160}
765 1161
766#ifdef POINTER_BLANK 1162#ifdef POINTER_BLANK
767void 1163void
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 () 1164rxvt_term::pointer_blank ()
781{ 1165{
782 if (! (Options & Opt_pointerBlank)) 1166 if (! OPTION (Opt_pointerBlank))
783 return; 1167 return;
784 1168
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1169 XDefineCursor (display->display, vt, display->blank_cursor);
786 XFlush (display->display); 1170 XFlush (display->display);
787 1171
788 hidden_pointer = 1; 1172 hidden_pointer = 1;
789} 1173}
790 1174
… …
807 x = ev.x; 1191 x = ev.x;
808 y = ev.y; 1192 y = ev.y;
809 pixel_position (&x, &y); 1193 pixel_position (&x, &y);
810 1194
811 if (MEvent.button == AnyButton) 1195 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1196 button_number = 3;
814 }
815 else 1197 else
816 { 1198 {
817 button_number = MEvent.button - Button1; 1199 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1200 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1201 if (button_number >= 3)
820 button_number += (64 - 3); 1202 button_number += (64 - 3);
821 } 1203 }
822 1204
823 if (PrivateModes & PrivMode_MouseX10) 1205 if (priv_modes & PrivMode_MouseX10)
824 { 1206 {
825 /* 1207 /*
826 * do not report ButtonRelease 1208 * do not report ButtonRelease
827 * no state info allowed 1209 * no state info allowed
828 */ 1210 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1225 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1226 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1227#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1228 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1229#endif
848
849 } 1230 }
850 1231
851#ifdef DEBUG_MOUSEREPORT 1232#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1233 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1234 if (key_state & 16)
854 fputc ('C', stderr); 1235 fputc ('C', stderr);
855 if (key_state & 4) 1236 if (key_state & 4)
856 fputc ('S', stderr); 1237 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1241 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1242 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1243 button_number,
863 x + 1, 1244 x + 1,
864 y + 1); 1245 y + 1);
865#else 1246#endif
1247
866 tt_printf ("\033[M%c%c%c", 1248 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1249 (32 + button_number + key_state),
868 (32 + x + 1), 1250 (32 + x + 1),
869 (32 + y + 1)); 1251 (32 + y + 1));
870#endif
871} 1252}
872 1253
873#ifdef USING_W11LIB 1254#ifdef USING_W11LIB
874void 1255void
875rxvt_W11_process_x_event (XEvent *ev) 1256rxvt_W11_process_x_event (XEvent *ev)
… …
882 1263
883/*{{{ process an X event */ 1264/*{{{ process an X event */
884void 1265void
885rxvt_term::x_cb (XEvent &ev) 1266rxvt_term::x_cb (XEvent &ev)
886{ 1267{
1268 dDisp;
1269
887 SET_R (this); 1270 SET_R (this);
888 SET_LOCALE (locale); 1271 SET_LOCALE (locale);
889 1272
890#if defined(CURSOR_BLINK) 1273#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1274 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
892 { 1275 {
893 if (hidden_cursor) 1276 if (hidden_cursor)
894 { 1277 {
895 hidden_cursor = 0; 1278 hidden_cursor = 0;
896 want_refresh = 1; 1279 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1282 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1283 }
901#endif 1284#endif
902 1285
903#if defined(POINTER_BLANK) 1286#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1287 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1288 {
906 if (ev.type == MotionNotify 1289 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1290 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1291 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1292 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1295 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1296 pointer_blank ();
914 } 1297 }
915#endif 1298#endif
916 1299
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1300 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1301 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1302 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 1303
975 switch (ev.type) 1304 switch (ev.type)
976 { 1305 {
977 case KeyPress: 1306 case KeyPress:
1307#if ISO_14755
1308 if (!(iso14755buf & ISO_14755_52))
1309#endif
978 lookup_key (ev.xkey); 1310 lookup_key (ev.xkey);
1311
1312 break;
1313
1314 case KeyRelease:
1315 {
1316#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1317 KeySym ks;
1318
1319 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1320#endif
1321
1322#if ENABLE_FRILLS || ISO_14755
1323 // ISO 14755 support
1324 if (iso14755buf)
1325 if (iso14755buf & ISO_14755_52)
1326 {
1327# if ENABLE_OVERLAY
1328 scr_overlay_off ();
1329# endif
1330# if ISO_14755
1331 // iso14755 part 5.2 handling: release time
1332 // first: controls
1333 if ((ev.xkey.state & ControlMask)
1334 && ((ks >= 0x40 && ks <= 0x5f)
1335 || (ks >= 0x61 && ks <= 0x7f)))
1336 {
1337 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1338 commit_iso14755 ();
1339 return; // case-break;
1340 }
1341
1342 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1343 if (i[0] == ks)
1344 {
1345 iso14755buf = ISO_14755_51 | i[1];
1346 commit_iso14755 ();
1347 return; // case-break;
1348 }
1349
1350 scr_bell ();
1351# endif
1352 iso14755buf = 0;
979 break; 1353 break;
1354 }
1355 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1356 {
1357# if ENABLE_OVERLAY
1358 scr_overlay_off ();
1359# endif
1360 if (iso14755buf & ISO_14755_51)
1361 commit_iso14755 ();
1362#if ISO_14755
1363 else if (iso14755buf & ISO_14755_STARTED)
1364 {
1365 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1366
1367 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1368 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1369 }
1370# endif
1371 else
1372 iso14755buf = 0;
1373 }
1374#endif
980 1375
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1376#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1377 if (!(ev.xkey.state & ControlMask))
1378 slip_wheel_ev.stop ();
1379 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1380 mouse_slip_wheel_speed = 0;
986 else 1381#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; 1382 break;
995 } 1383 }
996#endif
997 1384
998 case ButtonPress: 1385 case ButtonPress:
999 button_press (ev.xbutton); 1386 button_press (ev.xbutton);
1000 break; 1387 break;
1001 1388
… …
1003 button_release (ev.xbutton); 1390 button_release (ev.xbutton);
1004 break; 1391 break;
1005 1392
1006 case ClientMessage: 1393 case ClientMessage:
1007 if (ev.xclient.format == 32 1394 if (ev.xclient.format == 32
1395 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1396 {
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1009 destroy (); 1398 destroy ();
1399#if ENABLE_EWMH
1400 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1401 XSendEvent (disp, ev.xclient.window = display->root,
1402 False, SubstructureRedirectMask | SubstructureNotifyMask,
1403 &ev);
1404#endif
1405 }
1406#if ENABLE_XEMBED
1407 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1408 {
1409 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1410 focus_in ();
1411 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1412 focus_out ();
1413 }
1414#endif
1010#ifdef OFFIX_DND 1415#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */ 1416 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1417 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile 1418 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1419 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1420 || ev.xclient.data.l[0] == DndLink))
1016 { 1421 {
1017 /* Get Dnd data */ 1422 /* Get Dnd data */
1018 Atom ActualType; 1423 Atom ActualType;
1019 int ActualFormat; 1424 int ActualFormat;
1020 unsigned char *data; 1425 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1426 unsigned long Size, RemainingBytes;
1022 1427
1023 XGetWindowProperty (display->display, display->root, 1428 XGetWindowProperty (disp, display->root,
1024 xa[XA_DNDSELECTION], 1429 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1430 0L, 1000000L,
1026 False, AnyPropertyType, 1431 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1432 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1433 &Size, &RemainingBytes,
1029 &data); 1434 &data);
1030 XChangeProperty (display->display, display->root, 1435 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1436 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1437 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1438 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1036 } 1439 }
1037#endif /* OFFIX_DND */ 1440#endif /* OFFIX_DND */
1038 break; 1441 break;
1039 1442
1040 case MappingNotify: 1443 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1444 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1445 break;
1043 1446
1044 /* 1447 /*
1045 * XXX: this is not the _current_ arrangement 1448 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1449 * Here's my conclusion:
… …
1065 break; 1468 break;
1066 } 1469 }
1067 break; 1470 break;
1068 1471
1069 case FocusIn: 1472 case FocusIn:
1070 if (!TermWin.focus) 1473 focus_in ();
1474 break;
1475
1476 case FocusOut:
1477 focus_out ();
1478 break;
1479
1480 case ConfigureNotify:
1481 if (ev.xconfigure.window == parent[0])
1071 { 1482 {
1072 TermWin.focus = 1; 1483 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1; 1484 ;
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 1485
1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1487 {
1488 seen_resize = 1;
1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1490 }
1491
1492#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1493 if (OPTION (Opt_transparent))
1494 check_our_parents ();
1495#endif
1083 } 1496 }
1084 break; 1497 break;
1085 1498
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: 1499 case PropertyNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1500 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1106 { 1501 && ev.xproperty.state == PropertyNewValue)
1107 int height, width; 1502 selection_property (ev.xproperty.window, ev.xproperty.atom);
1108 1503
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; 1504 break;
1138 1505
1139 case SelectionClear: 1506 case SelectionClear:
1140 selection_clear (); 1507 selection_clear ();
1141 break; 1508 break;
1142 1509
1143 case SelectionNotify: 1510 case SelectionNotify:
1144 if (selection_wait == Sel_normal) 1511 if (selection_wait == Sel_normal)
1145 selection_paste (ev.xselection.requestor, 1512 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1146 ev.xselection.property, True);
1147 break; 1513 break;
1148 1514
1149 case SelectionRequest: 1515 case SelectionRequest:
1150 selection_send (ev.xselectionrequest); 1516 selection_send (ev.xselectionrequest);
1151 break; 1517 break;
1152 1518
1153 case UnmapNotify: 1519 case UnmapNotify:
1154 TermWin.mapped = 0; 1520 mapped = 0;
1155#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1156 text_blink_ev.stop (); 1522 text_blink_ev.stop ();
1157#endif 1523#endif
1158 break; 1524 break;
1159 1525
1160 case MapNotify: 1526 case MapNotify:
1161 TermWin.mapped = 1; 1527 mapped = 1;
1162#ifdef TEXT_BLINK 1528#ifdef TEXT_BLINK
1163 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1164#endif 1530#endif
1165 break; 1531 break;
1166 1532
… …
1170 break; 1536 break;
1171#endif /* TRANSPARENT */ 1537#endif /* TRANSPARENT */
1172 1538
1173 case GraphicsExpose: 1539 case GraphicsExpose:
1174 case Expose: 1540 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1541 if (ev.xany.window == vt)
1176 { 1542 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1543 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1181 // don't understand this, so commented it out 1547
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1553
1185 // ev.xexpose.width, TermWin.height, False); 1554 scr_refresh (refresh_type);
1186#endif
1187 want_refresh = 1;
1188 } 1555 }
1189 else 1556 else
1190 { 1557 {
1191 XEvent unused_event; 1558 XEvent unused_event;
1192 1559
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1194 Expose, 1561 ;
1195 &unused_event)) ; 1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1563 ;
1197 GraphicsExpose, 1564
1198 &unused_event)) ;
1199 if (isScrollbarWindow (ev.xany.window)) 1565 if (isScrollbarWindow (ev.xany.window))
1200 { 1566 {
1201 scrollBar.setIdle (); 1567 scrollBar.setIdle ();
1202 scrollbar_show (0); 1568 scrollbar_show (0);
1203 } 1569 }
1204#ifdef MENUBAR 1570#ifdef MENUBAR
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1571 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206 menubar_expose (); 1572 menubar_expose ();
1207#endif 1573#endif
1574
1575#ifdef TRANSPARENT
1576 if (am_transparent && ev.xany.window == parent[0])
1577 XClearWindow (disp, ev.xany.window);
1578#endif
1208 } 1579 }
1209 break; 1580 break;
1210 1581
1211 case MotionNotify: 1582 case MotionNotify:
1212#ifdef POINTER_BLANK 1583#ifdef POINTER_BLANK
… …
1218 { 1589 {
1219 menubar_control (ev.xbutton); 1590 menubar_control (ev.xbutton);
1220 break; 1591 break;
1221 } 1592 }
1222#endif 1593#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1224 break; 1595 break;
1225 1596
1226 if (ev.xany.window == TermWin.vt) 1597 if (ev.xany.window == vt)
1227 { 1598 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1599 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1600 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1601 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1231 ; 1602 ;
1232 1603
1233 XQueryPointer (display->display, TermWin.vt, 1604 XQueryPointer (disp, vt,
1234 &unused_root, &unused_child, 1605 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1606 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1607 &ev.xbutton.x, &ev.xbutton.y,
1237 &unused_mask); 1608 &ev.xbutton.state);
1238#ifdef MOUSE_THRESHOLD 1609#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1610 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1611 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1612 {
1242#endif 1613#endif
1614#if ISO_14755
1615 // 5.4
1616 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1617 {
1618 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1619 break;
1620 }
1621#endif
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1622 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1623 ev.xbutton.state & Button3Mask ? 2 : 0);
1624
1245#ifdef SELECTION_SCROLLING 1625#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1626 if (ev.xbutton.y < int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1627 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1248 { 1628 {
1249 int dist; 1629 int dist;
1250
1251 pending_scroll_selection=1;
1252 1630
1253 /* don't clobber the current delay if we are 1631 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1632 * already in the middle of scrolling.
1255 */ 1633 */
1256 if (scroll_selection_delay<=0) 1634 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1635 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1636
1259 /* save the event params so we can highlight 1637 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1638 * the selection in the pending-scroll loop
1261 */ 1639 */
1262 selection_save_x=ev.xbutton.x; 1640 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1641 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1642 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1643
1267 /* calc number of lines to scroll */ 1644 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1645 if (ev.xbutton.y < int_bwidth)
1269 { 1646 {
1270 scroll_selection_dir = UP; 1647 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1648 dist = int_bwidth - ev.xbutton.y;
1272 } 1649 }
1273 else 1650 else
1274 { 1651 {
1275 scroll_selection_dir = DN; 1652 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y - 1653 dist = ev.xbutton.y - (int_bwidth + height);
1277 (TermWin.int_bwidth + TermWin.height);
1278 } 1654 }
1655
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1656 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1657 / SELECTION_SCROLL_LINE_SPEEDUP
1658 + 1;
1281 MIN_IT (scroll_selection_lines, 1659 min_it (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1660 SELECTION_SCROLL_MAX_LINES);
1283 } 1661 }
1284 else 1662 else
1285 { 1663 {
1286 /* we are within the text window, so we 1664 /* we are within the text window, so we
1287 * shouldn't be scrolling 1665 * shouldn't be scrolling
1288 */ 1666 */
1289 pending_scroll_selection = 0; 1667 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop();
1290 } 1669 }
1291#endif 1670#endif
1292#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1293
1294 } 1672 }
1295#endif 1673#endif
1296
1297 } 1674 }
1298 } 1675 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1676 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1677 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1678 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1302 MotionNotify, &ev)) ; 1679 MotionNotify, &ev))
1680 ;
1681
1303 XQueryPointer (display->display, scrollBar.win, 1682 XQueryPointer (disp, scrollBar.win,
1304 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1685 &ev.xbutton.x, &ev.xbutton.y,
1307 &unused_mask); 1686 &unused_mask);
1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1309 scrollbar_size ()); 1688 scrollbar_size ());
1310 scr_refresh (refresh_type); 1689 scr_refresh (refresh_type);
1311 refresh_limit = 0; 1690 refresh_limit = 0;
… …
1314 break; 1693 break;
1315 } 1694 }
1316} 1695}
1317 1696
1318void 1697void
1698rxvt_term::focus_in ()
1699{
1700 if (!focus)
1701 {
1702 focus = 1;
1703 want_refresh = 1;
1704
1705 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706
1707#if USE_XIM
1708 if (Input_Context != NULL)
1709 {
1710 IMSetStatusPosition ();
1711 XSetICFocus (Input_Context);
1712 }
1713#endif
1714#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink))
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1717#endif
1718#if OFF_FOCUS_FADING
1719 if (rs[Rs_fade])
1720 {
1721 pix_colors = pix_colors_focused;
1722 scr_recolour ();
1723 }
1724#endif
1725 }
1726}
1727
1728void
1729rxvt_term::focus_out ()
1730{
1731 if (focus)
1732 {
1733 focus = 0;
1734 want_refresh = 1;
1735
1736 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737
1738#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf)
1740 {
1741 iso14755buf = 0;
1742# if ENABLE_OVERLAY
1743 scr_overlay_off ();
1744# endif
1745 }
1746#endif
1747#if USE_XIM
1748 if (Input_Context != NULL)
1749 XUnsetICFocus (Input_Context);
1750#endif
1751#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink))
1753 cursor_blink_ev.stop ();
1754 hidden_cursor = 0;
1755#endif
1756#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade])
1758 {
1759 pix_colors = pix_colors_unfocused;
1760 scr_recolour ();
1761 }
1762#endif
1763 }
1764}
1765
1766#if TRANSPARENT
1767void
1319rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1769{
1321 SET_R (this); 1770 SET_R (this);
1322 SET_LOCALE (locale); 1771 SET_LOCALE (locale);
1323 1772
1324 switch (ev.type) 1773 switch (ev.type)
1325 { 1774 {
1326 case PropertyNotify: 1775 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 /* 1776 /*
1337 * if user used some Esetroot compatible prog to set the root bg, 1777 * 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. 1778 * use the property to determine the pixmap. We use it later on.
1339 */ 1779 */
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]) 1780 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1781 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1344 return; 1782 return;
1345 }
1346 1783
1347 /* FALLTHROUGH */ 1784 /* FALLTHROUGH */
1348 case ReparentNotify: 1785 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1786 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1; 1787 want_refresh = want_full_refresh = 1;
1351 break; 1788 break;
1352#endif
1353 } 1789 }
1354} 1790}
1791#endif
1355 1792
1356void 1793void
1357rxvt_term::button_press (XButtonEvent &ev) 1794rxvt_term::button_press (XButtonEvent &ev)
1358{ 1795{
1359 int reportmode = 0, clickintime; 1796 int reportmode = 0, clickintime;
1360 1797
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1798 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1362 if (!bypass_keystate) 1799 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1800 reportmode = !! (priv_modes & PrivMode_mouse_report);
1801
1364 /* 1802 /*
1365 * VT window processing of button press 1803 * VT window processing of button press
1366 */ 1804 */
1367 if (ev.window == TermWin.vt) 1805 if (ev.window == vt)
1368 { 1806 {
1807#if ISO_14755
1808 // 5.4
1809 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1810 {
1811 iso14755_54 (ev.x, ev.y);
1812 return;
1813 }
1814#endif
1815
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1816 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1817
1370 if (reportmode) 1818 if (reportmode)
1371 { 1819 {
1372 /* mouse report from vt window */ 1820 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1821 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state; 1822 MEvent.state = ev.state;
… …
1403 } 1851 }
1404 else 1852 else
1405 { 1853 {
1406 if (ev.button != MEvent.button) 1854 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1855 MEvent.clicks = 0;
1856
1408 switch (ev.button) 1857 switch (ev.button)
1409 { 1858 {
1410 case Button1: 1859 case Button1:
1860 /* allow meta + click to select rectangular areas */
1861 /* should be done in screen.C */
1862#if ENABLE_FRILLS
1863 selection.rect = !!(ev.state & ModMetaMask);
1864#else
1865 selection.rect = false;
1866#endif
1867
1411 /* allow shift+left click to extend selection */ 1868 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1869 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1413 { 1870 {
1414 if (MEvent.button == Button1 && clickintime) 1871 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1872 selection_rotate (ev.x, ev.y);
1416 else 1873 else
1417 selection_extend (ev.x, ev.y, 1); 1874 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1889 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1890 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1891 selection_rotate (ev.x, ev.y);
1435 else 1892 else
1436 selection_extend (ev.x, ev.y, 1); 1893 selection_extend (ev.x, ev.y, 1);
1894
1437 MEvent.button = Button3; 1895 MEvent.button = Button3;
1438 break; 1896 break;
1439 } 1897 }
1440 } 1898 }
1899
1441 MEvent.time = ev.time; 1900 MEvent.time = ev.time;
1442 return; 1901 return;
1443 } 1902 }
1444 1903
1445 /* 1904 /*
… …
1511 upordown = 1; /* down */ 1970 upordown = 1; /* down */
1512 } 1971 }
1513 if (upordown) 1972 if (upordown)
1514 { 1973 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1974#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1975 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 1976#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 1977 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 1978 {
1520 if (upordown < 0) 1979 if (upordown < 0)
1521 scrollBar.setUp (); 1980 scrollBar.setUp ();
… …
1537 break; 1996 break;
1538 case R_SB_ALIGN_BOTTOM: 1997 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 1998 csrO = scrollBar.bot - scrollBar.top;
1540 break; 1999 break;
1541 } 2000 }
2001
1542 if (scrollBar.style == R_SB_XTERM 2002 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 2003 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 2004 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 2005 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 2006
1547 scrollBar.setMotion (); 2007 scrollBar.setMotion ();
1548 break; 2008 break;
1549 2009
1550 case Button1: 2010 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2011 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1555 case Button3: 2015 case Button3:
1556 if (scrollBar.style != R_SB_XTERM) 2016 if (scrollBar.style != R_SB_XTERM)
1557 { 2017 {
1558 if (scrollbar_above_slider (ev.y)) 2018 if (scrollbar_above_slider (ev.y))
1559# ifdef RXVT_SCROLL_FULL 2019# ifdef RXVT_SCROLL_FULL
1560 scr_page (UP, TermWin.nrow - 1); 2020 scr_page (UP, nrow - 1);
1561# else 2021# else
1562 scr_page (UP, TermWin.nrow / 4); 2022 scr_page (UP, nrow / 4);
1563# endif 2023# endif
1564 else if (scrollbar_below_slider (ev.y)) 2024 else if (scrollbar_below_slider (ev.y))
1565# ifdef RXVT_SCROLL_FULL 2025# ifdef RXVT_SCROLL_FULL
1566 scr_page (DN, TermWin.nrow - 1); 2026 scr_page (DN, nrow - 1);
1567# else 2027# else
1568 scr_page (DN, TermWin.nrow / 4); 2028 scr_page (DN, nrow / 4);
1569# endif 2029# endif
1570 else 2030 else
1571 scrollBar.setMotion (); 2031 scrollBar.setMotion ();
1572 } 2032 }
1573 else 2033 else
1574 { 2034 {
1575 scr_page ((ev.button == Button1 ? DN : UP), 2035 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 2036 (nrow
1577 * scrollbar_position (ev.y) 2037 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 2038 / scrollbar_size ()));
1579 } 2039 }
2040
1580 break; 2041 break;
1581 } 2042 }
1582 } 2043 }
1583 return; 2044 return;
1584 } 2045 }
… …
1596{ 2057{
1597 int reportmode = 0; 2058 int reportmode = 0;
1598 2059
1599 csrO = 0; /* reset csr Offset */ 2060 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 2061 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2062 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 2063
1603 if (scrollbar_isUpDn ()) 2064 if (scrollbar_isUpDn ())
1604 { 2065 {
1605 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
1606 scrollbar_show (0); 2067 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH; 2069 refresh_type &= ~SMOOTH_REFRESH;
1609#endif 2070#endif
1610
1611 } 2071 }
2072
1612#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 2074 if (sel_scroll_ev.active)
2075 sel_scroll_ev.stop();
1614#endif 2076#endif
2077
1615 if (ev.window == TermWin.vt) 2078 if (ev.window == vt)
1616 { 2079 {
2080#if ISO_14755
2081 // 5.4
2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2083 return;
2084#endif
1617 if (reportmode) 2085 if (reportmode)
1618 { 2086 {
1619 /* mouse report from vt window */ 2087 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 2088 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 2089 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 2103 MEvent.button = AnyButton;
1636 mouse_report (ev); 2104 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 2105#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 2106 return;
1639 } 2107 }
2108
1640 /* 2109 /*
1641 * dumb hack to compensate for the failure of click-and-drag 2110 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 2111 * when overriding mouse reporting
1643 */ 2112 */
1644 if (PrivateModes & PrivMode_mouse_report 2113 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2114 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2115 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2116 selection_extend (ev.x, ev.y, 0);
1648 2117
1649 switch (ev.button) 2118 switch (ev.button)
… …
1660 case Button5: 2129 case Button5:
1661 { 2130 {
1662 int i; 2131 int i;
1663 page_dirn v; 2132 page_dirn v;
1664 2133
1665 v = (ev.button == Button4) ? UP : DN; 2134 v = ev.button == Button4 ? UP : DN;
2135
1666 if (ev.state & ShiftMask) 2136 if (ev.state & ShiftMask)
1667 i = 1; 2137 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2138 else if (OPTION (Opt_mouseWheelScrollPage))
1669 i = TermWin.nrow - 1; 2139 i = nrow - 1;
1670 else 2140 else
1671 i = 5; 2141 i = 5;
2142
1672# ifdef MOUSE_SLIP_WHEELING 2143# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2144 if (ev.state & ControlMask)
1674 { 2145 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2146 mouse_slip_wheel_speed += v ? -1 : 1;
2147 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2149
2150 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2152
2153 slip_wheel_ev.start ();
1677 } 2154 }
2155 else
2156 {
1678# endif 2157# endif
1679# ifdef JUMP_MOUSE_WHEEL 2158# 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); 2159 scr_page (v, i);
1687 scr_refresh (SMOOTH_REFRESH); 2160 scr_refresh (SMOOTH_REFRESH);
1688 scrollbar_show (1); 2161 scrollbar_show (1);
2162# else
2163 while (i--)
2164 {
2165 scr_page (v, 1);
2166 scr_refresh (SMOOTH_REFRESH);
2167 scrollbar_show (1);
2168 }
2169# endif
2170# ifdef MOUSE_SLIP_WHEELING
1689 } 2171 }
1690# endif 2172#endif
1691
1692 } 2173 }
1693 break; 2174 break;
1694#endif 2175#endif
1695
1696 } 2176 }
1697 } 2177 }
1698#ifdef MENUBAR 2178#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window)) 2179 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev); 2180 menubar_control (ev);
1701#endif 2181#endif
1702} 2182}
1703 2183
1704#ifdef TRANSPARENT 2184#ifdef TRANSPARENT
1705#if TINTING 2185#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2186/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2187
1709static void 2188typedef 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 2189
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2190void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2191{
1717 /* No saturation */ 2192 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2193 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2194 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 int r, g, b; 2195 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2196 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2197 int i;
1721 2198
1722 b = ((uint16_t *) ptr)[x]; 2199 Visual *visual = display->visual;
1723 r = (b & 0x7c00) * rm; 2200
1724 g = (b & 0x3e0) * gm; 2201 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2202
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2203 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2204 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2205 mask_g = visual->green_mask;
1729 } 2206 mask_b = visual->blue_mask;
1730 ptr += bpl; 2207
1731 } 2208 /* boring lookup table pre-initialization */
2209 switch (srcImage->bits_per_pixel) {
2210 case 15:
2211 if ((mask_r != 0x7c00) ||
2212 (mask_g != 0x03e0) ||
2213 (mask_b != 0x001f))
2214 return;
2215 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2216 lookup_r = lookup;
2217 lookup_g = lookup+32;
2218 lookup_b = lookup+32+32;
2219 sh_r = 10;
2220 sh_g = 5;
2221 sh_b = 0;
2222 break;
2223 case 16:
2224 if ((mask_r != 0xf800) ||
2225 (mask_g != 0x07e0) ||
2226 (mask_b != 0x001f))
2227 return;
2228 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2229 lookup_r = lookup;
2230 lookup_g = lookup+32;
2231 lookup_b = lookup+32+64;
2232 sh_r = 11;
2233 sh_g = 5;
2234 sh_b = 0;
2235 break;
2236 case 24:
2237 if ((mask_r != 0xff0000) ||
2238 (mask_g != 0x00ff00) ||
2239 (mask_b != 0x0000ff))
2240 return;
2241 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2242 lookup_r = lookup;
2243 lookup_g = lookup+256;
2244 lookup_b = lookup+256+256;
2245 sh_r = 16;
2246 sh_g = 8;
2247 sh_b = 0;
2248 break;
2249 case 32:
2250 if ((mask_r != 0xff0000) ||
2251 (mask_g != 0x00ff00) ||
2252 (mask_b != 0x0000ff))
2253 return;
2254 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2255 lookup_r = lookup;
2256 lookup_g = lookup+256;
2257 lookup_b = lookup+256+256;
2258 sh_r = 16;
2259 sh_g = 8;
2260 sh_b = 0;
2261 break;
2262 default:
2263 return; /* we do not support this color depth */
2264 }
2265
2266 /* prepare limits for color transformation (each channel is handled separately) */
2267 if (shade < 0) {
2268 shade = -shade;
2269 if (shade < 0) shade = 0;
2270 if (shade > 100) shade = 100;
2271
2272 lower_lim_r = 65535-rm;
2273 lower_lim_g = 65535-gm;
2274 lower_lim_b = 65535-bm;
2275
2276 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2277 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2278 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2279
2280 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1732 } else { 2281 } else {
1733 for (y = h; --y >= 0;) { 2282 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2283 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2284
1737 b = ((uint16_t *) ptr)[x]; 2285 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2286
1739 g = (b & 0x3e0) * gm; 2287 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2288 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2289 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2290 }
1743 b |= (!(b >> 5) - 1); 2291
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2292 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745 | ((g >> 8) & 0x3e0) 2293 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2294 {
1747 } 2295 unsigned int tmp;
1748 ptr += bpl; 2296
2297 tmp = lower_lim_r;
2298 lower_lim_r = lower_lim_b;
2299 lower_lim_b = tmp;
2300
2301 tmp = upper_lim_r;
2302 upper_lim_r = upper_lim_b;
2303 upper_lim_b = tmp;
2304 }
2305
2306 /* fill our lookup tables */
2307 for (i = 0; i <= mask_r>>sh_r; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2311 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2312 lookup_r[i] = (tmp/65535)<<sh_r;
2313 }
2314 for (i = 0; i <= mask_g>>sh_g; i++)
2315 {
2316 RUINT32T tmp;
2317 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2318 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2319 lookup_g[i] = (tmp/65535)<<sh_g;
2320 }
2321 for (i = 0; i <= mask_b>>sh_b; i++)
2322 {
2323 RUINT32T tmp;
2324 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2325 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2326 lookup_b[i] = (tmp/65535)<<sh_b;
2327 }
2328
2329 /* apply table to input image (replacing colors by newly calculated ones) */
2330 switch (srcImage->bits_per_pixel)
2331 {
2332 case 15:
2333 {
2334 unsigned short *p1, *pf, *p, *pl;
2335 p1 = (unsigned short *) srcImage->data;
2336 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2337 while (p1 < pf)
2338 {
2339 p = p1;
2340 pl = p1 + srcImage->width;
2341 for (; p < pl; p++)
1749 } 2342 {
2343 *p = lookup_r[(*p & 0x7c00)>>10] |
2344 lookup_g[(*p & 0x03e0)>> 5] |
2345 lookup_b[(*p & 0x001f)];
2346 }
2347 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1750 } 2348 }
1751} 2349 break;
1752 2350 }
1753/* RGB 16 */ 2351 case 16:
1754static void 2352 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2353 unsigned short *p1, *pf, *p, *pl;
1756{ 2354 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2355 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2356 while (p1 < pf)
1759 2357 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2358 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2359 pl = p1 + srcImage->width;
1762 /* No saturation */ 2360 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 } 2361 {
1777 } else { 2362 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2363 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2364 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 } 2365 }
1793 ptr += bpl; 2366 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2367 }
2368 break;
2369 }
2370 case 24:
2371 {
2372 unsigned char *p1, *pf, *p, *pl;
2373 p1 = (unsigned char *) srcImage->data;
2374 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2375 while (p1 < pf)
2376 {
2377 p = p1;
2378 pl = p1 + srcImage->width * 3;
2379 for (; p < pl; p += 3)
1794 } 2380 {
2381 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2382 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2383 p[2] = lookup_r[(p[2] & 0x0000ff)];
2384 }
2385 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1795 } 2386 }
1796} 2387 break;
2388 }
2389 case 32:
2390 {
2391 RUINT32T *p1, *pf, *p, *pl;
2392 p1 = (RUINT32T *) srcImage->data;
2393 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1797 2394
1798/* RGB 24 */ 2395 while (p1 < pf)
1799static void 2396 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2397 p = p1;
1801{ 2398 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2399 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 } 2400 {
1830 } else { 2401 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2402 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2403 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2404 (*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 } 2405 }
1861 ptr += bpl; 2406 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2407 }
2408 break;
2409 }
1863 } 2410 }
1864}
1865 2411
1866/* RGB 32 */ 2412 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} 2413}
1937
1938#endif 2414#endif
1939 2415
1940/* 2416/*
1941 * Check our parents are still who we think they are. 2417 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2418 * Do transparency updates if required
… …
1949 Atom atype; 2425 Atom atype;
1950 unsigned char *prop = NULL; 2426 unsigned char *prop = NULL;
1951 Window root, oldp, *list; 2427 Window root, oldp, *list;
1952 Pixmap rootpixmap = None; 2428 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2429 XWindowAttributes wattr, wrootattr;
2430 dDisp;
1954 2431
1955 pchanged = 0; 2432 pchanged = 0;
1956 2433
1957 if (!(Options & Opt_transparent)) 2434 if (!OPTION (Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2435 return pchanged; /* Don't try any more */
1959 2436
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2437 XGetWindowAttributes (disp, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2438 rootdepth = wrootattr.depth;
1962 2439
1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2440 XGetWindowAttributes (disp, parent[0], &wattr);
1964 2441
1965 if (rootdepth != wattr.depth) 2442 if (rootdepth != wattr.depth)
1966 { 2443 {
1967 if (am_transparent) 2444 if (am_transparent)
1968 { 2445 {
1969 pchanged = 1; 2446 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2447 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2448 am_transparent = am_pixmap_trans = 0;
1972 } 2449 }
1973 2450
1974 return pchanged; /* Don't try any more */ 2451 return pchanged; /* Don't try any more */
1975 } 2452 }
1976 2453
1977 /* Get all X ops out of the queue so that our information is up-to-date. */ 2454 /* Get all X ops out of the queue so that our information is up-to-date. */
1978 XSync (display->display, False); 2455 XSync (disp, False);
1979 2456
1980 /* 2457 /*
1981 * Make the frame window set by the window manager have 2458 * Make the frame window set by the window manager have
1982 * the root background. Some window managers put multiple nested frame 2459 * the root background. Some window managers put multiple nested frame
1983 * windows for each client, so we have to take care about that. 2460 * windows for each client, so we have to take care about that.
1984 */ 2461 */
1985 i = (xa[XA_XROOTPMAPID] 2462 i = (xa[XA_XROOTPMAP_ID]
1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2463 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2464 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1988 &nitems, &bytes_after, &prop) == Success); 2465 &nitems, &bytes_after, &prop) == Success);
1989 2466
1990 if (!i || prop == NULL) 2467 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID] 2468 i = (xa[XA_ESETROOT_PMAP_ID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2469 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2471 &nitems, &bytes_after, &prop) == Success);
1995 2472
1996 if (!i || prop == NULL) 2473 if (!i || prop == NULL
2474#if TINTING
2475 || !rs[Rs_color + Color_tint]
2476#endif
2477 )
1997 have_pixmap = 0; 2478 have_pixmap = 0;
1998 else 2479 else
1999 { 2480 {
2000 have_pixmap = 1; 2481 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2482 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2483 XFree (prop);
2003 } 2484 }
2004 2485
2005 if (have_pixmap) 2486 if (have_pixmap)
2006 { 2487 {
… …
2012 Window cr; 2493 Window cr;
2013 XImage *image; 2494 XImage *image;
2014 GC gc; 2495 GC gc;
2015 XGCValues gcvalue; 2496 XGCValues gcvalue;
2016 2497
2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2498 XTranslateCoordinates (disp, parent[0], display->root,
2018 0, 0, &sx, &sy, &cr); 2499 0, 0, &sx, &sy, &cr);
2019 nw = (unsigned int)szHint.width; 2500 nw = (unsigned int)szHint.width;
2020 nh = (unsigned int)szHint.height; 2501 nh = (unsigned int)szHint.height;
2021 nx = ny = 0; 2502 nx = ny = 0;
2022 2503
… …
2032 nh += sy; 2513 nh += sy;
2033 ny = -sy; 2514 ny = -sy;
2034 sy = 0; 2515 sy = 0;
2035 } 2516 }
2036 2517
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2518 min_it (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2519 min_it (nh, (unsigned int) (wrootattr.height - sy));
2520
2521 XSync (disp, False);
2039 allowedxerror = -1; 2522 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2523 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 2524
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2525 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2526 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 2527 allowedxerror = 0;
2045 2528
2046 if (image == NULL) 2529 if (image == NULL)
2047 { 2530 {
2048 if (am_transparent && am_pixmap_trans) 2531 if (am_transparent && am_pixmap_trans)
2049 { 2532 {
2050 pchanged = 1; 2533 pchanged = 1;
2051 if (TermWin.pixmap != None) 2534 if (pixmap != None)
2052 { 2535 {
2053 XFreePixmap (display->display, TermWin.pixmap); 2536 XFreePixmap (disp, pixmap);
2054 TermWin.pixmap = None; 2537 pixmap = None;
2055 } 2538 }
2056 } 2539 }
2057 2540
2058 am_pixmap_trans = 0; 2541 am_pixmap_trans = 0;
2059 } 2542 }
2060 else 2543 else
2061 { 2544 {
2062 if (TermWin.pixmap != None) 2545 if (pixmap != None)
2063 XFreePixmap (display->display, TermWin.pixmap); 2546 XFreePixmap (disp, pixmap);
2064 2547
2065#if TINTING 2548#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2549 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2550 {
2068 unsigned short shade, rm, gm, bm; 2551 unsigned short rm, gm, bm;
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2553
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2554 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2071 2555
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2556 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 } 2557 }
2083#endif 2558#endif
2084 2559
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2560 pixmap = XCreatePixmap (disp, vt,
2086 szHint.width, szHint.height, image->depth); 2561 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2562 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2563 XPutImage (disp, pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2565 XFreeGC (disp, gc);
2091 XDestroyImage (image); 2566 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2567 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2093 TermWin.pixmap); 2568 XClearWindow (disp, parent[0]);
2094 2569
2095 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2571 pchanged = 1;
2097 2572
2098 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2099 } 2574 }
2100 } 2575 }
2101 2576
2102 if (!am_pixmap_trans) 2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579 else
2103 { 2580 {
2104 unsigned int n; 2581 unsigned int n;
2105 /* 2582 /*
2106 * InheritPixmap transparency 2583 * InheritPixmap transparency
2107 */ 2584 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2110 { 2586 {
2111 oldp = TermWin.parent[i]; 2587 oldp = parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2588 XQueryTree (disp, parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n); 2589 &parent[i], &list, &n);
2114 XFree (list); 2590 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2591
2117 if (TermWin.parent[i] == display->root) 2592 if (parent[i] == display->root)
2118 { 2593 {
2119 if (oldp != None) 2594 if (oldp != None)
2120 pchanged = 1; 2595 pchanged = 1;
2121 2596
2122 break; 2597 break;
2123 } 2598 }
2124 2599
2125 if (oldp != TermWin.parent[i]) 2600 if (oldp != parent[i])
2126 pchanged = 1; 2601 pchanged = 1;
2127 } 2602 }
2128 2603
2129 n = 0; 2604 n = 0;
2130 2605
2131 if (pchanged) 2606 if (pchanged)
2132 { 2607 {
2133 for (; n < (unsigned int)i; n++) 2608 for (; n < (unsigned int)i; n++)
2134 { 2609 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2610 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) 2611 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2612 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2613 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2140 break; 2614 break;
2141 } 2615 }
2142 } 2616 }
2143 } 2617 }
2144 2618
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2619 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2146 { 2620 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2621 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2622 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2623 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2624 /* XXX: also turn off Opt_transparent? */
2152 } 2625 }
2153 else 2626 else
2154 { 2627 {
2155#if WAIT_FOR_WM 2628#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing 2629 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */ 2630 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1); 2631 sleep (1);
2159#endif 2632#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2633 for (n = 0; n < (unsigned int)i; n++)
2634 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2635 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2636 XClearWindow (disp, parent[n]);
2637 }
2163 2638
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2165 am_transparent = 1; 2640 am_transparent = 1;
2166 } 2641 }
2167 2642
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2643 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None; 2644 parent[i] = None;
2645 }
2646
2647 if (scrollBar.win)
2648 {
2649 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2650 scrollBar.setIdle ();
2651 scrollbar_show (0);
2652 }
2653
2654 if (am_transparent)
2655 {
2656 want_refresh = want_full_refresh = 1;
2657 if (am_pixmap_trans)
2658 flush ();
2170 } 2659 }
2171 2660
2172 return pchanged; 2661 return pchanged;
2173} 2662}
2174#endif 2663#endif
… …
2191 } 2680 }
2192 2681
2193 if (ch == NOCHAR) // TODO: improve 2682 if (ch == NOCHAR) // TODO: improve
2194 break; 2683 break;
2195 2684
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2685 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2686 {
2687 if (!seen_input)
2197 { 2688 {
2689 seen_input = 1;
2690 // many badly-written programs (e.g. jed) contain a race condition:
2691 // they first read the screensize and then install a SIGWINCH handler.
2692 // some window managers resize the window early, and these programs
2693 // then sometimes get the size wrong.
2694 // unfortunately other programs are even more buggy and dislike
2695 // being sent SIGWINCH, so only do it when we were in fact being
2696 // resized.
2697 if (seen_resize && cmd_pid)
2698 kill (-cmd_pid, SIGWINCH);
2699 }
2700
2198 /* Read a text string from the input buffer */ 2701 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2702 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2703 bool refreshnow = false;
2201 int nlines = 0; 2704 int nlines = 0;
2202 unicode_t *str = buf; 2705 unicode_t *str = buf;
2203 2706 unicode_t *eol = str + min (ncol, UBUFSIZ);
2204 *str++ = ch;
2205 2707
2206 for (;;) 2708 for (;;)
2207 { 2709 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2710 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212 break; 2711 break;
2213 2712
2214 *str++ = ch; 2713 *str++ = ch;
2215 2714
2216 if (ch == '\n') 2715 if (ch == C0_LF || str >= eol)
2217 { 2716 {
2717 if (ch == C0_LF)
2218 nlines++; 2718 nlines++;
2719
2219 refresh_count++; 2720 refresh_count++;
2220 2721
2221 if (! (Options & Opt_jumpScroll) 2722 if (!OPTION (Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2723 || (refresh_count >= refresh_limit * (nrow - 1)))
2223 { 2724 {
2224 refreshnow = true; 2725 refreshnow = true;
2225 flag = true; 2726 refresh_count = 0;
2226 ch = NOCHAR; 2727 ch = NOCHAR;
2227 break; 2728 break;
2228 } 2729 }
2229 2730
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2731 // scr_add_lines only works for nlines <= nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2732 if (nlines >= nrow - 1)
2232 { 2733 {
2233 scr_add_lines (buf, nlines, str - buf); 2734 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0; 2735 nlines = 0;
2235 str = buf; 2736 str = buf;
2737 eol = str + min (ncol, UBUFSIZ);
2236 } 2738 }
2739
2740 if (str >= eol)
2741 {
2742 if (eol >= buf + UBUFSIZ)
2743 {
2744 ch = NOCHAR;
2745 break;
2746 }
2747 else
2748 eol = min (eol + ncol, buf + UBUFSIZ);
2749 }
2750
2237 } 2751 }
2238 2752
2239 if (str >= buf + UBUFSIZ) 2753 seq_begin = cmdbuf_ptr;
2240 { 2754 ch = next_char ();
2241 ch = NOCHAR;
2242 break;
2243 }
2244 } 2755 }
2245 2756
2246 scr_add_lines (buf, nlines, str - buf); 2757 scr_add_lines (buf, nlines, str - buf);
2247 2758
2248 /* 2759 /*
2249 * If there have been a lot of new lines, then update the screen 2760 * 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. 2761 * 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 2762 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2763 * 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 */ 2764 */
2257 if (refreshnow) 2765 if (refreshnow)
2258 { 2766 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2767 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2768 refresh_limit++;
2261 2769 else
2770 {
2771 flag = true;
2262 scr_refresh (refresh_type); 2772 scr_refresh (refresh_type);
2773 flush_ev.stop ();
2774 }
2263 } 2775 }
2264 2776
2265 } 2777 }
2266 else 2778 else
2267 { 2779 {
… …
2281 } 2793 }
2282 2794
2283 return flag; 2795 return flag;
2284} 2796}
2285 2797
2798// read the next octet
2799unicode_t
2800rxvt_term::next_octet ()
2801{
2802 return cmdbuf_ptr < cmdbuf_endp
2803 ? *cmdbuf_ptr++
2804 : NOCHAR;
2805}
2806
2286// read the next character 2807// read the next character
2287unicode_t 2808unicode_t
2288rxvt_term::next_char () 2809rxvt_term::next_char ()
2289{ 2810{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2811 while (cmdbuf_ptr < cmdbuf_endp)
… …
2306 if (len == (size_t)-1) 2827 if (len == (size_t)-1)
2307 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2828 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2308 2829
2309 // assume wchar == unicode 2830 // assume wchar == unicode
2310 cmdbuf_ptr += len; 2831 cmdbuf_ptr += len;
2311 return wc; 2832 return wc & UNICODE_MASK;
2312 } 2833 }
2313 2834
2314 return NOCHAR; 2835 return NOCHAR;
2315} 2836}
2316 2837
… …
2321 */ 2842 */
2322unicode_t 2843unicode_t
2323rxvt_term::cmd_getc () 2844rxvt_term::cmd_getc ()
2324{ 2845{
2325 unicode_t c = next_char (); 2846 unicode_t c = next_char ();
2847
2848 if (c == NOCHAR)
2849 throw out_of_input;
2850
2851 return c;
2852}
2853
2854unicode_t
2855rxvt_term::cmd_get8 ()
2856{
2857 unicode_t c = next_octet ();
2326 2858
2327 if (c == NOCHAR) 2859 if (c == NOCHAR)
2328 throw out_of_input; 2860 throw out_of_input;
2329 2861
2330 return c; 2862 return c;
… …
2431 process_escape_seq (); 2963 process_escape_seq ();
2432 break; 2964 break;
2433 case C0_ENQ: /* terminal Status */ 2965 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2966 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2967 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2968 (unsigned int)strlen (rs[Rs_answerbackstring]));
2437 else 2969 else
2438 tt_write ((unsigned char *)VT100_ANS, 2970 tt_write ((unsigned char *)VT100_ANS,
2439 (unsigned int)STRLEN (VT100_ANS)); 2971 (unsigned int)strlen (VT100_ANS));
2440 break; 2972 break;
2441 case C0_BEL: /* bell */ 2973 case C0_BEL: /* bell */
2442 scr_bell (); 2974 scr_bell ();
2443 break; 2975 break;
2444 case C0_BS: /* backspace */ 2976 case C0_BS: /* backspace */
… …
2460 break; 2992 break;
2461 case C0_SI: /* shift in - acs */ 2993 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2994 scr_charset_choose (0);
2463 break; 2995 break;
2464 2996
2997#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2998 // 8-bit controls
2466 case 0x90: /* DCS */ 2999 case 0x90: /* DCS */
2467 process_dcs_seq (); 3000 process_dcs_seq ();
2468 break; 3001 break;
2469 case 0x9b: /* CSI */ 3002 case 0x9b: /* CSI */
2470 process_csi_seq (); 3003 process_csi_seq ();
2471 break; 3004 break;
2472 case 0x9d: /* CSI */ 3005 case 0x9d: /* CSI */
2473 process_osc_seq (); 3006 process_osc_seq ();
2474 break; 3007 break;
3008#endif
2475 } 3009 }
2476} 3010}
2477/*}}} */ 3011/*}}} */
2478 3012
2479 3013
… …
2541void 3075void
2542rxvt_term::process_escape_seq () 3076rxvt_term::process_escape_seq ()
2543{ 3077{
2544 unicode_t ch = cmd_getc (); 3078 unicode_t ch = cmd_getc ();
2545 3079
2546 if (PrivateModes & PrivMode_vt52) 3080 if (priv_modes & PrivMode_vt52)
2547 { 3081 {
2548 process_escape_vt52 (ch); 3082 process_escape_vt52 (ch);
2549 return; 3083 return;
2550 } 3084 }
2551 3085
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 3100 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 3101 break;
2568 case '+': 3102 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 3103 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 3104 break;
2571#ifndef NO_FRILLS 3105#if ENABLE_FRILLS
2572 case '6': 3106 case '6':
2573 scr_backindex (); 3107 scr_backindex ();
2574 break; 3108 break;
2575#endif 3109#endif
2576 case '7': 3110 case '7':
2577 scr_cursor (SAVE); 3111 scr_cursor (SAVE);
2578 break; 3112 break;
2579 case '8': 3113 case '8':
2580 scr_cursor (RESTORE); 3114 scr_cursor (RESTORE);
2581 break; 3115 break;
2582#ifndef NO_FRILLS 3116#if ENABLE_FRILLS
2583 case '9': 3117 case '9':
2584 scr_forwardindex (); 3118 scr_forwardindex ();
2585 break; 3119 break;
2586#endif 3120#endif
2587 case '=': 3121 case '=':
… …
2597 break; 3131 break;
2598 3132
2599 /* 8.3.87: NEXT LINE */ 3133 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 3134 case C1_NEL: /* ESC E */
2601 { 3135 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 3136 unicode_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 3137 scr_add_lines (nlcr, 1, 2);
2604 } 3138 }
2605 break; 3139 break;
2606 3140
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 3141 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2668 3202
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3203/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3204/* *INDENT-OFF* */
2671enum { 3205enum {
2672 CSI_ICH = 0x40, 3206 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3207 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 , 3208 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, 3209 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, 3210 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, 3211 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, 3212 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2766 { 3300 {
2767 switch (priv) 3301 switch (priv)
2768 { 3302 {
2769 case '>': 3303 case '>':
2770 if (ch == CSI_DA) /* secondary device attributes */ 3304 if (ch == CSI_DA) /* secondary device attributes */
2771 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3305 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2772 break; 3306 break;
2773 case '?': 3307 case '?':
2774 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2775 process_terminal_mode (ch, priv, nargs, arg); 3309 process_terminal_mode (ch, priv, nargs, arg);
2776 break; 3310 break;
… …
2881 3415
2882 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3416 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2883 arg[0] = -arg[0]; 3417 arg[0] = -arg[0];
2884 /* FALLTHROUGH */ 3418 /* FALLTHROUGH */
2885 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2887 break; 3421 break;
2888 3422
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3424 tt_write ((const unsigned char *)VT100_ANS,
2891 (unsigned int) (sizeof (VT100_ANS) - 1)); 3425 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3426 break;
2893 3427
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3429 process_sgr_mode (nargs, arg);
2896 break; 3430 break;
… …
2903 break; 3437 break;
2904 case 6: /* CPR requested */ 3438 case 6: /* CPR requested */
2905 scr_report_position (); 3439 scr_report_position ();
2906 break; 3440 break;
2907 case 7: /* unofficial extension */ 3441 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3442 if (OPTION (Opt_insecure))
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3443 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3444 break;
2911 case 8: /* unofficial extension */ 3445 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3447 break;
2914 } 3448 }
… …
2950 break; 3484 break;
2951 3485
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3486 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3487 if (arg[0] == 4)
2954 scr_insert_mode (0); 3488 scr_insert_mode (0);
3489 else if (arg[0] == 20)
3490 priv_modes &= ~PrivMode_LFNL;
2955 break; 3491 break;
2956 3492
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3493 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3494 if (arg[0] == 4)
2959 scr_insert_mode (1); 3495 scr_insert_mode (1);
3496 else if (arg[0] == 20)
3497 priv_modes |= PrivMode_LFNL;
2960 break; 3498 break;
2961 3499
2962 /* 3500 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3501 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3502 */
… …
2976 break; 3514 break;
2977 case CSI_75: 3515 case CSI_75:
2978 scr_cursor (RESTORE); 3516 scr_cursor (RESTORE);
2979 break; 3517 break;
2980 3518
2981#ifndef NO_FRILLS 3519#if ENABLE_FRILLS
2982 case CSI_74: 3520 case CSI_74:
2983 process_window_ops (arg, nargs); 3521 process_window_ops (arg, nargs);
2984 break; 3522 break;
2985#endif 3523#endif
2986 3524
… …
2993 break; 3531 break;
2994 } 3532 }
2995} 3533}
2996/*}}} */ 3534/*}}} */
2997 3535
2998#ifndef NO_FRILLS 3536#if ENABLE_FRILLS
2999/* ARGSUSED */ 3537/* ARGSUSED */
3000void 3538void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3539rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3540{
3003 int x, y; 3541 int x, y;
3004 XWindowAttributes wattr; 3542 XWindowAttributes wattr;
3005 Window wdummy; 3543 Window wdummy;
3544 dDisp;
3006 3545
3007 if (nargs == 0) 3546 if (nargs == 0)
3008 return; 3547 return;
3009 3548
3010 switch (args[0]) 3549 switch (args[0])
3011 { 3550 {
3012 /* 3551 /*
3013 * commands 3552 * commands
3014 */ 3553 */
3015 case 1: /* deiconify window */ 3554 case 1: /* deiconify window */
3016 XMapWindow (display->display, TermWin.parent[0]); 3555 XMapWindow (disp, parent[0]);
3017 break; 3556 break;
3018 case 2: /* iconify window */ 3557 case 2: /* iconify window */
3019 XIconifyWindow (display->display, TermWin.parent[0], 3558 XIconifyWindow (disp, parent[0], display->screen);
3020 DefaultScreen (display->display));
3021 break; 3559 break;
3022 case 3: /* set position (pixels) */ 3560 case 3: /* set position (pixels) */
3023 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3561 XMoveWindow (disp, parent[0], args[1], args[2]);
3024 break; 3562 break;
3025 case 4: /* set size (pixels) */ 3563 case 4: /* set size (pixels) */
3026 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3027 break; 3565 break;
3028 case 5: /* raise window */ 3566 case 5: /* raise window */
3029 XRaiseWindow (display->display, TermWin.parent[0]); 3567 XRaiseWindow (disp, parent[0]);
3030 break; 3568 break;
3031 case 6: /* lower window */ 3569 case 6: /* lower window */
3032 XLowerWindow (display->display, TermWin.parent[0]); 3570 XLowerWindow (disp, parent[0]);
3033 break; 3571 break;
3034 case 7: /* refresh window */ 3572 case 7: /* refresh window */
3035 scr_touch (true); 3573 scr_touch (true);
3036 break; 3574 break;
3037 case 8: /* set size (chars) */ 3575 case 8: /* set size (chars) */
3038 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3576 set_widthheight ((unsigned int) (args[2] * fwidth),
3039 (unsigned int) (args[1] * TermWin.fheight)); 3577 (unsigned int) (args[1] * fheight));
3040 break; 3578 break;
3041 3579
3042 //case 9: NYI, TODO, restore maximized window or maximize window 3580 //case 9: NYI, TODO, restore maximized window or maximize window
3043 default: 3581 default:
3044 if (args[0] >= 24) /* set height (chars) */ 3582 if (args[0] >= 24) /* set height (chars) */
3045 set_widthheight ((unsigned int)TermWin.width, 3583 set_widthheight ((unsigned int)width,
3046 (unsigned int) (args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
3047 break; 3585 break;
3048 3586
3049 3587
3050 /* 3588 /*
3051 * reports - some output format copied from XTerm 3589 * reports - some output format copied from XTerm
3052 */ 3590 */
3053 case 11: /* report window state */ 3591 case 11: /* report window state */
3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3592 XGetWindowAttributes (disp, parent[0], &wattr);
3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3056 break; 3594 break;
3057 case 13: /* report window position */ 3595 case 13: /* report window position */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3597 XTranslateCoordinates (disp, parent[0], wattr.root,
3060 -wattr.border_width, -wattr.border_width, 3598 -wattr.border_width, -wattr.border_width,
3061 &x, &y, &wdummy); 3599 &x, &y, &wdummy);
3062 tt_printf ("\033[3;%d;%dt", x, y); 3600 tt_printf ("\033[3;%d;%dt", x, y);
3063 break; 3601 break;
3064 case 14: /* report window size (pixels) */ 3602 case 14: /* report window size (pixels) */
3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3067 break; 3605 break;
3068 case 18: /* report text area size (chars) */ 3606 case 18: /* report text area size (chars) */
3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3607 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3070 break; 3608 break;
3071 case 19: /* report window size (chars) */ 3609 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3073 break; 3611 break;
3074 case 20: /* report icon label */ 3612 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3613 {
3077 char *s; 3614 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3615 XGetIconName (disp, parent[0], &s);
3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3617 XFree (s);
3080 } 3618 }
3081 break; 3619 break;
3082 case 21: /* report window title */ 3620 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3621 {
3085 char *s; 3622 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3623 XFetchName (disp, parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625 XFree (s);
3088 } 3626 }
3089 break; 3627 break;
3090 } 3628 }
3091} 3629}
3092#endif 3630#endif
3093 3631
3094/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
3095/* 3633/*
3096 * get input up until STRING TERMINATOR (or BEL) 3634 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3635 * ends_how is terminator used. returned input must be free()'d
3098 */ 3636 */
3099unsigned char * 3637unsigned char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3638rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3639{
3102 int seen_esc = 0; /* seen escape? */ 3640 unicode_t ch;
3641 bool seen_esc = false;
3103 unsigned int n = 0; 3642 unsigned int n = 0;
3104 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3643 wchar_t string[STRING_MAX];
3107 3644
3108 while ((ch = cmd_getc ())) 3645 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3646 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3647 if (seen_esc)
3648 {
3114 if (ch == 0x5c) /* 7bit ST */ 3649 if (ch == 0x5c) /* 7bit ST */
3115 break; 3650 break;
3116 else 3651 else
3117 return NULL; 3652 return NULL;
3118 3653 }
3119 if (ch == C0_ESC) 3654 else if (ch == C0_ESC)
3120 { 3655 {
3121 seen_esc = 1; 3656 seen_esc = true;
3122 continue; 3657 continue;
3123 } 3658 }
3124 else if (ch == '\t') 3659 else if (ch == C0_BEL || ch == CHAR_ST)
3125 ch = ' '; /* translate '\t' to space */ 3660 break;
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3661 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3662 return NULL; /* other control character - exit */
3128 3663
3129 if (n >= sizeof (string) - 1) 3664 seen_esc = false;
3665
3666 if (n >= STRING_MAX - 1)
3130 // stop at some sane length 3667 // stop at some sane length
3131 return NULL; 3668 return NULL;
3132 3669
3670 if (ch == C0_SYN)
3671 string[n++] = cmd_get8 ();
3672 else
3133 string[n++] = ch; 3673 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3674 }
3136 3675
3137 string[n++] = '\0'; 3676 string[n++] = '\0';
3138 3677
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL;
3141
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3678 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3679
3144 return s; 3680 return (unsigned char *)rxvt_wcstombs (string);
3145} 3681}
3146 3682
3147/*----------------------------------------------------------------------*/ 3683/*----------------------------------------------------------------------*/
3148/* 3684/*
3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3685 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3193void 3729void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3730rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{ 3731{
3196 if (str[0] == '?' && !str[1]) 3732 if (str[0] == '?' && !str[1])
3197 { 3733 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b; 3734 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b); 3735 pix_colors_focused[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3736 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 } 3737 }
3205 else 3738 else
3206 set_window_color (color, str); 3739 set_window_color (color, str);
3207} 3740}
3208 3741
3209/* 3742/*
3210 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * 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 */ 3744 */
3234void 3745void
3235rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3236{ 3747{
3237 int changed = 0; 3748 int changed = 0;
3238 int color; 3749 int color;
3239 char *buf, *name; 3750 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
3752 int saveop = op;
3753 dDisp;
3241 3754
3242 assert (str != NULL); 3755 assert (str != NULL);
3243 switch (op) 3756 switch (op)
3244 { 3757 {
3245 case XTerm_name: 3758 case XTerm_name:
… …
3252 set_title (str); 3765 set_title (str);
3253 break; 3766 break;
3254 case XTerm_property: 3767 case XTerm_property:
3255 if (str[0] == '?') 3768 if (str[0] == '?')
3256 { 3769 {
3257 Atom prop = XInternAtom (display->display, str + 1, True); 3770 Atom prop = display->atom (str + 1);
3258 Atom actual_type; 3771 Atom actual_type;
3259 int actual_format; 3772 int actual_format;
3260 unsigned long nitems; 3773 unsigned long nitems;
3261 unsigned long bytes_after; 3774 unsigned long bytes_after;
3262 unsigned char *value = 0; 3775 unsigned char *value = 0;
3263 const char *str = ""; 3776 const char *str = "";
3264 3777
3265 if (prop 3778 if (prop
3266 && XGetWindowProperty (display->display, TermWin.parent[0], 3779 && XGetWindowProperty (disp, parent[0],
3267 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3268 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3269 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3270 && actual_type != None 3783 && actual_type != None
3271 && actual_format == 8) 3784 && actual_format == 8)
… …
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3793 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281 3794
3282 if (eq) 3795 if (eq)
3283 { 3796 {
3284 *eq = 0; 3797 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0], 3798 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 } 3799 }
3290 else 3800 else
3291 XDeleteProperty (display->display, TermWin.parent[0], 3801 XDeleteProperty (disp, parent[0],
3292 display->atom (str)); 3802 display->atom (str));
3293 } 3803 }
3294 break; 3804 break;
3295 3805
3296 case XTerm_Color: 3806 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3807 for (buf = (char *)str; buf && *buf;)
3298 { 3808 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3809 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3810 break;
3301 3811
3302 *name++ = '\0'; 3812 *name++ = '\0';
3303 color = atoi (buf); 3813 color = atoi (buf);
3304 3814
3305 if (color < 0 || color >= TOTAL_COLORS) 3815 if (color < 0 || color >= TOTAL_COLORS)
3306 break; 3816 break;
3307 3817
3308 if ((buf = STRCHR (name, ';')) != NULL) 3818 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3819 *buf++ = '\0';
3310 3820
3311 if (name[0] == '?' && !name[1]) 3821 if (name[0] == '?' && !name[1])
3312 { 3822 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b; 3823 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b); 3824 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); 3825 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 } 3826 }
3320 else 3827 else
3321 set_window_color (color + minCOLOR, name); 3828 set_window_color (color + minCOLOR, name);
3322 } 3829 }
3323 break; 3830 break;
… …
3345 case XTerm_Color_UL: 3852 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break; 3854 break;
3348 case XTerm_Color_RV: 3855 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3857 break;
3858 case URxvt_Color_IT:
3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3860 break;
3861#endif
3862#if TRANSPARENT && TINTING
3863 case URxvt_Color_tint:
3864 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3865 check_our_parents ();
3866 if (am_transparent)
3867 want_full_refresh = want_refresh = 1;
3350 break; 3868 break;
3351#endif 3869#endif
3352 3870
3353 case XTerm_Pixmap: 3871 case XTerm_Pixmap:
3354 if (*str != ';') 3872 if (*str != ';')
… …
3357 scale_pixmap (""); /* reset to default scaling */ 3875 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3876 set_bgPixmap (str); /* change pixmap */
3359#endif 3877#endif
3360 scr_touch (true); 3878 scr_touch (true);
3361 } 3879 }
3362 while ((str = STRCHR (str, ';')) != NULL) 3880 while ((str = strchr (str, ';')) != NULL)
3363 { 3881 {
3364 str++; 3882 str++;
3365#if XPM_BACKGROUND 3883#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3884 changed += scale_pixmap (str);
3367#endif 3885#endif
3368
3369 } 3886 }
3887
3370 if (changed) 3888 if (changed)
3371 { 3889 {
3372#ifdef XPM_BACKGROUND 3890#ifdef XPM_BACKGROUND
3373 resize_pixmap (); 3891 resize_pixmap ();
3374#endif 3892#endif
… …
3385 3903
3386 case XTerm_logfile: 3904 case XTerm_logfile:
3387 // TODO, when secure mode? 3905 // TODO, when secure mode?
3388 break; 3906 break;
3389 3907
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 3908#ifdef MENUBAR
3431 case XTerm_Menu: 3909 case URxvt_Menu:
3432 if (Options & Opt_insecure) 3910 if (OPTION (Opt_insecure))
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3912 break;
3435#endif 3913#endif
3436#if 0 3914#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3915 case XTerm_dumpscreen: /* no error notices */
… …
3441 { 3919 {
3442 scr_dump (fd); 3920 scr_dump (fd);
3443 close (fd); 3921 close (fd);
3444 } 3922 }
3445 } 3923 }
3924 break;
3925#endif
3926 case XTerm_font:
3927 op = URxvt_font;
3928 case URxvt_font:
3929#if ENABLE_STYLES
3930 case URxvt_boldFont:
3931 case URxvt_italicFont:
3932 case URxvt_boldItalicFont:
3933#endif
3934 if (query)
3935 tt_printf ("\33]%d;%-.250s%c", saveop,
3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3937 ? fontset[op - URxvt_font]->fontdesc : "",
3938 resp);
3939 else
3940 {
3941 const char *&res = rs[Rs_font + (op - URxvt_font)];
3942
3943 res = strdup (str);
3944 allocated.push_back ((void *)res);
3945 set_fonts ();
3946 }
3947 break;
3948
3949#if ENABLE_FRILLS
3950 case URxvt_locale:
3951 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3953 else
3954 {
3955 set_locale (str);
3956 pty.set_utf8_mode (enc_utf8);
3957 init_xlocale ();
3958 }
3959 break;
3960
3961 case URxvt_view_up:
3962 case URxvt_view_down:
3963 int lines = atoi (str);
3964
3965 if (lines)
3966 scr_page (op == URxvt_view_up ? UP : DN, lines);
3967 else
3968 {
3969 scr_erase_savelines ();
3970 }
3971
3446 break; 3972 break;
3447#endif 3973#endif
3448 } 3974 }
3449} 3975}
3450/*----------------------------------------------------------------------*/ 3976/*----------------------------------------------------------------------*/
… …
3464{ 3990{
3465 int state; 3991 int state;
3466 3992
3467 if (mode == 's') 3993 if (mode == 's')
3468 { 3994 {
3469 SavedModes |= (PrivateModes & bit); 3995 SavedModes |= (priv_modes & bit);
3470 return -1; 3996 return -1;
3471 } 3997 }
3472 else 3998 else
3473 { 3999 {
3474 if (mode == 'r') 4000 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4001 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 4002 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4003 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 4004 PrivMode (state, bit);
3479 } 4005 }
3480 4006
3481 return state; 4007 return state;
3482} 4008}
… …
3500 { 3, PrivMode_132 }, 4026 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 4027 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 4028 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 4029 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 4030 { 7, PrivMode_Autowrap },
4031 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 4032 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 4033#ifdef menuBar_esc
3507 { menuBar_esc, PrivMode_menuBar }, 4034 { menuBar_esc, PrivMode_menuBar },
3508#endif 4035#endif
4036 // 18, 19 printing-related
4037 { 25, PrivMode_VisibleCursor },
3509#ifdef scrollBar_esc 4038#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 4039 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 4040#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 4041 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 4042 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 4043 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 4044 // 45 margin bell NYI
3519 // 46 start logging 4045 // 46 start logging
… …
3559 } 4085 }
3560 4086
3561 /* extra handling for values with state unkept */ 4087 /* extra handling for values with state unkept */
3562 switch (arg[i]) 4088 switch (arg[i])
3563 { 4089 {
4090#if ENABLE_STYLES
4091 case 1021:
4092 if (mode)
4093 SET_OPTION (Opt_intensityStyles);
4094 else
4095 CLR_OPTION (Opt_intensityStyles);
4096
4097 scr_touch (true);
4098 break;
4099#endif
3564 case 1048: /* alternative cursor save */ 4100 case 1048: /* alternative cursor save */
4101 case 1049:
3565 if (Options & Opt_secondaryScreen) 4102 if (OPTION (Opt_secondaryScreen))
3566 if (mode == 0) 4103 if (mode == 0)
3567 scr_cursor (RESTORE); 4104 scr_cursor (RESTORE);
3568 else if (mode == 1) 4105 else if (mode == 1)
3569 scr_cursor (SAVE); 4106 scr_cursor (SAVE);
3570 break; 4107 break;
… …
3581 * within VT52 mode 4118 * within VT52 mode
3582 */ 4119 */
3583 PrivMode (1, PrivMode_vt52); 4120 PrivMode (1, PrivMode_vt52);
3584 break; 4121 break;
3585 case 3: /* 80/132 */ 4122 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 4123 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4124 set_widthheight (((state ? 132 : 80) * fwidth), height);
3588 break; 4125 break;
3589 case 4: /* smooth scrolling */ 4126 case 4: /* smooth scrolling */
3590 if (state) 4127 if (!state)
3591 Options &= ~Opt_jumpScroll; 4128 SET_OPTION (Opt_jumpScroll);
3592 else 4129 else
3593 Options |= Opt_jumpScroll; 4130 CLR_OPTION (Opt_jumpScroll);
3594 break; 4131 break;
3595 case 5: /* reverse video */ 4132 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 4133 scr_rvideo_mode (state);
3597 break; 4134 break;
3598 case 6: /* relative/absolute origins */ 4135 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 4139 scr_autowrap (state);
3603 break; 4140 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 4141 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 4142 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 4143 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 4144 priv_modes &= ~PrivMode_MouseX11;
3608 break; 4145 break;
3609#ifdef menuBar_esc 4146#ifdef menuBar_esc
3610 case menuBar_esc: 4147 case menuBar_esc:
3611#ifdef MENUBAR 4148#ifdef MENUBAR
3612 map_menuBar (state); 4149 map_menuBar (state);
… …
3632 break; 4169 break;
3633 /* case 66: - application key pad */ 4170 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4171 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4172 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4173 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4174 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4175 break;
3639#if 0 4176#if 0
3640 case 1001: 4177 case 1001:
3641 break; /* X11 mouse highlighting */ 4178 break; /* X11 mouse highlighting */
3642#endif 4179#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4180 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state) 4181 if (!state)
3645 Options &= ~Opt_scrollTtyOutput; 4182 SET_OPTION (Opt_scrollTtyOutput);
3646 else 4183 else
3647 Options |= Opt_scrollTtyOutput; 4184 CLR_OPTION (Opt_scrollTtyOutput);
3648 break; 4185 break;
3649 case 1011: /* scroll to bottom on key press */ 4186 case 1011: /* scroll to bottom on key press */
3650 if (state) 4187 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4188 SET_OPTION (Opt_scrollTtyKeypress);
3652 else 4189 else
3653 Options &= ~Opt_scrollTtyKeypress; 4190 CLR_OPTION (Opt_scrollTtyKeypress);
3654 break; 4191 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4192 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4193 if (OPTION (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 4194 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4195 scr_erase_screen (2);
3659 scr_change_screen (state); 4196 scr_change_screen (state);
3660 break; 4197 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4198 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4199 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4200 if (OPTION (Opt_secondaryScreen))
3664 if (current_screen != PRIMARY) 4201 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4202 scr_erase_screen (2);
3666 break; 4203 break;
3667 default: 4204 default:
3668 break; 4205 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4231 rendset = 0, rendstyle = ~RS_None;
3695 break; 4232 break;
3696 case 1: 4233 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4234 rendset = 1, rendstyle = RS_Bold;
3698 break; 4235 break;
4236 //case 2: // low intensity
4237 case 3:
4238 rendset = 1, rendstyle = RS_Italic;
4239 break;
3699 case 4: 4240 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4241 rendset = 1, rendstyle = RS_Uline;
3701 break; 4242 break;
3702 case 5: 4243 case 5: // slowly blinking
4244 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4245 rendset = 1, rendstyle = RS_Blink;
3704 break; 4246 break;
4247 //case 6: // scoansi light background
3705 case 7: 4248 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4249 rendset = 1, rendstyle = RS_RVid;
3707 break; 4250 break;
3708 case 8: 4251 case 8:
3709 // invisible. NYI 4252 // invisible. NYI
3710 break; 4253 break;
3711 case 22: 4254 //case 9: // crossed out
4255 //case 10: // scoansi acs off, primary font
4256 //case 11: // scoansi acs on, first alt font
4257 //case 12: // scoansi acs on, |0x80, second alt font
4258 //...
4259 //case 19: // ninth alt font
4260 //case 20: // gothic
4261 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 4262 rendset = 0, rendstyle = RS_Bold;
4263 break;
4264 case 22: // normal intensity
4265 rendset = 0, rendstyle = RS_Bold;
4266 break;
4267 case 23: // disable italic
4268 rendset = 0, rendstyle = RS_Italic;
3713 break; 4269 break;
3714 case 24: 4270 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4271 rendset = 0, rendstyle = RS_Uline;
3716 break; 4272 break;
3717 case 25: 4273 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4274 rendset = 0, rendstyle = RS_Blink;
3719 break; 4275 break;
4276 case 26: // variable spacing (iso 8613)
4277 rendset = 0, rendstyle = RS_Blink;
4278 break;
3720 case 27: 4279 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4280 rendset = 0, rendstyle = RS_RVid;
3722 break; 4281 break;
3723 case 28:
3724 // visible. NYI 4282 //case 28: // visible. NYI
3725 break; 4283 //case 29: // not crossed-out
3726 } 4284 }
3727 4285
3728 if (rendset != -1) 4286 if (rendset != -1)
3729 { 4287 {
3730 scr_rendition (rendset, rendstyle); 4288 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4299 case 35:
3742 case 36: 4300 case 36:
3743 case 37: 4301 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4302 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4303 break;
3746#ifdef TTY_256COLOR 4304 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4305 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4306 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4307 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4308 i += 2;
3752 } 4309 }
3753 break; 4310 break;
3754#endif
3755 case 39: /* default fg */ 4311 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4312 scr_color (Color_fg, Color_fg);
3757 break; 4313 break;
3758 4314
3759 case 40: 4315 case 40:
… …
3764 case 45: 4320 case 45:
3765 case 46: 4321 case 46:
3766 case 47: 4322 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4323 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4324 break;
3769#ifdef TTY_256COLOR 4325 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4326 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4327 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4328 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4329 i += 2;
3775 } 4330 }
3776 break; 4331 break;
3777#endif
3778 case 49: /* default bg */ 4332 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4333 scr_color (Color_bg, Color_bg);
3780 break; 4334 break;
4335
4336 //case 50: // not variable spacing
3781 4337
3782#ifndef NO_BRIGHTCOLOR 4338#ifndef NO_BRIGHTCOLOR
3783 case 90: 4339 case 90:
3784 case 91: /* set bright fg color */ 4340 case 91: /* set bright fg color */
3785 case 92: 4341 case 92:
3786 case 93: 4342 case 93:
3787 case 94: 4343 case 94:
3788 case 95: 4344 case 95:
3789 case 96: 4345 case 96:
3790 case 97: 4346 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4347 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4348 break;
3794 case 100: 4349 case 100:
3795 case 101: /* set bright bg color */ 4350 case 101: /* set bright bg color */
3796 case 102: 4351 case 102:
3797 case 103: 4352 case 103:
3798 case 104: 4353 case 104:
3799 case 105: 4354 case 105:
3800 case 106: 4355 case 106:
3801 case 107: 4356 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4357 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4358 break;
3805#endif 4359#endif
3806
3807 } 4360 }
3808 } 4361 }
3809} 4362}
3810/*}}} */ 4363/*}}} */
3811 4364
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4365/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4366void
3814rxvt_term::process_graphics () 4367rxvt_term::process_graphics ()
3815{ 4368{
3816 unicode_t ch, cmd = cmd_getc (); 4369 unicode_t ch, cmd = cmd_getc ();
3817 4370
3818 if (cmd == 'Q') 4371 if (cmd == 'Q')
3819 { /* query graphics */ 4372 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4373 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4374 return;
3822 } 4375 }
3823 /* swallow other graphics sequences until terminating ':' */ 4376 /* swallow other graphics sequences until terminating ':' */
3824 do 4377 do
3825 ch = cmd_getc (); 4378 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4393 unsigned char buf[256];
3841 4394
3842 va_start (arg_ptr, fmt); 4395 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4396 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4397 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4398 tt_write (buf, strlen (buf));
3846} 4399}
3847 4400
3848/* ---------------------------------------------------------------------- */ 4401/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4402/* 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. 4403 * or generated by us in response to a query ESC sequence.
3851 */ 4404 */
4405const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4406
3852void 4407void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4408rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4409{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4410 if (v_buflen == 0)
4411 {
4412 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3856 4413
3857 if (len) 4414 if ((unsigned int)written == len)
4415 return;
4416
4417 data += written;
4418 len -= written;
3858 { 4419 }
4420
4421 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4422
4423 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len;
4425
4426 pty_ev.set (EVENT_READ | EVENT_WRITE);
4427}
4428
4429void rxvt_term::pty_write ()
4430{
4431 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4432
4433 if (written > 0)
4434 {
4435 v_buflen -= written;
4436
3859 if (v_buflen == 0) 4437 if (v_buflen == 0)
3860 { 4438 {
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); 4439 free (v_buffer);
3888 v_buffer = 0; 4440 v_buffer = 0;
3889 v_buflen = 0; 4441 v_buflen = 0;
3890 4442
3891 pty_ev.set (EVENT_READ); 4443 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; 4444 return;
3904 } 4445 }
4446
4447 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4448 }
4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4450 pty_ev.set (EVENT_READ);
3906} 4451}
3907 4452
3908/*----------------------- end-of-file (C source) -----------------------*/ 4453/*----------------------- end-of-file (C source) -----------------------*/
3909 4454

Diff Legend

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