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.93 by pcg, Thu Apr 8 20:31:45 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 // don't understand this, so commented it out 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, 1518 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1187 Expose, 1519 ;
1188 &unused_event)) ; 1520 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1189 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1521 ;
1190 GraphicsExpose, 1522
1191 &unused_event)) ;
1192 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1193 { 1524 {
1194 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1195 scrollbar_show (0); 1526 scrollbar_show (0);
1196 } 1527 }
1197#ifdef MENUBAR 1528#ifdef MENUBAR
1198 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1199 menubar_expose (); 1530 menubar_expose ();
1200#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
1201 } 1537 }
1202 break; 1538 break;
1203 1539
1204 case MotionNotify: 1540 case MotionNotify:
1205#ifdef POINTER_BLANK 1541#ifdef POINTER_BLANK
… …
1211 { 1547 {
1212 menubar_control (ev.xbutton); 1548 menubar_control (ev.xbutton);
1213 break; 1549 break;
1214 } 1550 }
1215#endif 1551#endif
1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1552 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1217 break; 1553 break;
1218 1554
1219 if (ev.xany.window == TermWin.vt) 1555 if (ev.xany.window == TermWin.vt)
1220 { 1556 {
1221 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1557 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1222 { 1558 {
1223 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1224 ; 1560 ;
1225 1561
1226 XQueryPointer (display->display, TermWin.vt, 1562 XQueryPointer (disp, TermWin.vt,
1227 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1228 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1229 & (ev.xbutton.x), & (ev.xbutton.y), 1565 &ev.xbutton.x, &ev.xbutton.y,
1230 &unused_mask); 1566 &ev.xbutton.state);
1231#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
1232 /* deal with a `jumpy' mouse */ 1568 /* deal with a `jumpy' mouse */
1233 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1234 { 1570 {
1235#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
1236 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1580 selection_extend (ev.xbutton.x, ev.xbutton.y,
1237 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1581 ev.xbutton.state & Button3Mask ? 2 : 0);
1582
1238#ifdef SELECTION_SCROLLING 1583#ifdef SELECTION_SCROLLING
1239 if (ev.xbutton.y < TermWin.int_bwidth 1584 if (ev.xbutton.y < TermWin.int_bwidth
1240 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1585 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1241 { 1586 {
1242 int dist; 1587 int dist;
1243 1588
1244 pending_scroll_selection=1;
1245
1246 /* don't clobber the current delay if we are 1589 /* don't clobber the current delay if we are
1247 * already in the middle of scrolling. 1590 * already in the middle of scrolling.
1248 */ 1591 */
1249 if (scroll_selection_delay<=0) 1592 if (!sel_scroll_ev.active)
1250 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1593 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1251 1594
1252 /* save the event params so we can highlight 1595 /* save the event params so we can highlight
1253 * the selection in the pending-scroll loop 1596 * the selection in the pending-scroll loop
1254 */ 1597 */
1255 selection_save_x=ev.xbutton.x; 1598 selection_save_x = ev.xbutton.x;
1256 selection_save_y=ev.xbutton.y; 1599 selection_save_y = ev.xbutton.y;
1257 selection_save_state=
1258 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1600 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1259 1601
1260 /* calc number of lines to scroll */ 1602 /* calc number of lines to scroll */
1261 if (ev.xbutton.y<TermWin.int_bwidth) 1603 if (ev.xbutton.y < TermWin.int_bwidth)
1262 { 1604 {
1263 scroll_selection_dir = UP; 1605 scroll_selection_dir = UP;
1264 dist = TermWin.int_bwidth - ev.xbutton.y; 1606 dist = TermWin.int_bwidth - ev.xbutton.y;
1265 } 1607 }
1266 else 1608 else
1267 { 1609 {
1268 scroll_selection_dir = DN; 1610 scroll_selection_dir = DN;
1269 dist = ev.xbutton.y -
1270 (TermWin.int_bwidth + TermWin.height); 1611 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1271 } 1612 }
1613
1272 scroll_selection_lines= (Pixel2Height (dist)/ 1614 scroll_selection_lines = Pixel2Height (dist)
1273 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1615 / SELECTION_SCROLL_LINE_SPEEDUP
1616 + 1;
1274 MIN_IT (scroll_selection_lines, 1617 MIN_IT (scroll_selection_lines,
1275 SELECTION_SCROLL_MAX_LINES); 1618 SELECTION_SCROLL_MAX_LINES);
1276 } 1619 }
1277 else 1620 else
1278 { 1621 {
1279 /* we are within the text window, so we 1622 /* we are within the text window, so we
1280 * shouldn't be scrolling 1623 * shouldn't be scrolling
1281 */ 1624 */
1282 pending_scroll_selection = 0; 1625 if (sel_scroll_ev.active)
1626 sel_scroll_ev.stop();
1283 } 1627 }
1284#endif 1628#endif
1285#ifdef MOUSE_THRESHOLD 1629#ifdef MOUSE_THRESHOLD
1286
1287 } 1630 }
1288#endif 1631#endif
1289
1290 } 1632 }
1291 } 1633 }
1292 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1634 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1293 { 1635 {
1294 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1636 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1295 MotionNotify, &ev)) ; 1637 MotionNotify, &ev))
1638 ;
1639
1296 XQueryPointer (display->display, scrollBar.win, 1640 XQueryPointer (disp, scrollBar.win,
1297 &unused_root, &unused_child, 1641 &unused_root, &unused_child,
1298 &unused_root_x, &unused_root_y, 1642 &unused_root_x, &unused_root_y,
1299 & (ev.xbutton.x), & (ev.xbutton.y), 1643 &ev.xbutton.x, &ev.xbutton.y,
1300 &unused_mask); 1644 &unused_mask);
1301 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1302 scrollbar_size ()); 1646 scrollbar_size ());
1303 scr_refresh (refresh_type); 1647 scr_refresh (refresh_type);
1304 refresh_limit = 0; 1648 refresh_limit = 0;
… …
1306 } 1650 }
1307 break; 1651 break;
1308 } 1652 }
1309} 1653}
1310 1654
1655#if TRANSPARENT
1311void 1656void
1312rxvt_term::rootwin_cb (XEvent &ev) 1657rxvt_term::rootwin_cb (XEvent &ev)
1313{ 1658{
1314 SET_R (this); 1659 SET_R (this);
1315 SET_LOCALE (locale); 1660 SET_LOCALE (locale);
1316 1661
1317 switch (ev.type) 1662 switch (ev.type)
1318 { 1663 {
1319 case PropertyNotify: 1664 case PropertyNotify:
1320 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1321 {
1322 if (ev.xproperty.state == PropertyNewValue)
1323 selection_property (ev.xproperty.window, ev.xproperty.atom);
1324 break;
1325 }
1326#ifdef TRANSPARENT
1327 else
1328 {
1329 /* 1665 /*
1330 * 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,
1331 * 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.
1332 */ 1668 */
1333 if (xa[XA_XROOTPMAPID] == 0)
1334 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1335
1336 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])
1337 return; 1671 return;
1338 }
1339 1672
1340 /* FALLTHROUGH */ 1673 /* FALLTHROUGH */
1341 case ReparentNotify: 1674 case ReparentNotify:
1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1675 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1343 want_full_refresh = 1; 1676 want_refresh = want_full_refresh = 1;
1344 break; 1677 break;
1345#endif
1346 } 1678 }
1347} 1679}
1680#endif
1348 1681
1349void 1682void
1350rxvt_term::button_press (XButtonEvent &ev) 1683rxvt_term::button_press (XButtonEvent &ev)
1351{ 1684{
1352 int reportmode = 0, clickintime; 1685 int reportmode = 0, clickintime;
1353 1686
1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1687 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1355 if (!bypass_keystate) 1688 if (!bypass_keystate)
1356 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1689 reportmode = !! (priv_modes & PrivMode_mouse_report);
1690
1357 /* 1691 /*
1358 * VT window processing of button press 1692 * VT window processing of button press
1359 */ 1693 */
1360 if (ev.window == TermWin.vt) 1694 if (ev.window == TermWin.vt)
1361 { 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
1362 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1705 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1706
1363 if (reportmode) 1707 if (reportmode)
1364 { 1708 {
1365 /* mouse report from vt window */ 1709 /* mouse report from vt window */
1366 /* save the xbutton state (for ButtonRelease) */ 1710 /* save the xbutton state (for ButtonRelease) */
1367 MEvent.state = ev.state; 1711 MEvent.state = ev.state;
… …
1396 } 1740 }
1397 else 1741 else
1398 { 1742 {
1399 if (ev.button != MEvent.button) 1743 if (ev.button != MEvent.button)
1400 MEvent.clicks = 0; 1744 MEvent.clicks = 0;
1745
1401 switch (ev.button) 1746 switch (ev.button)
1402 { 1747 {
1403 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
1404 /* allow shift+left click to extend selection */ 1757 /* allow shift+left click to extend selection */
1405 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1758 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1406 { 1759 {
1407 if (MEvent.button == Button1 && clickintime) 1760 if (MEvent.button == Button1 && clickintime)
1408 selection_rotate (ev.x, ev.y); 1761 selection_rotate (ev.x, ev.y);
1409 else 1762 else
1410 selection_extend (ev.x, ev.y, 1); 1763 selection_extend (ev.x, ev.y, 1);
… …
1425 case Button3: 1778 case Button3:
1426 if (MEvent.button == Button3 && clickintime) 1779 if (MEvent.button == Button3 && clickintime)
1427 selection_rotate (ev.x, ev.y); 1780 selection_rotate (ev.x, ev.y);
1428 else 1781 else
1429 selection_extend (ev.x, ev.y, 1); 1782 selection_extend (ev.x, ev.y, 1);
1783
1430 MEvent.button = Button3; 1784 MEvent.button = Button3;
1431 break; 1785 break;
1432 } 1786 }
1433 } 1787 }
1788
1434 MEvent.time = ev.time; 1789 MEvent.time = ev.time;
1435 return; 1790 return;
1436 } 1791 }
1437 1792
1438 /* 1793 /*
… …
1504 upordown = 1; /* down */ 1859 upordown = 1; /* down */
1505 } 1860 }
1506 if (upordown) 1861 if (upordown)
1507 { 1862 {
1508#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1863#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1864 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1510#endif 1865#endif
1511 if (scr_page (upordown < 0 ? UP : DN, 1)) 1866 if (scr_page (upordown < 0 ? UP : DN, 1))
1512 { 1867 {
1513 if (upordown < 0) 1868 if (upordown < 0)
1514 scrollBar.setUp (); 1869 scrollBar.setUp ();
… …
1530 break; 1885 break;
1531 case R_SB_ALIGN_BOTTOM: 1886 case R_SB_ALIGN_BOTTOM:
1532 csrO = scrollBar.bot - scrollBar.top; 1887 csrO = scrollBar.bot - scrollBar.top;
1533 break; 1888 break;
1534 } 1889 }
1890
1535 if (scrollBar.style == R_SB_XTERM 1891 if (scrollBar.style == R_SB_XTERM
1536 || scrollbar_above_slider (ev.y) 1892 || scrollbar_above_slider (ev.y)
1537 || scrollbar_below_slider (ev.y)) 1893 || scrollbar_below_slider (ev.y))
1538 scr_move_to ( scrollbar_position (ev.y) - csrO, 1894 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1539 scrollbar_size ()); 1895
1540 scrollBar.setMotion (); 1896 scrollBar.setMotion ();
1541 break; 1897 break;
1542 1898
1543 case Button1: 1899 case Button1:
1544 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1900 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1568 scr_page ((ev.button == Button1 ? DN : UP), 1924 scr_page ((ev.button == Button1 ? DN : UP),
1569 (TermWin.nrow 1925 (TermWin.nrow
1570 * scrollbar_position (ev.y) 1926 * scrollbar_position (ev.y)
1571 / scrollbar_size ())); 1927 / scrollbar_size ()));
1572 } 1928 }
1929
1573 break; 1930 break;
1574 } 1931 }
1575 } 1932 }
1576 return; 1933 return;
1577 } 1934 }
… …
1589{ 1946{
1590 int reportmode = 0; 1947 int reportmode = 0;
1591 1948
1592 csrO = 0; /* reset csr Offset */ 1949 csrO = 0; /* reset csr Offset */
1593 if (!bypass_keystate) 1950 if (!bypass_keystate)
1594 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1951 reportmode = !! (priv_modes & PrivMode_mouse_report);
1595 1952
1596 if (scrollbar_isUpDn ()) 1953 if (scrollbar_isUpDn ())
1597 { 1954 {
1598 scrollBar.setIdle (); 1955 scrollBar.setIdle ();
1599 scrollbar_show (0); 1956 scrollbar_show (0);
1600#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1957#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1601 refresh_type &= ~SMOOTH_REFRESH; 1958 refresh_type &= ~SMOOTH_REFRESH;
1602#endif 1959#endif
1603
1604 } 1960 }
1961
1605#ifdef SELECTION_SCROLLING 1962#ifdef SELECTION_SCROLLING
1606 pending_scroll_selection=0; 1963 if (sel_scroll_ev.active)
1964 sel_scroll_ev.stop();
1607#endif 1965#endif
1966
1608 if (ev.window == TermWin.vt) 1967 if (ev.window == TermWin.vt)
1609 { 1968 {
1969#if ISO_14755
1970 // 5.4
1971 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1972 return;
1973#endif
1610 if (reportmode) 1974 if (reportmode)
1611 { 1975 {
1612 /* mouse report from vt window */ 1976 /* mouse report from vt window */
1613 /* don't report release of wheel "buttons" */ 1977 /* don't report release of wheel "buttons" */
1614 if (ev.button >= 4) 1978 if (ev.button >= 4)
… …
1628 MEvent.button = AnyButton; 1992 MEvent.button = AnyButton;
1629 mouse_report (ev); 1993 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 1994#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 return; 1995 return;
1632 } 1996 }
1997
1633 /* 1998 /*
1634 * dumb hack to compensate for the failure of click-and-drag 1999 * dumb hack to compensate for the failure of click-and-drag
1635 * when overriding mouse reporting 2000 * when overriding mouse reporting
1636 */ 2001 */
1637 if (PrivateModes & PrivMode_mouse_report 2002 if (priv_modes & PrivMode_mouse_report
1638 && bypass_keystate 2003 && bypass_keystate
1639 && ev.button == Button1 && MEvent.clicks <= 1) 2004 && ev.button == Button1 && MEvent.clicks <= 1)
1640 selection_extend (ev.x, ev.y, 0); 2005 selection_extend (ev.x, ev.y, 0);
1641 2006
1642 switch (ev.button) 2007 switch (ev.button)
… …
1653 case Button5: 2018 case Button5:
1654 { 2019 {
1655 int i; 2020 int i;
1656 page_dirn v; 2021 page_dirn v;
1657 2022
1658 v = (ev.button == Button4) ? UP : DN; 2023 v = ev.button == Button4 ? UP : DN;
2024
1659 if (ev.state & ShiftMask) 2025 if (ev.state & ShiftMask)
1660 i = 1; 2026 i = 1;
1661 else if ((Options & Opt_mouseWheelScrollPage)) 2027 else if (options & Opt_mouseWheelScrollPage)
1662 i = TermWin.nrow - 1; 2028 i = TermWin.nrow - 1;
1663 else 2029 else
1664 i = 5; 2030 i = 5;
2031
1665# ifdef MOUSE_SLIP_WHEELING 2032# ifdef MOUSE_SLIP_WHEELING
1666 if (ev.state & ControlMask) 2033 if (ev.state & ControlMask)
1667 { 2034 {
1668 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)
1669 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2040 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2041
2042 slip_wheel_ev.start ();
1670 } 2043 }
2044 else
2045 {
1671# endif 2046# endif
1672# ifdef JUMP_MOUSE_WHEEL 2047# ifdef JUMP_MOUSE_WHEEL
1673 scr_page (v, i);
1674 scr_refresh (SMOOTH_REFRESH);
1675 scrollbar_show (1);
1676# else
1677 while (i--)
1678 {
1679 scr_page (v, 1); 2048 scr_page (v, i);
1680 scr_refresh (SMOOTH_REFRESH); 2049 scr_refresh (SMOOTH_REFRESH);
1681 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
1682 } 2060 }
1683# endif 2061#endif
1684
1685 } 2062 }
1686 break; 2063 break;
1687#endif 2064#endif
1688
1689 } 2065 }
1690 } 2066 }
1691#ifdef MENUBAR 2067#ifdef MENUBAR
1692 else if (isMenuBarWindow (ev.window)) 2068 else if (isMenuBarWindow (ev.window))
1693 menubar_control (ev); 2069 menubar_control (ev);
1694#endif 2070#endif
1695} 2071}
1696 2072
1697#ifdef TRANSPARENT 2073#ifdef TRANSPARENT
1698#if TINTING 2074#if TINTING
1699/* shading taken from eterm-0.9.2 */ 2075/* taken from aterm-0.4.2 */
1700/* RGB 15 */
1701 2076
1702static void 2077typedef uint32_t RUINT32T;
1703shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704{
1705 unsigned char *ptr;
1706 int x, y;
1707 2078
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2079void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2080{
1710 /* No saturation */ 2081 int sh_r, sh_g, sh_b;
1711 for (y = h; --y >= 0;) { 2082 RUINT32T mask_r, mask_g, mask_b;
1712 for (x = -w; x < 0; x++) { 2083 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1713 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;
1714 2087
1715 b = ((uint16_t *) ptr)[x]; 2088 Visual *visual = display->visual;
1716 r = (b & 0x7c00) * rm; 2089
1717 g = (b & 0x3e0) * gm; 2090 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1718 b = (b & 0x1f) * bm; 2091
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2092 /* for convenience */
1720 | ((g >> 8) & 0x3e0) 2093 mask_r = visual->red_mask;
1721 | ((b >> 8) & 0x1f); 2094 mask_g = visual->green_mask;
1722 } 2095 mask_b = visual->blue_mask;
1723 ptr += bpl; 2096
1724 } 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;
1725 } else { 2170 } else {
1726 for (y = h; --y >= 0;) { 2171 if (shade < 0) shade = 0;
1727 for (x = -w; x < 0; x++) { 2172 if (shade > 100) shade = 100;
1728 int r, g, b;
1729 2173
1730 b = ((uint16_t *) ptr)[x]; 2174 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1731 r = (b & 0x7c00) * rm; 2175
1732 g = (b & 0x3e0) * gm; 2176 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1733 b = (b & 0x1f) * bm; 2177 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1734 r |= (!(r >> 15) - 1); 2178 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1735 g |= (!(g >> 10) - 1); 2179 }
1736 b |= (!(b >> 5) - 1); 2180
1737 ((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 */
1738 | ((g >> 8) & 0x3e0) 2182 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1739 | ((b >> 8) & 0x1f); 2183 {
1740 } 2184 unsigned int tmp;
1741 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++)
1742 } 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);
1743 } 2237 }
1744} 2238 break;
1745 2239 }
1746/* RGB 16 */ 2240 case 16:
1747static void 2241 {
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2242 unsigned short *p1, *pf, *p, *pl;
1749{ 2243 p1 = (unsigned short *) srcImage->data;
1750 unsigned char *ptr; 2244 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751 int x, y; 2245 while (p1 < pf)
1752 2246 {
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2247 p = p1;
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2248 pl = p1 + srcImage->width;
1755 /* No saturation */ 2249 for (; p < pl; p++)
1756 for (y = h; --y >= 0;) {
1757 for (x = -w; x < 0; x++) {
1758 int r, g, b;
1759
1760 b = ((uint16_t *) ptr)[x];
1761 r = (b & 0xf800) * rm;
1762 g = (b & 0x7e0) * gm;
1763 b = (b & 0x1f) * bm;
1764 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765 | ((g >> 8) & 0x7e0)
1766 | ((b >> 8) & 0x1f);
1767 }
1768 ptr += bpl;
1769 } 2250 {
1770 } else { 2251 *p = lookup_r[(*p & 0xf800)>>11] |
1771 for (y = h; --y >= 0;) { 2252 lookup_g[(*p & 0x07e0)>> 5] |
1772 for (x = -w; x < 0; x++) { 2253 lookup_b[(*p & 0x001f)];
1773 int r, g, b;
1774
1775 b = ((uint16_t *) ptr)[x];
1776 r = (b & 0xf800) * rm;
1777 g = (b & 0x7e0) * gm;
1778 b = (b & 0x1f) * bm;
1779 r |= (!(r >> 16) - 1);
1780 g |= (!(g >> 11) - 1);
1781 b |= (!(b >> 5) - 1);
1782 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783 | ((g >> 8) & 0x7e0)
1784 | ((b >> 8) & 0x1f);
1785 } 2254 }
1786 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)
1787 } 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);
1788 } 2275 }
1789} 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);
1790 2283
1791/* RGB 24 */ 2284 while (p1 < pf)
1792static void 2285 {
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2286 p = p1;
1794{ 2287 pl = p1 + srcImage->width;
1795 unsigned char *ptr; 2288 for (; p < pl; p++)
1796 int x, y;
1797
1798 ptr = (unsigned char *)data + (w * 3);
1799 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800 /* No saturation */
1801 for (y = h; --y >= 0;) {
1802 for (x = -(w * 3); x < 0; x += 3) {
1803 int r, g, b;
1804
1805 if (byteorder.big_endian()) {
1806 r = (ptr[x + 0] * rm) >> 8;
1807 g = (ptr[x + 1] * gm) >> 8;
1808 b = (ptr[x + 2] * bm) >> 8;
1809 ptr[x + 0] = r;
1810 ptr[x + 1] = g;
1811 ptr[x + 2] = b;
1812 } else {
1813 r = (ptr[x + 2] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 0] * bm) >> 8;
1816 ptr[x + 2] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 0] = b;
1819 }
1820 }
1821 ptr += bpl;
1822 } 2289 {
1823 } else { 2290 *p = lookup_r[(*p & 0xff0000)>>16] |
1824 for (y = h; --y >= 0;) { 2291 lookup_g[(*p & 0x00ff00)>> 8] |
1825 for (x = -(w * 3); x < 0; x += 3) { 2292 lookup_b[(*p & 0x0000ff)] |
1826 int r, g, b; 2293 (*p & ~0xffffff);
1827
1828 if (byteorder.big_endian()) {
1829 r = (ptr[x + 0] * rm) >> 8;
1830 g = (ptr[x + 1] * gm) >> 8;
1831 b = (ptr[x + 2] * bm) >> 8;
1832
1833 r |= (!(r >> 8) - 1);
1834 g |= (!(g >> 8) - 1);
1835 b |= (!(b >> 8) - 1);
1836
1837 ptr[x + 0] = r;
1838 ptr[x + 1] = g;
1839 ptr[x + 2] = b;
1840 } else {
1841 r = (ptr[x + 2] * rm) >> 8;
1842 g = (ptr[x + 1] * gm) >> 8;
1843 b = (ptr[x + 0] * bm) >> 8;
1844
1845 r |= (!(r >> 8) - 1);
1846 g |= (!(g >> 8) - 1);
1847 b |= (!(b >> 8) - 1);
1848
1849 ptr[x + 2] = r;
1850 ptr[x + 1] = g;
1851 ptr[x + 0] = b;
1852 }
1853 } 2294 }
1854 ptr += bpl; 2295 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1855 } 2296 }
2297 break;
2298 }
1856 } 2299 }
1857}
1858 2300
1859/* RGB 32 */ 2301 free (lookup);
1860static void
1861shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862{
1863 unsigned char *ptr;
1864 int x, y;
1865
1866 ptr = (unsigned char *)data + (w * 4);
1867 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868 /* No saturation */
1869 for (y = h; --y >= 0;) {
1870 if (byteorder.big_endian()) {
1871 for (x = -(w * 4); x < 0; x += 4) {
1872 int r, g, b;
1873
1874 r = (ptr[x + 1] * rm) >> 8;
1875 g = (ptr[x + 2] * gm) >> 8;
1876 b = (ptr[x + 3] * bm) >> 8;
1877 ptr[x + 1] = r;
1878 ptr[x + 2] = g;
1879 ptr[x + 3] = b;
1880 }
1881 } else {
1882 for (x = -(w * 4); x < 0; x += 4) {
1883 int r, g, b;
1884
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888 ptr[x + 2] = r;
1889 ptr[x + 1] = g;
1890 ptr[x + 0] = b;
1891 }
1892 }
1893 ptr += bpl;
1894 }
1895 } else {
1896 for (y = h; --y >= 0;) {
1897 for (x = -(w * 4); x < 0; x += 4) {
1898 int r, g, b;
1899
1900 if (byteorder.big_endian()) {
1901 r = (ptr[x + 1] * rm) >> 8;
1902 g = (ptr[x + 2] * gm) >> 8;
1903 b = (ptr[x + 3] * bm) >> 8;
1904
1905 r |= (!(r >> 8) - 1);
1906 g |= (!(g >> 8) - 1);
1907 b |= (!(b >> 8) - 1);
1908
1909 ptr[x + 1] = r;
1910 ptr[x + 2] = g;
1911 ptr[x + 3] = b;
1912 } else {
1913 r = (ptr[x + 2] * rm) >> 8;
1914 g = (ptr[x + 1] * gm) >> 8;
1915 b = (ptr[x + 0] * bm) >> 8;
1916
1917 r |= (!(r >> 8) - 1);
1918 g |= (!(g >> 8) - 1);
1919 b |= (!(b >> 8) - 1);
1920
1921 ptr[x + 2] = r;
1922 ptr[x + 1] = g;
1923 ptr[x + 0] = b;
1924 }
1925 }
1926 ptr += bpl;
1927 }
1928 }
1929} 2302}
1930
1931#endif 2303#endif
1932 2304
1933/* 2305/*
1934 * Check our parents are still who we think they are. 2306 * Check our parents are still who we think they are.
1935 * Do transparency updates if required 2307 * Do transparency updates if required
… …
1942 Atom atype; 2314 Atom atype;
1943 unsigned char *prop = NULL; 2315 unsigned char *prop = NULL;
1944 Window root, oldp, *list; 2316 Window root, oldp, *list;
1945 Pixmap rootpixmap = None; 2317 Pixmap rootpixmap = None;
1946 XWindowAttributes wattr, wrootattr; 2318 XWindowAttributes wattr, wrootattr;
2319 dDisp;
1947 2320
1948 pchanged = 0; 2321 pchanged = 0;
1949 2322
1950 if (!(Options & Opt_transparent)) 2323 if (!(options & Opt_transparent))
1951 return pchanged; /* Don't try any more */ 2324 return pchanged; /* Don't try any more */
1952 2325
1953 XGetWindowAttributes (display->display, display->root, &wrootattr); 2326 XGetWindowAttributes (disp, display->root, &wrootattr);
1954 rootdepth = wrootattr.depth; 2327 rootdepth = wrootattr.depth;
1955 2328
1956 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2329 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
1957 2330
1958 if (rootdepth != wattr.depth) 2331 if (rootdepth != wattr.depth)
1959 { 2332 {
1960 if (am_transparent) 2333 if (am_transparent)
1961 { 2334 {
1962 pchanged = 1; 2335 pchanged = 1;
1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2336 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1964 am_transparent = am_pixmap_trans = 0; 2337 am_transparent = am_pixmap_trans = 0;
1965 } 2338 }
1966 2339
1967 return pchanged; /* Don't try any more */ 2340 return pchanged; /* Don't try any more */
1968 } 2341 }
1969 2342
1970 /* 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. */
1971 XSync (display->display, False); 2344 XSync (disp, False);
1972 2345
1973 /* 2346 /*
1974 * Make the frame window set by the window manager have 2347 * Make the frame window set by the window manager have
1975 * the root background. Some window managers put multiple nested frame 2348 * the root background. Some window managers put multiple nested frame
1976 * 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.
1977 */ 2350 */
1978 i = (xa[XA_XROOTPMAPID] 2351 i = (xa[XA_XROOTPMAP_ID]
1979 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2352 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1980 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2353 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1981 &nitems, &bytes_after, &prop) == Success); 2354 &nitems, &bytes_after, &prop) == Success);
1982 2355
1983 if (!i || prop == NULL) 2356 if (!i || prop == NULL)
1984 i = (xa[XA_XSETROOTID] 2357 i = (xa[XA_ESETROOT_PMAP_ID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2358 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2359 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success); 2360 &nitems, &bytes_after, &prop) == Success);
1988 2361
1989 if (!i || prop == NULL) 2362 if (!i || prop == NULL
2363#if TINTING
2364 || !rs[Rs_color + Color_tint]
2365#endif
2366 )
1990 have_pixmap = 0; 2367 have_pixmap = 0;
1991 else 2368 else
1992 { 2369 {
1993 have_pixmap = 1; 2370 have_pixmap = 1;
1994 rootpixmap = *(Pixmap *)prop; 2371 rootpixmap = *(Pixmap *)prop;
… …
2005 Window cr; 2382 Window cr;
2006 XImage *image; 2383 XImage *image;
2007 GC gc; 2384 GC gc;
2008 XGCValues gcvalue; 2385 XGCValues gcvalue;
2009 2386
2010 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2387 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2011 0, 0, &sx, &sy, &cr); 2388 0, 0, &sx, &sy, &cr);
2012 nw = (unsigned int)szHint.width; 2389 nw = (unsigned int)szHint.width;
2013 nh = (unsigned int)szHint.height; 2390 nh = (unsigned int)szHint.height;
2014 nx = ny = 0; 2391 nx = ny = 0;
2015 2392
… …
2027 sy = 0; 2404 sy = 0;
2028 } 2405 }
2029 2406
2030 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2407 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2408 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2409
2410 XSync (disp, False);
2032 allowedxerror = -1; 2411 allowedxerror = -1;
2033 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2412 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034 2413
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2414 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */ 2415 /* XXX: may need a delay here? */
2037 allowedxerror = 0; 2416 allowedxerror = 0;
2038 2417
… …
2041 if (am_transparent && am_pixmap_trans) 2420 if (am_transparent && am_pixmap_trans)
2042 { 2421 {
2043 pchanged = 1; 2422 pchanged = 1;
2044 if (TermWin.pixmap != None) 2423 if (TermWin.pixmap != None)
2045 { 2424 {
2046 XFreePixmap (display->display, TermWin.pixmap); 2425 XFreePixmap (disp, TermWin.pixmap);
2047 TermWin.pixmap = None; 2426 TermWin.pixmap = None;
2048 } 2427 }
2049 } 2428 }
2050 2429
2051 am_pixmap_trans = 0; 2430 am_pixmap_trans = 0;
2052 } 2431 }
2053 else 2432 else
2054 { 2433 {
2055 if (TermWin.pixmap != None) 2434 if (TermWin.pixmap != None)
2056 XFreePixmap (display->display, TermWin.pixmap); 2435 XFreePixmap (disp, TermWin.pixmap);
2057 2436
2058#if TINTING 2437#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint)) 2438 if (ISSET_PIXCOLOR (Color_tint))
2060 { 2439 {
2061 unsigned short shade, rm, gm, bm; 2440 unsigned short rm, gm, bm;
2441 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2062 2442
2063 PixColors[Color_tint].get (display, rm, gm, bm); 2443 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2064 2444
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2445 ShadeXImage (display, image, shade, rm, gm, bm);
2066
2067 /* Determine bitshift and bitmask values */
2068 switch (image->bits_per_pixel)
2069 {
2070 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074 }
2075 } 2446 }
2076#endif 2447#endif
2077 2448
2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2449 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2079 szHint.width, szHint.height, image->depth); 2450 szHint.width, szHint.height, image->depth);
2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2451 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2452 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2082 nx, ny, image->width, image->height); 2453 nx, ny, image->width, image->height);
2083 XFreeGC (display->display, gc); 2454 XFreeGC (disp, gc);
2084 XDestroyImage (image); 2455 XDestroyImage (image);
2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2456 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2086 TermWin.pixmap); 2457 XClearWindow (disp, TermWin.parent[0]);
2087 2458
2088 if (!am_transparent || !am_pixmap_trans) 2459 if (!am_transparent || !am_pixmap_trans)
2089 pchanged = 1; 2460 pchanged = 1;
2090 2461
2091 am_transparent = am_pixmap_trans = 1; 2462 am_transparent = am_pixmap_trans = 1;
2092 } 2463 }
2093 } 2464 }
2094 2465
2095 if (!am_pixmap_trans) 2466 if (am_pixmap_trans)
2467 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2468 else
2096 { 2469 {
2097 unsigned int n; 2470 unsigned int n;
2098 /* 2471 /*
2099 * InheritPixmap transparency 2472 * InheritPixmap transparency
2100 */ 2473 */
2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2474 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2103 { 2475 {
2104 oldp = TermWin.parent[i]; 2476 oldp = TermWin.parent[i];
2105 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2477 XQueryTree (disp, TermWin.parent[i - 1], &root,
2106 &TermWin.parent[i], &list, &n); 2478 &TermWin.parent[i], &list, &n);
2107 XFree (list); 2479 XFree (list);
2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109 2480
2110 if (TermWin.parent[i] == display->root) 2481 if (TermWin.parent[i] == display->root)
2111 { 2482 {
2112 if (oldp != None) 2483 if (oldp != None)
2113 pchanged = 1; 2484 pchanged = 1;
… …
2123 2494
2124 if (pchanged) 2495 if (pchanged)
2125 { 2496 {
2126 for (; n < (unsigned int)i; n++) 2497 for (; n < (unsigned int)i; n++)
2127 { 2498 {
2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2499 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2129 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2130 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2500 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2131 { 2501 {
2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2502 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2133 break; 2503 break;
2134 } 2504 }
2135 } 2505 }
2136 } 2506 }
2137 2507
2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2508 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2139 { 2509 {
2140 D_X ((stderr, "InheritPixmap Turning off"));
2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2510 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2511 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2143 am_transparent = 0; 2512 am_transparent = 0;
2144 /* XXX: also turn off Opt_transparent? */ 2513 /* XXX: also turn off Opt_transparent? */
2145 } 2514 }
2146 else 2515 else
2147 { 2516 {
2148#if WAIT_FOR_WM 2517#if WAIT_FOR_WM
2149 /* wait (an arbitrary period) for the WM to do its thing 2518 /* wait (an arbitrary period) for the WM to do its thing
2150 * needed for fvwm2.2.2 (and before?) */ 2519 * needed for fvwm2.2.2 (and before?) */
2151 sleep (1); 2520 sleep (1);
2152#endif 2521#endif
2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154 for (n = 0; n < (unsigned int)i; n++) 2522 for (n = 0; n < (unsigned int)i; n++)
2523 {
2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2524 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2525 XClearWindow (disp, TermWin.parent[n]);
2526 }
2156 2527
2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2528 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2158 am_transparent = 1; 2529 am_transparent = 1;
2159 } 2530 }
2160 2531
2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2532 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2162 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 ();
2163 } 2548 }
2164 2549
2165 return pchanged; 2550 return pchanged;
2166} 2551}
2167#endif 2552#endif
… …
2186 if (ch == NOCHAR) // TODO: improve 2571 if (ch == NOCHAR) // TODO: improve
2187 break; 2572 break;
2188 2573
2189 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)
2190 { 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
2191 /* Read a text string from the input buffer */ 2590 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ]; 2591 unicode_t buf[UBUFSIZ];
2193 bool refreshnow = false; 2592 bool refreshnow = false;
2194 int nlines = 0; 2593 int nlines = 0;
2195 unicode_t *str = buf; 2594 unicode_t *str = buf;
2196 2595
2197 *str++ = ch;
2198
2199 for (;;) 2596 for (;;)
2200 { 2597 {
2201 seq_begin = cmdbuf_ptr;
2202 ch = next_char ();
2203
2204 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))
2205 break; 2599 break;
2206 2600
2207 *str++ = ch; 2601 *str++ = ch;
2208 2602
2209 if (ch == C0_LF) 2603 if (ch == C0_LF)
2210 { 2604 {
2211 nlines++; 2605 nlines++;
2212 refresh_count++; 2606 refresh_count++;
2213 2607
2214 if (! (Options & Opt_jumpScroll) 2608 if (!(options & Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2216 { 2610 {
2217 refreshnow = true; 2611 refreshnow = true;
2218 flag = true;
2219 ch = NOCHAR; 2612 ch = NOCHAR;
2220 break; 2613 break;
2221 } 2614 }
2222 2615
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2224 if (nlines >= TermWin.nrow - 1) 2617 if (nlines >= TermWin.nrow - 1)
2225 { 2618 {
2226 scr_add_lines (buf, nlines, str - buf); 2619 scr_add_lines (buf, nlines, str - buf);
2227 nlines = 0; 2620 nlines = 0;
2228 str = buf; 2621 str = buf;
… …
2232 if (str >= buf + UBUFSIZ) 2625 if (str >= buf + UBUFSIZ)
2233 { 2626 {
2234 ch = NOCHAR; 2627 ch = NOCHAR;
2235 break; 2628 break;
2236 } 2629 }
2630
2631 seq_begin = cmdbuf_ptr;
2632 ch = next_char ();
2237 } 2633 }
2238 2634
2239 scr_add_lines (buf, nlines, str - buf); 2635 scr_add_lines (buf, nlines, str - buf);
2240 2636
2241 /* 2637 /*
2242 * 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
2243 * 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.
2244 * the number of pages between refreshes is refresh_limit, which 2640 * the number of pages between refreshes is refresh_limit, which
2245 * is incremented here because we must be doing flat-out scrolling. 2641 * is incremented here because we must be doing flat-out scrolling.
2246 *
2247 * refreshing should be correct for small scrolls, because of the
2248 * time-out
2249 */ 2642 */
2250 if (refreshnow) 2643 if (refreshnow)
2251 { 2644 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++; 2646 refresh_limit++;
2254 else 2647 else
2648 {
2649 flag = true;
2255 scr_refresh (refresh_type); 2650 scr_refresh (refresh_type);
2651 }
2256 } 2652 }
2257 2653
2258 } 2654 }
2259 else 2655 else
2260 { 2656 {
… …
2274 } 2670 }
2275 2671
2276 return flag; 2672 return flag;
2277} 2673}
2278 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
2279// read the next character 2684// read the next character
2280unicode_t 2685unicode_t
2281rxvt_term::next_char () 2686rxvt_term::next_char ()
2282{ 2687{
2283 while (cmdbuf_ptr < cmdbuf_endp) 2688 while (cmdbuf_ptr < cmdbuf_endp)
… …
2299 if (len == (size_t)-1) 2704 if (len == (size_t)-1)
2300 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
2301 2706
2302 // assume wchar == unicode 2707 // assume wchar == unicode
2303 cmdbuf_ptr += len; 2708 cmdbuf_ptr += len;
2304 return wc; 2709 return wc & UNICODE_MASK;
2305 } 2710 }
2306 2711
2307 return NOCHAR; 2712 return NOCHAR;
2308} 2713}
2309 2714
… …
2314 */ 2719 */
2315unicode_t 2720unicode_t
2316rxvt_term::cmd_getc () 2721rxvt_term::cmd_getc ()
2317{ 2722{
2318 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 ();
2319 2735
2320 if (c == NOCHAR) 2736 if (c == NOCHAR)
2321 throw out_of_input; 2737 throw out_of_input;
2322 2738
2323 return c; 2739 return c;
… …
2424 process_escape_seq (); 2840 process_escape_seq ();
2425 break; 2841 break;
2426 case C0_ENQ: /* terminal Status */ 2842 case C0_ENQ: /* terminal Status */
2427 if (rs[Rs_answerbackstring]) 2843 if (rs[Rs_answerbackstring])
2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2844 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2429 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2845 (unsigned int)strlen (rs[Rs_answerbackstring]));
2430 else 2846 else
2431 tt_write ((unsigned char *)VT100_ANS, 2847 tt_write ((unsigned char *)VT100_ANS,
2432 (unsigned int)STRLEN (VT100_ANS)); 2848 (unsigned int)strlen (VT100_ANS));
2433 break; 2849 break;
2434 case C0_BEL: /* bell */ 2850 case C0_BEL: /* bell */
2435 scr_bell (); 2851 scr_bell ();
2436 break; 2852 break;
2437 case C0_BS: /* backspace */ 2853 case C0_BS: /* backspace */
… …
2453 break; 2869 break;
2454 case C0_SI: /* shift in - acs */ 2870 case C0_SI: /* shift in - acs */
2455 scr_charset_choose (0); 2871 scr_charset_choose (0);
2456 break; 2872 break;
2457 2873
2874#ifdef EIGHT_BIT_CONTROLS
2458 // 8-bit controls 2875 // 8-bit controls
2459 case 0x90: /* DCS */ 2876 case 0x90: /* DCS */
2460 process_dcs_seq (); 2877 process_dcs_seq ();
2461 break; 2878 break;
2462 case 0x9b: /* CSI */ 2879 case 0x9b: /* CSI */
2463 process_csi_seq (); 2880 process_csi_seq ();
2464 break; 2881 break;
2465 case 0x9d: /* CSI */ 2882 case 0x9d: /* CSI */
2466 process_osc_seq (); 2883 process_osc_seq ();
2467 break; 2884 break;
2885#endif
2468 } 2886 }
2469} 2887}
2470/*}}} */ 2888/*}}} */
2471 2889
2472 2890
… …
2534void 2952void
2535rxvt_term::process_escape_seq () 2953rxvt_term::process_escape_seq ()
2536{ 2954{
2537 unicode_t ch = cmd_getc (); 2955 unicode_t ch = cmd_getc ();
2538 2956
2539 if (PrivateModes & PrivMode_vt52) 2957 if (priv_modes & PrivMode_vt52)
2540 { 2958 {
2541 process_escape_vt52 (ch); 2959 process_escape_vt52 (ch);
2542 return; 2960 return;
2543 } 2961 }
2544 2962
… …
2559 scr_charset_set (2, (unsigned int)cmd_getc ()); 2977 scr_charset_set (2, (unsigned int)cmd_getc ());
2560 break; 2978 break;
2561 case '+': 2979 case '+':
2562 scr_charset_set (3, (unsigned int)cmd_getc ()); 2980 scr_charset_set (3, (unsigned int)cmd_getc ());
2563 break; 2981 break;
2564#ifndef NO_FRILLS 2982#if ENABLE_FRILLS
2565 case '6': 2983 case '6':
2566 scr_backindex (); 2984 scr_backindex ();
2567 break; 2985 break;
2568#endif 2986#endif
2569 case '7': 2987 case '7':
2570 scr_cursor (SAVE); 2988 scr_cursor (SAVE);
2571 break; 2989 break;
2572 case '8': 2990 case '8':
2573 scr_cursor (RESTORE); 2991 scr_cursor (RESTORE);
2574 break; 2992 break;
2575#ifndef NO_FRILLS 2993#if ENABLE_FRILLS
2576 case '9': 2994 case '9':
2577 scr_forwardindex (); 2995 scr_forwardindex ();
2578 break; 2996 break;
2579#endif 2997#endif
2580 case '=': 2998 case '=':
… …
2661 3079
2662/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3080/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663/* *INDENT-OFF* */ 3081/* *INDENT-OFF* */
2664enum { 3082enum {
2665 CSI_ICH = 0x40, 3083 CSI_ICH = 0x40,
2666 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3084 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2667 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3085 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2668 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3086 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2669 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3087 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2670 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3088 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2671 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3089 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2879 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2880 break; 3298 break;
2881 3299
2882 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2883 tt_write ((const unsigned char *)VT100_ANS, 3301 tt_write ((const unsigned char *)VT100_ANS,
2884 (unsigned int) (sizeof (VT100_ANS) - 1)); 3302 (unsigned int) (sizeof (VT100_ANS) - 1));
2885 break; 3303 break;
2886 3304
2887 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3305 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2888 process_sgr_mode (nargs, arg); 3306 process_sgr_mode (nargs, arg);
2889 break; 3307 break;
… …
2896 break; 3314 break;
2897 case 6: /* CPR requested */ 3315 case 6: /* CPR requested */
2898 scr_report_position (); 3316 scr_report_position ();
2899 break; 3317 break;
2900 case 7: /* unofficial extension */ 3318 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure) 3319 if (options & Opt_insecure)
2902 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3320 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2903 break; 3321 break;
2904 case 8: /* unofficial extension */ 3322 case 8: /* unofficial extension */
2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2906 break; 3324 break;
2907 } 3325 }
… …
2943 break; 3361 break;
2944 3362
2945 case CSI_RM: /* 8.3.107: RESET MODE */ 3363 case CSI_RM: /* 8.3.107: RESET MODE */
2946 if (arg[0] == 4) 3364 if (arg[0] == 4)
2947 scr_insert_mode (0); 3365 scr_insert_mode (0);
3366 else if (arg[0] == 20)
3367 priv_modes &= ~PrivMode_LFNL;
2948 break; 3368 break;
2949 3369
2950 case CSI_SM: /* 8.3.126: SET MODE */ 3370 case CSI_SM: /* 8.3.126: SET MODE */
2951 if (arg[0] == 4) 3371 if (arg[0] == 4)
2952 scr_insert_mode (1); 3372 scr_insert_mode (1);
3373 else if (arg[0] == 20)
3374 priv_modes |= PrivMode_LFNL;
2953 break; 3375 break;
2954 3376
2955 /* 3377 /*
2956 * PRIVATE USE beyond this point. All CSI_7? sequences here 3378 * PRIVATE USE beyond this point. All CSI_7? sequences here
2957 */ 3379 */
… …
2969 break; 3391 break;
2970 case CSI_75: 3392 case CSI_75:
2971 scr_cursor (RESTORE); 3393 scr_cursor (RESTORE);
2972 break; 3394 break;
2973 3395
2974#ifndef NO_FRILLS 3396#if ENABLE_FRILLS
2975 case CSI_74: 3397 case CSI_74:
2976 process_window_ops (arg, nargs); 3398 process_window_ops (arg, nargs);
2977 break; 3399 break;
2978#endif 3400#endif
2979 3401
… …
2986 break; 3408 break;
2987 } 3409 }
2988} 3410}
2989/*}}} */ 3411/*}}} */
2990 3412
2991#ifndef NO_FRILLS 3413#if ENABLE_FRILLS
2992/* ARGSUSED */ 3414/* ARGSUSED */
2993void 3415void
2994rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3416rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2995{ 3417{
2996 int x, y; 3418 int x, y;
2997 XWindowAttributes wattr; 3419 XWindowAttributes wattr;
2998 Window wdummy; 3420 Window wdummy;
3421 dDisp;
2999 3422
3000 if (nargs == 0) 3423 if (nargs == 0)
3001 return; 3424 return;
3002 3425
3003 switch (args[0]) 3426 switch (args[0])
3004 { 3427 {
3005 /* 3428 /*
3006 * commands 3429 * commands
3007 */ 3430 */
3008 case 1: /* deiconify window */ 3431 case 1: /* deiconify window */
3009 XMapWindow (display->display, TermWin.parent[0]); 3432 XMapWindow (disp, TermWin.parent[0]);
3010 break; 3433 break;
3011 case 2: /* iconify window */ 3434 case 2: /* iconify window */
3012 XIconifyWindow (display->display, TermWin.parent[0], 3435 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3013 DefaultScreen (display->display));
3014 break; 3436 break;
3015 case 3: /* set position (pixels) */ 3437 case 3: /* set position (pixels) */
3016 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3438 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3017 break; 3439 break;
3018 case 4: /* set size (pixels) */ 3440 case 4: /* set size (pixels) */
3019 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3020 break; 3442 break;
3021 case 5: /* raise window */ 3443 case 5: /* raise window */
3022 XRaiseWindow (display->display, TermWin.parent[0]); 3444 XRaiseWindow (disp, TermWin.parent[0]);
3023 break; 3445 break;
3024 case 6: /* lower window */ 3446 case 6: /* lower window */
3025 XLowerWindow (display->display, TermWin.parent[0]); 3447 XLowerWindow (disp, TermWin.parent[0]);
3026 break; 3448 break;
3027 case 7: /* refresh window */ 3449 case 7: /* refresh window */
3028 scr_touch (true); 3450 scr_touch (true);
3029 break; 3451 break;
3030 case 8: /* set size (chars) */ 3452 case 8: /* set size (chars) */
… …
3042 3464
3043 /* 3465 /*
3044 * reports - some output format copied from XTerm 3466 * reports - some output format copied from XTerm
3045 */ 3467 */
3046 case 11: /* report window state */ 3468 case 11: /* report window state */
3047 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3469 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3048 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3049 break; 3471 break;
3050 case 13: /* report window position */ 3472 case 13: /* report window position */
3051 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3473 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3052 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3474 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3053 -wattr.border_width, -wattr.border_width, 3475 -wattr.border_width, -wattr.border_width,
3054 &x, &y, &wdummy); 3476 &x, &y, &wdummy);
3055 tt_printf ("\033[3;%d;%dt", x, y); 3477 tt_printf ("\033[3;%d;%dt", x, y);
3056 break; 3478 break;
3057 case 14: /* report window size (pixels) */ 3479 case 14: /* report window size (pixels) */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3480 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3059 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3060 break; 3482 break;
3061 case 18: /* report text area size (chars) */ 3483 case 18: /* report text area size (chars) */
3062 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3063 break; 3485 break;
3064 case 19: /* report window size (chars) */ 3486 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3066 break; 3488 break;
3067 case 20: /* report icon label */ 3489 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 { 3490 {
3070 char *s; 3491 char *s;
3071 XGetIconName (display->display, TermWin.parent[0], &s); 3492 XGetIconName (disp, TermWin.parent[0], &s);
3072 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);
3073 } 3495 }
3074 break; 3496 break;
3075 case 21: /* report window title */ 3497 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 { 3498 {
3078 char *s; 3499 char *s;
3079 XFetchName (display->display, TermWin.parent[0], &s); 3500 XFetchName (disp, TermWin.parent[0], &s);
3080 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);
3081 } 3503 }
3082 break; 3504 break;
3083 } 3505 }
3084} 3506}
3085#endif 3507#endif
3086 3508
… …
3090 * ends_how is terminator used. returned input must be free()'d 3512 * ends_how is terminator used. returned input must be free()'d
3091 */ 3513 */
3092unsigned char * 3514unsigned char *
3093rxvt_term::get_to_st (unicode_t &ends_how) 3515rxvt_term::get_to_st (unicode_t &ends_how)
3094{ 3516{
3095 int seen_esc = 0; /* seen escape? */ 3517 unicode_t ch;
3518 bool seen_esc = false;
3096 unsigned int n = 0; 3519 unsigned int n = 0;
3097 unsigned char *s;
3098 unicode_t ch;
3099 unsigned char string[STRING_MAX]; 3520 wchar_t string[STRING_MAX];
3100 3521
3101 while ((ch = cmd_getc ())) 3522 while ((ch = cmd_getc ()) != NOCHAR)
3102 { 3523 {
3103 if (ch == C0_BEL || ch == CHAR_ST)
3104 break;
3105
3106 if (seen_esc) 3524 if (seen_esc)
3525 {
3107 if (ch == 0x5c) /* 7bit ST */ 3526 if (ch == 0x5c) /* 7bit ST */
3108 break; 3527 break;
3109 else 3528 else
3110 return NULL; 3529 return NULL;
3111 3530 }
3112 if (ch == C0_ESC) 3531 else if (ch == C0_ESC)
3113 { 3532 {
3114 seen_esc = 1; 3533 seen_esc = true;
3115 continue; 3534 continue;
3116 } 3535 }
3536 else if (ch == C0_BEL || ch == CHAR_ST)
3537 break;
3117 else if (ch == C0_HT) 3538 else if (ch < 0x20)
3118 ch = ' '; /* translate '\t' to space */
3119 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
3120 return NULL; /* other control character - exit */ 3539 return NULL; /* other control character - exit */
3540
3541 seen_esc = false;
3121 3542
3122 if (n >= sizeof (string) - 1) 3543 if (n >= sizeof (string) - 1)
3123 // stop at some sane length 3544 // stop at some sane length
3124 return NULL; 3545 return NULL;
3125 3546
3547 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 ();
3549 else
3126 string[n++] = ch; 3550 string[n++] = ch;
3127 seen_esc = 0;
3128 } 3551 }
3129 3552
3130 string[n++] = '\0'; 3553 string[n++] = '\0';
3131 3554
3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3133 return NULL;
3134
3135 ends_how = (ch == 0x5c ? C0_ESC : ch); 3555 ends_how = (ch == 0x5c ? C0_ESC : ch);
3136 STRNCPY (s, string, n); 3556
3137 return s; 3557 return (unsigned char *)rxvt_wcstombs (string);
3138} 3558}
3139 3559
3140/*----------------------------------------------------------------------*/ 3560/*----------------------------------------------------------------------*/
3141/* 3561/*
3142 * 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)'
… …
3186void 3606void
3187rxvt_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)
3188{ 3608{
3189 if (str[0] == '?' && !str[1]) 3609 if (str[0] == '?' && !str[1])
3190 { 3610 {
3191 if (Options & Opt_insecure)
3192 {
3193 unsigned short r, g, b; 3611 unsigned short r, g, b;
3194 PixColors[color].get (display, r, g, b); 3612 pix_colors_focused[color].get (display, r, g, b);
3195 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);
3196 }
3197 } 3614 }
3198 else 3615 else
3199 set_window_color (color, str); 3616 set_window_color (color, str);
3200} 3617}
3201 3618
… …
3229{ 3646{
3230 int changed = 0; 3647 int changed = 0;
3231 int color; 3648 int color;
3232 char *buf, *name; 3649 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1]; 3650 bool query = str[0] == '?' && !str[1];
3651 int saveop = op;
3652 dDisp;
3234 3653
3235 assert (str != NULL); 3654 assert (str != NULL);
3236 switch (op) 3655 switch (op)
3237 { 3656 {
3238 case XTerm_name: 3657 case XTerm_name:
… …
3245 set_title (str); 3664 set_title (str);
3246 break; 3665 break;
3247 case XTerm_property: 3666 case XTerm_property:
3248 if (str[0] == '?') 3667 if (str[0] == '?')
3249 { 3668 {
3250 Atom prop = XInternAtom (display->display, str + 1, True); 3669 Atom prop = display->atom (str + 1);
3251 Atom actual_type; 3670 Atom actual_type;
3252 int actual_format; 3671 int actual_format;
3253 unsigned long nitems; 3672 unsigned long nitems;
3254 unsigned long bytes_after; 3673 unsigned long bytes_after;
3255 unsigned char *value = 0; 3674 unsigned char *value = 0;
3256 const char *str = ""; 3675 const char *str = "";
3257 3676
3258 if (prop 3677 if (prop
3259 && XGetWindowProperty (display->display, TermWin.parent[0], 3678 && XGetWindowProperty (disp, TermWin.parent[0],
3260 prop, 0, 1<<16, 0, AnyPropertyType, 3679 prop, 0, 1<<16, 0, AnyPropertyType,
3261 &actual_type, &actual_format, 3680 &actual_type, &actual_format,
3262 &nitems, &bytes_after, &value) == Success 3681 &nitems, &bytes_after, &value) == Success
3263 && actual_type != None 3682 && actual_type != None
3264 && actual_format == 8) 3683 && actual_format == 8)
… …
3273 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3692 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3274 3693
3275 if (eq) 3694 if (eq)
3276 { 3695 {
3277 *eq = 0; 3696 *eq = 0;
3278 XChangeProperty (display->display, TermWin.parent[0], 3697 set_utf8_property (display->atom (str), eq + 1);
3279 display->atom (str), XA_STRING, 8,
3280 PropModeReplace, (unsigned char *)eq + 1,
3281 strlen (eq + 1));
3282 } 3698 }
3283 else 3699 else
3284 XDeleteProperty (display->display, TermWin.parent[0], 3700 XDeleteProperty (disp, TermWin.parent[0],
3285 display->atom (str)); 3701 display->atom (str));
3286 } 3702 }
3287 break; 3703 break;
3288 3704
3289 case XTerm_Color: 3705 case XTerm_Color:
3290 for (buf = (char *)str; buf && *buf;) 3706 for (buf = (char *)str; buf && *buf;)
3291 { 3707 {
3292 if ((name = STRCHR (buf, ';')) == NULL) 3708 if ((name = strchr (buf, ';')) == NULL)
3293 break; 3709 break;
3294 3710
3295 *name++ = '\0'; 3711 *name++ = '\0';
3296 color = atoi (buf); 3712 color = atoi (buf);
3297 3713
3298 if (color < 0 || color >= TOTAL_COLORS) 3714 if (color < 0 || color >= TOTAL_COLORS)
3299 break; 3715 break;
3300 3716
3301 if ((buf = STRCHR (name, ';')) != NULL) 3717 if ((buf = strchr (name, ';')) != NULL)
3302 *buf++ = '\0'; 3718 *buf++ = '\0';
3303 3719
3304 if (name[0] == '?' && !name[1]) 3720 if (name[0] == '?' && !name[1])
3305 { 3721 {
3306 if (Options & Opt_insecure)
3307 {
3308 unsigned short r, g, b; 3722 unsigned short r, g, b;
3309 PixColors[color + minCOLOR].get (display, r, g, b); 3723 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3310 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);
3311 }
3312 } 3725 }
3313 else 3726 else
3314 set_window_color (color + minCOLOR, name); 3727 set_window_color (color + minCOLOR, name);
3315 } 3728 }
3316 break; 3729 break;
… …
3333 break; 3746 break;
3334#ifndef NO_BOLD_UNDERLINE_REVERSE 3747#ifndef NO_BOLD_UNDERLINE_REVERSE
3335 case XTerm_Color_BD: 3748 case XTerm_Color_BD:
3336 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3749 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3337 break; 3750 break;
3751 case XTerm_Color_IT:
3752 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3753 break;
3338 case XTerm_Color_UL: 3754 case XTerm_Color_UL:
3339 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3755 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3340 break; 3756 break;
3341 case XTerm_Color_RV: 3757 case XTerm_Color_RV:
3342 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;
3343 break; 3767 break;
3344#endif 3768#endif
3345 3769
3346 case XTerm_Pixmap: 3770 case XTerm_Pixmap:
3347 if (*str != ';') 3771 if (*str != ';')
… …
3350 scale_pixmap (""); /* reset to default scaling */ 3774 scale_pixmap (""); /* reset to default scaling */
3351 set_bgPixmap (str); /* change pixmap */ 3775 set_bgPixmap (str); /* change pixmap */
3352#endif 3776#endif
3353 scr_touch (true); 3777 scr_touch (true);
3354 } 3778 }
3355 while ((str = STRCHR (str, ';')) != NULL) 3779 while ((str = strchr (str, ';')) != NULL)
3356 { 3780 {
3357 str++; 3781 str++;
3358#if XPM_BACKGROUND 3782#if XPM_BACKGROUND
3359 changed += scale_pixmap (str); 3783 changed += scale_pixmap (str);
3360#endif 3784#endif
3361
3362 } 3785 }
3786
3363 if (changed) 3787 if (changed)
3364 { 3788 {
3365#ifdef XPM_BACKGROUND 3789#ifdef XPM_BACKGROUND
3366 resize_pixmap (); 3790 resize_pixmap ();
3367#endif 3791#endif
… …
3379 case XTerm_logfile: 3803 case XTerm_logfile:
3380 // TODO, when secure mode? 3804 // TODO, when secure mode?
3381 break; 3805 break;
3382 3806
3383 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
3384 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
3385 { 3821 {
3386 if (Options & Opt_insecure) 3822 const char *&res = rs[Rs_font + (op - URxvt_font)];
3387 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3823
3388 TermWin.fontset->fontdesc 3824 res = strdup (str);
3389 ? TermWin.fontset->fontdesc 3825 allocated.push_back ((void *)res);
3390 : "", 3826 set_fonts ();
3391 resp);
3392 } 3827 }
3393 else
3394 change_font (str);
3395 break; 3828 break;
3396 3829
3397#ifndef NO_FRILLS 3830#if ENABLE_FRILLS
3398 case XTerm_locale: 3831 case XTerm_locale:
3399 if (query) 3832 if (query)
3400 {
3401 if (Options & Opt_insecure)
3402 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3833 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3403 }
3404 else 3834 else
3405 { 3835 {
3406 set_locale (str); 3836 set_locale (str);
3837 pty.set_utf8_mode (enc_utf8);
3407# ifdef USE_XIM 3838# ifdef USE_XIM
3408 im_cb (); 3839 im_cb ();
3409# endif 3840# endif
3410 } 3841 }
3411 break; 3842 break;
3412
3413 case XTerm_findfont:
3414 if (Options & Opt_insecure)
3415 {
3416 int fid = TermWin.fontset->find_font (atoi (str));
3417 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418 fid, (*TermWin.fontset)[fid]->name, resp);
3419 }
3420 break;
3421#endif 3843#endif
3422 3844
3423#ifdef MENUBAR 3845#ifdef MENUBAR
3424 case XTerm_Menu: 3846 case XTerm_Menu:
3425 if (Options & Opt_insecure) 3847 if (options & Opt_insecure)
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break; 3849 break;
3428#endif 3850#endif
3429#if 0 3851#if 0
3430 case XTerm_dumpscreen: /* no error notices */ 3852 case XTerm_dumpscreen: /* no error notices */
… …
3457{ 3879{
3458 int state; 3880 int state;
3459 3881
3460 if (mode == 's') 3882 if (mode == 's')
3461 { 3883 {
3462 SavedModes |= (PrivateModes & bit); 3884 SavedModes |= (priv_modes & bit);
3463 return -1; 3885 return -1;
3464 } 3886 }
3465 else 3887 else
3466 { 3888 {
3467 if (mode == 'r') 3889 if (mode == 'r')
3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3890 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3469 else 3891 else
3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3892 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3471 PrivMode (state, bit); 3893 PrivMode (state, bit);
3472 } 3894 }
3473 3895
3474 return state; 3896 return state;
3475} 3897}
… …
3493 { 3, PrivMode_132 }, 3915 { 3, PrivMode_132 },
3494 { 4, PrivMode_smoothScroll }, 3916 { 4, PrivMode_smoothScroll },
3495 { 5, PrivMode_rVideo }, 3917 { 5, PrivMode_rVideo },
3496 { 6, PrivMode_relOrigin }, 3918 { 6, PrivMode_relOrigin },
3497 { 7, PrivMode_Autowrap }, 3919 { 7, PrivMode_Autowrap },
3920 // 8, bi-directional support mode
3498 { 9, PrivMode_MouseX10 }, 3921 { 9, PrivMode_MouseX10 },
3499#ifdef menuBar_esc 3922#ifdef menuBar_esc
3500 { menuBar_esc, PrivMode_menuBar }, 3923 { menuBar_esc, PrivMode_menuBar },
3501#endif 3924#endif
3925 // 18, 19 printing-related
3926 { 25, PrivMode_VisibleCursor },
3502#ifdef scrollBar_esc 3927#ifdef scrollBar_esc
3503 { scrollBar_esc, PrivMode_scrollBar }, 3928 { scrollBar_esc, PrivMode_scrollBar },
3504#endif 3929#endif
3505 // 18, 19 printing-related
3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3508 { 35, PrivMode_ShiftKeys }, // rxvt extension 3930 { 35, PrivMode_ShiftKeys }, // rxvt extension
3509 { 40, PrivMode_132OK }, 3931 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI 3932 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI 3933 // 45 margin bell NYI
3512 // 46 start logging 3934 // 46 start logging
… …
3553 3975
3554 /* extra handling for values with state unkept */ 3976 /* extra handling for values with state unkept */
3555 switch (arg[i]) 3977 switch (arg[i])
3556 { 3978 {
3557 case 1048: /* alternative cursor save */ 3979 case 1048: /* alternative cursor save */
3980 case 1049:
3558 if (Options & Opt_secondaryScreen) 3981 if (options & Opt_secondaryScreen)
3559 if (mode == 0) 3982 if (mode == 0)
3560 scr_cursor (RESTORE); 3983 scr_cursor (RESTORE);
3561 else if (mode == 1) 3984 else if (mode == 1)
3562 scr_cursor (SAVE); 3985 scr_cursor (SAVE);
3563 break; 3986 break;
… …
3574 * within VT52 mode 3997 * within VT52 mode
3575 */ 3998 */
3576 PrivMode (1, PrivMode_vt52); 3999 PrivMode (1, PrivMode_vt52);
3577 break; 4000 break;
3578 case 3: /* 80/132 */ 4001 case 3: /* 80/132 */
3579 if (PrivateModes & PrivMode_132OK) 4002 if (priv_modes & PrivMode_132OK)
3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4003 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3581 break; 4004 break;
3582 case 4: /* smooth scrolling */ 4005 case 4: /* smooth scrolling */
3583 if (state) 4006 if (state)
3584 Options &= ~Opt_jumpScroll; 4007 options &= ~Opt_jumpScroll;
3585 else 4008 else
3586 Options |= Opt_jumpScroll; 4009 options |= Opt_jumpScroll;
3587 break; 4010 break;
3588 case 5: /* reverse video */ 4011 case 5: /* reverse video */
3589 scr_rvideo_mode (state); 4012 scr_rvideo_mode (state);
3590 break; 4013 break;
3591 case 6: /* relative/absolute origins */ 4014 case 6: /* relative/absolute origins */
… …
3595 scr_autowrap (state); 4018 scr_autowrap (state);
3596 break; 4019 break;
3597 /* 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 */
3598 case 9: /* X10 mouse reporting */ 4021 case 9: /* X10 mouse reporting */
3599 if (state) /* orthogonal */ 4022 if (state) /* orthogonal */
3600 PrivateModes &= ~PrivMode_MouseX11; 4023 priv_modes &= ~PrivMode_MouseX11;
3601 break; 4024 break;
3602#ifdef menuBar_esc 4025#ifdef menuBar_esc
3603 case menuBar_esc: 4026 case menuBar_esc:
3604#ifdef MENUBAR 4027#ifdef MENUBAR
3605 map_menuBar (state); 4028 map_menuBar (state);
… …
3625 break; 4048 break;
3626 /* case 66: - application key pad */ 4049 /* case 66: - application key pad */
3627 /* case 67: - backspace key */ 4050 /* case 67: - backspace key */
3628 case 1000: /* X11 mouse reporting */ 4051 case 1000: /* X11 mouse reporting */
3629 if (state) /* orthogonal */ 4052 if (state) /* orthogonal */
3630 PrivateModes &= ~PrivMode_MouseX10; 4053 priv_modes &= ~PrivMode_MouseX10;
3631 break; 4054 break;
3632#if 0 4055#if 0
3633 case 1001: 4056 case 1001:
3634 break; /* X11 mouse highlighting */ 4057 break; /* X11 mouse highlighting */
3635#endif 4058#endif
3636 case 1010: /* scroll to bottom on TTY output inhibit */ 4059 case 1010: /* scroll to bottom on TTY output inhibit */
3637 if (state) 4060 if (state)
3638 Options &= ~Opt_scrollTtyOutput; 4061 options &= ~Opt_scrollTtyOutput;
3639 else 4062 else
3640 Options |= Opt_scrollTtyOutput; 4063 options |= Opt_scrollTtyOutput;
3641 break; 4064 break;
3642 case 1011: /* scroll to bottom on key press */ 4065 case 1011: /* scroll to bottom on key press */
3643 if (state) 4066 if (state)
3644 Options |= Opt_scrollTtyKeypress; 4067 options |= Opt_scrollTtyKeypress;
3645 else 4068 else
3646 Options &= ~Opt_scrollTtyKeypress; 4069 options &= ~Opt_scrollTtyKeypress;
3647 break; 4070 break;
3648 case 1047: /* secondary screen w/ clearing last */ 4071 case 1047: /* secondary screen w/ clearing last */
3649 if (Options & Opt_secondaryScreen) 4072 if (options & Opt_secondaryScreen)
3650 if (current_screen != PRIMARY) 4073 if (current_screen != PRIMARY)
3651 scr_erase_screen (2); 4074 scr_erase_screen (2);
3652 scr_change_screen (state); 4075 scr_change_screen (state);
3653 break; 4076 break;
3654 case 1049: /* secondary screen w/ clearing first */ 4077 case 1049: /* secondary screen w/ clearing first */
3655 scr_change_screen (state); 4078 scr_change_screen (state);
3656 if (Options & Opt_secondaryScreen) 4079 if (options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY) 4080 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4081 scr_erase_screen (2);
3659 break; 4082 break;
3660 default: 4083 default:
3661 break; 4084 break;
… …
3687 rendset = 0, rendstyle = ~RS_None; 4110 rendset = 0, rendstyle = ~RS_None;
3688 break; 4111 break;
3689 case 1: 4112 case 1:
3690 rendset = 1, rendstyle = RS_Bold; 4113 rendset = 1, rendstyle = RS_Bold;
3691 break; 4114 break;
4115 //case 2: // low intensity
4116 case 3:
4117 rendset = 1, rendstyle = RS_Italic;
4118 break;
3692 case 4: 4119 case 4:
3693 rendset = 1, rendstyle = RS_Uline; 4120 rendset = 1, rendstyle = RS_Uline;
3694 break; 4121 break;
3695 case 5: 4122 case 5: // slowly blinking
4123 case 6: // rapidly blinking
3696 rendset = 1, rendstyle = RS_Blink; 4124 rendset = 1, rendstyle = RS_Blink;
3697 break; 4125 break;
3698 //case 6: // scoansi light background 4126 //case 6: // scoansi light background
3699 case 7: 4127 case 7:
3700 rendset = 1, rendstyle = RS_RVid; 4128 rendset = 1, rendstyle = RS_RVid;
3701 break; 4129 break;
3702 case 8: 4130 case 8:
3703 // invisible. NYI 4131 // invisible. NYI
3704 break; 4132 break;
4133 //case 9: // crossed out
3705 //case 10: // scoansi acs off 4134 //case 10: // scoansi acs off, primary font
3706 //case 11: // scoansi acs on 4135 //case 11: // scoansi acs on, first alt font
3707 //case 12: // scoansi acs on, |0x80 4136 //case 12: // scoansi acs on, |0x80, second alt font
3708 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)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4141 rendset = 0, rendstyle = RS_Bold;
3710 break; 4142 break;
3711 case 22: 4143 case 22: // normal intensity
3712 rendset = 0, rendstyle = RS_Bold; 4144 rendset = 0, rendstyle = RS_Bold;
4145 break;
4146 case 23: // disable italic
4147 rendset = 0, rendstyle = RS_Italic;
3713 break; 4148 break;
3714 case 24: 4149 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4150 rendset = 0, rendstyle = RS_Uline;
3716 break; 4151 break;
3717 case 25: 4152 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4153 rendset = 0, rendstyle = RS_Blink;
3719 break; 4154 break;
4155 case 26: // variable spacing (iso 8613)
4156 rendset = 0, rendstyle = RS_Blink;
4157 break;
3720 case 27: 4158 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4159 rendset = 0, rendstyle = RS_RVid;
3722 break; 4160 break;
3723 case 28:
3724 // visible. NYI 4161 //case 28: // visible. NYI
3725 break; 4162 //case 29: // not crossed-out
3726 } 4163 }
3727 4164
3728 if (rendset != -1) 4165 if (rendset != -1)
3729 { 4166 {
3730 scr_rendition (rendset, rendstyle); 4167 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4178 case 35:
3742 case 36: 4179 case 36:
3743 case 37: 4180 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4181 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4182 break;
3746#ifdef TTY_256COLOR 4183 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4184 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4185 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4186 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4187 i += 2;
3752 } 4188 }
3753 break; 4189 break;
3754#endif
3755 case 39: /* default fg */ 4190 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4191 scr_color (Color_fg, Color_fg);
3757 break; 4192 break;
3758 4193
3759 case 40: 4194 case 40:
… …
3764 case 45: 4199 case 45:
3765 case 46: 4200 case 46:
3766 case 47: 4201 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4202 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4203 break;
3769#ifdef TTY_256COLOR 4204 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4205 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4206 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4207 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4208 i += 2;
3775 } 4209 }
3776 break; 4210 break;
3777#endif
3778 case 49: /* default bg */ 4211 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4212 scr_color (Color_bg, Color_bg);
3780 break; 4213 break;
4214
4215 //case 50: // not variable spacing
3781 4216
3782#ifndef NO_BRIGHTCOLOR 4217#ifndef NO_BRIGHTCOLOR
3783 case 90: 4218 case 90:
3784 case 91: /* set bright fg color */ 4219 case 91: /* set bright fg color */
3785 case 92: 4220 case 92:
3786 case 93: 4221 case 93:
3787 case 94: 4222 case 94:
3788 case 95: 4223 case 95:
3789 case 96: 4224 case 96:
3790 case 97: 4225 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4226 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4227 break;
3794 case 100: 4228 case 100:
3795 case 101: /* set bright bg color */ 4229 case 101: /* set bright bg color */
3796 case 102: 4230 case 102:
3797 case 103: 4231 case 103:
3798 case 104: 4232 case 104:
3799 case 105: 4233 case 105:
3800 case 106: 4234 case 106:
3801 case 107: 4235 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4236 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4237 break;
3805#endif 4238#endif
3806 4239
3807 } 4240 }
3808 } 4241 }
… …
3815{ 4248{
3816 unicode_t ch, cmd = cmd_getc (); 4249 unicode_t ch, cmd = cmd_getc ();
3817 4250
3818 if (cmd == 'Q') 4251 if (cmd == 'Q')
3819 { /* query graphics */ 4252 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4253 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4254 return;
3822 } 4255 }
3823 /* swallow other graphics sequences until terminating ':' */ 4256 /* swallow other graphics sequences until terminating ':' */
3824 do 4257 do
3825 ch = cmd_getc (); 4258 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4273 unsigned char buf[256];
3841 4274
3842 va_start (arg_ptr, fmt); 4275 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4276 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4277 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4278 tt_write (buf, strlen (buf));
3846} 4279}
3847 4280
3848/* ---------------------------------------------------------------------- */ 4281/* ---------------------------------------------------------------------- */
3849/* 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,
3850 * or generated by us in response to a query ESC sequence. 4283 * or generated by us in response to a query ESC sequence.
3851 */ 4284 */
4285const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4286
3852void 4287void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4288rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4289{
3855 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));
3856 4293
3857 if (len) 4294 if ((unsigned int)written == len)
4295 return;
4296
4297 data += written;
4298 len -= written;
3858 { 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
3859 if (v_buflen == 0) 4317 if (v_buflen == 0)
3860 { 4318 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4319 free (v_buffer);
3888 v_buffer = 0; 4320 v_buffer = 0;
3889 v_buflen = 0; 4321 v_buflen = 0;
3890 4322
3891 pty_ev.set (EVENT_READ); 4323 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4324 return;
3904 } 4325 }
4326
4327 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4328 }
4329 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4330 // original code just ignores this...
4331 destroy ();
3906} 4332}
3907 4333
3908/*----------------------- end-of-file (C source) -----------------------*/ 4334/*----------------------- end-of-file (C source) -----------------------*/
3909 4335

Diff Legend

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