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.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.234 by root, Wed Jan 4 04:42:45 2006 UTC

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

Diff Legend

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