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.93 by pcg, Thu Apr 8 20:31:45 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 // don't understand this, so commented it out 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, 1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1187 Expose, 1562 ;
1188 &unused_event)) ; 1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1189 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1564 ;
1190 GraphicsExpose, 1565
1191 &unused_event)) ;
1192 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1193 { 1567 {
1194 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1195 scrollbar_show (0); 1569 scrollbar_show (0);
1196 } 1570 }
1197#ifdef MENUBAR 1571#ifdef MENUBAR
1198 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1199 menubar_expose (); 1573 menubar_expose ();
1200#endif 1574#endif
1575
1576#ifdef TRANSPARENT
1577 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window);
1579#endif
1201 } 1580 }
1202 break; 1581 break;
1203 1582
1204 case MotionNotify: 1583 case MotionNotify:
1205#ifdef POINTER_BLANK 1584#ifdef POINTER_BLANK
… …
1211 { 1590 {
1212 menubar_control (ev.xbutton); 1591 menubar_control (ev.xbutton);
1213 break; 1592 break;
1214 } 1593 }
1215#endif 1594#endif
1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1217 break; 1596 break;
1218 1597
1219 if (ev.xany.window == TermWin.vt) 1598 if (ev.xany.window == vt)
1220 { 1599 {
1221 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1600 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1222 { 1601 {
1223 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1224 ; 1603 ;
1225 1604
1226 XQueryPointer (display->display, TermWin.vt, 1605 XQueryPointer (disp, vt,
1227 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1228 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1229 & (ev.xbutton.x), & (ev.xbutton.y), 1608 &ev.xbutton.x, &ev.xbutton.y,
1230 &unused_mask); 1609 &ev.xbutton.state);
1231#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1232 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1233 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1234 { 1613 {
1235#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
1236 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1623 selection_extend (ev.xbutton.x, ev.xbutton.y,
1237 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1624 ev.xbutton.state & Button3Mask ? 2 : 0);
1625
1238#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1239 if (ev.xbutton.y < TermWin.int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1240 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1241 { 1629 {
1242 int dist; 1630 int dist;
1243
1244 pending_scroll_selection=1;
1245 1631
1246 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1247 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
1248 */ 1634 */
1249 if (scroll_selection_delay<=0) 1635 if (!sel_scroll_ev.active)
1250 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1251 1637
1252 /* save the event params so we can highlight 1638 /* save the event params so we can highlight
1253 * the selection in the pending-scroll loop 1639 * the selection in the pending-scroll loop
1254 */ 1640 */
1255 selection_save_x=ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
1256 selection_save_y=ev.xbutton.y; 1642 selection_save_y = ev.xbutton.y;
1257 selection_save_state=
1258 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1643 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1259 1644
1260 /* calc number of lines to scroll */ 1645 /* calc number of lines to scroll */
1261 if (ev.xbutton.y<TermWin.int_bwidth) 1646 if (ev.xbutton.y < int_bwidth)
1262 { 1647 {
1263 scroll_selection_dir = UP; 1648 scroll_selection_dir = UP;
1264 dist = TermWin.int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1265 } 1650 }
1266 else 1651 else
1267 { 1652 {
1268 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1269 dist = ev.xbutton.y - 1654 dist = ev.xbutton.y - (int_bwidth + height);
1270 (TermWin.int_bwidth + TermWin.height);
1271 } 1655 }
1656
1272 scroll_selection_lines= (Pixel2Height (dist)/ 1657 scroll_selection_lines = Pixel2Height (dist)
1273 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1659 + 1;
1274 MIN_IT (scroll_selection_lines, 1660 min_it (scroll_selection_lines,
1275 SELECTION_SCROLL_MAX_LINES); 1661 SELECTION_SCROLL_MAX_LINES);
1276 } 1662 }
1277 else 1663 else
1278 { 1664 {
1279 /* we are within the text window, so we 1665 /* we are within the text window, so we
1280 * shouldn't be scrolling 1666 * shouldn't be scrolling
1281 */ 1667 */
1282 pending_scroll_selection = 0; 1668 if (sel_scroll_ev.active)
1669 sel_scroll_ev.stop();
1283 } 1670 }
1284#endif 1671#endif
1285#ifdef MOUSE_THRESHOLD 1672#ifdef MOUSE_THRESHOLD
1286
1287 } 1673 }
1288#endif 1674#endif
1289
1290 } 1675 }
1291 } 1676 }
1292 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1293 { 1678 {
1294 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1679 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1295 MotionNotify, &ev)) ; 1680 MotionNotify, &ev))
1681 ;
1682
1296 XQueryPointer (display->display, scrollBar.win, 1683 XQueryPointer (disp, scrollBar.win,
1297 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1298 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1299 & (ev.xbutton.x), & (ev.xbutton.y), 1686 &ev.xbutton.x, &ev.xbutton.y,
1300 &unused_mask); 1687 &unused_mask);
1301 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1302 scrollbar_size ()); 1689 scrollbar_size ());
1303 scr_refresh (refresh_type); 1690 scr_refresh (refresh_type);
1304 refresh_limit = 0; 1691 refresh_limit = 0;
… …
1307 break; 1694 break;
1308 } 1695 }
1309} 1696}
1310 1697
1311void 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
1312rxvt_term::rootwin_cb (XEvent &ev) 1769rxvt_term::rootwin_cb (XEvent &ev)
1313{ 1770{
1314 SET_R (this); 1771 SET_R (this);
1315 SET_LOCALE (locale); 1772 SET_LOCALE (locale);
1316 1773
1317 switch (ev.type) 1774 switch (ev.type)
1318 { 1775 {
1319 case PropertyNotify: 1776 case PropertyNotify:
1320 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1321 {
1322 if (ev.xproperty.state == PropertyNewValue)
1323 selection_property (ev.xproperty.window, ev.xproperty.atom);
1324 break;
1325 }
1326#ifdef TRANSPARENT
1327 else
1328 {
1329 /* 1777 /*
1330 * 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,
1331 * 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.
1332 */ 1780 */
1333 if (xa[XA_XROOTPMAPID] == 0)
1334 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1335
1336 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])
1337 return; 1783 return;
1338 }
1339 1784
1340 /* FALLTHROUGH */ 1785 /* FALLTHROUGH */
1341 case ReparentNotify: 1786 case ReparentNotify:
1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1787 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1343 want_full_refresh = 1; 1788 want_refresh = want_full_refresh = 1;
1344 break; 1789 break;
1345#endif
1346 } 1790 }
1347} 1791}
1792#endif
1348 1793
1349void 1794void
1350rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
1351{ 1796{
1352 int reportmode = 0, clickintime; 1797 int reportmode = 0, clickintime;
1353 1798
1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1355 if (!bypass_keystate) 1800 if (!bypass_keystate)
1356 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1801 reportmode = !! (priv_modes & PrivMode_mouse_report);
1802
1357 /* 1803 /*
1358 * VT window processing of button press 1804 * VT window processing of button press
1359 */ 1805 */
1360 if (ev.window == TermWin.vt) 1806 if (ev.window == vt)
1361 { 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
1362 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1817 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1818
1363 if (reportmode) 1819 if (reportmode)
1364 { 1820 {
1365 /* mouse report from vt window */ 1821 /* mouse report from vt window */
1366 /* save the xbutton state (for ButtonRelease) */ 1822 /* save the xbutton state (for ButtonRelease) */
1367 MEvent.state = ev.state; 1823 MEvent.state = ev.state;
… …
1396 } 1852 }
1397 else 1853 else
1398 { 1854 {
1399 if (ev.button != MEvent.button) 1855 if (ev.button != MEvent.button)
1400 MEvent.clicks = 0; 1856 MEvent.clicks = 0;
1857
1401 switch (ev.button) 1858 switch (ev.button)
1402 { 1859 {
1403 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
1404 /* allow shift+left click to extend selection */ 1869 /* allow shift+left click to extend selection */
1405 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1870 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1406 { 1871 {
1407 if (MEvent.button == Button1 && clickintime) 1872 if (MEvent.button == Button1 && clickintime)
1408 selection_rotate (ev.x, ev.y); 1873 selection_rotate (ev.x, ev.y);
1409 else 1874 else
1410 selection_extend (ev.x, ev.y, 1); 1875 selection_extend (ev.x, ev.y, 1);
… …
1425 case Button3: 1890 case Button3:
1426 if (MEvent.button == Button3 && clickintime) 1891 if (MEvent.button == Button3 && clickintime)
1427 selection_rotate (ev.x, ev.y); 1892 selection_rotate (ev.x, ev.y);
1428 else 1893 else
1429 selection_extend (ev.x, ev.y, 1); 1894 selection_extend (ev.x, ev.y, 1);
1895
1430 MEvent.button = Button3; 1896 MEvent.button = Button3;
1431 break; 1897 break;
1432 } 1898 }
1433 } 1899 }
1900
1434 MEvent.time = ev.time; 1901 MEvent.time = ev.time;
1435 return; 1902 return;
1436 } 1903 }
1437 1904
1438 /* 1905 /*
… …
1504 upordown = 1; /* down */ 1971 upordown = 1; /* down */
1505 } 1972 }
1506 if (upordown) 1973 if (upordown)
1507 { 1974 {
1508#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1975#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1976 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1510#endif 1977#endif
1511 if (scr_page (upordown < 0 ? UP : DN, 1)) 1978 if (scr_page (upordown < 0 ? UP : DN, 1))
1512 { 1979 {
1513 if (upordown < 0) 1980 if (upordown < 0)
1514 scrollBar.setUp (); 1981 scrollBar.setUp ();
… …
1530 break; 1997 break;
1531 case R_SB_ALIGN_BOTTOM: 1998 case R_SB_ALIGN_BOTTOM:
1532 csrO = scrollBar.bot - scrollBar.top; 1999 csrO = scrollBar.bot - scrollBar.top;
1533 break; 2000 break;
1534 } 2001 }
2002
1535 if (scrollBar.style == R_SB_XTERM 2003 if (scrollBar.style == R_SB_XTERM
1536 || scrollbar_above_slider (ev.y) 2004 || scrollbar_above_slider (ev.y)
1537 || scrollbar_below_slider (ev.y)) 2005 || scrollbar_below_slider (ev.y))
1538 scr_move_to ( scrollbar_position (ev.y) - csrO, 2006 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1539 scrollbar_size ()); 2007
1540 scrollBar.setMotion (); 2008 scrollBar.setMotion ();
1541 break; 2009 break;
1542 2010
1543 case Button1: 2011 case Button1:
1544 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2012 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1548 case Button3: 2016 case Button3:
1549 if (scrollBar.style != R_SB_XTERM) 2017 if (scrollBar.style != R_SB_XTERM)
1550 { 2018 {
1551 if (scrollbar_above_slider (ev.y)) 2019 if (scrollbar_above_slider (ev.y))
1552# ifdef RXVT_SCROLL_FULL 2020# ifdef RXVT_SCROLL_FULL
1553 scr_page (UP, TermWin.nrow - 1); 2021 scr_page (UP, nrow - 1);
1554# else 2022# else
1555 scr_page (UP, TermWin.nrow / 4); 2023 scr_page (UP, nrow / 4);
1556# endif 2024# endif
1557 else if (scrollbar_below_slider (ev.y)) 2025 else if (scrollbar_below_slider (ev.y))
1558# ifdef RXVT_SCROLL_FULL 2026# ifdef RXVT_SCROLL_FULL
1559 scr_page (DN, TermWin.nrow - 1); 2027 scr_page (DN, nrow - 1);
1560# else 2028# else
1561 scr_page (DN, TermWin.nrow / 4); 2029 scr_page (DN, nrow / 4);
1562# endif 2030# endif
1563 else 2031 else
1564 scrollBar.setMotion (); 2032 scrollBar.setMotion ();
1565 } 2033 }
1566 else 2034 else
1567 { 2035 {
1568 scr_page ((ev.button == Button1 ? DN : UP), 2036 scr_page ((ev.button == Button1 ? DN : UP),
1569 (TermWin.nrow 2037 (nrow
1570 * scrollbar_position (ev.y) 2038 * scrollbar_position (ev.y)
1571 / scrollbar_size ())); 2039 / scrollbar_size ()));
1572 } 2040 }
2041
1573 break; 2042 break;
1574 } 2043 }
1575 } 2044 }
1576 return; 2045 return;
1577 } 2046 }
… …
1589{ 2058{
1590 int reportmode = 0; 2059 int reportmode = 0;
1591 2060
1592 csrO = 0; /* reset csr Offset */ 2061 csrO = 0; /* reset csr Offset */
1593 if (!bypass_keystate) 2062 if (!bypass_keystate)
1594 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2063 reportmode = !! (priv_modes & PrivMode_mouse_report);
1595 2064
1596 if (scrollbar_isUpDn ()) 2065 if (scrollbar_isUpDn ())
1597 { 2066 {
1598 scrollBar.setIdle (); 2067 scrollBar.setIdle ();
1599 scrollbar_show (0); 2068 scrollbar_show (0);
1600#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2069#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1601 refresh_type &= ~SMOOTH_REFRESH; 2070 refresh_type &= ~SMOOTH_REFRESH;
1602#endif 2071#endif
1603
1604 } 2072 }
2073
1605#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
1606 pending_scroll_selection=0; 2075 if (sel_scroll_ev.active)
2076 sel_scroll_ev.stop();
1607#endif 2077#endif
2078
1608 if (ev.window == TermWin.vt) 2079 if (ev.window == vt)
1609 { 2080 {
2081#if ISO_14755
2082 // 5.4
2083 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2084 return;
2085#endif
1610 if (reportmode) 2086 if (reportmode)
1611 { 2087 {
1612 /* mouse report from vt window */ 2088 /* mouse report from vt window */
1613 /* don't report release of wheel "buttons" */ 2089 /* don't report release of wheel "buttons" */
1614 if (ev.button >= 4) 2090 if (ev.button >= 4)
… …
1628 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
1629 mouse_report (ev); 2105 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 return; 2107 return;
1632 } 2108 }
2109
1633 /* 2110 /*
1634 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
1635 * when overriding mouse reporting 2112 * when overriding mouse reporting
1636 */ 2113 */
1637 if (PrivateModes & PrivMode_mouse_report 2114 if (priv_modes & PrivMode_mouse_report
1638 && bypass_keystate 2115 && bypass_keystate
1639 && ev.button == Button1 && MEvent.clicks <= 1) 2116 && ev.button == Button1 && MEvent.clicks <= 1)
1640 selection_extend (ev.x, ev.y, 0); 2117 selection_extend (ev.x, ev.y, 0);
1641 2118
1642 switch (ev.button) 2119 switch (ev.button)
… …
1653 case Button5: 2130 case Button5:
1654 { 2131 {
1655 int i; 2132 int i;
1656 page_dirn v; 2133 page_dirn v;
1657 2134
1658 v = (ev.button == Button4) ? UP : DN; 2135 v = ev.button == Button4 ? UP : DN;
2136
1659 if (ev.state & ShiftMask) 2137 if (ev.state & ShiftMask)
1660 i = 1; 2138 i = 1;
1661 else if ((Options & Opt_mouseWheelScrollPage)) 2139 else if (OPTION (Opt_mouseWheelScrollPage))
1662 i = TermWin.nrow - 1; 2140 i = nrow - 1;
1663 else 2141 else
1664 i = 5; 2142 i = 5;
2143
1665# ifdef MOUSE_SLIP_WHEELING 2144# ifdef MOUSE_SLIP_WHEELING
1666 if (ev.state & ControlMask) 2145 if (ev.state & ControlMask)
1667 { 2146 {
1668 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)
1669 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2152 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2153
2154 slip_wheel_ev.start ();
1670 } 2155 }
2156 else
2157 {
1671# endif 2158# endif
1672# ifdef JUMP_MOUSE_WHEEL 2159# ifdef JUMP_MOUSE_WHEEL
1673 scr_page (v, i);
1674 scr_refresh (SMOOTH_REFRESH);
1675 scrollbar_show (1);
1676# else
1677 while (i--)
1678 {
1679 scr_page (v, 1); 2160 scr_page (v, i);
1680 scr_refresh (SMOOTH_REFRESH); 2161 scr_refresh (SMOOTH_REFRESH);
1681 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
1682 } 2172 }
1683# endif 2173#endif
1684
1685 } 2174 }
1686 break; 2175 break;
1687#endif 2176#endif
1688
1689 } 2177 }
1690 } 2178 }
1691#ifdef MENUBAR 2179#ifdef MENUBAR
1692 else if (isMenuBarWindow (ev.window)) 2180 else if (isMenuBarWindow (ev.window))
1693 menubar_control (ev); 2181 menubar_control (ev);
1694#endif 2182#endif
1695} 2183}
1696 2184
1697#ifdef TRANSPARENT 2185#ifdef TRANSPARENT
1698#if TINTING 2186#if TINTING
1699/* shading taken from eterm-0.9.2 */ 2187/* taken from aterm-0.4.2 */
1700/* RGB 15 */
1701 2188
1702static void 2189typedef uint32_t RUINT32T;
1703shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704{
1705 unsigned char *ptr;
1706 int x, y;
1707 2190
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2191void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2192{
1710 /* No saturation */ 2193 int sh_r, sh_g, sh_b;
1711 for (y = h; --y >= 0;) { 2194 RUINT32T mask_r, mask_g, mask_b;
1712 for (x = -w; x < 0; x++) { 2195 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1713 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;
1714 2199
1715 b = ((uint16_t *) ptr)[x]; 2200 Visual *visual = display->visual;
1716 r = (b & 0x7c00) * rm; 2201
1717 g = (b & 0x3e0) * gm; 2202 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1718 b = (b & 0x1f) * bm; 2203
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2204 /* for convenience */
1720 | ((g >> 8) & 0x3e0) 2205 mask_r = visual->red_mask;
1721 | ((b >> 8) & 0x1f); 2206 mask_g = visual->green_mask;
1722 } 2207 mask_b = visual->blue_mask;
1723 ptr += bpl; 2208
1724 } 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;
1725 } else { 2282 } else {
1726 for (y = h; --y >= 0;) { 2283 if (shade < 0) shade = 0;
1727 for (x = -w; x < 0; x++) { 2284 if (shade > 100) shade = 100;
1728 int r, g, b;
1729 2285
1730 b = ((uint16_t *) ptr)[x]; 2286 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1731 r = (b & 0x7c00) * rm; 2287
1732 g = (b & 0x3e0) * gm; 2288 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1733 b = (b & 0x1f) * bm; 2289 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1734 r |= (!(r >> 15) - 1); 2290 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1735 g |= (!(g >> 10) - 1); 2291 }
1736 b |= (!(b >> 5) - 1); 2292
1737 ((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 */
1738 | ((g >> 8) & 0x3e0) 2294 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1739 | ((b >> 8) & 0x1f); 2295 {
1740 } 2296 unsigned int tmp;
1741 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++)
1742 } 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);
1743 } 2349 }
1744} 2350 break;
1745 2351 }
1746/* RGB 16 */ 2352 case 16:
1747static void 2353 {
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2354 unsigned short *p1, *pf, *p, *pl;
1749{ 2355 p1 = (unsigned short *) srcImage->data;
1750 unsigned char *ptr; 2356 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751 int x, y; 2357 while (p1 < pf)
1752 2358 {
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2359 p = p1;
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2360 pl = p1 + srcImage->width;
1755 /* No saturation */ 2361 for (; p < pl; p++)
1756 for (y = h; --y >= 0;) {
1757 for (x = -w; x < 0; x++) {
1758 int r, g, b;
1759
1760 b = ((uint16_t *) ptr)[x];
1761 r = (b & 0xf800) * rm;
1762 g = (b & 0x7e0) * gm;
1763 b = (b & 0x1f) * bm;
1764 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765 | ((g >> 8) & 0x7e0)
1766 | ((b >> 8) & 0x1f);
1767 }
1768 ptr += bpl;
1769 } 2362 {
1770 } else { 2363 *p = lookup_r[(*p & 0xf800)>>11] |
1771 for (y = h; --y >= 0;) { 2364 lookup_g[(*p & 0x07e0)>> 5] |
1772 for (x = -w; x < 0; x++) { 2365 lookup_b[(*p & 0x001f)];
1773 int r, g, b;
1774
1775 b = ((uint16_t *) ptr)[x];
1776 r = (b & 0xf800) * rm;
1777 g = (b & 0x7e0) * gm;
1778 b = (b & 0x1f) * bm;
1779 r |= (!(r >> 16) - 1);
1780 g |= (!(g >> 11) - 1);
1781 b |= (!(b >> 5) - 1);
1782 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783 | ((g >> 8) & 0x7e0)
1784 | ((b >> 8) & 0x1f);
1785 } 2366 }
1786 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)
1787 } 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);
1788 } 2387 }
1789} 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);
1790 2395
1791/* RGB 24 */ 2396 while (p1 < pf)
1792static void 2397 {
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2398 p = p1;
1794{ 2399 pl = p1 + srcImage->width;
1795 unsigned char *ptr; 2400 for (; p < pl; p++)
1796 int x, y;
1797
1798 ptr = (unsigned char *)data + (w * 3);
1799 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800 /* No saturation */
1801 for (y = h; --y >= 0;) {
1802 for (x = -(w * 3); x < 0; x += 3) {
1803 int r, g, b;
1804
1805 if (byteorder.big_endian()) {
1806 r = (ptr[x + 0] * rm) >> 8;
1807 g = (ptr[x + 1] * gm) >> 8;
1808 b = (ptr[x + 2] * bm) >> 8;
1809 ptr[x + 0] = r;
1810 ptr[x + 1] = g;
1811 ptr[x + 2] = b;
1812 } else {
1813 r = (ptr[x + 2] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 0] * bm) >> 8;
1816 ptr[x + 2] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 0] = b;
1819 }
1820 }
1821 ptr += bpl;
1822 } 2401 {
1823 } else { 2402 *p = lookup_r[(*p & 0xff0000)>>16] |
1824 for (y = h; --y >= 0;) { 2403 lookup_g[(*p & 0x00ff00)>> 8] |
1825 for (x = -(w * 3); x < 0; x += 3) { 2404 lookup_b[(*p & 0x0000ff)] |
1826 int r, g, b; 2405 (*p & ~0xffffff);
1827
1828 if (byteorder.big_endian()) {
1829 r = (ptr[x + 0] * rm) >> 8;
1830 g = (ptr[x + 1] * gm) >> 8;
1831 b = (ptr[x + 2] * bm) >> 8;
1832
1833 r |= (!(r >> 8) - 1);
1834 g |= (!(g >> 8) - 1);
1835 b |= (!(b >> 8) - 1);
1836
1837 ptr[x + 0] = r;
1838 ptr[x + 1] = g;
1839 ptr[x + 2] = b;
1840 } else {
1841 r = (ptr[x + 2] * rm) >> 8;
1842 g = (ptr[x + 1] * gm) >> 8;
1843 b = (ptr[x + 0] * bm) >> 8;
1844
1845 r |= (!(r >> 8) - 1);
1846 g |= (!(g >> 8) - 1);
1847 b |= (!(b >> 8) - 1);
1848
1849 ptr[x + 2] = r;
1850 ptr[x + 1] = g;
1851 ptr[x + 0] = b;
1852 }
1853 } 2406 }
1854 ptr += bpl; 2407 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1855 } 2408 }
2409 break;
2410 }
1856 } 2411 }
1857}
1858 2412
1859/* RGB 32 */ 2413 free (lookup);
1860static void
1861shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862{
1863 unsigned char *ptr;
1864 int x, y;
1865
1866 ptr = (unsigned char *)data + (w * 4);
1867 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868 /* No saturation */
1869 for (y = h; --y >= 0;) {
1870 if (byteorder.big_endian()) {
1871 for (x = -(w * 4); x < 0; x += 4) {
1872 int r, g, b;
1873
1874 r = (ptr[x + 1] * rm) >> 8;
1875 g = (ptr[x + 2] * gm) >> 8;
1876 b = (ptr[x + 3] * bm) >> 8;
1877 ptr[x + 1] = r;
1878 ptr[x + 2] = g;
1879 ptr[x + 3] = b;
1880 }
1881 } else {
1882 for (x = -(w * 4); x < 0; x += 4) {
1883 int r, g, b;
1884
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888 ptr[x + 2] = r;
1889 ptr[x + 1] = g;
1890 ptr[x + 0] = b;
1891 }
1892 }
1893 ptr += bpl;
1894 }
1895 } else {
1896 for (y = h; --y >= 0;) {
1897 for (x = -(w * 4); x < 0; x += 4) {
1898 int r, g, b;
1899
1900 if (byteorder.big_endian()) {
1901 r = (ptr[x + 1] * rm) >> 8;
1902 g = (ptr[x + 2] * gm) >> 8;
1903 b = (ptr[x + 3] * bm) >> 8;
1904
1905 r |= (!(r >> 8) - 1);
1906 g |= (!(g >> 8) - 1);
1907 b |= (!(b >> 8) - 1);
1908
1909 ptr[x + 1] = r;
1910 ptr[x + 2] = g;
1911 ptr[x + 3] = b;
1912 } else {
1913 r = (ptr[x + 2] * rm) >> 8;
1914 g = (ptr[x + 1] * gm) >> 8;
1915 b = (ptr[x + 0] * bm) >> 8;
1916
1917 r |= (!(r >> 8) - 1);
1918 g |= (!(g >> 8) - 1);
1919 b |= (!(b >> 8) - 1);
1920
1921 ptr[x + 2] = r;
1922 ptr[x + 1] = g;
1923 ptr[x + 0] = b;
1924 }
1925 }
1926 ptr += bpl;
1927 }
1928 }
1929} 2414}
1930
1931#endif 2415#endif
1932 2416
1933/* 2417/*
1934 * Check our parents are still who we think they are. 2418 * Check our parents are still who we think they are.
1935 * Do transparency updates if required 2419 * Do transparency updates if required
… …
1942 Atom atype; 2426 Atom atype;
1943 unsigned char *prop = NULL; 2427 unsigned char *prop = NULL;
1944 Window root, oldp, *list; 2428 Window root, oldp, *list;
1945 Pixmap rootpixmap = None; 2429 Pixmap rootpixmap = None;
1946 XWindowAttributes wattr, wrootattr; 2430 XWindowAttributes wattr, wrootattr;
2431 dDisp;
1947 2432
1948 pchanged = 0; 2433 pchanged = 0;
1949 2434
1950 if (!(Options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
1951 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
1952 2437
1953 XGetWindowAttributes (display->display, display->root, &wrootattr); 2438 XGetWindowAttributes (disp, display->root, &wrootattr);
1954 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
1955 2440
1956 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2441 XGetWindowAttributes (disp, parent[0], &wattr);
1957 2442
1958 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
1959 { 2444 {
1960 if (am_transparent) 2445 if (am_transparent)
1961 { 2446 {
1962 pchanged = 1; 2447 pchanged = 1;
1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2448 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1964 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
1965 } 2450 }
1966 2451
1967 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
1968 } 2453 }
1969 2454
1970 /* 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. */
1971 XSync (display->display, False); 2456 XSync (disp, False);
1972 2457
1973 /* 2458 /*
1974 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
1975 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
1976 * 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.
1977 */ 2462 */
1978 i = (xa[XA_XROOTPMAPID] 2463 i = (xa[XA_XROOTPMAP_ID]
1979 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2464 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1980 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1981 &nitems, &bytes_after, &prop) == Success); 2466 &nitems, &bytes_after, &prop) == Success);
1982 2467
1983 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
1984 i = (xa[XA_XSETROOTID] 2469 i = (xa[XA_ESETROOT_PMAP_ID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2470 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success); 2472 &nitems, &bytes_after, &prop) == Success);
1988 2473
1989 if (!i || prop == NULL) 2474 if (!i || prop == NULL
2475#if TINTING
2476 || !rs[Rs_color + Color_tint]
2477#endif
2478 )
1990 have_pixmap = 0; 2479 have_pixmap = 0;
1991 else 2480 else
1992 { 2481 {
1993 have_pixmap = 1; 2482 have_pixmap = 1;
1994 rootpixmap = *(Pixmap *)prop; 2483 rootpixmap = *(Pixmap *)prop;
… …
2005 Window cr; 2494 Window cr;
2006 XImage *image; 2495 XImage *image;
2007 GC gc; 2496 GC gc;
2008 XGCValues gcvalue; 2497 XGCValues gcvalue;
2009 2498
2010 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2499 XTranslateCoordinates (disp, parent[0], display->root,
2011 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2012 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2013 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2014 nx = ny = 0; 2503 nx = ny = 0;
2015 2504
… …
2025 nh += sy; 2514 nh += sy;
2026 ny = -sy; 2515 ny = -sy;
2027 sy = 0; 2516 sy = 0;
2028 } 2517 }
2029 2518
2030 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (disp, False);
2032 allowedxerror = -1; 2523 allowedxerror = -1;
2033 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034 2525
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2037 allowedxerror = 0; 2528 allowedxerror = 0;
2038 2529
2039 if (image == NULL) 2530 if (image == NULL)
2040 { 2531 {
2041 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2042 { 2533 {
2043 pchanged = 1; 2534 pchanged = 1;
2044 if (TermWin.pixmap != None) 2535 if (pixmap != None)
2045 { 2536 {
2046 XFreePixmap (display->display, TermWin.pixmap); 2537 XFreePixmap (disp, pixmap);
2047 TermWin.pixmap = None; 2538 pixmap = None;
2048 } 2539 }
2049 } 2540 }
2050 2541
2051 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2052 } 2543 }
2053 else 2544 else
2054 { 2545 {
2055 if (TermWin.pixmap != None) 2546 if (pixmap != None)
2056 XFreePixmap (display->display, TermWin.pixmap); 2547 XFreePixmap (disp, pixmap);
2057 2548
2058#if TINTING 2549#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2060 { 2551 {
2061 unsigned short shade, rm, gm, bm; 2552 unsigned short rm, gm, bm;
2553 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2062 2554
2063 PixColors[Color_tint].get (display, rm, gm, bm); 2555 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2064 2556
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2557 ShadeXImage (display, image, shade, rm, gm, bm);
2066
2067 /* Determine bitshift and bitmask values */
2068 switch (image->bits_per_pixel)
2069 {
2070 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074 }
2075 } 2558 }
2076#endif 2559#endif
2077 2560
2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2561 pixmap = XCreatePixmap (disp, vt,
2079 szHint.width, szHint.height, image->depth); 2562 szHint.width, szHint.height, image->depth);
2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2563 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2564 XPutImage (disp, pixmap, gc, image, 0, 0,
2082 nx, ny, image->width, image->height); 2565 nx, ny, image->width, image->height);
2083 XFreeGC (display->display, gc); 2566 XFreeGC (disp, gc);
2084 XDestroyImage (image); 2567 XDestroyImage (image);
2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2568 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2086 TermWin.pixmap); 2569 XClearWindow (disp, parent[0]);
2087 2570
2088 if (!am_transparent || !am_pixmap_trans) 2571 if (!am_transparent || !am_pixmap_trans)
2089 pchanged = 1; 2572 pchanged = 1;
2090 2573
2091 am_transparent = am_pixmap_trans = 1; 2574 am_transparent = am_pixmap_trans = 1;
2092 } 2575 }
2093 } 2576 }
2094 2577
2095 if (!am_pixmap_trans) 2578 if (am_pixmap_trans)
2579 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2580 else
2096 { 2581 {
2097 unsigned int n; 2582 unsigned int n;
2098 /* 2583 /*
2099 * InheritPixmap transparency 2584 * InheritPixmap transparency
2100 */ 2585 */
2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2586 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2103 { 2587 {
2104 oldp = TermWin.parent[i]; 2588 oldp = parent[i];
2105 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2589 XQueryTree (disp, parent[i - 1], &root,
2106 &TermWin.parent[i], &list, &n); 2590 &parent[i], &list, &n);
2107 XFree (list); 2591 XFree (list);
2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109 2592
2110 if (TermWin.parent[i] == display->root) 2593 if (parent[i] == display->root)
2111 { 2594 {
2112 if (oldp != None) 2595 if (oldp != None)
2113 pchanged = 1; 2596 pchanged = 1;
2114 2597
2115 break; 2598 break;
2116 } 2599 }
2117 2600
2118 if (oldp != TermWin.parent[i]) 2601 if (oldp != parent[i])
2119 pchanged = 1; 2602 pchanged = 1;
2120 } 2603 }
2121 2604
2122 n = 0; 2605 n = 0;
2123 2606
2124 if (pchanged) 2607 if (pchanged)
2125 { 2608 {
2126 for (; n < (unsigned int)i; n++) 2609 for (; n < (unsigned int)i; n++)
2127 { 2610 {
2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2611 XGetWindowAttributes (disp, parent[n], &wattr);
2129 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2130 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2612 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2131 { 2613 {
2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2614 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2133 break; 2615 break;
2134 } 2616 }
2135 } 2617 }
2136 } 2618 }
2137 2619
2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2620 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2139 { 2621 {
2140 D_X ((stderr, "InheritPixmap Turning off"));
2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2622 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2623 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2143 am_transparent = 0; 2624 am_transparent = 0;
2144 /* XXX: also turn off Opt_transparent? */ 2625 /* XXX: also turn off Opt_transparent? */
2145 } 2626 }
2146 else 2627 else
2147 { 2628 {
2148#if WAIT_FOR_WM 2629#if WAIT_FOR_WM
2149 /* wait (an arbitrary period) for the WM to do its thing 2630 /* wait (an arbitrary period) for the WM to do its thing
2150 * needed for fvwm2.2.2 (and before?) */ 2631 * needed for fvwm2.2.2 (and before?) */
2151 sleep (1); 2632 sleep (1);
2152#endif 2633#endif
2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154 for (n = 0; n < (unsigned int)i; n++) 2634 for (n = 0; n < (unsigned int)i; n++)
2635 {
2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2637 XClearWindow (disp, parent[n]);
2638 }
2156 2639
2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2158 am_transparent = 1; 2641 am_transparent = 1;
2159 } 2642 }
2160 2643
2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2162 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 ();
2163 } 2660 }
2164 2661
2165 return pchanged; 2662 return pchanged;
2166} 2663}
2167#endif 2664#endif
… …
2186 if (ch == NOCHAR) // TODO: improve 2683 if (ch == NOCHAR) // TODO: improve
2187 break; 2684 break;
2188 2685
2189 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)
2190 { 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
2191 /* Read a text string from the input buffer */ 2702 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ]; 2703 unicode_t buf[UBUFSIZ];
2193 bool refreshnow = false; 2704 bool refreshnow = false;
2194 int nlines = 0; 2705 int nlines = 0;
2195 unicode_t *str = buf; 2706 unicode_t *str = buf;
2196 2707 unicode_t *eol = str + min (ncol, UBUFSIZ);
2197 *str++ = ch;
2198 2708
2199 for (;;) 2709 for (;;)
2200 { 2710 {
2201 seq_begin = cmdbuf_ptr;
2202 ch = next_char ();
2203
2204 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))
2205 break; 2712 break;
2206 2713
2207 *str++ = ch; 2714 *str++ = ch;
2208 2715
2209 if (ch == C0_LF) 2716 if (ch == C0_LF || str >= eol)
2210 { 2717 {
2718 if (ch == C0_LF)
2211 nlines++; 2719 nlines++;
2720
2212 refresh_count++; 2721 refresh_count++;
2213 2722
2214 if (! (Options & Opt_jumpScroll) 2723 if (!OPTION (Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2216 { 2725 {
2217 refreshnow = true; 2726 refreshnow = true;
2218 flag = true; 2727 refresh_count = 0;
2219 ch = NOCHAR; 2728 ch = NOCHAR;
2220 break; 2729 break;
2221 } 2730 }
2222 2731
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2732 // scr_add_lines only works for nlines <= nrow - 1.
2224 if (nlines >= TermWin.nrow - 1) 2733 if (nlines >= nrow - 1)
2225 { 2734 {
2226 scr_add_lines (buf, nlines, str - buf); 2735 scr_add_lines (buf, nlines, str - buf);
2227 nlines = 0; 2736 nlines = 0;
2228 str = buf; 2737 str = buf;
2738 eol = str + min (ncol, UBUFSIZ);
2229 } 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
2230 } 2752 }
2231 2753
2232 if (str >= buf + UBUFSIZ) 2754 seq_begin = cmdbuf_ptr;
2233 { 2755 ch = next_char ();
2234 ch = NOCHAR;
2235 break;
2236 }
2237 } 2756 }
2238 2757
2239 scr_add_lines (buf, nlines, str - buf); 2758 scr_add_lines (buf, nlines, str - buf);
2240 2759
2241 /* 2760 /*
2242 * 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
2243 * 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.
2244 * the number of pages between refreshes is refresh_limit, which 2763 * the number of pages between refreshes is refresh_limit, which
2245 * is incremented here because we must be doing flat-out scrolling. 2764 * is incremented here because we must be doing flat-out scrolling.
2246 *
2247 * refreshing should be correct for small scrolls, because of the
2248 * time-out
2249 */ 2765 */
2250 if (refreshnow) 2766 if (refreshnow)
2251 { 2767 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2768 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++; 2769 refresh_limit++;
2254 else 2770 else
2771 {
2772 flag = true;
2255 scr_refresh (refresh_type); 2773 scr_refresh (refresh_type);
2774 flush_ev.stop ();
2775 }
2256 } 2776 }
2257 2777
2258 } 2778 }
2259 else 2779 else
2260 { 2780 {
… …
2274 } 2794 }
2275 2795
2276 return flag; 2796 return flag;
2277} 2797}
2278 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
2279// read the next character 2808// read the next character
2280unicode_t 2809unicode_t
2281rxvt_term::next_char () 2810rxvt_term::next_char ()
2282{ 2811{
2283 while (cmdbuf_ptr < cmdbuf_endp) 2812 while (cmdbuf_ptr < cmdbuf_endp)
… …
2299 if (len == (size_t)-1) 2828 if (len == (size_t)-1)
2300 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
2301 2830
2302 // assume wchar == unicode 2831 // assume wchar == unicode
2303 cmdbuf_ptr += len; 2832 cmdbuf_ptr += len;
2304 return wc; 2833 return wc & UNICODE_MASK;
2305 } 2834 }
2306 2835
2307 return NOCHAR; 2836 return NOCHAR;
2308} 2837}
2309 2838
… …
2314 */ 2843 */
2315unicode_t 2844unicode_t
2316rxvt_term::cmd_getc () 2845rxvt_term::cmd_getc ()
2317{ 2846{
2318 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 ();
2319 2859
2320 if (c == NOCHAR) 2860 if (c == NOCHAR)
2321 throw out_of_input; 2861 throw out_of_input;
2322 2862
2323 return c; 2863 return c;
… …
2424 process_escape_seq (); 2964 process_escape_seq ();
2425 break; 2965 break;
2426 case C0_ENQ: /* terminal Status */ 2966 case C0_ENQ: /* terminal Status */
2427 if (rs[Rs_answerbackstring]) 2967 if (rs[Rs_answerbackstring])
2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2968 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2429 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2969 (unsigned int)strlen (rs[Rs_answerbackstring]));
2430 else 2970 else
2431 tt_write ((unsigned char *)VT100_ANS, 2971 tt_write ((unsigned char *)VT100_ANS,
2432 (unsigned int)STRLEN (VT100_ANS)); 2972 (unsigned int)strlen (VT100_ANS));
2433 break; 2973 break;
2434 case C0_BEL: /* bell */ 2974 case C0_BEL: /* bell */
2435 scr_bell (); 2975 scr_bell ();
2436 break; 2976 break;
2437 case C0_BS: /* backspace */ 2977 case C0_BS: /* backspace */
… …
2453 break; 2993 break;
2454 case C0_SI: /* shift in - acs */ 2994 case C0_SI: /* shift in - acs */
2455 scr_charset_choose (0); 2995 scr_charset_choose (0);
2456 break; 2996 break;
2457 2997
2998#ifdef EIGHT_BIT_CONTROLS
2458 // 8-bit controls 2999 // 8-bit controls
2459 case 0x90: /* DCS */ 3000 case 0x90: /* DCS */
2460 process_dcs_seq (); 3001 process_dcs_seq ();
2461 break; 3002 break;
2462 case 0x9b: /* CSI */ 3003 case 0x9b: /* CSI */
2463 process_csi_seq (); 3004 process_csi_seq ();
2464 break; 3005 break;
2465 case 0x9d: /* CSI */ 3006 case 0x9d: /* CSI */
2466 process_osc_seq (); 3007 process_osc_seq ();
2467 break; 3008 break;
3009#endif
2468 } 3010 }
2469} 3011}
2470/*}}} */ 3012/*}}} */
2471 3013
2472 3014
… …
2534void 3076void
2535rxvt_term::process_escape_seq () 3077rxvt_term::process_escape_seq ()
2536{ 3078{
2537 unicode_t ch = cmd_getc (); 3079 unicode_t ch = cmd_getc ();
2538 3080
2539 if (PrivateModes & PrivMode_vt52) 3081 if (priv_modes & PrivMode_vt52)
2540 { 3082 {
2541 process_escape_vt52 (ch); 3083 process_escape_vt52 (ch);
2542 return; 3084 return;
2543 } 3085 }
2544 3086
… …
2559 scr_charset_set (2, (unsigned int)cmd_getc ()); 3101 scr_charset_set (2, (unsigned int)cmd_getc ());
2560 break; 3102 break;
2561 case '+': 3103 case '+':
2562 scr_charset_set (3, (unsigned int)cmd_getc ()); 3104 scr_charset_set (3, (unsigned int)cmd_getc ());
2563 break; 3105 break;
2564#ifndef NO_FRILLS 3106#if ENABLE_FRILLS
2565 case '6': 3107 case '6':
2566 scr_backindex (); 3108 scr_backindex ();
2567 break; 3109 break;
2568#endif 3110#endif
2569 case '7': 3111 case '7':
2570 scr_cursor (SAVE); 3112 scr_cursor (SAVE);
2571 break; 3113 break;
2572 case '8': 3114 case '8':
2573 scr_cursor (RESTORE); 3115 scr_cursor (RESTORE);
2574 break; 3116 break;
2575#ifndef NO_FRILLS 3117#if ENABLE_FRILLS
2576 case '9': 3118 case '9':
2577 scr_forwardindex (); 3119 scr_forwardindex ();
2578 break; 3120 break;
2579#endif 3121#endif
2580 case '=': 3122 case '=':
… …
2661 3203
2662/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3204/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663/* *INDENT-OFF* */ 3205/* *INDENT-OFF* */
2664enum { 3206enum {
2665 CSI_ICH = 0x40, 3207 CSI_ICH = 0x40,
2666 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3208 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2667 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3209 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2668 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3210 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2669 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3211 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2670 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3212 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2671 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3213 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2759 { 3301 {
2760 switch (priv) 3302 switch (priv)
2761 { 3303 {
2762 case '>': 3304 case '>':
2763 if (ch == CSI_DA) /* secondary device attributes */ 3305 if (ch == CSI_DA) /* secondary device attributes */
2764 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3306 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2765 break; 3307 break;
2766 case '?': 3308 case '?':
2767 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3309 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2768 process_terminal_mode (ch, priv, nargs, arg); 3310 process_terminal_mode (ch, priv, nargs, arg);
2769 break; 3311 break;
… …
2874 3416
2875 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3417 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2876 arg[0] = -arg[0]; 3418 arg[0] = -arg[0];
2877 /* FALLTHROUGH */ 3419 /* FALLTHROUGH */
2878 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2879 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2880 break; 3422 break;
2881 3423
2882 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2883 tt_write ((const unsigned char *)VT100_ANS, 3425 tt_write ((const unsigned char *)VT100_ANS,
2884 (unsigned int) (sizeof (VT100_ANS) - 1)); 3426 (unsigned int) (sizeof (VT100_ANS) - 1));
2885 break; 3427 break;
2886 3428
2887 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3429 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2888 process_sgr_mode (nargs, arg); 3430 process_sgr_mode (nargs, arg);
2889 break; 3431 break;
… …
2896 break; 3438 break;
2897 case 6: /* CPR requested */ 3439 case 6: /* CPR requested */
2898 scr_report_position (); 3440 scr_report_position ();
2899 break; 3441 break;
2900 case 7: /* unofficial extension */ 3442 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure) 3443 if (OPTION (Opt_insecure))
2902 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3444 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2903 break; 3445 break;
2904 case 8: /* unofficial extension */ 3446 case 8: /* unofficial extension */
2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3447 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2906 break; 3448 break;
2907 } 3449 }
… …
2943 break; 3485 break;
2944 3486
2945 case CSI_RM: /* 8.3.107: RESET MODE */ 3487 case CSI_RM: /* 8.3.107: RESET MODE */
2946 if (arg[0] == 4) 3488 if (arg[0] == 4)
2947 scr_insert_mode (0); 3489 scr_insert_mode (0);
3490 else if (arg[0] == 20)
3491 priv_modes &= ~PrivMode_LFNL;
2948 break; 3492 break;
2949 3493
2950 case CSI_SM: /* 8.3.126: SET MODE */ 3494 case CSI_SM: /* 8.3.126: SET MODE */
2951 if (arg[0] == 4) 3495 if (arg[0] == 4)
2952 scr_insert_mode (1); 3496 scr_insert_mode (1);
3497 else if (arg[0] == 20)
3498 priv_modes |= PrivMode_LFNL;
2953 break; 3499 break;
2954 3500
2955 /* 3501 /*
2956 * PRIVATE USE beyond this point. All CSI_7? sequences here 3502 * PRIVATE USE beyond this point. All CSI_7? sequences here
2957 */ 3503 */
… …
2969 break; 3515 break;
2970 case CSI_75: 3516 case CSI_75:
2971 scr_cursor (RESTORE); 3517 scr_cursor (RESTORE);
2972 break; 3518 break;
2973 3519
2974#ifndef NO_FRILLS 3520#if ENABLE_FRILLS
2975 case CSI_74: 3521 case CSI_74:
2976 process_window_ops (arg, nargs); 3522 process_window_ops (arg, nargs);
2977 break; 3523 break;
2978#endif 3524#endif
2979 3525
… …
2986 break; 3532 break;
2987 } 3533 }
2988} 3534}
2989/*}}} */ 3535/*}}} */
2990 3536
2991#ifndef NO_FRILLS 3537#if ENABLE_FRILLS
2992/* ARGSUSED */ 3538/* ARGSUSED */
2993void 3539void
2994rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3540rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2995{ 3541{
2996 int x, y; 3542 int x, y;
2997 XWindowAttributes wattr; 3543 XWindowAttributes wattr;
2998 Window wdummy; 3544 Window wdummy;
3545 dDisp;
2999 3546
3000 if (nargs == 0) 3547 if (nargs == 0)
3001 return; 3548 return;
3002 3549
3003 switch (args[0]) 3550 switch (args[0])
3004 { 3551 {
3005 /* 3552 /*
3006 * commands 3553 * commands
3007 */ 3554 */
3008 case 1: /* deiconify window */ 3555 case 1: /* deiconify window */
3009 XMapWindow (display->display, TermWin.parent[0]); 3556 XMapWindow (disp, parent[0]);
3010 break; 3557 break;
3011 case 2: /* iconify window */ 3558 case 2: /* iconify window */
3012 XIconifyWindow (display->display, TermWin.parent[0], 3559 XIconifyWindow (disp, parent[0], display->screen);
3013 DefaultScreen (display->display));
3014 break; 3560 break;
3015 case 3: /* set position (pixels) */ 3561 case 3: /* set position (pixels) */
3016 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3562 XMoveWindow (disp, parent[0], args[1], args[2]);
3017 break; 3563 break;
3018 case 4: /* set size (pixels) */ 3564 case 4: /* set size (pixels) */
3019 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3565 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3020 break; 3566 break;
3021 case 5: /* raise window */ 3567 case 5: /* raise window */
3022 XRaiseWindow (display->display, TermWin.parent[0]); 3568 XRaiseWindow (disp, parent[0]);
3023 break; 3569 break;
3024 case 6: /* lower window */ 3570 case 6: /* lower window */
3025 XLowerWindow (display->display, TermWin.parent[0]); 3571 XLowerWindow (disp, parent[0]);
3026 break; 3572 break;
3027 case 7: /* refresh window */ 3573 case 7: /* refresh window */
3028 scr_touch (true); 3574 scr_touch (true);
3029 break; 3575 break;
3030 case 8: /* set size (chars) */ 3576 case 8: /* set size (chars) */
3031 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3577 set_widthheight ((unsigned int) (args[2] * fwidth),
3032 (unsigned int) (args[1] * TermWin.fheight)); 3578 (unsigned int) (args[1] * fheight));
3033 break; 3579 break;
3034 3580
3035 //case 9: NYI, TODO, restore maximized window or maximize window 3581 //case 9: NYI, TODO, restore maximized window or maximize window
3036 default: 3582 default:
3037 if (args[0] >= 24) /* set height (chars) */ 3583 if (args[0] >= 24) /* set height (chars) */
3038 set_widthheight ((unsigned int)TermWin.width, 3584 set_widthheight ((unsigned int)width,
3039 (unsigned int) (args[1] * TermWin.fheight)); 3585 (unsigned int) (args[1] * fheight));
3040 break; 3586 break;
3041 3587
3042 3588
3043 /* 3589 /*
3044 * reports - some output format copied from XTerm 3590 * reports - some output format copied from XTerm
3045 */ 3591 */
3046 case 11: /* report window state */ 3592 case 11: /* report window state */
3047 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3593 XGetWindowAttributes (disp, parent[0], &wattr);
3048 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3594 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3049 break; 3595 break;
3050 case 13: /* report window position */ 3596 case 13: /* report window position */
3051 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3597 XGetWindowAttributes (disp, parent[0], &wattr);
3052 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3598 XTranslateCoordinates (disp, parent[0], wattr.root,
3053 -wattr.border_width, -wattr.border_width, 3599 -wattr.border_width, -wattr.border_width,
3054 &x, &y, &wdummy); 3600 &x, &y, &wdummy);
3055 tt_printf ("\033[3;%d;%dt", x, y); 3601 tt_printf ("\033[3;%d;%dt", x, y);
3056 break; 3602 break;
3057 case 14: /* report window size (pixels) */ 3603 case 14: /* report window size (pixels) */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3604 XGetWindowAttributes (disp, parent[0], &wattr);
3059 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3605 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3060 break; 3606 break;
3061 case 18: /* report text area size (chars) */ 3607 case 18: /* report text area size (chars) */
3062 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3608 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3063 break; 3609 break;
3064 case 19: /* report window size (chars) */ 3610 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3611 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3066 break; 3612 break;
3067 case 20: /* report icon label */ 3613 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 { 3614 {
3070 char *s; 3615 char *s;
3071 XGetIconName (display->display, TermWin.parent[0], &s); 3616 XGetIconName (disp, parent[0], &s);
3072 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);
3073 } 3619 }
3074 break; 3620 break;
3075 case 21: /* report window title */ 3621 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 { 3622 {
3078 char *s; 3623 char *s;
3079 XFetchName (display->display, TermWin.parent[0], &s); 3624 XFetchName (disp, parent[0], &s);
3080 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);
3081 } 3627 }
3082 break; 3628 break;
3083 } 3629 }
3084} 3630}
3085#endif 3631#endif
3086 3632
… …
3090 * ends_how is terminator used. returned input must be free()'d 3636 * ends_how is terminator used. returned input must be free()'d
3091 */ 3637 */
3092unsigned char * 3638unsigned char *
3093rxvt_term::get_to_st (unicode_t &ends_how) 3639rxvt_term::get_to_st (unicode_t &ends_how)
3094{ 3640{
3095 int seen_esc = 0; /* seen escape? */ 3641 unicode_t ch;
3642 bool seen_esc = false;
3096 unsigned int n = 0; 3643 unsigned int n = 0;
3097 unsigned char *s;
3098 unicode_t ch;
3099 unsigned char string[STRING_MAX]; 3644 wchar_t string[STRING_MAX];
3100 3645
3101 while ((ch = cmd_getc ())) 3646 while ((ch = cmd_getc ()) != NOCHAR)
3102 { 3647 {
3103 if (ch == C0_BEL || ch == CHAR_ST)
3104 break;
3105
3106 if (seen_esc) 3648 if (seen_esc)
3649 {
3107 if (ch == 0x5c) /* 7bit ST */ 3650 if (ch == 0x5c) /* 7bit ST */
3108 break; 3651 break;
3109 else 3652 else
3110 return NULL; 3653 return NULL;
3111 3654 }
3112 if (ch == C0_ESC) 3655 else if (ch == C0_ESC)
3113 { 3656 {
3114 seen_esc = 1; 3657 seen_esc = true;
3115 continue; 3658 continue;
3116 } 3659 }
3660 else if (ch == C0_BEL || ch == CHAR_ST)
3661 break;
3117 else if (ch == C0_HT) 3662 else if (ch < 0x20)
3118 ch = ' '; /* translate '\t' to space */
3119 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
3120 return NULL; /* other control character - exit */ 3663 return NULL; /* other control character - exit */
3121 3664
3122 if (n >= sizeof (string) - 1) 3665 seen_esc = false;
3666
3667 if (n >= STRING_MAX - 1)
3123 // stop at some sane length 3668 // stop at some sane length
3124 return NULL; 3669 return NULL;
3125 3670
3671 if (ch == C0_SYN)
3672 string[n++] = cmd_get8 ();
3673 else
3126 string[n++] = ch; 3674 string[n++] = ch;
3127 seen_esc = 0;
3128 } 3675 }
3129 3676
3130 string[n++] = '\0'; 3677 string[n++] = '\0';
3131 3678
3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3133 return NULL;
3134
3135 ends_how = (ch == 0x5c ? C0_ESC : ch); 3679 ends_how = (ch == 0x5c ? C0_ESC : ch);
3136 STRNCPY (s, string, n); 3680
3137 return s; 3681 return (unsigned char *)rxvt_wcstombs (string);
3138} 3682}
3139 3683
3140/*----------------------------------------------------------------------*/ 3684/*----------------------------------------------------------------------*/
3141/* 3685/*
3142 * 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)'
… …
3186void 3730void
3187rxvt_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)
3188{ 3732{
3189 if (str[0] == '?' && !str[1]) 3733 if (str[0] == '?' && !str[1])
3190 { 3734 {
3191 if (Options & Opt_insecure)
3192 {
3193 unsigned short r, g, b; 3735 unsigned short r, g, b;
3194 PixColors[color].get (display, r, g, b); 3736 pix_colors_focused[color].get (display, r, g, b);
3195 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);
3196 }
3197 } 3738 }
3198 else 3739 else
3199 set_window_color (color, str); 3740 set_window_color (color, str);
3200} 3741}
3201 3742
3202/* 3743/*
3203 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3744 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3204 * 0 = change iconName/title
3205 * 1 = change iconName
3206 * 2 = change title
3207 * 4 = change color
3208 * 10 = change fg color
3209 * 11 = change bg color
3210 * 12 = change text color
3211 * 13 = change mouse foreground color
3212 * 17 = change highlight character colour
3213 * 18 = change bold character color
3214 * 19 = change underlined character color
3215 * 46 = change logfile (not implemented)
3216 * 50 = change font
3217 *
3218 * rxvt extensions:
3219 * 20 = bg pixmap
3220 * 39 = change default fg color
3221 * 49 = change default bg color
3222 * 55 = dump scrollback buffer and all of screen
3223 * 701 = change locale
3224 * 702 = find font
3225 * 703 = menu
3226 */ 3745 */
3227void 3746void
3228rxvt_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)
3229{ 3748{
3230 int changed = 0; 3749 int changed = 0;
3231 int color; 3750 int color;
3232 char *buf, *name; 3751 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1]; 3752 bool query = str[0] == '?' && !str[1];
3753 int saveop = op;
3754 dDisp;
3234 3755
3235 assert (str != NULL); 3756 assert (str != NULL);
3236 switch (op) 3757 switch (op)
3237 { 3758 {
3238 case XTerm_name: 3759 case XTerm_name:
… …
3245 set_title (str); 3766 set_title (str);
3246 break; 3767 break;
3247 case XTerm_property: 3768 case XTerm_property:
3248 if (str[0] == '?') 3769 if (str[0] == '?')
3249 { 3770 {
3250 Atom prop = XInternAtom (display->display, str + 1, True); 3771 Atom prop = display->atom (str + 1);
3251 Atom actual_type; 3772 Atom actual_type;
3252 int actual_format; 3773 int actual_format;
3253 unsigned long nitems; 3774 unsigned long nitems;
3254 unsigned long bytes_after; 3775 unsigned long bytes_after;
3255 unsigned char *value = 0; 3776 unsigned char *value = 0;
3256 const char *str = ""; 3777 const char *str = "";
3257 3778
3258 if (prop 3779 if (prop
3259 && XGetWindowProperty (display->display, TermWin.parent[0], 3780 && XGetWindowProperty (disp, parent[0],
3260 prop, 0, 1<<16, 0, AnyPropertyType, 3781 prop, 0, 1<<16, 0, AnyPropertyType,
3261 &actual_type, &actual_format, 3782 &actual_type, &actual_format,
3262 &nitems, &bytes_after, &value) == Success 3783 &nitems, &bytes_after, &value) == Success
3263 && actual_type != None 3784 && actual_type != None
3264 && actual_format == 8) 3785 && actual_format == 8)
… …
3273 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3794 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3274 3795
3275 if (eq) 3796 if (eq)
3276 { 3797 {
3277 *eq = 0; 3798 *eq = 0;
3278 XChangeProperty (display->display, TermWin.parent[0], 3799 set_utf8_property (display->atom (str), eq + 1);
3279 display->atom (str), XA_STRING, 8,
3280 PropModeReplace, (unsigned char *)eq + 1,
3281 strlen (eq + 1));
3282 } 3800 }
3283 else 3801 else
3284 XDeleteProperty (display->display, TermWin.parent[0], 3802 XDeleteProperty (disp, parent[0],
3285 display->atom (str)); 3803 display->atom (str));
3286 } 3804 }
3287 break; 3805 break;
3288 3806
3289 case XTerm_Color: 3807 case XTerm_Color:
3290 for (buf = (char *)str; buf && *buf;) 3808 for (buf = (char *)str; buf && *buf;)
3291 { 3809 {
3292 if ((name = STRCHR (buf, ';')) == NULL) 3810 if ((name = strchr (buf, ';')) == NULL)
3293 break; 3811 break;
3294 3812
3295 *name++ = '\0'; 3813 *name++ = '\0';
3296 color = atoi (buf); 3814 color = atoi (buf);
3297 3815
3298 if (color < 0 || color >= TOTAL_COLORS) 3816 if (color < 0 || color >= TOTAL_COLORS)
3299 break; 3817 break;
3300 3818
3301 if ((buf = STRCHR (name, ';')) != NULL) 3819 if ((buf = strchr (name, ';')) != NULL)
3302 *buf++ = '\0'; 3820 *buf++ = '\0';
3303 3821
3304 if (name[0] == '?' && !name[1]) 3822 if (name[0] == '?' && !name[1])
3305 { 3823 {
3306 if (Options & Opt_insecure)
3307 {
3308 unsigned short r, g, b; 3824 unsigned short r, g, b;
3309 PixColors[color + minCOLOR].get (display, r, g, b); 3825 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3310 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);
3311 }
3312 } 3827 }
3313 else 3828 else
3314 set_window_color (color + minCOLOR, name); 3829 set_window_color (color + minCOLOR, name);
3315 } 3830 }
3316 break; 3831 break;
… …
3338 case XTerm_Color_UL: 3853 case XTerm_Color_UL:
3339 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3854 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3340 break; 3855 break;
3341 case XTerm_Color_RV: 3856 case XTerm_Color_RV:
3342 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;
3343 break; 3869 break;
3344#endif 3870#endif
3345 3871
3346 case XTerm_Pixmap: 3872 case XTerm_Pixmap:
3347 if (*str != ';') 3873 if (*str != ';')
… …
3350 scale_pixmap (""); /* reset to default scaling */ 3876 scale_pixmap (""); /* reset to default scaling */
3351 set_bgPixmap (str); /* change pixmap */ 3877 set_bgPixmap (str); /* change pixmap */
3352#endif 3878#endif
3353 scr_touch (true); 3879 scr_touch (true);
3354 } 3880 }
3355 while ((str = STRCHR (str, ';')) != NULL) 3881 while ((str = strchr (str, ';')) != NULL)
3356 { 3882 {
3357 str++; 3883 str++;
3358#if XPM_BACKGROUND 3884#if XPM_BACKGROUND
3359 changed += scale_pixmap (str); 3885 changed += scale_pixmap (str);
3360#endif 3886#endif
3361
3362 } 3887 }
3888
3363 if (changed) 3889 if (changed)
3364 { 3890 {
3365#ifdef XPM_BACKGROUND 3891#ifdef XPM_BACKGROUND
3366 resize_pixmap (); 3892 resize_pixmap ();
3367#endif 3893#endif
… …
3378 3904
3379 case XTerm_logfile: 3905 case XTerm_logfile:
3380 // TODO, when secure mode? 3906 // TODO, when secure mode?
3381 break; 3907 break;
3382 3908
3383 case XTerm_font:
3384 if (query)
3385 {
3386 if (Options & Opt_insecure)
3387 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3388 TermWin.fontset->fontdesc
3389 ? TermWin.fontset->fontdesc
3390 : "",
3391 resp);
3392 }
3393 else
3394 change_font (str);
3395 break;
3396
3397#ifndef NO_FRILLS
3398 case XTerm_locale:
3399 if (query)
3400 {
3401 if (Options & Opt_insecure)
3402 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3403 }
3404 else
3405 {
3406 set_locale (str);
3407# ifdef USE_XIM
3408 im_cb ();
3409# endif
3410 }
3411 break;
3412
3413 case XTerm_findfont:
3414 if (Options & Opt_insecure)
3415 {
3416 int fid = TermWin.fontset->find_font (atoi (str));
3417 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418 fid, (*TermWin.fontset)[fid]->name, resp);
3419 }
3420 break;
3421#endif
3422
3423#ifdef MENUBAR 3909#ifdef MENUBAR
3424 case XTerm_Menu: 3910 case URxvt_Menu:
3425 if (Options & Opt_insecure) 3911 if (OPTION (Opt_insecure))
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3912 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break; 3913 break;
3428#endif 3914#endif
3429#if 0 3915#if 0
3430 case XTerm_dumpscreen: /* no error notices */ 3916 case XTerm_dumpscreen: /* no error notices */
… …
3434 { 3920 {
3435 scr_dump (fd); 3921 scr_dump (fd);
3436 close (fd); 3922 close (fd);
3437 } 3923 }
3438 } 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
3439 break; 3973 break;
3440#endif 3974#endif
3441 } 3975 }
3442} 3976}
3443/*----------------------------------------------------------------------*/ 3977/*----------------------------------------------------------------------*/
… …
3457{ 3991{
3458 int state; 3992 int state;
3459 3993
3460 if (mode == 's') 3994 if (mode == 's')
3461 { 3995 {
3462 SavedModes |= (PrivateModes & bit); 3996 SavedModes |= (priv_modes & bit);
3463 return -1; 3997 return -1;
3464 } 3998 }
3465 else 3999 else
3466 { 4000 {
3467 if (mode == 'r') 4001 if (mode == 'r')
3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4002 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3469 else 4003 else
3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4004 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3471 PrivMode (state, bit); 4005 PrivMode (state, bit);
3472 } 4006 }
3473 4007
3474 return state; 4008 return state;
3475} 4009}
… …
3493 { 3, PrivMode_132 }, 4027 { 3, PrivMode_132 },
3494 { 4, PrivMode_smoothScroll }, 4028 { 4, PrivMode_smoothScroll },
3495 { 5, PrivMode_rVideo }, 4029 { 5, PrivMode_rVideo },
3496 { 6, PrivMode_relOrigin }, 4030 { 6, PrivMode_relOrigin },
3497 { 7, PrivMode_Autowrap }, 4031 { 7, PrivMode_Autowrap },
4032 // 8, bi-directional support mode
3498 { 9, PrivMode_MouseX10 }, 4033 { 9, PrivMode_MouseX10 },
3499#ifdef menuBar_esc 4034#ifdef menuBar_esc
3500 { menuBar_esc, PrivMode_menuBar }, 4035 { menuBar_esc, PrivMode_menuBar },
3501#endif 4036#endif
4037 // 18, 19 printing-related
4038 { 25, PrivMode_VisibleCursor },
3502#ifdef scrollBar_esc 4039#ifdef scrollBar_esc
3503 { scrollBar_esc, PrivMode_scrollBar }, 4040 { scrollBar_esc, PrivMode_scrollBar },
3504#endif 4041#endif
3505 // 18, 19 printing-related
3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3508 { 35, PrivMode_ShiftKeys }, // rxvt extension 4042 { 35, PrivMode_ShiftKeys }, // rxvt extension
3509 { 40, PrivMode_132OK }, 4043 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI 4044 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI 4045 // 45 margin bell NYI
3512 // 46 start logging 4046 // 46 start logging
… …
3552 } 4086 }
3553 4087
3554 /* extra handling for values with state unkept */ 4088 /* extra handling for values with state unkept */
3555 switch (arg[i]) 4089 switch (arg[i])
3556 { 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
3557 case 1048: /* alternative cursor save */ 4101 case 1048: /* alternative cursor save */
4102 case 1049:
3558 if (Options & Opt_secondaryScreen) 4103 if (OPTION (Opt_secondaryScreen))
3559 if (mode == 0) 4104 if (mode == 0)
3560 scr_cursor (RESTORE); 4105 scr_cursor (RESTORE);
3561 else if (mode == 1) 4106 else if (mode == 1)
3562 scr_cursor (SAVE); 4107 scr_cursor (SAVE);
3563 break; 4108 break;
… …
3574 * within VT52 mode 4119 * within VT52 mode
3575 */ 4120 */
3576 PrivMode (1, PrivMode_vt52); 4121 PrivMode (1, PrivMode_vt52);
3577 break; 4122 break;
3578 case 3: /* 80/132 */ 4123 case 3: /* 80/132 */
3579 if (PrivateModes & PrivMode_132OK) 4124 if (priv_modes & PrivMode_132OK)
3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4125 set_widthheight (((state ? 132 : 80) * fwidth), height);
3581 break; 4126 break;
3582 case 4: /* smooth scrolling */ 4127 case 4: /* smooth scrolling */
3583 if (state) 4128 if (!state)
3584 Options &= ~Opt_jumpScroll; 4129 SET_OPTION (Opt_jumpScroll);
3585 else 4130 else
3586 Options |= Opt_jumpScroll; 4131 CLR_OPTION (Opt_jumpScroll);
3587 break; 4132 break;
3588 case 5: /* reverse video */ 4133 case 5: /* reverse video */
3589 scr_rvideo_mode (state); 4134 scr_rvideo_mode (state);
3590 break; 4135 break;
3591 case 6: /* relative/absolute origins */ 4136 case 6: /* relative/absolute origins */
… …
3595 scr_autowrap (state); 4140 scr_autowrap (state);
3596 break; 4141 break;
3597 /* 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 */
3598 case 9: /* X10 mouse reporting */ 4143 case 9: /* X10 mouse reporting */
3599 if (state) /* orthogonal */ 4144 if (state) /* orthogonal */
3600 PrivateModes &= ~PrivMode_MouseX11; 4145 priv_modes &= ~PrivMode_MouseX11;
3601 break; 4146 break;
3602#ifdef menuBar_esc 4147#ifdef menuBar_esc
3603 case menuBar_esc: 4148 case menuBar_esc:
3604#ifdef MENUBAR 4149#ifdef MENUBAR
3605 map_menuBar (state); 4150 map_menuBar (state);
… …
3625 break; 4170 break;
3626 /* case 66: - application key pad */ 4171 /* case 66: - application key pad */
3627 /* case 67: - backspace key */ 4172 /* case 67: - backspace key */
3628 case 1000: /* X11 mouse reporting */ 4173 case 1000: /* X11 mouse reporting */
3629 if (state) /* orthogonal */ 4174 if (state) /* orthogonal */
3630 PrivateModes &= ~PrivMode_MouseX10; 4175 priv_modes &= ~PrivMode_MouseX10;
3631 break; 4176 break;
3632#if 0 4177#if 0
3633 case 1001: 4178 case 1001:
3634 break; /* X11 mouse highlighting */ 4179 break; /* X11 mouse highlighting */
3635#endif 4180#endif
3636 case 1010: /* scroll to bottom on TTY output inhibit */ 4181 case 1010: /* scroll to bottom on TTY output inhibit */
3637 if (state) 4182 if (!state)
3638 Options &= ~Opt_scrollTtyOutput; 4183 SET_OPTION (Opt_scrollTtyOutput);
3639 else 4184 else
3640 Options |= Opt_scrollTtyOutput; 4185 CLR_OPTION (Opt_scrollTtyOutput);
3641 break; 4186 break;
3642 case 1011: /* scroll to bottom on key press */ 4187 case 1011: /* scroll to bottom on key press */
3643 if (state) 4188 if (state)
3644 Options |= Opt_scrollTtyKeypress; 4189 SET_OPTION (Opt_scrollTtyKeypress);
3645 else 4190 else
3646 Options &= ~Opt_scrollTtyKeypress; 4191 CLR_OPTION (Opt_scrollTtyKeypress);
3647 break; 4192 break;
3648 case 1047: /* secondary screen w/ clearing last */ 4193 case 1047: /* secondary screen w/ clearing last */
3649 if (Options & Opt_secondaryScreen) 4194 if (OPTION (Opt_secondaryScreen))
3650 if (current_screen != PRIMARY) 4195 if (current_screen != PRIMARY)
3651 scr_erase_screen (2); 4196 scr_erase_screen (2);
3652 scr_change_screen (state); 4197 scr_change_screen (state);
3653 break; 4198 break;
3654 case 1049: /* secondary screen w/ clearing first */ 4199 case 1049: /* secondary screen w/ clearing first */
3655 scr_change_screen (state); 4200 scr_change_screen (state);
3656 if (Options & Opt_secondaryScreen) 4201 if (OPTION (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 4202 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4203 scr_erase_screen (2);
3659 break; 4204 break;
3660 default: 4205 default:
3661 break; 4206 break;
… …
3687 rendset = 0, rendstyle = ~RS_None; 4232 rendset = 0, rendstyle = ~RS_None;
3688 break; 4233 break;
3689 case 1: 4234 case 1:
3690 rendset = 1, rendstyle = RS_Bold; 4235 rendset = 1, rendstyle = RS_Bold;
3691 break; 4236 break;
4237 //case 2: // low intensity
4238 case 3:
4239 rendset = 1, rendstyle = RS_Italic;
4240 break;
3692 case 4: 4241 case 4:
3693 rendset = 1, rendstyle = RS_Uline; 4242 rendset = 1, rendstyle = RS_Uline;
3694 break; 4243 break;
3695 case 5: 4244 case 5: // slowly blinking
4245 case 6: // rapidly blinking
3696 rendset = 1, rendstyle = RS_Blink; 4246 rendset = 1, rendstyle = RS_Blink;
3697 break; 4247 break;
3698 //case 6: // scoansi light background 4248 //case 6: // scoansi light background
3699 case 7: 4249 case 7:
3700 rendset = 1, rendstyle = RS_RVid; 4250 rendset = 1, rendstyle = RS_RVid;
3701 break; 4251 break;
3702 case 8: 4252 case 8:
3703 // invisible. NYI 4253 // invisible. NYI
3704 break; 4254 break;
4255 //case 9: // crossed out
3705 //case 10: // scoansi acs off 4256 //case 10: // scoansi acs off, primary font
3706 //case 11: // scoansi acs on 4257 //case 11: // scoansi acs on, first alt font
3707 //case 12: // scoansi acs on, |0x80 4258 //case 12: // scoansi acs on, |0x80, second alt font
3708 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)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4263 rendset = 0, rendstyle = RS_Bold;
3710 break; 4264 break;
3711 case 22: 4265 case 22: // normal intensity
3712 rendset = 0, rendstyle = RS_Bold; 4266 rendset = 0, rendstyle = RS_Bold;
4267 break;
4268 case 23: // disable italic
4269 rendset = 0, rendstyle = RS_Italic;
3713 break; 4270 break;
3714 case 24: 4271 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4272 rendset = 0, rendstyle = RS_Uline;
3716 break; 4273 break;
3717 case 25: 4274 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4275 rendset = 0, rendstyle = RS_Blink;
3719 break; 4276 break;
4277 case 26: // variable spacing (iso 8613)
4278 rendset = 0, rendstyle = RS_Blink;
4279 break;
3720 case 27: 4280 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4281 rendset = 0, rendstyle = RS_RVid;
3722 break; 4282 break;
3723 case 28:
3724 // visible. NYI 4283 //case 28: // visible. NYI
3725 break; 4284 //case 29: // not crossed-out
3726 } 4285 }
3727 4286
3728 if (rendset != -1) 4287 if (rendset != -1)
3729 { 4288 {
3730 scr_rendition (rendset, rendstyle); 4289 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4300 case 35:
3742 case 36: 4301 case 36:
3743 case 37: 4302 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4303 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4304 break;
3746#ifdef TTY_256COLOR 4305 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4306 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4307 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4308 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4309 i += 2;
3752 } 4310 }
3753 break; 4311 break;
3754#endif
3755 case 39: /* default fg */ 4312 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4313 scr_color (Color_fg, Color_fg);
3757 break; 4314 break;
3758 4315
3759 case 40: 4316 case 40:
… …
3764 case 45: 4321 case 45:
3765 case 46: 4322 case 46:
3766 case 47: 4323 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4324 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4325 break;
3769#ifdef TTY_256COLOR 4326 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4327 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4328 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4329 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4330 i += 2;
3775 } 4331 }
3776 break; 4332 break;
3777#endif
3778 case 49: /* default bg */ 4333 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4334 scr_color (Color_bg, Color_bg);
3780 break; 4335 break;
4336
4337 //case 50: // not variable spacing
3781 4338
3782#ifndef NO_BRIGHTCOLOR 4339#ifndef NO_BRIGHTCOLOR
3783 case 90: 4340 case 90:
3784 case 91: /* set bright fg color */ 4341 case 91: /* set bright fg color */
3785 case 92: 4342 case 92:
3786 case 93: 4343 case 93:
3787 case 94: 4344 case 94:
3788 case 95: 4345 case 95:
3789 case 96: 4346 case 96:
3790 case 97: 4347 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4348 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4349 break;
3794 case 100: 4350 case 100:
3795 case 101: /* set bright bg color */ 4351 case 101: /* set bright bg color */
3796 case 102: 4352 case 102:
3797 case 103: 4353 case 103:
3798 case 104: 4354 case 104:
3799 case 105: 4355 case 105:
3800 case 106: 4356 case 106:
3801 case 107: 4357 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4358 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4359 break;
3805#endif 4360#endif
3806
3807 } 4361 }
3808 } 4362 }
3809} 4363}
3810/*}}} */ 4364/*}}} */
3811 4365
… …
3815{ 4369{
3816 unicode_t ch, cmd = cmd_getc (); 4370 unicode_t ch, cmd = cmd_getc ();
3817 4371
3818 if (cmd == 'Q') 4372 if (cmd == 'Q')
3819 { /* query graphics */ 4373 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4374 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4375 return;
3822 } 4376 }
3823 /* swallow other graphics sequences until terminating ':' */ 4377 /* swallow other graphics sequences until terminating ':' */
3824 do 4378 do
3825 ch = cmd_getc (); 4379 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4394 unsigned char buf[256];
3841 4395
3842 va_start (arg_ptr, fmt); 4396 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4397 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4398 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4399 tt_write (buf, strlen (buf));
3846} 4400}
3847 4401
3848/* ---------------------------------------------------------------------- */ 4402/* ---------------------------------------------------------------------- */
3849/* 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,
3850 * or generated by us in response to a query ESC sequence. 4404 * or generated by us in response to a query ESC sequence.
3851 */ 4405 */
4406const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4407
3852void 4408void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4409rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4410{
3855 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));
3856 4414
3857 if (len) 4415 if ((unsigned int)written == len)
4416 return;
4417
4418 data += written;
4419 len -= written;
3858 { 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
3859 if (v_buflen == 0) 4438 if (v_buflen == 0)
3860 { 4439 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4440 free (v_buffer);
3888 v_buffer = 0; 4441 v_buffer = 0;
3889 v_buflen = 0; 4442 v_buflen = 0;
3890 4443
3891 pty_ev.set (EVENT_READ); 4444 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4445 return;
3904 } 4446 }
4447
4448 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4449 }
4450 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4451 pty_ev.set (EVENT_READ);
3906} 4452}
3907 4453
3908/*----------------------- end-of-file (C source) -----------------------*/ 4454/*----------------------- end-of-file (C source) -----------------------*/
3909 4455

Diff Legend

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