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.36 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.49 by pcg, Sat Feb 21 22:14:00 2004 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
53 54
54/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
55 56
56/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
57void 58void
58rxvt_term::lookup_key (XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
59{ 60{
60 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
61 unsigned int newlen; 62 unsigned int newlen;
62 KeySym keysym; 63 KeySym keysym;
63#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
65#endif 66#endif
66 int valid_keysym; 67 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
68 69
69 /* 70 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
72 * 73 *
73 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
74 */ 75 */
75 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
76 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
77 meta = (ev->state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
78 79
79 if (numlock_state || (ev->state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
80 { 81 {
81 numlock_state = (ev->state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 84 }
84 85
85 kbuf[0] = 0; 86 kbuf[0] = 0;
86 87
87#ifdef USE_XIM 88#ifdef USE_XIM
88 if (Input_Context) 89 if (Input_Context)
89 { 90 {
90 Status status_return; 91 Status status_return;
91 92
92#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
96 else 97 else
97#endif 98#endif
98
99 { 99 {
100 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
101 101
102 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
106 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 110 SET_LOCALE (locale);
111 111
112 if (status_return == XLookupChars 112 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 { 114 {
115 wkbuf[len] = 0; 115 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 117 if (len < 0)
118 len = 0; 118 len = 0;
… …
120 else 120 else
121 len = 0; 121 len = 0;
122 } 122 }
123 123
124 valid_keysym = status_return == XLookupKeySym 124 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 125 || status_return == XLookupBoth;
126 } 126 }
127 else 127 else
128#endif 128#endif
129
130 { 129 {
131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 130 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 131 valid_keysym = keysym != NoSymbol;
133 } 132 }
134 133
135 if (valid_keysym) 134 if (valid_keysym)
136 { 135 {
137 /* for some backwards compatibility */ 136 /* for some backwards compatibility */
… …
162 { 161 {
163#else 162#else
164 if (IS_SCROLL_MOD) 163 if (IS_SCROLL_MOD)
165 { 164 {
166#endif 165#endif
167 int lnsppg; 166 int lnsppg;
168 167
169#ifdef PAGING_CONTEXT_LINES 168#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
171#else 170#else
172 lnsppg = TermWin.nrow * 4 / 5; 171 lnsppg = TermWin.nrow * 4 / 5;
… …
210 scr_move_to (1, 0); 209 scr_move_to (1, 0);
211 return; 210 return;
212 } 211 }
213 } 212 }
214#endif 213#endif
215
216 } 214 }
217 215
218 if (shft) 216 if (shft)
219 { 217 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 218 /* Shift + F1 - F10 generates F11 - F20 */
… …
227 { 225 {
228 switch (keysym) 226 switch (keysym)
229 { 227 {
230 /* normal XTerm key bindings */ 228 /* normal XTerm key bindings */
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 229 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev->time, 0, 0); 230 selection_request (ev.time, 0, 0);
233 return; 231 return;
234 /* rxvt extras */ 232 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 233 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 234 change_font (0, FONT_UP);
237 return; 235 return;
… …
253 { 251 {
254 greek_mode = !greek_mode; 252 greek_mode = !greek_mode;
255 if (greek_mode) 253 if (greek_mode)
256 { 254 {
257 xterm_seq (XTerm_title, 255 xterm_seq (XTerm_title,
258 (greek_getmode() == GREEK_ELOT928 256 (greek_getmode () == GREEK_ELOT928
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 257 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
260 greek_reset(); 258 greek_reset ();
261 } 259 }
262 else 260 else
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 261 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return; 262 return;
265 } 263 }
266#endif 264#endif
267 265
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 266 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 { 267 {
270#ifdef KEYSYM_RESOURCE 268#ifdef KEYSYM_RESOURCE
271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 269 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 270 {
273 unsigned int l; 271 unsigned int l;
274 const unsigned char *kbuf0; 272 const unsigned char *kbuf0;
275 const unsigned char ch = C0_ESC; 273 const unsigned char ch = C0_ESC;
276 274
… …
286 tt_write (kbuf0, l); 284 tt_write (kbuf0, l);
287 return; 285 return;
288 } 286 }
289 else 287 else
290#endif 288#endif
291
292 { 289 {
293 newlen = 1; 290 newlen = 1;
294 switch (keysym) 291 switch (keysym)
295 { 292 {
296#ifndef NO_BACKSPACE_KEY 293#ifndef NO_BACKSPACE_KEY
297 case XK_BackSpace: 294 case XK_BackSpace:
298 if (PrivateModes & PrivMode_HaveBackSpace) 295 if (PrivateModes & PrivMode_HaveBackSpace)
299 { 296 {
300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 297 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
301 ^ !!ctrl) ? '\b' : '\177'; 298 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 299 kbuf[1] = '\0';
303 } 300 }
304 else 301 else
305 STRCPY(kbuf, key_backspace); 302 STRCPY (kbuf, key_backspace);
306# ifdef MULTICHAR_SET 303# ifdef MULTICHAR_SET
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0) 304 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
308 { 305 {
309 int col, row; 306 int col, row;
310 307
311 newlen = STRLEN(kbuf); 308 newlen = STRLEN (kbuf);
312 col = screen.cur.col - 1; 309 col = screen.cur.col - 1;
313 row = screen.cur.row + TermWin.saveLines; 310 row = screen.cur.row + TermWin.saveLines;
314 if (IS_MULTI2(screen.rend[row][col])) 311 if (IS_MULTI2 (screen.rend[row][col]))
315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 312 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
316 } 313 }
317# endif 314# endif
318 break; 315 break;
319#endif 316#endif
320#ifndef NO_DELETE_KEY 317#ifndef NO_DELETE_KEY
321 case XK_Delete: 318 case XK_Delete:
322 STRCPY(kbuf, key_delete); 319 STRCPY (kbuf, key_delete);
323# ifdef MULTICHAR_SET 320# ifdef MULTICHAR_SET
324 if (Options & Opt_mc_hack) 321 if (Options & Opt_mc_hack)
325 { 322 {
326 int col, row; 323 int col, row;
327 324
328 newlen = STRLEN(kbuf); 325 newlen = STRLEN (kbuf);
329 col = screen.cur.col; 326 col = screen.cur.col;
330 row = screen.cur.row + TermWin.saveLines; 327 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1(screen.rend[row][col])) 328 if (IS_MULTI1 (screen.rend[row][col]))
332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 329 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
333 } 330 }
334# endif 331# endif
335 break; 332 break;
336#endif 333#endif
337 case XK_Tab: 334 case XK_Tab:
338 if (shft) 335 if (shft)
339 STRCPY(kbuf, "\033[Z"); 336 STRCPY (kbuf, "\033[Z");
340 else 337 else
341 { 338 {
342#ifdef CTRL_TAB_MAKES_META 339#ifdef CTRL_TAB_MAKES_META
343 if (ctrl) 340 if (ctrl)
344 meta = 1; 341 meta = 1;
345#endif 342#endif
346#ifdef MOD4_TAB_MAKES_META 343#ifdef MOD4_TAB_MAKES_META
347 if (ev->state & Mod4Mask) 344 if (ev.state & Mod4Mask)
348 meta = 1; 345 meta = 1;
349#endif 346#endif
350 newlen = 0; 347 newlen = 0;
351 } 348 }
352 break; 349 break;
353
354 350
355#ifdef XK_KP_Left 351#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 352 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 353 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 354 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 355 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 356 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
361 { 357 {
362 STRCPY(kbuf, "\033OZ"); 358 STRCPY (kbuf, "\033OZ");
363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 359 kbuf[2] = "txvr"[keysym - XK_KP_Left];
364 break; 360 break;
365 } 361 }
366 else 362 else
367 /* translate to std. cursor key */ 363 /* translate to std. cursor key */
368 keysym = XK_Left + (keysym - XK_KP_Left); 364 keysym = XK_Left + (keysym - XK_KP_Left);
… …
370#endif 366#endif
371 case XK_Up: /* "\033[A" */ 367 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 368 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 369 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 370 case XK_Left: /* "\033[D" */
375 STRCPY(kbuf, "\033[Z"); 371 STRCPY (kbuf, "\033[Z");
376 kbuf[2] = ("DACB"[keysym - XK_Left]); 372 kbuf[2] = "DACB"[keysym - XK_Left];
377 /* do Shift first */ 373 /* do Shift first */
378 if (shft) 374 if (shft)
379 kbuf[2] = ("dacb"[keysym - XK_Left]); 375 kbuf[2] = "dacb"[keysym - XK_Left];
380 else if (ctrl) 376 else if (ctrl)
381 { 377 {
382 kbuf[1] = 'O'; 378 kbuf[1] = 'O';
383 kbuf[2] = ("dacb"[keysym - XK_Left]); 379 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 380 }
385 else if (PrivateModes & PrivMode_aplCUR) 381 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 382 kbuf[1] = 'O';
387#ifdef MULTICHAR_SET 383#ifdef MULTICHAR_SET
388 //TODO: ?? 384 //TODO: ??
… …
392 388
393 col = screen.cur.col; 389 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines; 390 row = screen.cur.row + TermWin.saveLines;
395 m = 0; 391 m = 0;
396 if (keysym == XK_Right 392 if (keysym == XK_Right
397 && IS_MULTI1(screen.rend[row][col])) 393 && IS_MULTI1 (screen.rend[row][col]))
398 m = 1; 394 m = 1;
399 else if (keysym == XK_Left) 395 else if (keysym == XK_Left)
400 { 396 {
401 if (col > 0) 397 if (col > 0)
402 { 398 {
403 if (IS_MULTI2(screen.rend[row][col - 1])) 399 if (IS_MULTI2 (screen.rend[row][col - 1]))
404 m = 1; 400 m = 1;
405 } 401 }
406 else if (screen.cur.row > 0) 402 else if (screen.cur.row > 0)
407 { 403 {
408 col = screen.tlen[--row]; 404 col = screen.tlen[--row];
409 if (col == -1) 405 if (col == -1)
410 col = TermWin.ncol - 1; 406 col = TermWin.ncol - 1;
411 else 407 else
412 col--; 408 col--;
413 if (col > 0 409 if (col > 0
414 && IS_MULTI2(screen.rend[row][col])) 410 && IS_MULTI2 (screen.rend[row][col]))
415 m = 1; 411 m = 1;
416 } 412 }
417 } 413 }
418 if (m) 414 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 415 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
420 } 416 }
421#endif 417#endif
422 break; 418 break;
423 419
424#ifndef UNSHIFTED_SCROLLKEYS 420#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 421# ifdef XK_KP_Prior
426 case XK_KP_Prior: 422 case XK_KP_Prior:
427 /* allow shift to override */ 423 /* allow shift to override */
428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 424 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
429 { 425 {
430 STRCPY(kbuf, "\033Oy"); 426 STRCPY (kbuf, "\033Oy");
431 break; 427 break;
432 } 428 }
433 /* FALLTHROUGH */ 429 /* FALLTHROUGH */
434# endif 430# endif
435 case XK_Prior: 431 case XK_Prior:
436 STRCPY(kbuf, "\033[5~"); 432 STRCPY (kbuf, "\033[5~");
437 break; 433 break;
438# ifdef XK_KP_Next 434# ifdef XK_KP_Next
439 case XK_KP_Next: 435 case XK_KP_Next:
440 /* allow shift to override */ 436 /* allow shift to override */
441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 437 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
442 { 438 {
443 STRCPY(kbuf, "\033Os"); 439 STRCPY (kbuf, "\033Os");
444 break; 440 break;
445 } 441 }
446 /* FALLTHROUGH */ 442 /* FALLTHROUGH */
447# endif 443# endif
448 case XK_Next: 444 case XK_Next:
449 STRCPY(kbuf, "\033[6~"); 445 STRCPY (kbuf, "\033[6~");
450 break; 446 break;
451#endif 447#endif
452 case XK_KP_Enter: 448 case XK_KP_Enter:
453 /* allow shift to override */ 449 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 450 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 { 451 {
456 STRCPY(kbuf, "\033OM"); 452 STRCPY (kbuf, "\033OM");
457 } 453 }
458 else 454 else
459 { 455 {
460 kbuf[0] = '\r'; 456 kbuf[0] = '\r';
461 kbuf[1] = '\0'; 457 kbuf[1] = '\0';
462 } 458 }
463 break; 459 break;
464 460
465#ifdef XK_KP_Begin 461#ifdef XK_KP_Begin
466 case XK_KP_Begin: 462 case XK_KP_Begin:
467 STRCPY(kbuf, "\033Ou"); 463 STRCPY (kbuf, "\033Ou");
468 break; 464 break;
469 465
470 case XK_KP_Insert: 466 case XK_KP_Insert:
471 STRCPY(kbuf, "\033Op"); 467 STRCPY (kbuf, "\033Op");
472 break; 468 break;
473 469
474 case XK_KP_Delete: 470 case XK_KP_Delete:
475 STRCPY(kbuf, "\033On"); 471 STRCPY (kbuf, "\033On");
476 break; 472 break;
477#endif 473#endif
478 case XK_KP_F1: /* "\033OP" */ 474 case XK_KP_F1: /* "\033OP" */
479 case XK_KP_F2: /* "\033OQ" */ 475 case XK_KP_F2: /* "\033OQ" */
480 case XK_KP_F3: /* "\033OR" */ 476 case XK_KP_F3: /* "\033OR" */
481 case XK_KP_F4: /* "\033OS" */ 477 case XK_KP_F4: /* "\033OS" */
482 STRCPY(kbuf, "\033OP"); 478 STRCPY (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 479 kbuf[2] += (keysym - XK_KP_F1);
484 break; 480 break;
485 481
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 482 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 483 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 484 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 485 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 486 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 487 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 488 case XK_KP_0: /* "\033Op" : "0" */
… …
500 case XK_KP_8: /* "\033Ox" : "8" */ 496 case XK_KP_8: /* "\033Ox" : "8" */
501 case XK_KP_9: /* "\033Oy" : "9" */ 497 case XK_KP_9: /* "\033Oy" : "9" */
502 /* allow shift to override */ 498 /* allow shift to override */
503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 499 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
504 { 500 {
505 STRCPY(kbuf, "\033Oj"); 501 STRCPY (kbuf, "\033Oj");
506 kbuf[2] += (keysym - XK_KP_Multiply); 502 kbuf[2] += (keysym - XK_KP_Multiply);
507 } 503 }
508 else 504 else
509 { 505 {
510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 506 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
511 kbuf[1] = '\0'; 507 kbuf[1] = '\0';
512 } 508 }
513 break; 509 break;
514 510
515 case XK_Find: 511 case XK_Find:
516 STRCPY(kbuf, "\033[1~"); 512 STRCPY (kbuf, "\033[1~");
517 break; 513 break;
518 case XK_Insert: 514 case XK_Insert:
519 STRCPY(kbuf, "\033[2~"); 515 STRCPY (kbuf, "\033[2~");
520 break; 516 break;
521#ifdef DXK_Remove /* support for DEC remove like key */ 517#ifdef DXK_Remove /* support for DEC remove like key */
522 case DXK_Remove: 518 case DXK_Remove:
523 /* FALLTHROUGH */ 519 /* FALLTHROUGH */
524#endif 520#endif
525 case XK_Execute: 521 case XK_Execute:
526 STRCPY(kbuf, "\033[3~"); 522 STRCPY (kbuf, "\033[3~");
527 break; 523 break;
528 case XK_Select: 524 case XK_Select:
529 STRCPY(kbuf, "\033[4~"); 525 STRCPY (kbuf, "\033[4~");
530 break; 526 break;
531#ifdef XK_KP_End 527#ifdef XK_KP_End
532 case XK_KP_End: 528 case XK_KP_End:
533 /* allow shift to override */ 529 /* allow shift to override */
534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 530 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
535 { 531 {
536 STRCPY(kbuf, "\033Oq"); 532 STRCPY (kbuf, "\033Oq");
537 break; 533 break;
538 } 534 }
539 /* FALLTHROUGH */ 535 /* FALLTHROUGH */
540#endif 536#endif
541 case XK_End: 537 case XK_End:
542 STRCPY(kbuf, KS_END); 538 STRCPY (kbuf, KS_END);
543 break; 539 break;
544#ifdef XK_KP_Home 540#ifdef XK_KP_Home
545 case XK_KP_Home: 541 case XK_KP_Home:
546 /* allow shift to override */ 542 /* allow shift to override */
547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 543 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
548 { 544 {
549 STRCPY(kbuf, "\033Ow"); 545 STRCPY (kbuf, "\033Ow");
550 break; 546 break;
551 } 547 }
552 /* FALLTHROUGH */ 548 /* FALLTHROUGH */
553#endif 549#endif
554 case XK_Home: 550 case XK_Home:
555 STRCPY(kbuf, KS_HOME); 551 STRCPY (kbuf, KS_HOME);
556 break; 552 break;
557 553
558#define FKEY(n, fkey) \ 554#define FKEY(n, fkey) \
559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 555 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
560 556
561 case XK_F1: /* "\033[11~" */ 557 case XK_F1: /* "\033[11~" */
562 case XK_F2: /* "\033[12~" */ 558 case XK_F2: /* "\033[12~" */
563 case XK_F3: /* "\033[13~" */ 559 case XK_F3: /* "\033[13~" */
564 case XK_F4: /* "\033[14~" */ 560 case XK_F4: /* "\033[14~" */
565 case XK_F5: /* "\033[15~" */ 561 case XK_F5: /* "\033[15~" */
566 FKEY(11, XK_F1); 562 FKEY (11, XK_F1);
567 break; 563 break;
568 case XK_F6: /* "\033[17~" */ 564 case XK_F6: /* "\033[17~" */
569 case XK_F7: /* "\033[18~" */ 565 case XK_F7: /* "\033[18~" */
570 case XK_F8: /* "\033[19~" */ 566 case XK_F8: /* "\033[19~" */
571 case XK_F9: /* "\033[20~" */ 567 case XK_F9: /* "\033[20~" */
572 case XK_F10: /* "\033[21~" */ 568 case XK_F10: /* "\033[21~" */
573 FKEY(17, XK_F6); 569 FKEY (17, XK_F6);
574 break; 570 break;
575 case XK_F11: /* "\033[23~" */ 571 case XK_F11: /* "\033[23~" */
576 case XK_F12: /* "\033[24~" */ 572 case XK_F12: /* "\033[24~" */
577 case XK_F13: /* "\033[25~" */ 573 case XK_F13: /* "\033[25~" */
578 case XK_F14: /* "\033[26~" */ 574 case XK_F14: /* "\033[26~" */
579 FKEY(23, XK_F11); 575 FKEY (23, XK_F11);
580 break; 576 break;
581 case XK_F15: /* "\033[28~" */ 577 case XK_F15: /* "\033[28~" */
582 case XK_F16: /* "\033[29~" */ 578 case XK_F16: /* "\033[29~" */
583 FKEY(28, XK_F15); 579 FKEY (28, XK_F15);
584 break; 580 break;
585 case XK_Help: /* "\033[28~" */ 581 case XK_Help: /* "\033[28~" */
586 FKEY(28, XK_Help); 582 FKEY (28, XK_Help);
587 break; 583 break;
588 case XK_Menu: /* "\033[29~" */ 584 case XK_Menu: /* "\033[29~" */
589 FKEY(29, XK_Menu); 585 FKEY (29, XK_Menu);
590 break; 586 break;
591 case XK_F17: /* "\033[31~" */ 587 case XK_F17: /* "\033[31~" */
592 case XK_F18: /* "\033[32~" */ 588 case XK_F18: /* "\033[32~" */
593 case XK_F19: /* "\033[33~" */ 589 case XK_F19: /* "\033[33~" */
594 case XK_F20: /* "\033[34~" */ 590 case XK_F20: /* "\033[34~" */
… …
605 case XK_F31: /* "\033[45~" */ 601 case XK_F31: /* "\033[45~" */
606 case XK_F32: /* "\033[46~" */ 602 case XK_F32: /* "\033[46~" */
607 case XK_F33: /* "\033[47~" */ 603 case XK_F33: /* "\033[47~" */
608 case XK_F34: /* "\033[48~" */ 604 case XK_F34: /* "\033[48~" */
609 case XK_F35: /* "\033[49~" */ 605 case XK_F35: /* "\033[49~" */
610 FKEY(31, XK_F17); 606 FKEY (31, XK_F17);
611 break; 607 break;
612#undef FKEY 608#undef FKEY
613 default: 609 default:
614 newlen = 0; 610 newlen = 0;
615 break; 611 break;
616 } 612 }
617 if (newlen) 613 if (newlen)
618 len = STRLEN(kbuf); 614 len = STRLEN (kbuf);
619 } 615 }
620 /* 616 /*
621 * Pass meta for all function keys, if 'meta' option set 617 * Pass meta for all function keys, if 'meta' option set
622 */ 618 */
623#ifdef META8_OPTION 619#ifdef META8_OPTION
… …
644 meta = 0; 640 meta = 0;
645 } 641 }
646#endif 642#endif
647#ifdef GREEK_SUPPORT 643#ifdef GREEK_SUPPORT
648 if (greek_mode) 644 if (greek_mode)
649 len = greek_xlat(kbuf, len); 645 len = greek_xlat (kbuf, len);
650#endif 646#endif
651 /* nil */ ; 647 /* nil */ ;
652 } 648 }
653 } 649 }
654 650
… …
683#endif 679#endif
684 ) 680 )
685 { 681 {
686 const unsigned char ch = C0_ESC; 682 const unsigned char ch = C0_ESC;
687 683
688 tt_write(&ch, 1); 684 tt_write (&ch, 1);
689 } 685 }
690#ifdef DEBUG_CMD 686#ifdef DEBUG_CMD
691 if (debug_key) 687 if (debug_key)
692 { /* Display keyboard buffer contents */ 688 { /* Display keyboard buffer contents */
693 char *p; 689 char *p;
694 int i; 690 int i;
695 691
696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 692 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 693 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 694 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf(stderr, "'\n"); 695 fprintf (stderr, "'\n");
700 } 696 }
701#endif /* DEBUG_CMD */ 697#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 698 tt_write (kbuf, (unsigned int)len);
703} 699}
704/*}}} */ 700/*}}} */
705 701
706#if (MENUBAR_MAX) 702#if (MENUBAR_MAX)
707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 703/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 704/* attempt to `write' count to the input buffer */
709unsigned int 705unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 706rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 707{
712 unsigned int n, s; 708 unsigned int n, s;
713 709
714 n = cmdbuf_ptr - cmdbuf_base; 710 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 711 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
716 if (n > 0 && s < count) 712 if (n > 0 && s < count)
717 { 713 {
718 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 714 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 715 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 716 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 717 cmdbuf_endp -= n;
722 s += n; 718 s += n;
723 } 719 }
724 if (count > s) 720 if (count > s)
725 { 721 {
726 rxvt_print_error("data loss: cmd_write too large"); 722 rxvt_print_error ("data loss: cmd_write too large");
727 count = s; 723 count = s;
728 } 724 }
729 for (; count--;) 725 for (; count--;)
730 *cmdbuf_endp++ = *str++; 726 *cmdbuf_endp++ = *str++;
731 return 0; 727 return 0;
… …
753 IMSendSpot (); 749 IMSendSpot ();
754#endif 750#endif
755 751
756 } 752 }
757 753
758 XFlush (Xdisplay); 754 display->flush ();
759} 755}
760 756
761void 757void
762rxvt_term::check_cb (check_watcher &w) 758rxvt_term::check_cb (check_watcher &w)
763{ 759{
764 SET_R (this); 760 SET_R (this);
765 SET_LOCALE (locale); 761 SET_LOCALE (locale);
766 762
767 flush (); 763 flush ();
768}
769
770void
771rxvt_term::process_x_events ()
772{
773 do
774 {
775 XEvent xev;
776
777 XNextEvent (Xdisplay, &xev);
778
779#if defined(CURSOR_BLINK)
780 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
781 {
782 if (hidden_cursor)
783 {
784 hidden_cursor = 0;
785 want_refresh = 1;
786 }
787
788 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
789 }
790#endif
791
792#if defined(POINTER_BLANK)
793 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
794 {
795 if (xev.type == MotionNotify
796 || xev.type == ButtonPress
797 || xev.type == ButtonRelease)
798 if (hidden_pointer)
799 pointer_unblank ();
800
801 if (xev.type == KeyPress && hidden_pointer == 0)
802 pointer_blank ();
803 }
804#endif
805
806#ifdef USE_XIM
807 if (!XFilterEvent (&xev, xev.xany.window))
808#endif
809 process_x_event (&xev);
810 }
811 while (XPending (Xdisplay));
812} 764}
813 765
814#ifdef CURSOR_BLINK 766#ifdef CURSOR_BLINK
815void 767void
816rxvt_term::cursor_blink_cb (time_watcher &w) 768rxvt_term::cursor_blink_cb (time_watcher &w)
… …
832 want_refresh = 1; 784 want_refresh = 1;
833 w.start (w.at + TEXT_BLINK_INTERVAL); 785 w.start (w.at + TEXT_BLINK_INTERVAL);
834 } 786 }
835} 787}
836#endif 788#endif
837
838void
839rxvt_term::x_cb (io_watcher &w, short revents)
840{
841 SET_R (this);
842 SET_LOCALE (locale);
843
844 process_x_events ();
845}
846 789
847bool 790bool
848rxvt_term::pty_fill () 791rxvt_term::pty_fill ()
849{ 792{
850 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 793 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
… …
922 if (ch == '\n') 865 if (ch == '\n')
923 { 866 {
924 nlines++; 867 nlines++;
925 refresh_count++; 868 refresh_count++;
926 869
927 if (!(Options & Opt_jumpScroll) 870 if (! (Options & Opt_jumpScroll)
928 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
929 { 872 {
930 refreshnow = true; 873 refreshnow = true;
931 flag = false; 874 flag = false;
932 ch = NOCHAR; 875 ch = NOCHAR;
933 break; 876 break;
877 }
878
879 // scr_add_lines only works for nlines < TermWin.nrow - 1.
880 if (nlines >= TermWin.nrow - 1)
881 {
882 scr_add_lines (buf, nlines, str - buf);
883 nlines = 0;
884 str = buf;
934 } 885 }
935 } 886 }
936 887
937 if (str >= buf + BUFSIZ) 888 if (str >= buf + BUFSIZ)
938 { 889 {
… …
992 { 943 {
993 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
994 return *cmdbuf_ptr++; 945 return *cmdbuf_ptr++;
995 946
996 wchar_t wc; 947 wchar_t wc;
997 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
998 949
999 if (len == (size_t)-2) 950 if (len == (size_t)-2)
1000 return NOCHAR; 951 return NOCHAR;
1001 952
1002 if (len == (size_t)-1) 953 if (len == (size_t)-1)
… …
1008 } 959 }
1009 960
1010 return NOCHAR; 961 return NOCHAR;
1011} 962}
1012 963
1013/* rxvt_cmd_getc() - Return next input character */ 964/* rxvt_cmd_getc () - Return next input character */
1014/* 965/*
1015 * Return the next input character after first passing any keyboard input 966 * Return the next input character after first passing any keyboard input
1016 * to the command. 967 * to the command.
1017 */ 968 */
1018uint32_t 969uint32_t
… …
1034 985
1035#ifdef POINTER_BLANK 986#ifdef POINTER_BLANK
1036void 987void
1037rxvt_term::pointer_unblank () 988rxvt_term::pointer_unblank ()
1038{ 989{
1039 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 990 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1040 recolour_cursor (); 991 recolour_cursor ();
1041 992
1042 hidden_pointer = 0; 993 hidden_pointer = 0;
1043 994
1044 if (Options & Opt_pointerBlank) 995 if (Options & Opt_pointerBlank)
… …
1046} 997}
1047 998
1048void 999void
1049rxvt_term::pointer_blank () 1000rxvt_term::pointer_blank ()
1050{ 1001{
1051 if (!(Options & Opt_pointerBlank)) 1002 if (! (Options & Opt_pointerBlank))
1052 return; 1003 return;
1053 1004
1054 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1005 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1055 XFlush (Xdisplay); 1006 XFlush (display->display);
1056 1007
1057 hidden_pointer = 1; 1008 hidden_pointer = 1;
1058} 1009}
1059 1010
1060void 1011void
… …
1066 pointer_blank (); 1017 pointer_blank ();
1067} 1018}
1068#endif 1019#endif
1069 1020
1070void 1021void
1071rxvt_term::mouse_report (const XButtonEvent *ev) 1022rxvt_term::mouse_report (const XButtonEvent &ev)
1072{ 1023{
1073 int button_number, key_state = 0; 1024 int button_number, key_state = 0;
1074 int x, y; 1025 int x, y;
1075 1026
1076 x = ev->x; 1027 x = ev.x;
1077 y = ev->y; 1028 y = ev.y;
1078 pixel_position (&x, &y); 1029 pixel_position (&x, &y);
1079 1030
1080 if (MEvent.button == AnyButton) 1031 if (MEvent.button == AnyButton)
1081 { 1032 {
1082 button_number = 3; 1033 button_number = 3;
… …
1116#endif 1067#endif
1117 1068
1118 } 1069 }
1119 1070
1120#ifdef DEBUG_MOUSEREPORT 1071#ifdef DEBUG_MOUSEREPORT
1121 fprintf(stderr, "Mouse ["); 1072 fprintf (stderr, "Mouse [");
1122 if (key_state & 16) 1073 if (key_state & 16)
1123 fputc('C', stderr); 1074 fputc ('C', stderr);
1124 if (key_state & 4) 1075 if (key_state & 4)
1125 fputc('S', stderr); 1076 fputc ('S', stderr);
1126 if (key_state & 8) 1077 if (key_state & 8)
1127 fputc('A', stderr); 1078 fputc ('A', stderr);
1128 if (key_state & 32) 1079 if (key_state & 32)
1129 fputc('2', stderr); 1080 fputc ('2', stderr);
1130 fprintf(stderr, "]: <%d>, %d/%d\n", 1081 fprintf (stderr, "]: <%d>, %d/%d\n",
1131 button_number, 1082 button_number,
1132 x + 1, 1083 x + 1,
1133 y + 1); 1084 y + 1);
1134#else 1085#else
1135 tt_printf("\033[M%c%c%c", 1086 tt_printf ("\033[M%c%c%c",
1136 (32 + button_number + key_state), 1087 (32 + button_number + key_state),
1137 (32 + x + 1), 1088 (32 + x + 1),
1138 (32 + y + 1)); 1089 (32 + y + 1));
1139#endif 1090#endif
1140} 1091}
1141 1092
1142#ifdef USING_W11LIB 1093#ifdef USING_W11LIB
1143void 1094void
1144rxvt_W11_process_x_event(XEvent *ev) 1095rxvt_W11_process_x_event (XEvent *ev)
1145{ 1096{
1146 rxvt_t *r = rxvt_get_r(); 1097 rxvt_t *r = rxvt_get_r ();
1147 1098
1148 process_x_event (ev); 1099 x_cb (*ev);
1149} 1100}
1150#endif 1101#endif
1151 1102
1152/*{{{ process an X event */ 1103/*{{{ process an X event */
1153void 1104void
1154rxvt_term::process_x_event (XEvent *ev) 1105rxvt_term::x_cb (XEvent &ev)
1155{ 1106{
1107 SET_R (this);
1108 SET_LOCALE (locale);
1109
1110#if defined(CURSOR_BLINK)
1111 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1112 {
1113 if (hidden_cursor)
1114 {
1115 hidden_cursor = 0;
1116 want_refresh = 1;
1117 }
1118
1119 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1120 }
1121#endif
1122
1123#if defined(POINTER_BLANK)
1124 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1125 {
1126 if (ev.type == MotionNotify
1127 || ev.type == ButtonPress
1128 || ev.type == ButtonRelease)
1129 if (hidden_pointer)
1130 pointer_unblank ();
1131
1132 if (ev.type == KeyPress && hidden_pointer == 0)
1133 pointer_blank ();
1134 }
1135#endif
1136
1137#ifdef USE_XIM
1138 if (XFilterEvent (&ev, None))
1139 return;
1140#endif
1141
1156 Window unused_root, unused_child; 1142 Window unused_root, unused_child;
1157 int unused_root_x, unused_root_y; 1143 int unused_root_x, unused_root_y;
1158 unsigned int unused_mask; 1144 unsigned int unused_mask;
1159 1145
1160#ifdef DEBUG_X 1146#ifdef DEBUG_X
… …
1199#endif 1185#endif
1200 1186
1201#ifdef DEBUG_X 1187#ifdef DEBUG_X
1202 struct timeval tp; 1188 struct timeval tp;
1203 struct tm *ltt; 1189 struct tm *ltt;
1204 (void)gettimeofday(&tp, NULL); 1190 (void)gettimeofday (&tp, NULL);
1205 ltt = localtime(&(tp.tv_sec)); 1191 ltt = localtime (& (tp.tv_sec));
1206 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)); 1192 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));
1207#endif 1193#endif
1208 1194
1209 switch (ev->type) 1195 switch (ev.type)
1210 { 1196 {
1211 case KeyPress: 1197 case KeyPress:
1212 lookup_key ((XKeyEvent *)ev); 1198 lookup_key (ev.xkey);
1213 break; 1199 break;
1214 1200
1215#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1216 case KeyRelease: 1202 case KeyRelease:
1217 { 1203 {
1218 if (!(ev->xkey.state & ControlMask)) 1204 if (! (ev.xkey.state & ControlMask))
1219 mouse_slip_wheel_speed = 0; 1205 mouse_slip_wheel_speed = 0;
1220 else 1206 else
1221 { 1207 {
1222 KeySym ks; 1208 KeySym ks;
1223 1209
1224 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0); 1210 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1225 if (ks == XK_Control_L || ks == XK_Control_R) 1211 if (ks == XK_Control_L || ks == XK_Control_R)
1226 mouse_slip_wheel_speed = 0; 1212 mouse_slip_wheel_speed = 0;
1227 } 1213 }
1228 break; 1214 break;
1229 } 1215 }
1230#endif 1216#endif
1231 1217
1232 case ButtonPress: 1218 case ButtonPress:
1233 button_press ((XButtonEvent *)ev); 1219 button_press (ev.xbutton);
1234 break; 1220 break;
1235 1221
1236 case ButtonRelease: 1222 case ButtonRelease:
1237 button_release ((XButtonEvent *)ev); 1223 button_release (ev.xbutton);
1238 break; 1224 break;
1239 1225
1240 case ClientMessage: 1226 case ClientMessage:
1241 if (ev->xclient.format == 32 1227 if (ev.xclient.format == 32
1242 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1228 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1243 destroy (); 1229 destroy ();
1244#ifdef OFFIX_DND 1230#ifdef OFFIX_DND
1245 /* OffiX Dnd (drag 'n' drop) protocol */ 1231 /* OffiX Dnd (drag 'n' drop) protocol */
1246 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1232 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1247 && (ev->xclient.data.l[0] == DndFile 1233 && (ev.xclient.data.l[0] == DndFile
1248 || ev->xclient.data.l[0] == DndDir 1234 || ev.xclient.data.l[0] == DndDir
1249 || ev->xclient.data.l[0] == DndLink)) 1235 || ev.xclient.data.l[0] == DndLink))
1250 { 1236 {
1251 /* Get Dnd data */ 1237 /* Get Dnd data */
1252 Atom ActualType; 1238 Atom ActualType;
1253 int ActualFormat; 1239 int ActualFormat;
1254 unsigned char *data; 1240 unsigned char *data;
1255 unsigned long Size, RemainingBytes; 1241 unsigned long Size, RemainingBytes;
1256 1242
1257 XGetWindowProperty(Xdisplay, Xroot, 1243 XGetWindowProperty (display->display, display->root,
1258 xa[XA_DNDSELECTION], 1244 xa[XA_DNDSELECTION],
1259 0L, 1000000L, 1245 0L, 1000000L,
1260 False, AnyPropertyType, 1246 False, AnyPropertyType,
1261 &ActualType, &ActualFormat, 1247 &ActualType, &ActualFormat,
1262 &Size, &RemainingBytes, 1248 &Size, &RemainingBytes,
1263 &data); 1249 &data);
1264 XChangeProperty(Xdisplay, Xroot, 1250 XChangeProperty (display->display, display->root,
1265 XA_CUT_BUFFER0, XA_STRING, 1251 XA_CUT_BUFFER0, XA_STRING,
1266 8, PropModeReplace, 1252 8, PropModeReplace,
1267 data, STRLEN(data)); 1253 data, STRLEN (data));
1268 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1254 selection_paste (display->root, XA_CUT_BUFFER0, True);
1269 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1270 } 1256 }
1271#endif /* OFFIX_DND */ 1257#endif /* OFFIX_DND */
1272 break; 1258 break;
1273 1259
1274 case MappingNotify: 1260 case MappingNotify:
1275 XRefreshKeyboardMapping(&(ev->xmapping)); 1261 XRefreshKeyboardMapping (& (ev.xmapping));
1276 break; 1262 break;
1277 1263
1278 /* 1264 /*
1279 * XXX: this is not the _current_ arrangement 1265 * XXX: this is not the _current_ arrangement
1280 * Here's my conclusion: 1266 * Here's my conclusion:
… …
1284 * in the GraphicsExpose parts, which means that after each refresh, 1270 * in the GraphicsExpose parts, which means that after each refresh,
1285 * we need to wait for the graphics expose or Noexpose events, 1271 * we need to wait for the graphics expose or Noexpose events,
1286 * which ought to make things real slow! 1272 * which ought to make things real slow!
1287 */ 1273 */
1288 case VisibilityNotify: 1274 case VisibilityNotify:
1289 switch (ev->xvisibility.state) 1275 switch (ev.xvisibility.state)
1290 { 1276 {
1291 case VisibilityUnobscured: 1277 case VisibilityUnobscured:
1292 refresh_type = FAST_REFRESH; 1278 refresh_type = FAST_REFRESH;
1293 break; 1279 break;
1294 case VisibilityPartiallyObscured: 1280 case VisibilityPartiallyObscured:
… …
1305 { 1291 {
1306 TermWin.focus = 1; 1292 TermWin.focus = 1;
1307 want_refresh = 1; 1293 want_refresh = 1;
1308#ifdef USE_XIM 1294#ifdef USE_XIM
1309 if (Input_Context != NULL) 1295 if (Input_Context != NULL)
1310 XSetICFocus(Input_Context); 1296 XSetICFocus (Input_Context);
1311#endif 1297#endif
1312#ifdef CURSOR_BLINK 1298#ifdef CURSOR_BLINK
1313 if (Options & Opt_cursorBlink) 1299 if (Options & Opt_cursorBlink)
1314 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1300 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1315#endif 1301#endif
… …
1322 { 1308 {
1323 TermWin.focus = 0; 1309 TermWin.focus = 0;
1324 want_refresh = 1; 1310 want_refresh = 1;
1325#ifdef USE_XIM 1311#ifdef USE_XIM
1326 if (Input_Context != NULL) 1312 if (Input_Context != NULL)
1327 XUnsetICFocus(Input_Context); 1313 XUnsetICFocus (Input_Context);
1328#endif 1314#endif
1329#ifdef CURSOR_BLINK 1315#ifdef CURSOR_BLINK
1330 if (Options & Opt_cursorBlink) 1316 if (Options & Opt_cursorBlink)
1331 cursor_blink_ev.stop (); 1317 cursor_blink_ev.stop ();
1332 hidden_cursor = 0; 1318 hidden_cursor = 0;
… …
1334 1320
1335 } 1321 }
1336 break; 1322 break;
1337 1323
1338 case ConfigureNotify: 1324 case ConfigureNotify:
1339 if (ev->xconfigure.window == TermWin.parent[0]) 1325 if (ev.xconfigure.window == TermWin.parent[0])
1340 { 1326 {
1341 int height, width; 1327 int height, width;
1342 1328
1343 do 1329 do
1344 { /* Wrap lots of configures into one */ 1330 { /* Wrap lots of configures into one */
1345 width = ev->xconfigure.width; 1331 width = ev.xconfigure.width;
1346 height = ev->xconfigure.height; 1332 height = ev.xconfigure.height;
1347 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1333 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1348 } 1334 }
1349 while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1335 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1350 ConfigureNotify, ev)); 1336
1351 if (szHint.width != width || szHint.height != height) 1337 if (szHint.width != width || szHint.height != height)
1352 { 1338 {
1353 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1339 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1354 resize_all_windows (width, height, 1); 1340 resize_all_windows (width, height, 1);
1355 } 1341 }
1356#ifdef DEBUG_SIZE 1342#ifdef DEBUG_SIZE
1357 else 1343 else
1358 { 1344 {
1359 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE ((stderr, "Size: Not resizing"));
1360 } 1346 }
1361#endif 1347#endif
1362#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1363 if (Options & Opt_transparent) 1349 if (Options & Opt_transparent)
1364 { 1350 {
… …
1370 1356
1371 } 1357 }
1372 break; 1358 break;
1373 1359
1374 case SelectionClear: 1360 case SelectionClear:
1375 selection_clear (); 1361 display->set_selection_owner (0);
1376 break; 1362 break;
1377 1363
1378 case SelectionNotify: 1364 case SelectionNotify:
1379 if (selection_wait == Sel_normal) 1365 if (selection_wait == Sel_normal)
1380 selection_paste (ev->xselection.requestor, 1366 selection_paste (ev.xselection.requestor,
1381 ev->xselection.property, True); 1367 ev.xselection.property, True);
1382 break; 1368 break;
1383 1369
1384 case SelectionRequest: 1370 case SelectionRequest:
1385 selection_send (&(ev->xselectionrequest)); 1371 selection_send (ev.xselectionrequest);
1386 break; 1372 break;
1387 1373
1388 case UnmapNotify: 1374 case UnmapNotify:
1389 TermWin.mapped = 0; 1375 TermWin.mapped = 0;
1390#ifdef TEXT_BLINK 1376#ifdef TEXT_BLINK
… …
1397#ifdef TEXT_BLINK 1383#ifdef TEXT_BLINK
1398 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1384 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1399#endif 1385#endif
1400 break; 1386 break;
1401 1387
1402 case PropertyNotify:
1403 if (ev->xproperty.atom == xa[XA_VT_SELECTION])
1404 {
1405 if (ev->xproperty.state == PropertyNewValue)
1406 selection_property (ev->xproperty.window,
1407 ev->xproperty.atom);
1408 break;
1409 }
1410#ifdef TRANSPARENT 1388#ifdef TRANSPARENT
1411 /*
1412 * if user used some Esetroot compatible prog to set the root bg,
1413 * use the property to determine the pixmap. We use it later on.
1414 */
1415 if (xa[XA_XROOTPMAPID] == 0)
1416 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1417 "_XROOTPMAP_ID", False);
1418 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1419 break;
1420 /* FALLTHROUGH */
1421 case ReparentNotify: 1389 case ReparentNotify:
1422 if ((Options & Opt_transparent) && check_our_parents ()) 1390 rootwin_cb (ev);
1423 { 1391 break;
1424 if (am_transparent)
1425 want_full_refresh = 1;
1426 }
1427#endif /* TRANSPARENT */ 1392#endif /* TRANSPARENT */
1428 break;
1429 1393
1430 case GraphicsExpose: 1394 case GraphicsExpose:
1431 case Expose: 1395 case Expose:
1432 if (ev->xany.window == TermWin.vt) 1396 if (ev.xany.window == TermWin.vt)
1433 { 1397 {
1434#ifdef NO_SLOW_LINK_SUPPORT 1398#ifdef NO_SLOW_LINK_SUPPORT
1435 scr_expose (ev->xexpose.x, ev->xexpose.y, 1399 scr_expose (ev.xexpose.x, ev.xexpose.y,
1436 ev->xexpose.width, ev->xexpose.height, False); 1400 ev.xexpose.width, ev.xexpose.height, False);
1437#else 1401#else
1438 // don't understand this, so commented it out 1402 // don't understand this, so commented it out
1439 scr_expose (ev->xexpose.x, ev->xexpose.y, 1403 scr_expose (ev.xexpose.x, ev.xexpose.y,
1440 ev->xexpose.width, ev->xexpose.height, False); 1404 ev.xexpose.width, ev.xexpose.height, False);
1441 //scr_expose (ev->xexpose.x, 0, 1405 //scr_expose (ev.xexpose.x, 0,
1442 // ev->xexpose.width, TermWin.height, False); 1406 // ev.xexpose.width, TermWin.height, False);
1443#endif 1407#endif
1444 want_refresh = 1; 1408 want_refresh = 1;
1445 } 1409 }
1446 else 1410 else
1447 { 1411 {
1448 XEvent unused_xevent; 1412 XEvent unused_event;
1449 1413
1450 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1451 Expose, 1415 Expose,
1452 &unused_xevent)) ; 1416 &unused_event)) ;
1453 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1454 GraphicsExpose, 1418 GraphicsExpose,
1455 &unused_xevent)) ; 1419 &unused_event)) ;
1456 if (isScrollbarWindow(ev->xany.window)) 1420 if (isScrollbarWindow (ev.xany.window))
1457 { 1421 {
1458 scrollBar.setIdle(); 1422 scrollBar.setIdle ();
1459 scrollbar_show (0); 1423 scrollbar_show (0);
1460 } 1424 }
1461#ifdef MENUBAR 1425#ifdef MENUBAR
1462 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1463 menubar_expose (); 1427 menubar_expose ();
1464#endif 1428#endif
1465#ifdef RXVT_GRAPHICS 1429#ifdef RXVT_GRAPHICS
1466 Gr_expose (ev->xany.window); 1430 Gr_expose (ev.xany.window);
1467#endif 1431#endif
1468 1432
1469 } 1433 }
1470 break; 1434 break;
1471 1435
… …
1473#ifdef POINTER_BLANK 1437#ifdef POINTER_BLANK
1474 if (hidden_pointer) 1438 if (hidden_pointer)
1475 pointer_unblank (); 1439 pointer_unblank ();
1476#endif 1440#endif
1477#if MENUBAR 1441#if MENUBAR
1478 if (isMenuBarWindow(ev->xany.window)) 1442 if (isMenuBarWindow (ev.xany.window))
1479 { 1443 {
1480 menubar_control (&(ev->xbutton)); 1444 menubar_control (& (ev.xbutton));
1481 break; 1445 break;
1482 } 1446 }
1483#endif 1447#endif
1484 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1485 break; 1449 break;
1486 1450
1487 if (ev->xany.window == TermWin.vt) 1451 if (ev.xany.window == TermWin.vt)
1488 { 1452 {
1489 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) 1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1490 { 1454 {
1491 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1492 MotionNotify, ev)) ; 1456 ;
1457
1493 XQueryPointer(Xdisplay, TermWin.vt, 1458 XQueryPointer (display->display, TermWin.vt,
1494 &unused_root, &unused_child, 1459 &unused_root, &unused_child,
1495 &unused_root_x, &unused_root_y, 1460 &unused_root_x, &unused_root_y,
1496 &(ev->xbutton.x), &(ev->xbutton.y), 1461 & (ev.xbutton.x), & (ev.xbutton.y),
1497 &unused_mask); 1462 &unused_mask);
1498#ifdef MOUSE_THRESHOLD 1463#ifdef MOUSE_THRESHOLD
1499 /* deal with a `jumpy' mouse */ 1464 /* deal with a `jumpy' mouse */
1500 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1501 { 1466 {
1502#endif 1467#endif
1503 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1504 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1469 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1505#ifdef SELECTION_SCROLLING 1470#ifdef SELECTION_SCROLLING
1506 if (ev->xbutton.y < TermWin.int_bwidth 1471 if (ev.xbutton.y < TermWin.int_bwidth
1507 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) 1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1508 { 1473 {
1509 int dist; 1474 int dist;
1510 1475
1511 pending_scroll_selection=1; 1476 pending_scroll_selection=1;
1512 1477
… …
1517 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1518 1483
1519 /* save the event params so we can highlight 1484 /* save the event params so we can highlight
1520 * the selection in the pending-scroll loop 1485 * the selection in the pending-scroll loop
1521 */ 1486 */
1522 selection_save_x=ev->xbutton.x; 1487 selection_save_x=ev.xbutton.x;
1523 selection_save_y=ev->xbutton.y; 1488 selection_save_y=ev.xbutton.y;
1524 selection_save_state= 1489 selection_save_state=
1525 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1490 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1526 1491
1527 /* calc number of lines to scroll */ 1492 /* calc number of lines to scroll */
1528 if (ev->xbutton.y<TermWin.int_bwidth) 1493 if (ev.xbutton.y<TermWin.int_bwidth)
1529 { 1494 {
1530 scroll_selection_dir = UP; 1495 scroll_selection_dir = UP;
1531 dist = TermWin.int_bwidth - ev->xbutton.y; 1496 dist = TermWin.int_bwidth - ev.xbutton.y;
1532 } 1497 }
1533 else 1498 else
1534 { 1499 {
1535 scroll_selection_dir = DN; 1500 scroll_selection_dir = DN;
1536 dist = ev->xbutton.y - 1501 dist = ev.xbutton.y -
1537 (TermWin.int_bwidth + TermWin.height); 1502 (TermWin.int_bwidth + TermWin.height);
1538 } 1503 }
1539 scroll_selection_lines=(Pixel2Height(dist)/ 1504 scroll_selection_lines= (Pixel2Height (dist)/
1540 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1505 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1541 MIN_IT(scroll_selection_lines, 1506 MIN_IT (scroll_selection_lines,
1542 SELECTION_SCROLL_MAX_LINES); 1507 SELECTION_SCROLL_MAX_LINES);
1543 } 1508 }
1544 else 1509 else
1545 { 1510 {
1546 /* we are within the text window, so we 1511 /* we are within the text window, so we
… …
1554 } 1519 }
1555#endif 1520#endif
1556 1521
1557 } 1522 }
1558 } 1523 }
1559 else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) 1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1560 { 1525 {
1561 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win, 1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1562 MotionNotify, ev)) ; 1527 MotionNotify, &ev)) ;
1563 XQueryPointer(Xdisplay, scrollBar.win, 1528 XQueryPointer (display->display, scrollBar.win,
1564 &unused_root, &unused_child, 1529 &unused_root, &unused_child,
1565 &unused_root_x, &unused_root_y, 1530 &unused_root_x, &unused_root_y,
1566 &(ev->xbutton.x), &(ev->xbutton.y), 1531 & (ev.xbutton.x), & (ev.xbutton.y),
1567 &unused_mask); 1532 &unused_mask);
1568 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO, 1533 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1569 scrollbar_size()); 1534 scrollbar_size ());
1570 scr_refresh (refresh_type); 1535 scr_refresh (refresh_type);
1571 refresh_limit = 0; 1536 refresh_limit = 0;
1572 scrollbar_show (1); 1537 scrollbar_show (1);
1573 } 1538 }
1574 break; 1539 break;
1575 } 1540 }
1576} 1541}
1577 1542
1578void 1543void
1544rxvt_term::rootwin_cb (XEvent &ev)
1545{
1546 SET_R (this);
1547 SET_LOCALE (locale);
1548
1549 switch (ev.type)
1550 {
1551 case PropertyNotify:
1552 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1553 {
1554 if (ev.xproperty.state == PropertyNewValue)
1555 selection_property (ev.xproperty.window, ev.xproperty.atom);
1556 break;
1557 }
1558#ifdef TRANSPARENT
1559 else
1560 {
1561 /*
1562 * if user used some Esetroot compatible prog to set the root bg,
1563 * use the property to determine the pixmap. We use it later on.
1564 */
1565 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1567
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1569 return;
1570 }
1571
1572 /* FALLTHROUGH */
1573 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ())
1575 if (am_transparent)
1576 want_full_refresh = 1;
1577 break;
1578#endif
1579 }
1580}
1581
1582void
1579rxvt_term::button_press (XButtonEvent *ev) 1583rxvt_term::button_press (const XButtonEvent &ev)
1580{ 1584{
1581 int reportmode = 0, clickintime; 1585 int reportmode = 0, clickintime;
1582 1586
1583 bypass_keystate = ev->state & (ModMetaMask | ShiftMask); 1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1584 if (!bypass_keystate) 1588 if (!bypass_keystate)
1585 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1589 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1586 /* 1590 /*
1587 * VT window processing of button press 1591 * VT window processing of button press
1588 */ 1592 */
1589 if (ev->window == TermWin.vt) 1593 if (ev.window == TermWin.vt)
1590 { 1594 {
1591#if RXVT_GRAPHICS 1595#if RXVT_GRAPHICS
1592 if (ev->subwindow != None) 1596 if (ev.subwindow != None)
1593 rxvt_Gr_ButtonPress (ev->x, ev->y); 1597 rxvt_Gr_ButtonPress (ev.x, ev.y);
1594 else 1598 else
1595#endif 1599#endif
1596 1600
1597 { 1601 {
1598 clickintime = ev->time - MEvent.time < MULTICLICK_TIME; 1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1599 if (reportmode) 1603 if (reportmode)
1600 { 1604 {
1601 /* mouse report from vt window */ 1605 /* mouse report from vt window */
1602 /* save the xbutton state (for ButtonRelease) */ 1606 /* save the xbutton state (for ButtonRelease) */
1603 MEvent.state = ev->state; 1607 MEvent.state = ev.state;
1604#ifdef MOUSE_REPORT_DOUBLECLICK 1608#ifdef MOUSE_REPORT_DOUBLECLICK
1605 if (ev->button == MEvent.button && clickintime) 1609 if (ev.button == MEvent.button && clickintime)
1606 { 1610 {
1607 /* same button, within alloted time */ 1611 /* same button, within alloted time */
1608 MEvent.clicks++; 1612 MEvent.clicks++;
1609 if (MEvent.clicks > 1) 1613 if (MEvent.clicks > 1)
1610 { 1614 {
… …
1619 } 1623 }
1620 else 1624 else
1621 { 1625 {
1622 /* different button, or time expired */ 1626 /* different button, or time expired */
1623 MEvent.clicks = 1; 1627 MEvent.clicks = 1;
1624 MEvent.button = ev->button; 1628 MEvent.button = ev.button;
1625 mouse_report (ev); 1629 mouse_report (ev);
1626 } 1630 }
1627#else 1631#else
1628 MEvent.button = ev->button; 1632 MEvent.button = ev.button;
1629 mouse_report (ev); 1633 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 1634#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 1635
1632 } 1636 }
1633 else 1637 else
1634 { 1638 {
1635 if (ev->button != MEvent.button) 1639 if (ev.button != MEvent.button)
1636 MEvent.clicks = 0; 1640 MEvent.clicks = 0;
1637 switch (ev->button) 1641 switch (ev.button)
1638 { 1642 {
1639 case Button1: 1643 case Button1:
1640 /* allow shift+left click to extend selection */ 1644 /* allow shift+left click to extend selection */
1641 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1642 { 1646 {
1643 if (MEvent.button == Button1 && clickintime) 1647 if (MEvent.button == Button1 && clickintime)
1644 selection_rotate (ev->x, ev->y); 1648 selection_rotate (ev.x, ev.y);
1645 else 1649 else
1646 selection_extend (ev->x, ev->y, 1); 1650 selection_extend (ev.x, ev.y, 1);
1647 } 1651 }
1648 else 1652 else
1649 { 1653 {
1650 if (MEvent.button == Button1 && clickintime) 1654 if (MEvent.button == Button1 && clickintime)
1651 MEvent.clicks++; 1655 MEvent.clicks++;
1652 else 1656 else
1653 MEvent.clicks = 1; 1657 MEvent.clicks = 1;
1654 1658
1655 selection_click (MEvent.clicks, ev->x, ev->y); 1659 selection_click (MEvent.clicks, ev.x, ev.y);
1656 } 1660 }
1657 1661
1658 MEvent.button = Button1; 1662 MEvent.button = Button1;
1659 break; 1663 break;
1660 1664
1661 case Button3: 1665 case Button3:
1662 if (MEvent.button == Button3 && clickintime) 1666 if (MEvent.button == Button3 && clickintime)
1663 selection_rotate (ev->x, ev->y); 1667 selection_rotate (ev.x, ev.y);
1664 else 1668 else
1665 selection_extend (ev->x, ev->y, 1); 1669 selection_extend (ev.x, ev.y, 1);
1666 MEvent.button = Button3; 1670 MEvent.button = Button3;
1667 break; 1671 break;
1668 } 1672 }
1669 } 1673 }
1670 MEvent.time = ev->time; 1674 MEvent.time = ev.time;
1671 return; 1675 return;
1672 } 1676 }
1673 } 1677 }
1674 1678
1675 /* 1679 /*
1676 * Scrollbar window processing of button press 1680 * Scrollbar window processing of button press
1677 */ 1681 */
1678 if (isScrollbarWindow(ev->window)) 1682 if (isScrollbarWindow (ev.window))
1679 { 1683 {
1680 scrollBar.setIdle (); 1684 scrollBar.setIdle ();
1681 /* 1685 /*
1682 * Rxvt-style scrollbar: 1686 * Rxvt-style scrollbar:
1683 * move up if mouse is above slider 1687 * move up if mouse is above slider
… …
1695 * Mouse report disabled scrollbar: 1699 * Mouse report disabled scrollbar:
1696 * arrow buttons - send up/down 1700 * arrow buttons - send up/down
1697 * click on scrollbar - send pageup/down 1701 * click on scrollbar - send pageup/down
1698 */ 1702 */
1699 if ((scrollBar.style == R_SB_NEXT 1703 if ((scrollBar.style == R_SB_NEXT
1700 && scrollbarnext_upButton(ev->y)) 1704 && scrollbarnext_upButton (ev.y))
1701 || (scrollBar.style == R_SB_RXVT 1705 || (scrollBar.style == R_SB_RXVT
1702 && scrollbarrxvt_upButton(ev->y))) 1706 && scrollbarrxvt_upButton (ev.y)))
1703 tt_printf("\033[A"); 1707 tt_printf ("\033[A");
1704 else if ((scrollBar.style == R_SB_NEXT 1708 else if ((scrollBar.style == R_SB_NEXT
1705 && scrollbarnext_dnButton(ev->y)) 1709 && scrollbarnext_dnButton (ev.y))
1706 || (scrollBar.style == R_SB_RXVT 1710 || (scrollBar.style == R_SB_RXVT
1707 && scrollbarrxvt_dnButton(ev->y))) 1711 && scrollbarrxvt_dnButton (ev.y)))
1708 tt_printf("\033[B"); 1712 tt_printf ("\033[B");
1709 else 1713 else
1710 switch (ev->button) 1714 switch (ev.button)
1711 { 1715 {
1712 case Button2: 1716 case Button2:
1713 tt_printf("\014"); 1717 tt_printf ("\014");
1714 break; 1718 break;
1715 case Button1: 1719 case Button1:
1716 tt_printf("\033[6~"); 1720 tt_printf ("\033[6~");
1717 break; 1721 break;
1718 case Button3: 1722 case Button3:
1719 tt_printf("\033[5~"); 1723 tt_printf ("\033[5~");
1720 break; 1724 break;
1721 } 1725 }
1722 } 1726 }
1723 else 1727 else
1724#endif /* NO_SCROLLBAR_REPORT */ 1728#endif /* NO_SCROLLBAR_REPORT */
… …
1726 { 1730 {
1727 char upordown = 0; 1731 char upordown = 0;
1728 1732
1729 if (scrollBar.style == R_SB_NEXT) 1733 if (scrollBar.style == R_SB_NEXT)
1730 { 1734 {
1731 if (scrollbarnext_upButton(ev->y)) 1735 if (scrollbarnext_upButton (ev.y))
1732 upordown = -1; /* up */ 1736 upordown = -1; /* up */
1733 else if (scrollbarnext_dnButton(ev->y)) 1737 else if (scrollbarnext_dnButton (ev.y))
1734 upordown = 1; /* down */ 1738 upordown = 1; /* down */
1735 } 1739 }
1736 else if (scrollBar.style == R_SB_RXVT) 1740 else if (scrollBar.style == R_SB_RXVT)
1737 { 1741 {
1738 if (scrollbarrxvt_upButton(ev->y)) 1742 if (scrollbarrxvt_upButton (ev.y))
1739 upordown = -1; /* up */ 1743 upordown = -1; /* up */
1740 else if (scrollbarrxvt_dnButton(ev->y)) 1744 else if (scrollbarrxvt_dnButton (ev.y))
1741 upordown = 1; /* down */ 1745 upordown = 1; /* down */
1742 } 1746 }
1743 if (upordown) 1747 if (upordown)
1744 { 1748 {
1745#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
… …
1752 else 1756 else
1753 scrollBar.setDn (); 1757 scrollBar.setDn ();
1754 } 1758 }
1755 } 1759 }
1756 else 1760 else
1757 switch (ev->button) 1761 switch (ev.button)
1758 { 1762 {
1759 case Button2: 1763 case Button2:
1760 switch (scrollbar_align) 1764 switch (scrollbar_align)
1761 { 1765 {
1762 case R_SB_ALIGN_TOP: 1766 case R_SB_ALIGN_TOP:
… …
1768 case R_SB_ALIGN_BOTTOM: 1772 case R_SB_ALIGN_BOTTOM:
1769 csrO = scrollBar.bot - scrollBar.top; 1773 csrO = scrollBar.bot - scrollBar.top;
1770 break; 1774 break;
1771 } 1775 }
1772 if (scrollBar.style == R_SB_XTERM 1776 if (scrollBar.style == R_SB_XTERM
1773 || scrollbar_above_slider(ev->y) 1777 || scrollbar_above_slider (ev.y)
1774 || scrollbar_below_slider(ev->y)) 1778 || scrollbar_below_slider (ev.y))
1775 scr_move_to ( scrollbar_position(ev->y) - csrO, 1779 scr_move_to ( scrollbar_position (ev.y) - csrO,
1776 scrollbar_size()); 1780 scrollbar_size ());
1777 scrollBar.setMotion (); 1781 scrollBar.setMotion ();
1778 break; 1782 break;
1779 1783
1780 case Button1: 1784 case Button1:
1781 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1785 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1782 csrO = ev->y - scrollBar.top; 1786 csrO = ev.y - scrollBar.top;
1783 /* FALLTHROUGH */ 1787 /* FALLTHROUGH */
1784 1788
1785 case Button3: 1789 case Button3:
1786 if (scrollBar.style != R_SB_XTERM) 1790 if (scrollBar.style != R_SB_XTERM)
1787 { 1791 {
1788 if (scrollbar_above_slider(ev->y)) 1792 if (scrollbar_above_slider (ev.y))
1789# ifdef RXVT_SCROLL_FULL 1793# ifdef RXVT_SCROLL_FULL
1790 scr_page (UP, TermWin.nrow - 1); 1794 scr_page (UP, TermWin.nrow - 1);
1791# else 1795# else
1792 scr_page (UP, TermWin.nrow / 4); 1796 scr_page (UP, TermWin.nrow / 4);
1793# endif 1797# endif
1794 else if (scrollbar_below_slider(ev->y)) 1798 else if (scrollbar_below_slider (ev.y))
1795# ifdef RXVT_SCROLL_FULL 1799# ifdef RXVT_SCROLL_FULL
1796 scr_page (DN, TermWin.nrow - 1); 1800 scr_page (DN, TermWin.nrow - 1);
1797# else 1801# else
1798 scr_page (DN, TermWin.nrow / 4); 1802 scr_page (DN, TermWin.nrow / 4);
1799# endif 1803# endif
1800 else 1804 else
1801 scrollBar.setMotion (); 1805 scrollBar.setMotion ();
1802 } 1806 }
1803 else 1807 else
1804 { 1808 {
1805 scr_page ((ev->button == Button1 ? DN : UP), 1809 scr_page ((ev.button == Button1 ? DN : UP),
1806 (TermWin.nrow 1810 (TermWin.nrow
1807 * scrollbar_position(ev->y) 1811 * scrollbar_position (ev.y)
1808 / scrollbar_size())); 1812 / scrollbar_size ()));
1809 } 1813 }
1810 break; 1814 break;
1811 } 1815 }
1812 } 1816 }
1813 return; 1817 return;
1814 } 1818 }
1815#if MENUBAR 1819#if MENUBAR
1816 /* 1820 /*
1817 * Menubar window processing of button press 1821 * Menubar window processing of button press
1818 */ 1822 */
1819 if (isMenuBarWindow(ev->window)) 1823 if (isMenuBarWindow (ev.window))
1820 menubar_control (ev); 1824 menubar_control (ev);
1821#endif 1825#endif
1822} 1826}
1823 1827
1824void 1828void
1825rxvt_term::button_release (XButtonEvent *ev) 1829rxvt_term::button_release (const XButtonEvent &ev)
1826{ 1830{
1827 int reportmode = 0; 1831 int reportmode = 0;
1828 1832
1829 csrO = 0; /* reset csr Offset */ 1833 csrO = 0; /* reset csr Offset */
1830 if (!bypass_keystate) 1834 if (!bypass_keystate)
1831 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1835 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1832 1836
1833 if (scrollbar_isUpDn()) 1837 if (scrollbar_isUpDn ())
1834 { 1838 {
1835 scrollBar.setIdle (); 1839 scrollBar.setIdle ();
1836 scrollbar_show (0); 1840 scrollbar_show (0);
1837#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1838 refresh_type &= ~SMOOTH_REFRESH; 1842 refresh_type &= ~SMOOTH_REFRESH;
… …
1840 1844
1841 } 1845 }
1842#ifdef SELECTION_SCROLLING 1846#ifdef SELECTION_SCROLLING
1843 pending_scroll_selection=0; 1847 pending_scroll_selection=0;
1844#endif 1848#endif
1845 if (ev->window == TermWin.vt) 1849 if (ev.window == TermWin.vt)
1846 { 1850 {
1847#ifdef RXVT_GRAPHICS 1851#ifdef RXVT_GRAPHICS
1848 if (ev->subwindow != None) 1852 if (ev.subwindow != None)
1849 rxvt_Gr_ButtonRelease(ev->x, ev->y); 1853 rxvt_Gr_ButtonRelease (ev.x, ev.y);
1850 else 1854 else
1851#endif 1855#endif
1852 1856
1853 { 1857 {
1854 if (reportmode) 1858 if (reportmode)
1855 { 1859 {
1856 /* mouse report from vt window */ 1860 /* mouse report from vt window */
1857 /* don't report release of wheel "buttons" */ 1861 /* don't report release of wheel "buttons" */
1858 if (ev->button >= 4) 1862 if (ev.button >= 4)
1859 return; 1863 return;
1860#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1861 /* only report the release of 'slow' single clicks */ 1865 /* only report the release of 'slow' single clicks */
1862 if (MEvent.button != AnyButton 1866 if (MEvent.button != AnyButton
1863 && (ev->button != MEvent.button 1867 && (ev.button != MEvent.button
1864 || (ev->time - MEvent.time 1868 || (ev.time - MEvent.time
1865 > MULTICLICK_TIME / 2))) 1869 > MULTICLICK_TIME / 2)))
1866 { 1870 {
1867 MEvent.clicks = 0; 1871 MEvent.clicks = 0;
1868 MEvent.button = AnyButton; 1872 MEvent.button = AnyButton;
1869 mouse_report (ev); 1873 mouse_report (ev);
… …
1878 * dumb hack to compensate for the failure of click-and-drag 1882 * dumb hack to compensate for the failure of click-and-drag
1879 * when overriding mouse reporting 1883 * when overriding mouse reporting
1880 */ 1884 */
1881 if (PrivateModes & PrivMode_mouse_report 1885 if (PrivateModes & PrivMode_mouse_report
1882 && bypass_keystate 1886 && bypass_keystate
1883 && ev->button == Button1 && MEvent.clicks <= 1) 1887 && ev.button == Button1 && MEvent.clicks <= 1)
1884 selection_extend (ev->x, ev->y, 0); 1888 selection_extend (ev.x, ev.y, 0);
1885 1889
1886 switch (ev->button) 1890 switch (ev.button)
1887 { 1891 {
1888 case Button1: 1892 case Button1:
1889 case Button3: 1893 case Button3:
1890 selection_make (ev->time); 1894 selection_make (ev.time);
1891 break; 1895 break;
1892 case Button2: 1896 case Button2:
1893 selection_request (ev->time, ev->x, ev->y); 1897 selection_request (ev.time, ev.x, ev.y);
1894 break; 1898 break;
1895#ifdef MOUSE_WHEEL 1899#ifdef MOUSE_WHEEL
1896 case Button4: 1900 case Button4:
1897 case Button5: 1901 case Button5:
1898 { 1902 {
1899 int i; 1903 int i;
1900 page_dirn v; 1904 page_dirn v;
1901 1905
1902 v = (ev->button == Button4) ? UP : DN; 1906 v = (ev.button == Button4) ? UP : DN;
1903 if (ev->state & ShiftMask) 1907 if (ev.state & ShiftMask)
1904 i = 1; 1908 i = 1;
1905 else if ((Options & Opt_mouseWheelScrollPage)) 1909 else if ((Options & Opt_mouseWheelScrollPage))
1906 i = TermWin.nrow - 1; 1910 i = TermWin.nrow - 1;
1907 else 1911 else
1908 i = 5; 1912 i = 5;
1909# ifdef MOUSE_SLIP_WHEELING 1913# ifdef MOUSE_SLIP_WHEELING
1910 if (ev->state & ControlMask) 1914 if (ev.state & ControlMask)
1911 { 1915 {
1912 mouse_slip_wheel_speed += (v ? -1 : 1); 1916 mouse_slip_wheel_speed += (v ? -1 : 1);
1913 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1914 } 1918 }
1915# endif 1919# endif
… …
1932 1936
1933 } 1937 }
1934 } 1938 }
1935 } 1939 }
1936#ifdef MENUBAR 1940#ifdef MENUBAR
1937 else if (isMenuBarWindow(ev->window)) 1941 else if (isMenuBarWindow (ev.window))
1938 menubar_control (ev); 1942 menubar_control (ev);
1939#endif 1943#endif
1940} 1944}
1941 1945
1942 1946
… …
1956 Pixmap rootpixmap = None; 1960 Pixmap rootpixmap = None;
1957 XWindowAttributes wattr, wrootattr; 1961 XWindowAttributes wattr, wrootattr;
1958 1962
1959 pchanged = 0; 1963 pchanged = 0;
1960 1964
1961 if (!(Options & Opt_transparent)) 1965 if (! (Options & Opt_transparent))
1962 return pchanged; /* Don't try any more */ 1966 return pchanged; /* Don't try any more */
1963 1967
1964 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 1968 XGetWindowAttributes (display->display, display->root, &wrootattr);
1965 rootdepth = wrootattr.depth; 1969 rootdepth = wrootattr.depth;
1966 1970
1967 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1968 if (rootdepth != wattr.depth) 1972 if (rootdepth != wattr.depth)
1969 { 1973 {
1970 if (am_transparent) 1974 if (am_transparent)
1971 { 1975 {
1972 pchanged = 1; 1976 pchanged = 1;
1973 XSetWindowBackground(Xdisplay, TermWin.vt, 1977 XSetWindowBackground (display->display, TermWin.vt,
1974 PixColors[Color_bg]); 1978 PixColors[Color_bg]);
1975 am_transparent = am_pixmap_trans = 0; 1979 am_transparent = am_pixmap_trans = 0;
1976 } 1980 }
1977 return pchanged; /* Don't try any more */ 1981 return pchanged; /* Don't try any more */
1978 } 1982 }
1979 1983
1980 /* Get all X ops out of the queue so that our information is up-to-date. */ 1984 /* Get all X ops out of the queue so that our information is up-to-date. */
1981 XSync(Xdisplay, False); 1985 XSync (display->display, False);
1982 1986
1983 /* 1987 /*
1984 * Make the frame window set by the window manager have 1988 * Make the frame window set by the window manager have
1985 * the root background. Some window managers put multiple nested frame 1989 * the root background. Some window managers put multiple nested frame
1986 * windows for each client, so we have to take care about that. 1990 * windows for each client, so we have to take care about that.
1987 */ 1991 */
1988 i = (xa[XA_XROOTPMAPID] != 0 1992 i = (xa[XA_XROOTPMAPID] != 0
1989 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1990 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1991 &nitems, &bytes_after, &prop) == Success)); 1995 &nitems, &bytes_after, &prop) == Success));
1992 if (!i || prop == NULL) 1996 if (!i || prop == NULL)
1993 have_pixmap = 0; 1997 have_pixmap = 0;
1994 else 1998 else
1995 { 1999 {
1996 have_pixmap = 1; 2000 have_pixmap = 1;
1997 rootpixmap = *((Pixmap *)prop); 2001 rootpixmap = * ((Pixmap *)prop);
1998 XFree(prop); 2002 XFree (prop);
1999 } 2003 }
2000 if (have_pixmap) 2004 if (have_pixmap)
2001 { 2005 {
2002 /* 2006 /*
2003 * Copy Xroot pixmap transparency 2007 * Copy display->root pixmap transparency
2004 */ 2008 */
2005 int sx, sy, nx, ny; 2009 int sx, sy, nx, ny;
2006 unsigned int nw, nh; 2010 unsigned int nw, nh;
2007 Window cr; 2011 Window cr;
2008 XImage *image; 2012 XImage *image;
2009 GC gc; 2013 GC gc;
2010 XGCValues gcvalue; 2014 XGCValues gcvalue;
2011 2015
2012 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2013 0, 0, &sx, &sy, &cr); 2017 0, 0, &sx, &sy, &cr);
2014 nw = (unsigned int)szHint.width; 2018 nw = (unsigned int)szHint.width;
2015 nh = (unsigned int)szHint.height; 2019 nh = (unsigned int)szHint.height;
2016 nx = ny = 0; 2020 nx = ny = 0;
2017 if (sx < 0) 2021 if (sx < 0)
… …
2024 { 2028 {
2025 nh += sy; 2029 nh += sy;
2026 ny = -sy; 2030 ny = -sy;
2027 sy = 0; 2031 sy = 0;
2028 } 2032 }
2029 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2031 allowedxerror = -1; 2035 allowedxerror = -1;
2032 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2033 ZPixmap); 2037 ZPixmap);
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */ 2039 /* XXX: may need a delay here? */
2036 allowedxerror = 0; 2040 allowedxerror = 0;
2037 if (image == NULL) 2041 if (image == NULL)
… …
2039 if (am_transparent && am_pixmap_trans) 2043 if (am_transparent && am_pixmap_trans)
2040 { 2044 {
2041 pchanged = 1; 2045 pchanged = 1;
2042 if (TermWin.pixmap != None) 2046 if (TermWin.pixmap != None)
2043 { 2047 {
2044 XFreePixmap(Xdisplay, TermWin.pixmap); 2048 XFreePixmap (display->display, TermWin.pixmap);
2045 TermWin.pixmap = None; 2049 TermWin.pixmap = None;
2046 } 2050 }
2047 } 2051 }
2048 am_pixmap_trans = 0; 2052 am_pixmap_trans = 0;
2049 } 2053 }
2050 else 2054 else
2051 { 2055 {
2052 if (TermWin.pixmap != None) 2056 if (TermWin.pixmap != None)
2053 XFreePixmap(Xdisplay, TermWin.pixmap); 2057 XFreePixmap (display->display, TermWin.pixmap);
2054 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2055 (unsigned int)szHint.width, 2059 (unsigned int)szHint.width,
2056 (unsigned int)szHint.height, 2060 (unsigned int)szHint.height,
2057 (unsigned int)image->depth); 2061 (unsigned int)image->depth);
2058 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2059 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2060 nx, ny, (unsigned int)image->width, 2064 nx, ny, (unsigned int)image->width,
2061 (unsigned int)image->height); 2065 (unsigned int)image->height);
2062 XFreeGC(Xdisplay, gc); 2066 XFreeGC (display->display, gc);
2063 XDestroyImage(image); 2067 XDestroyImage (image);
2064 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2065 TermWin.pixmap); 2069 TermWin.pixmap);
2066 if (!am_transparent || !am_pixmap_trans) 2070 if (!am_transparent || !am_pixmap_trans)
2067 pchanged = 1; 2071 pchanged = 1;
2068 am_transparent = am_pixmap_trans = 1; 2072 am_transparent = am_pixmap_trans = 1;
2069 } 2073 }
… …
2072 { 2076 {
2073 unsigned int n; 2077 unsigned int n;
2074 /* 2078 /*
2075 * InheritPixmap transparency 2079 * InheritPixmap transparency
2076 */ 2080 */
2077 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2078 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2079 i++) 2083 i++)
2080 { 2084 {
2081 oldp = TermWin.parent[i]; 2085 oldp = TermWin.parent[i];
2082 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2086 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2083 &TermWin.parent[i], &list, &n); 2087 &TermWin.parent[i], &list, &n);
2084 XFree(list); 2088 XFree (list);
2085 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2086 if (TermWin.parent[i] == Xroot) 2090 if (TermWin.parent[i] == display->root)
2087 { 2091 {
2088 if (oldp != None) 2092 if (oldp != None)
2089 pchanged = 1; 2093 pchanged = 1;
2090 break; 2094 break;
2091 } 2095 }
… …
2095 n = 0; 2099 n = 0;
2096 if (pchanged) 2100 if (pchanged)
2097 { 2101 {
2098 for (; n < (unsigned int)i; n++) 2102 for (; n < (unsigned int)i; n++)
2099 { 2103 {
2100 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2101 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2105 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2102 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2106 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2103 { 2107 {
2104 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2105 break; 2109 break;
2106 } 2110 }
2107 } 2111 }
2108 } 2112 }
2109 if (n > (int)(sizeof(TermWin.parent) 2113 if (n > (int) (sizeof (TermWin.parent)
2110 / sizeof(TermWin.parent[0]))) 2114 / sizeof (TermWin.parent[0])))
2111 { 2115 {
2112 D_X((stderr, "InheritPixmap Turning off")); 2116 D_X ((stderr, "InheritPixmap Turning off"));
2113 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2117 XSetWindowBackground (display->display, TermWin.parent[0],
2114 PixColors[Color_fg]); 2118 PixColors[Color_fg]);
2115 XSetWindowBackground(Xdisplay, TermWin.vt, 2119 XSetWindowBackground (display->display, TermWin.vt,
2116 PixColors[Color_bg]); 2120 PixColors[Color_bg]);
2117 am_transparent = 0; 2121 am_transparent = 0;
2118 /* XXX: also turn off Opt_transparent? */ 2122 /* XXX: also turn off Opt_transparent? */
2119 } 2123 }
2120 else 2124 else
… …
2124# ifdef HAVE_NANOSLEEP 2128# ifdef HAVE_NANOSLEEP
2125 struct timespec rqt; 2129 struct timespec rqt;
2126 2130
2127 rqt.tv_sec = 1; 2131 rqt.tv_sec = 1;
2128 rqt.tv_nsec = 0; 2132 rqt.tv_nsec = 0;
2129 nanosleep(&rqt, NULL); 2133 nanosleep (&rqt, NULL);
2130# else 2134# else
2131 sleep(1); 2135 sleep (1);
2132# endif 2136# endif
2133 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2134 for (n = 0; n < (unsigned int)i; n++) 2138 for (n = 0; n < (unsigned int)i; n++)
2135 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2136 ParentRelative); 2140 ParentRelative);
2137 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2138 ParentRelative); 2142 ParentRelative);
2139 am_transparent = 1; 2143 am_transparent = 1;
2140 } 2144 }
2141 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2142 TermWin.parent[i] = None; 2146 TermWin.parent[i] = None;
2143 } 2147 }
2144 return pchanged; 2148 return pchanged;
2145} 2149}
2146#endif 2150#endif
… …
2151/*----------------------------------------------------------------------*/ 2155/*----------------------------------------------------------------------*/
2152#ifdef PRINTPIPE 2156#ifdef PRINTPIPE
2153FILE * 2157FILE *
2154rxvt_term::popen_printer () 2158rxvt_term::popen_printer ()
2155{ 2159{
2156 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2160 FILE *stream = popen (rs[Rs_print_pipe], "w");
2157 2161
2158 if (stream == NULL) 2162 if (stream == NULL)
2159 rxvt_print_error("can't open printer pipe"); 2163 rxvt_print_error ("can't open printer pipe");
2160 return stream; 2164 return stream;
2161} 2165}
2162 2166
2163int 2167int
2164rxvt_term::pclose_printer (FILE *stream) 2168rxvt_term::pclose_printer (FILE *stream)
2165{ 2169{
2166 fflush (stream); 2170 fflush (stream);
2167 /* pclose() reported not to work on SunOS 4.1.3 */ 2171 /* pclose () reported not to work on SunOS 4.1.3 */
2168# if defined (__sun__) /* TODO: RESOLVE THIS */ 2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2169 /* pclose works provided SIGCHLD handler uses waitpid */ 2173 /* pclose works provided SIGCHLD handler uses waitpid */
2170 return pclose (stream); /* return fclose (stream); */ 2174 return pclose (stream); /* return fclose (stream); */
2171# else 2175# else
2172 return pclose (stream); 2176 return pclose (stream);
… …
2195 unsigned char ch; 2199 unsigned char ch;
2196 unsigned int i, len; 2200 unsigned int i, len;
2197 2201
2198 if ((ch = cmd_getc ()) != C0_ESC) 2202 if ((ch = cmd_getc ()) != C0_ESC)
2199 { 2203 {
2200 if (putc(ch, fd) == EOF) 2204 if (putc (ch, fd) == EOF)
2201 break; /* done = 1 */ 2205 break; /* done = 1 */
2202 } 2206 }
2203 else 2207 else
2204 { 2208 {
2205 len = 0; 2209 len = 0;
… …
2217 if ((buf[len++] = cmd_getc ()) == 'i') 2221 if ((buf[len++] = cmd_getc ()) == 'i')
2218 break; /* done = 1 */ 2222 break; /* done = 1 */
2219 } 2223 }
2220 } 2224 }
2221 for (i = 0; i < len; i++) 2225 for (i = 0; i < len; i++)
2222 if (putc(buf[i], fd) == EOF) 2226 if (putc (buf[i], fd) == EOF)
2223 { 2227 {
2224 done = 1; 2228 done = 1;
2225 break; 2229 break;
2226 } 2230 }
2227 } 2231 }
… …
2247{ 2251{
2248 switch (ch) 2252 switch (ch)
2249 { 2253 {
2250 case C0_ENQ: /* terminal Status */ 2254 case C0_ENQ: /* terminal Status */
2251 if (rs[Rs_answerbackstring]) 2255 if (rs[Rs_answerbackstring])
2252 tt_write( 2256 tt_write (
2253 (const unsigned char *)rs[Rs_answerbackstring], 2257 (const unsigned char *)rs[Rs_answerbackstring],
2254 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2258 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2255 else 2259 else
2256 tt_write((unsigned char *)VT100_ANS, 2260 tt_write ((unsigned char *)VT100_ANS,
2257 (unsigned int)STRLEN(VT100_ANS)); 2261 (unsigned int)STRLEN (VT100_ANS));
2258 break; 2262 break;
2259 case C0_BEL: /* bell */ 2263 case C0_BEL: /* bell */
2260 scr_bell (); 2264 scr_bell ();
2261 break; 2265 break;
2262 case C0_BS: /* backspace */ 2266 case C0_BS: /* backspace */
… …
2324 row = cmd_getc () - ' '; 2328 row = cmd_getc () - ' ';
2325 col = cmd_getc () - ' '; 2329 col = cmd_getc () - ' ';
2326 scr_gotorc (row, col, 0); 2330 scr_gotorc (row, col, 0);
2327 break; 2331 break;
2328 case 'Z': /* identify the terminal type */ 2332 case 'Z': /* identify the terminal type */
2329 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2333 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2330 break; 2334 break;
2331 case '<': /* turn off VT52 mode */ 2335 case '<': /* turn off VT52 mode */
2332 PrivMode(0, PrivMode_vt52); 2336 PrivMode (0, PrivMode_vt52);
2333 break; 2337 break;
2334 case 'F': /* use special graphics character set */ 2338 case 'F': /* use special graphics character set */
2335 case 'G': /* use regular character set */ 2339 case 'G': /* use regular character set */
2336 /* unimplemented */ 2340 /* unimplemented */
2337 break; 2341 break;
… …
2396 scr_forwardindex (); 2400 scr_forwardindex ();
2397 break; 2401 break;
2398#endif 2402#endif
2399 case '=': 2403 case '=':
2400 case '>': 2404 case '>':
2401 PrivMode((ch == '='), PrivMode_aplKP); 2405 PrivMode ((ch == '='), PrivMode_aplKP);
2402 break; 2406 break;
2403 2407
2404 case C1_40: 2408 case C1_40:
2405 cmd_getc (); 2409 cmd_getc ();
2406 break; 2410 break;
… …
2442 process_dcs_seq (); 2446 process_dcs_seq ();
2443 break; 2447 break;
2444 2448
2445 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2449 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2446 case C1_SCI: /* ESC Z */ 2450 case C1_SCI: /* ESC Z */
2447 tt_write((const unsigned char *)ESCZ_ANSWER, 2451 tt_write ((const unsigned char *)ESCZ_ANSWER,
2448 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2452 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2449 break; /* steal obsolete ESC [ c */ 2453 break; /* steal obsolete ESC [ c */
2450 2454
2451 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2455 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2452 case C1_CSI: /* ESC [ */ 2456 case C1_CSI: /* ESC [ */
2453 process_csi_seq (); 2457 process_csi_seq ();
… …
2493 2497
2494#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2498#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2495 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2499 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2496 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2500 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2497#define get_byte_array_bit(array, bit) \ 2501#define get_byte_array_bit(array, bit) \
2498 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2502 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2499 2503
2500const unsigned char csi_defaults[] = 2504const unsigned char csi_defaults[] =
2501 { 2505 {
2502 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2506 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2503 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2507 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2504 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2508 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2505 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2509 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2506 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2510 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2507 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2511 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2508 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2512 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2509 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2513 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2510 }; 2514 };
2511/* *INDENT-ON* */ 2515/* *INDENT-ON* */
2512 2516
2513void 2517void
2514rxvt_term::process_csi_seq () 2518rxvt_term::process_csi_seq ()
… …
2529 ch = cmd_getc (); 2533 ch = cmd_getc ();
2530 } 2534 }
2531 /* read any numerical arguments */ 2535 /* read any numerical arguments */
2532 for (n = -1; ch < CSI_ICH; ) 2536 for (n = -1; ch < CSI_ICH; )
2533 { 2537 {
2534 if (isdigit(ch)) 2538 if (isdigit (ch))
2535 { 2539 {
2536 if (n < 0) 2540 if (n < 0)
2537 n = ch - '0'; 2541 n = ch - '0';
2538 else 2542 else
2539 n = n * 10 + ch - '0'; 2543 n = n * 10 + ch - '0';
… …
2565 2569
2566 if (nargs < ESC_ARGS) 2570 if (nargs < ESC_ARGS)
2567 arg[nargs++] = n; 2571 arg[nargs++] = n;
2568 2572
2569 i = ch - CSI_ICH; 2573 i = ch - CSI_ICH;
2570 ndef = get_byte_array_bit(csi_defaults, i); 2574 ndef = get_byte_array_bit (csi_defaults, i);
2571 for (p = 0; p < nargs; p++) 2575 for (p = 0; p < nargs; p++)
2572 if (arg[p] == -1) 2576 if (arg[p] == -1)
2573 arg[p] = ndef; 2577 arg[p] = ndef;
2574 2578
2575#ifdef DEBUG_CMD 2579#ifdef DEBUG_CMD
2576 fprintf(stderr, "CSI "); 2580 fprintf (stderr, "CSI ");
2577 for (p = 0; p < nargs; p++) 2581 for (p = 0; p < nargs; p++)
2578 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2582 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2579 fprintf(stderr, "%c\n", ch); 2583 fprintf (stderr, "%c\n", ch);
2580#endif 2584#endif
2581 2585
2582 /* 2586 /*
2583 * private mode handling 2587 * private mode handling
2584 */ 2588 */
… …
2586 { 2590 {
2587 switch (priv) 2591 switch (priv)
2588 { 2592 {
2589 case '>': 2593 case '>':
2590 if (ch == CSI_DA) /* secondary device attributes */ 2594 if (ch == CSI_DA) /* secondary device attributes */
2591 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2595 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2592 break; 2596 break;
2593 case '?': 2597 case '?':
2594 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2598 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2595 process_terminal_mode (ch, priv, nargs, arg); 2599 process_terminal_mode (ch, priv, nargs, arg);
2596 break; 2600 break;
… …
2599 } 2603 }
2600 2604
2601 switch (ch) 2605 switch (ch)
2602 { 2606 {
2603 /* 2607 /*
2604 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2608 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2605 */ 2609 */
2606#ifdef PRINTPIPE 2610#ifdef PRINTPIPE
2607 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2611 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2608 switch (arg[0]) 2612 switch (arg[0])
2609 { 2613 {
… …
2705 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2709 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2706 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2707 break; 2711 break;
2708 2712
2709 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2710 tt_write((const unsigned char *)VT100_ANS, 2714 tt_write ((const unsigned char *)VT100_ANS,
2711 (unsigned int)(sizeof(VT100_ANS) - 1)); 2715 (unsigned int) (sizeof (VT100_ANS) - 1));
2712 break; 2716 break;
2713 2717
2714 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2715 process_sgr_mode (nargs, arg); 2719 process_sgr_mode (nargs, arg);
2716 break; 2720 break;
2717 2721
2718 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2722 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2719 switch (arg[0]) 2723 switch (arg[0])
2720 { 2724 {
2721 case 5: /* DSR requested */ 2725 case 5: /* DSR requested */
2722 tt_printf("\033[0n"); 2726 tt_printf ("\033[0n");
2723 break; 2727 break;
2724 case 6: /* CPR requested */ 2728 case 6: /* CPR requested */
2725 scr_report_position (); 2729 scr_report_position ();
2726 break; 2730 break;
2727#if defined (ENABLE_DISPLAY_ANSWER) 2731#if defined (ENABLE_DISPLAY_ANSWER)
2728 case 7: /* unofficial extension */ 2732 case 7: /* unofficial extension */
2729 tt_printf("%-.250s\n", rs[Rs_display_name]); 2733 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2730 break; 2734 break;
2731#endif 2735#endif
2732 case 8: /* unofficial extension */ 2736 case 8: /* unofficial extension */
2733 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2734 break; 2738 break;
… …
2805 break; 2809 break;
2806#endif 2810#endif
2807 2811
2808 case CSI_78: /* DECREQTPARM */ 2812 case CSI_78: /* DECREQTPARM */
2809 if (arg[0] == 0 || arg[0] == 1) 2813 if (arg[0] == 0 || arg[0] == 1)
2810 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2811 /* FALLTHROUGH */ 2815 /* FALLTHROUGH */
2812 2816
2813 default: 2817 default:
2814 break; 2818 break;
2815 } 2819 }
… …
2834 { 2838 {
2835 /* 2839 /*
2836 * commands 2840 * commands
2837 */ 2841 */
2838 case 1: /* deiconify window */ 2842 case 1: /* deiconify window */
2839 XMapWindow(Xdisplay, TermWin.parent[0]); 2843 XMapWindow (display->display, TermWin.parent[0]);
2840 break; 2844 break;
2841 case 2: /* iconify window */ 2845 case 2: /* iconify window */
2842 XIconifyWindow(Xdisplay, TermWin.parent[0], 2846 XIconifyWindow (display->display, TermWin.parent[0],
2843 DefaultScreen(Xdisplay)); 2847 DefaultScreen (display->display));
2844 break; 2848 break;
2845 case 3: /* set position (pixels) */ 2849 case 3: /* set position (pixels) */
2846 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 2850 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2847 break; 2851 break;
2848 case 4: /* set size (pixels) */ 2852 case 4: /* set size (pixels) */
2849 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2853 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2850 break; 2854 break;
2851 case 5: /* raise window */ 2855 case 5: /* raise window */
2852 XRaiseWindow(Xdisplay, TermWin.parent[0]); 2856 XRaiseWindow (display->display, TermWin.parent[0]);
2853 break; 2857 break;
2854 case 6: /* lower window */ 2858 case 6: /* lower window */
2855 XLowerWindow(Xdisplay, TermWin.parent[0]); 2859 XLowerWindow (display->display, TermWin.parent[0]);
2856 break; 2860 break;
2857 case 7: /* refresh window */ 2861 case 7: /* refresh window */
2858 scr_touch (true); 2862 scr_touch (true);
2859 break; 2863 break;
2860 case 8: /* set size (chars) */ 2864 case 8: /* set size (chars) */
2861 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2862 (unsigned int)(args[1] * TermWin.fheight)); 2866 (unsigned int) (args[1] * TermWin.fheight));
2863 break; 2867 break;
2864 default: 2868 default:
2865 if (args[0] >= 24) /* set height (chars) */ 2869 if (args[0] >= 24) /* set height (chars) */
2866 set_widthheight ((unsigned int)TermWin.width, 2870 set_widthheight ((unsigned int)TermWin.width,
2867 (unsigned int)(args[1] * TermWin.fheight)); 2871 (unsigned int) (args[1] * TermWin.fheight));
2868 break; 2872 break;
2869 /* 2873 /*
2870 * reports - some output format copied from XTerm 2874 * reports - some output format copied from XTerm
2871 */ 2875 */
2872 case 11: /* report window state */ 2876 case 11: /* report window state */
2873 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2874 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2875 break; 2879 break;
2876 case 13: /* report window position */ 2880 case 13: /* report window position */
2877 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2878 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2879 -wattr.border_width, -wattr.border_width, 2883 -wattr.border_width, -wattr.border_width,
2880 &x, &y, &wdummy); 2884 &x, &y, &wdummy);
2881 tt_printf("\033[3;%d;%dt", x, y); 2885 tt_printf ("\033[3;%d;%dt", x, y);
2882 break; 2886 break;
2883 case 14: /* report window size (pixels) */ 2887 case 14: /* report window size (pixels) */
2884 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2885 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2886 break; 2890 break;
2887 case 18: /* report window size (chars) */ 2891 case 18: /* report window size (chars) */
2888 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2889 break; 2893 break;
2890#if 0 /* XXX: currently disabled due to security concerns */ 2894#if 0 /* XXX: currently disabled due to security concerns */
2891 case 20: /* report icon label */ 2895 case 20: /* report icon label */
2892 XGetIconName(Xdisplay, TermWin.parent[0], &s); 2896 XGetIconName (display->display, TermWin.parent[0], &s);
2893 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2894 break; 2898 break;
2895 case 21: /* report window title */ 2899 case 21: /* report window title */
2896 XFetchName(Xdisplay, TermWin.parent[0], &s); 2900 XFetchName (display->display, TermWin.parent[0], &s);
2897 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2898 break; 2902 break;
2899#endif 2903#endif
2900 2904
2901 } 2905 }
2902} 2906}
2903#endif 2907#endif
2904 2908
2905/*----------------------------------------------------------------------*/ 2909/*----------------------------------------------------------------------*/
2906/* 2910/*
2907 * get input up until STRING TERMINATOR (or BEL) 2911 * get input up until STRING TERMINATOR (or BEL)
2908 * ends_how is terminator used. returned input must be free()d 2912 * ends_how is terminator used. returned input must be free ()d
2909 */ 2913 */
2910unsigned char * 2914unsigned char *
2911rxvt_term::get_to_st (unsigned char *ends_how) 2915rxvt_term::get_to_st (unsigned char *ends_how)
2912{ 2916{
2913 int seen_esc = 0; /* seen escape? */ 2917 int seen_esc = 0; /* seen escape? */
… …
2928 } 2932 }
2929 else if (ch == '\t') 2933 else if (ch == '\t')
2930 ch = ' '; /* translate '\t' to space */ 2934 ch = ' '; /* translate '\t' to space */
2931 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2932 return NULL; /* other control character - exit */ 2936 return NULL; /* other control character - exit */
2933 if (n < sizeof(string) - 1) 2937 if (n < sizeof (string) - 1)
2934 string[n++] = ch; 2938 string[n++] = ch;
2935 seen_esc = 0; 2939 seen_esc = 0;
2936 } 2940 }
2937 string[n++] = '\0'; 2941 string[n++] = '\0';
2938 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2939 return NULL; 2943 return NULL;
2940 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2944 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2941 STRNCPY(s, string, n); 2945 STRNCPY (s, string, n);
2942 return s; 2946 return s;
2943} 2947}
2944 2948
2945/*----------------------------------------------------------------------*/ 2949/*----------------------------------------------------------------------*/
2946/* 2950/*
… …
2953 /* 2957 /*
2954 * Not handled yet 2958 * Not handled yet
2955 */ 2959 */
2956 s = get_to_st (&eh); 2960 s = get_to_st (&eh);
2957 if (s) 2961 if (s)
2958 free(s); 2962 free (s);
2959 return; 2963 return;
2960} 2964}
2961 2965
2962/*----------------------------------------------------------------------*/ 2966/*----------------------------------------------------------------------*/
2963/* 2967/*
… …
2968{ 2972{
2969 unsigned char ch, eh, *s; 2973 unsigned char ch, eh, *s;
2970 int arg; 2974 int arg;
2971 2975
2972 ch = cmd_getc (); 2976 ch = cmd_getc ();
2973 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2977 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2974 arg = arg * 10 + (ch - '0'); 2978 arg = arg * 10 + (ch - '0');
2975 2979
2976 if (ch == ';') 2980 if (ch == ';')
2977 { 2981 {
2978 s = get_to_st (&eh); 2982 s = get_to_st (&eh);
2979 if (s) 2983 if (s)
2980 { 2984 {
2981 /* 2985 /*
2982 * rxvt_menubar_dispatch() violates the constness of the string, 2986 * rxvt_menubar_dispatch () violates the constness of the string,
2983 * so do it here 2987 * so do it here
2984 */ 2988 */
2985 if (arg == XTerm_Menu) 2989 if (arg == XTerm_Menu)
2986#if 0 /* XXX: currently disabled due to security concerns */ 2990#if 0 /* XXX: currently disabled due to security concerns */
2987 menubar_dispatch ((char *)s); 2991 menubar_dispatch ((char *)s);
2988#else 2992#else
2989 (void)0; 2993 (void)0;
2990#endif 2994#endif
2991 else 2995 else
2992 xterm_seq (arg, (char *)s, eh); 2996 xterm_seq (arg, (char *)s, eh);
2993 free(s); 2997 free (s);
2994 } 2998 }
2995 } 2999 }
2996} 3000}
2997/* 3001/*
2998 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
… …
3014 * 39 = change default fg color 3018 * 39 = change default fg color
3015 * 49 = change default bg color 3019 * 49 = change default bg color
3016 * 55 = dump scrollback buffer and all of screen 3020 * 55 = dump scrollback buffer and all of screen
3017 */ 3021 */
3018void 3022void
3019rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
3020{ 3024{
3021 int changed = 0; 3025 int changed = 0;
3022 int color; 3026 int color;
3023 char *buf, *name; 3027 char *buf, *name;
3024 3028
3025 assert(str != NULL); 3029 assert (str != NULL);
3026 switch (op) 3030 switch (op)
3027 { 3031 {
3028 case XTerm_name: 3032 case XTerm_name:
3029 set_title (str); 3033 set_title (str);
3030 /* FALLTHROUGH */ 3034 /* FALLTHROUGH */
… …
3035 set_title (str); 3039 set_title (str);
3036 break; 3040 break;
3037 case XTerm_Color: 3041 case XTerm_Color:
3038 for (buf = (char *)str; buf && *buf;) 3042 for (buf = (char *)str; buf && *buf;)
3039 { 3043 {
3040 if ((name = STRCHR(buf, ';')) == NULL) 3044 if ((name = STRCHR (buf, ';')) == NULL)
3041 break; 3045 break;
3042 *name++ = '\0'; 3046 *name++ = '\0';
3043 color = atoi(buf); 3047 color = atoi (buf);
3044 if (color < 0 || color >= TOTAL_COLORS) 3048 if (color < 0 || color >= TOTAL_COLORS)
3045 break; 3049 break;
3046 if ((buf = STRCHR(name, ';')) != NULL) 3050 if ((buf = STRCHR (name, ';')) != NULL)
3047 *buf++ = '\0'; 3051 *buf++ = '\0';
3048 set_window_color (color + minCOLOR, name); 3052 set_window_color (color + minCOLOR, name);
3049 } 3053 }
3050 break; 3054 break;
3051#ifndef NO_CURSORCOLOR 3055#ifndef NO_CURSORCOLOR
… …
3068 break; 3072 break;
3069#endif 3073#endif
3070 3074
3071 case XTerm_Menu: 3075 case XTerm_Menu:
3072 /* 3076 /*
3073 * rxvt_menubar_dispatch() violates the constness of the string, 3077 * rxvt_menubar_dispatch () violates the constness of the string,
3074 * so DON'T do it here 3078 * so DON'T do it here
3075 */ 3079 */
3076 break; 3080 break;
3077 case XTerm_Pixmap: 3081 case XTerm_Pixmap:
3078 if (*str != ';') 3082 if (*str != ';')
… …
3081 scale_pixmap (""); /* reset to default scaling */ 3085 scale_pixmap (""); /* reset to default scaling */
3082 set_bgPixmap (str); /* change pixmap */ 3086 set_bgPixmap (str); /* change pixmap */
3083#endif 3087#endif
3084 scr_touch (true); 3088 scr_touch (true);
3085 } 3089 }
3086 while ((str = STRCHR(str, ';')) != NULL) 3090 while ((str = STRCHR (str, ';')) != NULL)
3087 { 3091 {
3088 str++; 3092 str++;
3089#if XPM_BACKGROUND 3093#if XPM_BACKGROUND
3090 changed += scale_pixmap (str); 3094 changed += scale_pixmap (str);
3091#endif 3095#endif
… …
3113 break; 3117 break;
3114#if 0 3118#if 0
3115 case XTerm_dumpscreen: /* no error notices */ 3119 case XTerm_dumpscreen: /* no error notices */
3116 { 3120 {
3117 int fd; 3121 int fd;
3118 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3119 { 3123 {
3120 scr_dump (fd); 3124 scr_dump (fd);
3121 close(fd); 3125 close (fd);
3122 } 3126 }
3123 } 3127 }
3124 break; 3128 break;
3125#endif 3129#endif
3126 3130
… …
3151 else 3155 else
3152 { 3156 {
3153 if (mode == 'r') 3157 if (mode == 'r')
3154 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3155 else 3159 else
3156 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3157 PrivMode(state, bit); 3161 PrivMode (state, bit);
3158 } 3162 }
3159 return state; 3163 return state;
3160} 3164}
3161 3165
3162/* we're not using priv _yet_ */ 3166/* we're not using priv _yet_ */
3163void 3167void
3164rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3165{ 3169{
3166 unsigned int i, j; 3170 unsigned int i, j;
3167 int state; 3171 int state;
3168 static const struct 3172 static const struct
3169 { 3173 {
… …
3212 for (i = 0; i < nargs; i++) 3216 for (i = 0; i < nargs; i++)
3213 { 3217 {
3214 state = -1; 3218 state = -1;
3215 3219
3216 /* basic handling */ 3220 /* basic handling */
3217 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3221 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3218 if (argtopriv[j].argval == arg[i]) 3222 if (argtopriv[j].argval == arg[i])
3219 { 3223 {
3220 state = privcases (mode, argtopriv[j].bit); 3224 state = privcases (mode, argtopriv[j].bit);
3221 break; 3225 break;
3222 } 3226 }
… …
3230 scr_cursor (RESTORE); 3234 scr_cursor (RESTORE);
3231 else if (mode == 1) 3235 else if (mode == 1)
3232 scr_cursor (SAVE); 3236 scr_cursor (SAVE);
3233 /* FALLTHROUGH */ 3237 /* FALLTHROUGH */
3234 default: 3238 default:
3235 continue; /* for(;i;) */ 3239 continue; /* for (;i;) */
3236 } 3240 }
3237 3241
3238 /* extra handling for values with valid 0 or 1 state */ 3242 /* extra handling for values with valid 0 or 1 state */
3239 switch (arg[i]) 3243 switch (arg[i])
3240 { 3244 {
… …
3242 case 2: /* VT52 mode */ 3246 case 2: /* VT52 mode */
3243 /* oddball mode. should be set regardless of set/reset 3247 /* oddball mode. should be set regardless of set/reset
3244 * parameter. Return from VT52 mode with an ESC < from 3248 * parameter. Return from VT52 mode with an ESC < from
3245 * within VT52 mode 3249 * within VT52 mode
3246 */ 3250 */
3247 PrivMode(1, PrivMode_vt52); 3251 PrivMode (1, PrivMode_vt52);
3248 break; 3252 break;
3249 case 3: /* 80/132 */ 3253 case 3: /* 80/132 */
3250 if (PrivateModes & PrivMode_132OK) 3254 if (PrivateModes & PrivMode_132OK)
3251 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3252 (unsigned int)TermWin.height); 3256 (unsigned int)TermWin.height);
3253 break; 3257 break;
3254 case 4: /* smooth scrolling */ 3258 case 4: /* smooth scrolling */
3255 if (state) 3259 if (state)
3256 Options &= ~Opt_jumpScroll; 3260 Options &= ~Opt_jumpScroll;
… …
3267 scr_autowrap (state); 3271 scr_autowrap (state);
3268 break; 3272 break;
3269 /* case 8: - auto repeat, can't do on a per window basis */ 3273 /* case 8: - auto repeat, can't do on a per window basis */
3270 case 9: /* X10 mouse reporting */ 3274 case 9: /* X10 mouse reporting */
3271 if (state) /* orthogonal */ 3275 if (state) /* orthogonal */
3272 PrivateModes &= ~(PrivMode_MouseX11); 3276 PrivateModes &= ~ (PrivMode_MouseX11);
3273 break; 3277 break;
3274#ifdef menuBar_esc 3278#ifdef menuBar_esc
3275 case menuBar_esc: 3279 case menuBar_esc:
3276#ifdef MENUBAR 3280#ifdef MENUBAR
3277 map_menuBar (state); 3281 map_menuBar (state);
… …
3297 break; 3301 break;
3298 /* case 66: - application key pad */ 3302 /* case 66: - application key pad */
3299 /* case 67: - backspace key */ 3303 /* case 67: - backspace key */
3300 case 1000: /* X11 mouse reporting */ 3304 case 1000: /* X11 mouse reporting */
3301 if (state) /* orthogonal */ 3305 if (state) /* orthogonal */
3302 PrivateModes &= ~(PrivMode_MouseX10); 3306 PrivateModes &= ~ (PrivMode_MouseX10);
3303 break; 3307 break;
3304#if 0 3308#if 0
3305 case 1001: 3309 case 1001:
3306 break; /* X11 mouse highlighting */ 3310 break; /* X11 mouse highlighting */
3307#endif 3311#endif
… …
3377 break; 3381 break;
3378 } 3382 }
3379 if (rendset != -1) 3383 if (rendset != -1)
3380 { 3384 {
3381 scr_rendition (rendset, rendstyle); 3385 scr_rendition (rendset, rendstyle);
3382 continue; /* for(;i;) */ 3386 continue; /* for (;i;) */
3383 } 3387 }
3384 3388
3385 switch (arg[i]) 3389 switch (arg[i])
3386 { 3390 {
3387 case 30: 3391 case 30:
… …
3390 case 33: 3394 case 33:
3391 case 34: 3395 case 34:
3392 case 35: 3396 case 35:
3393 case 36: 3397 case 36:
3394 case 37: 3398 case 37:
3395 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3396 Color_fg); 3400 Color_fg);
3397 break; 3401 break;
3398#ifdef TTY_256COLOR 3402#ifdef TTY_256COLOR
3399 case 38: 3403 case 38:
3400 if (nargs > i + 2 && arg[i + 1] == 5) 3404 if (nargs > i + 2 && arg[i + 1] == 5)
3401 { 3405 {
3402 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3403 Color_fg); 3407 Color_fg);
3404 i += 2; 3408 i += 2;
3405 } 3409 }
3406 break; 3410 break;
3407#endif 3411#endif
… …
3415 case 43: 3419 case 43:
3416 case 44: 3420 case 44:
3417 case 45: 3421 case 45:
3418 case 46: 3422 case 46:
3419 case 47: 3423 case 47:
3420 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3421 Color_bg); 3425 Color_bg);
3422 break; 3426 break;
3423#ifdef TTY_256COLOR 3427#ifdef TTY_256COLOR
3424 case 48: 3428 case 48:
3425 if (nargs > i + 2 && arg[i + 1] == 5) 3429 if (nargs > i + 2 && arg[i + 1] == 5)
3426 { 3430 {
3427 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3428 Color_bg); 3432 Color_bg);
3429 i += 2; 3433 i += 2;
3430 } 3434 }
3431 break; 3435 break;
3432#endif 3436#endif
… …
3441 case 93: 3445 case 93:
3442 case 94: 3446 case 94:
3443 case 95: 3447 case 95:
3444 case 96: 3448 case 96:
3445 case 97: 3449 case 97:
3446 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3447 Color_fg); 3451 Color_fg);
3448 break; 3452 break;
3449 case 100: 3453 case 100:
3450 case 101: /* set bright bg color */ 3454 case 101: /* set bright bg color */
3451 case 102: 3455 case 102:
3452 case 103: 3456 case 103:
3453 case 104: 3457 case 104:
3454 case 105: 3458 case 105:
3455 case 106: 3459 case 106:
3456 case 107: 3460 case 107:
3457 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3458 Color_bg); 3462 Color_bg);
3459 break; 3463 break;
3460#endif 3464#endif
3461 3465
3462 } 3466 }
… …
3471 unsigned char ch, cmd = cmd_getc (); 3475 unsigned char ch, cmd = cmd_getc ();
3472 3476
3473#ifndef RXVT_GRAPHICS 3477#ifndef RXVT_GRAPHICS
3474 if (cmd == 'Q') 3478 if (cmd == 'Q')
3475 { /* query graphics */ 3479 { /* query graphics */
3476 tt_printf("\033G0\n"); /* no graphics */ 3480 tt_printf ("\033G0\n"); /* no graphics */
3477 return; 3481 return;
3478 } 3482 }
3479 /* swallow other graphics sequences until terminating ':' */ 3483 /* swallow other graphics sequences until terminating ':' */
3480 do 3484 do
3481 ch = cmd_getc (); 3485 ch = cmd_getc ();
… …
3485 int args[NGRX_PTS]; 3489 int args[NGRX_PTS];
3486 unsigned char *text = NULL; 3490 unsigned char *text = NULL;
3487 3491
3488 if (cmd == 'Q') 3492 if (cmd == 'Q')
3489 { /* query graphics */ 3493 { /* query graphics */
3490 tt_printf("\033G1\n"); /* yes, graphics (color) */ 3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3491 return; 3495 return;
3492 } 3496 }
3493 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) 3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3494 { 3498 {
3495 int neg; 3499 int neg;
3496 3500
3497 ch = cmd_getc (); 3501 ch = cmd_getc ();
3498 neg = (ch == '-'); 3502 neg = (ch == '-');
3499 if (neg || ch == '+') 3503 if (neg || ch == '+')
3500 ch = cmd_getc (); 3504 ch = cmd_getc ();
3501 3505
3502 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ()) 3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3503 args[nargs] = args[nargs] * 10 + (ch - '0'); 3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3504 if (neg) 3508 if (neg)
3505 args[nargs] = -args[nargs]; 3509 args[nargs] = -args[nargs];
3506 3510
3507 nargs++; 3511 nargs++;
… …
3512 3516
3513 if ((cmd == 'T') && (nargs >= 5)) 3517 if ((cmd == 'T') && (nargs >= 5))
3514 { 3518 {
3515 int i, len = args[4]; 3519 int i, len = args[4];
3516 3520
3517 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); 3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3518 3522
3519 if (text != NULL) 3523 if (text != NULL)
3520 { 3524 {
3521 for (i = 0; i < len; i++) 3525 for (i = 0; i < len; i++)
3522 text[i] = cmd_getc (); 3526 text[i] = cmd_getc ();
… …
3529/*}}} */ 3533/*}}} */
3530 3534
3531/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3532 3536
3533/* 3537/*
3534 * Send printf() formatted output to the command. 3538 * Send printf () formatted output to the command.
3535 * Only use for small amounts of data. 3539 * Only use for small amounts of data.
3536 */ 3540 */
3537void 3541void
3538rxvt_term::tt_printf (const char *fmt,...) 3542rxvt_term::tt_printf (const char *fmt,...)
3539{ 3543{

Diff Legend

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