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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.221 by root, Sat Dec 31 18:27:57 2005 UTC

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

Diff Legend

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