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.171 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.204 by root, Wed Jul 13 02:47:02 2005 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 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * 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
33 * 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
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
54#include <signal.h> 57#include <csignal>
55 58
56/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
57 60
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59 62
… …
114 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 119 XK_Print, 0x2399,
117 120
118 XK_space, 0x2423, 121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
119 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
120 0, 131 0,
121}; 132};
122 133
123void 134void
124rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
… …
152void 163void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{ 165{
155 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
159 172
160#if ENABLE_COMBINING 173#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
162 { 175 {
163 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
… …
172 alloc = 0; 185 alloc = 0;
173 chr = &ch2; 186 chr = &ch2;
174 len = 1; 187 len = 1;
175 } 188 }
176 189
177 int width = strlen (f->name); 190 int width = wcswidth (fname, wcslen (fname));
178 191
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180 193
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 195
… …
195#endif 208#endif
196 scr_overlay_set (11, y, ch, r); 209 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r); 210 scr_overlay_set (12, y, NOCHAR, r);
198 } 211 }
199 212
200 scr_overlay_set (0, len, f->name); 213 scr_overlay_set (0, len, fname);
214
215 free (fname);
201 216
202#if ENABLE_COMBINING 217#if ENABLE_COMBINING
203 if (alloc) 218 if (alloc)
204 delete [] alloc; 219 delete [] alloc;
205#endif 220#endif
… …
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 289 * escape sequence to toggle the Keypad.
275 * 290 *
276 * Always permit `shift' to override the current setting 291 * Always permit `shift' to override the current setting
277 */ 292 */
278 shft = (ev.state & ShiftMask); 293 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 294 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 295 meta = ev.state & ModMetaMask;
281 296
282 if (numlock_state || (ev.state & ModNumLockMask)) 297 if (numlock_state || (ev.state & ModNumLockMask))
283 { 298 {
284 numlock_state = (ev.state & ModNumLockMask); 299 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 300 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
305 320
306 // the XOpenIM manpage lies about hardcoding the locale 321 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 322 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 323 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 324 SET_LOCALE (rs[Rs_imLocale]);
325
310 // assume wchar_t == unicode or better 326 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 327 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 328 KBUFSZ, &keysym, &status_return);
329
313 if (rs[Rs_imLocale]) 330 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 331 SET_LOCALE (locale);
315 332
316 if (status_return == XLookupChars 333 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 334 || status_return == XLookupBoth)
… …
344 valid_keysym = keysym != NoSymbol; 361 valid_keysym = keysym != NoSymbol;
345 } 362 }
346 363
347 if (valid_keysym) 364 if (valid_keysym)
348 { 365 {
366#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state))
368 return;
369#endif
370
349 if (TermWin.saveLines) 371 if (TermWin.saveLines)
350 { 372 {
351#ifdef UNSHIFTED_SCROLLKEYS 373#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 374 if (!ctrl && !meta)
353#else 375#else
… …
487 } 509 }
488#endif 510#endif
489 511
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 512 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 513 {
492#ifdef KEYSYM_RESOURCE
493 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 {
495 unsigned int l;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 { 514 {
518 newlen = 1; 515 newlen = 1;
519 switch (keysym) 516 switch (keysym)
520 { 517 {
521#ifndef NO_BACKSPACE_KEY 518#ifndef NO_BACKSPACE_KEY
… …
529 else 526 else
530 strcpy (kbuf, key_backspace); 527 strcpy (kbuf, key_backspace);
531 break; 528 break;
532#endif 529#endif
533#ifndef NO_DELETE_KEY 530#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
534 case XK_Delete: 541 case XK_Delete:
535 strcpy (kbuf, key_delete); 542 strcpy (kbuf, key_delete);
536 break; 543 break;
537#endif 544#endif
538 case XK_Tab: 545 case XK_Tab:
… …
641#ifdef XK_KP_Begin 648#ifdef XK_KP_Begin
642 case XK_KP_Begin: 649 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 650 strcpy (kbuf, "\033Ou");
644 break; 651 break;
645 652
646 case XK_KP_Insert:
647 strcpy (kbuf, "\033Op");
648 break;
649
650 case XK_KP_Delete:
651 strcpy (kbuf, "\033On");
652 break;
653#endif 653#endif
654 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
… …
689 break; 689 break;
690 690
691 case XK_Find: 691 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
693 break; 693 break;
694
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
694 case XK_Insert: 705 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 706 strcpy (kbuf, "\033[2~");
696 break; 707 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 708#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 709 case DXK_Remove:
… …
788#undef FKEY 799#undef FKEY
789 default: 800 default:
790 newlen = 0; 801 newlen = 0;
791 break; 802 break;
792 } 803 }
804
793 if (newlen) 805 if (newlen)
794 len = strlen (kbuf); 806 len = strlen (kbuf);
795 } 807 }
796 808
797 /* 809 /*
… …
805 } 817 }
806 else if (ctrl && keysym == XK_minus) 818 else if (ctrl && keysym == XK_minus)
807 { 819 {
808 len = 1; 820 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 821 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
822 }
823 else if (keysym == XK_ISO_Left_Tab)
824 {
825 strcpy (kbuf, "\033[Z");
826 len = 3;
810 } 827 }
811 else 828 else
812 { 829 {
813#ifdef META8_OPTION 830#ifdef META8_OPTION
814 /* set 8-bit on */ 831 /* set 8-bit on */
… …
873#endif /* DEBUG_CMD */ 890#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 891 tt_write (kbuf, (unsigned int)len);
875} 892}
876/*}}} */ 893/*}}} */
877 894
878#if (MENUBAR_MAX) 895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */ 897/* attempt to `write' count to the input buffer */
881unsigned int 898unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 899rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883{ 900{
… …
906 923
907 cmd_parse (); 924 cmd_parse ();
908 925
909 return 0; 926 return 0;
910} 927}
911#endif /* MENUBAR_MAX */ 928#endif
912 929
913void 930void
914rxvt_term::flush () 931rxvt_term::flush ()
915{ 932{
916 flush_ev.stop (); 933 flush_ev.stop ();
… …
1017{ 1034{
1018 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1038 {
1039 if (TermWin.view_start == TermWin.nscrolled ||
1040 TermWin.view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
1022 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1044 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1046 }
1026} 1047}
… …
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1079rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1080{
1060 SET_R (this); 1081 SET_R (this);
1061 SET_LOCALE (locale); 1082 SET_LOCALE (locale);
1062 1083
1063 if (revents & EVENT_WRITE)
1064 tt_write (0, 0);
1065 else if (revents & EVENT_READ) 1084 if (revents & EVENT_READ)
1066 // loop, but don't allow a single term to monopolize us 1085 // loop, but don't allow a single term to monopolize us
1067 while (pty_fill ()) 1086 while (pty_fill ())
1068 if (cmd_parse ()) 1087 if (cmd_parse ())
1069 break; 1088 break;
1089
1090 if (revents & EVENT_WRITE)
1091 pty_write ();
1070} 1092}
1071 1093
1072void 1094void
1073rxvt_term::pointer_unblank () 1095rxvt_term::pointer_unblank ()
1074{ 1096{
… …
1088rxvt_term::pointer_blank () 1110rxvt_term::pointer_blank ()
1089{ 1111{
1090 if (! (options & Opt_pointerBlank)) 1112 if (! (options & Opt_pointerBlank))
1091 return; 1113 return;
1092 1114
1093 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1094 XFlush (display->display); 1116 XFlush (display->display);
1095 1117
1096 hidden_pointer = 1; 1118 hidden_pointer = 1;
1097} 1119}
1098 1120
… …
1187 1209
1188/*{{{ process an X event */ 1210/*{{{ process an X event */
1189void 1211void
1190rxvt_term::x_cb (XEvent &ev) 1212rxvt_term::x_cb (XEvent &ev)
1191{ 1213{
1214 dDisp;
1215
1192 SET_R (this); 1216 SET_R (this);
1193 SET_LOCALE (locale); 1217 SET_LOCALE (locale);
1194 1218
1195#if defined(CURSOR_BLINK) 1219#if defined(CURSOR_BLINK)
1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1217 if (ev.type == KeyPress && hidden_pointer == 0) 1241 if (ev.type == KeyPress && hidden_pointer == 0)
1218 pointer_blank (); 1242 pointer_blank ();
1219 } 1243 }
1220#endif 1244#endif
1221 1245
1222 Window unused_root, unused_child; 1246 Window unused_root, unused_child;
1223 int unused_root_x, unused_root_y; 1247 int unused_root_x, unused_root_y;
1224 unsigned int unused_mask; 1248 unsigned int unused_mask;
1225 1249
1226 switch (ev.type) 1250 switch (ev.type)
1227 { 1251 {
1228 case KeyPress: 1252 case KeyPress:
1229#if ISO_14755 1253#if ISO_14755
… …
1312 button_release (ev.xbutton); 1336 button_release (ev.xbutton);
1313 break; 1337 break;
1314 1338
1315 case ClientMessage: 1339 case ClientMessage:
1316 if (ev.xclient.format == 32 1340 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1342 {
1317 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1318 destroy (); 1344 destroy ();
1345#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev);
1350#endif
1351 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1319#ifdef OFFIX_DND 1361#ifdef OFFIX_DND
1320 /* OffiX Dnd (drag 'n' drop) protocol */ 1362 /* OffiX Dnd (drag 'n' drop) protocol */
1321 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1322 && (ev.xclient.data.l[0] == DndFile 1364 && (ev.xclient.data.l[0] == DndFile
1323 || ev.xclient.data.l[0] == DndDir 1365 || ev.xclient.data.l[0] == DndDir
1324 || ev.xclient.data.l[0] == DndLink)) 1366 || ev.xclient.data.l[0] == DndLink))
1325 { 1367 {
1326 /* Get Dnd data */ 1368 /* Get Dnd data */
1327 Atom ActualType; 1369 Atom ActualType;
1328 int ActualFormat; 1370 int ActualFormat;
1329 unsigned char *data; 1371 unsigned char *data;
1330 unsigned long Size, RemainingBytes; 1372 unsigned long Size, RemainingBytes;
1331 1373
1332 XGetWindowProperty (display->display, display->root, 1374 XGetWindowProperty (disp, display->root,
1333 xa[XA_DNDSELECTION], 1375 xa[XA_DNDSELECTION],
1334 0L, 1000000L, 1376 0L, 1000000L,
1335 False, AnyPropertyType, 1377 False, AnyPropertyType,
1336 &ActualType, &ActualFormat, 1378 &ActualType, &ActualFormat,
1337 &Size, &RemainingBytes, 1379 &Size, &RemainingBytes,
1338 &data); 1380 &data);
1339 XChangeProperty (display->display, display->root, 1381 set_string_property (XA_CUT_BUFFER0, data);
1340 XA_CUT_BUFFER0, XA_STRING,
1341 8, PropModeReplace,
1342 data, strlen (data));
1343 XFree (data); 1382 XFree (data);
1344 selection_paste (display->root, XA_CUT_BUFFER0, True); 1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1345 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1346 } 1385 }
1347#endif /* OFFIX_DND */ 1386#endif /* OFFIX_DND */
1348 break; 1387 break;
1349 1388
1350 case MappingNotify: 1389 case MappingNotify:
… …
1375 break; 1414 break;
1376 } 1415 }
1377 break; 1416 break;
1378 1417
1379 case FocusIn: 1418 case FocusIn:
1380 if (!TermWin.focus) 1419 focus_in ();
1381 {
1382 TermWin.focus = 1;
1383 want_refresh = 1;
1384#ifdef USE_XIM
1385 if (Input_Context != NULL)
1386 {
1387 IMSetStatusPosition ();
1388 XSetICFocus (Input_Context);
1389 }
1390#endif
1391#ifdef CURSOR_BLINK
1392 if (options & Opt_cursorBlink)
1393 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1394#endif
1395#ifdef OFF_FOCUS_FADING
1396 if (rs[Rs_fade])
1397 {
1398 pix_colors = pix_colors_focused;
1399 scr_recolour ();
1400 }
1401#endif
1402
1403 }
1404 break; 1420 break;
1405 1421
1406 case FocusOut: 1422 case FocusOut:
1407 if (TermWin.focus) 1423 focus_out ();
1408 {
1409 TermWin.focus = 0;
1410 want_refresh = 1;
1411
1412#if ENABLE_FRILLS || ISO_14755
1413 iso14755buf = 0;
1414#endif
1415#if ENABLE_OVERLAY
1416 scr_overlay_off ();
1417#endif
1418#ifdef USE_XIM
1419 if (Input_Context != NULL)
1420 XUnsetICFocus (Input_Context);
1421#endif
1422#ifdef CURSOR_BLINK
1423 if (options & Opt_cursorBlink)
1424 cursor_blink_ev.stop ();
1425 hidden_cursor = 0;
1426#endif
1427#ifdef OFF_FOCUS_FADING
1428 if (rs[Rs_fade])
1429 {
1430 pix_colors = pix_colors_unfocused;
1431 scr_recolour ();
1432 }
1433#endif
1434 }
1435 break; 1424 break;
1436 1425
1437 case ConfigureNotify: 1426 case ConfigureNotify:
1438 if (ev.xconfigure.window == TermWin.parent[0]) 1427 if (ev.xconfigure.window == TermWin.parent[0])
1439 { 1428 {
… …
1443 { /* Wrap lots of configures into one */ 1432 { /* Wrap lots of configures into one */
1444 width = ev.xconfigure.width; 1433 width = ev.xconfigure.width;
1445 height = ev.xconfigure.height; 1434 height = ev.xconfigure.height;
1446 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1447 } 1436 }
1448 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1449 1438
1450 if (szHint.width != width || szHint.height != height) 1439 if (szHint.width != width || szHint.height != height)
1451 { 1440 {
1452 seen_resize = 1; 1441 seen_resize = 1;
1453 resize_all_windows (width, height, 1); 1442 resize_all_windows (width, height, 1);
1454 } 1443 }
1455 1444
1456#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1457 if (options & Opt_transparent) 1446 if (options & Opt_transparent)
1458 {
1459 check_our_parents (); 1447 check_our_parents ();
1460 if (am_transparent)
1461 want_refresh = want_full_refresh = 1;
1462 }
1463#endif 1448#endif
1464 } 1449 }
1465 break; 1450 break;
1466 1451
1467 case PropertyNotify: 1452 case PropertyNotify:
… …
1475 selection_clear (); 1460 selection_clear ();
1476 break; 1461 break;
1477 1462
1478 case SelectionNotify: 1463 case SelectionNotify:
1479 if (selection_wait == Sel_normal) 1464 if (selection_wait == Sel_normal)
1480 selection_paste (ev.xselection.requestor, 1465 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481 ev.xselection.property, True);
1482 break; 1466 break;
1483 1467
1484 case SelectionRequest: 1468 case SelectionRequest:
1485 selection_send (ev.xselectionrequest); 1469 selection_send (ev.xselectionrequest);
1486 break; 1470 break;
… …
1510 if (ev.xany.window == TermWin.vt) 1494 if (ev.xany.window == TermWin.vt)
1511 { 1495 {
1512 do 1496 do
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1497 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1498 ev.xexpose.width, ev.xexpose.height, False);
1515 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1516 1500
1517 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1518 1502
1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1520 scr_expose (ev.xexpose.x, ev.xexpose.y, 1504 scr_expose (ev.xexpose.x, ev.xexpose.y,
1521 ev.xexpose.width, ev.xexpose.height, False); 1505 ev.xexpose.width, ev.xexpose.height, False);
1522 1506
1523 scr_refresh (refresh_type); 1507 scr_refresh (refresh_type);
1524 } 1508 }
1525 else 1509 else
1526 { 1510 {
1527 XEvent unused_event; 1511 XEvent unused_event;
1528 1512
1529 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1530 ; 1514 ;
1531 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1515 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1532 ; 1516 ;
1533 1517
1534 if (isScrollbarWindow (ev.xany.window)) 1518 if (isScrollbarWindow (ev.xany.window))
1535 { 1519 {
1536 scrollBar.setIdle (); 1520 scrollBar.setIdle ();
… …
1541 menubar_expose (); 1525 menubar_expose ();
1542#endif 1526#endif
1543 1527
1544#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1545 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1529 if (am_transparent && ev.xany.window == TermWin.parent[0])
1546 XClearWindow (display->display, ev.xany.window); 1530 XClearWindow (disp, ev.xany.window);
1547#endif 1531#endif
1548 } 1532 }
1549 break; 1533 break;
1550 1534
1551 case MotionNotify: 1535 case MotionNotify:
… …
1565 1549
1566 if (ev.xany.window == TermWin.vt) 1550 if (ev.xany.window == TermWin.vt)
1567 { 1551 {
1568 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1553 {
1570 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1571 ; 1555 ;
1572 1556
1573 XQueryPointer (display->display, TermWin.vt, 1557 XQueryPointer (disp, TermWin.vt,
1574 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1560 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1561 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
… …
1642#endif 1626#endif
1643 } 1627 }
1644 } 1628 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1630 {
1647 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1631 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1648 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1649 ; 1633 ;
1650 1634
1651 XQueryPointer (display->display, scrollBar.win, 1635 XQueryPointer (disp, scrollBar.win,
1652 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1639 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1661 } 1645 }
1662 break; 1646 break;
1663 } 1647 }
1664} 1648}
1665 1649
1650void
1651rxvt_term::focus_in ()
1652{
1653 if (!TermWin.focus)
1654 {
1655 TermWin.focus = 1;
1656 want_refresh = 1;
1657#ifdef USE_XIM
1658 if (Input_Context != NULL)
1659 {
1660 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context);
1662 }
1663#endif
1664#ifdef CURSOR_BLINK
1665 if (options & Opt_cursorBlink)
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif
1668#ifdef OFF_FOCUS_FADING
1669 if (rs[Rs_fade])
1670 {
1671 pix_colors = pix_colors_focused;
1672 scr_recolour ();
1673 }
1674#endif
1675 }
1676}
1677
1678void
1679rxvt_term::focus_out ()
1680{
1681 if (TermWin.focus)
1682 {
1683 TermWin.focus = 0;
1684 want_refresh = 1;
1685
1686#if ENABLE_FRILLS || ISO_14755
1687 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY
1690 scr_overlay_off ();
1691#endif
1692#ifdef USE_XIM
1693 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context);
1695#endif
1696#ifdef CURSOR_BLINK
1697 if (options & Opt_cursorBlink)
1698 cursor_blink_ev.stop ();
1699 hidden_cursor = 0;
1700#endif
1701#ifdef OFF_FOCUS_FADING
1702 if (rs[Rs_fade])
1703 {
1704 pix_colors = pix_colors_unfocused;
1705 scr_recolour ();
1706 }
1707#endif
1708 }
1709}
1710
1666#if TRANSPARENT 1711#if TRANSPARENT
1667void 1712void
1668rxvt_term::rootwin_cb (XEvent &ev) 1713rxvt_term::rootwin_cb (XEvent &ev)
1669{ 1714{
1670 SET_R (this); 1715 SET_R (this);
… …
1675 case PropertyNotify: 1720 case PropertyNotify:
1676 /* 1721 /*
1677 * if user used some Esetroot compatible prog to set the root bg, 1722 * if user used some Esetroot compatible prog to set the root bg,
1678 * use the property to determine the pixmap. We use it later on. 1723 * use the property to determine the pixmap. We use it later on.
1679 */ 1724 */
1680 if (xa[XA_XROOTPMAPID] == 0)
1681 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1682
1683 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1725 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1684 return; 1727 return;
1685 1728
1686 /* FALLTHROUGH */ 1729 /* FALLTHROUGH */
1687 case ReparentNotify: 1730 case ReparentNotify:
1688 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
… …
1760 { 1803 {
1761 case Button1: 1804 case Button1:
1762 /* allow meta + click to select rectangular areas */ 1805 /* allow meta + click to select rectangular areas */
1763 /* should be done in screen.C */ 1806 /* should be done in screen.C */
1764#if ENABLE_FRILLS 1807#if ENABLE_FRILLS
1765 selection.rect = !! (ev.state & ModMetaMask); 1808 selection.rect = !!(ev.state & ModMetaMask);
1766#else 1809#else
1767 selection.rect = false; 1810 selection.rect = false;
1768#endif 1811#endif
1769 1812
1770 /* allow shift+left click to extend selection */ 1813 /* allow shift+left click to extend selection */
… …
2096 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2139 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2097 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2140 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2098 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2141 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2099 int i; 2142 int i;
2100 2143
2101 Visual* visual = display->visual; 2144 Visual *visual = display->visual;
2102 2145
2103 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2146 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2104 2147
2105 /* for convenience */ 2148 /* for convenience */
2106 mask_r = visual->red_mask; 2149 mask_r = visual->red_mask;
… …
2327 Atom atype; 2370 Atom atype;
2328 unsigned char *prop = NULL; 2371 unsigned char *prop = NULL;
2329 Window root, oldp, *list; 2372 Window root, oldp, *list;
2330 Pixmap rootpixmap = None; 2373 Pixmap rootpixmap = None;
2331 XWindowAttributes wattr, wrootattr; 2374 XWindowAttributes wattr, wrootattr;
2375 dDisp;
2332 2376
2333 pchanged = 0; 2377 pchanged = 0;
2334 2378
2335 if (!(options & Opt_transparent)) 2379 if (!(options & Opt_transparent))
2336 return pchanged; /* Don't try any more */ 2380 return pchanged; /* Don't try any more */
2337 2381
2338 XGetWindowAttributes (display->display, display->root, &wrootattr); 2382 XGetWindowAttributes (disp, display->root, &wrootattr);
2339 rootdepth = wrootattr.depth; 2383 rootdepth = wrootattr.depth;
2340 2384
2341 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2342 2386
2343 if (rootdepth != wattr.depth) 2387 if (rootdepth != wattr.depth)
2344 { 2388 {
2345 if (am_transparent) 2389 if (am_transparent)
2346 { 2390 {
2347 pchanged = 1; 2391 pchanged = 1;
2348 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2349 am_transparent = am_pixmap_trans = 0; 2393 am_transparent = am_pixmap_trans = 0;
2350 } 2394 }
2351 2395
2352 return pchanged; /* Don't try any more */ 2396 return pchanged; /* Don't try any more */
2353 } 2397 }
2354 2398
2355 /* Get all X ops out of the queue so that our information is up-to-date. */ 2399 /* Get all X ops out of the queue so that our information is up-to-date. */
2356 XSync (display->display, False); 2400 XSync (disp, False);
2357 2401
2358 /* 2402 /*
2359 * Make the frame window set by the window manager have 2403 * Make the frame window set by the window manager have
2360 * the root background. Some window managers put multiple nested frame 2404 * the root background. Some window managers put multiple nested frame
2361 * windows for each client, so we have to take care about that. 2405 * windows for each client, so we have to take care about that.
2362 */ 2406 */
2363 i = (xa[XA_XROOTPMAPID] 2407 i = (xa[XA_XROOTPMAP_ID]
2364 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2408 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2365 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2366 &nitems, &bytes_after, &prop) == Success); 2410 &nitems, &bytes_after, &prop) == Success);
2367 2411
2368 if (!i || prop == NULL) 2412 if (!i || prop == NULL)
2369 i = (xa[XA_XSETROOTID] 2413 i = (xa[XA_ESETROOT_PMAP_ID]
2370 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2414 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2371 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2415 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2372 &nitems, &bytes_after, &prop) == Success); 2416 &nitems, &bytes_after, &prop) == Success);
2373 2417
2374 if (!i || prop == NULL 2418 if (!i || prop == NULL
2375#if TINTING 2419#if TINTING
… …
2394 Window cr; 2438 Window cr;
2395 XImage *image; 2439 XImage *image;
2396 GC gc; 2440 GC gc;
2397 XGCValues gcvalue; 2441 XGCValues gcvalue;
2398 2442
2399 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2400 0, 0, &sx, &sy, &cr); 2444 0, 0, &sx, &sy, &cr);
2401 nw = (unsigned int)szHint.width; 2445 nw = (unsigned int)szHint.width;
2402 nh = (unsigned int)szHint.height; 2446 nh = (unsigned int)szHint.height;
2403 nx = ny = 0; 2447 nx = ny = 0;
2404 2448
… …
2416 sy = 0; 2460 sy = 0;
2417 } 2461 }
2418 2462
2419 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2420 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2465
2466 XSync (disp, False);
2421 allowedxerror = -1; 2467 allowedxerror = -1;
2422 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2423 2469
2424 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2470 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2425 /* XXX: may need a delay here? */ 2471 /* XXX: may need a delay here? */
2426 allowedxerror = 0; 2472 allowedxerror = 0;
2427 2473
… …
2430 if (am_transparent && am_pixmap_trans) 2476 if (am_transparent && am_pixmap_trans)
2431 { 2477 {
2432 pchanged = 1; 2478 pchanged = 1;
2433 if (TermWin.pixmap != None) 2479 if (TermWin.pixmap != None)
2434 { 2480 {
2435 XFreePixmap (display->display, TermWin.pixmap); 2481 XFreePixmap (disp, TermWin.pixmap);
2436 TermWin.pixmap = None; 2482 TermWin.pixmap = None;
2437 } 2483 }
2438 } 2484 }
2439 2485
2440 am_pixmap_trans = 0; 2486 am_pixmap_trans = 0;
2441 } 2487 }
2442 else 2488 else
2443 { 2489 {
2444 if (TermWin.pixmap != None) 2490 if (TermWin.pixmap != None)
2445 XFreePixmap (display->display, TermWin.pixmap); 2491 XFreePixmap (disp, TermWin.pixmap);
2446 2492
2447#if TINTING 2493#if TINTING
2448 if (ISSET_PIXCOLOR (Color_tint)) 2494 if (ISSET_PIXCOLOR (Color_tint))
2449 { 2495 {
2450 unsigned short rm, gm, bm; 2496 unsigned short rm, gm, bm;
… …
2454 2500
2455 ShadeXImage (display, image, shade, rm, gm, bm); 2501 ShadeXImage (display, image, shade, rm, gm, bm);
2456 } 2502 }
2457#endif 2503#endif
2458 2504
2459 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2460 szHint.width, szHint.height, image->depth); 2506 szHint.width, szHint.height, image->depth);
2461 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2462 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2463 nx, ny, image->width, image->height); 2509 nx, ny, image->width, image->height);
2464 XFreeGC (display->display, gc); 2510 XFreeGC (disp, gc);
2465 XDestroyImage (image); 2511 XDestroyImage (image);
2466 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2467 XClearWindow (display->display, TermWin.parent[0]); 2513 XClearWindow (disp, TermWin.parent[0]);
2468 2514
2469 if (!am_transparent || !am_pixmap_trans) 2515 if (!am_transparent || !am_pixmap_trans)
2470 pchanged = 1; 2516 pchanged = 1;
2471 2517
2472 am_transparent = am_pixmap_trans = 1; 2518 am_transparent = am_pixmap_trans = 1;
2473 } 2519 }
2474 } 2520 }
2475 2521
2476 if (!am_pixmap_trans) 2522 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2524 else
2477 { 2525 {
2478 unsigned int n; 2526 unsigned int n;
2479 /* 2527 /*
2480 * InheritPixmap transparency 2528 * InheritPixmap transparency
2481 */ 2529 */
2482 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2483 { 2531 {
2484 oldp = TermWin.parent[i]; 2532 oldp = TermWin.parent[i];
2485 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2533 XQueryTree (disp, TermWin.parent[i - 1], &root,
2486 &TermWin.parent[i], &list, &n); 2534 &TermWin.parent[i], &list, &n);
2487 XFree (list); 2535 XFree (list);
2488 2536
2489 if (TermWin.parent[i] == display->root) 2537 if (TermWin.parent[i] == display->root)
2490 { 2538 {
… …
2502 2550
2503 if (pchanged) 2551 if (pchanged)
2504 { 2552 {
2505 for (; n < (unsigned int)i; n++) 2553 for (; n < (unsigned int)i; n++)
2506 { 2554 {
2507 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2508 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2509 { 2557 {
2510 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2511 break; 2559 break;
2512 } 2560 }
2513 } 2561 }
2514 } 2562 }
2515 2563
2516 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2517 { 2565 {
2518 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2519 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2520 am_transparent = 0; 2568 am_transparent = 0;
2521 /* XXX: also turn off Opt_transparent? */ 2569 /* XXX: also turn off Opt_transparent? */
2522 } 2570 }
2523 else 2571 else
2524 { 2572 {
… …
2527 * needed for fvwm2.2.2 (and before?) */ 2575 * needed for fvwm2.2.2 (and before?) */
2528 sleep (1); 2576 sleep (1);
2529#endif 2577#endif
2530 for (n = 0; n < (unsigned int)i; n++) 2578 for (n = 0; n < (unsigned int)i; n++)
2531 { 2579 {
2532 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2533 XClearWindow (display->display, TermWin.parent[n]); 2581 XClearWindow (disp, TermWin.parent[n]);
2534 } 2582 }
2535 2583
2536 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2537 am_transparent = 1; 2585 am_transparent = 1;
2538 } 2586 }
2539 2587
2540 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2541 TermWin.parent[i] = None; 2589 TermWin.parent[i] = None;
2542 } 2590 }
2543 2591
2544 if (scrollBar.win) 2592 if (scrollBar.win)
2545 { 2593 {
2546 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2547 scrollBar.setIdle (); 2595 scrollBar.setIdle ();
2548 scrollbar_show (0); 2596 scrollbar_show (0);
2597 }
2598
2599 if (am_transparent)
2600 {
2601 want_refresh = want_full_refresh = 1;
2602 if (am_pixmap_trans)
2603 flush ();
2549 } 2604 }
2550 2605
2551 return pchanged; 2606 return pchanged;
2552} 2607}
2553#endif 2608#endif
… …
2582 // some window managers resize the window early, and these programs 2637 // some window managers resize the window early, and these programs
2583 // then sometimes get the size wrong. 2638 // then sometimes get the size wrong.
2584 // unfortunately other programs are even more buggy and dislike 2639 // unfortunately other programs are even more buggy and dislike
2585 // being sent SIGWINCH, so only do it when we were in fact being 2640 // being sent SIGWINCH, so only do it when we were in fact being
2586 // resized. 2641 // resized.
2587 if (seen_resize) 2642 if (seen_resize && cmd_pid)
2588 kill (-cmd_pid, SIGWINCH); 2643 kill (-cmd_pid, SIGWINCH);
2589 } 2644 }
2590 2645
2591 /* Read a text string from the input buffer */ 2646 /* Read a text string from the input buffer */
2592 unicode_t buf[UBUFSIZ]; 2647 unicode_t buf[UBUFSIZ];
2593 bool refreshnow = false; 2648 bool refreshnow = false;
2594 int nlines = 0; 2649 int nlines = 0;
2595 unicode_t *str = buf; 2650 unicode_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ);
2596 2652
2597 for (;;) 2653 for (;;)
2598 { 2654 {
2599 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2600 break; 2656 break;
2601 2657
2602 *str++ = ch; 2658 *str++ = ch;
2603 2659
2604 if (ch == C0_LF) 2660 if (ch == C0_LF || str >= eol)
2605 { 2661 {
2606 nlines++; 2662 nlines++;
2607 refresh_count++; 2663 refresh_count++;
2608 2664
2609 if (!(options & Opt_jumpScroll) 2665 if (!(options & Opt_jumpScroll)
… …
2618 if (nlines >= TermWin.nrow - 1) 2674 if (nlines >= TermWin.nrow - 1)
2619 { 2675 {
2620 scr_add_lines (buf, nlines, str - buf); 2676 scr_add_lines (buf, nlines, str - buf);
2621 nlines = 0; 2677 nlines = 0;
2622 str = buf; 2678 str = buf;
2679 eol = str + min (TermWin.ncol, UBUFSIZ);
2623 } 2680 }
2624 }
2625 2681
2626 if (str >= buf + UBUFSIZ) 2682 if (str >= eol)
2627 { 2683 {
2684 if (eol >= buf + UBUFSIZ)
2685 {
2628 ch = NOCHAR; 2686 ch = NOCHAR;
2629 break; 2687 break;
2688 }
2689 else
2690 eol = min (eol + TermWin.ncol, buf + UBUFSIZ);
2691 }
2692
2630 } 2693 }
2631 2694
2632 seq_begin = cmdbuf_ptr; 2695 seq_begin = cmdbuf_ptr;
2633 ch = next_char (); 2696 ch = next_char ();
2634 } 2697 }
… …
2705 if (len == (size_t)-1) 2768 if (len == (size_t)-1)
2706 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2769 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2707 2770
2708 // assume wchar == unicode 2771 // assume wchar == unicode
2709 cmdbuf_ptr += len; 2772 cmdbuf_ptr += len;
2710 return wc; 2773 return wc & UNICODE_MASK;
2711 } 2774 }
2712 2775
2713 return NOCHAR; 2776 return NOCHAR;
2714} 2777}
2715 2778
… …
3178 { 3241 {
3179 switch (priv) 3242 switch (priv)
3180 { 3243 {
3181 case '>': 3244 case '>':
3182 if (ch == CSI_DA) /* secondary device attributes */ 3245 if (ch == CSI_DA) /* secondary device attributes */
3183 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3246 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3184 break; 3247 break;
3185 case '?': 3248 case '?':
3186 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3249 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3187 process_terminal_mode (ch, priv, nargs, arg); 3250 process_terminal_mode (ch, priv, nargs, arg);
3188 break; 3251 break;
… …
3417rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3480rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3418{ 3481{
3419 int x, y; 3482 int x, y;
3420 XWindowAttributes wattr; 3483 XWindowAttributes wattr;
3421 Window wdummy; 3484 Window wdummy;
3485 dDisp;
3422 3486
3423 if (nargs == 0) 3487 if (nargs == 0)
3424 return; 3488 return;
3425 3489
3426 switch (args[0]) 3490 switch (args[0])
3427 { 3491 {
3428 /* 3492 /*
3429 * commands 3493 * commands
3430 */ 3494 */
3431 case 1: /* deiconify window */ 3495 case 1: /* deiconify window */
3432 XMapWindow (display->display, TermWin.parent[0]); 3496 XMapWindow (disp, TermWin.parent[0]);
3433 break; 3497 break;
3434 case 2: /* iconify window */ 3498 case 2: /* iconify window */
3435 XIconifyWindow (display->display, TermWin.parent[0], 3499 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3436 DefaultScreen (display->display));
3437 break; 3500 break;
3438 case 3: /* set position (pixels) */ 3501 case 3: /* set position (pixels) */
3439 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3502 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3440 break; 3503 break;
3441 case 4: /* set size (pixels) */ 3504 case 4: /* set size (pixels) */
3442 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3443 break; 3506 break;
3444 case 5: /* raise window */ 3507 case 5: /* raise window */
3445 XRaiseWindow (display->display, TermWin.parent[0]); 3508 XRaiseWindow (disp, TermWin.parent[0]);
3446 break; 3509 break;
3447 case 6: /* lower window */ 3510 case 6: /* lower window */
3448 XLowerWindow (display->display, TermWin.parent[0]); 3511 XLowerWindow (disp, TermWin.parent[0]);
3449 break; 3512 break;
3450 case 7: /* refresh window */ 3513 case 7: /* refresh window */
3451 scr_touch (true); 3514 scr_touch (true);
3452 break; 3515 break;
3453 case 8: /* set size (chars) */ 3516 case 8: /* set size (chars) */
… …
3465 3528
3466 /* 3529 /*
3467 * reports - some output format copied from XTerm 3530 * reports - some output format copied from XTerm
3468 */ 3531 */
3469 case 11: /* report window state */ 3532 case 11: /* report window state */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3471 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3472 break; 3535 break;
3473 case 13: /* report window position */ 3536 case 13: /* report window position */
3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3537 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3475 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3538 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3476 -wattr.border_width, -wattr.border_width, 3539 -wattr.border_width, -wattr.border_width,
3477 &x, &y, &wdummy); 3540 &x, &y, &wdummy);
3478 tt_printf ("\033[3;%d;%dt", x, y); 3541 tt_printf ("\033[3;%d;%dt", x, y);
3479 break; 3542 break;
3480 case 14: /* report window size (pixels) */ 3543 case 14: /* report window size (pixels) */
3481 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3544 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3482 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3483 break; 3546 break;
3484 case 18: /* report text area size (chars) */ 3547 case 18: /* report text area size (chars) */
3485 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3548 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3486 break; 3549 break;
… …
3488 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3551 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3489 break; 3552 break;
3490 case 20: /* report icon label */ 3553 case 20: /* report icon label */
3491 { 3554 {
3492 char *s; 3555 char *s;
3493 XGetIconName (display->display, TermWin.parent[0], &s); 3556 XGetIconName (disp, TermWin.parent[0], &s);
3494 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3495 XFree (s); 3558 XFree (s);
3496 } 3559 }
3497 break; 3560 break;
3498 case 21: /* report window title */ 3561 case 21: /* report window title */
3499 { 3562 {
3500 char *s; 3563 char *s;
3501 XFetchName (display->display, TermWin.parent[0], &s); 3564 XFetchName (disp, TermWin.parent[0], &s);
3502 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3503 XFree (s); 3566 XFree (s);
3504 } 3567 }
3505 break; 3568 break;
3506 } 3569 }
… …
3513 * ends_how is terminator used. returned input must be free()'d 3576 * ends_how is terminator used. returned input must be free()'d
3514 */ 3577 */
3515unsigned char * 3578unsigned char *
3516rxvt_term::get_to_st (unicode_t &ends_how) 3579rxvt_term::get_to_st (unicode_t &ends_how)
3517{ 3580{
3518 unicode_t seen_esc = 0, ch; 3581 unicode_t ch;
3582 bool seen_esc = false;
3519 unsigned int n = 0; 3583 unsigned int n = 0;
3520 unsigned char *s;
3521 unsigned char string[STRING_MAX]; 3584 wchar_t string[STRING_MAX];
3522 3585
3523 while ((ch = cmd_getc ()) != NOCHAR) 3586 while ((ch = cmd_getc ()) != NOCHAR)
3524 { 3587 {
3525 if (seen_esc) 3588 if (seen_esc)
3526 { 3589 {
… …
3529 else 3592 else
3530 return NULL; 3593 return NULL;
3531 } 3594 }
3532 else if (ch == C0_ESC) 3595 else if (ch == C0_ESC)
3533 { 3596 {
3534 seen_esc = 1; 3597 seen_esc = true;
3535 continue; 3598 continue;
3536 } 3599 }
3537 else if (ch == C0_BEL || ch == CHAR_ST) 3600 else if (ch == C0_BEL || ch == CHAR_ST)
3538 break; 3601 break;
3539 else if (ch < 0x20) 3602 else if (ch < 0x20)
3540 return NULL; /* other control character - exit */ 3603 return NULL; /* other control character - exit */
3541 3604
3542 seen_esc = 0; 3605 seen_esc = false;
3543 3606
3544 if (n >= sizeof (string) - 1) 3607 if (n >= STRING_MAX - 1)
3545 // stop at some sane length 3608 // stop at some sane length
3546 return NULL; 3609 return NULL;
3547 3610
3548 if (ch == C0_SYN) 3611 if (ch == C0_SYN)
3549 string[n++] = cmd_get8 (); 3612 string[n++] = cmd_get8 ();
… …
3551 string[n++] = ch; 3614 string[n++] = ch;
3552 } 3615 }
3553 3616
3554 string[n++] = '\0'; 3617 string[n++] = '\0';
3555 3618
3556 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3557 return NULL;
3558
3559 ends_how = (ch == 0x5c ? C0_ESC : ch); 3619 ends_how = (ch == 0x5c ? C0_ESC : ch);
3560 strncpy (s, string, n); 3620
3561 return s; 3621 return (unsigned char *)rxvt_wcstombs (string);
3562} 3622}
3563 3623
3564/*----------------------------------------------------------------------*/ 3624/*----------------------------------------------------------------------*/
3565/* 3625/*
3566 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3626 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3620 set_window_color (color, str); 3680 set_window_color (color, str);
3621} 3681}
3622 3682
3623/* 3683/*
3624 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3625 * 0 = change iconName/title
3626 * 1 = change iconName
3627 * 2 = change title
3628 * 4 = change color
3629 * 10 = change fg color
3630 * 11 = change bg color
3631 * 12 = change text color
3632 * 13 = change mouse foreground color
3633 * 17 = change highlight character colour
3634 * 18 = change bold character color
3635 * 19 = change underlined character color
3636 * 46 = change logfile (not implemented)
3637 * 50 = change font
3638 *
3639 * rxvt extensions:
3640 * 20 = bg pixmap
3641 * 39 = change default fg color
3642 * 49 = change default bg color
3643 * 55 = dump scrollback buffer and all of screen
3644 * 701 = change locale
3645 * 702 = find font
3646 * 703 = menu
3647 */ 3685 */
3648void 3686void
3649rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3650{ 3688{
3651 int changed = 0; 3689 int changed = 0;
3652 int color; 3690 int color;
3653 char *buf, *name; 3691 char *buf, *name;
3654 bool query = str[0] == '?' && !str[1]; 3692 bool query = str[0] == '?' && !str[1];
3655 int saveop = op; 3693 int saveop = op;
3694 dDisp;
3656 3695
3657 assert (str != NULL); 3696 assert (str != NULL);
3658 switch (op) 3697 switch (op)
3659 { 3698 {
3660 case XTerm_name: 3699 case XTerm_name:
… …
3667 set_title (str); 3706 set_title (str);
3668 break; 3707 break;
3669 case XTerm_property: 3708 case XTerm_property:
3670 if (str[0] == '?') 3709 if (str[0] == '?')
3671 { 3710 {
3672 Atom prop = XInternAtom (display->display, str + 1, True); 3711 Atom prop = display->atom (str + 1);
3673 Atom actual_type; 3712 Atom actual_type;
3674 int actual_format; 3713 int actual_format;
3675 unsigned long nitems; 3714 unsigned long nitems;
3676 unsigned long bytes_after; 3715 unsigned long bytes_after;
3677 unsigned char *value = 0; 3716 unsigned char *value = 0;
3678 const char *str = ""; 3717 const char *str = "";
3679 3718
3680 if (prop 3719 if (prop
3681 && XGetWindowProperty (display->display, TermWin.parent[0], 3720 && XGetWindowProperty (disp, TermWin.parent[0],
3682 prop, 0, 1<<16, 0, AnyPropertyType, 3721 prop, 0, 1<<16, 0, AnyPropertyType,
3683 &actual_type, &actual_format, 3722 &actual_type, &actual_format,
3684 &nitems, &bytes_after, &value) == Success 3723 &nitems, &bytes_after, &value) == Success
3685 && actual_type != None 3724 && actual_type != None
3686 && actual_format == 8) 3725 && actual_format == 8)
… …
3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3734 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3696 3735
3697 if (eq) 3736 if (eq)
3698 { 3737 {
3699 *eq = 0; 3738 *eq = 0;
3700 XChangeProperty (display->display, TermWin.parent[0], 3739 set_utf8_property (display->atom (str), eq + 1);
3701 display->atom (str), XA_STRING, 8,
3702 PropModeReplace, (unsigned char *)eq + 1,
3703 strlen (eq + 1));
3704 } 3740 }
3705 else 3741 else
3706 XDeleteProperty (display->display, TermWin.parent[0], 3742 XDeleteProperty (disp, TermWin.parent[0],
3707 display->atom (str)); 3743 display->atom (str));
3708 } 3744 }
3709 break; 3745 break;
3710 3746
3711 case XTerm_Color: 3747 case XTerm_Color:
… …
3752 break; 3788 break;
3753#ifndef NO_BOLD_UNDERLINE_REVERSE 3789#ifndef NO_BOLD_UNDERLINE_REVERSE
3754 case XTerm_Color_BD: 3790 case XTerm_Color_BD:
3755 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3791 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3756 break; 3792 break;
3757 case XTerm_Color_IT:
3758 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3759 break;
3760 case XTerm_Color_UL: 3793 case XTerm_Color_UL:
3761 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3762 break; 3795 break;
3763 case XTerm_Color_RV: 3796 case XTerm_Color_RV:
3764 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3765 break; 3798 break;
3799 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3801 break;
3766#endif 3802#endif
3767#if TRANSPARENT && TINTING 3803#if TRANSPARENT && TINTING
3768 case XTerm_Color_tint: 3804 case URxvt_Color_tint:
3769 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3770 check_our_parents (); 3806 check_our_parents ();
3771 if (am_transparent) 3807 if (am_transparent)
3772 want_full_refresh = want_refresh = 1; 3808 want_full_refresh = want_refresh = 1;
3773 break; 3809 break;
3774#endif 3810#endif
… …
3786 { 3822 {
3787 str++; 3823 str++;
3788#if XPM_BACKGROUND 3824#if XPM_BACKGROUND
3789 changed += scale_pixmap (str); 3825 changed += scale_pixmap (str);
3790#endif 3826#endif
3791
3792 } 3827 }
3828
3793 if (changed) 3829 if (changed)
3794 { 3830 {
3795#ifdef XPM_BACKGROUND 3831#ifdef XPM_BACKGROUND
3796 resize_pixmap (); 3832 resize_pixmap ();
3797#endif 3833#endif
… …
3808 3844
3809 case XTerm_logfile: 3845 case XTerm_logfile:
3810 // TODO, when secure mode? 3846 // TODO, when secure mode?
3811 break; 3847 break;
3812 3848
3849#ifdef MENUBAR
3850 case URxvt_Menu:
3851 if (options & Opt_insecure)
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break;
3854#endif
3855#if 0
3856 case XTerm_dumpscreen: /* no error notices */
3857 {
3858 int fd;
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860 {
3861 scr_dump (fd);
3862 close (fd);
3863 }
3864 }
3865 break;
3866#endif
3813 case XTerm_font: 3867 case XTerm_font:
3814 op = URxvt_font; 3868 op = URxvt_font;
3815 case URxvt_font: 3869 case URxvt_font:
3816#if ENABLE_STYLES 3870#if ENABLE_STYLES
3817 case URxvt_boldFont: 3871 case URxvt_boldFont:
… …
3832 set_fonts (); 3886 set_fonts ();
3833 } 3887 }
3834 break; 3888 break;
3835 3889
3836#if ENABLE_FRILLS 3890#if ENABLE_FRILLS
3837 case XTerm_locale: 3891 case URxvt_locale:
3838 if (query) 3892 if (query)
3839 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3840 else 3894 else
3841 { 3895 {
3842 set_locale (str); 3896 set_locale (str);
3843# ifdef USE_XIM 3897 pty.set_utf8_mode (enc_utf8);
3844 im_cb (); 3898 init_xlocale ();
3845# endif
3846 } 3899 }
3847 break; 3900 break;
3848#endif
3849 3901
3850#ifdef MENUBAR 3902 case URxvt_view_up:
3851 case XTerm_Menu: 3903 case URxvt_view_down:
3852 if (options & Opt_insecure) 3904 int lines = atoi (str);
3853 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3905
3854 break; 3906 if (lines)
3855#endif 3907 scr_page (op == URxvt_view_up ? UP : DN, lines);
3856#if 0
3857 case XTerm_dumpscreen: /* no error notices */
3858 { 3908 else
3859 int fd;
3860 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3861 { 3909 {
3862 scr_dump (fd); 3910 scr_erase_savelines ();
3863 close (fd);
3864 } 3911 }
3865 } 3912
3866 break; 3913 break;
3867#endif 3914#endif
3868 } 3915 }
3869} 3916}
3870/*----------------------------------------------------------------------*/ 3917/*----------------------------------------------------------------------*/
… …
4285 4332
4286/* ---------------------------------------------------------------------- */ 4333/* ---------------------------------------------------------------------- */
4287/* Write data to the pty as typed by the user, pasted with the mouse, 4334/* Write data to the pty as typed by the user, pasted with the mouse,
4288 * or generated by us in response to a query ESC sequence. 4335 * or generated by us in response to a query ESC sequence.
4289 */ 4336 */
4337const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4338
4290void 4339void
4291rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4340rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4292{ 4341{
4293 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4342 if (v_buflen == 0)
4343 {
4344 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4294 4345
4295 if (len) 4346 if ((unsigned int)written == len)
4347 return;
4348
4349 data += written;
4350 len -= written;
4296 { 4351 }
4352
4353 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4354
4355 memcpy (v_buffer + v_buflen, data, len);
4356 v_buflen += len;
4357
4358 pty_ev.set (EVENT_READ | EVENT_WRITE);
4359}
4360
4361void rxvt_term::pty_write ()
4362{
4363 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4364
4365 if (written > 0)
4366 {
4367 v_buflen -= written;
4368
4297 if (v_buflen == 0) 4369 if (v_buflen == 0)
4298 { 4370 {
4299 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4300
4301 if ((unsigned int)written == len)
4302 return;
4303
4304 data += written;
4305 len -= written;
4306 }
4307
4308
4309 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4310
4311 memcpy (v_buffer + v_buflen, data, len);
4312 v_buflen += len;
4313 }
4314
4315 for (;;)
4316 {
4317 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4318
4319 if (written > 0)
4320 {
4321 v_buflen -= written;
4322
4323 if (v_buflen == 0)
4324 {
4325 free (v_buffer); 4371 free (v_buffer);
4326 v_buffer = 0; 4372 v_buffer = 0;
4327 v_buflen = 0; 4373 v_buflen = 0;
4328 4374
4329 pty_ev.set (EVENT_READ); 4375 pty_ev.set (EVENT_READ);
4330 return;
4331 }
4332
4333 memmove (v_buffer, v_buffer + written, v_buflen);
4334 }
4335 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4336 // original code just ignores this...
4337 destroy ();
4338 else
4339 {
4340 pty_ev.set (EVENT_READ | EVENT_WRITE);
4341 return; 4376 return;
4342 } 4377 }
4378
4379 memmove (v_buffer, v_buffer + written, v_buflen);
4343 } 4380 }
4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4382 // original code just ignores this...
4383 destroy ();
4344} 4384}
4345 4385
4346/*----------------------- end-of-file (C source) -----------------------*/ 4386/*----------------------- end-of-file (C source) -----------------------*/
4347 4387

Diff Legend

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