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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.226 by root, Sun Jan 1 15:03:49 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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 {
672 scr_refresh (refresh_type); 970 scr_refresh (refresh_type);
673 scrollbar_show (1); 971 scrollbar_show (1);
674#ifdef USE_XIM 972#ifdef USE_XIM
675 IMSendSpot (); 973 IMSendSpot ();
676#endif 974#endif
677
678 } 975 }
679 976
680 display->flush (); 977 display->flush ();
681} 978}
682 979
… …
684rxvt_term::check_cb (check_watcher &w) 981rxvt_term::check_cb (check_watcher &w)
685{ 982{
686 SET_R (this); 983 SET_R (this);
687 SET_LOCALE (locale); 984 SET_LOCALE (locale);
688 985
986 display->flush ();
987
988 if (want_refresh && !flush_ev.active)
989 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
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;
689 flush (); 1000 flush ();
690} 1001}
691 1002
692#ifdef CURSOR_BLINK 1003#ifdef CURSOR_BLINK
693void 1004void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1022 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 1023 }
713} 1024}
714#endif 1025#endif
715 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
716bool 1074bool
717rxvt_term::pty_fill () 1075rxvt_term::pty_fill ()
718{ 1076{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1077 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1078
1079 if (CBUFSIZ == n)
1080 {
1081 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1082 n = 0;
1083 }
720 1084
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1085 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1086 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1087 cmdbuf_endp = cmdbuf_ptr + n;
724 1088
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1089 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1090
727 if (n > 0) 1091 if (r > 0)
728 { 1092 {
729 cmdbuf_endp += n; 1093 cmdbuf_endp += r;
730 return true; 1094 return true;
731 } 1095 }
732 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))
733 destroy (); 1107 destroy ();
1108 }
734 1109
735 return false; 1110 return false;
736} 1111}
737 1112
738void 1113void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1114rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1115{
741 SET_R (this); 1116 SET_R (this);
742 SET_LOCALE (locale); 1117 SET_LOCALE (locale);
743 1118
1119 if (revents & EVENT_READ)
1120 // loop, but don't allow a single term to monopolize us
1121 while (pty_fill ())
1122 if (cmd_parse ())
1123 break;
1124
744 if (revents & EVENT_WRITE) 1125 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1126 pty_write ();
746 else if (revents & EVENT_READ) 1127}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1128
760 if (cmd_parse ()) 1129void
761 break; 1130rxvt_term::pointer_unblank ()
762 } 1131{
763 } 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
764} 1141}
765 1142
766#ifdef POINTER_BLANK 1143#ifdef POINTER_BLANK
767void 1144void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1145rxvt_term::pointer_blank ()
781{ 1146{
782 if (! (Options & Opt_pointerBlank)) 1147 if (! OPTION (Opt_pointerBlank))
783 return; 1148 return;
784 1149
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1150 XDefineCursor (display->display, vt, display->blank_cursor);
786 XFlush (display->display); 1151 XFlush (display->display);
787 1152
788 hidden_pointer = 1; 1153 hidden_pointer = 1;
789} 1154}
790 1155
… …
807 x = ev.x; 1172 x = ev.x;
808 y = ev.y; 1173 y = ev.y;
809 pixel_position (&x, &y); 1174 pixel_position (&x, &y);
810 1175
811 if (MEvent.button == AnyButton) 1176 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1177 button_number = 3;
814 }
815 else 1178 else
816 { 1179 {
817 button_number = MEvent.button - Button1; 1180 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1181 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1182 if (button_number >= 3)
820 button_number += (64 - 3); 1183 button_number += (64 - 3);
821 } 1184 }
822 1185
823 if (PrivateModes & PrivMode_MouseX10) 1186 if (priv_modes & PrivMode_MouseX10)
824 { 1187 {
825 /* 1188 /*
826 * do not report ButtonRelease 1189 * do not report ButtonRelease
827 * no state info allowed 1190 * no state info allowed
828 */ 1191 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1206 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1207 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1208#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1209 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1210#endif
848
849 } 1211 }
850 1212
851#ifdef DEBUG_MOUSEREPORT 1213#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1214 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1215 if (key_state & 16)
854 fputc ('C', stderr); 1216 fputc ('C', stderr);
855 if (key_state & 4) 1217 if (key_state & 4)
856 fputc ('S', stderr); 1218 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1222 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1223 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1224 button_number,
863 x + 1, 1225 x + 1,
864 y + 1); 1226 y + 1);
865#else 1227#endif
1228
866 tt_printf ("\033[M%c%c%c", 1229 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1230 (32 + button_number + key_state),
868 (32 + x + 1), 1231 (32 + x + 1),
869 (32 + y + 1)); 1232 (32 + y + 1));
870#endif
871} 1233}
872 1234
873#ifdef USING_W11LIB 1235#ifdef USING_W11LIB
874void 1236void
875rxvt_W11_process_x_event (XEvent *ev) 1237rxvt_W11_process_x_event (XEvent *ev)
… …
882 1244
883/*{{{ process an X event */ 1245/*{{{ process an X event */
884void 1246void
885rxvt_term::x_cb (XEvent &ev) 1247rxvt_term::x_cb (XEvent &ev)
886{ 1248{
1249 dDisp;
1250
887 SET_R (this); 1251 SET_R (this);
888 SET_LOCALE (locale); 1252 SET_LOCALE (locale);
889 1253
890#if defined(CURSOR_BLINK) 1254#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
892 { 1256 {
893 if (hidden_cursor) 1257 if (hidden_cursor)
894 { 1258 {
895 hidden_cursor = 0; 1259 hidden_cursor = 0;
896 want_refresh = 1; 1260 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1264 }
901#endif 1265#endif
902 1266
903#if defined(POINTER_BLANK) 1267#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1269 {
906 if (ev.type == MotionNotify 1270 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1271 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1272 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1273 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1276 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1277 pointer_blank ();
914 } 1278 }
915#endif 1279#endif
916 1280
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1281 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1282 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1283 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 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));
973#endif
974 1284
975 switch (ev.type) 1285 switch (ev.type)
976 { 1286 {
977 case KeyPress: 1287 case KeyPress:
1288#if ISO_14755
1289 if (!(iso14755buf & ISO_14755_52))
1290#endif
978 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;
979 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
980 1356
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1357#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 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)
985 mouse_slip_wheel_speed = 0; 1361 mouse_slip_wheel_speed = 0;
986 else 1362#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1363 break;
995 } 1364 }
996#endif
997 1365
998 case ButtonPress: 1366 case ButtonPress:
999 button_press (ev.xbutton); 1367 button_press (ev.xbutton);
1000 break; 1368 break;
1001 1369
… …
1003 button_release (ev.xbutton); 1371 button_release (ev.xbutton);
1004 break; 1372 break;
1005 1373
1006 case ClientMessage: 1374 case ClientMessage:
1007 if (ev.xclient.format == 32 1375 if (ev.xclient.format == 32
1376 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1377 {
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1378 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1009 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
1010#ifdef OFFIX_DND 1396#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */ 1397 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1398 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile 1399 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1400 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1401 || ev.xclient.data.l[0] == DndLink))
1016 { 1402 {
1017 /* Get Dnd data */ 1403 /* Get Dnd data */
1018 Atom ActualType; 1404 Atom ActualType;
1019 int ActualFormat; 1405 int ActualFormat;
1020 unsigned char *data; 1406 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1407 unsigned long Size, RemainingBytes;
1022 1408
1023 XGetWindowProperty (display->display, display->root, 1409 XGetWindowProperty (disp, display->root,
1024 xa[XA_DNDSELECTION], 1410 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1411 0L, 1000000L,
1026 False, AnyPropertyType, 1412 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1413 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1414 &Size, &RemainingBytes,
1029 &data); 1415 &data);
1030 XChangeProperty (display->display, display->root, 1416 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1417 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1418 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1419 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1036 } 1420 }
1037#endif /* OFFIX_DND */ 1421#endif /* OFFIX_DND */
1038 break; 1422 break;
1039 1423
1040 case MappingNotify: 1424 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1425 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1426 break;
1043 1427
1044 /* 1428 /*
1045 * XXX: this is not the _current_ arrangement 1429 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1430 * Here's my conclusion:
… …
1065 break; 1449 break;
1066 } 1450 }
1067 break; 1451 break;
1068 1452
1069 case FocusIn: 1453 case FocusIn:
1070 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])
1071 { 1463 {
1072 TermWin.focus = 1; 1464 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1; 1465 ;
1074#ifdef USE_XIM
1075 if (Input_Context != NULL)
1076 XSetICFocus (Input_Context);
1077#endif
1078#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif
1082 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
1083 } 1477 }
1084 break; 1478 break;
1085 1479
1086 case FocusOut:
1087 if (TermWin.focus)
1088 {
1089 TermWin.focus = 0;
1090 want_refresh = 1;
1091#ifdef USE_XIM
1092 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context);
1094#endif
1095#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop ();
1098 hidden_cursor = 0;
1099#endif
1100
1101 }
1102 break;
1103
1104 case ConfigureNotify: 1480 case PropertyNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1481 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1106 { 1482 && ev.xproperty.state == PropertyNewValue)
1107 int height, width; 1483 selection_property (ev.xproperty.window, ev.xproperty.atom);
1108 1484
1109 do
1110 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116
1117 if (szHint.width != width || szHint.height != height)
1118 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1120 resize_all_windows (width, height, 1);
1121 }
1122#ifdef DEBUG_SIZE
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent)
1130 {
1131 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif
1136 }
1137 break; 1485 break;
1138 1486
1139 case SelectionClear: 1487 case SelectionClear:
1140 selection_clear (); 1488 selection_clear ();
1141 break; 1489 break;
1142 1490
1143 case SelectionNotify: 1491 case SelectionNotify:
1144 if (selection_wait == Sel_normal) 1492 if (selection_wait == Sel_normal)
1145 selection_paste (ev.xselection.requestor, 1493 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1146 ev.xselection.property, True);
1147 break; 1494 break;
1148 1495
1149 case SelectionRequest: 1496 case SelectionRequest:
1150 selection_send (ev.xselectionrequest); 1497 selection_send (ev.xselectionrequest);
1151 break; 1498 break;
1152 1499
1153 case UnmapNotify: 1500 case UnmapNotify:
1154 TermWin.mapped = 0; 1501 mapped = 0;
1155#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1156 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1157#endif 1504#endif
1158 break; 1505 break;
1159 1506
1160 case MapNotify: 1507 case MapNotify:
1161 TermWin.mapped = 1; 1508 mapped = 1;
1162#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1163 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1164#endif 1511#endif
1165 break; 1512 break;
1166 1513
… …
1170 break; 1517 break;
1171#endif /* TRANSPARENT */ 1518#endif /* TRANSPARENT */
1172 1519
1173 case GraphicsExpose: 1520 case GraphicsExpose:
1174 case Expose: 1521 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1522 if (ev.xany.window == vt)
1176 { 1523 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1524 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1181 // 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))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1534
1185 // ev.xexpose.width, TermWin.height, False); 1535 scr_refresh (refresh_type);
1186#endif
1187 want_refresh = 1;
1188 } 1536 }
1189 else 1537 else
1190 { 1538 {
1191 XEvent unused_event; 1539 XEvent unused_event;
1192 1540
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1194 Expose, 1542 ;
1195 &unused_event)) ; 1543 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1544 ;
1197 GraphicsExpose, 1545
1198 &unused_event)) ;
1199 if (isScrollbarWindow (ev.xany.window)) 1546 if (isScrollbarWindow (ev.xany.window))
1200 { 1547 {
1201 scrollBar.setIdle (); 1548 scrollBar.setIdle ();
1202 scrollbar_show (0); 1549 scrollbar_show (0);
1203 } 1550 }
1204#ifdef MENUBAR 1551#ifdef MENUBAR
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1552 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206 menubar_expose (); 1553 menubar_expose ();
1207#endif 1554#endif
1555
1556#ifdef TRANSPARENT
1557 if (am_transparent && ev.xany.window == parent[0])
1558 XClearWindow (disp, ev.xany.window);
1559#endif
1208 } 1560 }
1209 break; 1561 break;
1210 1562
1211 case MotionNotify: 1563 case MotionNotify:
1212#ifdef POINTER_BLANK 1564#ifdef POINTER_BLANK
… …
1218 { 1570 {
1219 menubar_control (ev.xbutton); 1571 menubar_control (ev.xbutton);
1220 break; 1572 break;
1221 } 1573 }
1222#endif 1574#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1224 break; 1576 break;
1225 1577
1226 if (ev.xany.window == TermWin.vt) 1578 if (ev.xany.window == vt)
1227 { 1579 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1580 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1581 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1231 ; 1583 ;
1232 1584
1233 XQueryPointer (display->display, TermWin.vt, 1585 XQueryPointer (disp, vt,
1234 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1588 &ev.xbutton.x, &ev.xbutton.y,
1237 &unused_mask); 1589 &ev.xbutton.state);
1238#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1591 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1592 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1593 {
1242#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
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1603 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1604 ev.xbutton.state & Button3Mask ? 2 : 0);
1605
1245#ifdef SELECTION_SCROLLING 1606#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1607 if (ev.xbutton.y < int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1608 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1248 { 1609 {
1249 int dist; 1610 int dist;
1250
1251 pending_scroll_selection=1;
1252 1611
1253 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1255 */ 1614 */
1256 if (scroll_selection_delay<=0) 1615 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1616 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1617
1259 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1261 */ 1620 */
1262 selection_save_x=ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1622 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1623 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1624
1267 /* calc number of lines to scroll */ 1625 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1626 if (ev.xbutton.y < int_bwidth)
1269 { 1627 {
1270 scroll_selection_dir = UP; 1628 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1629 dist = int_bwidth - ev.xbutton.y;
1272 } 1630 }
1273 else 1631 else
1274 { 1632 {
1275 scroll_selection_dir = DN; 1633 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y - 1634 dist = ev.xbutton.y - (int_bwidth + height);
1277 (TermWin.int_bwidth + TermWin.height);
1278 } 1635 }
1636
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1637 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1638 / SELECTION_SCROLL_LINE_SPEEDUP
1639 + 1;
1281 MIN_IT (scroll_selection_lines, 1640 min_it (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1641 SELECTION_SCROLL_MAX_LINES);
1283 } 1642 }
1284 else 1643 else
1285 { 1644 {
1286 /* we are within the text window, so we 1645 /* we are within the text window, so we
1287 * shouldn't be scrolling 1646 * shouldn't be scrolling
1288 */ 1647 */
1289 pending_scroll_selection = 0; 1648 if (sel_scroll_ev.active)
1649 sel_scroll_ev.stop();
1290 } 1650 }
1291#endif 1651#endif
1292#ifdef MOUSE_THRESHOLD 1652#ifdef MOUSE_THRESHOLD
1293
1294 } 1653 }
1295#endif 1654#endif
1296
1297 } 1655 }
1298 } 1656 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1658 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1659 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1302 MotionNotify, &ev)) ; 1660 MotionNotify, &ev))
1661 ;
1662
1303 XQueryPointer (display->display, scrollBar.win, 1663 XQueryPointer (disp, scrollBar.win,
1304 &unused_root, &unused_child, 1664 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1665 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1666 &ev.xbutton.x, &ev.xbutton.y,
1307 &unused_mask); 1667 &unused_mask);
1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1309 scrollbar_size ()); 1669 scrollbar_size ());
1310 scr_refresh (refresh_type); 1670 scr_refresh (refresh_type);
1311 refresh_limit = 0; 1671 refresh_limit = 0;
… …
1314 break; 1674 break;
1315 } 1675 }
1316} 1676}
1317 1677
1318void 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
1319rxvt_term::rootwin_cb (XEvent &ev) 1741rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1742{
1321 SET_R (this); 1743 SET_R (this);
1322 SET_LOCALE (locale); 1744 SET_LOCALE (locale);
1323 1745
1324 switch (ev.type) 1746 switch (ev.type)
1325 { 1747 {
1326 case PropertyNotify: 1748 case PropertyNotify:
1327 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1328 {
1329 if (ev.xproperty.state == PropertyNewValue)
1330 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 break;
1332 }
1333#ifdef TRANSPARENT
1334 else
1335 {
1336 /* 1749 /*
1337 * 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,
1338 * 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.
1339 */ 1752 */
1340 if (xa[XA_XROOTPMAPID] == 0)
1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1342
1343 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])
1344 return; 1755 return;
1345 }
1346 1756
1347 /* FALLTHROUGH */ 1757 /* FALLTHROUGH */
1348 case ReparentNotify: 1758 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1759 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1; 1760 want_refresh = want_full_refresh = 1;
1351 break; 1761 break;
1352#endif
1353 } 1762 }
1354} 1763}
1764#endif
1355 1765
1356void 1766void
1357rxvt_term::button_press (XButtonEvent &ev) 1767rxvt_term::button_press (XButtonEvent &ev)
1358{ 1768{
1359 int reportmode = 0, clickintime; 1769 int reportmode = 0, clickintime;
1360 1770
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1771 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1362 if (!bypass_keystate) 1772 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1773 reportmode = !! (priv_modes & PrivMode_mouse_report);
1774
1364 /* 1775 /*
1365 * VT window processing of button press 1776 * VT window processing of button press
1366 */ 1777 */
1367 if (ev.window == TermWin.vt) 1778 if (ev.window == vt)
1368 { 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
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1789 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1790
1370 if (reportmode) 1791 if (reportmode)
1371 { 1792 {
1372 /* mouse report from vt window */ 1793 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1794 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state; 1795 MEvent.state = ev.state;
… …
1403 } 1824 }
1404 else 1825 else
1405 { 1826 {
1406 if (ev.button != MEvent.button) 1827 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1828 MEvent.clicks = 0;
1829
1408 switch (ev.button) 1830 switch (ev.button)
1409 { 1831 {
1410 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
1411 /* allow shift+left click to extend selection */ 1841 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1842 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1413 { 1843 {
1414 if (MEvent.button == Button1 && clickintime) 1844 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1845 selection_rotate (ev.x, ev.y);
1416 else 1846 else
1417 selection_extend (ev.x, ev.y, 1); 1847 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1862 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1863 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1864 selection_rotate (ev.x, ev.y);
1435 else 1865 else
1436 selection_extend (ev.x, ev.y, 1); 1866 selection_extend (ev.x, ev.y, 1);
1867
1437 MEvent.button = Button3; 1868 MEvent.button = Button3;
1438 break; 1869 break;
1439 } 1870 }
1440 } 1871 }
1872
1441 MEvent.time = ev.time; 1873 MEvent.time = ev.time;
1442 return; 1874 return;
1443 } 1875 }
1444 1876
1445 /* 1877 /*
… …
1511 upordown = 1; /* down */ 1943 upordown = 1; /* down */
1512 } 1944 }
1513 if (upordown) 1945 if (upordown)
1514 { 1946 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1947#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1948 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 1949#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 1950 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 1951 {
1520 if (upordown < 0) 1952 if (upordown < 0)
1521 scrollBar.setUp (); 1953 scrollBar.setUp ();
… …
1537 break; 1969 break;
1538 case R_SB_ALIGN_BOTTOM: 1970 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 1971 csrO = scrollBar.bot - scrollBar.top;
1540 break; 1972 break;
1541 } 1973 }
1974
1542 if (scrollBar.style == R_SB_XTERM 1975 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 1976 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 1977 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 1978 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 1979
1547 scrollBar.setMotion (); 1980 scrollBar.setMotion ();
1548 break; 1981 break;
1549 1982
1550 case Button1: 1983 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1984 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1555 case Button3: 1988 case Button3:
1556 if (scrollBar.style != R_SB_XTERM) 1989 if (scrollBar.style != R_SB_XTERM)
1557 { 1990 {
1558 if (scrollbar_above_slider (ev.y)) 1991 if (scrollbar_above_slider (ev.y))
1559# ifdef RXVT_SCROLL_FULL 1992# ifdef RXVT_SCROLL_FULL
1560 scr_page (UP, TermWin.nrow - 1); 1993 scr_page (UP, nrow - 1);
1561# else 1994# else
1562 scr_page (UP, TermWin.nrow / 4); 1995 scr_page (UP, nrow / 4);
1563# endif 1996# endif
1564 else if (scrollbar_below_slider (ev.y)) 1997 else if (scrollbar_below_slider (ev.y))
1565# ifdef RXVT_SCROLL_FULL 1998# ifdef RXVT_SCROLL_FULL
1566 scr_page (DN, TermWin.nrow - 1); 1999 scr_page (DN, nrow - 1);
1567# else 2000# else
1568 scr_page (DN, TermWin.nrow / 4); 2001 scr_page (DN, nrow / 4);
1569# endif 2002# endif
1570 else 2003 else
1571 scrollBar.setMotion (); 2004 scrollBar.setMotion ();
1572 } 2005 }
1573 else 2006 else
1574 { 2007 {
1575 scr_page ((ev.button == Button1 ? DN : UP), 2008 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 2009 (nrow
1577 * scrollbar_position (ev.y) 2010 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 2011 / scrollbar_size ()));
1579 } 2012 }
2013
1580 break; 2014 break;
1581 } 2015 }
1582 } 2016 }
1583 return; 2017 return;
1584 } 2018 }
… …
1596{ 2030{
1597 int reportmode = 0; 2031 int reportmode = 0;
1598 2032
1599 csrO = 0; /* reset csr Offset */ 2033 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 2034 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2035 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 2036
1603 if (scrollbar_isUpDn ()) 2037 if (scrollbar_isUpDn ())
1604 { 2038 {
1605 scrollBar.setIdle (); 2039 scrollBar.setIdle ();
1606 scrollbar_show (0); 2040 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2041#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH; 2042 refresh_type &= ~SMOOTH_REFRESH;
1609#endif 2043#endif
1610
1611 } 2044 }
2045
1612#ifdef SELECTION_SCROLLING 2046#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 2047 if (sel_scroll_ev.active)
2048 sel_scroll_ev.stop();
1614#endif 2049#endif
2050
1615 if (ev.window == TermWin.vt) 2051 if (ev.window == vt)
1616 { 2052 {
2053#if ISO_14755
2054 // 5.4
2055 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2056 return;
2057#endif
1617 if (reportmode) 2058 if (reportmode)
1618 { 2059 {
1619 /* mouse report from vt window */ 2060 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 2061 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 2062 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 2076 MEvent.button = AnyButton;
1636 mouse_report (ev); 2077 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 2078#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 2079 return;
1639 } 2080 }
2081
1640 /* 2082 /*
1641 * dumb hack to compensate for the failure of click-and-drag 2083 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 2084 * when overriding mouse reporting
1643 */ 2085 */
1644 if (PrivateModes & PrivMode_mouse_report 2086 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2087 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2088 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2089 selection_extend (ev.x, ev.y, 0);
1648 2090
1649 switch (ev.button) 2091 switch (ev.button)
… …
1660 case Button5: 2102 case Button5:
1661 { 2103 {
1662 int i; 2104 int i;
1663 page_dirn v; 2105 page_dirn v;
1664 2106
1665 v = (ev.button == Button4) ? UP : DN; 2107 v = ev.button == Button4 ? UP : DN;
2108
1666 if (ev.state & ShiftMask) 2109 if (ev.state & ShiftMask)
1667 i = 1; 2110 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2111 else if (OPTION (Opt_mouseWheelScrollPage))
1669 i = TermWin.nrow - 1; 2112 i = nrow - 1;
1670 else 2113 else
1671 i = 5; 2114 i = 5;
2115
1672# ifdef MOUSE_SLIP_WHEELING 2116# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2117 if (ev.state & ControlMask)
1674 { 2118 {
1675 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)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2124 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2125
2126 slip_wheel_ev.start ();
1677 } 2127 }
2128 else
2129 {
1678# endif 2130# endif
1679# ifdef JUMP_MOUSE_WHEEL 2131# ifdef JUMP_MOUSE_WHEEL
1680 scr_page (v, i);
1681 scr_refresh (SMOOTH_REFRESH);
1682 scrollbar_show (1);
1683# else
1684 while (i--)
1685 {
1686 scr_page (v, 1); 2132 scr_page (v, i);
1687 scr_refresh (SMOOTH_REFRESH); 2133 scr_refresh (SMOOTH_REFRESH);
1688 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
1689 } 2144 }
1690# endif 2145#endif
1691
1692 } 2146 }
1693 break; 2147 break;
1694#endif 2148#endif
1695
1696 } 2149 }
1697 } 2150 }
1698#ifdef MENUBAR 2151#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window)) 2152 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev); 2153 menubar_control (ev);
1701#endif 2154#endif
1702} 2155}
1703 2156
1704#ifdef TRANSPARENT 2157#ifdef TRANSPARENT
1705#if TINTING 2158#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2159/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2160
1709static void 2161typedef uint32_t RUINT32T;
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714 2162
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2163void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2164{
1717 /* No saturation */ 2165 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2166 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2167 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 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;
1721 2171
1722 b = ((uint16_t *) ptr)[x]; 2172 Visual *visual = display->visual;
1723 r = (b & 0x7c00) * rm; 2173
1724 g = (b & 0x3e0) * gm; 2174 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2175
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2176 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2177 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2178 mask_g = visual->green_mask;
1729 } 2179 mask_b = visual->blue_mask;
1730 ptr += bpl; 2180
1731 } 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;
1732 } else { 2254 } else {
1733 for (y = h; --y >= 0;) { 2255 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2256 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2257
1737 b = ((uint16_t *) ptr)[x]; 2258 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2259
1739 g = (b & 0x3e0) * gm; 2260 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2261 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2262 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2263 }
1743 b |= (!(b >> 5) - 1); 2264
1744 ((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 */
1745 | ((g >> 8) & 0x3e0) 2266 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2267 {
1747 } 2268 unsigned int tmp;
1748 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++)
1749 } 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);
1750 } 2321 }
1751} 2322 break;
1752 2323 }
1753/* RGB 16 */ 2324 case 16:
1754static void 2325 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2326 unsigned short *p1, *pf, *p, *pl;
1756{ 2327 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2328 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2329 while (p1 < pf)
1759 2330 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2331 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2332 pl = p1 + srcImage->width;
1762 /* No saturation */ 2333 for (; p < pl; p++)
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 } 2334 {
1777 } else { 2335 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2336 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2337 lookup_b[(*p & 0x001f)];
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 } 2338 }
1793 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)
1794 } 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);
1795 } 2359 }
1796} 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);
1797 2367
1798/* RGB 24 */ 2368 while (p1 < pf)
1799static void 2369 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2370 p = p1;
1801{ 2371 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2372 for (; p < pl; p++)
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1826 }
1827 }
1828 ptr += bpl;
1829 } 2373 {
1830 } else { 2374 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2375 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2376 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2377 (*p & ~0xffffff);
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1860 } 2378 }
1861 ptr += bpl; 2379 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2380 }
2381 break;
2382 }
1863 } 2383 }
1864}
1865 2384
1866/* RGB 32 */ 2385 free (lookup);
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1872
1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936} 2386}
1937
1938#endif 2387#endif
1939 2388
1940/* 2389/*
1941 * Check our parents are still who we think they are. 2390 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2391 * Do transparency updates if required
… …
1949 Atom atype; 2398 Atom atype;
1950 unsigned char *prop = NULL; 2399 unsigned char *prop = NULL;
1951 Window root, oldp, *list; 2400 Window root, oldp, *list;
1952 Pixmap rootpixmap = None; 2401 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2402 XWindowAttributes wattr, wrootattr;
2403 dDisp;
1954 2404
1955 pchanged = 0; 2405 pchanged = 0;
1956 2406
1957 if (!(Options & Opt_transparent)) 2407 if (!OPTION (Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2408 return pchanged; /* Don't try any more */
1959 2409
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2410 XGetWindowAttributes (disp, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2411 rootdepth = wrootattr.depth;
1962 2412
1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2413 XGetWindowAttributes (disp, parent[0], &wattr);
1964 2414
1965 if (rootdepth != wattr.depth) 2415 if (rootdepth != wattr.depth)
1966 { 2416 {
1967 if (am_transparent) 2417 if (am_transparent)
1968 { 2418 {
1969 pchanged = 1; 2419 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2420 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2421 am_transparent = am_pixmap_trans = 0;
1972 } 2422 }
1973 2423
1974 return pchanged; /* Don't try any more */ 2424 return pchanged; /* Don't try any more */
1975 } 2425 }
1976 2426
1977 /* 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. */
1978 XSync (display->display, False); 2428 XSync (disp, False);
1979 2429
1980 /* 2430 /*
1981 * Make the frame window set by the window manager have 2431 * Make the frame window set by the window manager have
1982 * the root background. Some window managers put multiple nested frame 2432 * the root background. Some window managers put multiple nested frame
1983 * 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.
1984 */ 2434 */
1985 i = (xa[XA_XROOTPMAPID] 2435 i = (xa[XA_XROOTPMAP_ID]
1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2436 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2437 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1988 &nitems, &bytes_after, &prop) == Success); 2438 &nitems, &bytes_after, &prop) == Success);
1989 2439
1990 if (!i || prop == NULL) 2440 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID] 2441 i = (xa[XA_ESETROOT_PMAP_ID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2442 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2443 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2444 &nitems, &bytes_after, &prop) == Success);
1995 2445
1996 if (!i || prop == NULL) 2446 if (!i || prop == NULL
2447#if TINTING
2448 || !rs[Rs_color + Color_tint]
2449#endif
2450 )
1997 have_pixmap = 0; 2451 have_pixmap = 0;
1998 else 2452 else
1999 { 2453 {
2000 have_pixmap = 1; 2454 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2455 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2456 XFree (prop);
2003 } 2457 }
2004 2458
2005 if (have_pixmap) 2459 if (have_pixmap)
2006 { 2460 {
… …
2012 Window cr; 2466 Window cr;
2013 XImage *image; 2467 XImage *image;
2014 GC gc; 2468 GC gc;
2015 XGCValues gcvalue; 2469 XGCValues gcvalue;
2016 2470
2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2471 XTranslateCoordinates (disp, parent[0], display->root,
2018 0, 0, &sx, &sy, &cr); 2472 0, 0, &sx, &sy, &cr);
2019 nw = (unsigned int)szHint.width; 2473 nw = (unsigned int)szHint.width;
2020 nh = (unsigned int)szHint.height; 2474 nh = (unsigned int)szHint.height;
2021 nx = ny = 0; 2475 nx = ny = 0;
2022 2476
… …
2032 nh += sy; 2486 nh += sy;
2033 ny = -sy; 2487 ny = -sy;
2034 sy = 0; 2488 sy = 0;
2035 } 2489 }
2036 2490
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2491 min_it (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2492 min_it (nh, (unsigned int) (wrootattr.height - sy));
2493
2494 XSync (disp, False);
2039 allowedxerror = -1; 2495 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2496 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 2497
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2498 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2499 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 2500 allowedxerror = 0;
2045 2501
2046 if (image == NULL) 2502 if (image == NULL)
2047 { 2503 {
2048 if (am_transparent && am_pixmap_trans) 2504 if (am_transparent && am_pixmap_trans)
2049 { 2505 {
2050 pchanged = 1; 2506 pchanged = 1;
2051 if (TermWin.pixmap != None) 2507 if (pixmap != None)
2052 { 2508 {
2053 XFreePixmap (display->display, TermWin.pixmap); 2509 XFreePixmap (disp, pixmap);
2054 TermWin.pixmap = None; 2510 pixmap = None;
2055 } 2511 }
2056 } 2512 }
2057 2513
2058 am_pixmap_trans = 0; 2514 am_pixmap_trans = 0;
2059 } 2515 }
2060 else 2516 else
2061 { 2517 {
2062 if (TermWin.pixmap != None) 2518 if (pixmap != None)
2063 XFreePixmap (display->display, TermWin.pixmap); 2519 XFreePixmap (disp, pixmap);
2064 2520
2065#if TINTING 2521#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2522 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2523 {
2068 unsigned short shade, rm, gm, bm; 2524 unsigned short rm, gm, bm;
2525 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2526
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2527 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2071 2528
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2529 ShadeXImage (display, image, shade, rm, gm, bm);
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 } 2530 }
2083#endif 2531#endif
2084 2532
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2533 pixmap = XCreatePixmap (disp, vt,
2086 szHint.width, szHint.height, image->depth); 2534 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2535 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2536 XPutImage (disp, pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2537 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2538 XFreeGC (disp, gc);
2091 XDestroyImage (image); 2539 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2540 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2093 TermWin.pixmap); 2541 XClearWindow (disp, parent[0]);
2094 2542
2095 if (!am_transparent || !am_pixmap_trans) 2543 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2544 pchanged = 1;
2097 2545
2098 am_transparent = am_pixmap_trans = 1; 2546 am_transparent = am_pixmap_trans = 1;
2099 } 2547 }
2100 } 2548 }
2101 2549
2102 if (!am_pixmap_trans) 2550 if (am_pixmap_trans)
2551 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2552 else
2103 { 2553 {
2104 unsigned int n; 2554 unsigned int n;
2105 /* 2555 /*
2106 * InheritPixmap transparency 2556 * InheritPixmap transparency
2107 */ 2557 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2558 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2110 { 2559 {
2111 oldp = TermWin.parent[i]; 2560 oldp = parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2561 XQueryTree (disp, parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n); 2562 &parent[i], &list, &n);
2114 XFree (list); 2563 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2564
2117 if (TermWin.parent[i] == display->root) 2565 if (parent[i] == display->root)
2118 { 2566 {
2119 if (oldp != None) 2567 if (oldp != None)
2120 pchanged = 1; 2568 pchanged = 1;
2121 2569
2122 break; 2570 break;
2123 } 2571 }
2124 2572
2125 if (oldp != TermWin.parent[i]) 2573 if (oldp != parent[i])
2126 pchanged = 1; 2574 pchanged = 1;
2127 } 2575 }
2128 2576
2129 n = 0; 2577 n = 0;
2130 2578
2131 if (pchanged) 2579 if (pchanged)
2132 { 2580 {
2133 for (; n < (unsigned int)i; n++) 2581 for (; n < (unsigned int)i; n++)
2134 { 2582 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2583 XGetWindowAttributes (disp, parent[n], &wattr);
2136 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2137 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2584 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2585 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2586 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2140 break; 2587 break;
2141 } 2588 }
2142 } 2589 }
2143 } 2590 }
2144 2591
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2592 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2146 { 2593 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2594 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2595 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2596 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2597 /* XXX: also turn off Opt_transparent? */
2152 } 2598 }
2153 else 2599 else
2154 { 2600 {
2155#if WAIT_FOR_WM 2601#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing 2602 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */ 2603 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1); 2604 sleep (1);
2159#endif 2605#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2606 for (n = 0; n < (unsigned int)i; n++)
2607 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2609 XClearWindow (disp, parent[n]);
2610 }
2163 2611
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2612 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2165 am_transparent = 1; 2613 am_transparent = 1;
2166 } 2614 }
2167 2615
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2616 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2169 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 ();
2170 } 2632 }
2171 2633
2172 return pchanged; 2634 return pchanged;
2173} 2635}
2174#endif 2636#endif
… …
2191 } 2653 }
2192 2654
2193 if (ch == NOCHAR) // TODO: improve 2655 if (ch == NOCHAR) // TODO: improve
2194 break; 2656 break;
2195 2657
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2658 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2659 {
2660 if (!seen_input)
2197 { 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
2198 /* Read a text string from the input buffer */ 2674 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2675 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2676 bool refreshnow = false;
2201 int nlines = 0; 2677 int nlines = 0;
2202 unicode_t *str = buf; 2678 unicode_t *str = buf;
2203 2679 unicode_t *eol = str + min (ncol, UBUFSIZ);
2204 *str++ = ch;
2205 2680
2206 for (;;) 2681 for (;;)
2207 { 2682 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2683 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212 break; 2684 break;
2213 2685
2214 *str++ = ch; 2686 *str++ = ch;
2215 2687
2216 if (ch == '\n') 2688 if (ch == C0_LF || str >= eol)
2217 { 2689 {
2690 if (ch == C0_LF)
2218 nlines++; 2691 nlines++;
2692
2219 refresh_count++; 2693 refresh_count++;
2220 2694
2221 if (! (Options & Opt_jumpScroll) 2695 if (!OPTION (Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2696 || (refresh_count >= refresh_limit * (nrow - 1)))
2223 { 2697 {
2224 refreshnow = true; 2698 refreshnow = true;
2225 flag = true; 2699 refresh_count = 0;
2226 ch = NOCHAR; 2700 ch = NOCHAR;
2227 break; 2701 break;
2228 } 2702 }
2229 2703
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2704 // scr_add_lines only works for nlines <= nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2705 if (nlines >= nrow - 1)
2232 { 2706 {
2233 scr_add_lines (buf, nlines, str - buf); 2707 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0; 2708 nlines = 0;
2235 str = buf; 2709 str = buf;
2710 eol = str + min (ncol, UBUFSIZ);
2236 } 2711 }
2712
2713 if (str >= eol)
2714 {
2715 if (eol >= buf + UBUFSIZ)
2716 {
2717 ch = NOCHAR;
2718 break;
2719 }
2720 else
2721 eol = min (eol + ncol, buf + UBUFSIZ);
2722 }
2723
2237 } 2724 }
2238 2725
2239 if (str >= buf + UBUFSIZ) 2726 seq_begin = cmdbuf_ptr;
2240 { 2727 ch = next_char ();
2241 ch = NOCHAR;
2242 break;
2243 }
2244 } 2728 }
2245 2729
2246 scr_add_lines (buf, nlines, str - buf); 2730 scr_add_lines (buf, nlines, str - buf);
2247 2731
2248 /* 2732 /*
2249 * If there have been a lot of new lines, then update the screen 2733 * If there have been a lot of new lines, then update the screen
2250 * What the heck I'll cheat and only refresh less than every page-full. 2734 * What the heck I'll cheat and only refresh less than every page-full.
2251 * the number of pages between refreshes is refresh_limit, which 2735 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2736 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */ 2737 */
2257 if (refreshnow) 2738 if (refreshnow)
2258 { 2739 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2740 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2741 refresh_limit++;
2261 2742 else
2743 {
2744 flag = true;
2262 scr_refresh (refresh_type); 2745 scr_refresh (refresh_type);
2746 flush_ev.stop ();
2747 }
2263 } 2748 }
2264 2749
2265 } 2750 }
2266 else 2751 else
2267 { 2752 {
… …
2281 } 2766 }
2282 2767
2283 return flag; 2768 return flag;
2284} 2769}
2285 2770
2771// read the next octet
2772unicode_t
2773rxvt_term::next_octet ()
2774{
2775 return cmdbuf_ptr < cmdbuf_endp
2776 ? *cmdbuf_ptr++
2777 : NOCHAR;
2778}
2779
2286// read the next character 2780// read the next character
2287unicode_t 2781unicode_t
2288rxvt_term::next_char () 2782rxvt_term::next_char ()
2289{ 2783{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2784 while (cmdbuf_ptr < cmdbuf_endp)
… …
2306 if (len == (size_t)-1) 2800 if (len == (size_t)-1)
2307 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2801 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2308 2802
2309 // assume wchar == unicode 2803 // assume wchar == unicode
2310 cmdbuf_ptr += len; 2804 cmdbuf_ptr += len;
2311 return wc; 2805 return wc & UNICODE_MASK;
2312 } 2806 }
2313 2807
2314 return NOCHAR; 2808 return NOCHAR;
2315} 2809}
2316 2810
… …
2321 */ 2815 */
2322unicode_t 2816unicode_t
2323rxvt_term::cmd_getc () 2817rxvt_term::cmd_getc ()
2324{ 2818{
2325 unicode_t c = next_char (); 2819 unicode_t c = next_char ();
2820
2821 if (c == NOCHAR)
2822 throw out_of_input;
2823
2824 return c;
2825}
2826
2827unicode_t
2828rxvt_term::cmd_get8 ()
2829{
2830 unicode_t c = next_octet ();
2326 2831
2327 if (c == NOCHAR) 2832 if (c == NOCHAR)
2328 throw out_of_input; 2833 throw out_of_input;
2329 2834
2330 return c; 2835 return c;
… …
2431 process_escape_seq (); 2936 process_escape_seq ();
2432 break; 2937 break;
2433 case C0_ENQ: /* terminal Status */ 2938 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2939 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2940 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2941 (unsigned int)strlen (rs[Rs_answerbackstring]));
2437 else 2942 else
2438 tt_write ((unsigned char *)VT100_ANS, 2943 tt_write ((unsigned char *)VT100_ANS,
2439 (unsigned int)STRLEN (VT100_ANS)); 2944 (unsigned int)strlen (VT100_ANS));
2440 break; 2945 break;
2441 case C0_BEL: /* bell */ 2946 case C0_BEL: /* bell */
2442 scr_bell (); 2947 scr_bell ();
2443 break; 2948 break;
2444 case C0_BS: /* backspace */ 2949 case C0_BS: /* backspace */
… …
2460 break; 2965 break;
2461 case C0_SI: /* shift in - acs */ 2966 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2967 scr_charset_choose (0);
2463 break; 2968 break;
2464 2969
2970#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2971 // 8-bit controls
2466 case 0x90: /* DCS */ 2972 case 0x90: /* DCS */
2467 process_dcs_seq (); 2973 process_dcs_seq ();
2468 break; 2974 break;
2469 case 0x9b: /* CSI */ 2975 case 0x9b: /* CSI */
2470 process_csi_seq (); 2976 process_csi_seq ();
2471 break; 2977 break;
2472 case 0x9d: /* CSI */ 2978 case 0x9d: /* CSI */
2473 process_osc_seq (); 2979 process_osc_seq ();
2474 break; 2980 break;
2981#endif
2475 } 2982 }
2476} 2983}
2477/*}}} */ 2984/*}}} */
2478 2985
2479 2986
… …
2541void 3048void
2542rxvt_term::process_escape_seq () 3049rxvt_term::process_escape_seq ()
2543{ 3050{
2544 unicode_t ch = cmd_getc (); 3051 unicode_t ch = cmd_getc ();
2545 3052
2546 if (PrivateModes & PrivMode_vt52) 3053 if (priv_modes & PrivMode_vt52)
2547 { 3054 {
2548 process_escape_vt52 (ch); 3055 process_escape_vt52 (ch);
2549 return; 3056 return;
2550 } 3057 }
2551 3058
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 3073 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 3074 break;
2568 case '+': 3075 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 3076 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 3077 break;
2571#ifndef NO_FRILLS 3078#if ENABLE_FRILLS
2572 case '6': 3079 case '6':
2573 scr_backindex (); 3080 scr_backindex ();
2574 break; 3081 break;
2575#endif 3082#endif
2576 case '7': 3083 case '7':
2577 scr_cursor (SAVE); 3084 scr_cursor (SAVE);
2578 break; 3085 break;
2579 case '8': 3086 case '8':
2580 scr_cursor (RESTORE); 3087 scr_cursor (RESTORE);
2581 break; 3088 break;
2582#ifndef NO_FRILLS 3089#if ENABLE_FRILLS
2583 case '9': 3090 case '9':
2584 scr_forwardindex (); 3091 scr_forwardindex ();
2585 break; 3092 break;
2586#endif 3093#endif
2587 case '=': 3094 case '=':
… …
2597 break; 3104 break;
2598 3105
2599 /* 8.3.87: NEXT LINE */ 3106 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 3107 case C1_NEL: /* ESC E */
2601 { 3108 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 3109 unicode_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 3110 scr_add_lines (nlcr, 1, 2);
2604 } 3111 }
2605 break; 3112 break;
2606 3113
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 3114 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2668 3175
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3176/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3177/* *INDENT-OFF* */
2671enum { 3178enum {
2672 CSI_ICH = 0x40, 3179 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3180 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2674 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3181 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2675 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3182 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2676 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3183 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2677 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3184 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2678 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3185 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2766 { 3273 {
2767 switch (priv) 3274 switch (priv)
2768 { 3275 {
2769 case '>': 3276 case '>':
2770 if (ch == CSI_DA) /* secondary device attributes */ 3277 if (ch == CSI_DA) /* secondary device attributes */
2771 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3278 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2772 break; 3279 break;
2773 case '?': 3280 case '?':
2774 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3281 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2775 process_terminal_mode (ch, priv, nargs, arg); 3282 process_terminal_mode (ch, priv, nargs, arg);
2776 break; 3283 break;
… …
2881 3388
2882 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3389 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2883 arg[0] = -arg[0]; 3390 arg[0] = -arg[0];
2884 /* FALLTHROUGH */ 3391 /* FALLTHROUGH */
2885 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3392 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3393 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2887 break; 3394 break;
2888 3395
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3396 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3397 tt_write ((const unsigned char *)VT100_ANS,
2891 (unsigned int) (sizeof (VT100_ANS) - 1)); 3398 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3399 break;
2893 3400
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3401 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3402 process_sgr_mode (nargs, arg);
2896 break; 3403 break;
… …
2903 break; 3410 break;
2904 case 6: /* CPR requested */ 3411 case 6: /* CPR requested */
2905 scr_report_position (); 3412 scr_report_position ();
2906 break; 3413 break;
2907 case 7: /* unofficial extension */ 3414 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3415 if (OPTION (Opt_insecure))
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3416 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3417 break;
2911 case 8: /* unofficial extension */ 3418 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3419 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3420 break;
2914 } 3421 }
… …
2950 break; 3457 break;
2951 3458
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3459 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3460 if (arg[0] == 4)
2954 scr_insert_mode (0); 3461 scr_insert_mode (0);
3462 else if (arg[0] == 20)
3463 priv_modes &= ~PrivMode_LFNL;
2955 break; 3464 break;
2956 3465
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3466 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3467 if (arg[0] == 4)
2959 scr_insert_mode (1); 3468 scr_insert_mode (1);
3469 else if (arg[0] == 20)
3470 priv_modes |= PrivMode_LFNL;
2960 break; 3471 break;
2961 3472
2962 /* 3473 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3474 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3475 */
… …
2976 break; 3487 break;
2977 case CSI_75: 3488 case CSI_75:
2978 scr_cursor (RESTORE); 3489 scr_cursor (RESTORE);
2979 break; 3490 break;
2980 3491
2981#ifndef NO_FRILLS 3492#if ENABLE_FRILLS
2982 case CSI_74: 3493 case CSI_74:
2983 process_window_ops (arg, nargs); 3494 process_window_ops (arg, nargs);
2984 break; 3495 break;
2985#endif 3496#endif
2986 3497
… …
2993 break; 3504 break;
2994 } 3505 }
2995} 3506}
2996/*}}} */ 3507/*}}} */
2997 3508
2998#ifndef NO_FRILLS 3509#if ENABLE_FRILLS
2999/* ARGSUSED */ 3510/* ARGSUSED */
3000void 3511void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3512rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3513{
3003 int x, y; 3514 int x, y;
3004 XWindowAttributes wattr; 3515 XWindowAttributes wattr;
3005 Window wdummy; 3516 Window wdummy;
3517 dDisp;
3006 3518
3007 if (nargs == 0) 3519 if (nargs == 0)
3008 return; 3520 return;
3009 3521
3010 switch (args[0]) 3522 switch (args[0])
3011 { 3523 {
3012 /* 3524 /*
3013 * commands 3525 * commands
3014 */ 3526 */
3015 case 1: /* deiconify window */ 3527 case 1: /* deiconify window */
3016 XMapWindow (display->display, TermWin.parent[0]); 3528 XMapWindow (disp, parent[0]);
3017 break; 3529 break;
3018 case 2: /* iconify window */ 3530 case 2: /* iconify window */
3019 XIconifyWindow (display->display, TermWin.parent[0], 3531 XIconifyWindow (disp, parent[0], display->screen);
3020 DefaultScreen (display->display));
3021 break; 3532 break;
3022 case 3: /* set position (pixels) */ 3533 case 3: /* set position (pixels) */
3023 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3534 XMoveWindow (disp, parent[0], args[1], args[2]);
3024 break; 3535 break;
3025 case 4: /* set size (pixels) */ 3536 case 4: /* set size (pixels) */
3026 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3537 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3027 break; 3538 break;
3028 case 5: /* raise window */ 3539 case 5: /* raise window */
3029 XRaiseWindow (display->display, TermWin.parent[0]); 3540 XRaiseWindow (disp, parent[0]);
3030 break; 3541 break;
3031 case 6: /* lower window */ 3542 case 6: /* lower window */
3032 XLowerWindow (display->display, TermWin.parent[0]); 3543 XLowerWindow (disp, parent[0]);
3033 break; 3544 break;
3034 case 7: /* refresh window */ 3545 case 7: /* refresh window */
3035 scr_touch (true); 3546 scr_touch (true);
3036 break; 3547 break;
3037 case 8: /* set size (chars) */ 3548 case 8: /* set size (chars) */
3038 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3549 set_widthheight ((unsigned int) (args[2] * fwidth),
3039 (unsigned int) (args[1] * TermWin.fheight)); 3550 (unsigned int) (args[1] * fheight));
3040 break; 3551 break;
3041 3552
3042 //case 9: NYI, TODO, restore maximized window or maximize window 3553 //case 9: NYI, TODO, restore maximized window or maximize window
3043 default: 3554 default:
3044 if (args[0] >= 24) /* set height (chars) */ 3555 if (args[0] >= 24) /* set height (chars) */
3045 set_widthheight ((unsigned int)TermWin.width, 3556 set_widthheight ((unsigned int)width,
3046 (unsigned int) (args[1] * TermWin.fheight)); 3557 (unsigned int) (args[1] * fheight));
3047 break; 3558 break;
3048 3559
3049 3560
3050 /* 3561 /*
3051 * reports - some output format copied from XTerm 3562 * reports - some output format copied from XTerm
3052 */ 3563 */
3053 case 11: /* report window state */ 3564 case 11: /* report window state */
3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3565 XGetWindowAttributes (disp, parent[0], &wattr);
3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3566 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3056 break; 3567 break;
3057 case 13: /* report window position */ 3568 case 13: /* report window position */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3569 XGetWindowAttributes (disp, parent[0], &wattr);
3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3570 XTranslateCoordinates (disp, parent[0], wattr.root,
3060 -wattr.border_width, -wattr.border_width, 3571 -wattr.border_width, -wattr.border_width,
3061 &x, &y, &wdummy); 3572 &x, &y, &wdummy);
3062 tt_printf ("\033[3;%d;%dt", x, y); 3573 tt_printf ("\033[3;%d;%dt", x, y);
3063 break; 3574 break;
3064 case 14: /* report window size (pixels) */ 3575 case 14: /* report window size (pixels) */
3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3576 XGetWindowAttributes (disp, parent[0], &wattr);
3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3577 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3067 break; 3578 break;
3068 case 18: /* report text area size (chars) */ 3579 case 18: /* report text area size (chars) */
3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3580 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3070 break; 3581 break;
3071 case 19: /* report window size (chars) */ 3582 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3583 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3073 break; 3584 break;
3074 case 20: /* report icon label */ 3585 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3586 {
3077 char *s; 3587 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3588 XGetIconName (disp, parent[0], &s);
3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3589 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3590 XFree (s);
3080 } 3591 }
3081 break; 3592 break;
3082 case 21: /* report window title */ 3593 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3594 {
3085 char *s; 3595 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3596 XFetchName (disp, parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3597 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3598 XFree (s);
3088 } 3599 }
3089 break; 3600 break;
3090 } 3601 }
3091} 3602}
3092#endif 3603#endif
3093 3604
3094/*----------------------------------------------------------------------*/ 3605/*----------------------------------------------------------------------*/
3095/* 3606/*
3096 * get input up until STRING TERMINATOR (or BEL) 3607 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3608 * ends_how is terminator used. returned input must be free()'d
3098 */ 3609 */
3099unsigned char * 3610unsigned char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3611rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3612{
3102 int seen_esc = 0; /* seen escape? */ 3613 unicode_t ch;
3614 bool seen_esc = false;
3103 unsigned int n = 0; 3615 unsigned int n = 0;
3104 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3616 wchar_t string[STRING_MAX];
3107 3617
3108 while ((ch = cmd_getc ())) 3618 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3619 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3620 if (seen_esc)
3621 {
3114 if (ch == 0x5c) /* 7bit ST */ 3622 if (ch == 0x5c) /* 7bit ST */
3115 break; 3623 break;
3116 else 3624 else
3117 return NULL; 3625 return NULL;
3118 3626 }
3119 if (ch == C0_ESC) 3627 else if (ch == C0_ESC)
3120 { 3628 {
3121 seen_esc = 1; 3629 seen_esc = true;
3122 continue; 3630 continue;
3123 } 3631 }
3124 else if (ch == '\t') 3632 else if (ch == C0_BEL || ch == CHAR_ST)
3125 ch = ' '; /* translate '\t' to space */ 3633 break;
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3634 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3635 return NULL; /* other control character - exit */
3128 3636
3129 if (n >= sizeof (string) - 1) 3637 seen_esc = false;
3638
3639 if (n >= STRING_MAX - 1)
3130 // stop at some sane length 3640 // stop at some sane length
3131 return NULL; 3641 return NULL;
3132 3642
3643 if (ch == C0_SYN)
3644 string[n++] = cmd_get8 ();
3645 else
3133 string[n++] = ch; 3646 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3647 }
3136 3648
3137 string[n++] = '\0'; 3649 string[n++] = '\0';
3138 3650
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL;
3141
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3651 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3652
3144 return s; 3653 return (unsigned char *)rxvt_wcstombs (string);
3145} 3654}
3146 3655
3147/*----------------------------------------------------------------------*/ 3656/*----------------------------------------------------------------------*/
3148/* 3657/*
3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3658 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3193void 3702void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3703rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{ 3704{
3196 if (str[0] == '?' && !str[1]) 3705 if (str[0] == '?' && !str[1])
3197 { 3706 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b; 3707 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b); 3708 pix_colors_focused[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3709 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 } 3710 }
3205 else 3711 else
3206 set_window_color (color, str); 3712 set_window_color (color, str);
3207} 3713}
3208 3714
3209/* 3715/*
3210 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3716 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3211 * 0 = change iconName/title
3212 * 1 = change iconName
3213 * 2 = change title
3214 * 4 = change color
3215 * 10 = change fg color
3216 * 11 = change bg color
3217 * 12 = change text color
3218 * 13 = change mouse foreground color
3219 * 17 = change highlight character colour
3220 * 18 = change bold character color
3221 * 19 = change underlined character color
3222 * 46 = change logfile (not implemented)
3223 * 50 = change font
3224 *
3225 * rxvt extensions:
3226 * 20 = bg pixmap
3227 * 39 = change default fg color
3228 * 49 = change default bg color
3229 * 55 = dump scrollback buffer and all of screen
3230 * 701 = change locale
3231 * 702 = find font
3232 * 703 = menu
3233 */ 3717 */
3234void 3718void
3235rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3719rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3236{ 3720{
3237 int changed = 0; 3721 int changed = 0;
3238 int color; 3722 int color;
3239 char *buf, *name; 3723 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3724 bool query = str[0] == '?' && !str[1];
3725 int saveop = op;
3726 dDisp;
3241 3727
3242 assert (str != NULL); 3728 assert (str != NULL);
3243 switch (op) 3729 switch (op)
3244 { 3730 {
3245 case XTerm_name: 3731 case XTerm_name:
… …
3252 set_title (str); 3738 set_title (str);
3253 break; 3739 break;
3254 case XTerm_property: 3740 case XTerm_property:
3255 if (str[0] == '?') 3741 if (str[0] == '?')
3256 { 3742 {
3257 Atom prop = XInternAtom (display->display, str + 1, True); 3743 Atom prop = display->atom (str + 1);
3258 Atom actual_type; 3744 Atom actual_type;
3259 int actual_format; 3745 int actual_format;
3260 unsigned long nitems; 3746 unsigned long nitems;
3261 unsigned long bytes_after; 3747 unsigned long bytes_after;
3262 unsigned char *value = 0; 3748 unsigned char *value = 0;
3263 const char *str = ""; 3749 const char *str = "";
3264 3750
3265 if (prop 3751 if (prop
3266 && XGetWindowProperty (display->display, TermWin.parent[0], 3752 && XGetWindowProperty (disp, parent[0],
3267 prop, 0, 1<<16, 0, AnyPropertyType, 3753 prop, 0, 1<<16, 0, AnyPropertyType,
3268 &actual_type, &actual_format, 3754 &actual_type, &actual_format,
3269 &nitems, &bytes_after, &value) == Success 3755 &nitems, &bytes_after, &value) == Success
3270 && actual_type != None 3756 && actual_type != None
3271 && actual_format == 8) 3757 && actual_format == 8)
… …
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3766 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281 3767
3282 if (eq) 3768 if (eq)
3283 { 3769 {
3284 *eq = 0; 3770 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0], 3771 set_utf8_property (display->atom (str), eq + 1);
3286 display->atom (str), XA_STRING, 8,
3287 PropModeReplace, (unsigned char *)eq + 1,
3288 strlen (eq + 1));
3289 } 3772 }
3290 else 3773 else
3291 XDeleteProperty (display->display, TermWin.parent[0], 3774 XDeleteProperty (disp, parent[0],
3292 display->atom (str)); 3775 display->atom (str));
3293 } 3776 }
3294 break; 3777 break;
3295 3778
3296 case XTerm_Color: 3779 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3780 for (buf = (char *)str; buf && *buf;)
3298 { 3781 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3782 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3783 break;
3301 3784
3302 *name++ = '\0'; 3785 *name++ = '\0';
3303 color = atoi (buf); 3786 color = atoi (buf);
3304 3787
3305 if (color < 0 || color >= TOTAL_COLORS) 3788 if (color < 0 || color >= TOTAL_COLORS)
3306 break; 3789 break;
3307 3790
3308 if ((buf = STRCHR (name, ';')) != NULL) 3791 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3792 *buf++ = '\0';
3310 3793
3311 if (name[0] == '?' && !name[1]) 3794 if (name[0] == '?' && !name[1])
3312 { 3795 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b; 3796 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b); 3797 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3798 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 } 3799 }
3320 else 3800 else
3321 set_window_color (color + minCOLOR, name); 3801 set_window_color (color + minCOLOR, name);
3322 } 3802 }
3323 break; 3803 break;
… …
3345 case XTerm_Color_UL: 3825 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3826 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break; 3827 break;
3348 case XTerm_Color_RV: 3828 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3829 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3830 break;
3831 case URxvt_Color_IT:
3832 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3833 break;
3834#endif
3835#if TRANSPARENT && TINTING
3836 case URxvt_Color_tint:
3837 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3838 check_our_parents ();
3839 if (am_transparent)
3840 want_full_refresh = want_refresh = 1;
3350 break; 3841 break;
3351#endif 3842#endif
3352 3843
3353 case XTerm_Pixmap: 3844 case XTerm_Pixmap:
3354 if (*str != ';') 3845 if (*str != ';')
… …
3357 scale_pixmap (""); /* reset to default scaling */ 3848 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3849 set_bgPixmap (str); /* change pixmap */
3359#endif 3850#endif
3360 scr_touch (true); 3851 scr_touch (true);
3361 } 3852 }
3362 while ((str = STRCHR (str, ';')) != NULL) 3853 while ((str = strchr (str, ';')) != NULL)
3363 { 3854 {
3364 str++; 3855 str++;
3365#if XPM_BACKGROUND 3856#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3857 changed += scale_pixmap (str);
3367#endif 3858#endif
3368
3369 } 3859 }
3860
3370 if (changed) 3861 if (changed)
3371 { 3862 {
3372#ifdef XPM_BACKGROUND 3863#ifdef XPM_BACKGROUND
3373 resize_pixmap (); 3864 resize_pixmap ();
3374#endif 3865#endif
… …
3385 3876
3386 case XTerm_logfile: 3877 case XTerm_logfile:
3387 // TODO, when secure mode? 3878 // TODO, when secure mode?
3388 break; 3879 break;
3389 3880
3390 case XTerm_font:
3391 if (query)
3392 {
3393 if (Options & Opt_insecure)
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3395 TermWin.fontset->fontdesc
3396 ? TermWin.fontset->fontdesc
3397 : "",
3398 resp);
3399 }
3400 else
3401 change_font (str);
3402 break;
3403
3404#ifndef NO_FRILLS
3405 case XTerm_locale:
3406 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3410 }
3411 else
3412 {
3413 set_locale (str);
3414# ifdef USE_XIM
3415 im_cb ();
3416# endif
3417 }
3418 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif
3429
3430#ifdef MENUBAR 3881#ifdef MENUBAR
3431 case XTerm_Menu: 3882 case URxvt_Menu:
3432 if (Options & Opt_insecure) 3883 if (OPTION (Opt_insecure))
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3884 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3885 break;
3435#endif 3886#endif
3436#if 0 3887#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3888 case XTerm_dumpscreen: /* no error notices */
… …
3441 { 3892 {
3442 scr_dump (fd); 3893 scr_dump (fd);
3443 close (fd); 3894 close (fd);
3444 } 3895 }
3445 } 3896 }
3897 break;
3898#endif
3899 case XTerm_font:
3900 op = URxvt_font;
3901 case URxvt_font:
3902#if ENABLE_STYLES
3903 case URxvt_boldFont:
3904 case URxvt_italicFont:
3905 case URxvt_boldItalicFont:
3906#endif
3907 if (query)
3908 tt_printf ("\33]%d;%-.250s%c", saveop,
3909 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3910 ? fontset[op - URxvt_font]->fontdesc : "",
3911 resp);
3912 else
3913 {
3914 const char *&res = rs[Rs_font + (op - URxvt_font)];
3915
3916 res = strdup (str);
3917 allocated.push_back ((void *)res);
3918 set_fonts ();
3919 }
3920 break;
3921
3922#if ENABLE_FRILLS
3923 case URxvt_locale:
3924 if (query)
3925 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3926 else
3927 {
3928 set_locale (str);
3929 pty.set_utf8_mode (enc_utf8);
3930 init_xlocale ();
3931 }
3932 break;
3933
3934 case URxvt_view_up:
3935 case URxvt_view_down:
3936 int lines = atoi (str);
3937
3938 if (lines)
3939 scr_page (op == URxvt_view_up ? UP : DN, lines);
3940 else
3941 {
3942 scr_erase_savelines ();
3943 }
3944
3446 break; 3945 break;
3447#endif 3946#endif
3448 } 3947 }
3449} 3948}
3450/*----------------------------------------------------------------------*/ 3949/*----------------------------------------------------------------------*/
… …
3464{ 3963{
3465 int state; 3964 int state;
3466 3965
3467 if (mode == 's') 3966 if (mode == 's')
3468 { 3967 {
3469 SavedModes |= (PrivateModes & bit); 3968 SavedModes |= (priv_modes & bit);
3470 return -1; 3969 return -1;
3471 } 3970 }
3472 else 3971 else
3473 { 3972 {
3474 if (mode == 'r') 3973 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3974 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 3975 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3976 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 3977 PrivMode (state, bit);
3479 } 3978 }
3480 3979
3481 return state; 3980 return state;
3482} 3981}
… …
3500 { 3, PrivMode_132 }, 3999 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 4000 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 4001 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 4002 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 4003 { 7, PrivMode_Autowrap },
4004 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 4005 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 4006#ifdef menuBar_esc
3507 { menuBar_esc, PrivMode_menuBar }, 4007 { menuBar_esc, PrivMode_menuBar },
3508#endif 4008#endif
4009 // 18, 19 printing-related
4010 { 25, PrivMode_VisibleCursor },
3509#ifdef scrollBar_esc 4011#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 4012 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 4013#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 4014 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 4015 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 4016 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 4017 // 45 margin bell NYI
3519 // 46 start logging 4018 // 46 start logging
… …
3559 } 4058 }
3560 4059
3561 /* extra handling for values with state unkept */ 4060 /* extra handling for values with state unkept */
3562 switch (arg[i]) 4061 switch (arg[i])
3563 { 4062 {
4063#if ENABLE_STYLES
4064 case 1021:
4065 if (mode)
4066 SET_OPTION (Opt_intensityStyles);
4067 else
4068 CLR_OPTION (Opt_intensityStyles);
4069
4070 scr_touch (true);
4071 break;
4072#endif
3564 case 1048: /* alternative cursor save */ 4073 case 1048: /* alternative cursor save */
4074 case 1049:
3565 if (Options & Opt_secondaryScreen) 4075 if (OPTION (Opt_secondaryScreen))
3566 if (mode == 0) 4076 if (mode == 0)
3567 scr_cursor (RESTORE); 4077 scr_cursor (RESTORE);
3568 else if (mode == 1) 4078 else if (mode == 1)
3569 scr_cursor (SAVE); 4079 scr_cursor (SAVE);
3570 break; 4080 break;
… …
3581 * within VT52 mode 4091 * within VT52 mode
3582 */ 4092 */
3583 PrivMode (1, PrivMode_vt52); 4093 PrivMode (1, PrivMode_vt52);
3584 break; 4094 break;
3585 case 3: /* 80/132 */ 4095 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 4096 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4097 set_widthheight (((state ? 132 : 80) * fwidth), height);
3588 break; 4098 break;
3589 case 4: /* smooth scrolling */ 4099 case 4: /* smooth scrolling */
3590 if (state) 4100 if (!state)
3591 Options &= ~Opt_jumpScroll; 4101 SET_OPTION (Opt_jumpScroll);
3592 else 4102 else
3593 Options |= Opt_jumpScroll; 4103 CLR_OPTION (Opt_jumpScroll);
3594 break; 4104 break;
3595 case 5: /* reverse video */ 4105 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 4106 scr_rvideo_mode (state);
3597 break; 4107 break;
3598 case 6: /* relative/absolute origins */ 4108 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 4112 scr_autowrap (state);
3603 break; 4113 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 4114 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 4115 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 4116 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 4117 priv_modes &= ~PrivMode_MouseX11;
3608 break; 4118 break;
3609#ifdef menuBar_esc 4119#ifdef menuBar_esc
3610 case menuBar_esc: 4120 case menuBar_esc:
3611#ifdef MENUBAR 4121#ifdef MENUBAR
3612 map_menuBar (state); 4122 map_menuBar (state);
… …
3632 break; 4142 break;
3633 /* case 66: - application key pad */ 4143 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4144 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4145 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4146 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4147 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4148 break;
3639#if 0 4149#if 0
3640 case 1001: 4150 case 1001:
3641 break; /* X11 mouse highlighting */ 4151 break; /* X11 mouse highlighting */
3642#endif 4152#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4153 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state) 4154 if (!state)
3645 Options &= ~Opt_scrollTtyOutput; 4155 SET_OPTION (Opt_scrollTtyOutput);
3646 else 4156 else
3647 Options |= Opt_scrollTtyOutput; 4157 CLR_OPTION (Opt_scrollTtyOutput);
3648 break; 4158 break;
3649 case 1011: /* scroll to bottom on key press */ 4159 case 1011: /* scroll to bottom on key press */
3650 if (state) 4160 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4161 SET_OPTION (Opt_scrollTtyKeypress);
3652 else 4162 else
3653 Options &= ~Opt_scrollTtyKeypress; 4163 CLR_OPTION (Opt_scrollTtyKeypress);
3654 break; 4164 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4165 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4166 if (OPTION (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 4167 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4168 scr_erase_screen (2);
3659 scr_change_screen (state); 4169 scr_change_screen (state);
3660 break; 4170 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4171 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4172 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4173 if (OPTION (Opt_secondaryScreen))
3664 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4175 scr_erase_screen (2);
3666 break; 4176 break;
3667 default: 4177 default:
3668 break; 4178 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4204 rendset = 0, rendstyle = ~RS_None;
3695 break; 4205 break;
3696 case 1: 4206 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4207 rendset = 1, rendstyle = RS_Bold;
3698 break; 4208 break;
4209 //case 2: // low intensity
4210 case 3:
4211 rendset = 1, rendstyle = RS_Italic;
4212 break;
3699 case 4: 4213 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4214 rendset = 1, rendstyle = RS_Uline;
3701 break; 4215 break;
3702 case 5: 4216 case 5: // slowly blinking
4217 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4218 rendset = 1, rendstyle = RS_Blink;
3704 break; 4219 break;
4220 //case 6: // scoansi light background
3705 case 7: 4221 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4222 rendset = 1, rendstyle = RS_RVid;
3707 break; 4223 break;
3708 case 8: 4224 case 8:
3709 // invisible. NYI 4225 // invisible. NYI
3710 break; 4226 break;
3711 case 22: 4227 //case 9: // crossed out
4228 //case 10: // scoansi acs off, primary font
4229 //case 11: // scoansi acs on, first alt font
4230 //case 12: // scoansi acs on, |0x80, second alt font
4231 //...
4232 //case 19: // ninth alt font
4233 //case 20: // gothic
4234 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 4235 rendset = 0, rendstyle = RS_Bold;
4236 break;
4237 case 22: // normal intensity
4238 rendset = 0, rendstyle = RS_Bold;
4239 break;
4240 case 23: // disable italic
4241 rendset = 0, rendstyle = RS_Italic;
3713 break; 4242 break;
3714 case 24: 4243 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4244 rendset = 0, rendstyle = RS_Uline;
3716 break; 4245 break;
3717 case 25: 4246 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4247 rendset = 0, rendstyle = RS_Blink;
3719 break; 4248 break;
4249 case 26: // variable spacing (iso 8613)
4250 rendset = 0, rendstyle = RS_Blink;
4251 break;
3720 case 27: 4252 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4253 rendset = 0, rendstyle = RS_RVid;
3722 break; 4254 break;
3723 case 28:
3724 // visible. NYI 4255 //case 28: // visible. NYI
3725 break; 4256 //case 29: // not crossed-out
3726 } 4257 }
3727 4258
3728 if (rendset != -1) 4259 if (rendset != -1)
3729 { 4260 {
3730 scr_rendition (rendset, rendstyle); 4261 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4272 case 35:
3742 case 36: 4273 case 36:
3743 case 37: 4274 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4275 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4276 break;
3746#ifdef TTY_256COLOR 4277 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4278 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4279 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4280 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4281 i += 2;
3752 } 4282 }
3753 break; 4283 break;
3754#endif
3755 case 39: /* default fg */ 4284 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4285 scr_color (Color_fg, Color_fg);
3757 break; 4286 break;
3758 4287
3759 case 40: 4288 case 40:
… …
3764 case 45: 4293 case 45:
3765 case 46: 4294 case 46:
3766 case 47: 4295 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4296 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4297 break;
3769#ifdef TTY_256COLOR 4298 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4299 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4300 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4301 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4302 i += 2;
3775 } 4303 }
3776 break; 4304 break;
3777#endif
3778 case 49: /* default bg */ 4305 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4306 scr_color (Color_bg, Color_bg);
3780 break; 4307 break;
4308
4309 //case 50: // not variable spacing
3781 4310
3782#ifndef NO_BRIGHTCOLOR 4311#ifndef NO_BRIGHTCOLOR
3783 case 90: 4312 case 90:
3784 case 91: /* set bright fg color */ 4313 case 91: /* set bright fg color */
3785 case 92: 4314 case 92:
3786 case 93: 4315 case 93:
3787 case 94: 4316 case 94:
3788 case 95: 4317 case 95:
3789 case 96: 4318 case 96:
3790 case 97: 4319 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4320 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4321 break;
3794 case 100: 4322 case 100:
3795 case 101: /* set bright bg color */ 4323 case 101: /* set bright bg color */
3796 case 102: 4324 case 102:
3797 case 103: 4325 case 103:
3798 case 104: 4326 case 104:
3799 case 105: 4327 case 105:
3800 case 106: 4328 case 106:
3801 case 107: 4329 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4330 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4331 break;
3805#endif 4332#endif
3806
3807 } 4333 }
3808 } 4334 }
3809} 4335}
3810/*}}} */ 4336/*}}} */
3811 4337
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4338/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4339void
3814rxvt_term::process_graphics () 4340rxvt_term::process_graphics ()
3815{ 4341{
3816 unicode_t ch, cmd = cmd_getc (); 4342 unicode_t ch, cmd = cmd_getc ();
3817 4343
3818 if (cmd == 'Q') 4344 if (cmd == 'Q')
3819 { /* query graphics */ 4345 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4346 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4347 return;
3822 } 4348 }
3823 /* swallow other graphics sequences until terminating ':' */ 4349 /* swallow other graphics sequences until terminating ':' */
3824 do 4350 do
3825 ch = cmd_getc (); 4351 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4366 unsigned char buf[256];
3841 4367
3842 va_start (arg_ptr, fmt); 4368 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4370 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4371 tt_write (buf, strlen (buf));
3846} 4372}
3847 4373
3848/* ---------------------------------------------------------------------- */ 4374/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4375/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4376 * or generated by us in response to a query ESC sequence.
3851 */ 4377 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379
3852void 4380void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4381rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4382{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4383 if (v_buflen == 0)
4384 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3856 4386
3857 if (len) 4387 if ((unsigned int)written == len)
4388 return;
4389
4390 data += written;
4391 len -= written;
3858 { 4392 }
4393
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4395
4396 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len;
4398
4399 pty_ev.set (EVENT_READ | EVENT_WRITE);
4400}
4401
4402void rxvt_term::pty_write ()
4403{
4404 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4405
4406 if (written > 0)
4407 {
4408 v_buflen -= written;
4409
3859 if (v_buflen == 0) 4410 if (v_buflen == 0)
3860 { 4411 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4412 free (v_buffer);
3888 v_buffer = 0; 4413 v_buffer = 0;
3889 v_buflen = 0; 4414 v_buflen = 0;
3890 4415
3891 pty_ev.set (EVENT_READ); 4416 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4417 return;
3904 } 4418 }
4419
4420 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4421 }
4422 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4423 pty_ev.set (EVENT_READ);
3906} 4424}
3907 4425
3908/*----------------------- end-of-file (C source) -----------------------*/ 4426/*----------------------- end-of-file (C source) -----------------------*/
3909 4427

Diff Legend

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