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.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.239 by root, Fri Jan 6 03:02:22 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 {
972 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973 {
974 int row = -view_start;
975
976 while (row > -nsaved && ROW (row - 1).is_longer ())
977 --row;
978
979 while (row < -view_start + nrow)
980 {
981 int start_row = row;
982 line_t *l;
983
984 do
985 {
986 l = &ROW (row);
987
988 if (!(l->f & LINE_FILTERED))
989 {
990 // line not filtered, mark it as filtered
991 l->f |= LINE_FILTERED;
992 while (l->is_longer ())
993 {
994 l = &ROW (++row);
995 l->f |= LINE_FILTERED;
996 }
997
998 // and filter it
999 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1000
1001 break;
1002 }
1003 }
1004 while (l->is_longer ());
1005
1006 row++;
1007 }
1008
1009 }
1010
672 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
673 scrollbar_show (1); 1012 scrollbar_show (1);
674#ifdef USE_XIM 1013#ifdef USE_XIM
675 IMSendSpot (); 1014 IMSendSpot ();
676#endif 1015#endif
… …
683rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
684{ 1023{
685 SET_R (this); 1024 SET_R (this);
686 SET_LOCALE (locale); 1025 SET_LOCALE (locale);
687 1026
1027 display->flush ();
1028
1029 if (want_refresh && !flush_ev.active)
1030 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1031}
1032
1033void
1034rxvt_term::flush_cb (time_watcher &w)
1035{
1036 SET_R (this);
1037 SET_LOCALE (locale);
1038
1039 refresh_limit = 1;
1040 refresh_count = 0;
688 flush (); 1041 flush ();
689} 1042}
690 1043
691#ifdef CURSOR_BLINK 1044#ifdef CURSOR_BLINK
692void 1045void
… …
746{ 1099{
747 if (mouse_slip_wheel_speed == 0 1100 if (mouse_slip_wheel_speed == 0
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed)) 1102 : scr_page (UP, mouse_slip_wheel_speed))
750 { 1103 {
1104 if (view_start == nsaved ||
1105 view_start == 0)
1106 mouse_slip_wheel_speed = 0;
1107
751 refresh_type |= SMOOTH_REFRESH; 1108 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1109 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1111 }
755} 1112}
756#endif 1113#endif
757 1114
1115#if HAVE_SCHED_YIELD
1116static struct event_handler
1117{
1118 check_watcher cw_yield;
1119
1120 void yield (check_watcher &w)
1121 {
1122 sched_yield ();
1123 w.stop ();
1124 }
1125
1126 event_handler ()
1127 : cw_yield (this, &event_handler::yield)
1128 {
1129 }
1130} event_handler;
1131#endif
1132
758bool 1133bool
759rxvt_term::pty_fill () 1134rxvt_term::pty_fill ()
760{ 1135{
761 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1136 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
762 1137
763 if (CBUFSIZ == n) 1138 if (CBUFSIZ == n)
764 { 1139 {
765 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1140 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
766 n = 0; 1141 n = 0;
767 } 1142 }
768 1143
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1144 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1145 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1146 cmdbuf_endp = cmdbuf_ptr + n;
772 1147
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1148 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1149
775 if (n > 0) 1150 if (r > 0)
776 { 1151 {
777 cmdbuf_endp += n; 1152 cmdbuf_endp += r;
778 return true; 1153 return true;
779 } 1154 }
780 else if (n < 0 && errno != EAGAIN) 1155 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1156 {
1157#if HAVE_SCHED_YIELD
1158 if (display->is_local)
1159 event_handler.cw_yield.start ();
1160#endif
1161 }
1162 else
1163 {
1164 pty_ev.stop ();
1165
1166 if (!OPTION (Opt_hold))
781 destroy (); 1167 destroy ();
1168 }
782 1169
783 return false; 1170 return false;
784} 1171}
785 1172
786void 1173void
787rxvt_term::pty_cb (io_watcher &w, short revents) 1174rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 1175{
789 SET_R (this); 1176 SET_R (this);
790 SET_LOCALE (locale); 1177 SET_LOCALE (locale);
791 1178
792 if (revents & EVENT_WRITE)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ) 1179 if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1180 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1181 while (pty_fill ())
797 if (cmd_parse ()) 1182 if (cmd_parse ())
798 break; 1183 break;
1184
1185 if (revents & EVENT_WRITE)
1186 pty_write ();
1187}
1188
1189void
1190rxvt_term::pointer_unblank ()
1191{
1192 XDefineCursor (display->display, vt, TermWin_cursor);
1193 recolour_cursor ();
1194
1195#ifdef POINTER_BLANK
1196 hidden_pointer = 0;
1197
1198 if (OPTION (Opt_pointerBlank))
1199 pointer_ev.start (NOW + pointerBlankDelay);
1200#endif
799} 1201}
800 1202
801#ifdef POINTER_BLANK 1203#ifdef POINTER_BLANK
802void 1204void
803rxvt_term::pointer_unblank ()
804{
805 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
806 recolour_cursor ();
807
808 hidden_pointer = 0;
809
810 if (Options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay);
812}
813
814void
815rxvt_term::pointer_blank () 1205rxvt_term::pointer_blank ()
816{ 1206{
817 if (! (Options & Opt_pointerBlank)) 1207 if (! OPTION (Opt_pointerBlank))
818 return; 1208 return;
819 1209
820 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1210 XDefineCursor (display->display, vt, display->blank_cursor);
821 XFlush (display->display); 1211 XFlush (display->display);
822 1212
823 hidden_pointer = 1; 1213 hidden_pointer = 1;
824} 1214}
825 1215
… …
842 x = ev.x; 1232 x = ev.x;
843 y = ev.y; 1233 y = ev.y;
844 pixel_position (&x, &y); 1234 pixel_position (&x, &y);
845 1235
846 if (MEvent.button == AnyButton) 1236 if (MEvent.button == AnyButton)
847 {
848 button_number = 3; 1237 button_number = 3;
849 }
850 else 1238 else
851 { 1239 {
852 button_number = MEvent.button - Button1; 1240 button_number = MEvent.button - Button1;
853 /* add 0x3D for wheel events, like xterm does */ 1241 /* add 0x3D for wheel events, like xterm does */
854 if (button_number >= 3) 1242 if (button_number >= 3)
855 button_number += (64 - 3); 1243 button_number += (64 - 3);
856 } 1244 }
857 1245
858 if (PrivateModes & PrivMode_MouseX10) 1246 if (priv_modes & PrivMode_MouseX10)
859 { 1247 {
860 /* 1248 /*
861 * do not report ButtonRelease 1249 * do not report ButtonRelease
862 * no state info allowed 1250 * no state info allowed
863 */ 1251 */
… …
878 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1266 + ((MEvent.state & ModMetaMask) ? 8 : 0)
879 + ((MEvent.state & ControlMask) ? 16 : 0); 1267 + ((MEvent.state & ControlMask) ? 16 : 0);
880#ifdef MOUSE_REPORT_DOUBLECLICK 1268#ifdef MOUSE_REPORT_DOUBLECLICK
881 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1269 key_state += ((MEvent.clicks > 1) ? 32 : 0);
882#endif 1270#endif
883
884 } 1271 }
885 1272
886#ifdef DEBUG_MOUSEREPORT 1273#if DEBUG_MOUSEREPORT
887 fprintf (stderr, "Mouse ["); 1274 fprintf (stderr, "Mouse [");
888 if (key_state & 16) 1275 if (key_state & 16)
889 fputc ('C', stderr); 1276 fputc ('C', stderr);
890 if (key_state & 4) 1277 if (key_state & 4)
891 fputc ('S', stderr); 1278 fputc ('S', stderr);
… …
895 fputc ('2', stderr); 1282 fputc ('2', stderr);
896 fprintf (stderr, "]: <%d>, %d/%d\n", 1283 fprintf (stderr, "]: <%d>, %d/%d\n",
897 button_number, 1284 button_number,
898 x + 1, 1285 x + 1,
899 y + 1); 1286 y + 1);
900#else 1287#endif
1288
901 tt_printf ("\033[M%c%c%c", 1289 tt_printf ("\033[M%c%c%c",
902 (32 + button_number + key_state), 1290 (32 + button_number + key_state),
903 (32 + x + 1), 1291 (32 + x + 1),
904 (32 + y + 1)); 1292 (32 + y + 1));
905#endif
906} 1293}
907 1294
908#ifdef USING_W11LIB 1295#ifdef USING_W11LIB
909void 1296void
910rxvt_W11_process_x_event (XEvent *ev) 1297rxvt_W11_process_x_event (XEvent *ev)
… …
917 1304
918/*{{{ process an X event */ 1305/*{{{ process an X event */
919void 1306void
920rxvt_term::x_cb (XEvent &ev) 1307rxvt_term::x_cb (XEvent &ev)
921{ 1308{
1309 dDisp;
1310
922 SET_R (this); 1311 SET_R (this);
923 SET_LOCALE (locale); 1312 SET_LOCALE (locale);
924 1313
925#if defined(CURSOR_BLINK) 1314#if defined(CURSOR_BLINK)
926 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1315 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
927 { 1316 {
928 if (hidden_cursor) 1317 if (hidden_cursor)
929 { 1318 {
930 hidden_cursor = 0; 1319 hidden_cursor = 0;
931 want_refresh = 1; 1320 want_refresh = 1;
… …
934 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1323 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
935 } 1324 }
936#endif 1325#endif
937 1326
938#if defined(POINTER_BLANK) 1327#if defined(POINTER_BLANK)
939 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1328 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
940 { 1329 {
941 if (ev.type == MotionNotify 1330 if (ev.type == MotionNotify
942 || ev.type == ButtonPress 1331 || ev.type == ButtonPress
943 || ev.type == ButtonRelease) 1332 || ev.type == ButtonRelease)
944 if (hidden_pointer) 1333 if (hidden_pointer)
… …
947 if (ev.type == KeyPress && hidden_pointer == 0) 1336 if (ev.type == KeyPress && hidden_pointer == 0)
948 pointer_blank (); 1337 pointer_blank ();
949 } 1338 }
950#endif 1339#endif
951 1340
952#ifdef USE_XIM
953 if (XFilterEvent (&ev, None))
954 return;
955#endif
956
957 Window unused_root, unused_child; 1341 Window unused_root, unused_child;
958 int unused_root_x, unused_root_y; 1342 int unused_root_x, unused_root_y;
959 unsigned int unused_mask; 1343 unsigned int unused_mask;
960
961#ifdef DEBUG_X
962 const char *const eventnames[] =
963 { /* mason - this matches my system */
964 "",
965 "",
966 "KeyPress",
967 "KeyRelease",
968 "ButtonPress",
969 "ButtonRelease",
970 "MotionNotify",
971 "EnterNotify",
972 "LeaveNotify",
973 "FocusIn",
974 "FocusOut",
975 "KeymapNotify",
976 "Expose",
977 "GraphicsExpose",
978 "NoExpose",
979 "VisibilityNotify",
980 "CreateNotify",
981 "DestroyNotify",
982 "UnmapNotify",
983 "MapNotify",
984 "MapRequest",
985 "ReparentNotify",
986 "ConfigureNotify",
987 "ConfigureRequest",
988 "GravityNotify",
989 "ResizeRequest",
990 "CirculateNotify",
991 "CirculateRequest",
992 "PropertyNotify",
993 "SelectionClear",
994 "SelectionRequest",
995 "SelectionNotify",
996 "ColormapNotify",
997 "ClientMessage",
998 "MappingNotify"
999 };
1000#endif
1001
1002#ifdef DEBUG_X
1003 struct timeval tp;
1004 struct tm *ltt;
1005 (void)gettimeofday (&tp, NULL);
1006 ltt = localtime (& (tp.tv_sec));
1007 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));
1008#endif
1009 1344
1010 switch (ev.type) 1345 switch (ev.type)
1011 { 1346 {
1012 case KeyPress: 1347 case KeyPress:
1348#if ISO_14755
1349 if (!(iso14755buf & ISO_14755_52))
1350#endif
1013 lookup_key (ev.xkey); 1351 lookup_key (ev.xkey);
1352
1353 break;
1354
1355 case KeyRelease:
1356 {
1357#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1358 KeySym ks;
1359
1360 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1361#endif
1362
1363#if ENABLE_FRILLS || ISO_14755
1364 // ISO 14755 support
1365 if (iso14755buf)
1366 if (iso14755buf & ISO_14755_52)
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371# if ISO_14755
1372 // iso14755 part 5.2 handling: release time
1373 // first: controls
1374 if ((ev.xkey.state & ControlMask)
1375 && ((ks >= 0x40 && ks <= 0x5f)
1376 || (ks >= 0x61 && ks <= 0x7f)))
1377 {
1378 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1379 commit_iso14755 ();
1380 return; // case-break;
1381 }
1382
1383 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1384 if (i[0] == ks)
1385 {
1386 iso14755buf = ISO_14755_51 | i[1];
1387 commit_iso14755 ();
1388 return; // case-break;
1389 }
1390
1391 scr_bell ();
1392# endif
1393 iso14755buf = 0;
1014 break; 1394 break;
1395 }
1396 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1397 {
1398# if ENABLE_OVERLAY
1399 scr_overlay_off ();
1400# endif
1401 if (iso14755buf & ISO_14755_51)
1402 commit_iso14755 ();
1403#if ISO_14755
1404 else if (iso14755buf & ISO_14755_STARTED)
1405 {
1406 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1407
1408 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1409 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1410 }
1411# endif
1412 else
1413 iso14755buf = 0;
1414 }
1415#endif
1015 1416
1016#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1417#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1017 case KeyRelease:
1018 {
1019 if (!(ev.xkey.state & ControlMask)) 1418 if (!(ev.xkey.state & ControlMask))
1020 slip_wheel_ev.stop (); 1419 slip_wheel_ev.stop ();
1021 else
1022 {
1023 KeySym ks;
1024
1025 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1026 if (ks == XK_Control_L || ks == XK_Control_R) 1420 else if (ks == XK_Control_L || ks == XK_Control_R)
1027 mouse_slip_wheel_speed = 0; 1421 mouse_slip_wheel_speed = 0;
1028 } 1422#endif
1029 break; 1423 break;
1030 } 1424 }
1031#endif
1032 1425
1033 case ButtonPress: 1426 case ButtonPress:
1034 button_press (ev.xbutton); 1427 button_press (ev.xbutton);
1035 break; 1428 break;
1036 1429
… …
1038 button_release (ev.xbutton); 1431 button_release (ev.xbutton);
1039 break; 1432 break;
1040 1433
1041 case ClientMessage: 1434 case ClientMessage:
1042 if (ev.xclient.format == 32 1435 if (ev.xclient.format == 32
1436 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1437 {
1043 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1438 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1044 destroy (); 1439 destroy ();
1440#if ENABLE_EWMH
1441 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1442 XSendEvent (disp, ev.xclient.window = display->root,
1443 False, SubstructureRedirectMask | SubstructureNotifyMask,
1444 &ev);
1445#endif
1446 }
1447#if ENABLE_XEMBED
1448 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1449 {
1450 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1451 focus_in ();
1452 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1453 focus_out ();
1454 }
1455#endif
1045#ifdef OFFIX_DND 1456#ifdef OFFIX_DND
1046 /* OffiX Dnd (drag 'n' drop) protocol */ 1457 /* OffiX Dnd (drag 'n' drop) protocol */
1047 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1458 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1048 && (ev.xclient.data.l[0] == DndFile 1459 && (ev.xclient.data.l[0] == DndFile
1049 || ev.xclient.data.l[0] == DndDir 1460 || ev.xclient.data.l[0] == DndDir
1050 || ev.xclient.data.l[0] == DndLink)) 1461 || ev.xclient.data.l[0] == DndLink))
1051 { 1462 {
1052 /* Get Dnd data */ 1463 /* Get Dnd data */
1053 Atom ActualType; 1464 Atom ActualType;
1054 int ActualFormat; 1465 int ActualFormat;
1055 unsigned char *data; 1466 unsigned char *data;
1056 unsigned long Size, RemainingBytes; 1467 unsigned long Size, RemainingBytes;
1057 1468
1058 XGetWindowProperty (display->display, display->root, 1469 XGetWindowProperty (disp, display->root,
1059 xa[XA_DNDSELECTION], 1470 xa[XA_DNDSELECTION],
1060 0L, 1000000L, 1471 0L, 1000000L,
1061 False, AnyPropertyType, 1472 False, AnyPropertyType,
1062 &ActualType, &ActualFormat, 1473 &ActualType, &ActualFormat,
1063 &Size, &RemainingBytes, 1474 &Size, &RemainingBytes,
1064 &data); 1475 &data);
1065 XChangeProperty (display->display, display->root, 1476 set_string_property (XA_CUT_BUFFER0, data);
1066 XA_CUT_BUFFER0, XA_STRING,
1067 8, PropModeReplace,
1068 data, STRLEN (data));
1069 XFree (data); 1477 XFree (data);
1070 selection_paste (display->root, XA_CUT_BUFFER0, True); 1478 selection_paste (display->root, XA_CUT_BUFFER0, true);
1071 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1479 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1072 } 1480 }
1073#endif /* OFFIX_DND */ 1481#endif /* OFFIX_DND */
1074 break; 1482 break;
1075 1483
1076 case MappingNotify: 1484 case MappingNotify:
1077 XRefreshKeyboardMapping (& (ev.xmapping)); 1485 XRefreshKeyboardMapping (&ev.xmapping);
1078 break; 1486 break;
1079 1487
1080 /* 1488 /*
1081 * XXX: this is not the _current_ arrangement 1489 * XXX: this is not the _current_ arrangement
1082 * Here's my conclusion: 1490 * Here's my conclusion:
… …
1101 break; 1509 break;
1102 } 1510 }
1103 break; 1511 break;
1104 1512
1105 case FocusIn: 1513 case FocusIn:
1106 if (!TermWin.focus) 1514 focus_in ();
1515 break;
1516
1517 case FocusOut:
1518 focus_out ();
1519 break;
1520
1521 case ConfigureNotify:
1522 if (ev.xconfigure.window == parent[0])
1107 { 1523 {
1108 TermWin.focus = 1; 1524 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1109 want_refresh = 1; 1525 ;
1110#ifdef USE_XIM
1111 if (Input_Context != NULL)
1112 XSetICFocus (Input_Context);
1113#endif
1114#ifdef CURSOR_BLINK
1115 if (Options & Opt_cursorBlink)
1116 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1117#endif
1118 1526
1527 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1528 {
1529 seen_resize = 1;
1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1531 }
1532
1533#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1534 if (OPTION (Opt_transparent))
1535 check_our_parents ();
1536#endif
1119 } 1537 }
1120 break; 1538 break;
1121 1539
1122 case FocusOut:
1123 if (TermWin.focus)
1124 {
1125 TermWin.focus = 0;
1126 want_refresh = 1;
1127#ifdef USE_XIM
1128 if (Input_Context != NULL)
1129 XUnsetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.stop ();
1134 hidden_cursor = 0;
1135#endif
1136
1137 }
1138 break;
1139
1140 case ConfigureNotify: 1540 case PropertyNotify:
1141 if (ev.xconfigure.window == TermWin.parent[0]) 1541 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1142 { 1542 && ev.xproperty.state == PropertyNewValue)
1143 int height, width; 1543 selection_property (ev.xproperty.window, ev.xproperty.atom);
1144 1544
1145 do
1146 { /* Wrap lots of configures into one */
1147 width = ev.xconfigure.width;
1148 height = ev.xconfigure.height;
1149 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1150 }
1151 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1152
1153 if (szHint.width != width || szHint.height != height)
1154 {
1155 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1156 resize_all_windows (width, height, 1);
1157 }
1158#ifdef DEBUG_SIZE
1159 else
1160 {
1161 D_SIZE ((stderr, "Size: Not resizing"));
1162 }
1163#endif
1164#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1165 if (Options & Opt_transparent)
1166 {
1167 check_our_parents ();
1168 if (am_transparent)
1169 want_full_refresh = 1;
1170 }
1171#endif
1172 }
1173 break; 1545 break;
1174 1546
1175 case SelectionClear: 1547 case SelectionClear:
1176 selection_clear (); 1548 selection_clear ();
1177 break; 1549 break;
1178 1550
1179 case SelectionNotify: 1551 case SelectionNotify:
1180 if (selection_wait == Sel_normal) 1552 if (selection_wait == Sel_normal)
1181 selection_paste (ev.xselection.requestor, 1553 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1182 ev.xselection.property, True);
1183 break; 1554 break;
1184 1555
1185 case SelectionRequest: 1556 case SelectionRequest:
1186 selection_send (ev.xselectionrequest); 1557 selection_send (ev.xselectionrequest);
1187 break; 1558 break;
1188 1559
1189 case UnmapNotify: 1560 case UnmapNotify:
1190 TermWin.mapped = 0; 1561 mapped = 0;
1191#ifdef TEXT_BLINK 1562#ifdef TEXT_BLINK
1192 text_blink_ev.stop (); 1563 text_blink_ev.stop ();
1193#endif 1564#endif
1194 break; 1565 break;
1195 1566
1196 case MapNotify: 1567 case MapNotify:
1197 TermWin.mapped = 1; 1568 mapped = 1;
1198#ifdef TEXT_BLINK 1569#ifdef TEXT_BLINK
1199 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1200#endif 1571#endif
1201 break; 1572 break;
1202 1573
… …
1206 break; 1577 break;
1207#endif /* TRANSPARENT */ 1578#endif /* TRANSPARENT */
1208 1579
1209 case GraphicsExpose: 1580 case GraphicsExpose:
1210 case Expose: 1581 case Expose:
1211 if (ev.xany.window == TermWin.vt) 1582 if (ev.xany.window == vt)
1212 { 1583 {
1213#ifdef NO_SLOW_LINK_SUPPORT 1584 do
1214 scr_expose (ev.xexpose.x, ev.xexpose.y, 1585 scr_expose (ev.xexpose.x, ev.xexpose.y,
1215 ev.xexpose.width, ev.xexpose.height, False); 1586 ev.xexpose.width, ev.xexpose.height, False);
1216#else 1587 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1217 // I don't understand this, so I changed it :) 1588
1589 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1590
1591 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1218 scr_expose (ev.xexpose.x, ev.xexpose.y, 1592 scr_expose (ev.xexpose.x, ev.xexpose.y,
1219 ev.xexpose.width, ev.xexpose.height, False); 1593 ev.xexpose.width, ev.xexpose.height, False);
1220 //scr_expose (ev.xexpose.x, 0, 1594
1221 // ev.xexpose.width, TermWin.height, False); 1595 scr_refresh (refresh_type);
1222#endif
1223 want_refresh = 1;
1224 } 1596 }
1225 else 1597 else
1226 { 1598 {
1227 XEvent unused_event; 1599 XEvent unused_event;
1228 1600
1229 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1601 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1230 ; 1602 ;
1231 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1603 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1232 ; 1604 ;
1233 1605
1234 if (isScrollbarWindow (ev.xany.window)) 1606 if (isScrollbarWindow (ev.xany.window))
1235 { 1607 {
1236 scrollBar.setIdle (); 1608 scrollBar.setIdle ();
… …
1238 } 1610 }
1239#ifdef MENUBAR 1611#ifdef MENUBAR
1240 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1612 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1241 menubar_expose (); 1613 menubar_expose ();
1242#endif 1614#endif
1615
1616#ifdef TRANSPARENT
1617 if (am_transparent && ev.xany.window == parent[0])
1618 XClearWindow (disp, ev.xany.window);
1619#endif
1243 } 1620 }
1244 break; 1621 break;
1245 1622
1246 case MotionNotify: 1623 case MotionNotify:
1247#ifdef POINTER_BLANK 1624#ifdef POINTER_BLANK
… …
1253 { 1630 {
1254 menubar_control (ev.xbutton); 1631 menubar_control (ev.xbutton);
1255 break; 1632 break;
1256 } 1633 }
1257#endif 1634#endif
1258 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1635 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1259 break; 1636 break;
1260 1637
1261 if (ev.xany.window == TermWin.vt) 1638 if (ev.xany.window == vt)
1262 { 1639 {
1263 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1640 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1264 { 1641 {
1265 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1642 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1266 ; 1643 ;
1267 1644
1268 XQueryPointer (display->display, TermWin.vt, 1645 XQueryPointer (disp, vt,
1269 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1270 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1271 & (ev.xbutton.x), & (ev.xbutton.y), 1648 &ev.xbutton.x, &ev.xbutton.y,
1272 &unused_mask); 1649 &ev.xbutton.state);
1273#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1274 /* deal with a `jumpy' mouse */ 1651 /* deal with a `jumpy' mouse */
1275 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1652 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1276 { 1653 {
1277#endif 1654#endif
1655#if ISO_14755
1656 // 5.4
1657 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1658 {
1659 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1660 break;
1661 }
1662#endif
1278 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1663 selection_extend (ev.xbutton.x, ev.xbutton.y,
1279 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1664 ev.xbutton.state & Button3Mask ? 2 : 0);
1665
1280#ifdef SELECTION_SCROLLING 1666#ifdef SELECTION_SCROLLING
1281 if (ev.xbutton.y < TermWin.int_bwidth 1667 if (ev.xbutton.y < int_bwidth
1282 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1668 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1283 { 1669 {
1284 int dist; 1670 int dist;
1285 1671
1286 /* don't clobber the current delay if we are 1672 /* don't clobber the current delay if we are
1287 * already in the middle of scrolling. 1673 * already in the middle of scrolling.
… …
1290 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1676 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1291 1677
1292 /* save the event params so we can highlight 1678 /* save the event params so we can highlight
1293 * the selection in the pending-scroll loop 1679 * the selection in the pending-scroll loop
1294 */ 1680 */
1295 selection_save_x=ev.xbutton.x; 1681 selection_save_x = ev.xbutton.x;
1296 selection_save_y=ev.xbutton.y; 1682 selection_save_y = ev.xbutton.y;
1297 selection_save_state=
1298 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1683 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1299 1684
1300 /* calc number of lines to scroll */ 1685 /* calc number of lines to scroll */
1301 if (ev.xbutton.y<TermWin.int_bwidth) 1686 if (ev.xbutton.y < int_bwidth)
1302 { 1687 {
1303 scroll_selection_dir = UP; 1688 scroll_selection_dir = UP;
1304 dist = TermWin.int_bwidth - ev.xbutton.y; 1689 dist = int_bwidth - ev.xbutton.y;
1305 } 1690 }
1306 else 1691 else
1307 { 1692 {
1308 scroll_selection_dir = DN; 1693 scroll_selection_dir = DN;
1309 dist = ev.xbutton.y - 1694 dist = ev.xbutton.y - (int_bwidth + height);
1310 (TermWin.int_bwidth + TermWin.height);
1311 } 1695 }
1696
1312 scroll_selection_lines= (Pixel2Height (dist)/ 1697 scroll_selection_lines = Pixel2Height (dist)
1313 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1698 / SELECTION_SCROLL_LINE_SPEEDUP
1699 + 1;
1314 MIN_IT (scroll_selection_lines, 1700 min_it (scroll_selection_lines,
1315 SELECTION_SCROLL_MAX_LINES); 1701 SELECTION_SCROLL_MAX_LINES);
1316 } 1702 }
1317 else 1703 else
1318 { 1704 {
1319 /* we are within the text window, so we 1705 /* we are within the text window, so we
1320 * shouldn't be scrolling 1706 * shouldn't be scrolling
… …
1322 if (sel_scroll_ev.active) 1708 if (sel_scroll_ev.active)
1323 sel_scroll_ev.stop(); 1709 sel_scroll_ev.stop();
1324 } 1710 }
1325#endif 1711#endif
1326#ifdef MOUSE_THRESHOLD 1712#ifdef MOUSE_THRESHOLD
1327
1328 } 1713 }
1329#endif 1714#endif
1330
1331 } 1715 }
1332 } 1716 }
1333 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1717 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1334 { 1718 {
1335 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1719 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1336 MotionNotify, &ev)) ; 1720 MotionNotify, &ev))
1721 ;
1722
1337 XQueryPointer (display->display, scrollBar.win, 1723 XQueryPointer (disp, scrollBar.win,
1338 &unused_root, &unused_child, 1724 &unused_root, &unused_child,
1339 &unused_root_x, &unused_root_y, 1725 &unused_root_x, &unused_root_y,
1340 & (ev.xbutton.x), & (ev.xbutton.y), 1726 &ev.xbutton.x, &ev.xbutton.y,
1341 &unused_mask); 1727 &unused_mask);
1342 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1728 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1343 scrollbar_size ()); 1729 scrollbar_size ());
1344 scr_refresh (refresh_type); 1730 scr_refresh (refresh_type);
1345 refresh_limit = 0; 1731 refresh_limit = 0;
… …
1348 break; 1734 break;
1349 } 1735 }
1350} 1736}
1351 1737
1352void 1738void
1739rxvt_term::focus_in ()
1740{
1741 if (!focus)
1742 {
1743 focus = 1;
1744 want_refresh = 1;
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1748#if USE_XIM
1749 if (Input_Context != NULL)
1750 {
1751 IMSetStatusPosition ();
1752 XSetICFocus (Input_Context);
1753 }
1754#endif
1755#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1758#endif
1759#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade])
1761 {
1762 pix_colors = pix_colors_focused;
1763 scr_recolour ();
1764 }
1765#endif
1766 }
1767}
1768
1769void
1770rxvt_term::focus_out ()
1771{
1772 if (focus)
1773 {
1774 focus = 0;
1775 want_refresh = 1;
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1782 iso14755buf = 0;
1783# if ENABLE_OVERLAY
1784 scr_overlay_off ();
1785# endif
1786 }
1787#endif
1788#if USE_XIM
1789 if (Input_Context != NULL)
1790 XUnsetICFocus (Input_Context);
1791#endif
1792#if CURSOR_BLINK
1793 if (OPTION (Opt_cursorBlink))
1794 cursor_blink_ev.stop ();
1795 hidden_cursor = 0;
1796#endif
1797#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade])
1799 {
1800 pix_colors = pix_colors_unfocused;
1801 scr_recolour ();
1802 }
1803#endif
1804 }
1805}
1806
1807#if TRANSPARENT
1808void
1353rxvt_term::rootwin_cb (XEvent &ev) 1809rxvt_term::rootwin_cb (XEvent &ev)
1354{ 1810{
1355 SET_R (this); 1811 SET_R (this);
1356 SET_LOCALE (locale); 1812 SET_LOCALE (locale);
1357 1813
1358 switch (ev.type) 1814 switch (ev.type)
1359 { 1815 {
1360 case PropertyNotify: 1816 case PropertyNotify:
1361 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1362 {
1363 if (ev.xproperty.state == PropertyNewValue)
1364 selection_property (ev.xproperty.window, ev.xproperty.atom);
1365 break;
1366 }
1367#ifdef TRANSPARENT
1368 else
1369 {
1370 /* 1817 /*
1371 * if user used some Esetroot compatible prog to set the root bg, 1818 * if user used some Esetroot compatible prog to set the root bg,
1372 * use the property to determine the pixmap. We use it later on. 1819 * use the property to determine the pixmap. We use it later on.
1373 */ 1820 */
1374 if (xa[XA_XROOTPMAPID] == 0)
1375 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1376
1377 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1821 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1822 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1378 return; 1823 return;
1379 }
1380 1824
1381 /* FALLTHROUGH */ 1825 /* FALLTHROUGH */
1382 case ReparentNotify: 1826 case ReparentNotify:
1383 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1827 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1384 want_full_refresh = 1; 1828 want_refresh = want_full_refresh = 1;
1385 break; 1829 break;
1386#endif
1387 } 1830 }
1388} 1831}
1832#endif
1389 1833
1390void 1834void
1391rxvt_term::button_press (XButtonEvent &ev) 1835rxvt_term::button_press (XButtonEvent &ev)
1392{ 1836{
1393 int reportmode = 0, clickintime; 1837 int reportmode = 0, clickintime;
1394 1838
1395 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1839 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1840
1396 if (!bypass_keystate) 1841 if (!bypass_keystate)
1397 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1842 reportmode = !! (priv_modes & PrivMode_mouse_report);
1843
1398 /* 1844 /*
1399 * VT window processing of button press 1845 * VT window processing of button press
1400 */ 1846 */
1401 if (ev.window == TermWin.vt) 1847 if (ev.window == vt)
1402 { 1848 {
1849#if ISO_14755
1850 // 5.4
1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1852 {
1853 iso14755_54 (ev.x, ev.y);
1854 return;
1855 }
1856#endif
1857
1403 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1858 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1859
1404 if (reportmode) 1860 if (reportmode)
1405 { 1861 {
1406 /* mouse report from vt window */ 1862 /* mouse report from vt window */
1407 /* save the xbutton state (for ButtonRelease) */ 1863 /* save the xbutton state (for ButtonRelease) */
1408 MEvent.state = ev.state; 1864 MEvent.state = ev.state;
… …
1437 } 1893 }
1438 else 1894 else
1439 { 1895 {
1440 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1441 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1898
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1442 switch (ev.button) 1900 switch (ev.button)
1443 { 1901 {
1444 case Button1: 1902 case Button1:
1903 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */
1905#if ENABLE_FRILLS
1906 selection.rect = !!(ev.state & ModMetaMask);
1907#else
1908 selection.rect = false;
1909#endif
1910
1445 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1446 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1447 { 1913 {
1448 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1449 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1450 else 1916 else
1451 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1452 } 1918 }
1453 else 1919 else
1454 { 1920 {
1455 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1456 MEvent.clicks++; 1922 MEvent.clicks++;
1457 else 1923 else
1458 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1459 1925
1460 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1461 } 1927 }
1462 1928
1463 MEvent.button = Button1; 1929 MEvent.button = Button1;
1464 break; 1930 break;
1465 1931
1466 case Button3: 1932 case Button3:
1467 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1468 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1469 else 1935 else
1470 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1937
1471 MEvent.button = Button3; 1938 MEvent.button = Button3;
1472 break; 1939 break;
1473 } 1940 }
1474 } 1941 }
1942
1475 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1476 return; 1944 return;
1477 } 1945 }
1478 1946
1479 /* 1947 /*
… …
1571 break; 2039 break;
1572 case R_SB_ALIGN_BOTTOM: 2040 case R_SB_ALIGN_BOTTOM:
1573 csrO = scrollBar.bot - scrollBar.top; 2041 csrO = scrollBar.bot - scrollBar.top;
1574 break; 2042 break;
1575 } 2043 }
2044
1576 if (scrollBar.style == R_SB_XTERM 2045 if (scrollBar.style == R_SB_XTERM
1577 || scrollbar_above_slider (ev.y) 2046 || scrollbar_above_slider (ev.y)
1578 || scrollbar_below_slider (ev.y)) 2047 || scrollbar_below_slider (ev.y))
1579 scr_move_to ( scrollbar_position (ev.y) - csrO, 2048 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1580 scrollbar_size ()); 2049
1581 scrollBar.setMotion (); 2050 scrollBar.setMotion ();
1582 break; 2051 break;
1583 2052
1584 case Button1: 2053 case Button1:
1585 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2054 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1589 case Button3: 2058 case Button3:
1590 if (scrollBar.style != R_SB_XTERM) 2059 if (scrollBar.style != R_SB_XTERM)
1591 { 2060 {
1592 if (scrollbar_above_slider (ev.y)) 2061 if (scrollbar_above_slider (ev.y))
1593# ifdef RXVT_SCROLL_FULL 2062# ifdef RXVT_SCROLL_FULL
1594 scr_page (UP, TermWin.nrow - 1); 2063 scr_page (UP, nrow - 1);
1595# else 2064# else
1596 scr_page (UP, TermWin.nrow / 4); 2065 scr_page (UP, nrow / 4);
1597# endif 2066# endif
1598 else if (scrollbar_below_slider (ev.y)) 2067 else if (scrollbar_below_slider (ev.y))
1599# ifdef RXVT_SCROLL_FULL 2068# ifdef RXVT_SCROLL_FULL
1600 scr_page (DN, TermWin.nrow - 1); 2069 scr_page (DN, nrow - 1);
1601# else 2070# else
1602 scr_page (DN, TermWin.nrow / 4); 2071 scr_page (DN, nrow / 4);
1603# endif 2072# endif
1604 else 2073 else
1605 scrollBar.setMotion (); 2074 scrollBar.setMotion ();
1606 } 2075 }
1607 else 2076 else
1608 { 2077 {
1609 scr_page ((ev.button == Button1 ? DN : UP), 2078 scr_page ((ev.button == Button1 ? DN : UP),
1610 (TermWin.nrow 2079 (nrow
1611 * scrollbar_position (ev.y) 2080 * scrollbar_position (ev.y)
1612 / scrollbar_size ())); 2081 / scrollbar_size ()));
1613 } 2082 }
2083
1614 break; 2084 break;
1615 } 2085 }
1616 } 2086 }
1617 return; 2087 return;
1618 } 2088 }
… …
1630{ 2100{
1631 int reportmode = 0; 2101 int reportmode = 0;
1632 2102
1633 csrO = 0; /* reset csr Offset */ 2103 csrO = 0; /* reset csr Offset */
1634 if (!bypass_keystate) 2104 if (!bypass_keystate)
1635 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2105 reportmode = !! (priv_modes & PrivMode_mouse_report);
1636 2106
1637 if (scrollbar_isUpDn ()) 2107 if (scrollbar_isUpDn ())
1638 { 2108 {
1639 scrollBar.setIdle (); 2109 scrollBar.setIdle ();
1640 scrollbar_show (0); 2110 scrollbar_show (0);
1641#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2111#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1642 refresh_type &= ~SMOOTH_REFRESH; 2112 refresh_type &= ~SMOOTH_REFRESH;
1643#endif 2113#endif
1644
1645 } 2114 }
2115
1646#ifdef SELECTION_SCROLLING 2116#ifdef SELECTION_SCROLLING
1647 if (sel_scroll_ev.active) 2117 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
1649#endif 2119#endif
2120
1650 if (ev.window == TermWin.vt) 2121 if (ev.window == vt)
1651 { 2122 {
2123#if ISO_14755
2124 // 5.4
2125 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2126 return;
2127#endif
1652 if (reportmode) 2128 if (reportmode)
1653 { 2129 {
1654 /* mouse report from vt window */ 2130 /* mouse report from vt window */
1655 /* don't report release of wheel "buttons" */ 2131 /* don't report release of wheel "buttons" */
1656 if (ev.button >= 4) 2132 if (ev.button >= 4)
… …
1670 MEvent.button = AnyButton; 2146 MEvent.button = AnyButton;
1671 mouse_report (ev); 2147 mouse_report (ev);
1672#endif /* MOUSE_REPORT_DOUBLECLICK */ 2148#endif /* MOUSE_REPORT_DOUBLECLICK */
1673 return; 2149 return;
1674 } 2150 }
2151
1675 /* 2152 /*
1676 * dumb hack to compensate for the failure of click-and-drag 2153 * dumb hack to compensate for the failure of click-and-drag
1677 * when overriding mouse reporting 2154 * when overriding mouse reporting
1678 */ 2155 */
1679 if (PrivateModes & PrivMode_mouse_report 2156 if (priv_modes & PrivMode_mouse_report
1680 && bypass_keystate 2157 && bypass_keystate
1681 && ev.button == Button1 && MEvent.clicks <= 1) 2158 && ev.button == Button1 && MEvent.clicks <= 1)
1682 selection_extend (ev.x, ev.y, 0); 2159 selection_extend (ev.x, ev.y, 0);
1683 2160
1684 switch (ev.button) 2161 switch (ev.button)
… …
1699 2176
1700 v = ev.button == Button4 ? UP : DN; 2177 v = ev.button == Button4 ? UP : DN;
1701 2178
1702 if (ev.state & ShiftMask) 2179 if (ev.state & ShiftMask)
1703 i = 1; 2180 i = 1;
1704 else if (Options & Opt_mouseWheelScrollPage) 2181 else if (OPTION (Opt_mouseWheelScrollPage))
1705 i = TermWin.nrow - 1; 2182 i = nrow - 1;
1706 else 2183 else
1707 i = 5; 2184 i = 5;
1708 2185
1709# ifdef MOUSE_SLIP_WHEELING 2186# ifdef MOUSE_SLIP_WHEELING
1710 if (ev.state & ControlMask) 2187 if (ev.state & ControlMask)
1711 { 2188 {
1712 mouse_slip_wheel_speed += v ? -1 : 1; 2189 mouse_slip_wheel_speed += v ? -1 : 1;
2190 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2192
2193 if (slip_wheel_ev.at < NOW)
1713 slip_wheel_ev.start (NOW + SCROLLBAR_CONTINUOUS_DELAY); 2194 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2195
2196 slip_wheel_ev.start ();
1714 } 2197 }
2198 else
2199 {
1715# endif 2200# endif
1716# ifdef JUMP_MOUSE_WHEEL 2201# ifdef JUMP_MOUSE_WHEEL
1717 scr_page (v, i);
1718 scr_refresh (SMOOTH_REFRESH);
1719 scrollbar_show (1);
1720# else
1721 while (i--)
1722 {
1723 scr_page (v, 1); 2202 scr_page (v, i);
1724 scr_refresh (SMOOTH_REFRESH); 2203 scr_refresh (SMOOTH_REFRESH);
1725 scrollbar_show (1); 2204 scrollbar_show (1);
2205# else
2206 while (i--)
2207 {
2208 scr_page (v, 1);
2209 scr_refresh (SMOOTH_REFRESH);
2210 scrollbar_show (1);
2211 }
2212# endif
2213# ifdef MOUSE_SLIP_WHEELING
1726 } 2214 }
1727# endif 2215#endif
1728
1729 } 2216 }
1730 break; 2217 break;
1731#endif 2218#endif
1732
1733 } 2219 }
1734 } 2220 }
1735#ifdef MENUBAR 2221#ifdef MENUBAR
1736 else if (isMenuBarWindow (ev.window)) 2222 else if (isMenuBarWindow (ev.window))
1737 menubar_control (ev); 2223 menubar_control (ev);
1738#endif 2224#endif
1739} 2225}
1740 2226
1741#ifdef TRANSPARENT 2227#ifdef TRANSPARENT
1742#if TINTING 2228#if TINTING
1743/* shading taken from eterm-0.9.2 */ 2229/* taken from aterm-0.4.2 */
1744/* RGB 15 */
1745 2230
1746static void 2231typedef uint32_t RUINT32T;
1747shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751 2232
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2233void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2234{
1754 /* No saturation */ 2235 int sh_r, sh_g, sh_b;
1755 for (y = h; --y >= 0;) { 2236 RUINT32T mask_r, mask_g, mask_b;
1756 for (x = -w; x < 0; x++) { 2237 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1757 int r, g, b; 2238 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2239 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2240 int i;
1758 2241
1759 b = ((uint16_t *) ptr)[x]; 2242 Visual *visual = display->visual;
1760 r = (b & 0x7c00) * rm; 2243
1761 g = (b & 0x3e0) * gm; 2244 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1762 b = (b & 0x1f) * bm; 2245
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2246 /* for convenience */
1764 | ((g >> 8) & 0x3e0) 2247 mask_r = visual->red_mask;
1765 | ((b >> 8) & 0x1f); 2248 mask_g = visual->green_mask;
1766 } 2249 mask_b = visual->blue_mask;
1767 ptr += bpl; 2250
1768 } 2251 /* boring lookup table pre-initialization */
2252 switch (srcImage->bits_per_pixel) {
2253 case 15:
2254 if ((mask_r != 0x7c00) ||
2255 (mask_g != 0x03e0) ||
2256 (mask_b != 0x001f))
2257 return;
2258 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2259 lookup_r = lookup;
2260 lookup_g = lookup+32;
2261 lookup_b = lookup+32+32;
2262 sh_r = 10;
2263 sh_g = 5;
2264 sh_b = 0;
2265 break;
2266 case 16:
2267 if ((mask_r != 0xf800) ||
2268 (mask_g != 0x07e0) ||
2269 (mask_b != 0x001f))
2270 return;
2271 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2272 lookup_r = lookup;
2273 lookup_g = lookup+32;
2274 lookup_b = lookup+32+64;
2275 sh_r = 11;
2276 sh_g = 5;
2277 sh_b = 0;
2278 break;
2279 case 24:
2280 if ((mask_r != 0xff0000) ||
2281 (mask_g != 0x00ff00) ||
2282 (mask_b != 0x0000ff))
2283 return;
2284 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2285 lookup_r = lookup;
2286 lookup_g = lookup+256;
2287 lookup_b = lookup+256+256;
2288 sh_r = 16;
2289 sh_g = 8;
2290 sh_b = 0;
2291 break;
2292 case 32:
2293 if ((mask_r != 0xff0000) ||
2294 (mask_g != 0x00ff00) ||
2295 (mask_b != 0x0000ff))
2296 return;
2297 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2298 lookup_r = lookup;
2299 lookup_g = lookup+256;
2300 lookup_b = lookup+256+256;
2301 sh_r = 16;
2302 sh_g = 8;
2303 sh_b = 0;
2304 break;
2305 default:
2306 return; /* we do not support this color depth */
2307 }
2308
2309 /* prepare limits for color transformation (each channel is handled separately) */
2310 if (shade < 0) {
2311 shade = -shade;
2312 if (shade < 0) shade = 0;
2313 if (shade > 100) shade = 100;
2314
2315 lower_lim_r = 65535-rm;
2316 lower_lim_g = 65535-gm;
2317 lower_lim_b = 65535-bm;
2318
2319 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2320 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2321 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2322
2323 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1769 } else { 2324 } else {
1770 for (y = h; --y >= 0;) { 2325 if (shade < 0) shade = 0;
1771 for (x = -w; x < 0; x++) { 2326 if (shade > 100) shade = 100;
1772 int r, g, b;
1773 2327
1774 b = ((uint16_t *) ptr)[x]; 2328 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1775 r = (b & 0x7c00) * rm; 2329
1776 g = (b & 0x3e0) * gm; 2330 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1777 b = (b & 0x1f) * bm; 2331 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1778 r |= (!(r >> 15) - 1); 2332 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1779 g |= (!(g >> 10) - 1); 2333 }
1780 b |= (!(b >> 5) - 1); 2334
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2335 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1782 | ((g >> 8) & 0x3e0) 2336 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1783 | ((b >> 8) & 0x1f); 2337 {
1784 } 2338 unsigned int tmp;
1785 ptr += bpl; 2339
2340 tmp = lower_lim_r;
2341 lower_lim_r = lower_lim_b;
2342 lower_lim_b = tmp;
2343
2344 tmp = upper_lim_r;
2345 upper_lim_r = upper_lim_b;
2346 upper_lim_b = tmp;
2347 }
2348
2349 /* fill our lookup tables */
2350 for (i = 0; i <= mask_r>>sh_r; i++)
2351 {
2352 RUINT32T tmp;
2353 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2354 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2355 lookup_r[i] = (tmp/65535)<<sh_r;
2356 }
2357 for (i = 0; i <= mask_g>>sh_g; i++)
2358 {
2359 RUINT32T tmp;
2360 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2361 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2362 lookup_g[i] = (tmp/65535)<<sh_g;
2363 }
2364 for (i = 0; i <= mask_b>>sh_b; i++)
2365 {
2366 RUINT32T tmp;
2367 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2368 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2369 lookup_b[i] = (tmp/65535)<<sh_b;
2370 }
2371
2372 /* apply table to input image (replacing colors by newly calculated ones) */
2373 switch (srcImage->bits_per_pixel)
2374 {
2375 case 15:
2376 {
2377 unsigned short *p1, *pf, *p, *pl;
2378 p1 = (unsigned short *) srcImage->data;
2379 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380 while (p1 < pf)
2381 {
2382 p = p1;
2383 pl = p1 + srcImage->width;
2384 for (; p < pl; p++)
1786 } 2385 {
2386 *p = lookup_r[(*p & 0x7c00)>>10] |
2387 lookup_g[(*p & 0x03e0)>> 5] |
2388 lookup_b[(*p & 0x001f)];
2389 }
2390 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1787 } 2391 }
1788} 2392 break;
1789 2393 }
1790/* RGB 16 */ 2394 case 16:
1791static void 2395 {
1792shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2396 unsigned short *p1, *pf, *p, *pl;
1793{ 2397 p1 = (unsigned short *) srcImage->data;
1794 unsigned char *ptr; 2398 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1795 int x, y; 2399 while (p1 < pf)
1796 2400 {
1797 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2401 p = p1;
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2402 pl = p1 + srcImage->width;
1799 /* No saturation */ 2403 for (; p < pl; p++)
1800 for (y = h; --y >= 0;) {
1801 for (x = -w; x < 0; x++) {
1802 int r, g, b;
1803
1804 b = ((uint16_t *) ptr)[x];
1805 r = (b & 0xf800) * rm;
1806 g = (b & 0x7e0) * gm;
1807 b = (b & 0x1f) * bm;
1808 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1809 | ((g >> 8) & 0x7e0)
1810 | ((b >> 8) & 0x1f);
1811 }
1812 ptr += bpl;
1813 } 2404 {
1814 } else { 2405 *p = lookup_r[(*p & 0xf800)>>11] |
1815 for (y = h; --y >= 0;) { 2406 lookup_g[(*p & 0x07e0)>> 5] |
1816 for (x = -w; x < 0; x++) { 2407 lookup_b[(*p & 0x001f)];
1817 int r, g, b;
1818
1819 b = ((uint16_t *) ptr)[x];
1820 r = (b & 0xf800) * rm;
1821 g = (b & 0x7e0) * gm;
1822 b = (b & 0x1f) * bm;
1823 r |= (!(r >> 16) - 1);
1824 g |= (!(g >> 11) - 1);
1825 b |= (!(b >> 5) - 1);
1826 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1827 | ((g >> 8) & 0x7e0)
1828 | ((b >> 8) & 0x1f);
1829 } 2408 }
1830 ptr += bpl; 2409 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2410 }
2411 break;
2412 }
2413 case 24:
2414 {
2415 unsigned char *p1, *pf, *p, *pl;
2416 p1 = (unsigned char *) srcImage->data;
2417 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2418 while (p1 < pf)
2419 {
2420 p = p1;
2421 pl = p1 + srcImage->width * 3;
2422 for (; p < pl; p += 3)
1831 } 2423 {
2424 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2425 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2426 p[2] = lookup_r[(p[2] & 0x0000ff)];
2427 }
2428 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1832 } 2429 }
1833} 2430 break;
2431 }
2432 case 32:
2433 {
2434 RUINT32T *p1, *pf, *p, *pl;
2435 p1 = (RUINT32T *) srcImage->data;
2436 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1834 2437
1835/* RGB 24 */ 2438 while (p1 < pf)
1836static void 2439 {
1837shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2440 p = p1;
1838{ 2441 pl = p1 + srcImage->width;
1839 unsigned char *ptr; 2442 for (; p < pl; p++)
1840 int x, y;
1841
1842 ptr = (unsigned char *)data + (w * 3);
1843 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1844 /* No saturation */
1845 for (y = h; --y >= 0;) {
1846 for (x = -(w * 3); x < 0; x += 3) {
1847 int r, g, b;
1848
1849 if (byteorder.big_endian()) {
1850 r = (ptr[x + 0] * rm) >> 8;
1851 g = (ptr[x + 1] * gm) >> 8;
1852 b = (ptr[x + 2] * bm) >> 8;
1853 ptr[x + 0] = r;
1854 ptr[x + 1] = g;
1855 ptr[x + 2] = b;
1856 } else {
1857 r = (ptr[x + 2] * rm) >> 8;
1858 g = (ptr[x + 1] * gm) >> 8;
1859 b = (ptr[x + 0] * bm) >> 8;
1860 ptr[x + 2] = r;
1861 ptr[x + 1] = g;
1862 ptr[x + 0] = b;
1863 }
1864 }
1865 ptr += bpl;
1866 } 2443 {
1867 } else { 2444 *p = lookup_r[(*p & 0xff0000)>>16] |
1868 for (y = h; --y >= 0;) { 2445 lookup_g[(*p & 0x00ff00)>> 8] |
1869 for (x = -(w * 3); x < 0; x += 3) { 2446 lookup_b[(*p & 0x0000ff)] |
1870 int r, g, b; 2447 (*p & ~0xffffff);
1871
1872 if (byteorder.big_endian()) {
1873 r = (ptr[x + 0] * rm) >> 8;
1874 g = (ptr[x + 1] * gm) >> 8;
1875 b = (ptr[x + 2] * bm) >> 8;
1876
1877 r |= (!(r >> 8) - 1);
1878 g |= (!(g >> 8) - 1);
1879 b |= (!(b >> 8) - 1);
1880
1881 ptr[x + 0] = r;
1882 ptr[x + 1] = g;
1883 ptr[x + 2] = b;
1884 } else {
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888
1889 r |= (!(r >> 8) - 1);
1890 g |= (!(g >> 8) - 1);
1891 b |= (!(b >> 8) - 1);
1892
1893 ptr[x + 2] = r;
1894 ptr[x + 1] = g;
1895 ptr[x + 0] = b;
1896 }
1897 } 2448 }
1898 ptr += bpl; 2449 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1899 } 2450 }
2451 break;
2452 }
1900 } 2453 }
1901}
1902 2454
1903/* RGB 32 */ 2455 free (lookup);
1904static void
1905shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1906{
1907 unsigned char *ptr;
1908 int x, y;
1909
1910 ptr = (unsigned char *)data + (w * 4);
1911 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1912 /* No saturation */
1913 for (y = h; --y >= 0;) {
1914 if (byteorder.big_endian()) {
1915 for (x = -(w * 4); x < 0; x += 4) {
1916 int r, g, b;
1917
1918 r = (ptr[x + 1] * rm) >> 8;
1919 g = (ptr[x + 2] * gm) >> 8;
1920 b = (ptr[x + 3] * bm) >> 8;
1921 ptr[x + 1] = r;
1922 ptr[x + 2] = g;
1923 ptr[x + 3] = b;
1924 }
1925 } else {
1926 for (x = -(w * 4); x < 0; x += 4) {
1927 int r, g, b;
1928
1929 r = (ptr[x + 2] * rm) >> 8;
1930 g = (ptr[x + 1] * gm) >> 8;
1931 b = (ptr[x + 0] * bm) >> 8;
1932 ptr[x + 2] = r;
1933 ptr[x + 1] = g;
1934 ptr[x + 0] = b;
1935 }
1936 }
1937 ptr += bpl;
1938 }
1939 } else {
1940 for (y = h; --y >= 0;) {
1941 for (x = -(w * 4); x < 0; x += 4) {
1942 int r, g, b;
1943
1944 if (byteorder.big_endian()) {
1945 r = (ptr[x + 1] * rm) >> 8;
1946 g = (ptr[x + 2] * gm) >> 8;
1947 b = (ptr[x + 3] * bm) >> 8;
1948
1949 r |= (!(r >> 8) - 1);
1950 g |= (!(g >> 8) - 1);
1951 b |= (!(b >> 8) - 1);
1952
1953 ptr[x + 1] = r;
1954 ptr[x + 2] = g;
1955 ptr[x + 3] = b;
1956 } else {
1957 r = (ptr[x + 2] * rm) >> 8;
1958 g = (ptr[x + 1] * gm) >> 8;
1959 b = (ptr[x + 0] * bm) >> 8;
1960
1961 r |= (!(r >> 8) - 1);
1962 g |= (!(g >> 8) - 1);
1963 b |= (!(b >> 8) - 1);
1964
1965 ptr[x + 2] = r;
1966 ptr[x + 1] = g;
1967 ptr[x + 0] = b;
1968 }
1969 }
1970 ptr += bpl;
1971 }
1972 }
1973} 2456}
1974
1975#endif 2457#endif
1976 2458
1977/* 2459/*
1978 * Check our parents are still who we think they are. 2460 * Check our parents are still who we think they are.
1979 * Do transparency updates if required 2461 * Do transparency updates if required
… …
1986 Atom atype; 2468 Atom atype;
1987 unsigned char *prop = NULL; 2469 unsigned char *prop = NULL;
1988 Window root, oldp, *list; 2470 Window root, oldp, *list;
1989 Pixmap rootpixmap = None; 2471 Pixmap rootpixmap = None;
1990 XWindowAttributes wattr, wrootattr; 2472 XWindowAttributes wattr, wrootattr;
2473 dDisp;
1991 2474
1992 pchanged = 0; 2475 pchanged = 0;
1993 2476
1994 if (!(Options & Opt_transparent)) 2477 if (!OPTION (Opt_transparent))
1995 return pchanged; /* Don't try any more */ 2478 return pchanged; /* Don't try any more */
1996 2479
1997 XGetWindowAttributes (display->display, display->root, &wrootattr); 2480 XGetWindowAttributes (disp, display->root, &wrootattr);
1998 rootdepth = wrootattr.depth; 2481 rootdepth = wrootattr.depth;
1999 2482
2000 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2483 XGetWindowAttributes (disp, parent[0], &wattr);
2001 2484
2002 if (rootdepth != wattr.depth) 2485 if (rootdepth != wattr.depth)
2003 { 2486 {
2004 if (am_transparent) 2487 if (am_transparent)
2005 { 2488 {
2006 pchanged = 1; 2489 pchanged = 1;
2007 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2490 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2008 am_transparent = am_pixmap_trans = 0; 2491 am_transparent = am_pixmap_trans = 0;
2009 } 2492 }
2010 2493
2011 return pchanged; /* Don't try any more */ 2494 return pchanged; /* Don't try any more */
2012 } 2495 }
2013 2496
2014 /* Get all X ops out of the queue so that our information is up-to-date. */ 2497 /* Get all X ops out of the queue so that our information is up-to-date. */
2015 XSync (display->display, False); 2498 XSync (disp, False);
2016 2499
2017 /* 2500 /*
2018 * Make the frame window set by the window manager have 2501 * Make the frame window set by the window manager have
2019 * the root background. Some window managers put multiple nested frame 2502 * the root background. Some window managers put multiple nested frame
2020 * windows for each client, so we have to take care about that. 2503 * windows for each client, so we have to take care about that.
2021 */ 2504 */
2022 i = (xa[XA_XROOTPMAPID] 2505 i = (xa[XA_XROOTPMAP_ID]
2023 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2506 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2024 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2507 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2025 &nitems, &bytes_after, &prop) == Success); 2508 &nitems, &bytes_after, &prop) == Success);
2026 2509
2027 if (!i || prop == NULL) 2510 if (!i || prop == NULL)
2028 i = (xa[XA_XSETROOTID] 2511 i = (xa[XA_ESETROOT_PMAP_ID]
2029 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2512 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2030 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2031 &nitems, &bytes_after, &prop) == Success); 2514 &nitems, &bytes_after, &prop) == Success);
2032 2515
2033 if (!i || prop == NULL) 2516 if (!i || prop == NULL
2517#if TINTING
2518 || !rs[Rs_color + Color_tint]
2519#endif
2520 )
2034 have_pixmap = 0; 2521 have_pixmap = 0;
2035 else 2522 else
2036 { 2523 {
2037 have_pixmap = 1; 2524 have_pixmap = 1;
2038 rootpixmap = *(Pixmap *)prop; 2525 rootpixmap = *(Pixmap *)prop;
… …
2049 Window cr; 2536 Window cr;
2050 XImage *image; 2537 XImage *image;
2051 GC gc; 2538 GC gc;
2052 XGCValues gcvalue; 2539 XGCValues gcvalue;
2053 2540
2054 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2541 XTranslateCoordinates (disp, parent[0], display->root,
2055 0, 0, &sx, &sy, &cr); 2542 0, 0, &sx, &sy, &cr);
2056 nw = (unsigned int)szHint.width; 2543 nw = (unsigned int)szHint.width;
2057 nh = (unsigned int)szHint.height; 2544 nh = (unsigned int)szHint.height;
2058 nx = ny = 0; 2545 nx = ny = 0;
2059 2546
… …
2069 nh += sy; 2556 nh += sy;
2070 ny = -sy; 2557 ny = -sy;
2071 sy = 0; 2558 sy = 0;
2072 } 2559 }
2073 2560
2074 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2561 min_it (nw, (unsigned int) (wrootattr.width - sx));
2075 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2562 min_it (nh, (unsigned int) (wrootattr.height - sy));
2563
2564 XSync (disp, False);
2076 allowedxerror = -1; 2565 allowedxerror = -1;
2077 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2566 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2078 2567
2079 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2568 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2080 /* XXX: may need a delay here? */ 2569 /* XXX: may need a delay here? */
2081 allowedxerror = 0; 2570 allowedxerror = 0;
2082 2571
2083 if (image == NULL) 2572 if (image == NULL)
2084 { 2573 {
2085 if (am_transparent && am_pixmap_trans) 2574 if (am_transparent && am_pixmap_trans)
2086 { 2575 {
2087 pchanged = 1; 2576 pchanged = 1;
2088 if (TermWin.pixmap != None) 2577 if (pixmap != None)
2089 { 2578 {
2090 XFreePixmap (display->display, TermWin.pixmap); 2579 XFreePixmap (disp, pixmap);
2091 TermWin.pixmap = None; 2580 pixmap = None;
2092 } 2581 }
2093 } 2582 }
2094 2583
2095 am_pixmap_trans = 0; 2584 am_pixmap_trans = 0;
2096 } 2585 }
2097 else 2586 else
2098 { 2587 {
2099 if (TermWin.pixmap != None) 2588 if (pixmap != None)
2100 XFreePixmap (display->display, TermWin.pixmap); 2589 XFreePixmap (disp, pixmap);
2101 2590
2102#if TINTING 2591#if TINTING
2103 if (ISSET_PIXCOLOR (Color_tint)) 2592 if (ISSET_PIXCOLOR (Color_tint))
2104 { 2593 {
2105 unsigned short shade, rm, gm, bm; 2594 unsigned short rm, gm, bm;
2595 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2106 2596
2107 PixColors[Color_tint].get (display, rm, gm, bm); 2597 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2108 2598
2109 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2599 ShadeXImage (display, image, shade, rm, gm, bm);
2110
2111 /* Determine bitshift and bitmask values */
2112 switch (image->bits_per_pixel)
2113 {
2114 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2115 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2116 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2117 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2118 }
2119 } 2600 }
2120#endif 2601#endif
2121 2602
2122 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2603 pixmap = XCreatePixmap (disp, vt,
2123 szHint.width, szHint.height, image->depth); 2604 szHint.width, szHint.height, image->depth);
2124 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2605 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2125 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2606 XPutImage (disp, pixmap, gc, image, 0, 0,
2126 nx, ny, image->width, image->height); 2607 nx, ny, image->width, image->height);
2127 XFreeGC (display->display, gc); 2608 XFreeGC (disp, gc);
2128 XDestroyImage (image); 2609 XDestroyImage (image);
2129 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2610 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2130 TermWin.pixmap); 2611 XClearWindow (disp, parent[0]);
2131 2612
2132 if (!am_transparent || !am_pixmap_trans) 2613 if (!am_transparent || !am_pixmap_trans)
2133 pchanged = 1; 2614 pchanged = 1;
2134 2615
2135 am_transparent = am_pixmap_trans = 1; 2616 am_transparent = am_pixmap_trans = 1;
2136 } 2617 }
2137 } 2618 }
2138 2619
2139 if (!am_pixmap_trans) 2620 if (am_pixmap_trans)
2621 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2622 else
2140 { 2623 {
2141 unsigned int n; 2624 unsigned int n;
2142 /* 2625 /*
2143 * InheritPixmap transparency 2626 * InheritPixmap transparency
2144 */ 2627 */
2145 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2146 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2628 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2147 { 2629 {
2148 oldp = TermWin.parent[i]; 2630 oldp = parent[i];
2149 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2631 XQueryTree (disp, parent[i - 1], &root,
2150 &TermWin.parent[i], &list, &n); 2632 &parent[i], &list, &n);
2151 XFree (list); 2633 XFree (list);
2152 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2153 2634
2154 if (TermWin.parent[i] == display->root) 2635 if (parent[i] == display->root)
2155 { 2636 {
2156 if (oldp != None) 2637 if (oldp != None)
2157 pchanged = 1; 2638 pchanged = 1;
2158 2639
2159 break; 2640 break;
2160 } 2641 }
2161 2642
2162 if (oldp != TermWin.parent[i]) 2643 if (oldp != parent[i])
2163 pchanged = 1; 2644 pchanged = 1;
2164 } 2645 }
2165 2646
2166 n = 0; 2647 n = 0;
2167 2648
2168 if (pchanged) 2649 if (pchanged)
2169 { 2650 {
2170 for (; n < (unsigned int)i; n++) 2651 for (; n < (unsigned int)i; n++)
2171 { 2652 {
2172 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2653 XGetWindowAttributes (disp, parent[n], &wattr);
2173 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2174 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2654 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2175 { 2655 {
2176 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2656 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2177 break; 2657 break;
2178 } 2658 }
2179 } 2659 }
2180 } 2660 }
2181 2661
2182 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2662 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2183 { 2663 {
2184 D_X ((stderr, "InheritPixmap Turning off"));
2185 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2664 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2186 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2665 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2187 am_transparent = 0; 2666 am_transparent = 0;
2188 /* XXX: also turn off Opt_transparent? */ 2667 /* XXX: also turn off Opt_transparent? */
2189 } 2668 }
2190 else 2669 else
2191 { 2670 {
2192#if WAIT_FOR_WM 2671#if WAIT_FOR_WM
2193 /* wait (an arbitrary period) for the WM to do its thing 2672 /* wait (an arbitrary period) for the WM to do its thing
2194 * needed for fvwm2.2.2 (and before?) */ 2673 * needed for fvwm2.2.2 (and before?) */
2195 sleep (1); 2674 sleep (1);
2196#endif 2675#endif
2197 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2198 for (n = 0; n < (unsigned int)i; n++) 2676 for (n = 0; n < (unsigned int)i; n++)
2677 {
2199 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2678 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2679 XClearWindow (disp, parent[n]);
2680 }
2200 2681
2201 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2682 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2202 am_transparent = 1; 2683 am_transparent = 1;
2203 } 2684 }
2204 2685
2205 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2686 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2206 TermWin.parent[i] = None; 2687 parent[i] = None;
2688 }
2689
2690 if (scrollBar.win)
2691 {
2692 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2693 scrollBar.setIdle ();
2694 scrollbar_show (0);
2695 }
2696
2697 if (am_transparent)
2698 {
2699 want_refresh = want_full_refresh = 1;
2700 if (am_pixmap_trans)
2701 flush ();
2207 } 2702 }
2208 2703
2209 return pchanged; 2704 return pchanged;
2210} 2705}
2211#endif 2706#endif
… …
2215bool 2710bool
2216rxvt_term::cmd_parse () 2711rxvt_term::cmd_parse ()
2217{ 2712{
2218 bool flag = false; 2713 bool flag = false;
2219 unicode_t ch = NOCHAR; 2714 unicode_t ch = NOCHAR;
2220 unsigned char *seq_begin; // remember start of esc-sequence here 2715 char *seq_begin; // remember start of esc-sequence here
2221 2716
2222 for (;;) 2717 for (;;)
2223 { 2718 {
2224 if (ch == NOCHAR) 2719 if (ch == NOCHAR)
2225 { 2720 {
2226 seq_begin = cmdbuf_ptr; 2721 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2722 ch = next_char ();
2228 }
2229 2723
2230 if (ch == NOCHAR) // TODO: improve 2724 if (ch == NOCHAR)
2231 break; 2725 break;
2726 }
2232 2727
2233 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2728 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2234 { 2729 {
2730 if (!seen_input)
2731 {
2732 seen_input = 1;
2733 // many badly-written programs (e.g. jed) contain a race condition:
2734 // they first read the screensize and then install a SIGWINCH handler.
2735 // some window managers resize the window early, and these programs
2736 // then sometimes get the size wrong.
2737 // unfortunately other programs are even more buggy and dislike
2738 // being sent SIGWINCH, so only do it when we were in fact being
2739 // resized.
2740 if (seen_resize && cmd_pid)
2741 kill (-cmd_pid, SIGWINCH);
2742 }
2743
2235 /* Read a text string from the input buffer */ 2744 /* Read a text string from the input buffer */
2236 unicode_t buf[UBUFSIZ]; 2745 unicode_t buf[UBUFSIZ];
2237 bool refreshnow = false; 2746 bool refreshnow = false;
2238 int nlines = 0; 2747 int nlines = 0;
2239 unicode_t *str = buf; 2748 unicode_t *str = buf;
2240 2749 unicode_t *eol = str + min (ncol, UBUFSIZ);
2241 *str++ = ch;
2242 2750
2243 for (;;) 2751 for (;;)
2244 { 2752 {
2245 seq_begin = cmdbuf_ptr;
2246 ch = next_char ();
2247
2248 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2753 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2249 break; 2754 break;
2250 2755
2251 *str++ = ch; 2756 *str++ = ch;
2252 2757
2253 if (ch == C0_LF) 2758 if (ch == C0_LF || str >= eol)
2254 { 2759 {
2760 if (ch == C0_LF)
2255 nlines++; 2761 nlines++;
2762
2256 refresh_count++; 2763 refresh_count++;
2257 2764
2258 if (! (Options & Opt_jumpScroll) 2765 if (!OPTION (Opt_jumpScroll)
2259 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2766 || (refresh_count >= refresh_limit * (nrow - 1)))
2260 { 2767 {
2261 refreshnow = true; 2768 refreshnow = true;
2262 flag = true; 2769 refresh_count = 0;
2263 ch = NOCHAR; 2770 ch = NOCHAR;
2264 break; 2771 break;
2265 } 2772 }
2266 2773
2267 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2774 // scr_add_lines only works for nlines <= nrow - 1.
2268 if (nlines >= TermWin.nrow - 1) 2775 if (nlines >= nrow - 1)
2269 { 2776 {
2777 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2270 scr_add_lines (buf, nlines, str - buf); 2778 scr_add_lines (buf, nlines, str - buf);
2779
2271 nlines = 0; 2780 nlines = 0;
2272 str = buf; 2781 str = buf;
2782 eol = str + min (ncol, UBUFSIZ);
2273 } 2783 }
2784
2785 if (str >= eol)
2786 {
2787 if (eol >= buf + UBUFSIZ)
2788 {
2789 ch = NOCHAR;
2790 break;
2791 }
2792 else
2793 eol = min (eol + ncol, buf + UBUFSIZ);
2794 }
2795
2274 } 2796 }
2275 2797
2276 if (str >= buf + UBUFSIZ) 2798 seq_begin = cmdbuf_ptr;
2277 { 2799 ch = next_char ();
2278 ch = NOCHAR;
2279 break;
2280 }
2281 } 2800 }
2282 2801
2802 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2283 scr_add_lines (buf, nlines, str - buf); 2803 scr_add_lines (buf, nlines, str - buf);
2284 2804
2285 /* 2805 /*
2286 * If there have been a lot of new lines, then update the screen 2806 * If there have been a lot of new lines, then update the screen
2287 * What the heck I'll cheat and only refresh less than every page-full. 2807 * What the heck I'll cheat and only refresh less than every page-full.
2288 * the number of pages between refreshes is refresh_limit, which 2808 * the number of pages between refreshes is refresh_limit, which
2289 * is incremented here because we must be doing flat-out scrolling. 2809 * is incremented here because we must be doing flat-out scrolling.
2290 *
2291 * refreshing should be correct for small scrolls, because of the
2292 * time-out
2293 */ 2810 */
2294 if (refreshnow) 2811 if (refreshnow)
2295 { 2812 {
2296 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2813 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2297 refresh_limit++; 2814 refresh_limit++;
2298 else 2815 else
2816 {
2817 flag = true;
2299 scr_refresh (refresh_type); 2818 scr_refresh (refresh_type);
2819 flush_ev.stop ();
2820 }
2300 } 2821 }
2301 2822
2302 } 2823 }
2303 else 2824 else
2304 { 2825 {
… …
2334rxvt_term::next_char () 2855rxvt_term::next_char ()
2335{ 2856{
2336 while (cmdbuf_ptr < cmdbuf_endp) 2857 while (cmdbuf_ptr < cmdbuf_endp)
2337 { 2858 {
2338 // assume 7-bit to be ascii ALWAYS 2859 // assume 7-bit to be ascii ALWAYS
2339 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2860 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2340 return *cmdbuf_ptr++; 2861 return *cmdbuf_ptr++;
2341 2862
2342 wchar_t wc; 2863 wchar_t wc;
2343 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2864 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2344 2865
2345 if (len == (size_t)-2) 2866 if (len == (size_t)-2)
2346 { 2867 {
2347 // the mbstate stores incomplete sequences. didn't know this :/ 2868 // the mbstate stores incomplete sequences. didn't know this :/
2348 cmdbuf_ptr = cmdbuf_endp; 2869 cmdbuf_ptr = cmdbuf_endp;
… …
2352 if (len == (size_t)-1) 2873 if (len == (size_t)-1)
2353 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2874 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2354 2875
2355 // assume wchar == unicode 2876 // assume wchar == unicode
2356 cmdbuf_ptr += len; 2877 cmdbuf_ptr += len;
2357 return wc; 2878 return wc & UNICODE_MASK;
2358 } 2879 }
2359 2880
2360 return NOCHAR; 2881 return NOCHAR;
2361} 2882}
2362 2883
… …
2487 case C0_ESC: 3008 case C0_ESC:
2488 process_escape_seq (); 3009 process_escape_seq ();
2489 break; 3010 break;
2490 case C0_ENQ: /* terminal Status */ 3011 case C0_ENQ: /* terminal Status */
2491 if (rs[Rs_answerbackstring]) 3012 if (rs[Rs_answerbackstring])
2492 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3013 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2493 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2494 else 3014 else
2495 tt_write ((unsigned char *)VT100_ANS, 3015 tt_write (VT100_ANS, strlen (VT100_ANS));
2496 (unsigned int)STRLEN (VT100_ANS));
2497 break; 3016 break;
2498 case C0_BEL: /* bell */ 3017 case C0_BEL: /* bell */
2499 scr_bell (); 3018 scr_bell ();
2500 break; 3019 break;
2501 case C0_BS: /* backspace */ 3020 case C0_BS: /* backspace */
… …
2600void 3119void
2601rxvt_term::process_escape_seq () 3120rxvt_term::process_escape_seq ()
2602{ 3121{
2603 unicode_t ch = cmd_getc (); 3122 unicode_t ch = cmd_getc ();
2604 3123
2605 if (PrivateModes & PrivMode_vt52) 3124 if (priv_modes & PrivMode_vt52)
2606 { 3125 {
2607 process_escape_vt52 (ch); 3126 process_escape_vt52 (ch);
2608 return; 3127 return;
2609 } 3128 }
2610 3129
… …
2625 scr_charset_set (2, (unsigned int)cmd_getc ()); 3144 scr_charset_set (2, (unsigned int)cmd_getc ());
2626 break; 3145 break;
2627 case '+': 3146 case '+':
2628 scr_charset_set (3, (unsigned int)cmd_getc ()); 3147 scr_charset_set (3, (unsigned int)cmd_getc ());
2629 break; 3148 break;
2630#ifndef NO_FRILLS 3149#if ENABLE_FRILLS
2631 case '6': 3150 case '6':
2632 scr_backindex (); 3151 scr_backindex ();
2633 break; 3152 break;
2634#endif 3153#endif
2635 case '7': 3154 case '7':
2636 scr_cursor (SAVE); 3155 scr_cursor (SAVE);
2637 break; 3156 break;
2638 case '8': 3157 case '8':
2639 scr_cursor (RESTORE); 3158 scr_cursor (RESTORE);
2640 break; 3159 break;
2641#ifndef NO_FRILLS 3160#if ENABLE_FRILLS
2642 case '9': 3161 case '9':
2643 scr_forwardindex (); 3162 scr_forwardindex ();
2644 break; 3163 break;
2645#endif 3164#endif
2646 case '=': 3165 case '=':
… …
2689 process_dcs_seq (); 3208 process_dcs_seq ();
2690 break; 3209 break;
2691 3210
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3211 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 3212 case C1_SCI: /* ESC Z */
2694 tt_write ((const unsigned char *)ESCZ_ANSWER, 3213 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2696 break; /* steal obsolete ESC [ c */ 3214 break; /* steal obsolete ESC [ c */
2697 3215
2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3216 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2699 case C1_CSI: /* ESC [ */ 3217 case C1_CSI: /* ESC [ */
2700 process_csi_seq (); 3218 process_csi_seq ();
… …
2825 { 3343 {
2826 switch (priv) 3344 switch (priv)
2827 { 3345 {
2828 case '>': 3346 case '>':
2829 if (ch == CSI_DA) /* secondary device attributes */ 3347 if (ch == CSI_DA) /* secondary device attributes */
2830 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3348 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2831 break; 3349 break;
2832 case '?': 3350 case '?':
2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3351 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2834 process_terminal_mode (ch, priv, nargs, arg); 3352 process_terminal_mode (ch, priv, nargs, arg);
2835 break; 3353 break;
… …
2940 3458
2941 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3459 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2942 arg[0] = -arg[0]; 3460 arg[0] = -arg[0];
2943 /* FALLTHROUGH */ 3461 /* FALLTHROUGH */
2944 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3462 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2945 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3463 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2946 break; 3464 break;
2947 3465
2948 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3466 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2949 tt_write ((const unsigned char *)VT100_ANS, 3467 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2950 (unsigned int) (sizeof (VT100_ANS) - 1));
2951 break; 3468 break;
2952 3469
2953 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3470 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2954 process_sgr_mode (nargs, arg); 3471 process_sgr_mode (nargs, arg);
2955 break; 3472 break;
… …
2962 break; 3479 break;
2963 case 6: /* CPR requested */ 3480 case 6: /* CPR requested */
2964 scr_report_position (); 3481 scr_report_position ();
2965 break; 3482 break;
2966 case 7: /* unofficial extension */ 3483 case 7: /* unofficial extension */
2967 if (Options & Opt_insecure) 3484 if (OPTION (Opt_insecure))
2968 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3485 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2969 break; 3486 break;
2970 case 8: /* unofficial extension */ 3487 case 8: /* unofficial extension */
2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3488 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2972 break; 3489 break;
2973 } 3490 }
… …
3009 break; 3526 break;
3010 3527
3011 case CSI_RM: /* 8.3.107: RESET MODE */ 3528 case CSI_RM: /* 8.3.107: RESET MODE */
3012 if (arg[0] == 4) 3529 if (arg[0] == 4)
3013 scr_insert_mode (0); 3530 scr_insert_mode (0);
3531 else if (arg[0] == 20)
3532 priv_modes &= ~PrivMode_LFNL;
3014 break; 3533 break;
3015 3534
3016 case CSI_SM: /* 8.3.126: SET MODE */ 3535 case CSI_SM: /* 8.3.126: SET MODE */
3017 if (arg[0] == 4) 3536 if (arg[0] == 4)
3018 scr_insert_mode (1); 3537 scr_insert_mode (1);
3538 else if (arg[0] == 20)
3539 priv_modes |= PrivMode_LFNL;
3019 break; 3540 break;
3020 3541
3021 /* 3542 /*
3022 * PRIVATE USE beyond this point. All CSI_7? sequences here 3543 * PRIVATE USE beyond this point. All CSI_7? sequences here
3023 */ 3544 */
… …
3035 break; 3556 break;
3036 case CSI_75: 3557 case CSI_75:
3037 scr_cursor (RESTORE); 3558 scr_cursor (RESTORE);
3038 break; 3559 break;
3039 3560
3040#ifndef NO_FRILLS 3561#if ENABLE_FRILLS
3041 case CSI_74: 3562 case CSI_74:
3042 process_window_ops (arg, nargs); 3563 process_window_ops (arg, nargs);
3043 break; 3564 break;
3044#endif 3565#endif
3045 3566
… …
3052 break; 3573 break;
3053 } 3574 }
3054} 3575}
3055/*}}} */ 3576/*}}} */
3056 3577
3057#ifndef NO_FRILLS 3578#if ENABLE_FRILLS
3058/* ARGSUSED */ 3579/* ARGSUSED */
3059void 3580void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3581rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3582{
3062 int x, y; 3583 int x, y;
3063 XWindowAttributes wattr; 3584 XWindowAttributes wattr;
3064 Window wdummy; 3585 Window wdummy;
3586 dDisp;
3065 3587
3066 if (nargs == 0) 3588 if (nargs == 0)
3067 return; 3589 return;
3068 3590
3069 switch (args[0]) 3591 switch (args[0])
3070 { 3592 {
3071 /* 3593 /*
3072 * commands 3594 * commands
3073 */ 3595 */
3074 case 1: /* deiconify window */ 3596 case 1: /* deiconify window */
3075 XMapWindow (display->display, TermWin.parent[0]); 3597 XMapWindow (disp, parent[0]);
3076 break; 3598 break;
3077 case 2: /* iconify window */ 3599 case 2: /* iconify window */
3078 XIconifyWindow (display->display, TermWin.parent[0], 3600 XIconifyWindow (disp, parent[0], display->screen);
3079 DefaultScreen (display->display));
3080 break; 3601 break;
3081 case 3: /* set position (pixels) */ 3602 case 3: /* set position (pixels) */
3082 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3603 XMoveWindow (disp, parent[0], args[1], args[2]);
3083 break; 3604 break;
3084 case 4: /* set size (pixels) */ 3605 case 4: /* set size (pixels) */
3085 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3606 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3086 break; 3607 break;
3087 case 5: /* raise window */ 3608 case 5: /* raise window */
3088 XRaiseWindow (display->display, TermWin.parent[0]); 3609 XRaiseWindow (disp, parent[0]);
3089 break; 3610 break;
3090 case 6: /* lower window */ 3611 case 6: /* lower window */
3091 XLowerWindow (display->display, TermWin.parent[0]); 3612 XLowerWindow (disp, parent[0]);
3092 break; 3613 break;
3093 case 7: /* refresh window */ 3614 case 7: /* refresh window */
3094 scr_touch (true); 3615 scr_touch (true);
3095 break; 3616 break;
3096 case 8: /* set size (chars) */ 3617 case 8: /* set size (chars) */
3097 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3618 set_widthheight ((unsigned int) (args[2] * fwidth),
3098 (unsigned int) (args[1] * TermWin.fheight)); 3619 (unsigned int) (args[1] * fheight));
3099 break; 3620 break;
3100 3621
3101 //case 9: NYI, TODO, restore maximized window or maximize window 3622 //case 9: NYI, TODO, restore maximized window or maximize window
3102 default: 3623 default:
3103 if (args[0] >= 24) /* set height (chars) */ 3624 if (args[0] >= 24) /* set height (chars) */
3104 set_widthheight ((unsigned int)TermWin.width, 3625 set_widthheight ((unsigned int)width,
3105 (unsigned int) (args[1] * TermWin.fheight)); 3626 (unsigned int) (args[1] * fheight));
3106 break; 3627 break;
3107 3628
3108 3629
3109 /* 3630 /*
3110 * reports - some output format copied from XTerm 3631 * reports - some output format copied from XTerm
3111 */ 3632 */
3112 case 11: /* report window state */ 3633 case 11: /* report window state */
3113 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3634 XGetWindowAttributes (disp, parent[0], &wattr);
3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3635 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3115 break; 3636 break;
3116 case 13: /* report window position */ 3637 case 13: /* report window position */
3117 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3638 XGetWindowAttributes (disp, parent[0], &wattr);
3118 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3639 XTranslateCoordinates (disp, parent[0], wattr.root,
3119 -wattr.border_width, -wattr.border_width, 3640 -wattr.border_width, -wattr.border_width,
3120 &x, &y, &wdummy); 3641 &x, &y, &wdummy);
3121 tt_printf ("\033[3;%d;%dt", x, y); 3642 tt_printf ("\033[3;%d;%dt", x, y);
3122 break; 3643 break;
3123 case 14: /* report window size (pixels) */ 3644 case 14: /* report window size (pixels) */
3124 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3645 XGetWindowAttributes (disp, parent[0], &wattr);
3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3646 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3126 break; 3647 break;
3127 case 18: /* report text area size (chars) */ 3648 case 18: /* report text area size (chars) */
3128 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3649 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3129 break; 3650 break;
3130 case 19: /* report window size (chars) */ 3651 case 19: /* report window size (chars) */
3131 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3652 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3132 break; 3653 break;
3133 case 20: /* report icon label */ 3654 case 20: /* report icon label */
3134 if (Options & Opt_insecure)
3135 { 3655 {
3136 char *s; 3656 char *s;
3137 XGetIconName (display->display, TermWin.parent[0], &s); 3657 XGetIconName (disp, parent[0], &s);
3138 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3658 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3659 XFree (s);
3139 } 3660 }
3140 break; 3661 break;
3141 case 21: /* report window title */ 3662 case 21: /* report window title */
3142 if (Options & Opt_insecure)
3143 { 3663 {
3144 char *s; 3664 char *s;
3145 XFetchName (display->display, TermWin.parent[0], &s); 3665 XFetchName (disp, parent[0], &s);
3146 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3666 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3667 XFree (s);
3147 } 3668 }
3148 break; 3669 break;
3149 } 3670 }
3150} 3671}
3151#endif 3672#endif
3152 3673
3153/*----------------------------------------------------------------------*/ 3674/*----------------------------------------------------------------------*/
3154/* 3675/*
3155 * get input up until STRING TERMINATOR (or BEL) 3676 * get input up until STRING TERMINATOR (or BEL)
3156 * ends_how is terminator used. returned input must be free()'d 3677 * ends_how is terminator used. returned input must be free()'d
3157 */ 3678 */
3158unsigned char * 3679char *
3159rxvt_term::get_to_st (unicode_t &ends_how) 3680rxvt_term::get_to_st (unicode_t &ends_how)
3160{ 3681{
3161 unicode_t prev = 0, ch; 3682 unicode_t ch;
3683 bool seen_esc = false;
3162 unsigned int n = 0; 3684 unsigned int n = 0;
3163 unsigned char *s;
3164 unsigned char string[STRING_MAX]; 3685 wchar_t string[STRING_MAX];
3165 3686
3166 while ((ch = cmd_getc ()) != NOCHAR) 3687 while ((ch = cmd_getc ()) != NOCHAR)
3167 { 3688 {
3168 if (prev == C0_ESC) 3689 if (seen_esc)
3169 { 3690 {
3170 if (ch == 0x5c) /* 7bit ST */ 3691 if (ch == 0x5c) /* 7bit ST */
3171 break; 3692 break;
3172 else 3693 else
3173 return NULL; 3694 return NULL;
3174 } 3695 }
3696 else if (ch == C0_ESC)
3697 {
3698 seen_esc = true;
3699 continue;
3700 }
3175 else if (ch == C0_BEL || ch == CHAR_ST) 3701 else if (ch == C0_BEL || ch == CHAR_ST)
3176 break; 3702 break;
3177 else if (ch < 0x20) 3703 else if (ch < 0x20)
3178 return NULL; /* other control character - exit */ 3704 return NULL; /* other control character - exit */
3179 3705
3180 if (n >= sizeof (string) - 1) 3706 seen_esc = false;
3707
3708 if (n >= STRING_MAX - 1)
3181 // stop at some sane length 3709 // stop at some sane length
3182 return NULL; 3710 return NULL;
3183 3711
3184 if (ch == C0_SYN) 3712 if (ch == C0_SYN)
3185 {
3186 string[n++] = cmd_get8 (); 3713 string[n++] = cmd_get8 ();
3187 prev = 0;
3188 }
3189 else 3714 else
3190 string[n++] = prev = ch; 3715 string[n++] = ch;
3191 } 3716 }
3192 3717
3193 string[n++] = '\0'; 3718 string[n++] = '\0';
3194 3719
3195 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3196 return NULL;
3197
3198 ends_how = (ch == 0x5c ? C0_ESC : ch); 3720 ends_how = (ch == 0x5c ? C0_ESC : ch);
3199 STRNCPY (s, string, n); 3721
3200 return s; 3722 return rxvt_wcstombs (string);
3201} 3723}
3202 3724
3203/*----------------------------------------------------------------------*/ 3725/*----------------------------------------------------------------------*/
3204/* 3726/*
3205 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3727 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3206 */ 3728 */
3207void 3729void
3208rxvt_term::process_dcs_seq () 3730rxvt_term::process_dcs_seq ()
3209{ 3731{
3210 unsigned char *s; 3732 char *s;
3211 unicode_t eh; 3733 unicode_t eh;
3212 3734
3213 /* 3735 /*
3214 * Not handled yet 3736 * Not handled yet
3215 */ 3737 */
… …
3234 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3756 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3235 arg = arg * 10 + (ch - '0'); 3757 arg = arg * 10 + (ch - '0');
3236 3758
3237 if (ch == ';') 3759 if (ch == ';')
3238 { 3760 {
3239 unsigned char *s = get_to_st (eh); 3761 char *s = get_to_st (eh);
3240 3762
3241 if (s) 3763 if (s)
3242 { 3764 {
3243 process_xterm_seq (arg, (char *)s, eh); 3765 process_xterm_seq (arg, s, eh);
3244 free (s); 3766 free (s);
3245 } 3767 }
3246 } 3768 }
3247} 3769}
3248 3770
3249void 3771void
3250rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3772rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3251{ 3773{
3252 if (str[0] == '?' && !str[1]) 3774 if (str[0] == '?' && !str[1])
3253 { 3775 {
3254 if (Options & Opt_insecure)
3255 {
3256 unsigned short r, g, b; 3776 unsigned short r, g, b;
3257 PixColors[color].get (display, r, g, b); 3777 pix_colors_focused[color].get (display, r, g, b);
3258 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3778 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3259 }
3260 } 3779 }
3261 else 3780 else
3262 set_window_color (color, str); 3781 set_window_color (color, str);
3263} 3782}
3264 3783
3265/* 3784/*
3266 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3267 * 0 = change iconName/title
3268 * 1 = change iconName
3269 * 2 = change title
3270 * 4 = change color
3271 * 10 = change fg color
3272 * 11 = change bg color
3273 * 12 = change text color
3274 * 13 = change mouse foreground color
3275 * 17 = change highlight character colour
3276 * 18 = change bold character color
3277 * 19 = change underlined character color
3278 * 46 = change logfile (not implemented)
3279 * 50 = change font
3280 *
3281 * rxvt extensions:
3282 * 20 = bg pixmap
3283 * 39 = change default fg color
3284 * 49 = change default bg color
3285 * 55 = dump scrollback buffer and all of screen
3286 * 701 = change locale
3287 * 702 = find font
3288 * 703 = menu
3289 */ 3786 */
3290void 3787void
3291rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3788rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3292{ 3789{
3293 int changed = 0; 3790 int changed = 0;
3294 int color; 3791 int color;
3295 char *buf, *name; 3792 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1]; 3793 bool query = str[0] == '?' && !str[1];
3794 int saveop = op;
3795 dDisp;
3297 3796
3298 assert (str != NULL); 3797 assert (str != NULL);
3299 switch (op) 3798 switch (op)
3300 { 3799 {
3301 case XTerm_name: 3800 case XTerm_name:
… …
3308 set_title (str); 3807 set_title (str);
3309 break; 3808 break;
3310 case XTerm_property: 3809 case XTerm_property:
3311 if (str[0] == '?') 3810 if (str[0] == '?')
3312 { 3811 {
3313 Atom prop = XInternAtom (display->display, str + 1, True); 3812 Atom prop = display->atom (str + 1);
3314 Atom actual_type; 3813 Atom actual_type;
3315 int actual_format; 3814 int actual_format;
3316 unsigned long nitems; 3815 unsigned long nitems;
3317 unsigned long bytes_after; 3816 unsigned long bytes_after;
3318 unsigned char *value = 0; 3817 unsigned char *value = 0;
3319 const char *str = ""; 3818 const char *str = "";
3320 3819
3321 if (prop 3820 if (prop
3322 && XGetWindowProperty (display->display, TermWin.parent[0], 3821 && XGetWindowProperty (disp, parent[0],
3323 prop, 0, 1<<16, 0, AnyPropertyType, 3822 prop, 0, 1<<16, 0, AnyPropertyType,
3324 &actual_type, &actual_format, 3823 &actual_type, &actual_format,
3325 &nitems, &bytes_after, &value) == Success 3824 &nitems, &bytes_after, &value) == Success
3326 && actual_type != None 3825 && actual_type != None
3327 && actual_format == 8) 3826 && actual_format == 8)
… …
3336 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3835 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3337 3836
3338 if (eq) 3837 if (eq)
3339 { 3838 {
3340 *eq = 0; 3839 *eq = 0;
3341 XChangeProperty (display->display, TermWin.parent[0], 3840 set_utf8_property (display->atom (str), eq + 1);
3342 display->atom (str), XA_STRING, 8,
3343 PropModeReplace, (unsigned char *)eq + 1,
3344 strlen (eq + 1));
3345 } 3841 }
3346 else 3842 else
3347 XDeleteProperty (display->display, TermWin.parent[0], 3843 XDeleteProperty (disp, parent[0],
3348 display->atom (str)); 3844 display->atom (str));
3349 } 3845 }
3350 break; 3846 break;
3351 3847
3352 case XTerm_Color: 3848 case XTerm_Color:
3353 for (buf = (char *)str; buf && *buf;) 3849 for (buf = (char *)str; buf && *buf;)
3354 { 3850 {
3355 if ((name = STRCHR (buf, ';')) == NULL) 3851 if ((name = strchr (buf, ';')) == NULL)
3356 break; 3852 break;
3357 3853
3358 *name++ = '\0'; 3854 *name++ = '\0';
3359 color = atoi (buf); 3855 color = atoi (buf);
3360 3856
3361 if (color < 0 || color >= TOTAL_COLORS) 3857 if (color < 0 || color >= TOTAL_COLORS)
3362 break; 3858 break;
3363 3859
3364 if ((buf = STRCHR (name, ';')) != NULL) 3860 if ((buf = strchr (name, ';')) != NULL)
3365 *buf++ = '\0'; 3861 *buf++ = '\0';
3366 3862
3367 if (name[0] == '?' && !name[1]) 3863 if (name[0] == '?' && !name[1])
3368 { 3864 {
3369 if (Options & Opt_insecure)
3370 {
3371 unsigned short r, g, b; 3865 unsigned short r, g, b;
3372 PixColors[color + minCOLOR].get (display, r, g, b); 3866 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3373 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3867 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3374 }
3375 } 3868 }
3376 else 3869 else
3377 set_window_color (color + minCOLOR, name); 3870 set_window_color (color + minCOLOR, name);
3378 } 3871 }
3379 break; 3872 break;
… …
3401 case XTerm_Color_UL: 3894 case XTerm_Color_UL:
3402 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3895 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3403 break; 3896 break;
3404 case XTerm_Color_RV: 3897 case XTerm_Color_RV:
3405 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3899 break;
3900 case URxvt_Color_IT:
3901 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3902 break;
3903#endif
3904#if TRANSPARENT && TINTING
3905 case URxvt_Color_tint:
3906 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3907 check_our_parents ();
3908 if (am_transparent)
3909 want_full_refresh = want_refresh = 1;
3406 break; 3910 break;
3407#endif 3911#endif
3408 3912
3409 case XTerm_Pixmap: 3913 case XTerm_Pixmap:
3410 if (*str != ';') 3914 if (*str != ';')
… …
3413 scale_pixmap (""); /* reset to default scaling */ 3917 scale_pixmap (""); /* reset to default scaling */
3414 set_bgPixmap (str); /* change pixmap */ 3918 set_bgPixmap (str); /* change pixmap */
3415#endif 3919#endif
3416 scr_touch (true); 3920 scr_touch (true);
3417 } 3921 }
3418 while ((str = STRCHR (str, ';')) != NULL) 3922 while ((str = strchr (str, ';')) != NULL)
3419 { 3923 {
3420 str++; 3924 str++;
3421#if XPM_BACKGROUND 3925#if XPM_BACKGROUND
3422 changed += scale_pixmap (str); 3926 changed += scale_pixmap (str);
3423#endif 3927#endif
3424
3425 } 3928 }
3929
3426 if (changed) 3930 if (changed)
3427 { 3931 {
3428#ifdef XPM_BACKGROUND 3932#ifdef XPM_BACKGROUND
3429 resize_pixmap (); 3933 resize_pixmap ();
3430#endif 3934#endif
… …
3441 3945
3442 case XTerm_logfile: 3946 case XTerm_logfile:
3443 // TODO, when secure mode? 3947 // TODO, when secure mode?
3444 break; 3948 break;
3445 3949
3446 case XTerm_font:
3447 if (query)
3448 {
3449 if (Options & Opt_insecure)
3450 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3451 TermWin.fontset->fontdesc
3452 ? TermWin.fontset->fontdesc
3453 : "",
3454 resp);
3455 }
3456 else
3457 change_font (str);
3458 break;
3459
3460#ifndef NO_FRILLS
3461 case XTerm_locale:
3462 if (query)
3463 {
3464 if (Options & Opt_insecure)
3465 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3466 }
3467 else
3468 {
3469 set_locale (str);
3470# ifdef USE_XIM
3471 im_cb ();
3472# endif
3473 }
3474 break;
3475
3476 case XTerm_findfont:
3477 if (Options & Opt_insecure)
3478 {
3479 int fid = TermWin.fontset->find_font (atoi (str));
3480 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3481 fid, (*TermWin.fontset)[fid]->name, resp);
3482 }
3483 break;
3484#endif
3485
3486#ifdef MENUBAR 3950#ifdef MENUBAR
3487 case XTerm_Menu: 3951 case URxvt_Menu:
3488 if (Options & Opt_insecure) 3952 if (OPTION (Opt_insecure))
3489 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3953 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3490 break; 3954 break;
3491#endif 3955#endif
3492#if 0 3956#if 0
3493 case XTerm_dumpscreen: /* no error notices */ 3957 case XTerm_dumpscreen: /* no error notices */
… …
3497 { 3961 {
3498 scr_dump (fd); 3962 scr_dump (fd);
3499 close (fd); 3963 close (fd);
3500 } 3964 }
3501 } 3965 }
3966 break;
3967#endif
3968 case XTerm_font:
3969 op = URxvt_font;
3970 case URxvt_font:
3971#if ENABLE_STYLES
3972 case URxvt_boldFont:
3973 case URxvt_italicFont:
3974 case URxvt_boldItalicFont:
3975#endif
3976 if (query)
3977 tt_printf ("\33]%d;%-.250s%c", saveop,
3978 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3979 ? fontset[op - URxvt_font]->fontdesc : "",
3980 resp);
3981 else
3982 {
3983 const char *&res = rs[Rs_font + (op - URxvt_font)];
3984
3985 res = strdup (str);
3986 allocated.push_back ((void *)res);
3987 set_fonts ();
3988 }
3989 break;
3990
3991#if ENABLE_FRILLS
3992 case URxvt_locale:
3993 if (query)
3994 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3995 else
3996 {
3997 set_locale (str);
3998 pty.set_utf8_mode (enc_utf8);
3999 init_xlocale ();
4000 }
4001 break;
4002
4003 case URxvt_view_up:
4004 case URxvt_view_down:
4005 {
4006 int lines = atoi (str);
4007
4008 if (lines)
4009 scr_page (op == URxvt_view_up ? UP : DN, lines);
4010 else
4011 scr_erase_savelines ();
4012 }
4013
4014 break;
4015#endif
4016
4017#if ENABLE_PERL
4018 case URxvt_perl:
4019 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
4020 ; // no responses yet
3502 break; 4021 break;
3503#endif 4022#endif
3504 } 4023 }
3505} 4024}
3506/*----------------------------------------------------------------------*/ 4025/*----------------------------------------------------------------------*/
… …
3520{ 4039{
3521 int state; 4040 int state;
3522 4041
3523 if (mode == 's') 4042 if (mode == 's')
3524 { 4043 {
3525 SavedModes |= (PrivateModes & bit); 4044 SavedModes |= (priv_modes & bit);
3526 return -1; 4045 return -1;
3527 } 4046 }
3528 else 4047 else
3529 { 4048 {
3530 if (mode == 'r') 4049 if (mode == 'r')
3531 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4050 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3532 else 4051 else
3533 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4052 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3534 PrivMode (state, bit); 4053 PrivMode (state, bit);
3535 } 4054 }
3536 4055
3537 return state; 4056 return state;
3538} 4057}
… …
3556 { 3, PrivMode_132 }, 4075 { 3, PrivMode_132 },
3557 { 4, PrivMode_smoothScroll }, 4076 { 4, PrivMode_smoothScroll },
3558 { 5, PrivMode_rVideo }, 4077 { 5, PrivMode_rVideo },
3559 { 6, PrivMode_relOrigin }, 4078 { 6, PrivMode_relOrigin },
3560 { 7, PrivMode_Autowrap }, 4079 { 7, PrivMode_Autowrap },
4080 // 8, bi-directional support mode
3561 { 9, PrivMode_MouseX10 }, 4081 { 9, PrivMode_MouseX10 },
3562#ifdef menuBar_esc 4082#ifdef menuBar_esc
3563 { menuBar_esc, PrivMode_menuBar }, 4083 { menuBar_esc, PrivMode_menuBar },
3564#endif 4084#endif
4085 // 18, 19 printing-related
4086 { 25, PrivMode_VisibleCursor },
3565#ifdef scrollBar_esc 4087#ifdef scrollBar_esc
3566 { scrollBar_esc, PrivMode_scrollBar }, 4088 { scrollBar_esc, PrivMode_scrollBar },
3567#endif 4089#endif
3568 // 18, 19 printing-related
3569 { 25, PrivMode_VisibleCursor },
3570 // 30 show scrollbar rxvt. extension
3571 { 35, PrivMode_ShiftKeys }, // rxvt extension 4090 { 35, PrivMode_ShiftKeys }, // rxvt extension
3572 { 40, PrivMode_132OK }, 4091 { 40, PrivMode_132OK },
3573 // 41 xterm more fixes NYI 4092 // 41 xterm more fixes NYI
3574 // 45 margin bell NYI 4093 // 45 margin bell NYI
3575 // 46 start logging 4094 // 46 start logging
… …
3615 } 4134 }
3616 4135
3617 /* extra handling for values with state unkept */ 4136 /* extra handling for values with state unkept */
3618 switch (arg[i]) 4137 switch (arg[i])
3619 { 4138 {
4139#if ENABLE_STYLES
4140 case 1021:
4141 if (mode)
4142 SET_OPTION (Opt_intensityStyles);
4143 else
4144 CLR_OPTION (Opt_intensityStyles);
4145
4146 scr_touch (true);
4147 break;
4148#endif
3620 case 1048: /* alternative cursor save */ 4149 case 1048: /* alternative cursor save */
4150 case 1049:
3621 if (Options & Opt_secondaryScreen) 4151 if (OPTION (Opt_secondaryScreen))
3622 if (mode == 0) 4152 if (mode == 0)
3623 scr_cursor (RESTORE); 4153 scr_cursor (RESTORE);
3624 else if (mode == 1) 4154 else if (mode == 1)
3625 scr_cursor (SAVE); 4155 scr_cursor (SAVE);
3626 break; 4156 break;
… …
3637 * within VT52 mode 4167 * within VT52 mode
3638 */ 4168 */
3639 PrivMode (1, PrivMode_vt52); 4169 PrivMode (1, PrivMode_vt52);
3640 break; 4170 break;
3641 case 3: /* 80/132 */ 4171 case 3: /* 80/132 */
3642 if (PrivateModes & PrivMode_132OK) 4172 if (priv_modes & PrivMode_132OK)
3643 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4173 set_widthheight (((state ? 132 : 80) * fwidth), height);
3644 break; 4174 break;
3645 case 4: /* smooth scrolling */ 4175 case 4: /* smooth scrolling */
3646 if (state) 4176 if (!state)
3647 Options &= ~Opt_jumpScroll; 4177 SET_OPTION (Opt_jumpScroll);
3648 else 4178 else
3649 Options |= Opt_jumpScroll; 4179 CLR_OPTION (Opt_jumpScroll);
3650 break; 4180 break;
3651 case 5: /* reverse video */ 4181 case 5: /* reverse video */
3652 scr_rvideo_mode (state); 4182 scr_rvideo_mode (state);
3653 break; 4183 break;
3654 case 6: /* relative/absolute origins */ 4184 case 6: /* relative/absolute origins */
… …
3658 scr_autowrap (state); 4188 scr_autowrap (state);
3659 break; 4189 break;
3660 /* case 8: - auto repeat, can't do on a per window basis */ 4190 /* case 8: - auto repeat, can't do on a per window basis */
3661 case 9: /* X10 mouse reporting */ 4191 case 9: /* X10 mouse reporting */
3662 if (state) /* orthogonal */ 4192 if (state) /* orthogonal */
3663 PrivateModes &= ~PrivMode_MouseX11; 4193 priv_modes &= ~PrivMode_MouseX11;
3664 break; 4194 break;
3665#ifdef menuBar_esc 4195#ifdef menuBar_esc
3666 case menuBar_esc: 4196 case menuBar_esc:
3667#ifdef MENUBAR 4197#ifdef MENUBAR
3668 map_menuBar (state); 4198 map_menuBar (state);
… …
3688 break; 4218 break;
3689 /* case 66: - application key pad */ 4219 /* case 66: - application key pad */
3690 /* case 67: - backspace key */ 4220 /* case 67: - backspace key */
3691 case 1000: /* X11 mouse reporting */ 4221 case 1000: /* X11 mouse reporting */
3692 if (state) /* orthogonal */ 4222 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX10; 4223 priv_modes &= ~PrivMode_MouseX10;
3694 break; 4224 break;
3695#if 0 4225#if 0
3696 case 1001: 4226 case 1001:
3697 break; /* X11 mouse highlighting */ 4227 break; /* X11 mouse highlighting */
3698#endif 4228#endif
3699 case 1010: /* scroll to bottom on TTY output inhibit */ 4229 case 1010: /* scroll to bottom on TTY output inhibit */
3700 if (state) 4230 if (!state)
3701 Options &= ~Opt_scrollTtyOutput; 4231 SET_OPTION (Opt_scrollTtyOutput);
3702 else 4232 else
3703 Options |= Opt_scrollTtyOutput; 4233 CLR_OPTION (Opt_scrollTtyOutput);
3704 break; 4234 break;
3705 case 1011: /* scroll to bottom on key press */ 4235 case 1011: /* scroll to bottom on key press */
3706 if (state) 4236 if (state)
3707 Options |= Opt_scrollTtyKeypress; 4237 SET_OPTION (Opt_scrollTtyKeypress);
3708 else 4238 else
3709 Options &= ~Opt_scrollTtyKeypress; 4239 CLR_OPTION (Opt_scrollTtyKeypress);
3710 break; 4240 break;
3711 case 1047: /* secondary screen w/ clearing last */ 4241 case 1047: /* secondary screen w/ clearing last */
3712 if (Options & Opt_secondaryScreen) 4242 if (OPTION (Opt_secondaryScreen))
3713 if (current_screen != PRIMARY) 4243 if (current_screen != PRIMARY)
3714 scr_erase_screen (2); 4244 scr_erase_screen (2);
3715 scr_change_screen (state); 4245 scr_change_screen (state);
3716 break; 4246 break;
3717 case 1049: /* secondary screen w/ clearing first */ 4247 case 1049: /* secondary screen w/ clearing first */
3718 scr_change_screen (state); 4248 scr_change_screen (state);
3719 if (Options & Opt_secondaryScreen) 4249 if (OPTION (Opt_secondaryScreen))
3720 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
3721 scr_erase_screen (2); 4251 scr_erase_screen (2);
3722 break; 4252 break;
3723 default: 4253 default:
3724 break; 4254 break;
… …
3750 rendset = 0, rendstyle = ~RS_None; 4280 rendset = 0, rendstyle = ~RS_None;
3751 break; 4281 break;
3752 case 1: 4282 case 1:
3753 rendset = 1, rendstyle = RS_Bold; 4283 rendset = 1, rendstyle = RS_Bold;
3754 break; 4284 break;
4285 //case 2: // low intensity
4286 case 3:
4287 rendset = 1, rendstyle = RS_Italic;
4288 break;
3755 case 4: 4289 case 4:
3756 rendset = 1, rendstyle = RS_Uline; 4290 rendset = 1, rendstyle = RS_Uline;
3757 break; 4291 break;
3758 case 5: 4292 case 5: // slowly blinking
4293 case 6: // rapidly blinking
3759 rendset = 1, rendstyle = RS_Blink; 4294 rendset = 1, rendstyle = RS_Blink;
3760 break; 4295 break;
3761 //case 6: // scoansi light background 4296 //case 6: // scoansi light background
3762 case 7: 4297 case 7:
3763 rendset = 1, rendstyle = RS_RVid; 4298 rendset = 1, rendstyle = RS_RVid;
3764 break; 4299 break;
3765 case 8: 4300 case 8:
3766 // invisible. NYI 4301 // invisible. NYI
3767 break; 4302 break;
4303 //case 9: // crossed out
3768 //case 10: // scoansi acs off 4304 //case 10: // scoansi acs off, primary font
3769 //case 11: // scoansi acs on 4305 //case 11: // scoansi acs on, first alt font
3770 //case 12: // scoansi acs on, |0x80 4306 //case 12: // scoansi acs on, |0x80, second alt font
3771 case 21: // disable bold, blink and invis (some terminals use this) 4307 //...
4308 //case 19: // ninth alt font
4309 //case 20: // gothic
4310 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3772 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4311 rendset = 0, rendstyle = RS_Bold;
3773 break; 4312 break;
3774 case 22: 4313 case 22: // normal intensity
3775 rendset = 0, rendstyle = RS_Bold; 4314 rendset = 0, rendstyle = RS_Bold;
4315 break;
4316 case 23: // disable italic
4317 rendset = 0, rendstyle = RS_Italic;
3776 break; 4318 break;
3777 case 24: 4319 case 24:
3778 rendset = 0, rendstyle = RS_Uline; 4320 rendset = 0, rendstyle = RS_Uline;
3779 break; 4321 break;
3780 case 25: 4322 case 25:
3781 rendset = 0, rendstyle = RS_Blink; 4323 rendset = 0, rendstyle = RS_Blink;
3782 break; 4324 break;
4325 case 26: // variable spacing (iso 8613)
4326 rendset = 0, rendstyle = RS_Blink;
4327 break;
3783 case 27: 4328 case 27:
3784 rendset = 0, rendstyle = RS_RVid; 4329 rendset = 0, rendstyle = RS_RVid;
3785 break; 4330 break;
3786 case 28:
3787 // visible. NYI 4331 //case 28: // visible. NYI
3788 break; 4332 //case 29: // not crossed-out
3789 } 4333 }
3790 4334
3791 if (rendset != -1) 4335 if (rendset != -1)
3792 { 4336 {
3793 scr_rendition (rendset, rendstyle); 4337 scr_rendition (rendset, rendstyle);
… …
3804 case 35: 4348 case 35:
3805 case 36: 4349 case 36:
3806 case 37: 4350 case 37:
3807 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4351 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3808 break; 4352 break;
3809#ifdef TTY_256COLOR 4353 case 38: // set fg color, ISO 8613-6
3810 case 38:
3811 if (nargs > i + 2 && arg[i + 1] == 5) 4354 if (nargs > i + 2 && arg[i + 1] == 5)
3812 { 4355 {
3813 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4356 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3814 i += 2; 4357 i += 2;
3815 } 4358 }
3816 break; 4359 break;
3817#endif
3818 case 39: /* default fg */ 4360 case 39: /* default fg */
3819 scr_color (Color_fg, Color_fg); 4361 scr_color (Color_fg, Color_fg);
3820 break; 4362 break;
3821 4363
3822 case 40: 4364 case 40:
… …
3827 case 45: 4369 case 45:
3828 case 46: 4370 case 46:
3829 case 47: 4371 case 47:
3830 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4372 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3831 break; 4373 break;
3832#ifdef TTY_256COLOR 4374 case 48: // set bg color, ISO 8613-6
3833 case 48:
3834 if (nargs > i + 2 && arg[i + 1] == 5) 4375 if (nargs > i + 2 && arg[i + 1] == 5)
3835 { 4376 {
3836 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4377 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3837 i += 2; 4378 i += 2;
3838 } 4379 }
3839 break; 4380 break;
3840#endif
3841 case 49: /* default bg */ 4381 case 49: /* default bg */
3842 scr_color (Color_bg, Color_bg); 4382 scr_color (Color_bg, Color_bg);
3843 break; 4383 break;
3844 4384
3845#ifndef NO_BRIGHTCOLOR 4385 //case 50: // not variable spacing
4386
4387#if ENABLE_FRILLS
3846 case 90: 4388 case 90:
3847 case 91: /* set bright fg color */ 4389 case 91: /* set bright fg color */
3848 case 92: 4390 case 92:
3849 case 93: 4391 case 93:
3850 case 94: 4392 case 94:
3851 case 95: 4393 case 95:
3852 case 96: 4394 case 96:
3853 case 97: 4395 case 97:
3854 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4396 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3855 Color_fg);
3856 break; 4397 break;
3857 case 100: 4398 case 100:
3858 case 101: /* set bright bg color */ 4399 case 101: /* set bright bg color */
3859 case 102: 4400 case 102:
3860 case 103: 4401 case 103:
3861 case 104: 4402 case 104:
3862 case 105: 4403 case 105:
3863 case 106: 4404 case 106:
3864 case 107: 4405 case 107:
3865 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4406 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3866 Color_bg);
3867 break; 4407 break;
3868#endif 4408#endif
3869
3870 } 4409 }
3871 } 4410 }
3872} 4411}
3873/*}}} */ 4412/*}}} */
3874 4413
… …
3878{ 4417{
3879 unicode_t ch, cmd = cmd_getc (); 4418 unicode_t ch, cmd = cmd_getc ();
3880 4419
3881 if (cmd == 'Q') 4420 if (cmd == 'Q')
3882 { /* query graphics */ 4421 { /* query graphics */
3883 tt_printf ("\033G0\n"); /* no graphics */ 4422 tt_printf ("\033G0\012"); /* no graphics */
3884 return; 4423 return;
3885 } 4424 }
3886 /* swallow other graphics sequences until terminating ':' */ 4425 /* swallow other graphics sequences until terminating ':' */
3887 do 4426 do
3888 ch = cmd_getc (); 4427 ch = cmd_getc ();
… …
3898 */ 4437 */
3899void 4438void
3900rxvt_term::tt_printf (const char *fmt,...) 4439rxvt_term::tt_printf (const char *fmt,...)
3901{ 4440{
3902 va_list arg_ptr; 4441 va_list arg_ptr;
3903 unsigned char buf[256]; 4442 char buf[256];
3904 4443
3905 va_start (arg_ptr, fmt); 4444 va_start (arg_ptr, fmt);
3906 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4445 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3907 va_end (arg_ptr); 4446 va_end (arg_ptr);
3908 tt_write (buf, STRLEN (buf)); 4447 tt_write (buf, strlen (buf));
3909} 4448}
3910 4449
3911/* ---------------------------------------------------------------------- */ 4450/* ---------------------------------------------------------------------- */
3912/* Write data to the pty as typed by the user, pasted with the mouse, 4451/* Write data to the pty as typed by the user, pasted with the mouse,
3913 * or generated by us in response to a query ESC sequence. 4452 * or generated by us in response to a query ESC sequence.
3914 */ 4453 */
4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455
3915void 4456void
3916rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4457rxvt_term::tt_write (const char *data, unsigned int len)
3917{ 4458{
3918 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4459 if (pty.pty < 0)
4460 return;
3919 4461
3920 if (len) 4462 if (v_buflen == 0)
4463 {
4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4465
4466 if ((unsigned int)written == len)
4467 return;
4468
4469 data += written;
4470 len -= written;
3921 { 4471 }
4472
4473 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4474
4475 memcpy (v_buffer + v_buflen, data, len);
4476 v_buflen += len;
4477
4478 pty_ev.set (EVENT_READ | EVENT_WRITE);
4479}
4480
4481void rxvt_term::pty_write ()
4482{
4483 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4484
4485 if (written > 0)
4486 {
4487 v_buflen -= written;
4488
3922 if (v_buflen == 0) 4489 if (v_buflen == 0)
3923 { 4490 {
3924 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3925
3926 if ((unsigned int)written == len)
3927 return;
3928
3929 data += written;
3930 len -= written;
3931 }
3932
3933
3934 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3935
3936 memcpy (v_buffer + v_buflen, data, len);
3937 v_buflen += len;
3938 }
3939
3940 for (;;)
3941 {
3942 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3943
3944 if (written > 0)
3945 {
3946 v_buflen -= written;
3947
3948 if (v_buflen == 0)
3949 {
3950 free (v_buffer); 4491 free (v_buffer);
3951 v_buffer = 0; 4492 v_buffer = 0;
3952 v_buflen = 0; 4493 v_buflen = 0;
3953 4494
3954 pty_ev.set (EVENT_READ); 4495 pty_ev.set (EVENT_READ);
3955 return;
3956 }
3957
3958 memmove (v_buffer, v_buffer + written, v_buflen);
3959 }
3960 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3961 // original code just ignores this...
3962 destroy ();
3963 else
3964 {
3965 pty_ev.set (EVENT_READ | EVENT_WRITE);
3966 return; 4496 return;
3967 } 4497 }
4498
4499 memmove (v_buffer, v_buffer + written, v_buflen);
3968 } 4500 }
4501 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4502 pty_ev.set (EVENT_READ);
3969} 4503}
3970 4504
3971/*----------------------- end-of-file (C source) -----------------------*/ 4505/*----------------------- end-of-file (C source) -----------------------*/
3972 4506

Diff Legend

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