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.224 by root, Sun Jan 1 06:18:20 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#if HAVE_SCHED_YIELD
53#include <wchar.h> 54# include <sched.h>
55#endif
56
57#ifdef KEYSYM_RESOURCE
58# include "keyboard.h"
59#endif
60
61#include <csignal>
54 62
55/*----------------------------------------------------------------------*/ 63/*----------------------------------------------------------------------*/
56 64
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 65#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 66
59// exception thrown when the command parser runs out of input data 67// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 68class out_of_input { } out_of_input;
69
70#if ENABLE_FRILLS || ISO_14755
71
72#define ISO_14755_STARTED 0x80000000UL
73#define ISO_14755_51 0x40000000UL // basic (section 5.1)
74#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
75#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
76#define ISO_14755_MASK 0x0fffffffUL
77
78#if ISO_14755
79static unsigned short iso14755_symtab[] = {
80 // keysym, unicode
81 XK_Left, 0x2190,
82 XK_KP_Left, 0x2190,
83 XK_Up, 0x2191,
84 XK_KP_Up, 0x2191,
85 XK_Right, 0x2192,
86 XK_KP_Right, 0x2192,
87 XK_Down, 0x2193,
88 XK_KP_Down, 0x2193,
89 XK_Linefeed, 0x21b4,
90 XK_Return, 0x21b5,
91 XK_KP_Enter, 0x21b5,
92
93 XK_Prior, 0x21de,
94 XK_Next, 0x21df,
95 XK_Tab, 0x21e5,
96 XK_ISO_Left_Tab, 0x21e6,
97 XK_Shift_L, 0x21e7,
98 XK_Shift_R, 0x21e7,
99
100 XK_Shift_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_ISO_Lock, 0x21eb,
103 XK_Caps_Lock, 0x21ec,
104 XK_Num_Lock, 0x21ed,
105 XK_ISO_Level3_Shift, 0x21ee,
106 XK_ISO_Level3_Lock, 0x21ef,
107 XK_ISO_Group_Lock, 0x21f0,
108 XK_Home, 0x21f1,
109 XK_End, 0x21f2,
110
111 XK_Execute, 0x2318,
112 XK_Begin, 0x2320,
113 XK_Delete, 0x2326,
114 XK_Clear, 0x2327,
115 XK_BackSpace, 0x232b,
116 XK_Insert, 0x2380,
117 XK_Control_L, 0x2388,
118 XK_Control_R, 0x2388,
119 XK_Pause, 0x2389,
120 XK_Break, 0x238a,
121 XK_Escape, 0x238b,
122 XK_Undo, 0x238c,
123 XK_Print, 0x2399,
124
125 XK_space, 0x2423,
126
127#ifdef XK_KP_Begin
128 XK_KP_Prior, 0x21de,
129 XK_KP_Next, 0x21df,
130 XK_KP_Begin, 0x2320,
131 XK_KP_Insert, 0x2380,
132 XK_KP_Delete, 0x2326,
133 XK_KP_Space, 0x2422,
134#endif
135 0,
136};
137
138void
139rxvt_term::iso14755_54 (int x, int y)
140{
141 x = Pixel2Col (x);
142 y = Pixel2Row (y);
143
144 if (!IN_RANGE_EXC (x, 0, ncol)
145 || !IN_RANGE_EXC (y, 0, nrow))
146 return;
147
148 for (;;)
149 {
150 const line_t &l = ROW(y - view_start);
151
152 text_t t = l.t[x];
153
154 if (t != NOCHAR || !x)
155 {
156 iso14755_51 (l.t[x], l.r[x], x, y);
157 iso14755buf = ISO_14755_54;
158 break;
159 }
160
161 x--;
162 }
163}
164
165void
166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
167{
168 rxvt_fontset *fs = FONTSET (r);
169 rxvt_font *f = (*fs)[fs->find_font (ch)];
170 wchar_t *chr, *alloc, ch2, *fname;
171 int len;
172
173 fname = rxvt_utf8towcs (f->name);
174
175# if ENABLE_COMBINING
176 if (IS_COMPOSE (ch))
177 {
178 len = rxvt_composite.expand (ch, 0);
179 alloc = chr = new wchar_t[len];
180 rxvt_composite.expand (ch, chr);
181 }
182 else
183# endif
184 {
185 ch2 = ch;
186
187 alloc = 0;
188 chr = &ch2;
189 len = 1;
190 }
191
192 char attr[80]; // plenty
193
194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
195 (int)r,
196 fgcolor_of (r), bgcolor_of (r),
197 r & RS_Bold ? " bold" : "",
198 r & RS_Italic ? " italic" : "",
199 r & RS_Blink ? " blink" : "",
200 r & RS_RVid ? " rvid" : "",
201 r & RS_Uline ? " uline" : "",
202 r & RS_Careful ? " careful" : "");
203
204 int width = wcswidth (fname, wcslen (fname));
205
206 max_it (width, 8+5); // for char + hey
207 max_it (width, strlen (attr));
208
209 if (y >= 0)
210 {
211 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
212 x = 0;
213 }
214
215 scr_overlay_new (x, y, width, len + 2);
216
217 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
218
219 for (int y = 0; y < len; y++)
220 {
221 char buf[9];
222
223 ch = *chr++;
224
225 sprintf (buf, "%8x", ch);
226 scr_overlay_set (0, y, buf);
227 scr_overlay_set (9, y, '=');
228# if !UNICODE3
229 if (ch >= 0x10000)
230 ch = 0xfffd;
231# endif
232 scr_overlay_set (11, y, ch, r);
233 scr_overlay_set (12, y, NOCHAR, r);
234 }
235
236 scr_overlay_set (0, len , attr);
237 scr_overlay_set (0, len + 1, fname);
238
239 free (fname);
240
241# if ENABLE_COMBINING
242 if (alloc)
243 delete [] alloc;
244# endif
245}
246#endif
247
248void
249rxvt_term::commit_iso14755 ()
250{
251 wchar_t ch[2];
252
253 ch[0] = iso14755buf & ISO_14755_MASK;
254 ch[1] = 0;
255
256 if (iso14755buf & ISO_14755_51)
257 {
258 char mb[16];
259 int len;
260
261 // allow verbatim 0-bytes and control-bytes to be entered
262 if (ch[0] >= 0x20)
263 len = wcstombs (mb, ch, 16);
264 else
265 {
266 mb[0] = ch[0];
267 len = 1;
268 }
269
270 if (len > 0)
271 tt_write ((unsigned char *)mb, len);
272 else
273 scr_bell ();
274 }
275
276 iso14755buf = 0;
277}
278
279int
280rxvt_term::hex_keyval (XKeyEvent &ev)
281{
282 // check wether this event corresponds to a hex digit
283 // if the modifiers had not been pressed.
284 for (int index = 0; index < 8; index++)
285 {
286 KeySym k = XLookupKeysym (&ev, index);
287
288 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
289 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
290 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
291 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
292 }
293
294 return -1;
295}
296#endif
61 297
62/*{{{ Convert the keypress event into a string */ 298/*{{{ Convert the keypress event into a string */
63void 299void
64rxvt_term::lookup_key (XKeyEvent &ev) 300rxvt_term::lookup_key (XKeyEvent &ev)
65{ 301{
… …
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 312 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 313 * escape sequence to toggle the Keypad.
78 * 314 *
79 * Always permit `shift' to override the current setting 315 * Always permit `shift' to override the current setting
80 */ 316 */
81 shft = (ev.state & ShiftMask); 317 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 318 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 319 meta = ev.state & ModMetaMask;
84 320
85 if (numlock_state || (ev.state & ModNumLockMask)) 321 if (numlock_state || (ev.state & ModNumLockMask))
86 { 322 {
87 numlock_state = (ev.state & ModNumLockMask); 323 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 324 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
108 344
109 // the XOpenIM manpage lies about hardcoding the locale 345 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 346 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 347 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 348 SET_LOCALE (rs[Rs_imLocale]);
349
113 // assume wchar_t == unicode or better 350 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 351 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 352 KBUFSZ, &keysym, &status_return);
353
116 if (rs[Rs_imLocale]) 354 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 355 SET_LOCALE (locale);
118 356
119 if (status_return == XLookupChars 357 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 358 || status_return == XLookupBoth)
… …
147 valid_keysym = keysym != NoSymbol; 385 valid_keysym = keysym != NoSymbol;
148 } 386 }
149 387
150 if (valid_keysym) 388 if (valid_keysym)
151 { 389 {
390#ifdef KEYSYM_RESOURCE
391 if (keyboard->dispatch (this, keysym, ev.state))
392 return;
393#endif
394
152 if (TermWin.saveLines) 395 if (saveLines)
153 { 396 {
154#ifdef UNSHIFTED_SCROLLKEYS 397#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 398 if (!ctrl && !meta)
156 {
157#else 399#else
158 if (IS_SCROLL_MOD) 400 if (IS_SCROLL_MOD)
401#endif
159 { 402 {
160#endif
161 int lnsppg; 403 int lnsppg;
162 404
163#ifdef PAGING_CONTEXT_LINES 405#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 406 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 407#else
166 lnsppg = TermWin.nrow * 4 / 5; 408 lnsppg = nrow * 4 / 5;
167#endif 409#endif
168 if (keysym == XK_Prior) 410 if (keysym == XK_Prior)
169 { 411 {
170 scr_page (UP, lnsppg); 412 scr_page (UP, lnsppg);
171 return; 413 return;
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 456 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 457 {
216 keysym += (XK_F11 - XK_F1); 458 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 459 shft = 0; /* turn off Shift */
218 } 460 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 461 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 462 {
221 switch (keysym) 463 switch (keysym)
222 { 464 {
223 /* normal XTerm key bindings */ 465 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 466 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 467 selection_request (ev.time, 0, 0);
226 return; 468 return;
469#if TODO
227 /* rxvt extras */ 470 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 471 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 472 change_font (FONT_UP);
230 return; 473 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 474 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 475 change_font (FONT_DN);
233 return; 476 return;
477#endif
234 } 478 }
235 } 479 }
236 } 480 }
237#ifdef PRINTPIPE 481
238 if (keysym == XK_Print) 482#if ENABLE_FRILLS || ISO_14755
239 { 483 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 484 if (shft && ctrl)
241 return;
242 } 485 {
243#endif 486 int hv;
244 487
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 488 if (iso14755buf & ISO_14755_51
246 { 489 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 490 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 491 {
250 unsigned int l; 492 commit_iso14755 ();
251 const unsigned char *kbuf0; 493 iso14755buf = ISO_14755_51;
252 494# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 495 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 496# endif
261 ) 497 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 498 }
266 499 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 500 {
501 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
502 | hv | ISO_14755_51;
503# if ISO_14755
504 iso14755_51 (iso14755buf & ISO_14755_MASK);
505# endif
268 return; 506 return;
269 } 507 }
270 else 508 else
509 {
510# if ENABLE_OVERLAY
511 scr_overlay_off ();
271#endif 512# endif
513 iso14755buf = 0;
514 }
515 }
516 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
517 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
518 if (!(iso14755buf & ISO_14755_STARTED))
519 {
520 iso14755buf |= ISO_14755_STARTED;
521# if ENABLE_OVERLAY
522 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
523 scr_overlay_set (0, 0, "ISO 14755 mode");
524# endif
525 }
526#endif
527
528#ifdef PRINTPIPE
529 if (keysym == XK_Print)
530 {
531 scr_printscreen (ctrl | shft);
532 return;
533 }
534#endif
535
536 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
537 {
272 { 538 {
273 newlen = 1; 539 newlen = 1;
274 switch (keysym) 540 switch (keysym)
275 { 541 {
276#ifndef NO_BACKSPACE_KEY 542#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 543 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 544 if (priv_modes & PrivMode_HaveBackSpace)
279 { 545 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 546 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 547 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 548 kbuf[1] = '\0';
283 } 549 }
284 else 550 else
285 STRCPY (kbuf, key_backspace); 551 strcpy (kbuf, key_backspace);
286 break; 552 break;
287#endif 553#endif
288#ifndef NO_DELETE_KEY 554#ifndef NO_DELETE_KEY
555# ifdef XK_KP_Prior
556 case XK_KP_Delete:
557 /* allow shift to override */
558 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
559 {
560 strcpy (kbuf, "\033On");
561 break;
562 }
563 /* FALLTHROUGH */
564# endif
289 case XK_Delete: 565 case XK_Delete:
290 STRCPY (kbuf, key_delete); 566 strcpy (kbuf, key_delete);
291 break; 567 break;
292#endif 568#endif
293 case XK_Tab: 569 case XK_Tab:
294 if (shft) 570 if (shft)
295 STRCPY (kbuf, "\033[Z"); 571 strcpy (kbuf, "\033[Z");
296 else 572 else
297 { 573 {
298#ifdef CTRL_TAB_MAKES_META 574#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 575 if (ctrl)
300 meta = 1; 576 meta = 1;
… …
306 newlen = 0; 582 newlen = 0;
307 } 583 }
308 break; 584 break;
309 585
310#ifdef XK_KP_Left 586#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 587 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 588 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 589 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 590 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 591 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 592 {
317 STRCPY (kbuf, "\033OZ"); 593 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 594 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 595 break;
320 } 596 }
321 else 597 else
322 /* translate to std. cursor key */ 598 /* translate to std. cursor key */
… …
325#endif 601#endif
326 case XK_Up: /* "\033[A" */ 602 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 603 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 604 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 605 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 606 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 607 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 608 /* do Shift first */
333 if (shft) 609 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 610 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 611 else if (ctrl)
336 { 612 {
337 kbuf[1] = 'O'; 613 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 614 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 615 }
340 else if (PrivateModes & PrivMode_aplCUR) 616 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 617 kbuf[1] = 'O';
342 break; 618 break;
343 619
344#ifndef UNSHIFTED_SCROLLKEYS 620#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 621# ifdef XK_KP_Prior
346 case XK_KP_Prior: 622 case XK_KP_Prior:
347 /* allow shift to override */ 623 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 624 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 625 {
350 STRCPY (kbuf, "\033Oy"); 626 strcpy (kbuf, "\033Oy");
351 break; 627 break;
352 } 628 }
353 /* FALLTHROUGH */ 629 /* FALLTHROUGH */
354# endif 630# endif
355 case XK_Prior: 631 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 632 strcpy (kbuf, "\033[5~");
357 break; 633 break;
358# ifdef XK_KP_Next 634# ifdef XK_KP_Next
359 case XK_KP_Next: 635 case XK_KP_Next:
360 /* allow shift to override */ 636 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 638 {
363 STRCPY (kbuf, "\033Os"); 639 strcpy (kbuf, "\033Os");
364 break; 640 break;
365 } 641 }
366 /* FALLTHROUGH */ 642 /* FALLTHROUGH */
367# endif 643# endif
368 case XK_Next: 644 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 645 strcpy (kbuf, "\033[6~");
370 break; 646 break;
371#endif 647#endif
372 case XK_KP_Enter: 648 case XK_KP_Enter:
373 /* allow shift to override */ 649 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 651 {
376 STRCPY (kbuf, "\033OM"); 652 strcpy (kbuf, "\033OM");
653 break;
654 }
655
656 /* FALLTHROUGH */
657
658 case XK_Return:
659 if (priv_modes & PrivMode_LFNL)
660 {
661 kbuf[0] = '\015';
662 kbuf[1] = '\012';
663 kbuf[2] = '\0';
377 } 664 }
378 else 665 else
379 { 666 {
380 kbuf[0] = '\r'; 667 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 668 kbuf[1] = '\0';
382 } 669 }
383 break; 670 break;
384 671
385#ifdef XK_KP_Begin 672#ifdef XK_KP_Begin
386 case XK_KP_Begin: 673 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 674 strcpy (kbuf, "\033Ou");
388 break; 675 break;
389 676
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 677#endif
398 case XK_KP_F1: /* "\033OP" */ 678 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 679 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 680 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 681 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 682 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 683 kbuf[2] += (keysym - XK_KP_F1);
404 break; 684 break;
405 685
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 686 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 687 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 698 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 699 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 700 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 701 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 702 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 703 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 704 {
425 STRCPY (kbuf, "\033Oj"); 705 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 706 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 707 }
428 else 708 else
429 { 709 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 710 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 711 kbuf[1] = '\0';
432 } 712 }
433 break; 713 break;
434 714
435 case XK_Find: 715 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 716 strcpy (kbuf, "\033[1~");
437 break; 717 break;
718
719#ifdef XK_KP_End
720 case XK_KP_Insert:
721 /* allow shift to override */
722 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
723 {
724 strcpy (kbuf, "\033Op");
725 break;
726 }
727 /* FALLTHROUGH */
728#endif
438 case XK_Insert: 729 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 730 strcpy (kbuf, "\033[2~");
440 break; 731 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 732#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 733 case DXK_Remove:
443 /* FALLTHROUGH */ 734 /* FALLTHROUGH */
444#endif 735#endif
445 case XK_Execute: 736 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 737 strcpy (kbuf, "\033[3~");
447 break; 738 break;
448 case XK_Select: 739 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 740 strcpy (kbuf, "\033[4~");
450 break; 741 break;
451#ifdef XK_KP_End 742#ifdef XK_KP_End
452 case XK_KP_End: 743 case XK_KP_End:
453 /* allow shift to override */ 744 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 745 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 746 {
456 STRCPY (kbuf, "\033Oq"); 747 strcpy (kbuf, "\033Oq");
457 break; 748 break;
458 } 749 }
459 /* FALLTHROUGH */ 750 /* FALLTHROUGH */
460#endif 751#endif
461 case XK_End: 752 case XK_End:
462 STRCPY (kbuf, KS_END); 753 strcpy (kbuf, KS_END);
463 break; 754 break;
464#ifdef XK_KP_Home 755#ifdef XK_KP_Home
465 case XK_KP_Home: 756 case XK_KP_Home:
466 /* allow shift to override */ 757 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 759 {
469 STRCPY (kbuf, "\033Ow"); 760 strcpy (kbuf, "\033Ow");
470 break; 761 break;
471 } 762 }
472 /* FALLTHROUGH */ 763 /* FALLTHROUGH */
473#endif 764#endif
474 case XK_Home: 765 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 766 strcpy (kbuf, KS_HOME);
476 break; 767 break;
477 768
478#define FKEY(n, fkey) \ 769#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 770 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 771
… …
532#undef FKEY 823#undef FKEY
533 default: 824 default:
534 newlen = 0; 825 newlen = 0;
535 break; 826 break;
536 } 827 }
828
537 if (newlen) 829 if (newlen)
538 len = STRLEN (kbuf); 830 len = strlen (kbuf);
539 } 831 }
540 832
541 /* 833 /*
542 * Pass meta for all function keys, if 'meta' option set 834 * Pass meta for all function keys, if 'meta' option set
543 */ 835 */
… …
550 else if (ctrl && keysym == XK_minus) 842 else if (ctrl && keysym == XK_minus)
551 { 843 {
552 len = 1; 844 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 845 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 846 }
847 else if (keysym == XK_ISO_Left_Tab)
848 {
849 strcpy (kbuf, "\033[Z");
850 len = 3;
851 }
555 else 852 else
556 { 853 {
557#ifdef META8_OPTION 854#ifdef META8_OPTION
558 /* set 8-bit on */ 855 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 856 if (meta && (meta_char == 0x80))
… …
571 } 868 }
572 869
573 if (len <= 0) 870 if (len <= 0)
574 return; /* not mapped */ 871 return; /* not mapped */
575 872
576 if (Options & Opt_scrollTtyKeypress) 873 if (OPTION (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 874 if (view_start)
578 { 875 {
579 TermWin.view_start = 0; 876 view_start = 0;
580 want_refresh = 1; 877 want_refresh = 1;
581 } 878 }
582 879
583 /* 880 /*
584 * these modifications only affect the static keybuffer 881 * these modifications only affect the static keybuffer
… …
617#endif /* DEBUG_CMD */ 914#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 915 tt_write (kbuf, (unsigned int)len);
619} 916}
620/*}}} */ 917/*}}} */
621 918
622#if (MENUBAR_MAX) 919#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 920/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 921/* attempt to `write' count to the input buffer */
625unsigned int 922unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 924{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 927 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 929
633 if (n > 0 && s < count) 930 if (n > 0 && s < count)
634 { 931 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 932 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 933 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 934 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 935 cmdbuf_endp -= n;
639 s += n; 936 s += n;
640 } 937 }
… …
650 947
651 cmd_parse (); 948 cmd_parse ();
652 949
653 return 0; 950 return 0;
654} 951}
655#endif /* MENUBAR_MAX */ 952#endif
656 953
657void 954void
658rxvt_term::flush () 955rxvt_term::flush ()
659{ 956{
957 flush_ev.stop ();
958
660#ifdef TRANSPARENT 959#ifdef TRANSPARENT
661 if (want_full_refresh) 960 if (want_full_refresh)
662 { 961 {
663 want_full_refresh = 0; 962 want_full_refresh = 0;
664 scr_clear (); 963 scr_clear ();
665 scr_touch (false); 964 scr_touch (false);
666 want_refresh = 1;
667 } 965 }
668#endif 966#endif
669 967
670 if (want_refresh) 968 if (want_refresh)
671 { 969 {
… …
683rxvt_term::check_cb (check_watcher &w) 981rxvt_term::check_cb (check_watcher &w)
684{ 982{
685 SET_R (this); 983 SET_R (this);
686 SET_LOCALE (locale); 984 SET_LOCALE (locale);
687 985
986 display->flush ();
987
988 if (want_refresh && !flush_ev.active)
989 flush_ev.start (NOW + 0.01);
990}
991
992void
993rxvt_term::flush_cb (time_watcher &w)
994{
995 SET_R (this);
996 SET_LOCALE (locale);
997
998 refresh_limit = 1;
999 refresh_count = 0;
688 flush (); 1000 flush ();
689} 1001}
690 1002
691#ifdef CURSOR_BLINK 1003#ifdef CURSOR_BLINK
692void 1004void
… …
710 w.start (w.at + TEXT_BLINK_INTERVAL); 1022 w.start (w.at + TEXT_BLINK_INTERVAL);
711 } 1023 }
712} 1024}
713#endif 1025#endif
714 1026
1027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1028void
1029rxvt_term::cont_scroll_cb (time_watcher &w)
1030{
1031 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1032 scr_page (scrollbar_isUp() ? UP : DN, 1))
1033 {
1034 refresh_type |= SMOOTH_REFRESH;
1035 want_refresh = 1;
1036 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1037 }
1038}
1039#endif
1040
1041#ifdef SELECTION_SCROLLING
1042void
1043rxvt_term::sel_scroll_cb (time_watcher &w)
1044{
1045 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1046 {
1047 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1048 refresh_type |= SMOOTH_REFRESH;
1049 want_refresh = 1;
1050 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1051 }
1052}
1053#endif
1054
1055#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1056void
1057rxvt_term::slip_wheel_cb (time_watcher &w)
1058{
1059 if (mouse_slip_wheel_speed == 0
1060 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1061 : scr_page (UP, mouse_slip_wheel_speed))
1062 {
1063 if (view_start == nsaved ||
1064 view_start == 0)
1065 mouse_slip_wheel_speed = 0;
1066
1067 refresh_type |= SMOOTH_REFRESH;
1068 want_refresh = 1;
1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1070 }
1071}
1072#endif
1073
715bool 1074bool
716rxvt_term::pty_fill () 1075rxvt_term::pty_fill ()
717{ 1076{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1077 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
719 1078
… …
725 1084
726 memmove (cmdbuf_base, cmdbuf_ptr, n); 1085 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1086 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1087 cmdbuf_endp = cmdbuf_ptr + n;
729 1088
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1089 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
731 1090
732 if (n > 0) 1091 if (r > 0)
733 { 1092 {
734 cmdbuf_endp += n; 1093 cmdbuf_endp += r;
735 return true; 1094 return true;
736 } 1095 }
737 else if (n < 0 && errno != EAGAIN) 1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 {
1098#if HAVE_SCHED_YIELD
1099 sched_yield ();
1100#endif
1101 }
1102 else
1103 {
1104 pty_ev.stop ();
1105
1106 if (!OPTION (Opt_hold))
738 destroy (); 1107 destroy ();
1108 }
739 1109
740 return false; 1110 return false;
741} 1111}
742 1112
743void 1113void
744rxvt_term::pty_cb (io_watcher &w, short revents) 1114rxvt_term::pty_cb (io_watcher &w, short revents)
745{ 1115{
746 SET_R (this); 1116 SET_R (this);
747 SET_LOCALE (locale); 1117 SET_LOCALE (locale);
748 1118
749 if (revents & EVENT_WRITE)
750 tt_write (0, 0);
751 else if (revents & EVENT_READ) 1119 if (revents & EVENT_READ)
752 // loop, but don't allow a single term to monopolize us 1120 // loop, but don't allow a single term to monopolize us
753 while (pty_fill ()) 1121 while (pty_fill ())
754 if (cmd_parse ()) 1122 if (cmd_parse ())
755 break; 1123 break;
1124
1125 if (revents & EVENT_WRITE)
1126 pty_write ();
1127}
1128
1129void
1130rxvt_term::pointer_unblank ()
1131{
1132 XDefineCursor (display->display, vt, TermWin_cursor);
1133 recolour_cursor ();
1134
1135#ifdef POINTER_BLANK
1136 hidden_pointer = 0;
1137
1138 if (OPTION (Opt_pointerBlank))
1139 pointer_ev.start (NOW + pointerBlankDelay);
1140#endif
756} 1141}
757 1142
758#ifdef POINTER_BLANK 1143#ifdef POINTER_BLANK
759void 1144void
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 () 1145rxvt_term::pointer_blank ()
773{ 1146{
774 if (! (Options & Opt_pointerBlank)) 1147 if (! OPTION (Opt_pointerBlank))
775 return; 1148 return;
776 1149
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1150 XDefineCursor (display->display, vt, display->blank_cursor);
778 XFlush (display->display); 1151 XFlush (display->display);
779 1152
780 hidden_pointer = 1; 1153 hidden_pointer = 1;
781} 1154}
782 1155
… …
799 x = ev.x; 1172 x = ev.x;
800 y = ev.y; 1173 y = ev.y;
801 pixel_position (&x, &y); 1174 pixel_position (&x, &y);
802 1175
803 if (MEvent.button == AnyButton) 1176 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1177 button_number = 3;
806 }
807 else 1178 else
808 { 1179 {
809 button_number = MEvent.button - Button1; 1180 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1181 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1182 if (button_number >= 3)
812 button_number += (64 - 3); 1183 button_number += (64 - 3);
813 } 1184 }
814 1185
815 if (PrivateModes & PrivMode_MouseX10) 1186 if (priv_modes & PrivMode_MouseX10)
816 { 1187 {
817 /* 1188 /*
818 * do not report ButtonRelease 1189 * do not report ButtonRelease
819 * no state info allowed 1190 * no state info allowed
820 */ 1191 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1206 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1207 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1208#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1209 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1210#endif
840
841 } 1211 }
842 1212
843#ifdef DEBUG_MOUSEREPORT 1213#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1214 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1215 if (key_state & 16)
846 fputc ('C', stderr); 1216 fputc ('C', stderr);
847 if (key_state & 4) 1217 if (key_state & 4)
848 fputc ('S', stderr); 1218 fputc ('S', stderr);
… …
852 fputc ('2', stderr); 1222 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1223 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1224 button_number,
855 x + 1, 1225 x + 1,
856 y + 1); 1226 y + 1);
857#else 1227#endif
1228
858 tt_printf ("\033[M%c%c%c", 1229 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1230 (32 + button_number + key_state),
860 (32 + x + 1), 1231 (32 + x + 1),
861 (32 + y + 1)); 1232 (32 + y + 1));
862#endif
863} 1233}
864 1234
865#ifdef USING_W11LIB 1235#ifdef USING_W11LIB
866void 1236void
867rxvt_W11_process_x_event (XEvent *ev) 1237rxvt_W11_process_x_event (XEvent *ev)
… …
874 1244
875/*{{{ process an X event */ 1245/*{{{ process an X event */
876void 1246void
877rxvt_term::x_cb (XEvent &ev) 1247rxvt_term::x_cb (XEvent &ev)
878{ 1248{
1249 dDisp;
1250
879 SET_R (this); 1251 SET_R (this);
880 SET_LOCALE (locale); 1252 SET_LOCALE (locale);
881 1253
882#if defined(CURSOR_BLINK) 1254#if defined(CURSOR_BLINK)
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
884 { 1256 {
885 if (hidden_cursor) 1257 if (hidden_cursor)
886 { 1258 {
887 hidden_cursor = 0; 1259 hidden_cursor = 0;
888 want_refresh = 1; 1260 want_refresh = 1;
… …
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
892 } 1264 }
893#endif 1265#endif
894 1266
895#if defined(POINTER_BLANK) 1267#if defined(POINTER_BLANK)
896 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
897 { 1269 {
898 if (ev.type == MotionNotify 1270 if (ev.type == MotionNotify
899 || ev.type == ButtonPress 1271 || ev.type == ButtonPress
900 || ev.type == ButtonRelease) 1272 || ev.type == ButtonRelease)
901 if (hidden_pointer) 1273 if (hidden_pointer)
… …
904 if (ev.type == KeyPress && hidden_pointer == 0) 1276 if (ev.type == KeyPress && hidden_pointer == 0)
905 pointer_blank (); 1277 pointer_blank ();
906 } 1278 }
907#endif 1279#endif
908 1280
909#ifdef USE_XIM
910 if (XFilterEvent (&ev, None))
911 return;
912#endif
913
914 Window unused_root, unused_child; 1281 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1282 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1283 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 1284
967 switch (ev.type) 1285 switch (ev.type)
968 { 1286 {
969 case KeyPress: 1287 case KeyPress:
1288#if ISO_14755
1289 if (!(iso14755buf & ISO_14755_52))
1290#endif
970 lookup_key (ev.xkey); 1291 lookup_key (ev.xkey);
1292
1293 break;
1294
1295 case KeyRelease:
1296 {
1297#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1298 KeySym ks;
1299
1300 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1301#endif
1302
1303#if ENABLE_FRILLS || ISO_14755
1304 // ISO 14755 support
1305 if (iso14755buf)
1306 if (iso14755buf & ISO_14755_52)
1307 {
1308# if ENABLE_OVERLAY
1309 scr_overlay_off ();
1310# endif
1311# if ISO_14755
1312 // iso14755 part 5.2 handling: release time
1313 // first: controls
1314 if ((ev.xkey.state & ControlMask)
1315 && ((ks >= 0x40 && ks <= 0x5f)
1316 || (ks >= 0x61 && ks <= 0x7f)))
1317 {
1318 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1319 commit_iso14755 ();
1320 return; // case-break;
1321 }
1322
1323 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1324 if (i[0] == ks)
1325 {
1326 iso14755buf = ISO_14755_51 | i[1];
1327 commit_iso14755 ();
1328 return; // case-break;
1329 }
1330
1331 scr_bell ();
1332# endif
1333 iso14755buf = 0;
971 break; 1334 break;
1335 }
1336 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341 if (iso14755buf & ISO_14755_51)
1342 commit_iso14755 ();
1343#if ISO_14755
1344 else if (iso14755buf & ISO_14755_STARTED)
1345 {
1346 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1347
1348 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1349 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1350 }
1351# endif
1352 else
1353 iso14755buf = 0;
1354 }
1355#endif
972 1356
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1357#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease:
975 {
976 if (! (ev.xkey.state & ControlMask)) 1358 if (!(ev.xkey.state & ControlMask))
1359 slip_wheel_ev.stop ();
1360 else if (ks == XK_Control_L || ks == XK_Control_R)
977 mouse_slip_wheel_speed = 0; 1361 mouse_slip_wheel_speed = 0;
978 else 1362#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; 1363 break;
987 } 1364 }
988#endif
989 1365
990 case ButtonPress: 1366 case ButtonPress:
991 button_press (ev.xbutton); 1367 button_press (ev.xbutton);
992 break; 1368 break;
993 1369
… …
995 button_release (ev.xbutton); 1371 button_release (ev.xbutton);
996 break; 1372 break;
997 1373
998 case ClientMessage: 1374 case ClientMessage:
999 if (ev.xclient.format == 32 1375 if (ev.xclient.format == 32
1376 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1377 {
1000 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1378 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1001 destroy (); 1379 destroy ();
1380#if ENABLE_EWMH
1381 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1382 XSendEvent (disp, ev.xclient.window = display->root,
1383 False, SubstructureRedirectMask | SubstructureNotifyMask,
1384 &ev);
1385#endif
1386 }
1387#if ENABLE_XEMBED
1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1389 {
1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1395#endif
1002#ifdef OFFIX_DND 1396#ifdef OFFIX_DND
1003 /* OffiX Dnd (drag 'n' drop) protocol */ 1397 /* OffiX Dnd (drag 'n' drop) protocol */
1004 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1398 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1005 && (ev.xclient.data.l[0] == DndFile 1399 && (ev.xclient.data.l[0] == DndFile
1006 || ev.xclient.data.l[0] == DndDir 1400 || ev.xclient.data.l[0] == DndDir
1007 || ev.xclient.data.l[0] == DndLink)) 1401 || ev.xclient.data.l[0] == DndLink))
1008 { 1402 {
1009 /* Get Dnd data */ 1403 /* Get Dnd data */
1010 Atom ActualType; 1404 Atom ActualType;
1011 int ActualFormat; 1405 int ActualFormat;
1012 unsigned char *data; 1406 unsigned char *data;
1013 unsigned long Size, RemainingBytes; 1407 unsigned long Size, RemainingBytes;
1014 1408
1015 XGetWindowProperty (display->display, display->root, 1409 XGetWindowProperty (disp, display->root,
1016 xa[XA_DNDSELECTION], 1410 xa[XA_DNDSELECTION],
1017 0L, 1000000L, 1411 0L, 1000000L,
1018 False, AnyPropertyType, 1412 False, AnyPropertyType,
1019 &ActualType, &ActualFormat, 1413 &ActualType, &ActualFormat,
1020 &Size, &RemainingBytes, 1414 &Size, &RemainingBytes,
1021 &data); 1415 &data);
1022 XChangeProperty (display->display, display->root, 1416 set_string_property (XA_CUT_BUFFER0, data);
1023 XA_CUT_BUFFER0, XA_STRING,
1024 8, PropModeReplace,
1025 data, STRLEN (data));
1026 XFree (data); 1417 XFree (data);
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1418 selection_paste (display->root, XA_CUT_BUFFER0, true);
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1419 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1029 } 1420 }
1030#endif /* OFFIX_DND */ 1421#endif /* OFFIX_DND */
1031 break; 1422 break;
1032 1423
1033 case MappingNotify: 1424 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1425 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1426 break;
1036 1427
1037 /* 1428 /*
1038 * XXX: this is not the _current_ arrangement 1429 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1430 * Here's my conclusion:
… …
1058 break; 1449 break;
1059 } 1450 }
1060 break; 1451 break;
1061 1452
1062 case FocusIn: 1453 case FocusIn:
1063 if (!TermWin.focus) 1454 focus_in ();
1455 break;
1456
1457 case FocusOut:
1458 focus_out ();
1459 break;
1460
1461 case ConfigureNotify:
1462 if (ev.xconfigure.window == parent[0])
1064 { 1463 {
1065 TermWin.focus = 1; 1464 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1066 want_refresh = 1; 1465 ;
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 1466
1467 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1468 {
1469 seen_resize = 1;
1470 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1471 }
1472
1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1474 if (OPTION (Opt_transparent))
1475 check_our_parents ();
1476#endif
1076 } 1477 }
1077 break; 1478 break;
1078 1479
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: 1480 case PropertyNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0]) 1481 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1099 { 1482 && ev.xproperty.state == PropertyNewValue)
1100 int height, width; 1483 selection_property (ev.xproperty.window, ev.xproperty.atom);
1101 1484
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; 1485 break;
1131 1486
1132 case SelectionClear: 1487 case SelectionClear:
1133 selection_clear (); 1488 selection_clear ();
1134 break; 1489 break;
1135 1490
1136 case SelectionNotify: 1491 case SelectionNotify:
1137 if (selection_wait == Sel_normal) 1492 if (selection_wait == Sel_normal)
1138 selection_paste (ev.xselection.requestor, 1493 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1139 ev.xselection.property, True);
1140 break; 1494 break;
1141 1495
1142 case SelectionRequest: 1496 case SelectionRequest:
1143 selection_send (ev.xselectionrequest); 1497 selection_send (ev.xselectionrequest);
1144 break; 1498 break;
1145 1499
1146 case UnmapNotify: 1500 case UnmapNotify:
1147 TermWin.mapped = 0; 1501 mapped = 0;
1148#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1149 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1150#endif 1504#endif
1151 break; 1505 break;
1152 1506
1153 case MapNotify: 1507 case MapNotify:
1154 TermWin.mapped = 1; 1508 mapped = 1;
1155#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1156 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1157#endif 1511#endif
1158 break; 1512 break;
1159 1513
… …
1163 break; 1517 break;
1164#endif /* TRANSPARENT */ 1518#endif /* TRANSPARENT */
1165 1519
1166 case GraphicsExpose: 1520 case GraphicsExpose:
1167 case Expose: 1521 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1522 if (ev.xany.window == vt)
1169 { 1523 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1524 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1174 // I don't understand this, so I changed it :) 1528
1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1530
1531 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1534
1178 // ev.xexpose.width, TermWin.height, False); 1535 scr_refresh (refresh_type);
1179#endif
1180 want_refresh = 1;
1181 } 1536 }
1182 else 1537 else
1183 { 1538 {
1184 XEvent unused_event; 1539 XEvent unused_event;
1185 1540
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1187 ; 1542 ;
1188 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1543 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1189 ; 1544 ;
1190 1545
1191 if (isScrollbarWindow (ev.xany.window)) 1546 if (isScrollbarWindow (ev.xany.window))
1192 { 1547 {
1193 scrollBar.setIdle (); 1548 scrollBar.setIdle ();
… …
1195 } 1550 }
1196#ifdef MENUBAR 1551#ifdef MENUBAR
1197 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1552 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1198 menubar_expose (); 1553 menubar_expose ();
1199#endif 1554#endif
1555
1556#ifdef TRANSPARENT
1557 if (am_transparent && ev.xany.window == parent[0])
1558 XClearWindow (disp, ev.xany.window);
1559#endif
1200 } 1560 }
1201 break; 1561 break;
1202 1562
1203 case MotionNotify: 1563 case MotionNotify:
1204#ifdef POINTER_BLANK 1564#ifdef POINTER_BLANK
… …
1210 { 1570 {
1211 menubar_control (ev.xbutton); 1571 menubar_control (ev.xbutton);
1212 break; 1572 break;
1213 } 1573 }
1214#endif 1574#endif
1215 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1216 break; 1576 break;
1217 1577
1218 if (ev.xany.window == TermWin.vt) 1578 if (ev.xany.window == vt)
1219 { 1579 {
1220 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1580 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1221 { 1581 {
1222 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1223 ; 1583 ;
1224 1584
1225 XQueryPointer (display->display, TermWin.vt, 1585 XQueryPointer (disp, vt,
1226 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1227 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1228 & (ev.xbutton.x), & (ev.xbutton.y), 1588 &ev.xbutton.x, &ev.xbutton.y,
1229 &unused_mask); 1589 &ev.xbutton.state);
1230#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
1231 /* deal with a `jumpy' mouse */ 1591 /* deal with a `jumpy' mouse */
1232 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1592 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1233 { 1593 {
1234#endif 1594#endif
1595#if ISO_14755
1596 // 5.4
1597 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1598 {
1599 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1600 break;
1601 }
1602#endif
1235 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1603 selection_extend (ev.xbutton.x, ev.xbutton.y,
1236 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1604 ev.xbutton.state & Button3Mask ? 2 : 0);
1605
1237#ifdef SELECTION_SCROLLING 1606#ifdef SELECTION_SCROLLING
1238 if (ev.xbutton.y < TermWin.int_bwidth 1607 if (ev.xbutton.y < int_bwidth
1239 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1608 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1240 { 1609 {
1241 int dist; 1610 int dist;
1242
1243 pending_scroll_selection=1;
1244 1611
1245 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1246 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1247 */ 1614 */
1248 if (scroll_selection_delay<=0) 1615 if (!sel_scroll_ev.active)
1249 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1616 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1250 1617
1251 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1252 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1253 */ 1620 */
1254 selection_save_x=ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
1255 selection_save_y=ev.xbutton.y; 1622 selection_save_y = ev.xbutton.y;
1256 selection_save_state=
1257 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1623 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1258 1624
1259 /* calc number of lines to scroll */ 1625 /* calc number of lines to scroll */
1260 if (ev.xbutton.y<TermWin.int_bwidth) 1626 if (ev.xbutton.y < int_bwidth)
1261 { 1627 {
1262 scroll_selection_dir = UP; 1628 scroll_selection_dir = UP;
1263 dist = TermWin.int_bwidth - ev.xbutton.y; 1629 dist = int_bwidth - ev.xbutton.y;
1264 } 1630 }
1265 else 1631 else
1266 { 1632 {
1267 scroll_selection_dir = DN; 1633 scroll_selection_dir = DN;
1268 dist = ev.xbutton.y - 1634 dist = ev.xbutton.y - (int_bwidth + height);
1269 (TermWin.int_bwidth + TermWin.height);
1270 } 1635 }
1636
1271 scroll_selection_lines= (Pixel2Height (dist)/ 1637 scroll_selection_lines = Pixel2Height (dist)
1272 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1638 / SELECTION_SCROLL_LINE_SPEEDUP
1639 + 1;
1273 MIN_IT (scroll_selection_lines, 1640 min_it (scroll_selection_lines,
1274 SELECTION_SCROLL_MAX_LINES); 1641 SELECTION_SCROLL_MAX_LINES);
1275 } 1642 }
1276 else 1643 else
1277 { 1644 {
1278 /* we are within the text window, so we 1645 /* we are within the text window, so we
1279 * shouldn't be scrolling 1646 * shouldn't be scrolling
1280 */ 1647 */
1281 pending_scroll_selection = 0; 1648 if (sel_scroll_ev.active)
1649 sel_scroll_ev.stop();
1282 } 1650 }
1283#endif 1651#endif
1284#ifdef MOUSE_THRESHOLD 1652#ifdef MOUSE_THRESHOLD
1285
1286 } 1653 }
1287#endif 1654#endif
1288
1289 } 1655 }
1290 } 1656 }
1291 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1292 { 1658 {
1293 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1659 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1294 MotionNotify, &ev)) ; 1660 MotionNotify, &ev))
1661 ;
1662
1295 XQueryPointer (display->display, scrollBar.win, 1663 XQueryPointer (disp, scrollBar.win,
1296 &unused_root, &unused_child, 1664 &unused_root, &unused_child,
1297 &unused_root_x, &unused_root_y, 1665 &unused_root_x, &unused_root_y,
1298 & (ev.xbutton.x), & (ev.xbutton.y), 1666 &ev.xbutton.x, &ev.xbutton.y,
1299 &unused_mask); 1667 &unused_mask);
1300 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1301 scrollbar_size ()); 1669 scrollbar_size ());
1302 scr_refresh (refresh_type); 1670 scr_refresh (refresh_type);
1303 refresh_limit = 0; 1671 refresh_limit = 0;
… …
1306 break; 1674 break;
1307 } 1675 }
1308} 1676}
1309 1677
1310void 1678void
1679rxvt_term::focus_in ()
1680{
1681 if (!focus)
1682 {
1683 focus = 1;
1684 want_refresh = 1;
1685#if USE_XIM
1686 if (Input_Context != NULL)
1687 {
1688 IMSetStatusPosition ();
1689 XSetICFocus (Input_Context);
1690 }
1691#endif
1692#if CURSOR_BLINK
1693 if (OPTION (Opt_cursorBlink))
1694 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1695#endif
1696#if OFF_FOCUS_FADING
1697 if (rs[Rs_fade])
1698 {
1699 pix_colors = pix_colors_focused;
1700 scr_recolour ();
1701 }
1702#endif
1703 }
1704}
1705
1706void
1707rxvt_term::focus_out ()
1708{
1709 if (focus)
1710 {
1711 focus = 0;
1712 want_refresh = 1;
1713
1714#if ENABLE_FRILLS || ISO_14755
1715 iso14755buf = 0;
1716#endif
1717#if ENABLE_OVERLAY
1718 scr_overlay_off ();
1719#endif
1720#if USE_XIM
1721 if (Input_Context != NULL)
1722 XUnsetICFocus (Input_Context);
1723#endif
1724#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink))
1726 cursor_blink_ev.stop ();
1727 hidden_cursor = 0;
1728#endif
1729#if OFF_FOCUS_FADING
1730 if (rs[Rs_fade])
1731 {
1732 pix_colors = pix_colors_unfocused;
1733 scr_recolour ();
1734 }
1735#endif
1736 }
1737}
1738
1739#if TRANSPARENT
1740void
1311rxvt_term::rootwin_cb (XEvent &ev) 1741rxvt_term::rootwin_cb (XEvent &ev)
1312{ 1742{
1313 SET_R (this); 1743 SET_R (this);
1314 SET_LOCALE (locale); 1744 SET_LOCALE (locale);
1315 1745
1316 switch (ev.type) 1746 switch (ev.type)
1317 { 1747 {
1318 case PropertyNotify: 1748 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 /* 1749 /*
1329 * if user used some Esetroot compatible prog to set the root bg, 1750 * 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. 1751 * use the property to determine the pixmap. We use it later on.
1331 */ 1752 */
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]) 1753 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1754 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1336 return; 1755 return;
1337 }
1338 1756
1339 /* FALLTHROUGH */ 1757 /* FALLTHROUGH */
1340 case ReparentNotify: 1758 case ReparentNotify:
1341 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1759 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1342 want_full_refresh = 1; 1760 want_refresh = want_full_refresh = 1;
1343 break; 1761 break;
1344#endif
1345 } 1762 }
1346} 1763}
1764#endif
1347 1765
1348void 1766void
1349rxvt_term::button_press (XButtonEvent &ev) 1767rxvt_term::button_press (XButtonEvent &ev)
1350{ 1768{
1351 int reportmode = 0, clickintime; 1769 int reportmode = 0, clickintime;
1352 1770
1353 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1771 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1354 if (!bypass_keystate) 1772 if (!bypass_keystate)
1355 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1773 reportmode = !! (priv_modes & PrivMode_mouse_report);
1774
1356 /* 1775 /*
1357 * VT window processing of button press 1776 * VT window processing of button press
1358 */ 1777 */
1359 if (ev.window == TermWin.vt) 1778 if (ev.window == vt)
1360 { 1779 {
1780#if ISO_14755
1781 // 5.4
1782 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1783 {
1784 iso14755_54 (ev.x, ev.y);
1785 return;
1786 }
1787#endif
1788
1361 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1789 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1790
1362 if (reportmode) 1791 if (reportmode)
1363 { 1792 {
1364 /* mouse report from vt window */ 1793 /* mouse report from vt window */
1365 /* save the xbutton state (for ButtonRelease) */ 1794 /* save the xbutton state (for ButtonRelease) */
1366 MEvent.state = ev.state; 1795 MEvent.state = ev.state;
… …
1395 } 1824 }
1396 else 1825 else
1397 { 1826 {
1398 if (ev.button != MEvent.button) 1827 if (ev.button != MEvent.button)
1399 MEvent.clicks = 0; 1828 MEvent.clicks = 0;
1829
1400 switch (ev.button) 1830 switch (ev.button)
1401 { 1831 {
1402 case Button1: 1832 case Button1:
1833 /* allow meta + click to select rectangular areas */
1834 /* should be done in screen.C */
1835#if ENABLE_FRILLS
1836 selection.rect = !!(ev.state & ModMetaMask);
1837#else
1838 selection.rect = false;
1839#endif
1840
1403 /* allow shift+left click to extend selection */ 1841 /* allow shift+left click to extend selection */
1404 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1842 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1405 { 1843 {
1406 if (MEvent.button == Button1 && clickintime) 1844 if (MEvent.button == Button1 && clickintime)
1407 selection_rotate (ev.x, ev.y); 1845 selection_rotate (ev.x, ev.y);
1408 else 1846 else
1409 selection_extend (ev.x, ev.y, 1); 1847 selection_extend (ev.x, ev.y, 1);
… …
1424 case Button3: 1862 case Button3:
1425 if (MEvent.button == Button3 && clickintime) 1863 if (MEvent.button == Button3 && clickintime)
1426 selection_rotate (ev.x, ev.y); 1864 selection_rotate (ev.x, ev.y);
1427 else 1865 else
1428 selection_extend (ev.x, ev.y, 1); 1866 selection_extend (ev.x, ev.y, 1);
1867
1429 MEvent.button = Button3; 1868 MEvent.button = Button3;
1430 break; 1869 break;
1431 } 1870 }
1432 } 1871 }
1872
1433 MEvent.time = ev.time; 1873 MEvent.time = ev.time;
1434 return; 1874 return;
1435 } 1875 }
1436 1876
1437 /* 1877 /*
… …
1503 upordown = 1; /* down */ 1943 upordown = 1; /* down */
1504 } 1944 }
1505 if (upordown) 1945 if (upordown)
1506 { 1946 {
1507#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1947#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1508 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1948 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1509#endif 1949#endif
1510 if (scr_page (upordown < 0 ? UP : DN, 1)) 1950 if (scr_page (upordown < 0 ? UP : DN, 1))
1511 { 1951 {
1512 if (upordown < 0) 1952 if (upordown < 0)
1513 scrollBar.setUp (); 1953 scrollBar.setUp ();
… …
1529 break; 1969 break;
1530 case R_SB_ALIGN_BOTTOM: 1970 case R_SB_ALIGN_BOTTOM:
1531 csrO = scrollBar.bot - scrollBar.top; 1971 csrO = scrollBar.bot - scrollBar.top;
1532 break; 1972 break;
1533 } 1973 }
1974
1534 if (scrollBar.style == R_SB_XTERM 1975 if (scrollBar.style == R_SB_XTERM
1535 || scrollbar_above_slider (ev.y) 1976 || scrollbar_above_slider (ev.y)
1536 || scrollbar_below_slider (ev.y)) 1977 || scrollbar_below_slider (ev.y))
1537 scr_move_to ( scrollbar_position (ev.y) - csrO, 1978 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1538 scrollbar_size ()); 1979
1539 scrollBar.setMotion (); 1980 scrollBar.setMotion ();
1540 break; 1981 break;
1541 1982
1542 case Button1: 1983 case Button1:
1543 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1984 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1547 case Button3: 1988 case Button3:
1548 if (scrollBar.style != R_SB_XTERM) 1989 if (scrollBar.style != R_SB_XTERM)
1549 { 1990 {
1550 if (scrollbar_above_slider (ev.y)) 1991 if (scrollbar_above_slider (ev.y))
1551# ifdef RXVT_SCROLL_FULL 1992# ifdef RXVT_SCROLL_FULL
1552 scr_page (UP, TermWin.nrow - 1); 1993 scr_page (UP, nrow - 1);
1553# else 1994# else
1554 scr_page (UP, TermWin.nrow / 4); 1995 scr_page (UP, nrow / 4);
1555# endif 1996# endif
1556 else if (scrollbar_below_slider (ev.y)) 1997 else if (scrollbar_below_slider (ev.y))
1557# ifdef RXVT_SCROLL_FULL 1998# ifdef RXVT_SCROLL_FULL
1558 scr_page (DN, TermWin.nrow - 1); 1999 scr_page (DN, nrow - 1);
1559# else 2000# else
1560 scr_page (DN, TermWin.nrow / 4); 2001 scr_page (DN, nrow / 4);
1561# endif 2002# endif
1562 else 2003 else
1563 scrollBar.setMotion (); 2004 scrollBar.setMotion ();
1564 } 2005 }
1565 else 2006 else
1566 { 2007 {
1567 scr_page ((ev.button == Button1 ? DN : UP), 2008 scr_page ((ev.button == Button1 ? DN : UP),
1568 (TermWin.nrow 2009 (nrow
1569 * scrollbar_position (ev.y) 2010 * scrollbar_position (ev.y)
1570 / scrollbar_size ())); 2011 / scrollbar_size ()));
1571 } 2012 }
2013
1572 break; 2014 break;
1573 } 2015 }
1574 } 2016 }
1575 return; 2017 return;
1576 } 2018 }
… …
1588{ 2030{
1589 int reportmode = 0; 2031 int reportmode = 0;
1590 2032
1591 csrO = 0; /* reset csr Offset */ 2033 csrO = 0; /* reset csr Offset */
1592 if (!bypass_keystate) 2034 if (!bypass_keystate)
1593 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2035 reportmode = !! (priv_modes & PrivMode_mouse_report);
1594 2036
1595 if (scrollbar_isUpDn ()) 2037 if (scrollbar_isUpDn ())
1596 { 2038 {
1597 scrollBar.setIdle (); 2039 scrollBar.setIdle ();
1598 scrollbar_show (0); 2040 scrollbar_show (0);
1599#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2041#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1600 refresh_type &= ~SMOOTH_REFRESH; 2042 refresh_type &= ~SMOOTH_REFRESH;
1601#endif 2043#endif
1602
1603 } 2044 }
2045
1604#ifdef SELECTION_SCROLLING 2046#ifdef SELECTION_SCROLLING
1605 pending_scroll_selection=0; 2047 if (sel_scroll_ev.active)
2048 sel_scroll_ev.stop();
1606#endif 2049#endif
2050
1607 if (ev.window == TermWin.vt) 2051 if (ev.window == vt)
1608 { 2052 {
2053#if ISO_14755
2054 // 5.4
2055 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2056 return;
2057#endif
1609 if (reportmode) 2058 if (reportmode)
1610 { 2059 {
1611 /* mouse report from vt window */ 2060 /* mouse report from vt window */
1612 /* don't report release of wheel "buttons" */ 2061 /* don't report release of wheel "buttons" */
1613 if (ev.button >= 4) 2062 if (ev.button >= 4)
… …
1627 MEvent.button = AnyButton; 2076 MEvent.button = AnyButton;
1628 mouse_report (ev); 2077 mouse_report (ev);
1629#endif /* MOUSE_REPORT_DOUBLECLICK */ 2078#endif /* MOUSE_REPORT_DOUBLECLICK */
1630 return; 2079 return;
1631 } 2080 }
2081
1632 /* 2082 /*
1633 * dumb hack to compensate for the failure of click-and-drag 2083 * dumb hack to compensate for the failure of click-and-drag
1634 * when overriding mouse reporting 2084 * when overriding mouse reporting
1635 */ 2085 */
1636 if (PrivateModes & PrivMode_mouse_report 2086 if (priv_modes & PrivMode_mouse_report
1637 && bypass_keystate 2087 && bypass_keystate
1638 && ev.button == Button1 && MEvent.clicks <= 1) 2088 && ev.button == Button1 && MEvent.clicks <= 1)
1639 selection_extend (ev.x, ev.y, 0); 2089 selection_extend (ev.x, ev.y, 0);
1640 2090
1641 switch (ev.button) 2091 switch (ev.button)
… …
1652 case Button5: 2102 case Button5:
1653 { 2103 {
1654 int i; 2104 int i;
1655 page_dirn v; 2105 page_dirn v;
1656 2106
1657 v = (ev.button == Button4) ? UP : DN; 2107 v = ev.button == Button4 ? UP : DN;
2108
1658 if (ev.state & ShiftMask) 2109 if (ev.state & ShiftMask)
1659 i = 1; 2110 i = 1;
1660 else if ((Options & Opt_mouseWheelScrollPage)) 2111 else if (OPTION (Opt_mouseWheelScrollPage))
1661 i = TermWin.nrow - 1; 2112 i = nrow - 1;
1662 else 2113 else
1663 i = 5; 2114 i = 5;
2115
1664# ifdef MOUSE_SLIP_WHEELING 2116# ifdef MOUSE_SLIP_WHEELING
1665 if (ev.state & ControlMask) 2117 if (ev.state & ControlMask)
1666 { 2118 {
1667 mouse_slip_wheel_speed += (v ? -1 : 1); 2119 mouse_slip_wheel_speed += v ? -1 : 1;
2120 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2121 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2122
2123 if (slip_wheel_ev.at < NOW)
1668 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2124 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2125
2126 slip_wheel_ev.start ();
1669 } 2127 }
2128 else
2129 {
1670# endif 2130# endif
1671# ifdef JUMP_MOUSE_WHEEL 2131# 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); 2132 scr_page (v, i);
1679 scr_refresh (SMOOTH_REFRESH); 2133 scr_refresh (SMOOTH_REFRESH);
1680 scrollbar_show (1); 2134 scrollbar_show (1);
2135# else
2136 while (i--)
2137 {
2138 scr_page (v, 1);
2139 scr_refresh (SMOOTH_REFRESH);
2140 scrollbar_show (1);
2141 }
2142# endif
2143# ifdef MOUSE_SLIP_WHEELING
1681 } 2144 }
1682# endif 2145#endif
1683
1684 } 2146 }
1685 break; 2147 break;
1686#endif 2148#endif
1687
1688 } 2149 }
1689 } 2150 }
1690#ifdef MENUBAR 2151#ifdef MENUBAR
1691 else if (isMenuBarWindow (ev.window)) 2152 else if (isMenuBarWindow (ev.window))
1692 menubar_control (ev); 2153 menubar_control (ev);
1693#endif 2154#endif
1694} 2155}
1695 2156
1696#ifdef TRANSPARENT 2157#ifdef TRANSPARENT
1697#if TINTING 2158#if TINTING
1698/* shading taken from eterm-0.9.2 */ 2159/* taken from aterm-0.4.2 */
1699/* RGB 15 */
1700 2160
1701static void 2161typedef 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 2162
1707 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2163void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1708 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2164{
1709 /* No saturation */ 2165 int sh_r, sh_g, sh_b;
1710 for (y = h; --y >= 0;) { 2166 RUINT32T mask_r, mask_g, mask_b;
1711 for (x = -w; x < 0; x++) { 2167 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1712 int r, g, b; 2168 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2169 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2170 int i;
1713 2171
1714 b = ((uint16_t *) ptr)[x]; 2172 Visual *visual = display->visual;
1715 r = (b & 0x7c00) * rm; 2173
1716 g = (b & 0x3e0) * gm; 2174 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1717 b = (b & 0x1f) * bm; 2175
1718 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2176 /* for convenience */
1719 | ((g >> 8) & 0x3e0) 2177 mask_r = visual->red_mask;
1720 | ((b >> 8) & 0x1f); 2178 mask_g = visual->green_mask;
1721 } 2179 mask_b = visual->blue_mask;
1722 ptr += bpl; 2180
1723 } 2181 /* boring lookup table pre-initialization */
2182 switch (srcImage->bits_per_pixel) {
2183 case 15:
2184 if ((mask_r != 0x7c00) ||
2185 (mask_g != 0x03e0) ||
2186 (mask_b != 0x001f))
2187 return;
2188 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2189 lookup_r = lookup;
2190 lookup_g = lookup+32;
2191 lookup_b = lookup+32+32;
2192 sh_r = 10;
2193 sh_g = 5;
2194 sh_b = 0;
2195 break;
2196 case 16:
2197 if ((mask_r != 0xf800) ||
2198 (mask_g != 0x07e0) ||
2199 (mask_b != 0x001f))
2200 return;
2201 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2202 lookup_r = lookup;
2203 lookup_g = lookup+32;
2204 lookup_b = lookup+32+64;
2205 sh_r = 11;
2206 sh_g = 5;
2207 sh_b = 0;
2208 break;
2209 case 24:
2210 if ((mask_r != 0xff0000) ||
2211 (mask_g != 0x00ff00) ||
2212 (mask_b != 0x0000ff))
2213 return;
2214 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2215 lookup_r = lookup;
2216 lookup_g = lookup+256;
2217 lookup_b = lookup+256+256;
2218 sh_r = 16;
2219 sh_g = 8;
2220 sh_b = 0;
2221 break;
2222 case 32:
2223 if ((mask_r != 0xff0000) ||
2224 (mask_g != 0x00ff00) ||
2225 (mask_b != 0x0000ff))
2226 return;
2227 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2228 lookup_r = lookup;
2229 lookup_g = lookup+256;
2230 lookup_b = lookup+256+256;
2231 sh_r = 16;
2232 sh_g = 8;
2233 sh_b = 0;
2234 break;
2235 default:
2236 return; /* we do not support this color depth */
2237 }
2238
2239 /* prepare limits for color transformation (each channel is handled separately) */
2240 if (shade < 0) {
2241 shade = -shade;
2242 if (shade < 0) shade = 0;
2243 if (shade > 100) shade = 100;
2244
2245 lower_lim_r = 65535-rm;
2246 lower_lim_g = 65535-gm;
2247 lower_lim_b = 65535-bm;
2248
2249 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2250 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2251 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2252
2253 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1724 } else { 2254 } else {
1725 for (y = h; --y >= 0;) { 2255 if (shade < 0) shade = 0;
1726 for (x = -w; x < 0; x++) { 2256 if (shade > 100) shade = 100;
1727 int r, g, b;
1728 2257
1729 b = ((uint16_t *) ptr)[x]; 2258 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1730 r = (b & 0x7c00) * rm; 2259
1731 g = (b & 0x3e0) * gm; 2260 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1732 b = (b & 0x1f) * bm; 2261 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1733 r |= (!(r >> 15) - 1); 2262 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1734 g |= (!(g >> 10) - 1); 2263 }
1735 b |= (!(b >> 5) - 1); 2264
1736 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2265 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1737 | ((g >> 8) & 0x3e0) 2266 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1738 | ((b >> 8) & 0x1f); 2267 {
1739 } 2268 unsigned int tmp;
1740 ptr += bpl; 2269
2270 tmp = lower_lim_r;
2271 lower_lim_r = lower_lim_b;
2272 lower_lim_b = tmp;
2273
2274 tmp = upper_lim_r;
2275 upper_lim_r = upper_lim_b;
2276 upper_lim_b = tmp;
2277 }
2278
2279 /* fill our lookup tables */
2280 for (i = 0; i <= mask_r>>sh_r; i++)
2281 {
2282 RUINT32T tmp;
2283 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2284 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2285 lookup_r[i] = (tmp/65535)<<sh_r;
2286 }
2287 for (i = 0; i <= mask_g>>sh_g; i++)
2288 {
2289 RUINT32T tmp;
2290 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2291 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2292 lookup_g[i] = (tmp/65535)<<sh_g;
2293 }
2294 for (i = 0; i <= mask_b>>sh_b; i++)
2295 {
2296 RUINT32T tmp;
2297 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2298 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2299 lookup_b[i] = (tmp/65535)<<sh_b;
2300 }
2301
2302 /* apply table to input image (replacing colors by newly calculated ones) */
2303 switch (srcImage->bits_per_pixel)
2304 {
2305 case 15:
2306 {
2307 unsigned short *p1, *pf, *p, *pl;
2308 p1 = (unsigned short *) srcImage->data;
2309 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2310 while (p1 < pf)
2311 {
2312 p = p1;
2313 pl = p1 + srcImage->width;
2314 for (; p < pl; p++)
1741 } 2315 {
2316 *p = lookup_r[(*p & 0x7c00)>>10] |
2317 lookup_g[(*p & 0x03e0)>> 5] |
2318 lookup_b[(*p & 0x001f)];
2319 }
2320 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1742 } 2321 }
1743} 2322 break;
1744 2323 }
1745/* RGB 16 */ 2324 case 16:
1746static void 2325 {
1747shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2326 unsigned short *p1, *pf, *p, *pl;
1748{ 2327 p1 = (unsigned short *) srcImage->data;
1749 unsigned char *ptr; 2328 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1750 int x, y; 2329 while (p1 < pf)
1751 2330 {
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2331 p = p1;
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2332 pl = p1 + srcImage->width;
1754 /* No saturation */ 2333 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 } 2334 {
1769 } else { 2335 *p = lookup_r[(*p & 0xf800)>>11] |
1770 for (y = h; --y >= 0;) { 2336 lookup_g[(*p & 0x07e0)>> 5] |
1771 for (x = -w; x < 0; x++) { 2337 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 } 2338 }
1785 ptr += bpl; 2339 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2340 }
2341 break;
2342 }
2343 case 24:
2344 {
2345 unsigned char *p1, *pf, *p, *pl;
2346 p1 = (unsigned char *) srcImage->data;
2347 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2348 while (p1 < pf)
2349 {
2350 p = p1;
2351 pl = p1 + srcImage->width * 3;
2352 for (; p < pl; p += 3)
1786 } 2353 {
2354 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2355 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2356 p[2] = lookup_r[(p[2] & 0x0000ff)];
2357 }
2358 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1787 } 2359 }
1788} 2360 break;
2361 }
2362 case 32:
2363 {
2364 RUINT32T *p1, *pf, *p, *pl;
2365 p1 = (RUINT32T *) srcImage->data;
2366 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1789 2367
1790/* RGB 24 */ 2368 while (p1 < pf)
1791static void 2369 {
1792shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2370 p = p1;
1793{ 2371 pl = p1 + srcImage->width;
1794 unsigned char *ptr; 2372 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 } 2373 {
1822 } else { 2374 *p = lookup_r[(*p & 0xff0000)>>16] |
1823 for (y = h; --y >= 0;) { 2375 lookup_g[(*p & 0x00ff00)>> 8] |
1824 for (x = -(w * 3); x < 0; x += 3) { 2376 lookup_b[(*p & 0x0000ff)] |
1825 int r, g, b; 2377 (*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 } 2378 }
1853 ptr += bpl; 2379 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1854 } 2380 }
2381 break;
2382 }
1855 } 2383 }
1856}
1857 2384
1858/* RGB 32 */ 2385 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} 2386}
1929
1930#endif 2387#endif
1931 2388
1932/* 2389/*
1933 * Check our parents are still who we think they are. 2390 * Check our parents are still who we think they are.
1934 * Do transparency updates if required 2391 * Do transparency updates if required
… …
1941 Atom atype; 2398 Atom atype;
1942 unsigned char *prop = NULL; 2399 unsigned char *prop = NULL;
1943 Window root, oldp, *list; 2400 Window root, oldp, *list;
1944 Pixmap rootpixmap = None; 2401 Pixmap rootpixmap = None;
1945 XWindowAttributes wattr, wrootattr; 2402 XWindowAttributes wattr, wrootattr;
2403 dDisp;
1946 2404
1947 pchanged = 0; 2405 pchanged = 0;
1948 2406
1949 if (!(Options & Opt_transparent)) 2407 if (!OPTION (Opt_transparent))
1950 return pchanged; /* Don't try any more */ 2408 return pchanged; /* Don't try any more */
1951 2409
1952 XGetWindowAttributes (display->display, display->root, &wrootattr); 2410 XGetWindowAttributes (disp, display->root, &wrootattr);
1953 rootdepth = wrootattr.depth; 2411 rootdepth = wrootattr.depth;
1954 2412
1955 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2413 XGetWindowAttributes (disp, parent[0], &wattr);
1956 2414
1957 if (rootdepth != wattr.depth) 2415 if (rootdepth != wattr.depth)
1958 { 2416 {
1959 if (am_transparent) 2417 if (am_transparent)
1960 { 2418 {
1961 pchanged = 1; 2419 pchanged = 1;
1962 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2420 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1963 am_transparent = am_pixmap_trans = 0; 2421 am_transparent = am_pixmap_trans = 0;
1964 } 2422 }
1965 2423
1966 return pchanged; /* Don't try any more */ 2424 return pchanged; /* Don't try any more */
1967 } 2425 }
1968 2426
1969 /* Get all X ops out of the queue so that our information is up-to-date. */ 2427 /* Get all X ops out of the queue so that our information is up-to-date. */
1970 XSync (display->display, False); 2428 XSync (disp, False);
1971 2429
1972 /* 2430 /*
1973 * Make the frame window set by the window manager have 2431 * Make the frame window set by the window manager have
1974 * the root background. Some window managers put multiple nested frame 2432 * the root background. Some window managers put multiple nested frame
1975 * windows for each client, so we have to take care about that. 2433 * windows for each client, so we have to take care about that.
1976 */ 2434 */
1977 i = (xa[XA_XROOTPMAPID] 2435 i = (xa[XA_XROOTPMAP_ID]
1978 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2436 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1979 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2437 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1980 &nitems, &bytes_after, &prop) == Success); 2438 &nitems, &bytes_after, &prop) == Success);
1981 2439
1982 if (!i || prop == NULL) 2440 if (!i || prop == NULL)
1983 i = (xa[XA_XSETROOTID] 2441 i = (xa[XA_ESETROOT_PMAP_ID]
1984 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2442 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1985 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2443 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1986 &nitems, &bytes_after, &prop) == Success); 2444 &nitems, &bytes_after, &prop) == Success);
1987 2445
1988 if (!i || prop == NULL) 2446 if (!i || prop == NULL
2447#if TINTING
2448 || !rs[Rs_color + Color_tint]
2449#endif
2450 )
1989 have_pixmap = 0; 2451 have_pixmap = 0;
1990 else 2452 else
1991 { 2453 {
1992 have_pixmap = 1; 2454 have_pixmap = 1;
1993 rootpixmap = *(Pixmap *)prop; 2455 rootpixmap = *(Pixmap *)prop;
… …
2004 Window cr; 2466 Window cr;
2005 XImage *image; 2467 XImage *image;
2006 GC gc; 2468 GC gc;
2007 XGCValues gcvalue; 2469 XGCValues gcvalue;
2008 2470
2009 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2471 XTranslateCoordinates (disp, parent[0], display->root,
2010 0, 0, &sx, &sy, &cr); 2472 0, 0, &sx, &sy, &cr);
2011 nw = (unsigned int)szHint.width; 2473 nw = (unsigned int)szHint.width;
2012 nh = (unsigned int)szHint.height; 2474 nh = (unsigned int)szHint.height;
2013 nx = ny = 0; 2475 nx = ny = 0;
2014 2476
… …
2024 nh += sy; 2486 nh += sy;
2025 ny = -sy; 2487 ny = -sy;
2026 sy = 0; 2488 sy = 0;
2027 } 2489 }
2028 2490
2029 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2491 min_it (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2492 min_it (nh, (unsigned int) (wrootattr.height - sy));
2493
2494 XSync (disp, False);
2031 allowedxerror = -1; 2495 allowedxerror = -1;
2032 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2496 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2033 2497
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2498 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */ 2499 /* XXX: may need a delay here? */
2036 allowedxerror = 0; 2500 allowedxerror = 0;
2037 2501
2038 if (image == NULL) 2502 if (image == NULL)
2039 { 2503 {
2040 if (am_transparent && am_pixmap_trans) 2504 if (am_transparent && am_pixmap_trans)
2041 { 2505 {
2042 pchanged = 1; 2506 pchanged = 1;
2043 if (TermWin.pixmap != None) 2507 if (pixmap != None)
2044 { 2508 {
2045 XFreePixmap (display->display, TermWin.pixmap); 2509 XFreePixmap (disp, pixmap);
2046 TermWin.pixmap = None; 2510 pixmap = None;
2047 } 2511 }
2048 } 2512 }
2049 2513
2050 am_pixmap_trans = 0; 2514 am_pixmap_trans = 0;
2051 } 2515 }
2052 else 2516 else
2053 { 2517 {
2054 if (TermWin.pixmap != None) 2518 if (pixmap != None)
2055 XFreePixmap (display->display, TermWin.pixmap); 2519 XFreePixmap (disp, pixmap);
2056 2520
2057#if TINTING 2521#if TINTING
2058 if (ISSET_PIXCOLOR (Color_tint)) 2522 if (ISSET_PIXCOLOR (Color_tint))
2059 { 2523 {
2060 unsigned short shade, rm, gm, bm; 2524 unsigned short rm, gm, bm;
2525 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2061 2526
2062 PixColors[Color_tint].get (display, rm, gm, bm); 2527 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2063 2528
2064 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2529 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 } 2530 }
2075#endif 2531#endif
2076 2532
2077 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2533 pixmap = XCreatePixmap (disp, vt,
2078 szHint.width, szHint.height, image->depth); 2534 szHint.width, szHint.height, image->depth);
2079 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2535 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2080 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2536 XPutImage (disp, pixmap, gc, image, 0, 0,
2081 nx, ny, image->width, image->height); 2537 nx, ny, image->width, image->height);
2082 XFreeGC (display->display, gc); 2538 XFreeGC (disp, gc);
2083 XDestroyImage (image); 2539 XDestroyImage (image);
2084 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2540 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2085 TermWin.pixmap); 2541 XClearWindow (disp, parent[0]);
2086 2542
2087 if (!am_transparent || !am_pixmap_trans) 2543 if (!am_transparent || !am_pixmap_trans)
2088 pchanged = 1; 2544 pchanged = 1;
2089 2545
2090 am_transparent = am_pixmap_trans = 1; 2546 am_transparent = am_pixmap_trans = 1;
2091 } 2547 }
2092 } 2548 }
2093 2549
2094 if (!am_pixmap_trans) 2550 if (am_pixmap_trans)
2551 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2552 else
2095 { 2553 {
2096 unsigned int n; 2554 unsigned int n;
2097 /* 2555 /*
2098 * InheritPixmap transparency 2556 * InheritPixmap transparency
2099 */ 2557 */
2100 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2101 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2558 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2102 { 2559 {
2103 oldp = TermWin.parent[i]; 2560 oldp = parent[i];
2104 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2561 XQueryTree (disp, parent[i - 1], &root,
2105 &TermWin.parent[i], &list, &n); 2562 &parent[i], &list, &n);
2106 XFree (list); 2563 XFree (list);
2107 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2108 2564
2109 if (TermWin.parent[i] == display->root) 2565 if (parent[i] == display->root)
2110 { 2566 {
2111 if (oldp != None) 2567 if (oldp != None)
2112 pchanged = 1; 2568 pchanged = 1;
2113 2569
2114 break; 2570 break;
2115 } 2571 }
2116 2572
2117 if (oldp != TermWin.parent[i]) 2573 if (oldp != parent[i])
2118 pchanged = 1; 2574 pchanged = 1;
2119 } 2575 }
2120 2576
2121 n = 0; 2577 n = 0;
2122 2578
2123 if (pchanged) 2579 if (pchanged)
2124 { 2580 {
2125 for (; n < (unsigned int)i; n++) 2581 for (; n < (unsigned int)i; n++)
2126 { 2582 {
2127 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2583 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) 2584 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2130 { 2585 {
2131 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2586 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2132 break; 2587 break;
2133 } 2588 }
2134 } 2589 }
2135 } 2590 }
2136 2591
2137 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2592 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2138 { 2593 {
2139 D_X ((stderr, "InheritPixmap Turning off"));
2140 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2594 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2141 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2595 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2142 am_transparent = 0; 2596 am_transparent = 0;
2143 /* XXX: also turn off Opt_transparent? */ 2597 /* XXX: also turn off Opt_transparent? */
2144 } 2598 }
2145 else 2599 else
2146 { 2600 {
2147#if WAIT_FOR_WM 2601#if WAIT_FOR_WM
2148 /* wait (an arbitrary period) for the WM to do its thing 2602 /* wait (an arbitrary period) for the WM to do its thing
2149 * needed for fvwm2.2.2 (and before?) */ 2603 * needed for fvwm2.2.2 (and before?) */
2150 sleep (1); 2604 sleep (1);
2151#endif 2605#endif
2152 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2153 for (n = 0; n < (unsigned int)i; n++) 2606 for (n = 0; n < (unsigned int)i; n++)
2607 {
2154 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2609 XClearWindow (disp, parent[n]);
2610 }
2155 2611
2156 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2612 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2157 am_transparent = 1; 2613 am_transparent = 1;
2158 } 2614 }
2159 2615
2160 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2616 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2161 TermWin.parent[i] = None; 2617 parent[i] = None;
2618 }
2619
2620 if (scrollBar.win)
2621 {
2622 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2623 scrollBar.setIdle ();
2624 scrollbar_show (0);
2625 }
2626
2627 if (am_transparent)
2628 {
2629 want_refresh = want_full_refresh = 1;
2630 if (am_pixmap_trans)
2631 flush ();
2162 } 2632 }
2163 2633
2164 return pchanged; 2634 return pchanged;
2165} 2635}
2166#endif 2636#endif
… …
2185 if (ch == NOCHAR) // TODO: improve 2655 if (ch == NOCHAR) // TODO: improve
2186 break; 2656 break;
2187 2657
2188 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2658 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2189 { 2659 {
2660 if (!seen_input)
2661 {
2662 seen_input = 1;
2663 // many badly-written programs (e.g. jed) contain a race condition:
2664 // they first read the screensize and then install a SIGWINCH handler.
2665 // some window managers resize the window early, and these programs
2666 // then sometimes get the size wrong.
2667 // unfortunately other programs are even more buggy and dislike
2668 // being sent SIGWINCH, so only do it when we were in fact being
2669 // resized.
2670 if (seen_resize && cmd_pid)
2671 kill (-cmd_pid, SIGWINCH);
2672 }
2673
2190 /* Read a text string from the input buffer */ 2674 /* Read a text string from the input buffer */
2191 unicode_t buf[UBUFSIZ]; 2675 unicode_t buf[UBUFSIZ];
2192 bool refreshnow = false; 2676 bool refreshnow = false;
2193 int nlines = 0; 2677 int nlines = 0;
2194 unicode_t *str = buf; 2678 unicode_t *str = buf;
2195 2679 unicode_t *eol = str + min (ncol, UBUFSIZ);
2196 *str++ = ch;
2197 2680
2198 for (;;) 2681 for (;;)
2199 { 2682 {
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)) 2683 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2204 break; 2684 break;
2205 2685
2206 *str++ = ch; 2686 *str++ = ch;
2207 2687
2208 if (ch == C0_LF) 2688 if (ch == C0_LF || str >= eol)
2209 { 2689 {
2690 if (ch == C0_LF)
2210 nlines++; 2691 nlines++;
2692
2211 refresh_count++; 2693 refresh_count++;
2212 2694
2213 if (! (Options & Opt_jumpScroll) 2695 if (!OPTION (Opt_jumpScroll)
2214 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2696 || (refresh_count >= refresh_limit * (nrow - 1)))
2215 { 2697 {
2216 refreshnow = true; 2698 refreshnow = true;
2217 flag = true;
2218 ch = NOCHAR; 2699 ch = NOCHAR;
2219 break; 2700 break;
2220 } 2701 }
2221 2702
2222 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2703 // scr_add_lines only works for nlines <= nrow - 1.
2223 if (nlines >= TermWin.nrow - 1) 2704 if (nlines >= nrow - 1)
2224 { 2705 {
2225 scr_add_lines (buf, nlines, str - buf); 2706 scr_add_lines (buf, nlines, str - buf);
2226 nlines = 0; 2707 nlines = 0;
2227 str = buf; 2708 str = buf;
2709 eol = str + min (ncol, UBUFSIZ);
2228 } 2710 }
2711
2712 if (str >= eol)
2713 {
2714 if (eol >= buf + UBUFSIZ)
2715 {
2716 ch = NOCHAR;
2717 break;
2718 }
2719 else
2720 eol = min (eol + ncol, buf + UBUFSIZ);
2721 }
2722
2229 } 2723 }
2230 2724
2231 if (str >= buf + UBUFSIZ) 2725 seq_begin = cmdbuf_ptr;
2232 { 2726 ch = next_char ();
2233 ch = NOCHAR;
2234 break;
2235 }
2236 } 2727 }
2237 2728
2238 scr_add_lines (buf, nlines, str - buf); 2729 scr_add_lines (buf, nlines, str - buf);
2239 2730
2240 /* 2731 /*
2241 * If there have been a lot of new lines, then update the screen 2732 * 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. 2733 * 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 2734 * the number of pages between refreshes is refresh_limit, which
2244 * is incremented here because we must be doing flat-out scrolling. 2735 * 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 */ 2736 */
2249 if (refreshnow) 2737 if (refreshnow)
2250 { 2738 {
2251 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2739 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2252 refresh_limit++; 2740 refresh_limit++;
2253 else 2741 else
2742 {
2743 flag = true;
2254 scr_refresh (refresh_type); 2744 scr_refresh (refresh_type);
2745 }
2255 } 2746 }
2256 2747
2257 } 2748 }
2258 else 2749 else
2259 { 2750 {
… …
2273 } 2764 }
2274 2765
2275 return flag; 2766 return flag;
2276} 2767}
2277 2768
2769// read the next octet
2770unicode_t
2771rxvt_term::next_octet ()
2772{
2773 return cmdbuf_ptr < cmdbuf_endp
2774 ? *cmdbuf_ptr++
2775 : NOCHAR;
2776}
2777
2278// read the next character 2778// read the next character
2279unicode_t 2779unicode_t
2280rxvt_term::next_char () 2780rxvt_term::next_char ()
2281{ 2781{
2282 while (cmdbuf_ptr < cmdbuf_endp) 2782 while (cmdbuf_ptr < cmdbuf_endp)
… …
2298 if (len == (size_t)-1) 2798 if (len == (size_t)-1)
2299 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2799 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2300 2800
2301 // assume wchar == unicode 2801 // assume wchar == unicode
2302 cmdbuf_ptr += len; 2802 cmdbuf_ptr += len;
2303 return wc; 2803 return wc & UNICODE_MASK;
2304 } 2804 }
2305 2805
2306 return NOCHAR; 2806 return NOCHAR;
2307} 2807}
2308 2808
… …
2313 */ 2813 */
2314unicode_t 2814unicode_t
2315rxvt_term::cmd_getc () 2815rxvt_term::cmd_getc ()
2316{ 2816{
2317 unicode_t c = next_char (); 2817 unicode_t c = next_char ();
2818
2819 if (c == NOCHAR)
2820 throw out_of_input;
2821
2822 return c;
2823}
2824
2825unicode_t
2826rxvt_term::cmd_get8 ()
2827{
2828 unicode_t c = next_octet ();
2318 2829
2319 if (c == NOCHAR) 2830 if (c == NOCHAR)
2320 throw out_of_input; 2831 throw out_of_input;
2321 2832
2322 return c; 2833 return c;
… …
2423 process_escape_seq (); 2934 process_escape_seq ();
2424 break; 2935 break;
2425 case C0_ENQ: /* terminal Status */ 2936 case C0_ENQ: /* terminal Status */
2426 if (rs[Rs_answerbackstring]) 2937 if (rs[Rs_answerbackstring])
2427 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2938 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2428 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2939 (unsigned int)strlen (rs[Rs_answerbackstring]));
2429 else 2940 else
2430 tt_write ((unsigned char *)VT100_ANS, 2941 tt_write ((unsigned char *)VT100_ANS,
2431 (unsigned int)STRLEN (VT100_ANS)); 2942 (unsigned int)strlen (VT100_ANS));
2432 break; 2943 break;
2433 case C0_BEL: /* bell */ 2944 case C0_BEL: /* bell */
2434 scr_bell (); 2945 scr_bell ();
2435 break; 2946 break;
2436 case C0_BS: /* backspace */ 2947 case C0_BS: /* backspace */
… …
2452 break; 2963 break;
2453 case C0_SI: /* shift in - acs */ 2964 case C0_SI: /* shift in - acs */
2454 scr_charset_choose (0); 2965 scr_charset_choose (0);
2455 break; 2966 break;
2456 2967
2968#ifdef EIGHT_BIT_CONTROLS
2457 // 8-bit controls 2969 // 8-bit controls
2458 case 0x90: /* DCS */ 2970 case 0x90: /* DCS */
2459 process_dcs_seq (); 2971 process_dcs_seq ();
2460 break; 2972 break;
2461 case 0x9b: /* CSI */ 2973 case 0x9b: /* CSI */
2462 process_csi_seq (); 2974 process_csi_seq ();
2463 break; 2975 break;
2464 case 0x9d: /* CSI */ 2976 case 0x9d: /* CSI */
2465 process_osc_seq (); 2977 process_osc_seq ();
2466 break; 2978 break;
2979#endif
2467 } 2980 }
2468} 2981}
2469/*}}} */ 2982/*}}} */
2470 2983
2471 2984
… …
2533void 3046void
2534rxvt_term::process_escape_seq () 3047rxvt_term::process_escape_seq ()
2535{ 3048{
2536 unicode_t ch = cmd_getc (); 3049 unicode_t ch = cmd_getc ();
2537 3050
2538 if (PrivateModes & PrivMode_vt52) 3051 if (priv_modes & PrivMode_vt52)
2539 { 3052 {
2540 process_escape_vt52 (ch); 3053 process_escape_vt52 (ch);
2541 return; 3054 return;
2542 } 3055 }
2543 3056
… …
2558 scr_charset_set (2, (unsigned int)cmd_getc ()); 3071 scr_charset_set (2, (unsigned int)cmd_getc ());
2559 break; 3072 break;
2560 case '+': 3073 case '+':
2561 scr_charset_set (3, (unsigned int)cmd_getc ()); 3074 scr_charset_set (3, (unsigned int)cmd_getc ());
2562 break; 3075 break;
2563#ifndef NO_FRILLS 3076#if ENABLE_FRILLS
2564 case '6': 3077 case '6':
2565 scr_backindex (); 3078 scr_backindex ();
2566 break; 3079 break;
2567#endif 3080#endif
2568 case '7': 3081 case '7':
2569 scr_cursor (SAVE); 3082 scr_cursor (SAVE);
2570 break; 3083 break;
2571 case '8': 3084 case '8':
2572 scr_cursor (RESTORE); 3085 scr_cursor (RESTORE);
2573 break; 3086 break;
2574#ifndef NO_FRILLS 3087#if ENABLE_FRILLS
2575 case '9': 3088 case '9':
2576 scr_forwardindex (); 3089 scr_forwardindex ();
2577 break; 3090 break;
2578#endif 3091#endif
2579 case '=': 3092 case '=':
… …
2758 { 3271 {
2759 switch (priv) 3272 switch (priv)
2760 { 3273 {
2761 case '>': 3274 case '>':
2762 if (ch == CSI_DA) /* secondary device attributes */ 3275 if (ch == CSI_DA) /* secondary device attributes */
2763 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3276 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2764 break; 3277 break;
2765 case '?': 3278 case '?':
2766 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3279 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2767 process_terminal_mode (ch, priv, nargs, arg); 3280 process_terminal_mode (ch, priv, nargs, arg);
2768 break; 3281 break;
… …
2873 3386
2874 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3387 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2875 arg[0] = -arg[0]; 3388 arg[0] = -arg[0];
2876 /* FALLTHROUGH */ 3389 /* FALLTHROUGH */
2877 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3390 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2878 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3391 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2879 break; 3392 break;
2880 3393
2881 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3394 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2882 tt_write ((const unsigned char *)VT100_ANS, 3395 tt_write ((const unsigned char *)VT100_ANS,
2883 (unsigned int) (sizeof (VT100_ANS) - 1)); 3396 (unsigned int) (sizeof (VT100_ANS) - 1));
2884 break; 3397 break;
2885 3398
2886 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3399 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2887 process_sgr_mode (nargs, arg); 3400 process_sgr_mode (nargs, arg);
2888 break; 3401 break;
… …
2895 break; 3408 break;
2896 case 6: /* CPR requested */ 3409 case 6: /* CPR requested */
2897 scr_report_position (); 3410 scr_report_position ();
2898 break; 3411 break;
2899 case 7: /* unofficial extension */ 3412 case 7: /* unofficial extension */
2900 if (Options & Opt_insecure) 3413 if (OPTION (Opt_insecure))
2901 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3414 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2902 break; 3415 break;
2903 case 8: /* unofficial extension */ 3416 case 8: /* unofficial extension */
2904 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3417 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2905 break; 3418 break;
2906 } 3419 }
… …
2942 break; 3455 break;
2943 3456
2944 case CSI_RM: /* 8.3.107: RESET MODE */ 3457 case CSI_RM: /* 8.3.107: RESET MODE */
2945 if (arg[0] == 4) 3458 if (arg[0] == 4)
2946 scr_insert_mode (0); 3459 scr_insert_mode (0);
3460 else if (arg[0] == 20)
3461 priv_modes &= ~PrivMode_LFNL;
2947 break; 3462 break;
2948 3463
2949 case CSI_SM: /* 8.3.126: SET MODE */ 3464 case CSI_SM: /* 8.3.126: SET MODE */
2950 if (arg[0] == 4) 3465 if (arg[0] == 4)
2951 scr_insert_mode (1); 3466 scr_insert_mode (1);
3467 else if (arg[0] == 20)
3468 priv_modes |= PrivMode_LFNL;
2952 break; 3469 break;
2953 3470
2954 /* 3471 /*
2955 * PRIVATE USE beyond this point. All CSI_7? sequences here 3472 * PRIVATE USE beyond this point. All CSI_7? sequences here
2956 */ 3473 */
… …
2968 break; 3485 break;
2969 case CSI_75: 3486 case CSI_75:
2970 scr_cursor (RESTORE); 3487 scr_cursor (RESTORE);
2971 break; 3488 break;
2972 3489
2973#ifndef NO_FRILLS 3490#if ENABLE_FRILLS
2974 case CSI_74: 3491 case CSI_74:
2975 process_window_ops (arg, nargs); 3492 process_window_ops (arg, nargs);
2976 break; 3493 break;
2977#endif 3494#endif
2978 3495
… …
2985 break; 3502 break;
2986 } 3503 }
2987} 3504}
2988/*}}} */ 3505/*}}} */
2989 3506
2990#ifndef NO_FRILLS 3507#if ENABLE_FRILLS
2991/* ARGSUSED */ 3508/* ARGSUSED */
2992void 3509void
2993rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3510rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2994{ 3511{
2995 int x, y; 3512 int x, y;
2996 XWindowAttributes wattr; 3513 XWindowAttributes wattr;
2997 Window wdummy; 3514 Window wdummy;
3515 dDisp;
2998 3516
2999 if (nargs == 0) 3517 if (nargs == 0)
3000 return; 3518 return;
3001 3519
3002 switch (args[0]) 3520 switch (args[0])
3003 { 3521 {
3004 /* 3522 /*
3005 * commands 3523 * commands
3006 */ 3524 */
3007 case 1: /* deiconify window */ 3525 case 1: /* deiconify window */
3008 XMapWindow (display->display, TermWin.parent[0]); 3526 XMapWindow (disp, parent[0]);
3009 break; 3527 break;
3010 case 2: /* iconify window */ 3528 case 2: /* iconify window */
3011 XIconifyWindow (display->display, TermWin.parent[0], 3529 XIconifyWindow (disp, parent[0], display->screen);
3012 DefaultScreen (display->display));
3013 break; 3530 break;
3014 case 3: /* set position (pixels) */ 3531 case 3: /* set position (pixels) */
3015 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3532 XMoveWindow (disp, parent[0], args[1], args[2]);
3016 break; 3533 break;
3017 case 4: /* set size (pixels) */ 3534 case 4: /* set size (pixels) */
3018 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3535 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3019 break; 3536 break;
3020 case 5: /* raise window */ 3537 case 5: /* raise window */
3021 XRaiseWindow (display->display, TermWin.parent[0]); 3538 XRaiseWindow (disp, parent[0]);
3022 break; 3539 break;
3023 case 6: /* lower window */ 3540 case 6: /* lower window */
3024 XLowerWindow (display->display, TermWin.parent[0]); 3541 XLowerWindow (disp, parent[0]);
3025 break; 3542 break;
3026 case 7: /* refresh window */ 3543 case 7: /* refresh window */
3027 scr_touch (true); 3544 scr_touch (true);
3028 break; 3545 break;
3029 case 8: /* set size (chars) */ 3546 case 8: /* set size (chars) */
3030 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3547 set_widthheight ((unsigned int) (args[2] * fwidth),
3031 (unsigned int) (args[1] * TermWin.fheight)); 3548 (unsigned int) (args[1] * fheight));
3032 break; 3549 break;
3033 3550
3034 //case 9: NYI, TODO, restore maximized window or maximize window 3551 //case 9: NYI, TODO, restore maximized window or maximize window
3035 default: 3552 default:
3036 if (args[0] >= 24) /* set height (chars) */ 3553 if (args[0] >= 24) /* set height (chars) */
3037 set_widthheight ((unsigned int)TermWin.width, 3554 set_widthheight ((unsigned int)width,
3038 (unsigned int) (args[1] * TermWin.fheight)); 3555 (unsigned int) (args[1] * fheight));
3039 break; 3556 break;
3040 3557
3041 3558
3042 /* 3559 /*
3043 * reports - some output format copied from XTerm 3560 * reports - some output format copied from XTerm
3044 */ 3561 */
3045 case 11: /* report window state */ 3562 case 11: /* report window state */
3046 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3563 XGetWindowAttributes (disp, parent[0], &wattr);
3047 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3564 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3048 break; 3565 break;
3049 case 13: /* report window position */ 3566 case 13: /* report window position */
3050 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3567 XGetWindowAttributes (disp, parent[0], &wattr);
3051 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3568 XTranslateCoordinates (disp, parent[0], wattr.root,
3052 -wattr.border_width, -wattr.border_width, 3569 -wattr.border_width, -wattr.border_width,
3053 &x, &y, &wdummy); 3570 &x, &y, &wdummy);
3054 tt_printf ("\033[3;%d;%dt", x, y); 3571 tt_printf ("\033[3;%d;%dt", x, y);
3055 break; 3572 break;
3056 case 14: /* report window size (pixels) */ 3573 case 14: /* report window size (pixels) */
3057 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3574 XGetWindowAttributes (disp, parent[0], &wattr);
3058 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3575 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3059 break; 3576 break;
3060 case 18: /* report text area size (chars) */ 3577 case 18: /* report text area size (chars) */
3061 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3578 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3062 break; 3579 break;
3063 case 19: /* report window size (chars) */ 3580 case 19: /* report window size (chars) */
3064 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3581 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3065 break; 3582 break;
3066 case 20: /* report icon label */ 3583 case 20: /* report icon label */
3067 if (Options & Opt_insecure)
3068 { 3584 {
3069 char *s; 3585 char *s;
3070 XGetIconName (display->display, TermWin.parent[0], &s); 3586 XGetIconName (disp, parent[0], &s);
3071 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3587 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3588 XFree (s);
3072 } 3589 }
3073 break; 3590 break;
3074 case 21: /* report window title */ 3591 case 21: /* report window title */
3075 if (Options & Opt_insecure)
3076 { 3592 {
3077 char *s; 3593 char *s;
3078 XFetchName (display->display, TermWin.parent[0], &s); 3594 XFetchName (disp, parent[0], &s);
3079 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3595 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3596 XFree (s);
3080 } 3597 }
3081 break; 3598 break;
3082 } 3599 }
3083} 3600}
3084#endif 3601#endif
3085 3602
… …
3089 * ends_how is terminator used. returned input must be free()'d 3606 * ends_how is terminator used. returned input must be free()'d
3090 */ 3607 */
3091unsigned char * 3608unsigned char *
3092rxvt_term::get_to_st (unicode_t &ends_how) 3609rxvt_term::get_to_st (unicode_t &ends_how)
3093{ 3610{
3094 int seen_esc = 0; /* seen escape? */ 3611 unicode_t ch;
3612 bool seen_esc = false;
3095 unsigned int n = 0; 3613 unsigned int n = 0;
3096 unsigned char *s;
3097 unicode_t ch;
3098 unsigned char string[STRING_MAX]; 3614 wchar_t string[STRING_MAX];
3099 3615
3100 while ((ch = cmd_getc ())) 3616 while ((ch = cmd_getc ()) != NOCHAR)
3101 { 3617 {
3102 if (ch == C0_BEL || ch == CHAR_ST)
3103 break;
3104
3105 if (seen_esc) 3618 if (seen_esc)
3619 {
3106 if (ch == 0x5c) /* 7bit ST */ 3620 if (ch == 0x5c) /* 7bit ST */
3107 break; 3621 break;
3108 else 3622 else
3109 return NULL; 3623 return NULL;
3110 3624 }
3111 if (ch == C0_ESC) 3625 else if (ch == C0_ESC)
3112 { 3626 {
3113 seen_esc = 1; 3627 seen_esc = true;
3114 continue; 3628 continue;
3115 } 3629 }
3630 else if (ch == C0_BEL || ch == CHAR_ST)
3631 break;
3116 else if (ch == C0_HT) 3632 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 */ 3633 return NULL; /* other control character - exit */
3120 3634
3121 if (n >= sizeof (string) - 1) 3635 seen_esc = false;
3636
3637 if (n >= STRING_MAX - 1)
3122 // stop at some sane length 3638 // stop at some sane length
3123 return NULL; 3639 return NULL;
3124 3640
3641 if (ch == C0_SYN)
3642 string[n++] = cmd_get8 ();
3643 else
3125 string[n++] = ch; 3644 string[n++] = ch;
3126 seen_esc = 0;
3127 } 3645 }
3128 3646
3129 string[n++] = '\0'; 3647 string[n++] = '\0';
3130 3648
3131 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3132 return NULL;
3133
3134 ends_how = (ch == 0x5c ? C0_ESC : ch); 3649 ends_how = (ch == 0x5c ? C0_ESC : ch);
3135 STRNCPY (s, string, n); 3650
3136 return s; 3651 return (unsigned char *)rxvt_wcstombs (string);
3137} 3652}
3138 3653
3139/*----------------------------------------------------------------------*/ 3654/*----------------------------------------------------------------------*/
3140/* 3655/*
3141 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3656 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3185void 3700void
3186rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3701rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3187{ 3702{
3188 if (str[0] == '?' && !str[1]) 3703 if (str[0] == '?' && !str[1])
3189 { 3704 {
3190 if (Options & Opt_insecure)
3191 {
3192 unsigned short r, g, b; 3705 unsigned short r, g, b;
3193 PixColors[color].get (display, r, g, b); 3706 pix_colors_focused[color].get (display, r, g, b);
3194 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3707 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3195 }
3196 } 3708 }
3197 else 3709 else
3198 set_window_color (color, str); 3710 set_window_color (color, str);
3199} 3711}
3200 3712
3201/* 3713/*
3202 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3714 * 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 */ 3715 */
3226void 3716void
3227rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3717rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3228{ 3718{
3229 int changed = 0; 3719 int changed = 0;
3230 int color; 3720 int color;
3231 char *buf, *name; 3721 char *buf, *name;
3232 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3723 int saveop = op;
3724 dDisp;
3233 3725
3234 assert (str != NULL); 3726 assert (str != NULL);
3235 switch (op) 3727 switch (op)
3236 { 3728 {
3237 case XTerm_name: 3729 case XTerm_name:
… …
3244 set_title (str); 3736 set_title (str);
3245 break; 3737 break;
3246 case XTerm_property: 3738 case XTerm_property:
3247 if (str[0] == '?') 3739 if (str[0] == '?')
3248 { 3740 {
3249 Atom prop = XInternAtom (display->display, str + 1, True); 3741 Atom prop = display->atom (str + 1);
3250 Atom actual_type; 3742 Atom actual_type;
3251 int actual_format; 3743 int actual_format;
3252 unsigned long nitems; 3744 unsigned long nitems;
3253 unsigned long bytes_after; 3745 unsigned long bytes_after;
3254 unsigned char *value = 0; 3746 unsigned char *value = 0;
3255 const char *str = ""; 3747 const char *str = "";
3256 3748
3257 if (prop 3749 if (prop
3258 && XGetWindowProperty (display->display, TermWin.parent[0], 3750 && XGetWindowProperty (disp, parent[0],
3259 prop, 0, 1<<16, 0, AnyPropertyType, 3751 prop, 0, 1<<16, 0, AnyPropertyType,
3260 &actual_type, &actual_format, 3752 &actual_type, &actual_format,
3261 &nitems, &bytes_after, &value) == Success 3753 &nitems, &bytes_after, &value) == Success
3262 && actual_type != None 3754 && actual_type != None
3263 && actual_format == 8) 3755 && actual_format == 8)
… …
3272 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3764 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3273 3765
3274 if (eq) 3766 if (eq)
3275 { 3767 {
3276 *eq = 0; 3768 *eq = 0;
3277 XChangeProperty (display->display, TermWin.parent[0], 3769 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 } 3770 }
3282 else 3771 else
3283 XDeleteProperty (display->display, TermWin.parent[0], 3772 XDeleteProperty (disp, parent[0],
3284 display->atom (str)); 3773 display->atom (str));
3285 } 3774 }
3286 break; 3775 break;
3287 3776
3288 case XTerm_Color: 3777 case XTerm_Color:
3289 for (buf = (char *)str; buf && *buf;) 3778 for (buf = (char *)str; buf && *buf;)
3290 { 3779 {
3291 if ((name = STRCHR (buf, ';')) == NULL) 3780 if ((name = strchr (buf, ';')) == NULL)
3292 break; 3781 break;
3293 3782
3294 *name++ = '\0'; 3783 *name++ = '\0';
3295 color = atoi (buf); 3784 color = atoi (buf);
3296 3785
3297 if (color < 0 || color >= TOTAL_COLORS) 3786 if (color < 0 || color >= TOTAL_COLORS)
3298 break; 3787 break;
3299 3788
3300 if ((buf = STRCHR (name, ';')) != NULL) 3789 if ((buf = strchr (name, ';')) != NULL)
3301 *buf++ = '\0'; 3790 *buf++ = '\0';
3302 3791
3303 if (name[0] == '?' && !name[1]) 3792 if (name[0] == '?' && !name[1])
3304 { 3793 {
3305 if (Options & Opt_insecure)
3306 {
3307 unsigned short r, g, b; 3794 unsigned short r, g, b;
3308 PixColors[color + minCOLOR].get (display, r, g, b); 3795 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); 3796 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3310 }
3311 } 3797 }
3312 else 3798 else
3313 set_window_color (color + minCOLOR, name); 3799 set_window_color (color + minCOLOR, name);
3314 } 3800 }
3315 break; 3801 break;
… …
3337 case XTerm_Color_UL: 3823 case XTerm_Color_UL:
3338 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3824 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3339 break; 3825 break;
3340 case XTerm_Color_RV: 3826 case XTerm_Color_RV:
3341 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3827 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3828 break;
3829 case URxvt_Color_IT:
3830 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3831 break;
3832#endif
3833#if TRANSPARENT && TINTING
3834 case URxvt_Color_tint:
3835 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3836 check_our_parents ();
3837 if (am_transparent)
3838 want_full_refresh = want_refresh = 1;
3342 break; 3839 break;
3343#endif 3840#endif
3344 3841
3345 case XTerm_Pixmap: 3842 case XTerm_Pixmap:
3346 if (*str != ';') 3843 if (*str != ';')
… …
3349 scale_pixmap (""); /* reset to default scaling */ 3846 scale_pixmap (""); /* reset to default scaling */
3350 set_bgPixmap (str); /* change pixmap */ 3847 set_bgPixmap (str); /* change pixmap */
3351#endif 3848#endif
3352 scr_touch (true); 3849 scr_touch (true);
3353 } 3850 }
3354 while ((str = STRCHR (str, ';')) != NULL) 3851 while ((str = strchr (str, ';')) != NULL)
3355 { 3852 {
3356 str++; 3853 str++;
3357#if XPM_BACKGROUND 3854#if XPM_BACKGROUND
3358 changed += scale_pixmap (str); 3855 changed += scale_pixmap (str);
3359#endif 3856#endif
3360
3361 } 3857 }
3858
3362 if (changed) 3859 if (changed)
3363 { 3860 {
3364#ifdef XPM_BACKGROUND 3861#ifdef XPM_BACKGROUND
3365 resize_pixmap (); 3862 resize_pixmap ();
3366#endif 3863#endif
… …
3377 3874
3378 case XTerm_logfile: 3875 case XTerm_logfile:
3379 // TODO, when secure mode? 3876 // TODO, when secure mode?
3380 break; 3877 break;
3381 3878
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 3879#ifdef MENUBAR
3423 case XTerm_Menu: 3880 case URxvt_Menu:
3424 if (Options & Opt_insecure) 3881 if (OPTION (Opt_insecure))
3425 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3882 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3426 break; 3883 break;
3427#endif 3884#endif
3428#if 0 3885#if 0
3429 case XTerm_dumpscreen: /* no error notices */ 3886 case XTerm_dumpscreen: /* no error notices */
… …
3433 { 3890 {
3434 scr_dump (fd); 3891 scr_dump (fd);
3435 close (fd); 3892 close (fd);
3436 } 3893 }
3437 } 3894 }
3895 break;
3896#endif
3897 case XTerm_font:
3898 op = URxvt_font;
3899 case URxvt_font:
3900#if ENABLE_STYLES
3901 case URxvt_boldFont:
3902 case URxvt_italicFont:
3903 case URxvt_boldItalicFont:
3904#endif
3905 if (query)
3906 tt_printf ("\33]%d;%-.250s%c", saveop,
3907 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3908 ? fontset[op - URxvt_font]->fontdesc : "",
3909 resp);
3910 else
3911 {
3912 const char *&res = rs[Rs_font + (op - URxvt_font)];
3913
3914 res = strdup (str);
3915 allocated.push_back ((void *)res);
3916 set_fonts ();
3917 }
3918 break;
3919
3920#if ENABLE_FRILLS
3921 case URxvt_locale:
3922 if (query)
3923 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3924 else
3925 {
3926 set_locale (str);
3927 pty.set_utf8_mode (enc_utf8);
3928 init_xlocale ();
3929 }
3930 break;
3931
3932 case URxvt_view_up:
3933 case URxvt_view_down:
3934 int lines = atoi (str);
3935
3936 if (lines)
3937 scr_page (op == URxvt_view_up ? UP : DN, lines);
3938 else
3939 {
3940 scr_erase_savelines ();
3941 }
3942
3438 break; 3943 break;
3439#endif 3944#endif
3440 } 3945 }
3441} 3946}
3442/*----------------------------------------------------------------------*/ 3947/*----------------------------------------------------------------------*/
… …
3456{ 3961{
3457 int state; 3962 int state;
3458 3963
3459 if (mode == 's') 3964 if (mode == 's')
3460 { 3965 {
3461 SavedModes |= (PrivateModes & bit); 3966 SavedModes |= (priv_modes & bit);
3462 return -1; 3967 return -1;
3463 } 3968 }
3464 else 3969 else
3465 { 3970 {
3466 if (mode == 'r') 3971 if (mode == 'r')
3467 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3972 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3468 else 3973 else
3469 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3974 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3470 PrivMode (state, bit); 3975 PrivMode (state, bit);
3471 } 3976 }
3472 3977
3473 return state; 3978 return state;
3474} 3979}
… …
3492 { 3, PrivMode_132 }, 3997 { 3, PrivMode_132 },
3493 { 4, PrivMode_smoothScroll }, 3998 { 4, PrivMode_smoothScroll },
3494 { 5, PrivMode_rVideo }, 3999 { 5, PrivMode_rVideo },
3495 { 6, PrivMode_relOrigin }, 4000 { 6, PrivMode_relOrigin },
3496 { 7, PrivMode_Autowrap }, 4001 { 7, PrivMode_Autowrap },
4002 // 8, bi-directional support mode
3497 { 9, PrivMode_MouseX10 }, 4003 { 9, PrivMode_MouseX10 },
3498#ifdef menuBar_esc 4004#ifdef menuBar_esc
3499 { menuBar_esc, PrivMode_menuBar }, 4005 { menuBar_esc, PrivMode_menuBar },
3500#endif 4006#endif
4007 // 18, 19 printing-related
4008 { 25, PrivMode_VisibleCursor },
3501#ifdef scrollBar_esc 4009#ifdef scrollBar_esc
3502 { scrollBar_esc, PrivMode_scrollBar }, 4010 { scrollBar_esc, PrivMode_scrollBar },
3503#endif 4011#endif
3504 // 18, 19 printing-related
3505 { 25, PrivMode_VisibleCursor },
3506 // 30 show scrollbar rxvt. extension
3507 { 35, PrivMode_ShiftKeys }, // rxvt extension 4012 { 35, PrivMode_ShiftKeys }, // rxvt extension
3508 { 40, PrivMode_132OK }, 4013 { 40, PrivMode_132OK },
3509 // 41 xterm more fixes NYI 4014 // 41 xterm more fixes NYI
3510 // 45 margin bell NYI 4015 // 45 margin bell NYI
3511 // 46 start logging 4016 // 46 start logging
… …
3551 } 4056 }
3552 4057
3553 /* extra handling for values with state unkept */ 4058 /* extra handling for values with state unkept */
3554 switch (arg[i]) 4059 switch (arg[i])
3555 { 4060 {
4061#if ENABLE_STYLES
4062 case 1021:
4063 if (mode)
4064 SET_OPTION (Opt_intensityStyles);
4065 else
4066 CLR_OPTION (Opt_intensityStyles);
4067
4068 want_refresh = 1;
4069 want_full_refresh = 1;
4070 break;
4071#endif
3556 case 1048: /* alternative cursor save */ 4072 case 1048: /* alternative cursor save */
4073 case 1049:
3557 if (Options & Opt_secondaryScreen) 4074 if (OPTION (Opt_secondaryScreen))
3558 if (mode == 0) 4075 if (mode == 0)
3559 scr_cursor (RESTORE); 4076 scr_cursor (RESTORE);
3560 else if (mode == 1) 4077 else if (mode == 1)
3561 scr_cursor (SAVE); 4078 scr_cursor (SAVE);
3562 break; 4079 break;
… …
3573 * within VT52 mode 4090 * within VT52 mode
3574 */ 4091 */
3575 PrivMode (1, PrivMode_vt52); 4092 PrivMode (1, PrivMode_vt52);
3576 break; 4093 break;
3577 case 3: /* 80/132 */ 4094 case 3: /* 80/132 */
3578 if (PrivateModes & PrivMode_132OK) 4095 if (priv_modes & PrivMode_132OK)
3579 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4096 set_widthheight (((state ? 132 : 80) * fwidth), height);
3580 break; 4097 break;
3581 case 4: /* smooth scrolling */ 4098 case 4: /* smooth scrolling */
3582 if (state) 4099 if (!state)
3583 Options &= ~Opt_jumpScroll; 4100 SET_OPTION (Opt_jumpScroll);
3584 else 4101 else
3585 Options |= Opt_jumpScroll; 4102 CLR_OPTION (Opt_jumpScroll);
3586 break; 4103 break;
3587 case 5: /* reverse video */ 4104 case 5: /* reverse video */
3588 scr_rvideo_mode (state); 4105 scr_rvideo_mode (state);
3589 break; 4106 break;
3590 case 6: /* relative/absolute origins */ 4107 case 6: /* relative/absolute origins */
… …
3594 scr_autowrap (state); 4111 scr_autowrap (state);
3595 break; 4112 break;
3596 /* case 8: - auto repeat, can't do on a per window basis */ 4113 /* case 8: - auto repeat, can't do on a per window basis */
3597 case 9: /* X10 mouse reporting */ 4114 case 9: /* X10 mouse reporting */
3598 if (state) /* orthogonal */ 4115 if (state) /* orthogonal */
3599 PrivateModes &= ~PrivMode_MouseX11; 4116 priv_modes &= ~PrivMode_MouseX11;
3600 break; 4117 break;
3601#ifdef menuBar_esc 4118#ifdef menuBar_esc
3602 case menuBar_esc: 4119 case menuBar_esc:
3603#ifdef MENUBAR 4120#ifdef MENUBAR
3604 map_menuBar (state); 4121 map_menuBar (state);
… …
3624 break; 4141 break;
3625 /* case 66: - application key pad */ 4142 /* case 66: - application key pad */
3626 /* case 67: - backspace key */ 4143 /* case 67: - backspace key */
3627 case 1000: /* X11 mouse reporting */ 4144 case 1000: /* X11 mouse reporting */
3628 if (state) /* orthogonal */ 4145 if (state) /* orthogonal */
3629 PrivateModes &= ~PrivMode_MouseX10; 4146 priv_modes &= ~PrivMode_MouseX10;
3630 break; 4147 break;
3631#if 0 4148#if 0
3632 case 1001: 4149 case 1001:
3633 break; /* X11 mouse highlighting */ 4150 break; /* X11 mouse highlighting */
3634#endif 4151#endif
3635 case 1010: /* scroll to bottom on TTY output inhibit */ 4152 case 1010: /* scroll to bottom on TTY output inhibit */
3636 if (state) 4153 if (!state)
3637 Options &= ~Opt_scrollTtyOutput; 4154 SET_OPTION (Opt_scrollTtyOutput);
3638 else 4155 else
3639 Options |= Opt_scrollTtyOutput; 4156 CLR_OPTION (Opt_scrollTtyOutput);
3640 break; 4157 break;
3641 case 1011: /* scroll to bottom on key press */ 4158 case 1011: /* scroll to bottom on key press */
3642 if (state) 4159 if (state)
3643 Options |= Opt_scrollTtyKeypress; 4160 SET_OPTION (Opt_scrollTtyKeypress);
3644 else 4161 else
3645 Options &= ~Opt_scrollTtyKeypress; 4162 CLR_OPTION (Opt_scrollTtyKeypress);
3646 break; 4163 break;
3647 case 1047: /* secondary screen w/ clearing last */ 4164 case 1047: /* secondary screen w/ clearing last */
3648 if (Options & Opt_secondaryScreen) 4165 if (OPTION (Opt_secondaryScreen))
3649 if (current_screen != PRIMARY) 4166 if (current_screen != PRIMARY)
3650 scr_erase_screen (2); 4167 scr_erase_screen (2);
3651 scr_change_screen (state); 4168 scr_change_screen (state);
3652 break; 4169 break;
3653 case 1049: /* secondary screen w/ clearing first */ 4170 case 1049: /* secondary screen w/ clearing first */
3654 scr_change_screen (state); 4171 scr_change_screen (state);
3655 if (Options & Opt_secondaryScreen) 4172 if (OPTION (Opt_secondaryScreen))
3656 if (current_screen != PRIMARY) 4173 if (current_screen != PRIMARY)
3657 scr_erase_screen (2); 4174 scr_erase_screen (2);
3658 break; 4175 break;
3659 default: 4176 default:
3660 break; 4177 break;
… …
3686 rendset = 0, rendstyle = ~RS_None; 4203 rendset = 0, rendstyle = ~RS_None;
3687 break; 4204 break;
3688 case 1: 4205 case 1:
3689 rendset = 1, rendstyle = RS_Bold; 4206 rendset = 1, rendstyle = RS_Bold;
3690 break; 4207 break;
4208 //case 2: // low intensity
4209 case 3:
4210 rendset = 1, rendstyle = RS_Italic;
4211 break;
3691 case 4: 4212 case 4:
3692 rendset = 1, rendstyle = RS_Uline; 4213 rendset = 1, rendstyle = RS_Uline;
3693 break; 4214 break;
3694 case 5: 4215 case 5: // slowly blinking
4216 case 6: // rapidly blinking
3695 rendset = 1, rendstyle = RS_Blink; 4217 rendset = 1, rendstyle = RS_Blink;
3696 break; 4218 break;
3697 //case 6: // scoansi light background 4219 //case 6: // scoansi light background
3698 case 7: 4220 case 7:
3699 rendset = 1, rendstyle = RS_RVid; 4221 rendset = 1, rendstyle = RS_RVid;
3700 break; 4222 break;
3701 case 8: 4223 case 8:
3702 // invisible. NYI 4224 // invisible. NYI
3703 break; 4225 break;
4226 //case 9: // crossed out
3704 //case 10: // scoansi acs off 4227 //case 10: // scoansi acs off, primary font
3705 //case 11: // scoansi acs on 4228 //case 11: // scoansi acs on, first alt font
3706 //case 12: // scoansi acs on, |0x80 4229 //case 12: // scoansi acs on, |0x80, second alt font
3707 case 21: // disable bold, blink and invis (some terminals use this) 4230 //...
4231 //case 19: // ninth alt font
4232 //case 20: // gothic
4233 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3708 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4234 rendset = 0, rendstyle = RS_Bold;
3709 break; 4235 break;
3710 case 22: 4236 case 22: // normal intensity
3711 rendset = 0, rendstyle = RS_Bold; 4237 rendset = 0, rendstyle = RS_Bold;
4238 break;
4239 case 23: // disable italic
4240 rendset = 0, rendstyle = RS_Italic;
3712 break; 4241 break;
3713 case 24: 4242 case 24:
3714 rendset = 0, rendstyle = RS_Uline; 4243 rendset = 0, rendstyle = RS_Uline;
3715 break; 4244 break;
3716 case 25: 4245 case 25:
3717 rendset = 0, rendstyle = RS_Blink; 4246 rendset = 0, rendstyle = RS_Blink;
3718 break; 4247 break;
4248 case 26: // variable spacing (iso 8613)
4249 rendset = 0, rendstyle = RS_Blink;
4250 break;
3719 case 27: 4251 case 27:
3720 rendset = 0, rendstyle = RS_RVid; 4252 rendset = 0, rendstyle = RS_RVid;
3721 break; 4253 break;
3722 case 28:
3723 // visible. NYI 4254 //case 28: // visible. NYI
3724 break; 4255 //case 29: // not crossed-out
3725 } 4256 }
3726 4257
3727 if (rendset != -1) 4258 if (rendset != -1)
3728 { 4259 {
3729 scr_rendition (rendset, rendstyle); 4260 scr_rendition (rendset, rendstyle);
… …
3740 case 35: 4271 case 35:
3741 case 36: 4272 case 36:
3742 case 37: 4273 case 37:
3743 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4274 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3744 break; 4275 break;
3745#ifdef TTY_256COLOR 4276 case 38: // set fg color, ISO 8613-6
3746 case 38:
3747 if (nargs > i + 2 && arg[i + 1] == 5) 4277 if (nargs > i + 2 && arg[i + 1] == 5)
3748 { 4278 {
3749 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4279 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3750 i += 2; 4280 i += 2;
3751 } 4281 }
3752 break; 4282 break;
3753#endif
3754 case 39: /* default fg */ 4283 case 39: /* default fg */
3755 scr_color (Color_fg, Color_fg); 4284 scr_color (Color_fg, Color_fg);
3756 break; 4285 break;
3757 4286
3758 case 40: 4287 case 40:
… …
3763 case 45: 4292 case 45:
3764 case 46: 4293 case 46:
3765 case 47: 4294 case 47:
3766 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4295 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3767 break; 4296 break;
3768#ifdef TTY_256COLOR 4297 case 48: // set bg color, ISO 8613-6
3769 case 48:
3770 if (nargs > i + 2 && arg[i + 1] == 5) 4298 if (nargs > i + 2 && arg[i + 1] == 5)
3771 { 4299 {
3772 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4300 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3773 i += 2; 4301 i += 2;
3774 } 4302 }
3775 break; 4303 break;
3776#endif
3777 case 49: /* default bg */ 4304 case 49: /* default bg */
3778 scr_color (Color_bg, Color_bg); 4305 scr_color (Color_bg, Color_bg);
3779 break; 4306 break;
4307
4308 //case 50: // not variable spacing
3780 4309
3781#ifndef NO_BRIGHTCOLOR 4310#ifndef NO_BRIGHTCOLOR
3782 case 90: 4311 case 90:
3783 case 91: /* set bright fg color */ 4312 case 91: /* set bright fg color */
3784 case 92: 4313 case 92:
3785 case 93: 4314 case 93:
3786 case 94: 4315 case 94:
3787 case 95: 4316 case 95:
3788 case 96: 4317 case 96:
3789 case 97: 4318 case 97:
3790 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4319 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3791 Color_fg);
3792 break; 4320 break;
3793 case 100: 4321 case 100:
3794 case 101: /* set bright bg color */ 4322 case 101: /* set bright bg color */
3795 case 102: 4323 case 102:
3796 case 103: 4324 case 103:
3797 case 104: 4325 case 104:
3798 case 105: 4326 case 105:
3799 case 106: 4327 case 106:
3800 case 107: 4328 case 107:
3801 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4329 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3802 Color_bg);
3803 break; 4330 break;
3804#endif 4331#endif
3805
3806 } 4332 }
3807 } 4333 }
3808} 4334}
3809/*}}} */ 4335/*}}} */
3810 4336
… …
3814{ 4340{
3815 unicode_t ch, cmd = cmd_getc (); 4341 unicode_t ch, cmd = cmd_getc ();
3816 4342
3817 if (cmd == 'Q') 4343 if (cmd == 'Q')
3818 { /* query graphics */ 4344 { /* query graphics */
3819 tt_printf ("\033G0\n"); /* no graphics */ 4345 tt_printf ("\033G0\012"); /* no graphics */
3820 return; 4346 return;
3821 } 4347 }
3822 /* swallow other graphics sequences until terminating ':' */ 4348 /* swallow other graphics sequences until terminating ':' */
3823 do 4349 do
3824 ch = cmd_getc (); 4350 ch = cmd_getc ();
… …
3839 unsigned char buf[256]; 4365 unsigned char buf[256];
3840 4366
3841 va_start (arg_ptr, fmt); 4367 va_start (arg_ptr, fmt);
3842 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4368 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3843 va_end (arg_ptr); 4369 va_end (arg_ptr);
3844 tt_write (buf, STRLEN (buf)); 4370 tt_write (buf, strlen (buf));
3845} 4371}
3846 4372
3847/* ---------------------------------------------------------------------- */ 4373/* ---------------------------------------------------------------------- */
3848/* Write data to the pty as typed by the user, pasted with the mouse, 4374/* 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. 4375 * or generated by us in response to a query ESC sequence.
3850 */ 4376 */
4377const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4378
3851void 4379void
3852rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4380rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3853{ 4381{
3854 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4382 if (v_buflen == 0)
4383 {
4384 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3855 4385
3856 if (len) 4386 if ((unsigned int)written == len)
4387 return;
4388
4389 data += written;
4390 len -= written;
3857 { 4391 }
4392
4393 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4394
4395 memcpy (v_buffer + v_buflen, data, len);
4396 v_buflen += len;
4397
4398 pty_ev.set (EVENT_READ | EVENT_WRITE);
4399}
4400
4401void rxvt_term::pty_write ()
4402{
4403 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4404
4405 if (written > 0)
4406 {
4407 v_buflen -= written;
4408
3858 if (v_buflen == 0) 4409 if (v_buflen == 0)
3859 { 4410 {
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); 4411 free (v_buffer);
3887 v_buffer = 0; 4412 v_buffer = 0;
3888 v_buflen = 0; 4413 v_buflen = 0;
3889 4414
3890 pty_ev.set (EVENT_READ); 4415 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; 4416 return;
3903 } 4417 }
4418
4419 memmove (v_buffer, v_buffer + written, v_buflen);
3904 } 4420 }
4421 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4422 pty_ev.set (EVENT_READ);
3905} 4423}
3906 4424
3907/*----------------------- end-of-file (C source) -----------------------*/ 4425/*----------------------- end-of-file (C source) -----------------------*/
3908 4426

Diff Legend

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