ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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