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.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.227 by root, Mon Jan 2 15:35:43 2006 UTC

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

Diff Legend

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