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

Diff Legend

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