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

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

Diff Legend

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