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

Diff Legend

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