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

Diff Legend

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