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.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.192 by root, Fri Feb 4 11:41:23 2005 UTC

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

Diff Legend

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