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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.225 by root, Sun Jan 1 13:35:14 2006 UTC

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

Diff Legend

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