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.223 by root, Sun Jan 1 05:28:28 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.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
57#include <csignal>
58
59#define HAVE_SCHED_YIELD 1 //D//TODO//FIXME
60#if HAVE_SCHED_YIELD
53#include <wchar.h> 61# include <sched.h>
62#endif
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 + 0.01);
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
715bool 1075bool
716rxvt_term::pty_fill () 1076rxvt_term::pty_fill ()
717{ 1077{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1078 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
719 1079
… …
725 1085
726 memmove (cmdbuf_base, cmdbuf_ptr, n); 1086 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1087 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1088 cmdbuf_endp = cmdbuf_ptr + n;
729 1089
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1090 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
731 1091
732 if (n > 0) 1092 if (r > 0)
733 { 1093 {
734 cmdbuf_endp += n; 1094 cmdbuf_endp += r;
735 return true; 1095 return true;
736 } 1096 }
737 else if (n < 0 && errno != EAGAIN) 1097 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1098 {
1099#if HAVE_SCHED_YIELD
1100 sched_yield ();
1101#endif
1102 }
1103 else
1104 {
1105 pty_ev.stop ();
1106
1107 if (!OPTION (Opt_hold))
738 destroy (); 1108 destroy ();
1109 }
739 1110
740 return false; 1111 return false;
741} 1112}
742 1113
743void 1114void
744rxvt_term::pty_cb (io_watcher &w, short revents) 1115rxvt_term::pty_cb (io_watcher &w, short revents)
745{ 1116{
746 SET_R (this); 1117 SET_R (this);
747 SET_LOCALE (locale); 1118 SET_LOCALE (locale);
748 1119
749 if (revents & EVENT_WRITE)
750 tt_write (0, 0);
751 else if (revents & EVENT_READ) 1120 if (revents & EVENT_READ)
752 // loop, but don't allow a single term to monopolize us 1121 // loop, but don't allow a single term to monopolize us
753 while (pty_fill ()) 1122 while (pty_fill ())
754 if (cmd_parse ()) 1123 if (cmd_parse ())
755 break; 1124 break;
1125
1126 if (revents & EVENT_WRITE)
1127 pty_write ();
1128}
1129
1130void
1131rxvt_term::pointer_unblank ()
1132{
1133 XDefineCursor (display->display, vt, TermWin_cursor);
1134 recolour_cursor ();
1135
1136#ifdef POINTER_BLANK
1137 hidden_pointer = 0;
1138
1139 if (OPTION (Opt_pointerBlank))
1140 pointer_ev.start (NOW + pointerBlankDelay);
1141#endif
756} 1142}
757 1143
758#ifdef POINTER_BLANK 1144#ifdef POINTER_BLANK
759void 1145void
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 () 1146rxvt_term::pointer_blank ()
773{ 1147{
774 if (! (Options & Opt_pointerBlank)) 1148 if (! OPTION (Opt_pointerBlank))
775 return; 1149 return;
776 1150
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1151 XDefineCursor (display->display, vt, display->blank_cursor);
778 XFlush (display->display); 1152 XFlush (display->display);
779 1153
780 hidden_pointer = 1; 1154 hidden_pointer = 1;
781} 1155}
782 1156
… …
799 x = ev.x; 1173 x = ev.x;
800 y = ev.y; 1174 y = ev.y;
801 pixel_position (&x, &y); 1175 pixel_position (&x, &y);
802 1176
803 if (MEvent.button == AnyButton) 1177 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1178 button_number = 3;
806 }
807 else 1179 else
808 { 1180 {
809 button_number = MEvent.button - Button1; 1181 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1182 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1183 if (button_number >= 3)
812 button_number += (64 - 3); 1184 button_number += (64 - 3);
813 } 1185 }
814 1186
815 if (PrivateModes & PrivMode_MouseX10) 1187 if (priv_modes & PrivMode_MouseX10)
816 { 1188 {
817 /* 1189 /*
818 * do not report ButtonRelease 1190 * do not report ButtonRelease
819 * no state info allowed 1191 * no state info allowed
820 */ 1192 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1207 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1208 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1209#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1210 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1211#endif
840
841 } 1212 }
842 1213
843#ifdef DEBUG_MOUSEREPORT 1214#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1215 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1216 if (key_state & 16)
846 fputc ('C', stderr); 1217 fputc ('C', stderr);
847 if (key_state & 4) 1218 if (key_state & 4)
848 fputc ('S', stderr); 1219 fputc ('S', stderr);
… …
852 fputc ('2', stderr); 1223 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1224 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1225 button_number,
855 x + 1, 1226 x + 1,
856 y + 1); 1227 y + 1);
857#else 1228#endif
1229
858 tt_printf ("\033[M%c%c%c", 1230 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1231 (32 + button_number + key_state),
860 (32 + x + 1), 1232 (32 + x + 1),
861 (32 + y + 1)); 1233 (32 + y + 1));
862#endif
863} 1234}
864 1235
865#ifdef USING_W11LIB 1236#ifdef USING_W11LIB
866void 1237void
867rxvt_W11_process_x_event (XEvent *ev) 1238rxvt_W11_process_x_event (XEvent *ev)
… …
874 1245
875/*{{{ process an X event */ 1246/*{{{ process an X event */
876void 1247void
877rxvt_term::x_cb (XEvent &ev) 1248rxvt_term::x_cb (XEvent &ev)
878{ 1249{
1250 dDisp;
1251
879 SET_R (this); 1252 SET_R (this);
880 SET_LOCALE (locale); 1253 SET_LOCALE (locale);
881 1254
882#if defined(CURSOR_BLINK) 1255#if defined(CURSOR_BLINK)
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1256 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
884 { 1257 {
885 if (hidden_cursor) 1258 if (hidden_cursor)
886 { 1259 {
887 hidden_cursor = 0; 1260 hidden_cursor = 0;
888 want_refresh = 1; 1261 want_refresh = 1;
… …
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1264 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
892 } 1265 }
893#endif 1266#endif
894 1267
895#if defined(POINTER_BLANK) 1268#if defined(POINTER_BLANK)
896 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1269 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
897 { 1270 {
898 if (ev.type == MotionNotify 1271 if (ev.type == MotionNotify
899 || ev.type == ButtonPress 1272 || ev.type == ButtonPress
900 || ev.type == ButtonRelease) 1273 || ev.type == ButtonRelease)
901 if (hidden_pointer) 1274 if (hidden_pointer)
… …
904 if (ev.type == KeyPress && hidden_pointer == 0) 1277 if (ev.type == KeyPress && hidden_pointer == 0)
905 pointer_blank (); 1278 pointer_blank ();
906 } 1279 }
907#endif 1280#endif
908 1281
909#ifdef USE_XIM
910 if (XFilterEvent (&ev, None))
911 return;
912#endif
913
914 Window unused_root, unused_child; 1282 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1283 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1284 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 1285
967 switch (ev.type) 1286 switch (ev.type)
968 { 1287 {
969 case KeyPress: 1288 case KeyPress:
1289#if ISO_14755
1290 if (!(iso14755buf & ISO_14755_52))
1291#endif
970 lookup_key (ev.xkey); 1292 lookup_key (ev.xkey);
1293
1294 break;
1295
1296 case KeyRelease:
1297 {
1298#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1299 KeySym ks;
1300
1301 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1302#endif
1303
1304#if ENABLE_FRILLS || ISO_14755
1305 // ISO 14755 support
1306 if (iso14755buf)
1307 if (iso14755buf & ISO_14755_52)
1308 {
1309# if ENABLE_OVERLAY
1310 scr_overlay_off ();
1311# endif
1312# if ISO_14755
1313 // iso14755 part 5.2 handling: release time
1314 // first: controls
1315 if ((ev.xkey.state & ControlMask)
1316 && ((ks >= 0x40 && ks <= 0x5f)
1317 || (ks >= 0x61 && ks <= 0x7f)))
1318 {
1319 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1320 commit_iso14755 ();
1321 return; // case-break;
1322 }
1323
1324 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1325 if (i[0] == ks)
1326 {
1327 iso14755buf = ISO_14755_51 | i[1];
1328 commit_iso14755 ();
1329 return; // case-break;
1330 }
1331
1332 scr_bell ();
1333# endif
1334 iso14755buf = 0;
971 break; 1335 break;
1336 }
1337 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1338 {
1339# if ENABLE_OVERLAY
1340 scr_overlay_off ();
1341# endif
1342 if (iso14755buf & ISO_14755_51)
1343 commit_iso14755 ();
1344#if ISO_14755
1345 else if (iso14755buf & ISO_14755_STARTED)
1346 {
1347 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1348
1349 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1350 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1351 }
1352# endif
1353 else
1354 iso14755buf = 0;
1355 }
1356#endif
972 1357
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1358#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease:
975 {
976 if (! (ev.xkey.state & ControlMask)) 1359 if (!(ev.xkey.state & ControlMask))
1360 slip_wheel_ev.stop ();
1361 else if (ks == XK_Control_L || ks == XK_Control_R)
977 mouse_slip_wheel_speed = 0; 1362 mouse_slip_wheel_speed = 0;
978 else 1363#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; 1364 break;
987 } 1365 }
988#endif
989 1366
990 case ButtonPress: 1367 case ButtonPress:
991 button_press (ev.xbutton); 1368 button_press (ev.xbutton);
992 break; 1369 break;
993 1370
… …
995 button_release (ev.xbutton); 1372 button_release (ev.xbutton);
996 break; 1373 break;
997 1374
998 case ClientMessage: 1375 case ClientMessage:
999 if (ev.xclient.format == 32 1376 if (ev.xclient.format == 32
1377 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1378 {
1000 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1379 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1001 destroy (); 1380 destroy ();
1381#if ENABLE_EWMH
1382 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1383 XSendEvent (disp, ev.xclient.window = display->root,
1384 False, SubstructureRedirectMask | SubstructureNotifyMask,
1385 &ev);
1386#endif
1387 }
1388#if ENABLE_XEMBED
1389 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1390 {
1391 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1392 focus_in ();
1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1394 focus_out ();
1395 }
1396#endif
1002#ifdef OFFIX_DND 1397#ifdef OFFIX_DND
1003 /* OffiX Dnd (drag 'n' drop) protocol */ 1398 /* OffiX Dnd (drag 'n' drop) protocol */
1004 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1399 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1005 && (ev.xclient.data.l[0] == DndFile 1400 && (ev.xclient.data.l[0] == DndFile
1006 || ev.xclient.data.l[0] == DndDir 1401 || ev.xclient.data.l[0] == DndDir
1007 || ev.xclient.data.l[0] == DndLink)) 1402 || ev.xclient.data.l[0] == DndLink))
1008 { 1403 {
1009 /* Get Dnd data */ 1404 /* Get Dnd data */
1010 Atom ActualType; 1405 Atom ActualType;
1011 int ActualFormat; 1406 int ActualFormat;
1012 unsigned char *data; 1407 unsigned char *data;
1013 unsigned long Size, RemainingBytes; 1408 unsigned long Size, RemainingBytes;
1014 1409
1015 XGetWindowProperty (display->display, display->root, 1410 XGetWindowProperty (disp, display->root,
1016 xa[XA_DNDSELECTION], 1411 xa[XA_DNDSELECTION],
1017 0L, 1000000L, 1412 0L, 1000000L,
1018 False, AnyPropertyType, 1413 False, AnyPropertyType,
1019 &ActualType, &ActualFormat, 1414 &ActualType, &ActualFormat,
1020 &Size, &RemainingBytes, 1415 &Size, &RemainingBytes,
1021 &data); 1416 &data);
1022 XChangeProperty (display->display, display->root, 1417 set_string_property (XA_CUT_BUFFER0, data);
1023 XA_CUT_BUFFER0, XA_STRING,
1024 8, PropModeReplace,
1025 data, STRLEN (data));
1026 XFree (data); 1418 XFree (data);
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1419 selection_paste (display->root, XA_CUT_BUFFER0, true);
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1420 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1029 } 1421 }
1030#endif /* OFFIX_DND */ 1422#endif /* OFFIX_DND */
1031 break; 1423 break;
1032 1424
1033 case MappingNotify: 1425 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1426 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1427 break;
1036 1428
1037 /* 1429 /*
1038 * XXX: this is not the _current_ arrangement 1430 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1431 * Here's my conclusion:
… …
1058 break; 1450 break;
1059 } 1451 }
1060 break; 1452 break;
1061 1453
1062 case FocusIn: 1454 case FocusIn:
1063 if (!TermWin.focus) 1455 focus_in ();
1456 break;
1457
1458 case FocusOut:
1459 focus_out ();
1460 break;
1461
1462 case ConfigureNotify:
1463 if (ev.xconfigure.window == parent[0])
1064 { 1464 {
1065 TermWin.focus = 1; 1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1066 want_refresh = 1; 1466 ;
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 1467
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 {
1470 seen_resize = 1;
1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472 }
1473
1474#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1475 if (OPTION (Opt_transparent))
1476 check_our_parents ();
1477#endif
1076 } 1478 }
1077 break; 1479 break;
1078 1480
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: 1481 case PropertyNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0]) 1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1099 { 1483 && ev.xproperty.state == PropertyNewValue)
1100 int height, width; 1484 selection_property (ev.xproperty.window, ev.xproperty.atom);
1101 1485
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; 1486 break;
1131 1487
1132 case SelectionClear: 1488 case SelectionClear:
1133 selection_clear (); 1489 selection_clear ();
1134 break; 1490 break;
1135 1491
1136 case SelectionNotify: 1492 case SelectionNotify:
1137 if (selection_wait == Sel_normal) 1493 if (selection_wait == Sel_normal)
1138 selection_paste (ev.xselection.requestor, 1494 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1139 ev.xselection.property, True);
1140 break; 1495 break;
1141 1496
1142 case SelectionRequest: 1497 case SelectionRequest:
1143 selection_send (ev.xselectionrequest); 1498 selection_send (ev.xselectionrequest);
1144 break; 1499 break;
1145 1500
1146 case UnmapNotify: 1501 case UnmapNotify:
1147 TermWin.mapped = 0; 1502 mapped = 0;
1148#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1149 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1150#endif 1505#endif
1151 break; 1506 break;
1152 1507
1153 case MapNotify: 1508 case MapNotify:
1154 TermWin.mapped = 1; 1509 mapped = 1;
1155#ifdef TEXT_BLINK 1510#ifdef TEXT_BLINK
1156 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1511 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1157#endif 1512#endif
1158 break; 1513 break;
1159 1514
… …
1163 break; 1518 break;
1164#endif /* TRANSPARENT */ 1519#endif /* TRANSPARENT */
1165 1520
1166 case GraphicsExpose: 1521 case GraphicsExpose:
1167 case Expose: 1522 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1523 if (ev.xany.window == vt)
1169 { 1524 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1525 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1528 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1174 // don't understand this, so commented it out 1529
1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1531
1532 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1535
1178 // ev.xexpose.width, TermWin.height, False); 1536 scr_refresh (refresh_type);
1179#endif
1180 want_refresh = 1;
1181 } 1537 }
1182 else 1538 else
1183 { 1539 {
1184 XEvent unused_event; 1540 XEvent unused_event;
1185 1541
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1542 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1187 Expose, 1543 ;
1188 &unused_event)) ; 1544 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1189 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1545 ;
1190 GraphicsExpose, 1546
1191 &unused_event)) ;
1192 if (isScrollbarWindow (ev.xany.window)) 1547 if (isScrollbarWindow (ev.xany.window))
1193 { 1548 {
1194 scrollBar.setIdle (); 1549 scrollBar.setIdle ();
1195 scrollbar_show (0); 1550 scrollbar_show (0);
1196 } 1551 }
1197#ifdef MENUBAR 1552#ifdef MENUBAR
1198 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1553 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1199 menubar_expose (); 1554 menubar_expose ();
1200#endif 1555#endif
1556
1557#ifdef TRANSPARENT
1558 if (am_transparent && ev.xany.window == parent[0])
1559 XClearWindow (disp, ev.xany.window);
1560#endif
1201 } 1561 }
1202 break; 1562 break;
1203 1563
1204 case MotionNotify: 1564 case MotionNotify:
1205#ifdef POINTER_BLANK 1565#ifdef POINTER_BLANK
… …
1211 { 1571 {
1212 menubar_control (ev.xbutton); 1572 menubar_control (ev.xbutton);
1213 break; 1573 break;
1214 } 1574 }
1215#endif 1575#endif
1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1217 break; 1577 break;
1218 1578
1219 if (ev.xany.window == TermWin.vt) 1579 if (ev.xany.window == vt)
1220 { 1580 {
1221 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1581 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1222 { 1582 {
1223 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1583 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1224 ; 1584 ;
1225 1585
1226 XQueryPointer (display->display, TermWin.vt, 1586 XQueryPointer (disp, vt,
1227 &unused_root, &unused_child, 1587 &unused_root, &unused_child,
1228 &unused_root_x, &unused_root_y, 1588 &unused_root_x, &unused_root_y,
1229 & (ev.xbutton.x), & (ev.xbutton.y), 1589 &ev.xbutton.x, &ev.xbutton.y,
1230 &unused_mask); 1590 &ev.xbutton.state);
1231#ifdef MOUSE_THRESHOLD 1591#ifdef MOUSE_THRESHOLD
1232 /* deal with a `jumpy' mouse */ 1592 /* deal with a `jumpy' mouse */
1233 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1593 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1234 { 1594 {
1235#endif 1595#endif
1596#if ISO_14755
1597 // 5.4
1598 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1599 {
1600 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1601 break;
1602 }
1603#endif
1236 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1604 selection_extend (ev.xbutton.x, ev.xbutton.y,
1237 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1605 ev.xbutton.state & Button3Mask ? 2 : 0);
1606
1238#ifdef SELECTION_SCROLLING 1607#ifdef SELECTION_SCROLLING
1239 if (ev.xbutton.y < TermWin.int_bwidth 1608 if (ev.xbutton.y < int_bwidth
1240 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1609 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1241 { 1610 {
1242 int dist; 1611 int dist;
1243
1244 pending_scroll_selection=1;
1245 1612
1246 /* don't clobber the current delay if we are 1613 /* don't clobber the current delay if we are
1247 * already in the middle of scrolling. 1614 * already in the middle of scrolling.
1248 */ 1615 */
1249 if (scroll_selection_delay<=0) 1616 if (!sel_scroll_ev.active)
1250 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1617 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1251 1618
1252 /* save the event params so we can highlight 1619 /* save the event params so we can highlight
1253 * the selection in the pending-scroll loop 1620 * the selection in the pending-scroll loop
1254 */ 1621 */
1255 selection_save_x=ev.xbutton.x; 1622 selection_save_x = ev.xbutton.x;
1256 selection_save_y=ev.xbutton.y; 1623 selection_save_y = ev.xbutton.y;
1257 selection_save_state=
1258 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1624 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1259 1625
1260 /* calc number of lines to scroll */ 1626 /* calc number of lines to scroll */
1261 if (ev.xbutton.y<TermWin.int_bwidth) 1627 if (ev.xbutton.y < int_bwidth)
1262 { 1628 {
1263 scroll_selection_dir = UP; 1629 scroll_selection_dir = UP;
1264 dist = TermWin.int_bwidth - ev.xbutton.y; 1630 dist = int_bwidth - ev.xbutton.y;
1265 } 1631 }
1266 else 1632 else
1267 { 1633 {
1268 scroll_selection_dir = DN; 1634 scroll_selection_dir = DN;
1269 dist = ev.xbutton.y - 1635 dist = ev.xbutton.y - (int_bwidth + height);
1270 (TermWin.int_bwidth + TermWin.height);
1271 } 1636 }
1637
1272 scroll_selection_lines= (Pixel2Height (dist)/ 1638 scroll_selection_lines = Pixel2Height (dist)
1273 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1639 / SELECTION_SCROLL_LINE_SPEEDUP
1640 + 1;
1274 MIN_IT (scroll_selection_lines, 1641 min_it (scroll_selection_lines,
1275 SELECTION_SCROLL_MAX_LINES); 1642 SELECTION_SCROLL_MAX_LINES);
1276 } 1643 }
1277 else 1644 else
1278 { 1645 {
1279 /* we are within the text window, so we 1646 /* we are within the text window, so we
1280 * shouldn't be scrolling 1647 * shouldn't be scrolling
1281 */ 1648 */
1282 pending_scroll_selection = 0; 1649 if (sel_scroll_ev.active)
1650 sel_scroll_ev.stop();
1283 } 1651 }
1284#endif 1652#endif
1285#ifdef MOUSE_THRESHOLD 1653#ifdef MOUSE_THRESHOLD
1286
1287 } 1654 }
1288#endif 1655#endif
1289
1290 } 1656 }
1291 } 1657 }
1292 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1293 { 1659 {
1294 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1660 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1295 MotionNotify, &ev)) ; 1661 MotionNotify, &ev))
1662 ;
1663
1296 XQueryPointer (display->display, scrollBar.win, 1664 XQueryPointer (disp, scrollBar.win,
1297 &unused_root, &unused_child, 1665 &unused_root, &unused_child,
1298 &unused_root_x, &unused_root_y, 1666 &unused_root_x, &unused_root_y,
1299 & (ev.xbutton.x), & (ev.xbutton.y), 1667 &ev.xbutton.x, &ev.xbutton.y,
1300 &unused_mask); 1668 &unused_mask);
1301 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1302 scrollbar_size ()); 1670 scrollbar_size ());
1303 scr_refresh (refresh_type); 1671 scr_refresh (refresh_type);
1304 refresh_limit = 0; 1672 refresh_limit = 0;
… …
1307 break; 1675 break;
1308 } 1676 }
1309} 1677}
1310 1678
1311void 1679void
1680rxvt_term::focus_in ()
1681{
1682 if (!focus)
1683 {
1684 focus = 1;
1685 want_refresh = 1;
1686#if USE_XIM
1687 if (Input_Context != NULL)
1688 {
1689 IMSetStatusPosition ();
1690 XSetICFocus (Input_Context);
1691 }
1692#endif
1693#if CURSOR_BLINK
1694 if (OPTION (Opt_cursorBlink))
1695 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1696#endif
1697#if OFF_FOCUS_FADING
1698 if (rs[Rs_fade])
1699 {
1700 pix_colors = pix_colors_focused;
1701 scr_recolour ();
1702 }
1703#endif
1704 }
1705}
1706
1707void
1708rxvt_term::focus_out ()
1709{
1710 if (focus)
1711 {
1712 focus = 0;
1713 want_refresh = 1;
1714
1715#if ENABLE_FRILLS || ISO_14755
1716 iso14755buf = 0;
1717#endif
1718#if ENABLE_OVERLAY
1719 scr_overlay_off ();
1720#endif
1721#if USE_XIM
1722 if (Input_Context != NULL)
1723 XUnsetICFocus (Input_Context);
1724#endif
1725#if CURSOR_BLINK
1726 if (OPTION (Opt_cursorBlink))
1727 cursor_blink_ev.stop ();
1728 hidden_cursor = 0;
1729#endif
1730#if OFF_FOCUS_FADING
1731 if (rs[Rs_fade])
1732 {
1733 pix_colors = pix_colors_unfocused;
1734 scr_recolour ();
1735 }
1736#endif
1737 }
1738}
1739
1740#if TRANSPARENT
1741void
1312rxvt_term::rootwin_cb (XEvent &ev) 1742rxvt_term::rootwin_cb (XEvent &ev)
1313{ 1743{
1314 SET_R (this); 1744 SET_R (this);
1315 SET_LOCALE (locale); 1745 SET_LOCALE (locale);
1316 1746
1317 switch (ev.type) 1747 switch (ev.type)
1318 { 1748 {
1319 case PropertyNotify: 1749 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 /* 1750 /*
1330 * if user used some Esetroot compatible prog to set the root bg, 1751 * 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. 1752 * use the property to determine the pixmap. We use it later on.
1332 */ 1753 */
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]) 1754 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1755 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1337 return; 1756 return;
1338 }
1339 1757
1340 /* FALLTHROUGH */ 1758 /* FALLTHROUGH */
1341 case ReparentNotify: 1759 case ReparentNotify:
1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1760 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1343 want_full_refresh = 1; 1761 want_refresh = want_full_refresh = 1;
1344 break; 1762 break;
1345#endif
1346 } 1763 }
1347} 1764}
1765#endif
1348 1766
1349void 1767void
1350rxvt_term::button_press (XButtonEvent &ev) 1768rxvt_term::button_press (XButtonEvent &ev)
1351{ 1769{
1352 int reportmode = 0, clickintime; 1770 int reportmode = 0, clickintime;
1353 1771
1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1772 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1355 if (!bypass_keystate) 1773 if (!bypass_keystate)
1356 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1774 reportmode = !! (priv_modes & PrivMode_mouse_report);
1775
1357 /* 1776 /*
1358 * VT window processing of button press 1777 * VT window processing of button press
1359 */ 1778 */
1360 if (ev.window == TermWin.vt) 1779 if (ev.window == vt)
1361 { 1780 {
1781#if ISO_14755
1782 // 5.4
1783 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1784 {
1785 iso14755_54 (ev.x, ev.y);
1786 return;
1787 }
1788#endif
1789
1362 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1790 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1791
1363 if (reportmode) 1792 if (reportmode)
1364 { 1793 {
1365 /* mouse report from vt window */ 1794 /* mouse report from vt window */
1366 /* save the xbutton state (for ButtonRelease) */ 1795 /* save the xbutton state (for ButtonRelease) */
1367 MEvent.state = ev.state; 1796 MEvent.state = ev.state;
… …
1396 } 1825 }
1397 else 1826 else
1398 { 1827 {
1399 if (ev.button != MEvent.button) 1828 if (ev.button != MEvent.button)
1400 MEvent.clicks = 0; 1829 MEvent.clicks = 0;
1830
1401 switch (ev.button) 1831 switch (ev.button)
1402 { 1832 {
1403 case Button1: 1833 case Button1:
1834 /* allow meta + click to select rectangular areas */
1835 /* should be done in screen.C */
1836#if ENABLE_FRILLS
1837 selection.rect = !!(ev.state & ModMetaMask);
1838#else
1839 selection.rect = false;
1840#endif
1841
1404 /* allow shift+left click to extend selection */ 1842 /* allow shift+left click to extend selection */
1405 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1843 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1406 { 1844 {
1407 if (MEvent.button == Button1 && clickintime) 1845 if (MEvent.button == Button1 && clickintime)
1408 selection_rotate (ev.x, ev.y); 1846 selection_rotate (ev.x, ev.y);
1409 else 1847 else
1410 selection_extend (ev.x, ev.y, 1); 1848 selection_extend (ev.x, ev.y, 1);
… …
1425 case Button3: 1863 case Button3:
1426 if (MEvent.button == Button3 && clickintime) 1864 if (MEvent.button == Button3 && clickintime)
1427 selection_rotate (ev.x, ev.y); 1865 selection_rotate (ev.x, ev.y);
1428 else 1866 else
1429 selection_extend (ev.x, ev.y, 1); 1867 selection_extend (ev.x, ev.y, 1);
1868
1430 MEvent.button = Button3; 1869 MEvent.button = Button3;
1431 break; 1870 break;
1432 } 1871 }
1433 } 1872 }
1873
1434 MEvent.time = ev.time; 1874 MEvent.time = ev.time;
1435 return; 1875 return;
1436 } 1876 }
1437 1877
1438 /* 1878 /*
… …
1504 upordown = 1; /* down */ 1944 upordown = 1; /* down */
1505 } 1945 }
1506 if (upordown) 1946 if (upordown)
1507 { 1947 {
1508#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1948#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1949 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1510#endif 1950#endif
1511 if (scr_page (upordown < 0 ? UP : DN, 1)) 1951 if (scr_page (upordown < 0 ? UP : DN, 1))
1512 { 1952 {
1513 if (upordown < 0) 1953 if (upordown < 0)
1514 scrollBar.setUp (); 1954 scrollBar.setUp ();
… …
1530 break; 1970 break;
1531 case R_SB_ALIGN_BOTTOM: 1971 case R_SB_ALIGN_BOTTOM:
1532 csrO = scrollBar.bot - scrollBar.top; 1972 csrO = scrollBar.bot - scrollBar.top;
1533 break; 1973 break;
1534 } 1974 }
1975
1535 if (scrollBar.style == R_SB_XTERM 1976 if (scrollBar.style == R_SB_XTERM
1536 || scrollbar_above_slider (ev.y) 1977 || scrollbar_above_slider (ev.y)
1537 || scrollbar_below_slider (ev.y)) 1978 || scrollbar_below_slider (ev.y))
1538 scr_move_to ( scrollbar_position (ev.y) - csrO, 1979 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1539 scrollbar_size ()); 1980
1540 scrollBar.setMotion (); 1981 scrollBar.setMotion ();
1541 break; 1982 break;
1542 1983
1543 case Button1: 1984 case Button1:
1544 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1985 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1548 case Button3: 1989 case Button3:
1549 if (scrollBar.style != R_SB_XTERM) 1990 if (scrollBar.style != R_SB_XTERM)
1550 { 1991 {
1551 if (scrollbar_above_slider (ev.y)) 1992 if (scrollbar_above_slider (ev.y))
1552# ifdef RXVT_SCROLL_FULL 1993# ifdef RXVT_SCROLL_FULL
1553 scr_page (UP, TermWin.nrow - 1); 1994 scr_page (UP, nrow - 1);
1554# else 1995# else
1555 scr_page (UP, TermWin.nrow / 4); 1996 scr_page (UP, nrow / 4);
1556# endif 1997# endif
1557 else if (scrollbar_below_slider (ev.y)) 1998 else if (scrollbar_below_slider (ev.y))
1558# ifdef RXVT_SCROLL_FULL 1999# ifdef RXVT_SCROLL_FULL
1559 scr_page (DN, TermWin.nrow - 1); 2000 scr_page (DN, nrow - 1);
1560# else 2001# else
1561 scr_page (DN, TermWin.nrow / 4); 2002 scr_page (DN, nrow / 4);
1562# endif 2003# endif
1563 else 2004 else
1564 scrollBar.setMotion (); 2005 scrollBar.setMotion ();
1565 } 2006 }
1566 else 2007 else
1567 { 2008 {
1568 scr_page ((ev.button == Button1 ? DN : UP), 2009 scr_page ((ev.button == Button1 ? DN : UP),
1569 (TermWin.nrow 2010 (nrow
1570 * scrollbar_position (ev.y) 2011 * scrollbar_position (ev.y)
1571 / scrollbar_size ())); 2012 / scrollbar_size ()));
1572 } 2013 }
2014
1573 break; 2015 break;
1574 } 2016 }
1575 } 2017 }
1576 return; 2018 return;
1577 } 2019 }
… …
1589{ 2031{
1590 int reportmode = 0; 2032 int reportmode = 0;
1591 2033
1592 csrO = 0; /* reset csr Offset */ 2034 csrO = 0; /* reset csr Offset */
1593 if (!bypass_keystate) 2035 if (!bypass_keystate)
1594 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2036 reportmode = !! (priv_modes & PrivMode_mouse_report);
1595 2037
1596 if (scrollbar_isUpDn ()) 2038 if (scrollbar_isUpDn ())
1597 { 2039 {
1598 scrollBar.setIdle (); 2040 scrollBar.setIdle ();
1599 scrollbar_show (0); 2041 scrollbar_show (0);
1600#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2042#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1601 refresh_type &= ~SMOOTH_REFRESH; 2043 refresh_type &= ~SMOOTH_REFRESH;
1602#endif 2044#endif
1603
1604 } 2045 }
2046
1605#ifdef SELECTION_SCROLLING 2047#ifdef SELECTION_SCROLLING
1606 pending_scroll_selection=0; 2048 if (sel_scroll_ev.active)
2049 sel_scroll_ev.stop();
1607#endif 2050#endif
2051
1608 if (ev.window == TermWin.vt) 2052 if (ev.window == vt)
1609 { 2053 {
2054#if ISO_14755
2055 // 5.4
2056 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2057 return;
2058#endif
1610 if (reportmode) 2059 if (reportmode)
1611 { 2060 {
1612 /* mouse report from vt window */ 2061 /* mouse report from vt window */
1613 /* don't report release of wheel "buttons" */ 2062 /* don't report release of wheel "buttons" */
1614 if (ev.button >= 4) 2063 if (ev.button >= 4)
… …
1628 MEvent.button = AnyButton; 2077 MEvent.button = AnyButton;
1629 mouse_report (ev); 2078 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 2079#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 return; 2080 return;
1632 } 2081 }
2082
1633 /* 2083 /*
1634 * dumb hack to compensate for the failure of click-and-drag 2084 * dumb hack to compensate for the failure of click-and-drag
1635 * when overriding mouse reporting 2085 * when overriding mouse reporting
1636 */ 2086 */
1637 if (PrivateModes & PrivMode_mouse_report 2087 if (priv_modes & PrivMode_mouse_report
1638 && bypass_keystate 2088 && bypass_keystate
1639 && ev.button == Button1 && MEvent.clicks <= 1) 2089 && ev.button == Button1 && MEvent.clicks <= 1)
1640 selection_extend (ev.x, ev.y, 0); 2090 selection_extend (ev.x, ev.y, 0);
1641 2091
1642 switch (ev.button) 2092 switch (ev.button)
… …
1653 case Button5: 2103 case Button5:
1654 { 2104 {
1655 int i; 2105 int i;
1656 page_dirn v; 2106 page_dirn v;
1657 2107
1658 v = (ev.button == Button4) ? UP : DN; 2108 v = ev.button == Button4 ? UP : DN;
2109
1659 if (ev.state & ShiftMask) 2110 if (ev.state & ShiftMask)
1660 i = 1; 2111 i = 1;
1661 else if ((Options & Opt_mouseWheelScrollPage)) 2112 else if (OPTION (Opt_mouseWheelScrollPage))
1662 i = TermWin.nrow - 1; 2113 i = nrow - 1;
1663 else 2114 else
1664 i = 5; 2115 i = 5;
2116
1665# ifdef MOUSE_SLIP_WHEELING 2117# ifdef MOUSE_SLIP_WHEELING
1666 if (ev.state & ControlMask) 2118 if (ev.state & ControlMask)
1667 { 2119 {
1668 mouse_slip_wheel_speed += (v ? -1 : 1); 2120 mouse_slip_wheel_speed += v ? -1 : 1;
2121 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2122 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2123
2124 if (slip_wheel_ev.at < NOW)
1669 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2125 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2126
2127 slip_wheel_ev.start ();
1670 } 2128 }
2129 else
2130 {
1671# endif 2131# endif
1672# ifdef JUMP_MOUSE_WHEEL 2132# 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); 2133 scr_page (v, i);
1680 scr_refresh (SMOOTH_REFRESH); 2134 scr_refresh (SMOOTH_REFRESH);
1681 scrollbar_show (1); 2135 scrollbar_show (1);
2136# else
2137 while (i--)
2138 {
2139 scr_page (v, 1);
2140 scr_refresh (SMOOTH_REFRESH);
2141 scrollbar_show (1);
2142 }
2143# endif
2144# ifdef MOUSE_SLIP_WHEELING
1682 } 2145 }
1683# endif 2146#endif
1684
1685 } 2147 }
1686 break; 2148 break;
1687#endif 2149#endif
1688
1689 } 2150 }
1690 } 2151 }
1691#ifdef MENUBAR 2152#ifdef MENUBAR
1692 else if (isMenuBarWindow (ev.window)) 2153 else if (isMenuBarWindow (ev.window))
1693 menubar_control (ev); 2154 menubar_control (ev);
1694#endif 2155#endif
1695} 2156}
1696 2157
1697#ifdef TRANSPARENT 2158#ifdef TRANSPARENT
1698#if TINTING 2159#if TINTING
1699/* shading taken from eterm-0.9.2 */ 2160/* taken from aterm-0.4.2 */
1700/* RGB 15 */
1701 2161
1702static void 2162typedef 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 2163
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2164void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2165{
1710 /* No saturation */ 2166 int sh_r, sh_g, sh_b;
1711 for (y = h; --y >= 0;) { 2167 RUINT32T mask_r, mask_g, mask_b;
1712 for (x = -w; x < 0; x++) { 2168 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1713 int r, g, b; 2169 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2170 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2171 int i;
1714 2172
1715 b = ((uint16_t *) ptr)[x]; 2173 Visual *visual = display->visual;
1716 r = (b & 0x7c00) * rm; 2174
1717 g = (b & 0x3e0) * gm; 2175 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1718 b = (b & 0x1f) * bm; 2176
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2177 /* for convenience */
1720 | ((g >> 8) & 0x3e0) 2178 mask_r = visual->red_mask;
1721 | ((b >> 8) & 0x1f); 2179 mask_g = visual->green_mask;
1722 } 2180 mask_b = visual->blue_mask;
1723 ptr += bpl; 2181
1724 } 2182 /* boring lookup table pre-initialization */
2183 switch (srcImage->bits_per_pixel) {
2184 case 15:
2185 if ((mask_r != 0x7c00) ||
2186 (mask_g != 0x03e0) ||
2187 (mask_b != 0x001f))
2188 return;
2189 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2190 lookup_r = lookup;
2191 lookup_g = lookup+32;
2192 lookup_b = lookup+32+32;
2193 sh_r = 10;
2194 sh_g = 5;
2195 sh_b = 0;
2196 break;
2197 case 16:
2198 if ((mask_r != 0xf800) ||
2199 (mask_g != 0x07e0) ||
2200 (mask_b != 0x001f))
2201 return;
2202 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2203 lookup_r = lookup;
2204 lookup_g = lookup+32;
2205 lookup_b = lookup+32+64;
2206 sh_r = 11;
2207 sh_g = 5;
2208 sh_b = 0;
2209 break;
2210 case 24:
2211 if ((mask_r != 0xff0000) ||
2212 (mask_g != 0x00ff00) ||
2213 (mask_b != 0x0000ff))
2214 return;
2215 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2216 lookup_r = lookup;
2217 lookup_g = lookup+256;
2218 lookup_b = lookup+256+256;
2219 sh_r = 16;
2220 sh_g = 8;
2221 sh_b = 0;
2222 break;
2223 case 32:
2224 if ((mask_r != 0xff0000) ||
2225 (mask_g != 0x00ff00) ||
2226 (mask_b != 0x0000ff))
2227 return;
2228 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2229 lookup_r = lookup;
2230 lookup_g = lookup+256;
2231 lookup_b = lookup+256+256;
2232 sh_r = 16;
2233 sh_g = 8;
2234 sh_b = 0;
2235 break;
2236 default:
2237 return; /* we do not support this color depth */
2238 }
2239
2240 /* prepare limits for color transformation (each channel is handled separately) */
2241 if (shade < 0) {
2242 shade = -shade;
2243 if (shade < 0) shade = 0;
2244 if (shade > 100) shade = 100;
2245
2246 lower_lim_r = 65535-rm;
2247 lower_lim_g = 65535-gm;
2248 lower_lim_b = 65535-bm;
2249
2250 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2251 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2252 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2253
2254 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1725 } else { 2255 } else {
1726 for (y = h; --y >= 0;) { 2256 if (shade < 0) shade = 0;
1727 for (x = -w; x < 0; x++) { 2257 if (shade > 100) shade = 100;
1728 int r, g, b;
1729 2258
1730 b = ((uint16_t *) ptr)[x]; 2259 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1731 r = (b & 0x7c00) * rm; 2260
1732 g = (b & 0x3e0) * gm; 2261 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1733 b = (b & 0x1f) * bm; 2262 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1734 r |= (!(r >> 15) - 1); 2263 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1735 g |= (!(g >> 10) - 1); 2264 }
1736 b |= (!(b >> 5) - 1); 2265
1737 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2266 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1738 | ((g >> 8) & 0x3e0) 2267 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1739 | ((b >> 8) & 0x1f); 2268 {
1740 } 2269 unsigned int tmp;
1741 ptr += bpl; 2270
2271 tmp = lower_lim_r;
2272 lower_lim_r = lower_lim_b;
2273 lower_lim_b = tmp;
2274
2275 tmp = upper_lim_r;
2276 upper_lim_r = upper_lim_b;
2277 upper_lim_b = tmp;
2278 }
2279
2280 /* fill our lookup tables */
2281 for (i = 0; i <= mask_r>>sh_r; i++)
2282 {
2283 RUINT32T tmp;
2284 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2285 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2286 lookup_r[i] = (tmp/65535)<<sh_r;
2287 }
2288 for (i = 0; i <= mask_g>>sh_g; i++)
2289 {
2290 RUINT32T tmp;
2291 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2292 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2293 lookup_g[i] = (tmp/65535)<<sh_g;
2294 }
2295 for (i = 0; i <= mask_b>>sh_b; i++)
2296 {
2297 RUINT32T tmp;
2298 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2299 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2300 lookup_b[i] = (tmp/65535)<<sh_b;
2301 }
2302
2303 /* apply table to input image (replacing colors by newly calculated ones) */
2304 switch (srcImage->bits_per_pixel)
2305 {
2306 case 15:
2307 {
2308 unsigned short *p1, *pf, *p, *pl;
2309 p1 = (unsigned short *) srcImage->data;
2310 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2311 while (p1 < pf)
2312 {
2313 p = p1;
2314 pl = p1 + srcImage->width;
2315 for (; p < pl; p++)
1742 } 2316 {
2317 *p = lookup_r[(*p & 0x7c00)>>10] |
2318 lookup_g[(*p & 0x03e0)>> 5] |
2319 lookup_b[(*p & 0x001f)];
2320 }
2321 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1743 } 2322 }
1744} 2323 break;
1745 2324 }
1746/* RGB 16 */ 2325 case 16:
1747static void 2326 {
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2327 unsigned short *p1, *pf, *p, *pl;
1749{ 2328 p1 = (unsigned short *) srcImage->data;
1750 unsigned char *ptr; 2329 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751 int x, y; 2330 while (p1 < pf)
1752 2331 {
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2332 p = p1;
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2333 pl = p1 + srcImage->width;
1755 /* No saturation */ 2334 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 } 2335 {
1770 } else { 2336 *p = lookup_r[(*p & 0xf800)>>11] |
1771 for (y = h; --y >= 0;) { 2337 lookup_g[(*p & 0x07e0)>> 5] |
1772 for (x = -w; x < 0; x++) { 2338 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 } 2339 }
1786 ptr += bpl; 2340 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2341 }
2342 break;
2343 }
2344 case 24:
2345 {
2346 unsigned char *p1, *pf, *p, *pl;
2347 p1 = (unsigned char *) srcImage->data;
2348 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2349 while (p1 < pf)
2350 {
2351 p = p1;
2352 pl = p1 + srcImage->width * 3;
2353 for (; p < pl; p += 3)
1787 } 2354 {
2355 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2356 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2357 p[2] = lookup_r[(p[2] & 0x0000ff)];
2358 }
2359 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1788 } 2360 }
1789} 2361 break;
2362 }
2363 case 32:
2364 {
2365 RUINT32T *p1, *pf, *p, *pl;
2366 p1 = (RUINT32T *) srcImage->data;
2367 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1790 2368
1791/* RGB 24 */ 2369 while (p1 < pf)
1792static void 2370 {
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2371 p = p1;
1794{ 2372 pl = p1 + srcImage->width;
1795 unsigned char *ptr; 2373 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 } 2374 {
1823 } else { 2375 *p = lookup_r[(*p & 0xff0000)>>16] |
1824 for (y = h; --y >= 0;) { 2376 lookup_g[(*p & 0x00ff00)>> 8] |
1825 for (x = -(w * 3); x < 0; x += 3) { 2377 lookup_b[(*p & 0x0000ff)] |
1826 int r, g, b; 2378 (*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 } 2379 }
1854 ptr += bpl; 2380 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1855 } 2381 }
2382 break;
2383 }
1856 } 2384 }
1857}
1858 2385
1859/* RGB 32 */ 2386 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} 2387}
1930
1931#endif 2388#endif
1932 2389
1933/* 2390/*
1934 * Check our parents are still who we think they are. 2391 * Check our parents are still who we think they are.
1935 * Do transparency updates if required 2392 * Do transparency updates if required
… …
1942 Atom atype; 2399 Atom atype;
1943 unsigned char *prop = NULL; 2400 unsigned char *prop = NULL;
1944 Window root, oldp, *list; 2401 Window root, oldp, *list;
1945 Pixmap rootpixmap = None; 2402 Pixmap rootpixmap = None;
1946 XWindowAttributes wattr, wrootattr; 2403 XWindowAttributes wattr, wrootattr;
2404 dDisp;
1947 2405
1948 pchanged = 0; 2406 pchanged = 0;
1949 2407
1950 if (!(Options & Opt_transparent)) 2408 if (!OPTION (Opt_transparent))
1951 return pchanged; /* Don't try any more */ 2409 return pchanged; /* Don't try any more */
1952 2410
1953 XGetWindowAttributes (display->display, display->root, &wrootattr); 2411 XGetWindowAttributes (disp, display->root, &wrootattr);
1954 rootdepth = wrootattr.depth; 2412 rootdepth = wrootattr.depth;
1955 2413
1956 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2414 XGetWindowAttributes (disp, parent[0], &wattr);
1957 2415
1958 if (rootdepth != wattr.depth) 2416 if (rootdepth != wattr.depth)
1959 { 2417 {
1960 if (am_transparent) 2418 if (am_transparent)
1961 { 2419 {
1962 pchanged = 1; 2420 pchanged = 1;
1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2421 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1964 am_transparent = am_pixmap_trans = 0; 2422 am_transparent = am_pixmap_trans = 0;
1965 } 2423 }
1966 2424
1967 return pchanged; /* Don't try any more */ 2425 return pchanged; /* Don't try any more */
1968 } 2426 }
1969 2427
1970 /* Get all X ops out of the queue so that our information is up-to-date. */ 2428 /* Get all X ops out of the queue so that our information is up-to-date. */
1971 XSync (display->display, False); 2429 XSync (disp, False);
1972 2430
1973 /* 2431 /*
1974 * Make the frame window set by the window manager have 2432 * Make the frame window set by the window manager have
1975 * the root background. Some window managers put multiple nested frame 2433 * the root background. Some window managers put multiple nested frame
1976 * windows for each client, so we have to take care about that. 2434 * windows for each client, so we have to take care about that.
1977 */ 2435 */
1978 i = (xa[XA_XROOTPMAPID] 2436 i = (xa[XA_XROOTPMAP_ID]
1979 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2437 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1980 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2438 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1981 &nitems, &bytes_after, &prop) == Success); 2439 &nitems, &bytes_after, &prop) == Success);
1982 2440
1983 if (!i || prop == NULL) 2441 if (!i || prop == NULL)
1984 i = (xa[XA_XSETROOTID] 2442 i = (xa[XA_ESETROOT_PMAP_ID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2443 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2444 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success); 2445 &nitems, &bytes_after, &prop) == Success);
1988 2446
1989 if (!i || prop == NULL) 2447 if (!i || prop == NULL
2448#if TINTING
2449 || !rs[Rs_color + Color_tint]
2450#endif
2451 )
1990 have_pixmap = 0; 2452 have_pixmap = 0;
1991 else 2453 else
1992 { 2454 {
1993 have_pixmap = 1; 2455 have_pixmap = 1;
1994 rootpixmap = *(Pixmap *)prop; 2456 rootpixmap = *(Pixmap *)prop;
… …
2005 Window cr; 2467 Window cr;
2006 XImage *image; 2468 XImage *image;
2007 GC gc; 2469 GC gc;
2008 XGCValues gcvalue; 2470 XGCValues gcvalue;
2009 2471
2010 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2472 XTranslateCoordinates (disp, parent[0], display->root,
2011 0, 0, &sx, &sy, &cr); 2473 0, 0, &sx, &sy, &cr);
2012 nw = (unsigned int)szHint.width; 2474 nw = (unsigned int)szHint.width;
2013 nh = (unsigned int)szHint.height; 2475 nh = (unsigned int)szHint.height;
2014 nx = ny = 0; 2476 nx = ny = 0;
2015 2477
… …
2025 nh += sy; 2487 nh += sy;
2026 ny = -sy; 2488 ny = -sy;
2027 sy = 0; 2489 sy = 0;
2028 } 2490 }
2029 2491
2030 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2492 min_it (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2493 min_it (nh, (unsigned int) (wrootattr.height - sy));
2494
2495 XSync (disp, False);
2032 allowedxerror = -1; 2496 allowedxerror = -1;
2033 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2497 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034 2498
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2499 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */ 2500 /* XXX: may need a delay here? */
2037 allowedxerror = 0; 2501 allowedxerror = 0;
2038 2502
2039 if (image == NULL) 2503 if (image == NULL)
2040 { 2504 {
2041 if (am_transparent && am_pixmap_trans) 2505 if (am_transparent && am_pixmap_trans)
2042 { 2506 {
2043 pchanged = 1; 2507 pchanged = 1;
2044 if (TermWin.pixmap != None) 2508 if (pixmap != None)
2045 { 2509 {
2046 XFreePixmap (display->display, TermWin.pixmap); 2510 XFreePixmap (disp, pixmap);
2047 TermWin.pixmap = None; 2511 pixmap = None;
2048 } 2512 }
2049 } 2513 }
2050 2514
2051 am_pixmap_trans = 0; 2515 am_pixmap_trans = 0;
2052 } 2516 }
2053 else 2517 else
2054 { 2518 {
2055 if (TermWin.pixmap != None) 2519 if (pixmap != None)
2056 XFreePixmap (display->display, TermWin.pixmap); 2520 XFreePixmap (disp, pixmap);
2057 2521
2058#if TINTING 2522#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint)) 2523 if (ISSET_PIXCOLOR (Color_tint))
2060 { 2524 {
2061 unsigned short shade, rm, gm, bm; 2525 unsigned short rm, gm, bm;
2526 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2062 2527
2063 PixColors[Color_tint].get (display, rm, gm, bm); 2528 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2064 2529
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2530 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 } 2531 }
2076#endif 2532#endif
2077 2533
2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2534 pixmap = XCreatePixmap (disp, vt,
2079 szHint.width, szHint.height, image->depth); 2535 szHint.width, szHint.height, image->depth);
2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2536 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2537 XPutImage (disp, pixmap, gc, image, 0, 0,
2082 nx, ny, image->width, image->height); 2538 nx, ny, image->width, image->height);
2083 XFreeGC (display->display, gc); 2539 XFreeGC (disp, gc);
2084 XDestroyImage (image); 2540 XDestroyImage (image);
2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2541 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2086 TermWin.pixmap); 2542 XClearWindow (disp, parent[0]);
2087 2543
2088 if (!am_transparent || !am_pixmap_trans) 2544 if (!am_transparent || !am_pixmap_trans)
2089 pchanged = 1; 2545 pchanged = 1;
2090 2546
2091 am_transparent = am_pixmap_trans = 1; 2547 am_transparent = am_pixmap_trans = 1;
2092 } 2548 }
2093 } 2549 }
2094 2550
2095 if (!am_pixmap_trans) 2551 if (am_pixmap_trans)
2552 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2553 else
2096 { 2554 {
2097 unsigned int n; 2555 unsigned int n;
2098 /* 2556 /*
2099 * InheritPixmap transparency 2557 * InheritPixmap transparency
2100 */ 2558 */
2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2559 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2103 { 2560 {
2104 oldp = TermWin.parent[i]; 2561 oldp = parent[i];
2105 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2562 XQueryTree (disp, parent[i - 1], &root,
2106 &TermWin.parent[i], &list, &n); 2563 &parent[i], &list, &n);
2107 XFree (list); 2564 XFree (list);
2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109 2565
2110 if (TermWin.parent[i] == display->root) 2566 if (parent[i] == display->root)
2111 { 2567 {
2112 if (oldp != None) 2568 if (oldp != None)
2113 pchanged = 1; 2569 pchanged = 1;
2114 2570
2115 break; 2571 break;
2116 } 2572 }
2117 2573
2118 if (oldp != TermWin.parent[i]) 2574 if (oldp != parent[i])
2119 pchanged = 1; 2575 pchanged = 1;
2120 } 2576 }
2121 2577
2122 n = 0; 2578 n = 0;
2123 2579
2124 if (pchanged) 2580 if (pchanged)
2125 { 2581 {
2126 for (; n < (unsigned int)i; n++) 2582 for (; n < (unsigned int)i; n++)
2127 { 2583 {
2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2584 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) 2585 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2131 { 2586 {
2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2587 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2133 break; 2588 break;
2134 } 2589 }
2135 } 2590 }
2136 } 2591 }
2137 2592
2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2593 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2139 { 2594 {
2140 D_X ((stderr, "InheritPixmap Turning off"));
2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2595 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2596 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2143 am_transparent = 0; 2597 am_transparent = 0;
2144 /* XXX: also turn off Opt_transparent? */ 2598 /* XXX: also turn off Opt_transparent? */
2145 } 2599 }
2146 else 2600 else
2147 { 2601 {
2148#if WAIT_FOR_WM 2602#if WAIT_FOR_WM
2149 /* wait (an arbitrary period) for the WM to do its thing 2603 /* wait (an arbitrary period) for the WM to do its thing
2150 * needed for fvwm2.2.2 (and before?) */ 2604 * needed for fvwm2.2.2 (and before?) */
2151 sleep (1); 2605 sleep (1);
2152#endif 2606#endif
2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154 for (n = 0; n < (unsigned int)i; n++) 2607 for (n = 0; n < (unsigned int)i; n++)
2608 {
2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2609 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2610 XClearWindow (disp, parent[n]);
2611 }
2156 2612
2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2613 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2158 am_transparent = 1; 2614 am_transparent = 1;
2159 } 2615 }
2160 2616
2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2617 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2162 TermWin.parent[i] = None; 2618 parent[i] = None;
2619 }
2620
2621 if (scrollBar.win)
2622 {
2623 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2624 scrollBar.setIdle ();
2625 scrollbar_show (0);
2626 }
2627
2628 if (am_transparent)
2629 {
2630 want_refresh = want_full_refresh = 1;
2631 if (am_pixmap_trans)
2632 flush ();
2163 } 2633 }
2164 2634
2165 return pchanged; 2635 return pchanged;
2166} 2636}
2167#endif 2637#endif
… …
2186 if (ch == NOCHAR) // TODO: improve 2656 if (ch == NOCHAR) // TODO: improve
2187 break; 2657 break;
2188 2658
2189 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2659 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2190 { 2660 {
2661 if (!seen_input)
2662 {
2663 seen_input = 1;
2664 // many badly-written programs (e.g. jed) contain a race condition:
2665 // they first read the screensize and then install a SIGWINCH handler.
2666 // some window managers resize the window early, and these programs
2667 // then sometimes get the size wrong.
2668 // unfortunately other programs are even more buggy and dislike
2669 // being sent SIGWINCH, so only do it when we were in fact being
2670 // resized.
2671 if (seen_resize && cmd_pid)
2672 kill (-cmd_pid, SIGWINCH);
2673 }
2674
2191 /* Read a text string from the input buffer */ 2675 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ]; 2676 unicode_t buf[UBUFSIZ];
2193 bool refreshnow = false; 2677 bool refreshnow = false;
2194 int nlines = 0; 2678 int nlines = 0;
2195 unicode_t *str = buf; 2679 unicode_t *str = buf;
2196 2680 unicode_t *eol = str + min (ncol, UBUFSIZ);
2197 *str++ = ch;
2198 2681
2199 for (;;) 2682 for (;;)
2200 { 2683 {
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)) 2684 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205 break; 2685 break;
2206 2686
2207 *str++ = ch; 2687 *str++ = ch;
2208 2688
2209 if (ch == C0_LF) 2689 if (ch == C0_LF || str >= eol)
2210 { 2690 {
2691 if (ch == C0_LF)
2211 nlines++; 2692 nlines++;
2693
2212 refresh_count++; 2694 refresh_count++;
2213 2695
2214 if (! (Options & Opt_jumpScroll) 2696 if (!OPTION (Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2697 || (refresh_count >= refresh_limit * (nrow - 1)))
2216 { 2698 {
2217 refreshnow = true; 2699 refreshnow = true;
2218 flag = true;
2219 ch = NOCHAR; 2700 ch = NOCHAR;
2220 break; 2701 break;
2221 } 2702 }
2222 2703
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2704 // scr_add_lines only works for nlines <= nrow - 1.
2224 if (nlines >= TermWin.nrow - 1) 2705 if (nlines >= nrow - 1)
2225 { 2706 {
2226 scr_add_lines (buf, nlines, str - buf); 2707 scr_add_lines (buf, nlines, str - buf);
2227 nlines = 0; 2708 nlines = 0;
2228 str = buf; 2709 str = buf;
2710 eol = str + min (ncol, UBUFSIZ);
2229 } 2711 }
2712
2713 if (str >= eol)
2714 {
2715 if (eol >= buf + UBUFSIZ)
2716 {
2717 ch = NOCHAR;
2718 break;
2719 }
2720 else
2721 eol = min (eol + ncol, buf + UBUFSIZ);
2722 }
2723
2230 } 2724 }
2231 2725
2232 if (str >= buf + UBUFSIZ) 2726 seq_begin = cmdbuf_ptr;
2233 { 2727 ch = next_char ();
2234 ch = NOCHAR;
2235 break;
2236 }
2237 } 2728 }
2238 2729
2239 scr_add_lines (buf, nlines, str - buf); 2730 scr_add_lines (buf, nlines, str - buf);
2240 2731
2241 /* 2732 /*
2242 * If there have been a lot of new lines, then update the screen 2733 * 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. 2734 * 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 2735 * the number of pages between refreshes is refresh_limit, which
2245 * is incremented here because we must be doing flat-out scrolling. 2736 * 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 */ 2737 */
2250 if (refreshnow) 2738 if (refreshnow)
2251 { 2739 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2740 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++; 2741 refresh_limit++;
2254 else 2742 else
2743 {
2744 flag = true;
2255 scr_refresh (refresh_type); 2745 scr_refresh (refresh_type);
2746 }
2256 } 2747 }
2257 2748
2258 } 2749 }
2259 else 2750 else
2260 { 2751 {
… …
2274 } 2765 }
2275 2766
2276 return flag; 2767 return flag;
2277} 2768}
2278 2769
2770// read the next octet
2771unicode_t
2772rxvt_term::next_octet ()
2773{
2774 return cmdbuf_ptr < cmdbuf_endp
2775 ? *cmdbuf_ptr++
2776 : NOCHAR;
2777}
2778
2279// read the next character 2779// read the next character
2280unicode_t 2780unicode_t
2281rxvt_term::next_char () 2781rxvt_term::next_char ()
2282{ 2782{
2283 while (cmdbuf_ptr < cmdbuf_endp) 2783 while (cmdbuf_ptr < cmdbuf_endp)
… …
2299 if (len == (size_t)-1) 2799 if (len == (size_t)-1)
2300 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2800 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2301 2801
2302 // assume wchar == unicode 2802 // assume wchar == unicode
2303 cmdbuf_ptr += len; 2803 cmdbuf_ptr += len;
2304 return wc; 2804 return wc & UNICODE_MASK;
2305 } 2805 }
2306 2806
2307 return NOCHAR; 2807 return NOCHAR;
2308} 2808}
2309 2809
… …
2314 */ 2814 */
2315unicode_t 2815unicode_t
2316rxvt_term::cmd_getc () 2816rxvt_term::cmd_getc ()
2317{ 2817{
2318 unicode_t c = next_char (); 2818 unicode_t c = next_char ();
2819
2820 if (c == NOCHAR)
2821 throw out_of_input;
2822
2823 return c;
2824}
2825
2826unicode_t
2827rxvt_term::cmd_get8 ()
2828{
2829 unicode_t c = next_octet ();
2319 2830
2320 if (c == NOCHAR) 2831 if (c == NOCHAR)
2321 throw out_of_input; 2832 throw out_of_input;
2322 2833
2323 return c; 2834 return c;
… …
2424 process_escape_seq (); 2935 process_escape_seq ();
2425 break; 2936 break;
2426 case C0_ENQ: /* terminal Status */ 2937 case C0_ENQ: /* terminal Status */
2427 if (rs[Rs_answerbackstring]) 2938 if (rs[Rs_answerbackstring])
2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2939 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2429 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2940 (unsigned int)strlen (rs[Rs_answerbackstring]));
2430 else 2941 else
2431 tt_write ((unsigned char *)VT100_ANS, 2942 tt_write ((unsigned char *)VT100_ANS,
2432 (unsigned int)STRLEN (VT100_ANS)); 2943 (unsigned int)strlen (VT100_ANS));
2433 break; 2944 break;
2434 case C0_BEL: /* bell */ 2945 case C0_BEL: /* bell */
2435 scr_bell (); 2946 scr_bell ();
2436 break; 2947 break;
2437 case C0_BS: /* backspace */ 2948 case C0_BS: /* backspace */
… …
2453 break; 2964 break;
2454 case C0_SI: /* shift in - acs */ 2965 case C0_SI: /* shift in - acs */
2455 scr_charset_choose (0); 2966 scr_charset_choose (0);
2456 break; 2967 break;
2457 2968
2969#ifdef EIGHT_BIT_CONTROLS
2458 // 8-bit controls 2970 // 8-bit controls
2459 case 0x90: /* DCS */ 2971 case 0x90: /* DCS */
2460 process_dcs_seq (); 2972 process_dcs_seq ();
2461 break; 2973 break;
2462 case 0x9b: /* CSI */ 2974 case 0x9b: /* CSI */
2463 process_csi_seq (); 2975 process_csi_seq ();
2464 break; 2976 break;
2465 case 0x9d: /* CSI */ 2977 case 0x9d: /* CSI */
2466 process_osc_seq (); 2978 process_osc_seq ();
2467 break; 2979 break;
2980#endif
2468 } 2981 }
2469} 2982}
2470/*}}} */ 2983/*}}} */
2471 2984
2472 2985
… …
2534void 3047void
2535rxvt_term::process_escape_seq () 3048rxvt_term::process_escape_seq ()
2536{ 3049{
2537 unicode_t ch = cmd_getc (); 3050 unicode_t ch = cmd_getc ();
2538 3051
2539 if (PrivateModes & PrivMode_vt52) 3052 if (priv_modes & PrivMode_vt52)
2540 { 3053 {
2541 process_escape_vt52 (ch); 3054 process_escape_vt52 (ch);
2542 return; 3055 return;
2543 } 3056 }
2544 3057
… …
2559 scr_charset_set (2, (unsigned int)cmd_getc ()); 3072 scr_charset_set (2, (unsigned int)cmd_getc ());
2560 break; 3073 break;
2561 case '+': 3074 case '+':
2562 scr_charset_set (3, (unsigned int)cmd_getc ()); 3075 scr_charset_set (3, (unsigned int)cmd_getc ());
2563 break; 3076 break;
2564#ifndef NO_FRILLS 3077#if ENABLE_FRILLS
2565 case '6': 3078 case '6':
2566 scr_backindex (); 3079 scr_backindex ();
2567 break; 3080 break;
2568#endif 3081#endif
2569 case '7': 3082 case '7':
2570 scr_cursor (SAVE); 3083 scr_cursor (SAVE);
2571 break; 3084 break;
2572 case '8': 3085 case '8':
2573 scr_cursor (RESTORE); 3086 scr_cursor (RESTORE);
2574 break; 3087 break;
2575#ifndef NO_FRILLS 3088#if ENABLE_FRILLS
2576 case '9': 3089 case '9':
2577 scr_forwardindex (); 3090 scr_forwardindex ();
2578 break; 3091 break;
2579#endif 3092#endif
2580 case '=': 3093 case '=':
… …
2661 3174
2662/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3175/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663/* *INDENT-OFF* */ 3176/* *INDENT-OFF* */
2664enum { 3177enum {
2665 CSI_ICH = 0x40, 3178 CSI_ICH = 0x40,
2666 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3179 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 , 3180 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, 3181 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, 3182 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, 3183 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, 3184 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2759 { 3272 {
2760 switch (priv) 3273 switch (priv)
2761 { 3274 {
2762 case '>': 3275 case '>':
2763 if (ch == CSI_DA) /* secondary device attributes */ 3276 if (ch == CSI_DA) /* secondary device attributes */
2764 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3277 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2765 break; 3278 break;
2766 case '?': 3279 case '?':
2767 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3280 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2768 process_terminal_mode (ch, priv, nargs, arg); 3281 process_terminal_mode (ch, priv, nargs, arg);
2769 break; 3282 break;
… …
2874 3387
2875 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3388 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2876 arg[0] = -arg[0]; 3389 arg[0] = -arg[0];
2877 /* FALLTHROUGH */ 3390 /* FALLTHROUGH */
2878 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2879 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2880 break; 3393 break;
2881 3394
2882 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2883 tt_write ((const unsigned char *)VT100_ANS, 3396 tt_write ((const unsigned char *)VT100_ANS,
2884 (unsigned int) (sizeof (VT100_ANS) - 1)); 3397 (unsigned int) (sizeof (VT100_ANS) - 1));
2885 break; 3398 break;
2886 3399
2887 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3400 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2888 process_sgr_mode (nargs, arg); 3401 process_sgr_mode (nargs, arg);
2889 break; 3402 break;
… …
2896 break; 3409 break;
2897 case 6: /* CPR requested */ 3410 case 6: /* CPR requested */
2898 scr_report_position (); 3411 scr_report_position ();
2899 break; 3412 break;
2900 case 7: /* unofficial extension */ 3413 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure) 3414 if (OPTION (Opt_insecure))
2902 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3415 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2903 break; 3416 break;
2904 case 8: /* unofficial extension */ 3417 case 8: /* unofficial extension */
2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3418 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2906 break; 3419 break;
2907 } 3420 }
… …
2943 break; 3456 break;
2944 3457
2945 case CSI_RM: /* 8.3.107: RESET MODE */ 3458 case CSI_RM: /* 8.3.107: RESET MODE */
2946 if (arg[0] == 4) 3459 if (arg[0] == 4)
2947 scr_insert_mode (0); 3460 scr_insert_mode (0);
3461 else if (arg[0] == 20)
3462 priv_modes &= ~PrivMode_LFNL;
2948 break; 3463 break;
2949 3464
2950 case CSI_SM: /* 8.3.126: SET MODE */ 3465 case CSI_SM: /* 8.3.126: SET MODE */
2951 if (arg[0] == 4) 3466 if (arg[0] == 4)
2952 scr_insert_mode (1); 3467 scr_insert_mode (1);
3468 else if (arg[0] == 20)
3469 priv_modes |= PrivMode_LFNL;
2953 break; 3470 break;
2954 3471
2955 /* 3472 /*
2956 * PRIVATE USE beyond this point. All CSI_7? sequences here 3473 * PRIVATE USE beyond this point. All CSI_7? sequences here
2957 */ 3474 */
… …
2969 break; 3486 break;
2970 case CSI_75: 3487 case CSI_75:
2971 scr_cursor (RESTORE); 3488 scr_cursor (RESTORE);
2972 break; 3489 break;
2973 3490
2974#ifndef NO_FRILLS 3491#if ENABLE_FRILLS
2975 case CSI_74: 3492 case CSI_74:
2976 process_window_ops (arg, nargs); 3493 process_window_ops (arg, nargs);
2977 break; 3494 break;
2978#endif 3495#endif
2979 3496
… …
2986 break; 3503 break;
2987 } 3504 }
2988} 3505}
2989/*}}} */ 3506/*}}} */
2990 3507
2991#ifndef NO_FRILLS 3508#if ENABLE_FRILLS
2992/* ARGSUSED */ 3509/* ARGSUSED */
2993void 3510void
2994rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3511rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2995{ 3512{
2996 int x, y; 3513 int x, y;
2997 XWindowAttributes wattr; 3514 XWindowAttributes wattr;
2998 Window wdummy; 3515 Window wdummy;
3516 dDisp;
2999 3517
3000 if (nargs == 0) 3518 if (nargs == 0)
3001 return; 3519 return;
3002 3520
3003 switch (args[0]) 3521 switch (args[0])
3004 { 3522 {
3005 /* 3523 /*
3006 * commands 3524 * commands
3007 */ 3525 */
3008 case 1: /* deiconify window */ 3526 case 1: /* deiconify window */
3009 XMapWindow (display->display, TermWin.parent[0]); 3527 XMapWindow (disp, parent[0]);
3010 break; 3528 break;
3011 case 2: /* iconify window */ 3529 case 2: /* iconify window */
3012 XIconifyWindow (display->display, TermWin.parent[0], 3530 XIconifyWindow (disp, parent[0], display->screen);
3013 DefaultScreen (display->display));
3014 break; 3531 break;
3015 case 3: /* set position (pixels) */ 3532 case 3: /* set position (pixels) */
3016 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3533 XMoveWindow (disp, parent[0], args[1], args[2]);
3017 break; 3534 break;
3018 case 4: /* set size (pixels) */ 3535 case 4: /* set size (pixels) */
3019 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3536 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3020 break; 3537 break;
3021 case 5: /* raise window */ 3538 case 5: /* raise window */
3022 XRaiseWindow (display->display, TermWin.parent[0]); 3539 XRaiseWindow (disp, parent[0]);
3023 break; 3540 break;
3024 case 6: /* lower window */ 3541 case 6: /* lower window */
3025 XLowerWindow (display->display, TermWin.parent[0]); 3542 XLowerWindow (disp, parent[0]);
3026 break; 3543 break;
3027 case 7: /* refresh window */ 3544 case 7: /* refresh window */
3028 scr_touch (true); 3545 scr_touch (true);
3029 break; 3546 break;
3030 case 8: /* set size (chars) */ 3547 case 8: /* set size (chars) */
3031 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3548 set_widthheight ((unsigned int) (args[2] * fwidth),
3032 (unsigned int) (args[1] * TermWin.fheight)); 3549 (unsigned int) (args[1] * fheight));
3033 break; 3550 break;
3034 3551
3035 //case 9: NYI, TODO, restore maximized window or maximize window 3552 //case 9: NYI, TODO, restore maximized window or maximize window
3036 default: 3553 default:
3037 if (args[0] >= 24) /* set height (chars) */ 3554 if (args[0] >= 24) /* set height (chars) */
3038 set_widthheight ((unsigned int)TermWin.width, 3555 set_widthheight ((unsigned int)width,
3039 (unsigned int) (args[1] * TermWin.fheight)); 3556 (unsigned int) (args[1] * fheight));
3040 break; 3557 break;
3041 3558
3042 3559
3043 /* 3560 /*
3044 * reports - some output format copied from XTerm 3561 * reports - some output format copied from XTerm
3045 */ 3562 */
3046 case 11: /* report window state */ 3563 case 11: /* report window state */
3047 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3564 XGetWindowAttributes (disp, parent[0], &wattr);
3048 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3565 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3049 break; 3566 break;
3050 case 13: /* report window position */ 3567 case 13: /* report window position */
3051 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3568 XGetWindowAttributes (disp, parent[0], &wattr);
3052 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3569 XTranslateCoordinates (disp, parent[0], wattr.root,
3053 -wattr.border_width, -wattr.border_width, 3570 -wattr.border_width, -wattr.border_width,
3054 &x, &y, &wdummy); 3571 &x, &y, &wdummy);
3055 tt_printf ("\033[3;%d;%dt", x, y); 3572 tt_printf ("\033[3;%d;%dt", x, y);
3056 break; 3573 break;
3057 case 14: /* report window size (pixels) */ 3574 case 14: /* report window size (pixels) */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3575 XGetWindowAttributes (disp, parent[0], &wattr);
3059 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3576 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3060 break; 3577 break;
3061 case 18: /* report text area size (chars) */ 3578 case 18: /* report text area size (chars) */
3062 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3579 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3063 break; 3580 break;
3064 case 19: /* report window size (chars) */ 3581 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3582 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3066 break; 3583 break;
3067 case 20: /* report icon label */ 3584 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 { 3585 {
3070 char *s; 3586 char *s;
3071 XGetIconName (display->display, TermWin.parent[0], &s); 3587 XGetIconName (disp, parent[0], &s);
3072 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3588 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3589 XFree (s);
3073 } 3590 }
3074 break; 3591 break;
3075 case 21: /* report window title */ 3592 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 { 3593 {
3078 char *s; 3594 char *s;
3079 XFetchName (display->display, TermWin.parent[0], &s); 3595 XFetchName (disp, parent[0], &s);
3080 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3596 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3597 XFree (s);
3081 } 3598 }
3082 break; 3599 break;
3083 } 3600 }
3084} 3601}
3085#endif 3602#endif
3086 3603
… …
3090 * ends_how is terminator used. returned input must be free()'d 3607 * ends_how is terminator used. returned input must be free()'d
3091 */ 3608 */
3092unsigned char * 3609unsigned char *
3093rxvt_term::get_to_st (unicode_t &ends_how) 3610rxvt_term::get_to_st (unicode_t &ends_how)
3094{ 3611{
3095 int seen_esc = 0; /* seen escape? */ 3612 unicode_t ch;
3613 bool seen_esc = false;
3096 unsigned int n = 0; 3614 unsigned int n = 0;
3097 unsigned char *s;
3098 unicode_t ch;
3099 unsigned char string[STRING_MAX]; 3615 wchar_t string[STRING_MAX];
3100 3616
3101 while ((ch = cmd_getc ())) 3617 while ((ch = cmd_getc ()) != NOCHAR)
3102 { 3618 {
3103 if (ch == C0_BEL || ch == CHAR_ST)
3104 break;
3105
3106 if (seen_esc) 3619 if (seen_esc)
3620 {
3107 if (ch == 0x5c) /* 7bit ST */ 3621 if (ch == 0x5c) /* 7bit ST */
3108 break; 3622 break;
3109 else 3623 else
3110 return NULL; 3624 return NULL;
3111 3625 }
3112 if (ch == C0_ESC) 3626 else if (ch == C0_ESC)
3113 { 3627 {
3114 seen_esc = 1; 3628 seen_esc = true;
3115 continue; 3629 continue;
3116 } 3630 }
3631 else if (ch == C0_BEL || ch == CHAR_ST)
3632 break;
3117 else if (ch == C0_HT) 3633 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 */ 3634 return NULL; /* other control character - exit */
3121 3635
3122 if (n >= sizeof (string) - 1) 3636 seen_esc = false;
3637
3638 if (n >= STRING_MAX - 1)
3123 // stop at some sane length 3639 // stop at some sane length
3124 return NULL; 3640 return NULL;
3125 3641
3642 if (ch == C0_SYN)
3643 string[n++] = cmd_get8 ();
3644 else
3126 string[n++] = ch; 3645 string[n++] = ch;
3127 seen_esc = 0;
3128 } 3646 }
3129 3647
3130 string[n++] = '\0'; 3648 string[n++] = '\0';
3131 3649
3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3133 return NULL;
3134
3135 ends_how = (ch == 0x5c ? C0_ESC : ch); 3650 ends_how = (ch == 0x5c ? C0_ESC : ch);
3136 STRNCPY (s, string, n); 3651
3137 return s; 3652 return (unsigned char *)rxvt_wcstombs (string);
3138} 3653}
3139 3654
3140/*----------------------------------------------------------------------*/ 3655/*----------------------------------------------------------------------*/
3141/* 3656/*
3142 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3657 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3186void 3701void
3187rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3702rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3188{ 3703{
3189 if (str[0] == '?' && !str[1]) 3704 if (str[0] == '?' && !str[1])
3190 { 3705 {
3191 if (Options & Opt_insecure)
3192 {
3193 unsigned short r, g, b; 3706 unsigned short r, g, b;
3194 PixColors[color].get (display, r, g, b); 3707 pix_colors_focused[color].get (display, r, g, b);
3195 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3196 }
3197 } 3709 }
3198 else 3710 else
3199 set_window_color (color, str); 3711 set_window_color (color, str);
3200} 3712}
3201 3713
3202/* 3714/*
3203 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3715 * 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 */ 3716 */
3227void 3717void
3228rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3718rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3229{ 3719{
3230 int changed = 0; 3720 int changed = 0;
3231 int color; 3721 int color;
3232 char *buf, *name; 3722 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1]; 3723 bool query = str[0] == '?' && !str[1];
3724 int saveop = op;
3725 dDisp;
3234 3726
3235 assert (str != NULL); 3727 assert (str != NULL);
3236 switch (op) 3728 switch (op)
3237 { 3729 {
3238 case XTerm_name: 3730 case XTerm_name:
… …
3245 set_title (str); 3737 set_title (str);
3246 break; 3738 break;
3247 case XTerm_property: 3739 case XTerm_property:
3248 if (str[0] == '?') 3740 if (str[0] == '?')
3249 { 3741 {
3250 Atom prop = XInternAtom (display->display, str + 1, True); 3742 Atom prop = display->atom (str + 1);
3251 Atom actual_type; 3743 Atom actual_type;
3252 int actual_format; 3744 int actual_format;
3253 unsigned long nitems; 3745 unsigned long nitems;
3254 unsigned long bytes_after; 3746 unsigned long bytes_after;
3255 unsigned char *value = 0; 3747 unsigned char *value = 0;
3256 const char *str = ""; 3748 const char *str = "";
3257 3749
3258 if (prop 3750 if (prop
3259 && XGetWindowProperty (display->display, TermWin.parent[0], 3751 && XGetWindowProperty (disp, parent[0],
3260 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3261 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3262 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3263 && actual_type != None 3755 && actual_type != None
3264 && actual_format == 8) 3756 && actual_format == 8)
… …
3273 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3765 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3274 3766
3275 if (eq) 3767 if (eq)
3276 { 3768 {
3277 *eq = 0; 3769 *eq = 0;
3278 XChangeProperty (display->display, TermWin.parent[0], 3770 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 } 3771 }
3283 else 3772 else
3284 XDeleteProperty (display->display, TermWin.parent[0], 3773 XDeleteProperty (disp, parent[0],
3285 display->atom (str)); 3774 display->atom (str));
3286 } 3775 }
3287 break; 3776 break;
3288 3777
3289 case XTerm_Color: 3778 case XTerm_Color:
3290 for (buf = (char *)str; buf && *buf;) 3779 for (buf = (char *)str; buf && *buf;)
3291 { 3780 {
3292 if ((name = STRCHR (buf, ';')) == NULL) 3781 if ((name = strchr (buf, ';')) == NULL)
3293 break; 3782 break;
3294 3783
3295 *name++ = '\0'; 3784 *name++ = '\0';
3296 color = atoi (buf); 3785 color = atoi (buf);
3297 3786
3298 if (color < 0 || color >= TOTAL_COLORS) 3787 if (color < 0 || color >= TOTAL_COLORS)
3299 break; 3788 break;
3300 3789
3301 if ((buf = STRCHR (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3302 *buf++ = '\0'; 3791 *buf++ = '\0';
3303 3792
3304 if (name[0] == '?' && !name[1]) 3793 if (name[0] == '?' && !name[1])
3305 { 3794 {
3306 if (Options & Opt_insecure)
3307 {
3308 unsigned short r, g, b; 3795 unsigned short r, g, b;
3309 PixColors[color + minCOLOR].get (display, r, g, b); 3796 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); 3797 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3311 }
3312 } 3798 }
3313 else 3799 else
3314 set_window_color (color + minCOLOR, name); 3800 set_window_color (color + minCOLOR, name);
3315 } 3801 }
3316 break; 3802 break;
… …
3338 case XTerm_Color_UL: 3824 case XTerm_Color_UL:
3339 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3825 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3340 break; 3826 break;
3341 case XTerm_Color_RV: 3827 case XTerm_Color_RV:
3342 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3828 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3829 break;
3830 case URxvt_Color_IT:
3831 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3832 break;
3833#endif
3834#if TRANSPARENT && TINTING
3835 case URxvt_Color_tint:
3836 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3837 check_our_parents ();
3838 if (am_transparent)
3839 want_full_refresh = want_refresh = 1;
3343 break; 3840 break;
3344#endif 3841#endif
3345 3842
3346 case XTerm_Pixmap: 3843 case XTerm_Pixmap:
3347 if (*str != ';') 3844 if (*str != ';')
… …
3350 scale_pixmap (""); /* reset to default scaling */ 3847 scale_pixmap (""); /* reset to default scaling */
3351 set_bgPixmap (str); /* change pixmap */ 3848 set_bgPixmap (str); /* change pixmap */
3352#endif 3849#endif
3353 scr_touch (true); 3850 scr_touch (true);
3354 } 3851 }
3355 while ((str = STRCHR (str, ';')) != NULL) 3852 while ((str = strchr (str, ';')) != NULL)
3356 { 3853 {
3357 str++; 3854 str++;
3358#if XPM_BACKGROUND 3855#if XPM_BACKGROUND
3359 changed += scale_pixmap (str); 3856 changed += scale_pixmap (str);
3360#endif 3857#endif
3361
3362 } 3858 }
3859
3363 if (changed) 3860 if (changed)
3364 { 3861 {
3365#ifdef XPM_BACKGROUND 3862#ifdef XPM_BACKGROUND
3366 resize_pixmap (); 3863 resize_pixmap ();
3367#endif 3864#endif
… …
3378 3875
3379 case XTerm_logfile: 3876 case XTerm_logfile:
3380 // TODO, when secure mode? 3877 // TODO, when secure mode?
3381 break; 3878 break;
3382 3879
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 3880#ifdef MENUBAR
3424 case XTerm_Menu: 3881 case URxvt_Menu:
3425 if (Options & Opt_insecure) 3882 if (OPTION (Opt_insecure))
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3883 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break; 3884 break;
3428#endif 3885#endif
3429#if 0 3886#if 0
3430 case XTerm_dumpscreen: /* no error notices */ 3887 case XTerm_dumpscreen: /* no error notices */
… …
3434 { 3891 {
3435 scr_dump (fd); 3892 scr_dump (fd);
3436 close (fd); 3893 close (fd);
3437 } 3894 }
3438 } 3895 }
3896 break;
3897#endif
3898 case XTerm_font:
3899 op = URxvt_font;
3900 case URxvt_font:
3901#if ENABLE_STYLES
3902 case URxvt_boldFont:
3903 case URxvt_italicFont:
3904 case URxvt_boldItalicFont:
3905#endif
3906 if (query)
3907 tt_printf ("\33]%d;%-.250s%c", saveop,
3908 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3909 ? fontset[op - URxvt_font]->fontdesc : "",
3910 resp);
3911 else
3912 {
3913 const char *&res = rs[Rs_font + (op - URxvt_font)];
3914
3915 res = strdup (str);
3916 allocated.push_back ((void *)res);
3917 set_fonts ();
3918 }
3919 break;
3920
3921#if ENABLE_FRILLS
3922 case URxvt_locale:
3923 if (query)
3924 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3925 else
3926 {
3927 set_locale (str);
3928 pty.set_utf8_mode (enc_utf8);
3929 init_xlocale ();
3930 }
3931 break;
3932
3933 case URxvt_view_up:
3934 case URxvt_view_down:
3935 int lines = atoi (str);
3936
3937 if (lines)
3938 scr_page (op == URxvt_view_up ? UP : DN, lines);
3939 else
3940 {
3941 scr_erase_savelines ();
3942 }
3943
3439 break; 3944 break;
3440#endif 3945#endif
3441 } 3946 }
3442} 3947}
3443/*----------------------------------------------------------------------*/ 3948/*----------------------------------------------------------------------*/
… …
3457{ 3962{
3458 int state; 3963 int state;
3459 3964
3460 if (mode == 's') 3965 if (mode == 's')
3461 { 3966 {
3462 SavedModes |= (PrivateModes & bit); 3967 SavedModes |= (priv_modes & bit);
3463 return -1; 3968 return -1;
3464 } 3969 }
3465 else 3970 else
3466 { 3971 {
3467 if (mode == 'r') 3972 if (mode == 'r')
3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3973 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3469 else 3974 else
3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3975 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3471 PrivMode (state, bit); 3976 PrivMode (state, bit);
3472 } 3977 }
3473 3978
3474 return state; 3979 return state;
3475} 3980}
… …
3493 { 3, PrivMode_132 }, 3998 { 3, PrivMode_132 },
3494 { 4, PrivMode_smoothScroll }, 3999 { 4, PrivMode_smoothScroll },
3495 { 5, PrivMode_rVideo }, 4000 { 5, PrivMode_rVideo },
3496 { 6, PrivMode_relOrigin }, 4001 { 6, PrivMode_relOrigin },
3497 { 7, PrivMode_Autowrap }, 4002 { 7, PrivMode_Autowrap },
4003 // 8, bi-directional support mode
3498 { 9, PrivMode_MouseX10 }, 4004 { 9, PrivMode_MouseX10 },
3499#ifdef menuBar_esc 4005#ifdef menuBar_esc
3500 { menuBar_esc, PrivMode_menuBar }, 4006 { menuBar_esc, PrivMode_menuBar },
3501#endif 4007#endif
4008 // 18, 19 printing-related
4009 { 25, PrivMode_VisibleCursor },
3502#ifdef scrollBar_esc 4010#ifdef scrollBar_esc
3503 { scrollBar_esc, PrivMode_scrollBar }, 4011 { scrollBar_esc, PrivMode_scrollBar },
3504#endif 4012#endif
3505 // 18, 19 printing-related
3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3508 { 35, PrivMode_ShiftKeys }, // rxvt extension 4013 { 35, PrivMode_ShiftKeys }, // rxvt extension
3509 { 40, PrivMode_132OK }, 4014 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI 4015 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI 4016 // 45 margin bell NYI
3512 // 46 start logging 4017 // 46 start logging
… …
3552 } 4057 }
3553 4058
3554 /* extra handling for values with state unkept */ 4059 /* extra handling for values with state unkept */
3555 switch (arg[i]) 4060 switch (arg[i])
3556 { 4061 {
4062#if ENABLE_STYLES
4063 case 1021:
4064 if (mode)
4065 SET_OPTION (Opt_intensityStyles);
4066 else
4067 CLR_OPTION (Opt_intensityStyles);
4068
4069 want_refresh = 1;
4070 want_full_refresh = 1;
4071 break;
4072#endif
3557 case 1048: /* alternative cursor save */ 4073 case 1048: /* alternative cursor save */
4074 case 1049:
3558 if (Options & Opt_secondaryScreen) 4075 if (OPTION (Opt_secondaryScreen))
3559 if (mode == 0) 4076 if (mode == 0)
3560 scr_cursor (RESTORE); 4077 scr_cursor (RESTORE);
3561 else if (mode == 1) 4078 else if (mode == 1)
3562 scr_cursor (SAVE); 4079 scr_cursor (SAVE);
3563 break; 4080 break;
… …
3574 * within VT52 mode 4091 * within VT52 mode
3575 */ 4092 */
3576 PrivMode (1, PrivMode_vt52); 4093 PrivMode (1, PrivMode_vt52);
3577 break; 4094 break;
3578 case 3: /* 80/132 */ 4095 case 3: /* 80/132 */
3579 if (PrivateModes & PrivMode_132OK) 4096 if (priv_modes & PrivMode_132OK)
3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4097 set_widthheight (((state ? 132 : 80) * fwidth), height);
3581 break; 4098 break;
3582 case 4: /* smooth scrolling */ 4099 case 4: /* smooth scrolling */
3583 if (state) 4100 if (!state)
3584 Options &= ~Opt_jumpScroll; 4101 SET_OPTION (Opt_jumpScroll);
3585 else 4102 else
3586 Options |= Opt_jumpScroll; 4103 CLR_OPTION (Opt_jumpScroll);
3587 break; 4104 break;
3588 case 5: /* reverse video */ 4105 case 5: /* reverse video */
3589 scr_rvideo_mode (state); 4106 scr_rvideo_mode (state);
3590 break; 4107 break;
3591 case 6: /* relative/absolute origins */ 4108 case 6: /* relative/absolute origins */
… …
3595 scr_autowrap (state); 4112 scr_autowrap (state);
3596 break; 4113 break;
3597 /* case 8: - auto repeat, can't do on a per window basis */ 4114 /* case 8: - auto repeat, can't do on a per window basis */
3598 case 9: /* X10 mouse reporting */ 4115 case 9: /* X10 mouse reporting */
3599 if (state) /* orthogonal */ 4116 if (state) /* orthogonal */
3600 PrivateModes &= ~PrivMode_MouseX11; 4117 priv_modes &= ~PrivMode_MouseX11;
3601 break; 4118 break;
3602#ifdef menuBar_esc 4119#ifdef menuBar_esc
3603 case menuBar_esc: 4120 case menuBar_esc:
3604#ifdef MENUBAR 4121#ifdef MENUBAR
3605 map_menuBar (state); 4122 map_menuBar (state);
… …
3625 break; 4142 break;
3626 /* case 66: - application key pad */ 4143 /* case 66: - application key pad */
3627 /* case 67: - backspace key */ 4144 /* case 67: - backspace key */
3628 case 1000: /* X11 mouse reporting */ 4145 case 1000: /* X11 mouse reporting */
3629 if (state) /* orthogonal */ 4146 if (state) /* orthogonal */
3630 PrivateModes &= ~PrivMode_MouseX10; 4147 priv_modes &= ~PrivMode_MouseX10;
3631 break; 4148 break;
3632#if 0 4149#if 0
3633 case 1001: 4150 case 1001:
3634 break; /* X11 mouse highlighting */ 4151 break; /* X11 mouse highlighting */
3635#endif 4152#endif
3636 case 1010: /* scroll to bottom on TTY output inhibit */ 4153 case 1010: /* scroll to bottom on TTY output inhibit */
3637 if (state) 4154 if (!state)
3638 Options &= ~Opt_scrollTtyOutput; 4155 SET_OPTION (Opt_scrollTtyOutput);
3639 else 4156 else
3640 Options |= Opt_scrollTtyOutput; 4157 CLR_OPTION (Opt_scrollTtyOutput);
3641 break; 4158 break;
3642 case 1011: /* scroll to bottom on key press */ 4159 case 1011: /* scroll to bottom on key press */
3643 if (state) 4160 if (state)
3644 Options |= Opt_scrollTtyKeypress; 4161 SET_OPTION (Opt_scrollTtyKeypress);
3645 else 4162 else
3646 Options &= ~Opt_scrollTtyKeypress; 4163 CLR_OPTION (Opt_scrollTtyKeypress);
3647 break; 4164 break;
3648 case 1047: /* secondary screen w/ clearing last */ 4165 case 1047: /* secondary screen w/ clearing last */
3649 if (Options & Opt_secondaryScreen) 4166 if (OPTION (Opt_secondaryScreen))
3650 if (current_screen != PRIMARY) 4167 if (current_screen != PRIMARY)
3651 scr_erase_screen (2); 4168 scr_erase_screen (2);
3652 scr_change_screen (state); 4169 scr_change_screen (state);
3653 break; 4170 break;
3654 case 1049: /* secondary screen w/ clearing first */ 4171 case 1049: /* secondary screen w/ clearing first */
3655 scr_change_screen (state); 4172 scr_change_screen (state);
3656 if (Options & Opt_secondaryScreen) 4173 if (OPTION (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4175 scr_erase_screen (2);
3659 break; 4176 break;
3660 default: 4177 default:
3661 break; 4178 break;
… …
3687 rendset = 0, rendstyle = ~RS_None; 4204 rendset = 0, rendstyle = ~RS_None;
3688 break; 4205 break;
3689 case 1: 4206 case 1:
3690 rendset = 1, rendstyle = RS_Bold; 4207 rendset = 1, rendstyle = RS_Bold;
3691 break; 4208 break;
4209 //case 2: // low intensity
4210 case 3:
4211 rendset = 1, rendstyle = RS_Italic;
4212 break;
3692 case 4: 4213 case 4:
3693 rendset = 1, rendstyle = RS_Uline; 4214 rendset = 1, rendstyle = RS_Uline;
3694 break; 4215 break;
3695 case 5: 4216 case 5: // slowly blinking
4217 case 6: // rapidly blinking
3696 rendset = 1, rendstyle = RS_Blink; 4218 rendset = 1, rendstyle = RS_Blink;
3697 break; 4219 break;
3698 //case 6: // scoansi light background 4220 //case 6: // scoansi light background
3699 case 7: 4221 case 7:
3700 rendset = 1, rendstyle = RS_RVid; 4222 rendset = 1, rendstyle = RS_RVid;
3701 break; 4223 break;
3702 case 8: 4224 case 8:
3703 // invisible. NYI 4225 // invisible. NYI
3704 break; 4226 break;
4227 //case 9: // crossed out
3705 //case 10: // scoansi acs off 4228 //case 10: // scoansi acs off, primary font
3706 //case 11: // scoansi acs on 4229 //case 11: // scoansi acs on, first alt font
3707 //case 12: // scoansi acs on, |0x80 4230 //case 12: // scoansi acs on, |0x80, second alt font
3708 case 21: // disable bold, blink and invis (some terminals use this) 4231 //...
4232 //case 19: // ninth alt font
4233 //case 20: // gothic
4234 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4235 rendset = 0, rendstyle = RS_Bold;
3710 break; 4236 break;
3711 case 22: 4237 case 22: // normal intensity
3712 rendset = 0, rendstyle = RS_Bold; 4238 rendset = 0, rendstyle = RS_Bold;
4239 break;
4240 case 23: // disable italic
4241 rendset = 0, rendstyle = RS_Italic;
3713 break; 4242 break;
3714 case 24: 4243 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4244 rendset = 0, rendstyle = RS_Uline;
3716 break; 4245 break;
3717 case 25: 4246 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4247 rendset = 0, rendstyle = RS_Blink;
3719 break; 4248 break;
4249 case 26: // variable spacing (iso 8613)
4250 rendset = 0, rendstyle = RS_Blink;
4251 break;
3720 case 27: 4252 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4253 rendset = 0, rendstyle = RS_RVid;
3722 break; 4254 break;
3723 case 28:
3724 // visible. NYI 4255 //case 28: // visible. NYI
3725 break; 4256 //case 29: // not crossed-out
3726 } 4257 }
3727 4258
3728 if (rendset != -1) 4259 if (rendset != -1)
3729 { 4260 {
3730 scr_rendition (rendset, rendstyle); 4261 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4272 case 35:
3742 case 36: 4273 case 36:
3743 case 37: 4274 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4275 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4276 break;
3746#ifdef TTY_256COLOR 4277 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4278 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4279 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4280 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4281 i += 2;
3752 } 4282 }
3753 break; 4283 break;
3754#endif
3755 case 39: /* default fg */ 4284 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4285 scr_color (Color_fg, Color_fg);
3757 break; 4286 break;
3758 4287
3759 case 40: 4288 case 40:
… …
3764 case 45: 4293 case 45:
3765 case 46: 4294 case 46:
3766 case 47: 4295 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4296 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4297 break;
3769#ifdef TTY_256COLOR 4298 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4299 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4300 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4301 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4302 i += 2;
3775 } 4303 }
3776 break; 4304 break;
3777#endif
3778 case 49: /* default bg */ 4305 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4306 scr_color (Color_bg, Color_bg);
3780 break; 4307 break;
4308
4309 //case 50: // not variable spacing
3781 4310
3782#ifndef NO_BRIGHTCOLOR 4311#ifndef NO_BRIGHTCOLOR
3783 case 90: 4312 case 90:
3784 case 91: /* set bright fg color */ 4313 case 91: /* set bright fg color */
3785 case 92: 4314 case 92:
3786 case 93: 4315 case 93:
3787 case 94: 4316 case 94:
3788 case 95: 4317 case 95:
3789 case 96: 4318 case 96:
3790 case 97: 4319 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4320 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4321 break;
3794 case 100: 4322 case 100:
3795 case 101: /* set bright bg color */ 4323 case 101: /* set bright bg color */
3796 case 102: 4324 case 102:
3797 case 103: 4325 case 103:
3798 case 104: 4326 case 104:
3799 case 105: 4327 case 105:
3800 case 106: 4328 case 106:
3801 case 107: 4329 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4330 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4331 break;
3805#endif 4332#endif
3806
3807 } 4333 }
3808 } 4334 }
3809} 4335}
3810/*}}} */ 4336/*}}} */
3811 4337
… …
3815{ 4341{
3816 unicode_t ch, cmd = cmd_getc (); 4342 unicode_t ch, cmd = cmd_getc ();
3817 4343
3818 if (cmd == 'Q') 4344 if (cmd == 'Q')
3819 { /* query graphics */ 4345 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4346 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4347 return;
3822 } 4348 }
3823 /* swallow other graphics sequences until terminating ':' */ 4349 /* swallow other graphics sequences until terminating ':' */
3824 do 4350 do
3825 ch = cmd_getc (); 4351 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4366 unsigned char buf[256];
3841 4367
3842 va_start (arg_ptr, fmt); 4368 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4370 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4371 tt_write (buf, strlen (buf));
3846} 4372}
3847 4373
3848/* ---------------------------------------------------------------------- */ 4374/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4375/* 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. 4376 * or generated by us in response to a query ESC sequence.
3851 */ 4377 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379
3852void 4380void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4381rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4382{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4383 if (v_buflen == 0)
4384 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3856 4386
3857 if (len) 4387 if ((unsigned int)written == len)
4388 return;
4389
4390 data += written;
4391 len -= written;
3858 { 4392 }
4393
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4395
4396 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len;
4398
4399 pty_ev.set (EVENT_READ | EVENT_WRITE);
4400}
4401
4402void rxvt_term::pty_write ()
4403{
4404 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4405
4406 if (written > 0)
4407 {
4408 v_buflen -= written;
4409
3859 if (v_buflen == 0) 4410 if (v_buflen == 0)
3860 { 4411 {
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); 4412 free (v_buffer);
3888 v_buffer = 0; 4413 v_buffer = 0;
3889 v_buflen = 0; 4414 v_buflen = 0;
3890 4415
3891 pty_ev.set (EVENT_READ); 4416 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; 4417 return;
3904 } 4418 }
4419
4420 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4421 }
4422 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4423 pty_ev.set (EVENT_READ);
3906} 4424}
3907 4425
3908/*----------------------- end-of-file (C source) -----------------------*/ 4426/*----------------------- end-of-file (C source) -----------------------*/
3909 4427

Diff Legend

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