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.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.229 by root, Tue Jan 3 17:34:44 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 ();
799} 1147}
800 1148
801void 1149void
802rxvt_term::pointer_unblank () 1150rxvt_term::pointer_unblank ()
803{ 1151{
804 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1152 XDefineCursor (display->display, vt, TermWin_cursor);
805 recolour_cursor (); 1153 recolour_cursor ();
806 1154
807#ifdef POINTER_BLANK 1155#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1156 hidden_pointer = 0;
809 1157
810 if (Options & Opt_pointerBlank) 1158 if (OPTION (Opt_pointerBlank))
811 pointer_ev.start (NOW + pointerBlankDelay); 1159 pointer_ev.start (NOW + pointerBlankDelay);
812#endif 1160#endif
813} 1161}
814 1162
815#ifdef POINTER_BLANK 1163#ifdef POINTER_BLANK
816void 1164void
817rxvt_term::pointer_blank () 1165rxvt_term::pointer_blank ()
818{ 1166{
819 if (! (Options & Opt_pointerBlank)) 1167 if (! OPTION (Opt_pointerBlank))
820 return; 1168 return;
821 1169
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1170 XDefineCursor (display->display, vt, display->blank_cursor);
823 XFlush (display->display); 1171 XFlush (display->display);
824 1172
825 hidden_pointer = 1; 1173 hidden_pointer = 1;
826} 1174}
827 1175
… …
844 x = ev.x; 1192 x = ev.x;
845 y = ev.y; 1193 y = ev.y;
846 pixel_position (&x, &y); 1194 pixel_position (&x, &y);
847 1195
848 if (MEvent.button == AnyButton) 1196 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1197 button_number = 3;
851 }
852 else 1198 else
853 { 1199 {
854 button_number = MEvent.button - Button1; 1200 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1201 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1202 if (button_number >= 3)
857 button_number += (64 - 3); 1203 button_number += (64 - 3);
858 } 1204 }
859 1205
860 if (PrivateModes & PrivMode_MouseX10) 1206 if (priv_modes & PrivMode_MouseX10)
861 { 1207 {
862 /* 1208 /*
863 * do not report ButtonRelease 1209 * do not report ButtonRelease
864 * no state info allowed 1210 * no state info allowed
865 */ 1211 */
… …
880 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1226 + ((MEvent.state & ModMetaMask) ? 8 : 0)
881 + ((MEvent.state & ControlMask) ? 16 : 0); 1227 + ((MEvent.state & ControlMask) ? 16 : 0);
882#ifdef MOUSE_REPORT_DOUBLECLICK 1228#ifdef MOUSE_REPORT_DOUBLECLICK
883 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1229 key_state += ((MEvent.clicks > 1) ? 32 : 0);
884#endif 1230#endif
885
886 } 1231 }
887 1232
888#ifdef DEBUG_MOUSEREPORT 1233#if DEBUG_MOUSEREPORT
889 fprintf (stderr, "Mouse ["); 1234 fprintf (stderr, "Mouse [");
890 if (key_state & 16) 1235 if (key_state & 16)
891 fputc ('C', stderr); 1236 fputc ('C', stderr);
892 if (key_state & 4) 1237 if (key_state & 4)
893 fputc ('S', stderr); 1238 fputc ('S', stderr);
… …
897 fputc ('2', stderr); 1242 fputc ('2', stderr);
898 fprintf (stderr, "]: <%d>, %d/%d\n", 1243 fprintf (stderr, "]: <%d>, %d/%d\n",
899 button_number, 1244 button_number,
900 x + 1, 1245 x + 1,
901 y + 1); 1246 y + 1);
902#else 1247#endif
1248
903 tt_printf ("\033[M%c%c%c", 1249 tt_printf ("\033[M%c%c%c",
904 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
905 (32 + x + 1), 1251 (32 + x + 1),
906 (32 + y + 1)); 1252 (32 + y + 1));
907#endif
908} 1253}
909 1254
910#ifdef USING_W11LIB 1255#ifdef USING_W11LIB
911void 1256void
912rxvt_W11_process_x_event (XEvent *ev) 1257rxvt_W11_process_x_event (XEvent *ev)
… …
919 1264
920/*{{{ process an X event */ 1265/*{{{ process an X event */
921void 1266void
922rxvt_term::x_cb (XEvent &ev) 1267rxvt_term::x_cb (XEvent &ev)
923{ 1268{
1269 dDisp;
1270
924 SET_R (this); 1271 SET_R (this);
925 SET_LOCALE (locale); 1272 SET_LOCALE (locale);
926 1273
927#if defined(CURSOR_BLINK) 1274#if defined(CURSOR_BLINK)
928 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
929 { 1276 {
930 if (hidden_cursor) 1277 if (hidden_cursor)
931 { 1278 {
932 hidden_cursor = 0; 1279 hidden_cursor = 0;
933 want_refresh = 1; 1280 want_refresh = 1;
… …
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
937 } 1284 }
938#endif 1285#endif
939 1286
940#if defined(POINTER_BLANK) 1287#if defined(POINTER_BLANK)
941 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
942 { 1289 {
943 if (ev.type == MotionNotify 1290 if (ev.type == MotionNotify
944 || ev.type == ButtonPress 1291 || ev.type == ButtonPress
945 || ev.type == ButtonRelease) 1292 || ev.type == ButtonRelease)
946 if (hidden_pointer) 1293 if (hidden_pointer)
… …
949 if (ev.type == KeyPress && hidden_pointer == 0) 1296 if (ev.type == KeyPress && hidden_pointer == 0)
950 pointer_blank (); 1297 pointer_blank ();
951 } 1298 }
952#endif 1299#endif
953 1300
954#ifdef USE_XIM
955 if (XFilterEvent (&ev, None))
956 return;
957#endif
958
959 Window unused_root, unused_child; 1301 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1302 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1303 unsigned int unused_mask;
962
963#ifdef DEBUG_X
964 const char *const eventnames[] =
965 { /* mason - this matches my system */
966 "",
967 "",
968 "KeyPress",
969 "KeyRelease",
970 "ButtonPress",
971 "ButtonRelease",
972 "MotionNotify",
973 "EnterNotify",
974 "LeaveNotify",
975 "FocusIn",
976 "FocusOut",
977 "KeymapNotify",
978 "Expose",
979 "GraphicsExpose",
980 "NoExpose",
981 "VisibilityNotify",
982 "CreateNotify",
983 "DestroyNotify",
984 "UnmapNotify",
985 "MapNotify",
986 "MapRequest",
987 "ReparentNotify",
988 "ConfigureNotify",
989 "ConfigureRequest",
990 "GravityNotify",
991 "ResizeRequest",
992 "CirculateNotify",
993 "CirculateRequest",
994 "PropertyNotify",
995 "SelectionClear",
996 "SelectionRequest",
997 "SelectionNotify",
998 "ColormapNotify",
999 "ClientMessage",
1000 "MappingNotify"
1001 };
1002#endif
1003
1004#ifdef DEBUG_X
1005 struct timeval tp;
1006 struct tm *ltt;
1007 (void)gettimeofday (&tp, NULL);
1008 ltt = localtime (& (tp.tv_sec));
1009 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));
1010#endif
1011 1304
1012 switch (ev.type) 1305 switch (ev.type)
1013 { 1306 {
1014 case KeyPress: 1307 case KeyPress:
1308#if ISO_14755
1309 if (!(iso14755buf & ISO_14755_52))
1310#endif
1015 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;
1016 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
1017 1376
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease:
1020 {
1021 if (!(ev.xkey.state & ControlMask)) 1378 if (!(ev.xkey.state & ControlMask))
1022 slip_wheel_ev.stop (); 1379 slip_wheel_ev.stop ();
1023 else
1024 {
1025 KeySym ks;
1026
1027 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1028 if (ks == XK_Control_L || ks == XK_Control_R) 1380 else if (ks == XK_Control_L || ks == XK_Control_R)
1029 mouse_slip_wheel_speed = 0; 1381 mouse_slip_wheel_speed = 0;
1030 } 1382#endif
1031 break; 1383 break;
1032 } 1384 }
1033#endif
1034 1385
1035 case ButtonPress: 1386 case ButtonPress:
1036 button_press (ev.xbutton); 1387 button_press (ev.xbutton);
1037 break; 1388 break;
1038 1389
… …
1040 button_release (ev.xbutton); 1391 button_release (ev.xbutton);
1041 break; 1392 break;
1042 1393
1043 case ClientMessage: 1394 case ClientMessage:
1044 if (ev.xclient.format == 32 1395 if (ev.xclient.format == 32
1396 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1397 {
1045 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1398 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1046 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
1047#ifdef OFFIX_DND 1416#ifdef OFFIX_DND
1048 /* OffiX Dnd (drag 'n' drop) protocol */ 1417 /* OffiX Dnd (drag 'n' drop) protocol */
1049 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1418 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1050 && (ev.xclient.data.l[0] == DndFile 1419 && (ev.xclient.data.l[0] == DndFile
1051 || ev.xclient.data.l[0] == DndDir 1420 || ev.xclient.data.l[0] == DndDir
1052 || ev.xclient.data.l[0] == DndLink)) 1421 || ev.xclient.data.l[0] == DndLink))
1053 { 1422 {
1054 /* Get Dnd data */ 1423 /* Get Dnd data */
1055 Atom ActualType; 1424 Atom ActualType;
1056 int ActualFormat; 1425 int ActualFormat;
1057 unsigned char *data; 1426 unsigned char *data;
1058 unsigned long Size, RemainingBytes; 1427 unsigned long Size, RemainingBytes;
1059 1428
1060 XGetWindowProperty (display->display, display->root, 1429 XGetWindowProperty (disp, display->root,
1061 xa[XA_DNDSELECTION], 1430 xa[XA_DNDSELECTION],
1062 0L, 1000000L, 1431 0L, 1000000L,
1063 False, AnyPropertyType, 1432 False, AnyPropertyType,
1064 &ActualType, &ActualFormat, 1433 &ActualType, &ActualFormat,
1065 &Size, &RemainingBytes, 1434 &Size, &RemainingBytes,
1066 &data); 1435 &data);
1067 XChangeProperty (display->display, display->root, 1436 set_string_property (XA_CUT_BUFFER0, data);
1068 XA_CUT_BUFFER0, XA_STRING,
1069 8, PropModeReplace,
1070 data, STRLEN (data));
1071 XFree (data); 1437 XFree (data);
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1438 selection_paste (display->root, XA_CUT_BUFFER0, true);
1073 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1439 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1074 } 1440 }
1075#endif /* OFFIX_DND */ 1441#endif /* OFFIX_DND */
1076 break; 1442 break;
1077 1443
1078 case MappingNotify: 1444 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping)); 1445 XRefreshKeyboardMapping (&ev.xmapping);
1080 break; 1446 break;
1081 1447
1082 /* 1448 /*
1083 * XXX: this is not the _current_ arrangement 1449 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1450 * Here's my conclusion:
… …
1103 break; 1469 break;
1104 } 1470 }
1105 break; 1471 break;
1106 1472
1107 case FocusIn: 1473 case FocusIn:
1108 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])
1109 { 1483 {
1110 TermWin.focus = 1; 1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1111 want_refresh = 1; 1485 ;
1112#ifdef USE_XIM 1486
1113 if (Input_Context != NULL) 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1114 XSetICFocus (Input_Context);
1115#endif
1116#ifdef CURSOR_BLINK
1117 if (Options & Opt_cursorBlink)
1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1119#endif
1120#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade])
1122 { 1488 {
1123 PixColors = PixColorsFocused; 1489 seen_resize = 1;
1124 set_colorfgbg (); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1125 scr_clear ();
1126 scr_touch (true);
1127 } 1491 }
1128#endif
1129 1492
1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1494 if (OPTION (Opt_transparent))
1495 check_our_parents ();
1496#endif
1130 } 1497 }
1131 break; 1498 break;
1132 1499
1133 case FocusOut:
1134 if (TermWin.focus)
1135 {
1136 TermWin.focus = 0;
1137 want_refresh = 1;
1138#ifdef USE_XIM
1139 if (Input_Context != NULL)
1140 XUnsetICFocus (Input_Context);
1141#endif
1142#ifdef CURSOR_BLINK
1143 if (Options & Opt_cursorBlink)
1144 cursor_blink_ev.stop ();
1145 hidden_cursor = 0;
1146#endif
1147#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade])
1149 {
1150 PixColors = PixColorsUnFocused;
1151 set_colorfgbg ();
1152 scr_clear ();
1153 scr_touch (true);
1154 }
1155#endif
1156
1157 }
1158 break;
1159
1160 case ConfigureNotify: 1500 case PropertyNotify:
1161 if (ev.xconfigure.window == TermWin.parent[0]) 1501 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1162 { 1502 && ev.xproperty.state == PropertyNewValue)
1163 int height, width; 1503 selection_property (ev.xproperty.window, ev.xproperty.atom);
1164 1504
1165 do
1166 { /* Wrap lots of configures into one */
1167 width = ev.xconfigure.width;
1168 height = ev.xconfigure.height;
1169 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1170 }
1171 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1172
1173 if (szHint.width != width || szHint.height != height)
1174 {
1175 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1176 resize_all_windows (width, height, 1);
1177 }
1178#ifdef DEBUG_SIZE
1179 else
1180 {
1181 D_SIZE ((stderr, "Size: Not resizing"));
1182 }
1183#endif
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1185 if (Options & Opt_transparent)
1186 {
1187 check_our_parents ();
1188 if (am_transparent)
1189 want_full_refresh = 1;
1190 }
1191#endif
1192 }
1193 break; 1505 break;
1194 1506
1195 case SelectionClear: 1507 case SelectionClear:
1196 selection_clear (); 1508 selection_clear ();
1197 break; 1509 break;
1198 1510
1199 case SelectionNotify: 1511 case SelectionNotify:
1200 if (selection_wait == Sel_normal) 1512 if (selection_wait == Sel_normal)
1201 selection_paste (ev.xselection.requestor, 1513 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1202 ev.xselection.property, True);
1203 break; 1514 break;
1204 1515
1205 case SelectionRequest: 1516 case SelectionRequest:
1206 selection_send (ev.xselectionrequest); 1517 selection_send (ev.xselectionrequest);
1207 break; 1518 break;
1208 1519
1209 case UnmapNotify: 1520 case UnmapNotify:
1210 TermWin.mapped = 0; 1521 mapped = 0;
1211#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1212 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1213#endif 1524#endif
1214 break; 1525 break;
1215 1526
1216 case MapNotify: 1527 case MapNotify:
1217 TermWin.mapped = 1; 1528 mapped = 1;
1218#ifdef TEXT_BLINK 1529#ifdef TEXT_BLINK
1219 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1220#endif 1531#endif
1221 break; 1532 break;
1222 1533
… …
1226 break; 1537 break;
1227#endif /* TRANSPARENT */ 1538#endif /* TRANSPARENT */
1228 1539
1229 case GraphicsExpose: 1540 case GraphicsExpose:
1230 case Expose: 1541 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1542 if (ev.xany.window == vt)
1232 { 1543 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1544 do
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1236#else 1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1237 // 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))
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1240 //scr_expose (ev.xexpose.x, 0, 1554
1241 // ev.xexpose.width, TermWin.height, False); 1555 scr_refresh (refresh_type);
1242#endif
1243 want_refresh = 1;
1244 } 1556 }
1245 else 1557 else
1246 { 1558 {
1247 XEvent unused_event; 1559 XEvent unused_event;
1248 1560
1249 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1250 ; 1562 ;
1251 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1252 ; 1564 ;
1253 1565
1254 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1255 { 1567 {
1256 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
… …
1258 } 1570 }
1259#ifdef MENUBAR 1571#ifdef MENUBAR
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1261 menubar_expose (); 1573 menubar_expose ();
1262#endif 1574#endif
1575
1576#ifdef TRANSPARENT
1577 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window);
1579#endif
1263 } 1580 }
1264 break; 1581 break;
1265 1582
1266 case MotionNotify: 1583 case MotionNotify:
1267#ifdef POINTER_BLANK 1584#ifdef POINTER_BLANK
… …
1273 { 1590 {
1274 menubar_control (ev.xbutton); 1591 menubar_control (ev.xbutton);
1275 break; 1592 break;
1276 } 1593 }
1277#endif 1594#endif
1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1279 break; 1596 break;
1280 1597
1281 if (ev.xany.window == TermWin.vt) 1598 if (ev.xany.window == vt)
1282 { 1599 {
1283 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1600 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1601 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1286 ; 1603 ;
1287 1604
1288 XQueryPointer (display->display, TermWin.vt, 1605 XQueryPointer (disp, vt,
1289 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1608 &ev.xbutton.x, &ev.xbutton.y,
1292 &unused_mask); 1609 &ev.xbutton.state);
1293#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1613 {
1297#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
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1623 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1624 ev.xbutton.state & Button3Mask ? 2 : 0);
1625
1300#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1303 { 1629 {
1304 int dist; 1630 int dist;
1305 1631
1306 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1307 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
… …
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1311 1637
1312 /* save the event params so we can highlight 1638 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1639 * the selection in the pending-scroll loop
1314 */ 1640 */
1315 selection_save_x=ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1642 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1643 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1644
1320 /* calc number of lines to scroll */ 1645 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1646 if (ev.xbutton.y < int_bwidth)
1322 { 1647 {
1323 scroll_selection_dir = UP; 1648 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1325 } 1650 }
1326 else 1651 else
1327 { 1652 {
1328 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y - 1654 dist = ev.xbutton.y - (int_bwidth + height);
1330 (TermWin.int_bwidth + TermWin.height);
1331 } 1655 }
1656
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1657 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1659 + 1;
1334 MIN_IT (scroll_selection_lines, 1660 min_it (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1661 SELECTION_SCROLL_MAX_LINES);
1336 } 1662 }
1337 else 1663 else
1338 { 1664 {
1339 /* we are within the text window, so we 1665 /* we are within the text window, so we
1340 * shouldn't be scrolling 1666 * shouldn't be scrolling
… …
1342 if (sel_scroll_ev.active) 1668 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1669 sel_scroll_ev.stop();
1344 } 1670 }
1345#endif 1671#endif
1346#ifdef MOUSE_THRESHOLD 1672#ifdef MOUSE_THRESHOLD
1347
1348 } 1673 }
1349#endif 1674#endif
1350
1351 } 1675 }
1352 } 1676 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1354 { 1678 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1679 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1356 MotionNotify, &ev)) ; 1680 MotionNotify, &ev))
1681 ;
1682
1357 XQueryPointer (display->display, scrollBar.win, 1683 XQueryPointer (disp, scrollBar.win,
1358 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1686 &ev.xbutton.x, &ev.xbutton.y,
1361 &unused_mask); 1687 &unused_mask);
1362 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1363 scrollbar_size ()); 1689 scrollbar_size ());
1364 scr_refresh (refresh_type); 1690 scr_refresh (refresh_type);
1365 refresh_limit = 0; 1691 refresh_limit = 0;
… …
1368 break; 1694 break;
1369 } 1695 }
1370} 1696}
1371 1697
1372void 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
1373rxvt_term::rootwin_cb (XEvent &ev) 1769rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1770{
1375 SET_R (this); 1771 SET_R (this);
1376 SET_LOCALE (locale); 1772 SET_LOCALE (locale);
1377 1773
1378 switch (ev.type) 1774 switch (ev.type)
1379 { 1775 {
1380 case PropertyNotify: 1776 case PropertyNotify:
1381 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1382 {
1383 if (ev.xproperty.state == PropertyNewValue)
1384 selection_property (ev.xproperty.window, ev.xproperty.atom);
1385 break;
1386 }
1387#ifdef TRANSPARENT
1388 else
1389 {
1390 /* 1777 /*
1391 * 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,
1392 * 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.
1393 */ 1780 */
1394 if (xa[XA_XROOTPMAPID] == 0)
1395 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1396
1397 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])
1398 return; 1783 return;
1399 }
1400 1784
1401 /* FALLTHROUGH */ 1785 /* FALLTHROUGH */
1402 case ReparentNotify: 1786 case ReparentNotify:
1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1404 want_full_refresh = 1; 1788 want_refresh = want_full_refresh = 1;
1405 break; 1789 break;
1406#endif
1407 } 1790 }
1408} 1791}
1792#endif
1409 1793
1410void 1794void
1411rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
1412{ 1796{
1413 int reportmode = 0, clickintime; 1797 int reportmode = 0, clickintime;
1414 1798
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1800
1416 if (!bypass_keystate) 1801 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1802 reportmode = !! (priv_modes & PrivMode_mouse_report);
1803
1418 /* 1804 /*
1419 * VT window processing of button press 1805 * VT window processing of button press
1420 */ 1806 */
1421 if (ev.window == TermWin.vt) 1807 if (ev.window == vt)
1422 { 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
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1818 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1819
1424 if (reportmode) 1820 if (reportmode)
1425 { 1821 {
1426 /* mouse report from vt window */ 1822 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1823 /* save the xbutton state (for ButtonRelease) */
1428 MEvent.state = ev.state; 1824 MEvent.state = ev.state;
… …
1457 } 1853 }
1458 else 1854 else
1459 { 1855 {
1460 if (ev.button != MEvent.button) 1856 if (ev.button != MEvent.button)
1461 MEvent.clicks = 0; 1857 MEvent.clicks = 0;
1858
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1462 switch (ev.button) 1860 switch (ev.button)
1463 { 1861 {
1464 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
1465 /* allow shift+left click to extend selection */ 1871 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1467 { 1873 {
1468 if (MEvent.button == Button1 && clickintime) 1874 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1875 selection_rotate (ev.x, ev.y);
1470 else 1876 else
1471 selection_extend (ev.x, ev.y, 1); 1877 selection_extend (ev.x, ev.y, 1);
1472 } 1878 }
1473 else 1879 else
1474 { 1880 {
1475 if (MEvent.button == Button1 && clickintime) 1881 if (MEvent.button == Button1 && clickintime)
1476 MEvent.clicks++; 1882 MEvent.clicks++;
1477 else 1883 else
1478 MEvent.clicks = 1; 1884 MEvent.clicks = 1;
1479 1885
1480 selection_click (MEvent.clicks, ev.x, ev.y); 1886 selection_click (MEvent.clicks, ev.x, ev.y);
1481 } 1887 }
1482 1888
1483 MEvent.button = Button1; 1889 MEvent.button = Button1;
1484 break; 1890 break;
1485 1891
1486 case Button3: 1892 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1893 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1894 selection_rotate (ev.x, ev.y);
1489 else 1895 else
1490 selection_extend (ev.x, ev.y, 1); 1896 selection_extend (ev.x, ev.y, 1);
1897
1491 MEvent.button = Button3; 1898 MEvent.button = Button3;
1492 break; 1899 break;
1493 } 1900 }
1494 } 1901 }
1902
1495 MEvent.time = ev.time; 1903 MEvent.time = ev.time;
1496 return; 1904 return;
1497 } 1905 }
1498 1906
1499 /* 1907 /*
… …
1591 break; 1999 break;
1592 case R_SB_ALIGN_BOTTOM: 2000 case R_SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 2001 csrO = scrollBar.bot - scrollBar.top;
1594 break; 2002 break;
1595 } 2003 }
2004
1596 if (scrollBar.style == R_SB_XTERM 2005 if (scrollBar.style == R_SB_XTERM
1597 || scrollbar_above_slider (ev.y) 2006 || scrollbar_above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 2007 || scrollbar_below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 2008 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1600 scrollbar_size ()); 2009
1601 scrollBar.setMotion (); 2010 scrollBar.setMotion ();
1602 break; 2011 break;
1603 2012
1604 case Button1: 2013 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2014 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1609 case Button3: 2018 case Button3:
1610 if (scrollBar.style != R_SB_XTERM) 2019 if (scrollBar.style != R_SB_XTERM)
1611 { 2020 {
1612 if (scrollbar_above_slider (ev.y)) 2021 if (scrollbar_above_slider (ev.y))
1613# ifdef RXVT_SCROLL_FULL 2022# ifdef RXVT_SCROLL_FULL
1614 scr_page (UP, TermWin.nrow - 1); 2023 scr_page (UP, nrow - 1);
1615# else 2024# else
1616 scr_page (UP, TermWin.nrow / 4); 2025 scr_page (UP, nrow / 4);
1617# endif 2026# endif
1618 else if (scrollbar_below_slider (ev.y)) 2027 else if (scrollbar_below_slider (ev.y))
1619# ifdef RXVT_SCROLL_FULL 2028# ifdef RXVT_SCROLL_FULL
1620 scr_page (DN, TermWin.nrow - 1); 2029 scr_page (DN, nrow - 1);
1621# else 2030# else
1622 scr_page (DN, TermWin.nrow / 4); 2031 scr_page (DN, nrow / 4);
1623# endif 2032# endif
1624 else 2033 else
1625 scrollBar.setMotion (); 2034 scrollBar.setMotion ();
1626 } 2035 }
1627 else 2036 else
1628 { 2037 {
1629 scr_page ((ev.button == Button1 ? DN : UP), 2038 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 2039 (nrow
1631 * scrollbar_position (ev.y) 2040 * scrollbar_position (ev.y)
1632 / scrollbar_size ())); 2041 / scrollbar_size ()));
1633 } 2042 }
2043
1634 break; 2044 break;
1635 } 2045 }
1636 } 2046 }
1637 return; 2047 return;
1638 } 2048 }
… …
1650{ 2060{
1651 int reportmode = 0; 2061 int reportmode = 0;
1652 2062
1653 csrO = 0; /* reset csr Offset */ 2063 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 2064 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2065 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 2066
1657 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
1658 { 2068 {
1659 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
1660 scrollbar_show (0); 2070 scrollbar_show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH; 2072 refresh_type &= ~SMOOTH_REFRESH;
1663#endif 2073#endif
1664
1665 } 2074 }
2075
1666#ifdef SELECTION_SCROLLING 2076#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active) 2077 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 2078 sel_scroll_ev.stop();
1669#endif 2079#endif
2080
1670 if (ev.window == TermWin.vt) 2081 if (ev.window == vt)
1671 { 2082 {
2083#if ISO_14755
2084 // 5.4
2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2086 return;
2087#endif
1672 if (reportmode) 2088 if (reportmode)
1673 { 2089 {
1674 /* mouse report from vt window */ 2090 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 2091 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 2092 if (ev.button >= 4)
… …
1690 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
1691 mouse_report (ev); 2107 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 2109 return;
1694 } 2110 }
2111
1695 /* 2112 /*
1696 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 2114 * when overriding mouse reporting
1698 */ 2115 */
1699 if (PrivateModes & PrivMode_mouse_report 2116 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 2117 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 2118 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 2119 selection_extend (ev.x, ev.y, 0);
1703 2120
1704 switch (ev.button) 2121 switch (ev.button)
… …
1719 2136
1720 v = ev.button == Button4 ? UP : DN; 2137 v = ev.button == Button4 ? UP : DN;
1721 2138
1722 if (ev.state & ShiftMask) 2139 if (ev.state & ShiftMask)
1723 i = 1; 2140 i = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2141 else if (OPTION (Opt_mouseWheelScrollPage))
1725 i = TermWin.nrow - 1; 2142 i = nrow - 1;
1726 else 2143 else
1727 i = 5; 2144 i = 5;
1728 2145
1729# ifdef MOUSE_SLIP_WHEELING 2146# ifdef MOUSE_SLIP_WHEELING
1730 if (ev.state & ControlMask) 2147 if (ev.state & ControlMask)
1731 { 2148 {
1732 mouse_slip_wheel_speed += v ? -1 : 1; 2149 mouse_slip_wheel_speed += v ? -1 : 1;
1733 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1734 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1735 2152
1736 if (slip_wheel_ev.at < NOW) 2153 if (slip_wheel_ev.at < NOW)
1737 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2154 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1738 2155
1739 slip_wheel_ev.start (); 2156 slip_wheel_ev.start ();
… …
1767#endif 2184#endif
1768} 2185}
1769 2186
1770#ifdef TRANSPARENT 2187#ifdef TRANSPARENT
1771#if TINTING 2188#if TINTING
1772/* shading taken from eterm-0.9.2 */ 2189/* taken from aterm-0.4.2 */
1773/* RGB 15 */
1774 2190
1775static void 2191typedef uint32_t RUINT32T;
1776shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1777{
1778 unsigned char *ptr;
1779 int x, y;
1780 2192
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2193void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2194{
1783 /* No saturation */ 2195 int sh_r, sh_g, sh_b;
1784 for (y = h; --y >= 0;) { 2196 RUINT32T mask_r, mask_g, mask_b;
1785 for (x = -w; x < 0; x++) { 2197 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1786 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;
1787 2201
1788 b = ((uint16_t *) ptr)[x]; 2202 Visual *visual = display->visual;
1789 r = (b & 0x7c00) * rm; 2203
1790 g = (b & 0x3e0) * gm; 2204 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1791 b = (b & 0x1f) * bm; 2205
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2206 /* for convenience */
1793 | ((g >> 8) & 0x3e0) 2207 mask_r = visual->red_mask;
1794 | ((b >> 8) & 0x1f); 2208 mask_g = visual->green_mask;
1795 } 2209 mask_b = visual->blue_mask;
1796 ptr += bpl; 2210
1797 } 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;
1798 } else { 2284 } else {
1799 for (y = h; --y >= 0;) { 2285 if (shade < 0) shade = 0;
1800 for (x = -w; x < 0; x++) { 2286 if (shade > 100) shade = 100;
1801 int r, g, b;
1802 2287
1803 b = ((uint16_t *) ptr)[x]; 2288 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1804 r = (b & 0x7c00) * rm; 2289
1805 g = (b & 0x3e0) * gm; 2290 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1806 b = (b & 0x1f) * bm; 2291 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1807 r |= (!(r >> 15) - 1); 2292 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1808 g |= (!(g >> 10) - 1); 2293 }
1809 b |= (!(b >> 5) - 1); 2294
1810 ((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 */
1811 | ((g >> 8) & 0x3e0) 2296 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1812 | ((b >> 8) & 0x1f); 2297 {
1813 } 2298 unsigned int tmp;
1814 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++)
1815 } 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);
1816 } 2351 }
1817} 2352 break;
1818 2353 }
1819/* RGB 16 */ 2354 case 16:
1820static void 2355 {
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2356 unsigned short *p1, *pf, *p, *pl;
1822{ 2357 p1 = (unsigned short *) srcImage->data;
1823 unsigned char *ptr; 2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1824 int x, y; 2359 while (p1 < pf)
1825 2360 {
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2361 p = p1;
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2362 pl = p1 + srcImage->width;
1828 /* No saturation */ 2363 for (; p < pl; p++)
1829 for (y = h; --y >= 0;) {
1830 for (x = -w; x < 0; x++) {
1831 int r, g, b;
1832
1833 b = ((uint16_t *) ptr)[x];
1834 r = (b & 0xf800) * rm;
1835 g = (b & 0x7e0) * gm;
1836 b = (b & 0x1f) * bm;
1837 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1838 | ((g >> 8) & 0x7e0)
1839 | ((b >> 8) & 0x1f);
1840 }
1841 ptr += bpl;
1842 } 2364 {
1843 } else { 2365 *p = lookup_r[(*p & 0xf800)>>11] |
1844 for (y = h; --y >= 0;) { 2366 lookup_g[(*p & 0x07e0)>> 5] |
1845 for (x = -w; x < 0; x++) { 2367 lookup_b[(*p & 0x001f)];
1846 int r, g, b;
1847
1848 b = ((uint16_t *) ptr)[x];
1849 r = (b & 0xf800) * rm;
1850 g = (b & 0x7e0) * gm;
1851 b = (b & 0x1f) * bm;
1852 r |= (!(r >> 16) - 1);
1853 g |= (!(g >> 11) - 1);
1854 b |= (!(b >> 5) - 1);
1855 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1856 | ((g >> 8) & 0x7e0)
1857 | ((b >> 8) & 0x1f);
1858 } 2368 }
1859 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)
1860 } 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);
1861 } 2389 }
1862} 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);
1863 2397
1864/* RGB 24 */ 2398 while (p1 < pf)
1865static void 2399 {
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2400 p = p1;
1867{ 2401 pl = p1 + srcImage->width;
1868 unsigned char *ptr; 2402 for (; p < pl; p++)
1869 int x, y;
1870
1871 ptr = (unsigned char *)data + (w * 3);
1872 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1873 /* No saturation */
1874 for (y = h; --y >= 0;) {
1875 for (x = -(w * 3); x < 0; x += 3) {
1876 int r, g, b;
1877
1878 if (byteorder.big_endian()) {
1879 r = (ptr[x + 0] * rm) >> 8;
1880 g = (ptr[x + 1] * gm) >> 8;
1881 b = (ptr[x + 2] * bm) >> 8;
1882 ptr[x + 0] = r;
1883 ptr[x + 1] = g;
1884 ptr[x + 2] = b;
1885 } else {
1886 r = (ptr[x + 2] * rm) >> 8;
1887 g = (ptr[x + 1] * gm) >> 8;
1888 b = (ptr[x + 0] * bm) >> 8;
1889 ptr[x + 2] = r;
1890 ptr[x + 1] = g;
1891 ptr[x + 0] = b;
1892 }
1893 }
1894 ptr += bpl;
1895 } 2403 {
1896 } else { 2404 *p = lookup_r[(*p & 0xff0000)>>16] |
1897 for (y = h; --y >= 0;) { 2405 lookup_g[(*p & 0x00ff00)>> 8] |
1898 for (x = -(w * 3); x < 0; x += 3) { 2406 lookup_b[(*p & 0x0000ff)] |
1899 int r, g, b; 2407 (*p & ~0xffffff);
1900
1901 if (byteorder.big_endian()) {
1902 r = (ptr[x + 0] * rm) >> 8;
1903 g = (ptr[x + 1] * gm) >> 8;
1904 b = (ptr[x + 2] * bm) >> 8;
1905
1906 r |= (!(r >> 8) - 1);
1907 g |= (!(g >> 8) - 1);
1908 b |= (!(b >> 8) - 1);
1909
1910 ptr[x + 0] = r;
1911 ptr[x + 1] = g;
1912 ptr[x + 2] = b;
1913 } else {
1914 r = (ptr[x + 2] * rm) >> 8;
1915 g = (ptr[x + 1] * gm) >> 8;
1916 b = (ptr[x + 0] * bm) >> 8;
1917
1918 r |= (!(r >> 8) - 1);
1919 g |= (!(g >> 8) - 1);
1920 b |= (!(b >> 8) - 1);
1921
1922 ptr[x + 2] = r;
1923 ptr[x + 1] = g;
1924 ptr[x + 0] = b;
1925 }
1926 } 2408 }
1927 ptr += bpl; 2409 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1928 } 2410 }
2411 break;
2412 }
1929 } 2413 }
1930}
1931 2414
1932/* RGB 32 */ 2415 free (lookup);
1933static void
1934shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1935{
1936 unsigned char *ptr;
1937 int x, y;
1938
1939 ptr = (unsigned char *)data + (w * 4);
1940 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1941 /* No saturation */
1942 for (y = h; --y >= 0;) {
1943 if (byteorder.big_endian()) {
1944 for (x = -(w * 4); x < 0; x += 4) {
1945 int r, g, b;
1946
1947 r = (ptr[x + 1] * rm) >> 8;
1948 g = (ptr[x + 2] * gm) >> 8;
1949 b = (ptr[x + 3] * bm) >> 8;
1950 ptr[x + 1] = r;
1951 ptr[x + 2] = g;
1952 ptr[x + 3] = b;
1953 }
1954 } else {
1955 for (x = -(w * 4); x < 0; x += 4) {
1956 int r, g, b;
1957
1958 r = (ptr[x + 2] * rm) >> 8;
1959 g = (ptr[x + 1] * gm) >> 8;
1960 b = (ptr[x + 0] * bm) >> 8;
1961 ptr[x + 2] = r;
1962 ptr[x + 1] = g;
1963 ptr[x + 0] = b;
1964 }
1965 }
1966 ptr += bpl;
1967 }
1968 } else {
1969 for (y = h; --y >= 0;) {
1970 for (x = -(w * 4); x < 0; x += 4) {
1971 int r, g, b;
1972
1973 if (byteorder.big_endian()) {
1974 r = (ptr[x + 1] * rm) >> 8;
1975 g = (ptr[x + 2] * gm) >> 8;
1976 b = (ptr[x + 3] * bm) >> 8;
1977
1978 r |= (!(r >> 8) - 1);
1979 g |= (!(g >> 8) - 1);
1980 b |= (!(b >> 8) - 1);
1981
1982 ptr[x + 1] = r;
1983 ptr[x + 2] = g;
1984 ptr[x + 3] = b;
1985 } else {
1986 r = (ptr[x + 2] * rm) >> 8;
1987 g = (ptr[x + 1] * gm) >> 8;
1988 b = (ptr[x + 0] * bm) >> 8;
1989
1990 r |= (!(r >> 8) - 1);
1991 g |= (!(g >> 8) - 1);
1992 b |= (!(b >> 8) - 1);
1993
1994 ptr[x + 2] = r;
1995 ptr[x + 1] = g;
1996 ptr[x + 0] = b;
1997 }
1998 }
1999 ptr += bpl;
2000 }
2001 }
2002} 2416}
2003
2004#endif 2417#endif
2005 2418
2006/* 2419/*
2007 * Check our parents are still who we think they are. 2420 * Check our parents are still who we think they are.
2008 * Do transparency updates if required 2421 * Do transparency updates if required
… …
2015 Atom atype; 2428 Atom atype;
2016 unsigned char *prop = NULL; 2429 unsigned char *prop = NULL;
2017 Window root, oldp, *list; 2430 Window root, oldp, *list;
2018 Pixmap rootpixmap = None; 2431 Pixmap rootpixmap = None;
2019 XWindowAttributes wattr, wrootattr; 2432 XWindowAttributes wattr, wrootattr;
2433 dDisp;
2020 2434
2021 pchanged = 0; 2435 pchanged = 0;
2022 2436
2023 if (!(Options & Opt_transparent)) 2437 if (!OPTION (Opt_transparent))
2024 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
2025 2439
2026 XGetWindowAttributes (display->display, display->root, &wrootattr); 2440 XGetWindowAttributes (disp, display->root, &wrootattr);
2027 rootdepth = wrootattr.depth; 2441 rootdepth = wrootattr.depth;
2028 2442
2029 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2443 XGetWindowAttributes (disp, parent[0], &wattr);
2030 2444
2031 if (rootdepth != wattr.depth) 2445 if (rootdepth != wattr.depth)
2032 { 2446 {
2033 if (am_transparent) 2447 if (am_transparent)
2034 { 2448 {
2035 pchanged = 1; 2449 pchanged = 1;
2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2450 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2037 am_transparent = am_pixmap_trans = 0; 2451 am_transparent = am_pixmap_trans = 0;
2038 } 2452 }
2039 2453
2040 return pchanged; /* Don't try any more */ 2454 return pchanged; /* Don't try any more */
2041 } 2455 }
2042 2456
2043 /* 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. */
2044 XSync (display->display, False); 2458 XSync (disp, False);
2045 2459
2046 /* 2460 /*
2047 * Make the frame window set by the window manager have 2461 * Make the frame window set by the window manager have
2048 * the root background. Some window managers put multiple nested frame 2462 * the root background. Some window managers put multiple nested frame
2049 * 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.
2050 */ 2464 */
2051 i = (xa[XA_XROOTPMAPID] 2465 i = (xa[XA_XROOTPMAP_ID]
2052 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2466 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2053 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2054 &nitems, &bytes_after, &prop) == Success); 2468 &nitems, &bytes_after, &prop) == Success);
2055 2469
2056 if (!i || prop == NULL) 2470 if (!i || prop == NULL)
2057 i = (xa[XA_XSETROOTID] 2471 i = (xa[XA_ESETROOT_PMAP_ID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2472 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success); 2474 &nitems, &bytes_after, &prop) == Success);
2061 2475
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint]) 2476 if (!i || prop == NULL
2477#if TINTING
2478 || !rs[Rs_color + Color_tint]
2479#endif
2480 )
2063 have_pixmap = 0; 2481 have_pixmap = 0;
2064 else 2482 else
2065 { 2483 {
2066 have_pixmap = 1; 2484 have_pixmap = 1;
2067 rootpixmap = *(Pixmap *)prop; 2485 rootpixmap = *(Pixmap *)prop;
… …
2078 Window cr; 2496 Window cr;
2079 XImage *image; 2497 XImage *image;
2080 GC gc; 2498 GC gc;
2081 XGCValues gcvalue; 2499 XGCValues gcvalue;
2082 2500
2083 XTranslateCoordinates (display->display, TermWin.vt, display->root, 2501 XTranslateCoordinates (disp, parent[0], display->root,
2084 0, 0, &sx, &sy, &cr); 2502 0, 0, &sx, &sy, &cr);
2085 nw = (unsigned int)szHint.width; 2503 nw = (unsigned int)szHint.width;
2086 nh = (unsigned int)szHint.height; 2504 nh = (unsigned int)szHint.height;
2087 nx = ny = 0; 2505 nx = ny = 0;
2088 2506
… …
2098 nh += sy; 2516 nh += sy;
2099 ny = -sy; 2517 ny = -sy;
2100 sy = 0; 2518 sy = 0;
2101 } 2519 }
2102 2520
2103 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2521 min_it (nw, (unsigned int) (wrootattr.width - sx));
2104 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2522 min_it (nh, (unsigned int) (wrootattr.height - sy));
2523
2524 XSync (disp, False);
2105 allowedxerror = -1; 2525 allowedxerror = -1;
2106 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2526 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2107 2527
2108 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2528 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2109 /* XXX: may need a delay here? */ 2529 /* XXX: may need a delay here? */
2110 allowedxerror = 0; 2530 allowedxerror = 0;
2111 2531
2112 if (image == NULL) 2532 if (image == NULL)
2113 { 2533 {
2114 if (am_transparent && am_pixmap_trans) 2534 if (am_transparent && am_pixmap_trans)
2115 { 2535 {
2116 pchanged = 1; 2536 pchanged = 1;
2117 if (TermWin.pixmap != None) 2537 if (pixmap != None)
2118 { 2538 {
2119 XFreePixmap (display->display, TermWin.pixmap); 2539 XFreePixmap (disp, pixmap);
2120 TermWin.pixmap = None; 2540 pixmap = None;
2121 } 2541 }
2122 } 2542 }
2123 2543
2124 am_pixmap_trans = 0; 2544 am_pixmap_trans = 0;
2125 } 2545 }
2126 else 2546 else
2127 { 2547 {
2128 if (TermWin.pixmap != None) 2548 if (pixmap != None)
2129 XFreePixmap (display->display, TermWin.pixmap); 2549 XFreePixmap (disp, pixmap);
2130 2550
2131#if TINTING 2551#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint)) 2552 if (ISSET_PIXCOLOR (Color_tint))
2133 { 2553 {
2134 unsigned short rm, gm, bm; 2554 unsigned short rm, gm, bm;
2135 if (rs[Rs_shade]) 2555 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2136 PixColorsFocused[Color_tint].fade (display, atoi (rs[Rs_shade])).get (display, rm, gm, bm); 2556
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2557 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2139 2558
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2559 ShadeXImage (display, image, shade, rm, gm, bm);
2141
2142 /* Determine bitshift and bitmask values */
2143 switch (image->bits_per_pixel)
2144 {
2145 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2146 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2147 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2148 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2149 }
2150 } 2560 }
2151#endif 2561#endif
2152 2562
2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2563 pixmap = XCreatePixmap (disp, vt,
2154 szHint.width, szHint.height, image->depth); 2564 szHint.width, szHint.height, image->depth);
2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2565 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2566 XPutImage (disp, pixmap, gc, image, 0, 0,
2157 nx, ny, image->width, image->height); 2567 nx, ny, image->width, image->height);
2158 XFreeGC (display->display, gc); 2568 XFreeGC (disp, gc);
2159 XDestroyImage (image); 2569 XDestroyImage (image);
2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 2570 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2571 XClearWindow (disp, parent[0]);
2161 2572
2162 if (!am_transparent || !am_pixmap_trans) 2573 if (!am_transparent || !am_pixmap_trans)
2163 pchanged = 1; 2574 pchanged = 1;
2164 2575
2165 am_transparent = am_pixmap_trans = 1; 2576 am_transparent = am_pixmap_trans = 1;
2166 } 2577 }
2167 } 2578 }
2168 2579
2169 if (!am_pixmap_trans) 2580 if (am_pixmap_trans)
2581 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2582 else
2170 { 2583 {
2171 unsigned int n; 2584 unsigned int n;
2172 /* 2585 /*
2173 * InheritPixmap transparency 2586 * InheritPixmap transparency
2174 */ 2587 */
2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2588 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2177 { 2589 {
2178 oldp = TermWin.parent[i]; 2590 oldp = parent[i];
2179 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2591 XQueryTree (disp, parent[i - 1], &root,
2180 &TermWin.parent[i], &list, &n); 2592 &parent[i], &list, &n);
2181 XFree (list); 2593 XFree (list);
2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183 2594
2184 if (TermWin.parent[i] == display->root) 2595 if (parent[i] == display->root)
2185 { 2596 {
2186 if (oldp != None) 2597 if (oldp != None)
2187 pchanged = 1; 2598 pchanged = 1;
2188 2599
2189 break; 2600 break;
2190 } 2601 }
2191 2602
2192 if (oldp != TermWin.parent[i]) 2603 if (oldp != parent[i])
2193 pchanged = 1; 2604 pchanged = 1;
2194 } 2605 }
2195 2606
2196 n = 0; 2607 n = 0;
2197 2608
2198 if (pchanged) 2609 if (pchanged)
2199 { 2610 {
2200 for (; n < (unsigned int)i; n++) 2611 for (; n < (unsigned int)i; n++)
2201 { 2612 {
2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2613 XGetWindowAttributes (disp, parent[n], &wattr);
2203 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2204 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2614 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2205 { 2615 {
2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2616 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2207 break; 2617 break;
2208 } 2618 }
2209 } 2619 }
2210 } 2620 }
2211 2621
2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2622 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2213 { 2623 {
2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2624 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2625 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2217 am_transparent = 0; 2626 am_transparent = 0;
2218 /* XXX: also turn off Opt_transparent? */ 2627 /* XXX: also turn off Opt_transparent? */
2219 } 2628 }
2220 else 2629 else
2221 { 2630 {
2222#if WAIT_FOR_WM 2631#if WAIT_FOR_WM
2223 /* wait (an arbitrary period) for the WM to do its thing 2632 /* wait (an arbitrary period) for the WM to do its thing
2224 * needed for fvwm2.2.2 (and before?) */ 2633 * needed for fvwm2.2.2 (and before?) */
2225 sleep (1); 2634 sleep (1);
2226#endif 2635#endif
2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2228 for (n = 0; n < (unsigned int)i; n++) 2636 for (n = 0; n < (unsigned int)i; n++)
2637 {
2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2638 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2639 XClearWindow (disp, parent[n]);
2640 }
2230 2641
2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2642 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2232 am_transparent = 1; 2643 am_transparent = 1;
2233 } 2644 }
2234 2645
2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2646 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2236 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 ();
2237 } 2662 }
2238 2663
2239 return pchanged; 2664 return pchanged;
2240} 2665}
2241#endif 2666#endif
… …
2260 if (ch == NOCHAR) // TODO: improve 2685 if (ch == NOCHAR) // TODO: improve
2261 break; 2686 break;
2262 2687
2263 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)
2264 { 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
2265 /* Read a text string from the input buffer */ 2704 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2705 unicode_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2706 bool refreshnow = false;
2268 int nlines = 0; 2707 int nlines = 0;
2269 unicode_t *str = buf; 2708 unicode_t *str = buf;
2270 2709 unicode_t *eol = str + min (ncol, UBUFSIZ);
2271 *str++ = ch;
2272 2710
2273 for (;;) 2711 for (;;)
2274 { 2712 {
2275 seq_begin = cmdbuf_ptr;
2276 ch = next_char ();
2277
2278 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))
2279 break; 2714 break;
2280 2715
2281 *str++ = ch; 2716 *str++ = ch;
2282 2717
2283 if (ch == C0_LF) 2718 if (ch == C0_LF || str >= eol)
2284 { 2719 {
2720 if (ch == C0_LF)
2285 nlines++; 2721 nlines++;
2722
2286 refresh_count++; 2723 refresh_count++;
2287 2724
2288 if (! (Options & Opt_jumpScroll) 2725 if (!OPTION (Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2726 || (refresh_count >= refresh_limit * (nrow - 1)))
2290 { 2727 {
2291 refreshnow = true; 2728 refreshnow = true;
2292 flag = true; 2729 refresh_count = 0;
2293 ch = NOCHAR; 2730 ch = NOCHAR;
2294 break; 2731 break;
2295 } 2732 }
2296 2733
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2734 // scr_add_lines only works for nlines <= nrow - 1.
2298 if (nlines >= TermWin.nrow - 1) 2735 if (nlines >= nrow - 1)
2299 { 2736 {
2300 scr_add_lines (buf, nlines, str - buf); 2737 scr_add_lines (buf, nlines, str - buf);
2301 nlines = 0; 2738 nlines = 0;
2302 str = buf; 2739 str = buf;
2740 eol = str + min (ncol, UBUFSIZ);
2303 } 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
2304 } 2754 }
2305 2755
2306 if (str >= buf + UBUFSIZ) 2756 seq_begin = cmdbuf_ptr;
2307 { 2757 ch = next_char ();
2308 ch = NOCHAR;
2309 break;
2310 }
2311 } 2758 }
2312 2759
2313 scr_add_lines (buf, nlines, str - buf); 2760 scr_add_lines (buf, nlines, str - buf);
2314 2761
2315 /* 2762 /*
2316 * 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
2317 * 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.
2318 * the number of pages between refreshes is refresh_limit, which 2765 * the number of pages between refreshes is refresh_limit, which
2319 * is incremented here because we must be doing flat-out scrolling. 2766 * is incremented here because we must be doing flat-out scrolling.
2320 *
2321 * refreshing should be correct for small scrolls, because of the
2322 * time-out
2323 */ 2767 */
2324 if (refreshnow) 2768 if (refreshnow)
2325 { 2769 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2770 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++; 2771 refresh_limit++;
2328 else 2772 else
2773 {
2774 flag = true;
2329 scr_refresh (refresh_type); 2775 scr_refresh (refresh_type);
2776 flush_ev.stop ();
2777 }
2330 } 2778 }
2331 2779
2332 } 2780 }
2333 else 2781 else
2334 { 2782 {
… …
2382 if (len == (size_t)-1) 2830 if (len == (size_t)-1)
2383 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
2384 2832
2385 // assume wchar == unicode 2833 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2834 cmdbuf_ptr += len;
2387 return wc; 2835 return wc & UNICODE_MASK;
2388 } 2836 }
2389 2837
2390 return NOCHAR; 2838 return NOCHAR;
2391} 2839}
2392 2840
… …
2518 process_escape_seq (); 2966 process_escape_seq ();
2519 break; 2967 break;
2520 case C0_ENQ: /* terminal Status */ 2968 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 2969 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2970 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2971 (unsigned int)strlen (rs[Rs_answerbackstring]));
2524 else 2972 else
2525 tt_write ((unsigned char *)VT100_ANS, 2973 tt_write ((unsigned char *)VT100_ANS,
2526 (unsigned int)STRLEN (VT100_ANS)); 2974 (unsigned int)strlen (VT100_ANS));
2527 break; 2975 break;
2528 case C0_BEL: /* bell */ 2976 case C0_BEL: /* bell */
2529 scr_bell (); 2977 scr_bell ();
2530 break; 2978 break;
2531 case C0_BS: /* backspace */ 2979 case C0_BS: /* backspace */
… …
2630void 3078void
2631rxvt_term::process_escape_seq () 3079rxvt_term::process_escape_seq ()
2632{ 3080{
2633 unicode_t ch = cmd_getc (); 3081 unicode_t ch = cmd_getc ();
2634 3082
2635 if (PrivateModes & PrivMode_vt52) 3083 if (priv_modes & PrivMode_vt52)
2636 { 3084 {
2637 process_escape_vt52 (ch); 3085 process_escape_vt52 (ch);
2638 return; 3086 return;
2639 } 3087 }
2640 3088
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 3103 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 3104 break;
2657 case '+': 3105 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 3106 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 3107 break;
2660#ifndef NO_FRILLS 3108#if ENABLE_FRILLS
2661 case '6': 3109 case '6':
2662 scr_backindex (); 3110 scr_backindex ();
2663 break; 3111 break;
2664#endif 3112#endif
2665 case '7': 3113 case '7':
2666 scr_cursor (SAVE); 3114 scr_cursor (SAVE);
2667 break; 3115 break;
2668 case '8': 3116 case '8':
2669 scr_cursor (RESTORE); 3117 scr_cursor (RESTORE);
2670 break; 3118 break;
2671#ifndef NO_FRILLS 3119#if ENABLE_FRILLS
2672 case '9': 3120 case '9':
2673 scr_forwardindex (); 3121 scr_forwardindex ();
2674 break; 3122 break;
2675#endif 3123#endif
2676 case '=': 3124 case '=':
… …
2855 { 3303 {
2856 switch (priv) 3304 switch (priv)
2857 { 3305 {
2858 case '>': 3306 case '>':
2859 if (ch == CSI_DA) /* secondary device attributes */ 3307 if (ch == CSI_DA) /* secondary device attributes */
2860 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3308 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2861 break; 3309 break;
2862 case '?': 3310 case '?':
2863 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3311 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2864 process_terminal_mode (ch, priv, nargs, arg); 3312 process_terminal_mode (ch, priv, nargs, arg);
2865 break; 3313 break;
… …
2970 3418
2971 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3419 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2972 arg[0] = -arg[0]; 3420 arg[0] = -arg[0];
2973 /* FALLTHROUGH */ 3421 /* FALLTHROUGH */
2974 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2976 break; 3424 break;
2977 3425
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 3427 tt_write ((const unsigned char *)VT100_ANS,
2980 (unsigned int) (sizeof (VT100_ANS) - 1)); 3428 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 3429 break;
2982 3430
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3431 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 3432 process_sgr_mode (nargs, arg);
2985 break; 3433 break;
… …
2992 break; 3440 break;
2993 case 6: /* CPR requested */ 3441 case 6: /* CPR requested */
2994 scr_report_position (); 3442 scr_report_position ();
2995 break; 3443 break;
2996 case 7: /* unofficial extension */ 3444 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 3445 if (OPTION (Opt_insecure))
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3446 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 3447 break;
3000 case 8: /* unofficial extension */ 3448 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3449 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3450 break;
3003 } 3451 }
… …
3039 break; 3487 break;
3040 3488
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3489 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3490 if (arg[0] == 4)
3043 scr_insert_mode (0); 3491 scr_insert_mode (0);
3492 else if (arg[0] == 20)
3493 priv_modes &= ~PrivMode_LFNL;
3044 break; 3494 break;
3045 3495
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3496 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3497 if (arg[0] == 4)
3048 scr_insert_mode (1); 3498 scr_insert_mode (1);
3499 else if (arg[0] == 20)
3500 priv_modes |= PrivMode_LFNL;
3049 break; 3501 break;
3050 3502
3051 /* 3503 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3504 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3505 */
… …
3065 break; 3517 break;
3066 case CSI_75: 3518 case CSI_75:
3067 scr_cursor (RESTORE); 3519 scr_cursor (RESTORE);
3068 break; 3520 break;
3069 3521
3070#ifndef NO_FRILLS 3522#if ENABLE_FRILLS
3071 case CSI_74: 3523 case CSI_74:
3072 process_window_ops (arg, nargs); 3524 process_window_ops (arg, nargs);
3073 break; 3525 break;
3074#endif 3526#endif
3075 3527
… …
3082 break; 3534 break;
3083 } 3535 }
3084} 3536}
3085/*}}} */ 3537/*}}} */
3086 3538
3087#ifndef NO_FRILLS 3539#if ENABLE_FRILLS
3088/* ARGSUSED */ 3540/* ARGSUSED */
3089void 3541void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3542rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3543{
3092 int x, y; 3544 int x, y;
3093 XWindowAttributes wattr; 3545 XWindowAttributes wattr;
3094 Window wdummy; 3546 Window wdummy;
3547 dDisp;
3095 3548
3096 if (nargs == 0) 3549 if (nargs == 0)
3097 return; 3550 return;
3098 3551
3099 switch (args[0]) 3552 switch (args[0])
3100 { 3553 {
3101 /* 3554 /*
3102 * commands 3555 * commands
3103 */ 3556 */
3104 case 1: /* deiconify window */ 3557 case 1: /* deiconify window */
3105 XMapWindow (display->display, TermWin.parent[0]); 3558 XMapWindow (disp, parent[0]);
3106 break; 3559 break;
3107 case 2: /* iconify window */ 3560 case 2: /* iconify window */
3108 XIconifyWindow (display->display, TermWin.parent[0], 3561 XIconifyWindow (disp, parent[0], display->screen);
3109 DefaultScreen (display->display));
3110 break; 3562 break;
3111 case 3: /* set position (pixels) */ 3563 case 3: /* set position (pixels) */
3112 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3564 XMoveWindow (disp, parent[0], args[1], args[2]);
3113 break; 3565 break;
3114 case 4: /* set size (pixels) */ 3566 case 4: /* set size (pixels) */
3115 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3567 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3116 break; 3568 break;
3117 case 5: /* raise window */ 3569 case 5: /* raise window */
3118 XRaiseWindow (display->display, TermWin.parent[0]); 3570 XRaiseWindow (disp, parent[0]);
3119 break; 3571 break;
3120 case 6: /* lower window */ 3572 case 6: /* lower window */
3121 XLowerWindow (display->display, TermWin.parent[0]); 3573 XLowerWindow (disp, parent[0]);
3122 break; 3574 break;
3123 case 7: /* refresh window */ 3575 case 7: /* refresh window */
3124 scr_touch (true); 3576 scr_touch (true);
3125 break; 3577 break;
3126 case 8: /* set size (chars) */ 3578 case 8: /* set size (chars) */
3127 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3579 set_widthheight ((unsigned int) (args[2] * fwidth),
3128 (unsigned int) (args[1] * TermWin.fheight)); 3580 (unsigned int) (args[1] * fheight));
3129 break; 3581 break;
3130 3582
3131 //case 9: NYI, TODO, restore maximized window or maximize window 3583 //case 9: NYI, TODO, restore maximized window or maximize window
3132 default: 3584 default:
3133 if (args[0] >= 24) /* set height (chars) */ 3585 if (args[0] >= 24) /* set height (chars) */
3134 set_widthheight ((unsigned int)TermWin.width, 3586 set_widthheight ((unsigned int)width,
3135 (unsigned int) (args[1] * TermWin.fheight)); 3587 (unsigned int) (args[1] * fheight));
3136 break; 3588 break;
3137 3589
3138 3590
3139 /* 3591 /*
3140 * reports - some output format copied from XTerm 3592 * reports - some output format copied from XTerm
3141 */ 3593 */
3142 case 11: /* report window state */ 3594 case 11: /* report window state */
3143 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3595 XGetWindowAttributes (disp, parent[0], &wattr);
3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3596 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3145 break; 3597 break;
3146 case 13: /* report window position */ 3598 case 13: /* report window position */
3147 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3599 XGetWindowAttributes (disp, parent[0], &wattr);
3148 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3600 XTranslateCoordinates (disp, parent[0], wattr.root,
3149 -wattr.border_width, -wattr.border_width, 3601 -wattr.border_width, -wattr.border_width,
3150 &x, &y, &wdummy); 3602 &x, &y, &wdummy);
3151 tt_printf ("\033[3;%d;%dt", x, y); 3603 tt_printf ("\033[3;%d;%dt", x, y);
3152 break; 3604 break;
3153 case 14: /* report window size (pixels) */ 3605 case 14: /* report window size (pixels) */
3154 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3606 XGetWindowAttributes (disp, parent[0], &wattr);
3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3607 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3156 break; 3608 break;
3157 case 18: /* report text area size (chars) */ 3609 case 18: /* report text area size (chars) */
3158 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3610 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3159 break; 3611 break;
3160 case 19: /* report window size (chars) */ 3612 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3613 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3162 break; 3614 break;
3163 case 20: /* report icon label */ 3615 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3616 {
3166 char *s; 3617 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3618 XGetIconName (disp, parent[0], &s);
3168 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);
3169 } 3621 }
3170 break; 3622 break;
3171 case 21: /* report window title */ 3623 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3624 {
3174 char *s; 3625 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3626 XFetchName (disp, parent[0], &s);
3176 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);
3177 } 3629 }
3178 break; 3630 break;
3179 } 3631 }
3180} 3632}
3181#endif 3633#endif
3182 3634
… …
3186 * ends_how is terminator used. returned input must be free()'d 3638 * ends_how is terminator used. returned input must be free()'d
3187 */ 3639 */
3188unsigned char * 3640unsigned char *
3189rxvt_term::get_to_st (unicode_t &ends_how) 3641rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3642{
3191 unicode_t prev = 0, ch; 3643 unicode_t ch;
3644 bool seen_esc = false;
3192 unsigned int n = 0; 3645 unsigned int n = 0;
3193 unsigned char *s;
3194 unsigned char string[STRING_MAX]; 3646 wchar_t string[STRING_MAX];
3195 3647
3196 while ((ch = cmd_getc ()) != NOCHAR) 3648 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3649 {
3198 if (prev == C0_ESC) 3650 if (seen_esc)
3199 { 3651 {
3200 if (ch == 0x5c) /* 7bit ST */ 3652 if (ch == 0x5c) /* 7bit ST */
3201 break; 3653 break;
3202 else 3654 else
3203 return NULL; 3655 return NULL;
3204 } 3656 }
3657 else if (ch == C0_ESC)
3658 {
3659 seen_esc = true;
3660 continue;
3661 }
3205 else if (ch == C0_BEL || ch == CHAR_ST) 3662 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break; 3663 break;
3207 else if (ch < 0x20) 3664 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3665 return NULL; /* other control character - exit */
3209 3666
3210 if (n >= sizeof (string) - 1) 3667 seen_esc = false;
3668
3669 if (n >= STRING_MAX - 1)
3211 // stop at some sane length 3670 // stop at some sane length
3212 return NULL; 3671 return NULL;
3213 3672
3214 if (ch == C0_SYN) 3673 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 (); 3674 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else 3675 else
3220 string[n++] = prev = ch; 3676 string[n++] = ch;
3221 } 3677 }
3222 3678
3223 string[n++] = '\0'; 3679 string[n++] = '\0';
3224 3680
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL;
3227
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3681 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3682
3230 return s; 3683 return (unsigned char *)rxvt_wcstombs (string);
3231} 3684}
3232 3685
3233/*----------------------------------------------------------------------*/ 3686/*----------------------------------------------------------------------*/
3234/* 3687/*
3235 * 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)'
… …
3279void 3732void
3280rxvt_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)
3281{ 3734{
3282 if (str[0] == '?' && !str[1]) 3735 if (str[0] == '?' && !str[1])
3283 { 3736 {
3284 if (Options & Opt_insecure)
3285 {
3286 unsigned short r, g, b; 3737 unsigned short r, g, b;
3287 PixColorsFocused[color].get (display, r, g, b); 3738 pix_colors_focused[color].get (display, r, g, b);
3288 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);
3289 }
3290 } 3740 }
3291 else 3741 else
3292 set_window_color (color, str); 3742 set_window_color (color, str);
3293} 3743}
3294 3744
3295/* 3745/*
3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3297 * 0 = change iconName/title
3298 * 1 = change iconName
3299 * 2 = change title
3300 * 4 = change color
3301 * 10 = change fg color
3302 * 11 = change bg color
3303 * 12 = change text color
3304 * 13 = change mouse foreground color
3305 * 17 = change highlight character colour
3306 * 18 = change bold character color
3307 * 19 = change underlined character color
3308 * 46 = change logfile (not implemented)
3309 * 50 = change font
3310 *
3311 * rxvt extensions:
3312 * 20 = bg pixmap
3313 * 39 = change default fg color
3314 * 49 = change default bg color
3315 * 55 = dump scrollback buffer and all of screen
3316 * 701 = change locale
3317 * 702 = find font
3318 * 703 = menu
3319 */ 3747 */
3320void 3748void
3321rxvt_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)
3322{ 3750{
3323 int changed = 0; 3751 int changed = 0;
3324 int color; 3752 int color;
3325 char *buf, *name; 3753 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3755 int saveop = op;
3756 dDisp;
3327 3757
3328 assert (str != NULL); 3758 assert (str != NULL);
3329 switch (op) 3759 switch (op)
3330 { 3760 {
3331 case XTerm_name: 3761 case XTerm_name:
… …
3338 set_title (str); 3768 set_title (str);
3339 break; 3769 break;
3340 case XTerm_property: 3770 case XTerm_property:
3341 if (str[0] == '?') 3771 if (str[0] == '?')
3342 { 3772 {
3343 Atom prop = XInternAtom (display->display, str + 1, True); 3773 Atom prop = display->atom (str + 1);
3344 Atom actual_type; 3774 Atom actual_type;
3345 int actual_format; 3775 int actual_format;
3346 unsigned long nitems; 3776 unsigned long nitems;
3347 unsigned long bytes_after; 3777 unsigned long bytes_after;
3348 unsigned char *value = 0; 3778 unsigned char *value = 0;
3349 const char *str = ""; 3779 const char *str = "";
3350 3780
3351 if (prop 3781 if (prop
3352 && XGetWindowProperty (display->display, TermWin.parent[0], 3782 && XGetWindowProperty (disp, parent[0],
3353 prop, 0, 1<<16, 0, AnyPropertyType, 3783 prop, 0, 1<<16, 0, AnyPropertyType,
3354 &actual_type, &actual_format, 3784 &actual_type, &actual_format,
3355 &nitems, &bytes_after, &value) == Success 3785 &nitems, &bytes_after, &value) == Success
3356 && actual_type != None 3786 && actual_type != None
3357 && actual_format == 8) 3787 && actual_format == 8)
… …
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3796 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3367 3797
3368 if (eq) 3798 if (eq)
3369 { 3799 {
3370 *eq = 0; 3800 *eq = 0;
3371 XChangeProperty (display->display, TermWin.parent[0], 3801 set_utf8_property (display->atom (str), eq + 1);
3372 display->atom (str), XA_STRING, 8,
3373 PropModeReplace, (unsigned char *)eq + 1,
3374 strlen (eq + 1));
3375 } 3802 }
3376 else 3803 else
3377 XDeleteProperty (display->display, TermWin.parent[0], 3804 XDeleteProperty (disp, parent[0],
3378 display->atom (str)); 3805 display->atom (str));
3379 } 3806 }
3380 break; 3807 break;
3381 3808
3382 case XTerm_Color: 3809 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3810 for (buf = (char *)str; buf && *buf;)
3384 { 3811 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3812 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3813 break;
3387 3814
3388 *name++ = '\0'; 3815 *name++ = '\0';
3389 color = atoi (buf); 3816 color = atoi (buf);
3390 3817
3391 if (color < 0 || color >= TOTAL_COLORS) 3818 if (color < 0 || color >= TOTAL_COLORS)
3392 break; 3819 break;
3393 3820
3394 if ((buf = STRCHR (name, ';')) != NULL) 3821 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3822 *buf++ = '\0';
3396 3823
3397 if (name[0] == '?' && !name[1]) 3824 if (name[0] == '?' && !name[1])
3398 { 3825 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b; 3826 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3403 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);
3404 }
3405 } 3829 }
3406 else 3830 else
3407 set_window_color (color + minCOLOR, name); 3831 set_window_color (color + minCOLOR, name);
3408 } 3832 }
3409 break; 3833 break;
… …
3431 case XTerm_Color_UL: 3855 case XTerm_Color_UL:
3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3433 break; 3857 break;
3434 case XTerm_Color_RV: 3858 case XTerm_Color_RV:
3435 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;
3436 break; 3871 break;
3437#endif 3872#endif
3438 3873
3439 case XTerm_Pixmap: 3874 case XTerm_Pixmap:
3440 if (*str != ';') 3875 if (*str != ';')
… …
3443 scale_pixmap (""); /* reset to default scaling */ 3878 scale_pixmap (""); /* reset to default scaling */
3444 set_bgPixmap (str); /* change pixmap */ 3879 set_bgPixmap (str); /* change pixmap */
3445#endif 3880#endif
3446 scr_touch (true); 3881 scr_touch (true);
3447 } 3882 }
3448 while ((str = STRCHR (str, ';')) != NULL) 3883 while ((str = strchr (str, ';')) != NULL)
3449 { 3884 {
3450 str++; 3885 str++;
3451#if XPM_BACKGROUND 3886#if XPM_BACKGROUND
3452 changed += scale_pixmap (str); 3887 changed += scale_pixmap (str);
3453#endif 3888#endif
3454
3455 } 3889 }
3890
3456 if (changed) 3891 if (changed)
3457 { 3892 {
3458#ifdef XPM_BACKGROUND 3893#ifdef XPM_BACKGROUND
3459 resize_pixmap (); 3894 resize_pixmap ();
3460#endif 3895#endif
… …
3471 3906
3472 case XTerm_logfile: 3907 case XTerm_logfile:
3473 // TODO, when secure mode? 3908 // TODO, when secure mode?
3474 break; 3909 break;
3475 3910
3476 case XTerm_font:
3477 if (query)
3478 {
3479 if (Options & Opt_insecure)
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3481 TermWin.fontset->fontdesc
3482 ? TermWin.fontset->fontdesc
3483 : "",
3484 resp);
3485 }
3486 else
3487 change_font (str);
3488 break;
3489
3490#ifndef NO_FRILLS
3491 case XTerm_locale:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3496 }
3497 else
3498 {
3499 set_locale (str);
3500# ifdef USE_XIM
3501 im_cb ();
3502# endif
3503 }
3504 break;
3505
3506 case XTerm_findfont:
3507 if (Options & Opt_insecure)
3508 {
3509 int fid = TermWin.fontset->find_font (atoi (str));
3510 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3511 fid, (*TermWin.fontset)[fid]->name, resp);
3512 }
3513 break;
3514#endif
3515
3516#ifdef MENUBAR 3911#ifdef MENUBAR
3517 case XTerm_Menu: 3912 case URxvt_Menu:
3518 if (Options & Opt_insecure) 3913 if (OPTION (Opt_insecure))
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break; 3915 break;
3521#endif 3916#endif
3522#if 0 3917#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3918 case XTerm_dumpscreen: /* no error notices */
… …
3527 { 3922 {
3528 scr_dump (fd); 3923 scr_dump (fd);
3529 close (fd); 3924 close (fd);
3530 } 3925 }
3531 } 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 int lines = atoi (str);
3967
3968 if (lines)
3969 scr_page (op == URxvt_view_up ? UP : DN, lines);
3970 else
3971 {
3972 scr_erase_savelines ();
3973 }
3974
3532 break; 3975 break;
3533#endif 3976#endif
3534 } 3977 }
3535} 3978}
3536/*----------------------------------------------------------------------*/ 3979/*----------------------------------------------------------------------*/
… …
3550{ 3993{
3551 int state; 3994 int state;
3552 3995
3553 if (mode == 's') 3996 if (mode == 's')
3554 { 3997 {
3555 SavedModes |= (PrivateModes & bit); 3998 SavedModes |= (priv_modes & bit);
3556 return -1; 3999 return -1;
3557 } 4000 }
3558 else 4001 else
3559 { 4002 {
3560 if (mode == 'r') 4003 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4004 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 4005 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4006 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 4007 PrivMode (state, bit);
3565 } 4008 }
3566 4009
3567 return state; 4010 return state;
3568} 4011}
… …
3586 { 3, PrivMode_132 }, 4029 { 3, PrivMode_132 },
3587 { 4, PrivMode_smoothScroll }, 4030 { 4, PrivMode_smoothScroll },
3588 { 5, PrivMode_rVideo }, 4031 { 5, PrivMode_rVideo },
3589 { 6, PrivMode_relOrigin }, 4032 { 6, PrivMode_relOrigin },
3590 { 7, PrivMode_Autowrap }, 4033 { 7, PrivMode_Autowrap },
4034 // 8, bi-directional support mode
3591 { 9, PrivMode_MouseX10 }, 4035 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 4036#ifdef menuBar_esc
3593 { menuBar_esc, PrivMode_menuBar }, 4037 { menuBar_esc, PrivMode_menuBar },
3594#endif 4038#endif
4039 // 18, 19 printing-related
4040 { 25, PrivMode_VisibleCursor },
3595#ifdef scrollBar_esc 4041#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 4042 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 4043#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 4044 { 35, PrivMode_ShiftKeys }, // rxvt extension
3602 { 40, PrivMode_132OK }, 4045 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 4046 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 4047 // 45 margin bell NYI
3605 // 46 start logging 4048 // 46 start logging
… …
3645 } 4088 }
3646 4089
3647 /* extra handling for values with state unkept */ 4090 /* extra handling for values with state unkept */
3648 switch (arg[i]) 4091 switch (arg[i])
3649 { 4092 {
4093#if ENABLE_STYLES
4094 case 1021:
4095 if (mode)
4096 SET_OPTION (Opt_intensityStyles);
4097 else
4098 CLR_OPTION (Opt_intensityStyles);
4099
4100 scr_touch (true);
4101 break;
4102#endif
3650 case 1048: /* alternative cursor save */ 4103 case 1048: /* alternative cursor save */
4104 case 1049:
3651 if (Options & Opt_secondaryScreen) 4105 if (OPTION (Opt_secondaryScreen))
3652 if (mode == 0) 4106 if (mode == 0)
3653 scr_cursor (RESTORE); 4107 scr_cursor (RESTORE);
3654 else if (mode == 1) 4108 else if (mode == 1)
3655 scr_cursor (SAVE); 4109 scr_cursor (SAVE);
3656 break; 4110 break;
… …
3667 * within VT52 mode 4121 * within VT52 mode
3668 */ 4122 */
3669 PrivMode (1, PrivMode_vt52); 4123 PrivMode (1, PrivMode_vt52);
3670 break; 4124 break;
3671 case 3: /* 80/132 */ 4125 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 4126 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4127 set_widthheight (((state ? 132 : 80) * fwidth), height);
3674 break; 4128 break;
3675 case 4: /* smooth scrolling */ 4129 case 4: /* smooth scrolling */
3676 if (state) 4130 if (!state)
3677 Options &= ~Opt_jumpScroll; 4131 SET_OPTION (Opt_jumpScroll);
3678 else 4132 else
3679 Options |= Opt_jumpScroll; 4133 CLR_OPTION (Opt_jumpScroll);
3680 break; 4134 break;
3681 case 5: /* reverse video */ 4135 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 4136 scr_rvideo_mode (state);
3683 break; 4137 break;
3684 case 6: /* relative/absolute origins */ 4138 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 4142 scr_autowrap (state);
3689 break; 4143 break;
3690 /* case 8: - auto repeat, can't do on a per window basis */ 4144 /* case 8: - auto repeat, can't do on a per window basis */
3691 case 9: /* X10 mouse reporting */ 4145 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 4146 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 4147 priv_modes &= ~PrivMode_MouseX11;
3694 break; 4148 break;
3695#ifdef menuBar_esc 4149#ifdef menuBar_esc
3696 case menuBar_esc: 4150 case menuBar_esc:
3697#ifdef MENUBAR 4151#ifdef MENUBAR
3698 map_menuBar (state); 4152 map_menuBar (state);
… …
3718 break; 4172 break;
3719 /* case 66: - application key pad */ 4173 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 4174 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 4175 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 4176 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 4177 priv_modes &= ~PrivMode_MouseX10;
3724 break; 4178 break;
3725#if 0 4179#if 0
3726 case 1001: 4180 case 1001:
3727 break; /* X11 mouse highlighting */ 4181 break; /* X11 mouse highlighting */
3728#endif 4182#endif
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 4183 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state) 4184 if (!state)
3731 Options &= ~Opt_scrollTtyOutput; 4185 SET_OPTION (Opt_scrollTtyOutput);
3732 else 4186 else
3733 Options |= Opt_scrollTtyOutput; 4187 CLR_OPTION (Opt_scrollTtyOutput);
3734 break; 4188 break;
3735 case 1011: /* scroll to bottom on key press */ 4189 case 1011: /* scroll to bottom on key press */
3736 if (state) 4190 if (state)
3737 Options |= Opt_scrollTtyKeypress; 4191 SET_OPTION (Opt_scrollTtyKeypress);
3738 else 4192 else
3739 Options &= ~Opt_scrollTtyKeypress; 4193 CLR_OPTION (Opt_scrollTtyKeypress);
3740 break; 4194 break;
3741 case 1047: /* secondary screen w/ clearing last */ 4195 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 4196 if (OPTION (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 4197 if (current_screen != PRIMARY)
3744 scr_erase_screen (2); 4198 scr_erase_screen (2);
3745 scr_change_screen (state); 4199 scr_change_screen (state);
3746 break; 4200 break;
3747 case 1049: /* secondary screen w/ clearing first */ 4201 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state); 4202 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen) 4203 if (OPTION (Opt_secondaryScreen))
3750 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
3751 scr_erase_screen (2); 4205 scr_erase_screen (2);
3752 break; 4206 break;
3753 default: 4207 default:
3754 break; 4208 break;
… …
3780 rendset = 0, rendstyle = ~RS_None; 4234 rendset = 0, rendstyle = ~RS_None;
3781 break; 4235 break;
3782 case 1: 4236 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 4237 rendset = 1, rendstyle = RS_Bold;
3784 break; 4238 break;
3785 //case 2: // faint or second colour 4239 //case 2: // low intensity
4240 case 3:
4241 rendset = 1, rendstyle = RS_Italic;
4242 break;
3786 case 4: 4243 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 4244 rendset = 1, rendstyle = RS_Uline;
3788 break; 4245 break;
3789 case 5: // slowly blinking 4246 case 5: // slowly blinking
3790 case 6: // rapidly blinking 4247 case 6: // rapidly blinking
… …
3802 //case 11: // scoansi acs on, first alt font 4259 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font 4260 //case 12: // scoansi acs on, |0x80, second alt font
3804 //... 4261 //...
3805 //case 19: // ninth alt font 4262 //case 19: // ninth alt font
3806 //case 20: // gothic 4263 //case 20: // gothic
3807 case 21: // disable bold, faint 4264 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3808 rendset = 0, rendstyle = RS_Bold; 4265 rendset = 0, rendstyle = RS_Bold;
3809 break; 4266 break;
3810 case 22: 4267 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold; 4268 rendset = 0, rendstyle = RS_Bold;
3812 break; 4269 break;
3813 //case 23: disable italic 4270 case 23: // disable italic
4271 rendset = 0, rendstyle = RS_Italic;
4272 break;
3814 case 24: 4273 case 24:
3815 rendset = 0, rendstyle = RS_Uline; 4274 rendset = 0, rendstyle = RS_Uline;
3816 break; 4275 break;
3817 case 25: 4276 case 25:
4277 rendset = 0, rendstyle = RS_Blink;
4278 break;
4279 case 26: // variable spacing (iso 8613)
3818 rendset = 0, rendstyle = RS_Blink; 4280 rendset = 0, rendstyle = RS_Blink;
3819 break; 4281 break;
3820 case 27: 4282 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 4283 rendset = 0, rendstyle = RS_RVid;
3822 break; 4284 break;
… …
3840 case 35: 4302 case 35:
3841 case 36: 4303 case 36:
3842 case 37: 4304 case 37:
3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4305 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3844 break; 4306 break;
3845#ifdef TTY_256COLOR 4307 case 38: // set fg color, ISO 8613-6
3846 case 38:
3847 if (nargs > i + 2 && arg[i + 1] == 5) 4308 if (nargs > i + 2 && arg[i + 1] == 5)
3848 { 4309 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4310 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2; 4311 i += 2;
3851 } 4312 }
3852 break; 4313 break;
3853#endif
3854 case 39: /* default fg */ 4314 case 39: /* default fg */
3855 scr_color (Color_fg, Color_fg); 4315 scr_color (Color_fg, Color_fg);
3856 break; 4316 break;
3857 4317
3858 case 40: 4318 case 40:
… …
3863 case 45: 4323 case 45:
3864 case 46: 4324 case 46:
3865 case 47: 4325 case 47:
3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4326 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3867 break; 4327 break;
3868#ifdef TTY_256COLOR 4328 case 48: // set bg color, ISO 8613-6
3869 case 48:
3870 if (nargs > i + 2 && arg[i + 1] == 5) 4329 if (nargs > i + 2 && arg[i + 1] == 5)
3871 { 4330 {
3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4331 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3873 i += 2; 4332 i += 2;
3874 } 4333 }
3875 break; 4334 break;
3876#endif
3877 case 49: /* default bg */ 4335 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 4336 scr_color (Color_bg, Color_bg);
3879 break; 4337 break;
4338
4339 //case 50: // not variable spacing
3880 4340
3881#ifndef NO_BRIGHTCOLOR 4341#ifndef NO_BRIGHTCOLOR
3882 case 90: 4342 case 90:
3883 case 91: /* set bright fg color */ 4343 case 91: /* set bright fg color */
3884 case 92: 4344 case 92:
3885 case 93: 4345 case 93:
3886 case 94: 4346 case 94:
3887 case 95: 4347 case 95:
3888 case 96: 4348 case 96:
3889 case 97: 4349 case 97:
3890 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4350 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3891 Color_fg);
3892 break; 4351 break;
3893 case 100: 4352 case 100:
3894 case 101: /* set bright bg color */ 4353 case 101: /* set bright bg color */
3895 case 102: 4354 case 102:
3896 case 103: 4355 case 103:
3897 case 104: 4356 case 104:
3898 case 105: 4357 case 105:
3899 case 106: 4358 case 106:
3900 case 107: 4359 case 107:
3901 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4360 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3902 Color_bg);
3903 break; 4361 break;
3904#endif 4362#endif
3905
3906 } 4363 }
3907 } 4364 }
3908} 4365}
3909/*}}} */ 4366/*}}} */
3910 4367
… …
3914{ 4371{
3915 unicode_t ch, cmd = cmd_getc (); 4372 unicode_t ch, cmd = cmd_getc ();
3916 4373
3917 if (cmd == 'Q') 4374 if (cmd == 'Q')
3918 { /* query graphics */ 4375 { /* query graphics */
3919 tt_printf ("\033G0\n"); /* no graphics */ 4376 tt_printf ("\033G0\012"); /* no graphics */
3920 return; 4377 return;
3921 } 4378 }
3922 /* swallow other graphics sequences until terminating ':' */ 4379 /* swallow other graphics sequences until terminating ':' */
3923 do 4380 do
3924 ch = cmd_getc (); 4381 ch = cmd_getc ();
… …
3939 unsigned char buf[256]; 4396 unsigned char buf[256];
3940 4397
3941 va_start (arg_ptr, fmt); 4398 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4399 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4400 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 4401 tt_write (buf, strlen (buf));
3945} 4402}
3946 4403
3947/* ---------------------------------------------------------------------- */ 4404/* ---------------------------------------------------------------------- */
3948/* Write data to the pty as typed by the user, pasted with the mouse, 4405/* Write data to the pty as typed by the user, pasted with the mouse,
3949 * or generated by us in response to a query ESC sequence. 4406 * or generated by us in response to a query ESC sequence.
3950 */ 4407 */
4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4409
3951void 4410void
3952rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4411rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3953{ 4412{
3954 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4413 if (v_buflen == 0)
4414 {
4415 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3955 4416
3956 if (len) 4417 if ((unsigned int)written == len)
4418 return;
4419
4420 data += written;
4421 len -= written;
3957 { 4422 }
4423
4424 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4425
4426 memcpy (v_buffer + v_buflen, data, len);
4427 v_buflen += len;
4428
4429 pty_ev.set (EVENT_READ | EVENT_WRITE);
4430}
4431
4432void rxvt_term::pty_write ()
4433{
4434 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4435
4436 if (written > 0)
4437 {
4438 v_buflen -= written;
4439
3958 if (v_buflen == 0) 4440 if (v_buflen == 0)
3959 { 4441 {
3960 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3961
3962 if ((unsigned int)written == len)
3963 return;
3964
3965 data += written;
3966 len -= written;
3967 }
3968
3969
3970 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3971
3972 memcpy (v_buffer + v_buflen, data, len);
3973 v_buflen += len;
3974 }
3975
3976 for (;;)
3977 {
3978 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3979
3980 if (written > 0)
3981 {
3982 v_buflen -= written;
3983
3984 if (v_buflen == 0)
3985 {
3986 free (v_buffer); 4442 free (v_buffer);
3987 v_buffer = 0; 4443 v_buffer = 0;
3988 v_buflen = 0; 4444 v_buflen = 0;
3989 4445
3990 pty_ev.set (EVENT_READ); 4446 pty_ev.set (EVENT_READ);
3991 return;
3992 }
3993
3994 memmove (v_buffer, v_buffer + written, v_buflen);
3995 }
3996 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3997 // original code just ignores this...
3998 destroy ();
3999 else
4000 {
4001 pty_ev.set (EVENT_READ | EVENT_WRITE);
4002 return; 4447 return;
4003 } 4448 }
4449
4450 memmove (v_buffer, v_buffer + written, v_buflen);
4004 } 4451 }
4452 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4453 pty_ev.set (EVENT_READ);
4005} 4454}
4006 4455
4007/*----------------------- end-of-file (C source) -----------------------*/ 4456/*----------------------- end-of-file (C source) -----------------------*/
4008 4457

Diff Legend

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