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.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.192 by root, Fri Feb 4 11:41:23 2005 UTC

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

Diff Legend

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