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.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.234 by root, Wed Jan 4 04:42:45 2006 UTC

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

Diff Legend

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