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.8 by pcg, Wed Nov 26 10:42:34 2003 UTC vs.
Revision 1.49 by pcg, Sat Feb 21 22:14:00 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.8 2003/11/26 10:42:34 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
26 * - extensive modifications 25 * - extensive modifications
27 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
28 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
29 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
30 * 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>
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>
54
53/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
54 56
55/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
56/* INTPROTO */
57void 58void
58rxvt_lookup_key(pR_ 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
67 int valid_keysym;
68 unsigned char kbuf[KBUFSZ];
69
70 /*
71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
72 * escape sequence to toggle the Keypad.
73 *
74 * Always permit `shift' to override the current setting
75 */
76 shft = (ev.state & ShiftMask);
77 ctrl = (ev.state & ControlMask);
78 meta = (ev.state & ModMetaMask);
79
80 if (numlock_state || (ev.state & ModNumLockMask))
81 {
82 numlock_state = (ev.state & ModNumLockMask);
83 PrivMode ((!numlock_state), PrivMode_aplKP);
84 }
85
86 kbuf[0] = 0;
87
66#ifdef USE_XIM 88#ifdef USE_XIM
67 int valid_keysym; 89 if (Input_Context)
68#endif
69 unsigned char *kbuf = R->kbuf;
70
71/*
72 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
73 * escape sequence to toggle the Keypad.
74 *
75 * Always permit `shift' to override the current setting
76 */
77 shft = (ev->state & ShiftMask);
78 ctrl = (ev->state & ControlMask);
79 meta = (ev->state & R->ModMetaMask);
80 if (R->numlock_state || (ev->state & R->ModNumLockMask)) {
81 R->numlock_state = (ev->state & R->ModNumLockMask);
82 PrivMode((!R->numlock_state), PrivMode_aplKP);
83 } 90 {
84#ifdef USE_XIM 91 Status status_return;
85 if (R->Input_Context != NULL) {
86 Status status_return;
87 92
88 kbuf[0] = '\0';
89#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
90 len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
91 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
92#else 97 else
98#endif
99 {
100 wchar_t wkbuf[KBUFSZ + 1];
101
102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]);
106 // assume wchar_t == unicode or better
93 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
94 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
95#endif 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale);
111
112 if (status_return == XLookupChars
113 || status_return == XLookupBoth)
114 {
115 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0)
118 len = 0;
119 }
120 else
121 len = 0;
122 }
123
96 valid_keysym = ((status_return == XLookupKeySym) 124 valid_keysym = status_return == XLookupKeySym
97 || (status_return == XLookupBoth)); 125 || status_return == XLookupBoth;
98 } else { 126 }
99 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, 127 else
100 &R->compose); 128#endif
101 valid_keysym = 1;
102 } 129 {
103#else /* USE_XIM */
104 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, 130 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
105 &R->compose); 131 valid_keysym = keysym != NoSymbol;
106/*
107 * map unmapped Latin[2-4]/Katakana/Arabic/Cyrillic/Greek entries -> Latin1
108 * good for installations with correct fonts, but without XLOCALE
109 */
110 if (!len) {
111 if ((keysym >= 0x0100) && (keysym < 0x0800)) {
112 kbuf[0] = (keysym & 0xFF);
113 kbuf[1] = '\0';
114 len = 1;
115 } else
116 kbuf[0] = '\0';
117 } 132 }
118#endif /* USE_XIM */
119 133
120#ifdef USE_XIM
121 if (valid_keysym) 134 if (valid_keysym)
122#endif
123 { 135 {
124/* for some backwards compatibility */ 136 /* for some backwards compatibility */
125#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
126# ifdef HOTKEY_CTRL 138# ifdef HOTKEY_CTRL
127 if (ctrl) { 139 if (ctrl)
128# else 140# else
129 if (meta) { 141 if (meta)
130# endif 142# endif
143 {
131 if (keysym == R->ks_bigfont) { 144 if (keysym == ks_bigfont)
132 rxvt_change_font(aR_ 0, FONT_UP); 145 {
133 return; 146 change_font (0, FONT_UP);
147 return;
148 }
134 } else if (keysym == R->ks_smallfont) { 149 else if (keysym == ks_smallfont)
135 rxvt_change_font(aR_ 0, FONT_DN); 150 {
136 return; 151 change_font (0, FONT_DN);
137 } 152 return;
138 } 153 }
154 }
139#endif 155#endif
140 156
141 if (R->TermWin.saveLines) { 157 if (TermWin.saveLines)
158 {
142#ifdef UNSHIFTED_SCROLLKEYS 159#ifdef UNSHIFTED_SCROLLKEYS
143 if (!ctrl && !meta) { 160 if (!ctrl && !meta)
161 {
144#else 162#else
145 if (IS_SCROLL_MOD) { 163 if (IS_SCROLL_MOD)
164 {
146#endif 165#endif
147 int lnsppg; 166 int lnsppg;
148 167
149#ifdef PAGING_CONTEXT_LINES 168#ifdef PAGING_CONTEXT_LINES
150 lnsppg = R->TermWin.nrow - PAGING_CONTEXT_LINES; 169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
151#else 170#else
152 lnsppg = R->TermWin.nrow * 4 / 5; 171 lnsppg = TermWin.nrow * 4 / 5;
153#endif 172#endif
154 if (keysym == XK_Prior) { 173 if (keysym == XK_Prior)
155 rxvt_scr_page(aR_ UP, lnsppg); 174 {
156 return; 175 scr_page (UP, lnsppg);
176 return;
177 }
157 } else if (keysym == XK_Next) { 178 else if (keysym == XK_Next)
158 rxvt_scr_page(aR_ DN, lnsppg); 179 {
159 return; 180 scr_page (DN, lnsppg);
160 } 181 return;
161 } 182 }
183 }
162#ifdef SCROLL_ON_UPDOWN_KEYS 184#ifdef SCROLL_ON_UPDOWN_KEYS
163 if (IS_SCROLL_MOD) { 185 if (IS_SCROLL_MOD)
164 if (keysym == XK_Up) { 186 {
165 rxvt_scr_page(aR_ UP, 1); 187 if (keysym == XK_Up)
166 return; 188 {
189 scr_page (UP, 1);
190 return;
191 }
167 } else if (keysym == XK_Down) { 192 else if (keysym == XK_Down)
168 rxvt_scr_page(aR_ DN, 1); 193 {
169 return; 194 scr_page (DN, 1);
170 } 195 return;
171 } 196 }
197 }
172#endif 198#endif
173#ifdef SCROLL_ON_HOMEEND_KEYS 199#ifdef SCROLL_ON_HOMEEND_KEYS
174 if (IS_SCROLL_MOD) { 200 if (IS_SCROLL_MOD)
175 if (keysym == XK_Home) { 201 {
176 rxvt_scr_move_to(aR_ 0, 1); 202 if (keysym == XK_Home)
177 return; 203 {
204 scr_move_to (0, 1);
205 return;
206 }
178 } else if (keysym == XK_End) { 207 else if (keysym == XK_End)
179 rxvt_scr_move_to(aR_ 1, 0); 208 {
180 return; 209 scr_move_to (1, 0);
181 } 210 return;
182 } 211 }
212 }
183#endif 213#endif
184 } 214 }
185 215
186 if (shft) { 216 if (shft)
217 {
187 /* Shift + F1 - F10 generates F11 - F20 */ 218 /* Shift + F1 - F10 generates F11 - F20 */
188 if (keysym >= XK_F1 && keysym <= XK_F10) { 219 if (keysym >= XK_F1 && keysym <= XK_F10)
220 {
189 keysym += (XK_F11 - XK_F1); 221 keysym += (XK_F11 - XK_F1);
190 shft = 0; /* turn off Shift */ 222 shft = 0; /* turn off Shift */
223 }
191 } else if (!ctrl && !meta && (R->PrivateModes & PrivMode_ShiftKeys)) { 224 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
192 switch (keysym) { 225 {
193 /* normal XTerm key bindings */ 226 switch (keysym)
227 {
228 /* normal XTerm key bindings */
194 case XK_Insert: /* Shift+Insert = paste mouse selection */ 229 case XK_Insert: /* Shift+Insert = paste mouse selection */
195 rxvt_selection_request(aR_ ev->time, 0, 0); 230 selection_request (ev.time, 0, 0);
196 return; 231 return;
197 /* rxvt extras */ 232 /* rxvt extras */
198 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 233 case XK_KP_Add: /* Shift+KP_Add = bigger font */
199 rxvt_change_font(aR_ 0, FONT_UP); 234 change_font (0, FONT_UP);
200 return; 235 return;
201 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
202 rxvt_change_font(aR_ 0, FONT_DN); 237 change_font (0, FONT_DN);
203 return; 238 return;
204 } 239 }
205 } 240 }
206 } 241 }
207#ifdef PRINTPIPE 242#ifdef PRINTPIPE
208 if (keysym == XK_Print) { 243 if (keysym == XK_Print)
209 rxvt_scr_printscreen(aR_ ctrl | shft); 244 {
245 scr_printscreen (ctrl | shft);
210 return; 246 return;
211 } 247 }
212#endif 248#endif
213#ifdef GREEK_SUPPORT 249#ifdef GREEK_SUPPORT
214 if (keysym == R->ks_greekmodeswith) { 250 if (keysym == ks_greekmodeswith)
215 R->greek_mode = !R->greek_mode; 251 {
252 greek_mode = !greek_mode;
216 if (R->greek_mode) { 253 if (greek_mode)
217 rxvt_xterm_seq(aR_ XTerm_title, 254 {
255 xterm_seq (XTerm_title,
218 (greek_getmode() == GREEK_ELOT928 256 (greek_getmode () == GREEK_ELOT928
219 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 257 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
220 greek_reset(); 258 greek_reset ();
221 } else 259 }
260 else
222 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 261 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
223 return; 262 return;
224 } 263 }
225#endif 264#endif
226 265
227 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 266 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
267 {
228#ifdef KEYSYM_RESOURCE 268#ifdef KEYSYM_RESOURCE
229 if (!(shft | ctrl) && R->Keysym_map[keysym & 0xFF] != NULL) { 269 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
230 unsigned int l; 270 {
271 unsigned int l;
231 const unsigned char *kbuf0; 272 const unsigned char *kbuf0;
232 const unsigned char ch = C0_ESC; 273 const unsigned char ch = C0_ESC;
233 274
234 kbuf0 = (R->Keysym_map[keysym & 0xFF]); 275 kbuf0 = (Keysym_map[keysym & 0xFF]);
235 l = (unsigned int)*kbuf0++; 276 l = (unsigned int)*kbuf0++;
236 277
237 /* escape prefix */ 278 /* escape prefix */
238 if (meta) 279 if (meta)
239# ifdef META8_OPTION 280# ifdef META8_OPTION
240 if (R->meta_char == C0_ESC) 281 if (meta_char == C0_ESC)
241# endif 282# endif
242 rxvt_tt_write(aR_ &ch, 1); 283 tt_write (&ch, 1);
243 rxvt_tt_write(aR_ kbuf0, l); 284 tt_write (kbuf0, l);
244 return; 285 return;
245 } else 286 }
287 else
246#endif 288#endif
247 { 289 {
248 newlen = 1; 290 newlen = 1;
249 switch (keysym) { 291 switch (keysym)
292 {
250#ifndef NO_BACKSPACE_KEY 293#ifndef NO_BACKSPACE_KEY
251 case XK_BackSpace: 294 case XK_BackSpace:
252 if (R->PrivateModes & PrivMode_HaveBackSpace) { 295 if (PrivateModes & PrivMode_HaveBackSpace)
296 {
253 kbuf[0] = (!!(R->PrivateModes & PrivMode_BackSpace) 297 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
254 ^ !!ctrl) ? '\b' : '\177'; 298 ^ !!ctrl) ? '\b' : '\177';
255 kbuf[1] = '\0'; 299 kbuf[1] = '\0';
256 } else 300 }
257 STRCPY(kbuf, R->key_backspace); 301 else
302 STRCPY (kbuf, key_backspace);
258# ifdef MULTICHAR_SET 303# ifdef MULTICHAR_SET
259 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) { 304 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
260 int col, row; 305 {
306 int col, row;
261 307
262 newlen = STRLEN(kbuf); 308 newlen = STRLEN (kbuf);
263 col = R->screen.cur.col - 1; 309 col = screen.cur.col - 1;
264 row = R->screen.cur.row + R->TermWin.saveLines; 310 row = screen.cur.row + TermWin.saveLines;
265 if (IS_MULTI2(R->screen.rend[row][col])) 311 if (IS_MULTI2 (screen.rend[row][col]))
266 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 312 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
267 } 313 }
268# endif 314# endif
269 break; 315 break;
270#endif 316#endif
271#ifndef NO_DELETE_KEY 317#ifndef NO_DELETE_KEY
272 case XK_Delete: 318 case XK_Delete:
273 STRCPY(kbuf, R->key_delete); 319 STRCPY (kbuf, key_delete);
274# ifdef MULTICHAR_SET 320# ifdef MULTICHAR_SET
275 if (R->Options & Opt_mc_hack) { 321 if (Options & Opt_mc_hack)
276 int col, row; 322 {
277 323 int col, row;
278 newlen = STRLEN(kbuf); 324
279 col = R->screen.cur.col; 325 newlen = STRLEN (kbuf);
280 row = R->screen.cur.row + R->TermWin.saveLines; 326 col = screen.cur.col;
281 if (IS_MULTI1(R->screen.rend[row][col])) 327 row = screen.cur.row + TermWin.saveLines;
328 if (IS_MULTI1 (screen.rend[row][col]))
282 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 329 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
283 } 330 }
284# endif 331# endif
285 break; 332 break;
286#endif 333#endif
287 case XK_Tab: 334 case XK_Tab:
288 if (shft) 335 if (shft)
289 STRCPY(kbuf, "\033[Z"); 336 STRCPY (kbuf, "\033[Z");
290 else { 337 else
338 {
291#ifdef CTRL_TAB_MAKES_META 339#ifdef CTRL_TAB_MAKES_META
292 if (ctrl) 340 if (ctrl)
293 meta = 1; 341 meta = 1;
294#endif 342#endif
295#ifdef MOD4_TAB_MAKES_META 343#ifdef MOD4_TAB_MAKES_META
296 if (ev->state & Mod4Mask) 344 if (ev.state & Mod4Mask)
297 meta = 1; 345 meta = 1;
298#endif 346#endif
299 newlen = 0; 347 newlen = 0;
300 } 348 }
301 break; 349 break;
302
303 350
304#ifdef XK_KP_Left 351#ifdef XK_KP_Left
305 case XK_KP_Up: /* \033Ox or standard */ 352 case XK_KP_Up: /* \033Ox or standard */
306 case XK_KP_Down: /* \033Or or standard */ 353 case XK_KP_Down: /* \033Or or standard */
307 case XK_KP_Right: /* \033Ov or standard */ 354 case XK_KP_Right: /* \033Ov or standard */
308 case XK_KP_Left: /* \033Ot or standard */ 355 case XK_KP_Left: /* \033Ot or standard */
309 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 356 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
310 STRCPY(kbuf, "\033OZ"); 357 {
311 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 358 STRCPY (kbuf, "\033OZ");
312 break; 359 kbuf[2] = "txvr"[keysym - XK_KP_Left];
313 } else 360 break;
361 }
362 else
314 /* translate to std. cursor key */ 363 /* translate to std. cursor key */
315 keysym = XK_Left + (keysym - XK_KP_Left); 364 keysym = XK_Left + (keysym - XK_KP_Left);
316 /* FALLTHROUGH */ 365 /* FALLTHROUGH */
317#endif 366#endif
318 case XK_Up: /* "\033[A" */ 367 case XK_Up: /* "\033[A" */
319 case XK_Down: /* "\033[B" */ 368 case XK_Down: /* "\033[B" */
320 case XK_Right: /* "\033[C" */ 369 case XK_Right: /* "\033[C" */
321 case XK_Left: /* "\033[D" */ 370 case XK_Left: /* "\033[D" */
322 STRCPY(kbuf, "\033[Z"); 371 STRCPY (kbuf, "\033[Z");
323 kbuf[2] = ("DACB"[keysym - XK_Left]); 372 kbuf[2] = "DACB"[keysym - XK_Left];
324 /* do Shift first */ 373 /* do Shift first */
325 if (shft) 374 if (shft)
326 kbuf[2] = ("dacb"[keysym - XK_Left]); 375 kbuf[2] = "dacb"[keysym - XK_Left];
327 else if (ctrl) { 376 else if (ctrl)
328 kbuf[1] = 'O'; 377 {
329 kbuf[2] = ("dacb"[keysym - XK_Left]); 378 kbuf[1] = 'O';
330 } else if (R->PrivateModes & PrivMode_aplCUR) 379 kbuf[2] = "dacb"[keysym - XK_Left];
331 kbuf[1] = 'O'; 380 }
381 else if (PrivateModes & PrivMode_aplCUR)
382 kbuf[1] = 'O';
332#ifdef MULTICHAR_SET 383#ifdef MULTICHAR_SET
333 //TODO: ?? 384 //TODO: ??
334 if (R->Options & Opt_mc_hack) { 385 if (Options & Opt_mc_hack)
335 int col, row, m; 386 {
387 int col, row, m;
336 388
337 col = R->screen.cur.col; 389 col = screen.cur.col;
338 row = R->screen.cur.row + R->TermWin.saveLines; 390 row = screen.cur.row + TermWin.saveLines;
339 m = 0; 391 m = 0;
340 if (keysym == XK_Right 392 if (keysym == XK_Right
341 && IS_MULTI1(R->screen.rend[row][col])) 393 && IS_MULTI1 (screen.rend[row][col]))
342 m = 1; 394 m = 1;
343 else if (keysym == XK_Left) { 395 else if (keysym == XK_Left)
344 if (col > 0) { 396 {
345 if (IS_MULTI2(R->screen.rend[row][col - 1])) 397 if (col > 0)
346 m = 1; 398 {
347 } else if (R->screen.cur.row > 0) { 399 if (IS_MULTI2 (screen.rend[row][col - 1]))
348 col = R->screen.tlen[--row]; 400 m = 1;
349 if (col == -1) 401 }
350 col = R->TermWin.ncol - 1; 402 else if (screen.cur.row > 0)
351 else 403 {
352 col--; 404 col = screen.tlen[--row];
353 if (col > 0 405 if (col == -1)
354 && IS_MULTI2(R->screen.rend[row][col])) 406 col = TermWin.ncol - 1;
355 m = 1; 407 else
356 } 408 col--;
357 } 409 if (col > 0
358 if (m) 410 && IS_MULTI2 (screen.rend[row][col]))
359 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 411 m = 1;
360 } 412 }
413 }
414 if (m)
415 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
416 }
361#endif 417#endif
362 break; 418 break;
363 419
364#ifndef UNSHIFTED_SCROLLKEYS 420#ifndef UNSHIFTED_SCROLLKEYS
365# ifdef XK_KP_Prior 421# ifdef XK_KP_Prior
366 case XK_KP_Prior: 422 case XK_KP_Prior:
367 /* allow shift to override */ 423 /* allow shift to override */
368 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 424 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
369 STRCPY(kbuf, "\033Oy"); 425 {
370 break; 426 STRCPY (kbuf, "\033Oy");
371 } 427 break;
372 /* FALLTHROUGH */ 428 }
429 /* FALLTHROUGH */
373# endif 430# endif
374 case XK_Prior: 431 case XK_Prior:
375 STRCPY(kbuf, "\033[5~"); 432 STRCPY (kbuf, "\033[5~");
376 break; 433 break;
377# ifdef XK_KP_Next 434# ifdef XK_KP_Next
378 case XK_KP_Next: 435 case XK_KP_Next:
379 /* allow shift to override */ 436 /* allow shift to override */
380 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 437 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
381 STRCPY(kbuf, "\033Os"); 438 {
382 break; 439 STRCPY (kbuf, "\033Os");
383 } 440 break;
384 /* FALLTHROUGH */ 441 }
442 /* FALLTHROUGH */
385# endif 443# endif
386 case XK_Next: 444 case XK_Next:
387 STRCPY(kbuf, "\033[6~"); 445 STRCPY (kbuf, "\033[6~");
388 break; 446 break;
389#endif 447#endif
390 case XK_KP_Enter: 448 case XK_KP_Enter:
391 /* allow shift to override */ 449 /* allow shift to override */
392 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 450 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
393 STRCPY(kbuf, "\033OM"); 451 {
394 } else { 452 STRCPY (kbuf, "\033OM");
395 kbuf[0] = '\r'; 453 }
396 kbuf[1] = '\0'; 454 else
397 } 455 {
398 break; 456 kbuf[0] = '\r';
457 kbuf[1] = '\0';
458 }
459 break;
399 460
400#ifdef XK_KP_Begin 461#ifdef XK_KP_Begin
401 case XK_KP_Begin: 462 case XK_KP_Begin:
402 STRCPY(kbuf, "\033Ou"); 463 STRCPY (kbuf, "\033Ou");
403 break; 464 break;
404 465
405 case XK_KP_Insert: 466 case XK_KP_Insert:
406 STRCPY(kbuf, "\033Op"); 467 STRCPY (kbuf, "\033Op");
407 break; 468 break;
408 469
409 case XK_KP_Delete: 470 case XK_KP_Delete:
410 STRCPY(kbuf, "\033On"); 471 STRCPY (kbuf, "\033On");
411 break; 472 break;
412#endif 473#endif
413 case XK_KP_F1: /* "\033OP" */ 474 case XK_KP_F1: /* "\033OP" */
414 case XK_KP_F2: /* "\033OQ" */ 475 case XK_KP_F2: /* "\033OQ" */
415 case XK_KP_F3: /* "\033OR" */ 476 case XK_KP_F3: /* "\033OR" */
416 case XK_KP_F4: /* "\033OS" */ 477 case XK_KP_F4: /* "\033OS" */
417 STRCPY(kbuf, "\033OP"); 478 STRCPY (kbuf, "\033OP");
418 kbuf[2] += (keysym - XK_KP_F1); 479 kbuf[2] += (keysym - XK_KP_F1);
419 break; 480 break;
420 481
421 case XK_KP_Multiply: /* "\033Oj" : "*" */ 482 case XK_KP_Multiply: /* "\033Oj" : "*" */
422 case XK_KP_Add: /* "\033Ok" : "+" */ 483 case XK_KP_Add: /* "\033Ok" : "+" */
423 case XK_KP_Separator: /* "\033Ol" : "," */ 484 case XK_KP_Separator: /* "\033Ol" : "," */
424 case XK_KP_Subtract: /* "\033Om" : "-" */ 485 case XK_KP_Subtract: /* "\033Om" : "-" */
425 case XK_KP_Decimal: /* "\033On" : "." */ 486 case XK_KP_Decimal: /* "\033On" : "." */
426 case XK_KP_Divide: /* "\033Oo" : "/" */ 487 case XK_KP_Divide: /* "\033Oo" : "/" */
427 case XK_KP_0: /* "\033Op" : "0" */ 488 case XK_KP_0: /* "\033Op" : "0" */
428 case XK_KP_1: /* "\033Oq" : "1" */ 489 case XK_KP_1: /* "\033Oq" : "1" */
429 case XK_KP_2: /* "\033Or" : "2" */ 490 case XK_KP_2: /* "\033Or" : "2" */
430 case XK_KP_3: /* "\033Os" : "3" */ 491 case XK_KP_3: /* "\033Os" : "3" */
431 case XK_KP_4: /* "\033Ot" : "4" */ 492 case XK_KP_4: /* "\033Ot" : "4" */
432 case XK_KP_5: /* "\033Ou" : "5" */ 493 case XK_KP_5: /* "\033Ou" : "5" */
433 case XK_KP_6: /* "\033Ov" : "6" */ 494 case XK_KP_6: /* "\033Ov" : "6" */
434 case XK_KP_7: /* "\033Ow" : "7" */ 495 case XK_KP_7: /* "\033Ow" : "7" */
435 case XK_KP_8: /* "\033Ox" : "8" */ 496 case XK_KP_8: /* "\033Ox" : "8" */
436 case XK_KP_9: /* "\033Oy" : "9" */ 497 case XK_KP_9: /* "\033Oy" : "9" */
437 /* allow shift to override */ 498 /* allow shift to override */
438 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 499 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
439 STRCPY(kbuf, "\033Oj"); 500 {
440 kbuf[2] += (keysym - XK_KP_Multiply); 501 STRCPY (kbuf, "\033Oj");
441 } else { 502 kbuf[2] += (keysym - XK_KP_Multiply);
503 }
504 else
505 {
442 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 506 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
443 kbuf[1] = '\0'; 507 kbuf[1] = '\0';
444 } 508 }
445 break; 509 break;
446 510
447 case XK_Find: 511 case XK_Find:
448 STRCPY(kbuf, "\033[1~"); 512 STRCPY (kbuf, "\033[1~");
449 break; 513 break;
450 case XK_Insert: 514 case XK_Insert:
451 STRCPY(kbuf, "\033[2~"); 515 STRCPY (kbuf, "\033[2~");
452 break; 516 break;
453#ifdef DXK_Remove /* support for DEC remove like key */ 517#ifdef DXK_Remove /* support for DEC remove like key */
454 case DXK_Remove: 518 case DXK_Remove:
455 /* FALLTHROUGH */ 519 /* FALLTHROUGH */
456#endif 520#endif
457 case XK_Execute: 521 case XK_Execute:
458 STRCPY(kbuf, "\033[3~"); 522 STRCPY (kbuf, "\033[3~");
459 break; 523 break;
460 case XK_Select: 524 case XK_Select:
461 STRCPY(kbuf, "\033[4~"); 525 STRCPY (kbuf, "\033[4~");
462 break; 526 break;
463#ifdef XK_KP_End 527#ifdef XK_KP_End
464 case XK_KP_End: 528 case XK_KP_End:
465 /* allow shift to override */ 529 /* allow shift to override */
466 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 530 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
467 STRCPY(kbuf, "\033Oq"); 531 {
468 break; 532 STRCPY (kbuf, "\033Oq");
469 } 533 break;
470 /* FALLTHROUGH */ 534 }
535 /* FALLTHROUGH */
471#endif 536#endif
472 case XK_End: 537 case XK_End:
473 STRCPY(kbuf, KS_END); 538 STRCPY (kbuf, KS_END);
474 break; 539 break;
475#ifdef XK_KP_Home 540#ifdef XK_KP_Home
476 case XK_KP_Home: 541 case XK_KP_Home:
477 /* allow shift to override */ 542 /* allow shift to override */
478 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 543 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
479 STRCPY(kbuf, "\033Ow"); 544 {
480 break; 545 STRCPY (kbuf, "\033Ow");
481 } 546 break;
482 /* FALLTHROUGH */ 547 }
548 /* FALLTHROUGH */
483#endif 549#endif
484 case XK_Home: 550 case XK_Home:
485 STRCPY(kbuf, KS_HOME); 551 STRCPY (kbuf, KS_HOME);
486 break; 552 break;
487 553
488#define FKEY(n, fkey) \ 554#define FKEY(n, fkey) \
489 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 555 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
490 556
491 case XK_F1: /* "\033[11~" */ 557 case XK_F1: /* "\033[11~" */
492 case XK_F2: /* "\033[12~" */ 558 case XK_F2: /* "\033[12~" */
493 case XK_F3: /* "\033[13~" */ 559 case XK_F3: /* "\033[13~" */
494 case XK_F4: /* "\033[14~" */ 560 case XK_F4: /* "\033[14~" */
495 case XK_F5: /* "\033[15~" */ 561 case XK_F5: /* "\033[15~" */
496 FKEY(11, XK_F1); 562 FKEY (11, XK_F1);
497 break; 563 break;
498 case XK_F6: /* "\033[17~" */ 564 case XK_F6: /* "\033[17~" */
499 case XK_F7: /* "\033[18~" */ 565 case XK_F7: /* "\033[18~" */
500 case XK_F8: /* "\033[19~" */ 566 case XK_F8: /* "\033[19~" */
501 case XK_F9: /* "\033[20~" */ 567 case XK_F9: /* "\033[20~" */
502 case XK_F10: /* "\033[21~" */ 568 case XK_F10: /* "\033[21~" */
503 FKEY(17, XK_F6); 569 FKEY (17, XK_F6);
504 break; 570 break;
505 case XK_F11: /* "\033[23~" */ 571 case XK_F11: /* "\033[23~" */
506 case XK_F12: /* "\033[24~" */ 572 case XK_F12: /* "\033[24~" */
507 case XK_F13: /* "\033[25~" */ 573 case XK_F13: /* "\033[25~" */
508 case XK_F14: /* "\033[26~" */ 574 case XK_F14: /* "\033[26~" */
509 FKEY(23, XK_F11); 575 FKEY (23, XK_F11);
510 break; 576 break;
511 case XK_F15: /* "\033[28~" */ 577 case XK_F15: /* "\033[28~" */
512 case XK_F16: /* "\033[29~" */ 578 case XK_F16: /* "\033[29~" */
513 FKEY(28, XK_F15); 579 FKEY (28, XK_F15);
514 break; 580 break;
515 case XK_Help: /* "\033[28~" */ 581 case XK_Help: /* "\033[28~" */
516 FKEY(28, XK_Help); 582 FKEY (28, XK_Help);
517 break; 583 break;
518 case XK_Menu: /* "\033[29~" */ 584 case XK_Menu: /* "\033[29~" */
519 FKEY(29, XK_Menu); 585 FKEY (29, XK_Menu);
520 break; 586 break;
521 case XK_F17: /* "\033[31~" */ 587 case XK_F17: /* "\033[31~" */
522 case XK_F18: /* "\033[32~" */ 588 case XK_F18: /* "\033[32~" */
523 case XK_F19: /* "\033[33~" */ 589 case XK_F19: /* "\033[33~" */
524 case XK_F20: /* "\033[34~" */ 590 case XK_F20: /* "\033[34~" */
525 case XK_F21: /* "\033[35~" */ 591 case XK_F21: /* "\033[35~" */
526 case XK_F22: /* "\033[36~" */ 592 case XK_F22: /* "\033[36~" */
527 case XK_F23: /* "\033[37~" */ 593 case XK_F23: /* "\033[37~" */
528 case XK_F24: /* "\033[38~" */ 594 case XK_F24: /* "\033[38~" */
529 case XK_F25: /* "\033[39~" */ 595 case XK_F25: /* "\033[39~" */
530 case XK_F26: /* "\033[40~" */ 596 case XK_F26: /* "\033[40~" */
531 case XK_F27: /* "\033[41~" */ 597 case XK_F27: /* "\033[41~" */
532 case XK_F28: /* "\033[42~" */ 598 case XK_F28: /* "\033[42~" */
533 case XK_F29: /* "\033[43~" */ 599 case XK_F29: /* "\033[43~" */
534 case XK_F30: /* "\033[44~" */ 600 case XK_F30: /* "\033[44~" */
535 case XK_F31: /* "\033[45~" */ 601 case XK_F31: /* "\033[45~" */
536 case XK_F32: /* "\033[46~" */ 602 case XK_F32: /* "\033[46~" */
537 case XK_F33: /* "\033[47~" */ 603 case XK_F33: /* "\033[47~" */
538 case XK_F34: /* "\033[48~" */ 604 case XK_F34: /* "\033[48~" */
539 case XK_F35: /* "\033[49~" */ 605 case XK_F35: /* "\033[49~" */
540 FKEY(31, XK_F17); 606 FKEY (31, XK_F17);
541 break; 607 break;
542#undef FKEY 608#undef FKEY
543 default: 609 default:
544 newlen = 0; 610 newlen = 0;
545 break; 611 break;
546 } 612 }
547 if (newlen) 613 if (newlen)
548 len = STRLEN(kbuf); 614 len = STRLEN (kbuf);
549 } 615 }
550 /* 616 /*
551 * Pass meta for all function keys, if 'meta' option set 617 * Pass meta for all function keys, if 'meta' option set
552 */ 618 */
553#ifdef META8_OPTION 619#ifdef META8_OPTION
554 if (meta && (R->meta_char == 0x80) && len > 0) 620 if (meta && (meta_char == 0x80) && len > 0)
555 kbuf[len - 1] |= 0x80; 621 kbuf[len - 1] |= 0x80;
556#endif 622#endif
623
624 }
557 } else if (ctrl && keysym == XK_minus) { 625 else if (ctrl && keysym == XK_minus)
626 {
558 len = 1; 627 len = 1;
559 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 628 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
560 } else { 629 }
630 else
631 {
561#ifdef META8_OPTION 632#ifdef META8_OPTION
562 /* set 8-bit on */ 633 /* set 8-bit on */
563 if (meta && (R->meta_char == 0x80)) { 634 if (meta && (meta_char == 0x80))
564 unsigned char *ch; 635 {
636 unsigned char *ch;
565 637
566 for (ch = kbuf; ch < kbuf + len; ch++) 638 for (ch = kbuf; ch < kbuf + len; ch++)
567 *ch |= 0x80; 639 *ch |= 0x80;
568 meta = 0; 640 meta = 0;
569 } 641 }
570#endif 642#endif
571#ifdef GREEK_SUPPORT 643#ifdef GREEK_SUPPORT
572 if (R->greek_mode) 644 if (greek_mode)
573 len = greek_xlat(kbuf, len); 645 len = greek_xlat (kbuf, len);
574#endif 646#endif
575 /* nil */ ; 647 /* nil */ ;
576 } 648 }
577 } 649 }
578 650
579 if (len <= 0) 651 if (len <= 0)
580 return; /* not mapped */ 652 return; /* not mapped */
581 653
582 if (R->Options & Opt_scrollTtyKeypress) 654 if (Options & Opt_scrollTtyKeypress)
583 if (R->TermWin.view_start) { 655 if (TermWin.view_start)
584 R->TermWin.view_start = 0; 656 {
585 R->want_refresh = 1; 657 TermWin.view_start = 0;
586 } 658 want_refresh = 1;
659 }
587 660
588/* 661 /*
589 * these modifications only affect the static keybuffer 662 * these modifications only affect the static keybuffer
590 * pass Shift/Control indicators for function keys ending with `~' 663 * pass Shift/Control indicators for function keys ending with `~'
591 * 664 *
592 * eg, 665 * eg,
593 * Prior = "ESC[5~" 666 * Prior = "ESC[5~"
594 * Shift+Prior = "ESC[5$" 667 * Shift+Prior = "ESC[5$"
595 * Ctrl+Prior = "ESC[5^" 668 * Ctrl+Prior = "ESC[5^"
596 * Ctrl+Shift+Prior = "ESC[5@" 669 * Ctrl+Shift+Prior = "ESC[5@"
597 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 670 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
598 */ 671 */
599 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 672 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
600 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 673 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
601 674
602/* escape prefix */ 675 /* escape prefix */
603 if (meta 676 if (meta
604#ifdef META8_OPTION 677#ifdef META8_OPTION
605 && (R->meta_char == C0_ESC) 678 && (meta_char == C0_ESC)
606#endif 679#endif
607 ) { 680 )
681 {
608 const unsigned char ch = C0_ESC; 682 const unsigned char ch = C0_ESC;
609 683
610 rxvt_tt_write(aR_ &ch, 1); 684 tt_write (&ch, 1);
611 } 685 }
612#ifdef DEBUG_CMD 686#ifdef DEBUG_CMD
687 if (debug_key)
613 if (debug_key) { /* Display keyboard buffer contents */ 688 { /* Display keyboard buffer contents */
614 char *p; 689 char *p;
615 int i; 690 int i;
616 691
617 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 692 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
618 for (i = 0, p = kbuf; i < len; i++, p++) 693 for (i = 0, p = kbuf; i < len; i++, p++)
619 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 694 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
620 fprintf(stderr, "'\n"); 695 fprintf (stderr, "'\n");
621 } 696 }
622#endif /* DEBUG_CMD */ 697#endif /* DEBUG_CMD */
623 rxvt_tt_write(aR_ kbuf, (unsigned int)len); 698 tt_write (kbuf, (unsigned int)len);
624} 699}
625/*}}} */ 700/*}}} */
626 701
627#if (MENUBAR_MAX) 702#if (MENUBAR_MAX)
628/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 703/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
629/* attempt to `write' count to the input buffer */ 704/* attempt to `write' count to the input buffer */
630/* EXTPROTO */
631unsigned int 705unsigned int
632rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 706rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
633{ 707{
634 unsigned int n, s; 708 unsigned int n, s;
635 unsigned char *cmdbuf_base = R->cmdbuf_base,
636 *cmdbuf_endp = R->cmdbuf_endp,
637 *cmdbuf_ptr = R->cmdbuf_ptr;
638 709
639 n = cmdbuf_ptr - cmdbuf_base; 710 n = cmdbuf_ptr - cmdbuf_base;
640 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 711 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
641 if (n > 0 && s < count) { 712 if (n > 0 && s < count)
713 {
642 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 714 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
643 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 715 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
644 cmdbuf_ptr = cmdbuf_base; 716 cmdbuf_ptr = cmdbuf_base;
645 cmdbuf_endp -= n; 717 cmdbuf_endp -= n;
646 s += n; 718 s += n;
647 } 719 }
648 if (count > s) { 720 if (count > s)
721 {
649 rxvt_print_error("data loss: cmd_write too large"); 722 rxvt_print_error ("data loss: cmd_write too large");
650 count = s; 723 count = s;
651 } 724 }
652 for (; count--;) 725 for (; count--;)
653 *cmdbuf_endp++ = *str++; 726 *cmdbuf_endp++ = *str++;
654 R->cmdbuf_ptr = cmdbuf_ptr;
655 R->cmdbuf_endp = cmdbuf_endp;
656 return 0; 727 return 0;
657} 728}
658#endif /* MENUBAR_MAX */ 729#endif /* MENUBAR_MAX */
659 730
660void 731void
661rxvt_term::process_x_events () 732rxvt_term::flush ()
662{ 733{
663 do 734#ifdef TRANSPARENT
735 if (want_full_refresh)
664 { 736 {
665 XEvent xev; 737 want_full_refresh = 0;
666 738 scr_clear ();
667 XNextEvent (Xdisplay, &xev); 739 scr_touch (false);
668
669#if defined(CURSOR_BLINK)
670 if ((Options & Opt_cursorBlink)
671 && xev.type == KeyPress)
672 {
673 if (hidden_cursor)
674 {
675 hidden_cursor = 0;
676 want_refresh = 1; 740 want_refresh = 1;
677 } 741 }
678
679 blink_ev.start (NOW + BLINK_INTERVAL);
680 }
681#endif 742#endif
682 743
683#if defined(POINTER_BLANK) 744 if (want_refresh)
684 if ((Options & Opt_pointerBlank) 745 {
685 && (pointerBlankDelay > 0)) 746 scr_refresh (refresh_type);
686 { 747 scrollbar_show (1);
687 if (xev.type == MotionNotify
688 || xev.type == ButtonPress
689 || xev.type == ButtonRelease)
690 if (hidden_pointer)
691 pointer_unblank ();
692
693 if (xev.type == KeyPress && hidden_pointer == 0)
694 pointer_blank ();
695 }
696#endif
697
698#ifdef USE_XIM 748#ifdef USE_XIM
699 if (!XFilterEvent (&xev, xev.xany.window)) 749 IMSendSpot ();
700#endif 750#endif
701 rxvt_process_x_event (this, &xev); 751
702 } 752 }
703 while (XPending (Xdisplay)); 753
754 display->flush ();
704} 755}
705 756
706void 757void
758rxvt_term::check_cb (check_watcher &w)
759{
760 SET_R (this);
761 SET_LOCALE (locale);
762
763 flush ();
764}
765
766#ifdef CURSOR_BLINK
767void
707rxvt_term::blink_cb (time_watcher &w) 768rxvt_term::cursor_blink_cb (time_watcher &w)
708{ 769{
709 w.at += BLINK_INTERVAL;
710 hidden_cursor = !hidden_cursor; 770 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 771 want_refresh = 1;
712 flush ();
713}
714 772
773 w.start (w.at + BLINK_INTERVAL);
774}
775#endif
776
777#ifdef TEXT_BLINK
715void 778void
779rxvt_term::text_blink_cb (time_watcher &w)
780{
781 if (scr_refresh_rend (RS_Blink, RS_Blink))
782 {
783 hidden_text = !hidden_text;
784 want_refresh = 1;
785 w.start (w.at + TEXT_BLINK_INTERVAL);
786 }
787}
788#endif
789
790bool
791rxvt_term::pty_fill ()
792{
793 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
794
795 memmove (cmdbuf_base, cmdbuf_ptr, n);
796 cmdbuf_ptr = cmdbuf_base;
797 cmdbuf_endp = cmdbuf_ptr + n;
798
799 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
800
801 if (n > 0)
802 {
803 cmdbuf_endp += n;
804 return true;
805 }
806 else if (n < 0 && errno != EAGAIN)
807 destroy ();
808
809 return false;
810}
811
812void
716rxvt_term::x_cb (io_watcher &w, short revents) 813rxvt_term::pty_cb (io_watcher &w, short revents)
717{ 814{
718 process_x_events (); 815 SET_R (this);
816 SET_LOCALE (locale);
719 817
720 flush (); 818 if (revents & EVENT_WRITE)
819 tt_write (0, 0);
820 else if (revents & EVENT_READ)
821 {
822 bool flag = true;
823
824 // loop, but don't allow a single term to monopolize us
825 // the number of loops is fully arbitrary, and thus wrong
826 while (flag && pty_fill ())
827 {
828 if (!seen_input)
829 {
830 seen_input = 1;
831 /* once we know the shell is running, send the screen size. Again! */
832 tt_winch ();
833 }
834
835 uint32_t ch = NOCHAR;
836
837 for (;;)
838 {
839 if (ch == NOCHAR)
840 ch = next_char ();
841
842 if (ch == NOCHAR) // TODO: improve
843 break;
844
845 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
846 {
847 /* Read a text string from the input buffer */
848 uint32_t buf[BUFSIZ];
849 bool refreshnow = false;
850 int nlines = 0;
851 uint32_t *str = buf;
852
853 *str++ = ch;
854
855 for (;;)
856 {
857 ch = next_char ();
858
859 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
860 break;
861 else
862 {
863 *str++ = ch;
864
865 if (ch == '\n')
866 {
867 nlines++;
868 refresh_count++;
869
870 if (! (Options & Opt_jumpScroll)
871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
872 {
873 refreshnow = true;
874 flag = false;
875 ch = NOCHAR;
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;
885 }
886 }
887
888 if (str >= buf + BUFSIZ)
889 {
890 ch = NOCHAR;
891 break;
892 }
893 }
894 }
895
896 scr_add_lines (buf, nlines, str - buf);
897
898 /*
899 * If there have been a lot of new lines, then update the screen
900 * What the heck I'll cheat and only refresh less than every page-full.
901 * the number of pages between refreshes is refresh_limit, which
902 * is incremented here because we must be doing flat-out scrolling.
903 *
904 * refreshing should be correct for small scrolls, because of the
905 * time-out
906 */
907 if (refreshnow)
908 {
909 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
910 refresh_limit++;
911
912 scr_refresh (refresh_type);
913 }
914
915 }
916 else
917 {
918 switch (ch)
919 {
920 default:
921 process_nonprinting (ch);
922 break;
923 case C0_ESC: /* escape char */
924 process_escape_seq ();
925 break;
926 /*case 0x9b: */ /* CSI */
927 /* process_csi_seq (); */
928 }
929
930 ch = NOCHAR;
931 }
932 }
933 }
934 }
721} 935}
722 936
723// read the next character, currently handles UTF-8 937// read the next character, currently handles UTF-8
724// will probably handle all sorts of other stuff in the future 938// will probably handle all sorts of other stuff in the future
725uint32_t 939uint32_t
726rxvt_term::next_char () 940rxvt_term::next_char ()
727{ 941{
728 struct mbstate &s = mbstate;
729
730 while (cmdbuf_ptr < cmdbuf_endp) 942 while (cmdbuf_ptr < cmdbuf_endp)
731 { 943 {
732 uint8_t ch = *cmdbuf_ptr; 944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
733
734 if (s.cnt)
735 {
736 if ((ch & 0xc0) == 0x80)
737 {
738 cmdbuf_ptr++;
739
740 /* continuation */
741 s.reg = (s.reg << 6) | (ch & 0x7f);
742
743 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
744 return s.reg;
745
746 continue;
747 }
748 else
749 {
750 s.cnt = 0;
751 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
752 }
753 }
754
755 if ((ch & 0xc0) == 0xc0)
756 {
757 cmdbuf_ptr++; 945 return *cmdbuf_ptr++;
758 946
759 /* first byte */ 947 wchar_t wc;
760 s.orig = ch; /* for broken encodings */ 948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
761 s.reg = ch; 949
762 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 950 if (len == (size_t)-2)
763 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 951 return NOCHAR;
764 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 952
765 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 953 if (len == (size_t)-1)
766 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 954 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
767 } 955
768 else 956 // assume wchar == unicode
769 { 957 cmdbuf_ptr += len;
770 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
771 return ch; 958 return wc;
772 }
773 } 959 }
774 960
775 return NOCHAR; 961 return NOCHAR;
776} 962}
777 963
778bool
779rxvt_term::pty_fill ()
780{
781 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
782
783 memmove (cmdbuf_base, cmdbuf_ptr, n);
784 cmdbuf_ptr = cmdbuf_base;
785 cmdbuf_endp = cmdbuf_ptr + n;
786
787 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
788
789 if (n > 0)
790 {
791 cmdbuf_endp += n;
792 return true;
793 }
794 else if (n < 0 && errno == EAGAIN)
795 return false;
796
797 rxvt_clean_exit ();
798 exit (EXIT_FAILURE); /* bad order of events? */
799}
800
801void
802rxvt_term::pty_cb (io_watcher &w, short revents)
803{
804 // loop, but don't allow a single term to monopolize us
805 // the number of loops is fully arbitrary, and thus wrong
806 for (int i = 7; i-- && pty_fill (); )
807 {
808 //TODO:
809 /* once we know the shell is running, send the screen size. Again! */
810 //ch = rxvt_cmd_getc(aR); /* wait for something */
811 //rxvt_tt_winsize(cmd_fd, TermWin.ncol, TermWin.nrow, cmd_pid);
812
813 uint32_t ch = NOCHAR;
814
815 for (;;)
816 {
817 if (ch == NOCHAR)
818 ch = next_char ();
819
820 if (ch == NOCHAR) // TODO: improve
821 break;
822
823 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
824 {
825 /* Read a text string from the input buffer */
826 uint32_t buf[BUFSIZ];
827 bool refreshnow = false;
828 int nlines = 0;
829 uint32_t *str = buf;
830
831 *str++ = ch;
832
833 for (;;)
834 {
835 ch = next_char ();
836
837 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
838 break;
839 else
840 {
841 *str++ = ch;
842
843 if (ch == '\n')
844 {
845 nlines++;
846 refresh_count++;
847
848 if (!(Options & Opt_jumpScroll)
849 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
850 {
851 refreshnow = true;
852 ch = NOCHAR;
853 break;
854 }
855 }
856
857 if (str >= buf + BUFSIZ)
858 {
859 ch = NOCHAR;
860 break;
861 }
862 }
863 }
864
865 rxvt_scr_add_lines (this, buf, nlines, str - buf);
866
867 /*
868 * If there have been a lot of new lines, then update the screen
869 * What the heck I'll cheat and only refresh less than every page-full.
870 * the number of pages between refreshes is refresh_limit, which
871 * is incremented here because we must be doing flat-out scrolling.
872 *
873 * refreshing should be correct for small scrolls, because of the
874 * time-out
875 */
876 if (refreshnow)
877 {
878 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
879 refresh_limit++;
880
881 rxvt_scr_refresh (this, refresh_type);
882 }
883
884 }
885 else
886 {
887 switch (ch)
888 {
889 default:
890 rxvt_process_nonprinting (this, ch);
891 break;
892 case C0_ESC: /* escape char */
893 rxvt_process_escape_seq (this);
894 break;
895 /*case 0x9b: */ /* CSI */
896 /* rxvt_process_csi_seq (this); */
897 }
898
899 ch = NOCHAR;
900 }
901 }
902 }
903
904 flush ();
905}
906
907void
908rxvt_term::flush ()
909{
910#ifdef TRANSPARENT
911 if (want_full_refresh)
912 {
913 want_full_refresh = 0;
914 rxvt_scr_clear (this);
915 rxvt_scr_touch (this, False);
916 want_refresh = 1;
917 }
918#endif
919
920 if (want_refresh)
921 {
922 rxvt_scr_refresh (this, refresh_type);
923 rxvt_scrollbar_show (this, 1);
924#ifdef USE_XIM
925 rxvt_IMSendSpot (this);
926#endif
927 }
928
929 if (XPending (Xdisplay)) process_x_events ();
930 XFlush (Xdisplay);
931 if (XPending (Xdisplay)) process_x_events ();
932}
933
934/* rxvt_cmd_getc() - Return next input character */ 964/* rxvt_cmd_getc () - Return next input character */
935/* 965/*
936 * Return the next input character after first passing any keyboard input 966 * Return the next input character after first passing any keyboard input
937 * to the command. 967 * to the command.
938 */ 968 */
939/* INTPROTO */
940uint32_t 969uint32_t
941rxvt_cmd_getc(pR) 970rxvt_term::cmd_getc ()
942{ 971{
943 for (;;) 972 for (;;)
944 { 973 {
945 uint32_t c = R->next_char (); 974 uint32_t c = next_char ();
946 if (c != NOCHAR) 975 if (c != NOCHAR)
947 return c; 976 return c;
948 977
949 // incomplete sequences should occur rarely, still, a better solution 978 // incomplete sequences should occur rarely, still, a better solution
950 // would be preferred. either setjmp/longjmp or better design. 979 // would be preferred. either setjmp/longjmp or better design.
951 fcntl (R->cmd_fd, F_SETFL, 0); 980 fcntl (cmd_fd, F_SETFL, 0);
952 R->pty_fill (); 981 pty_fill ();
953 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 982 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
954 }
955
956#if 0
957#define TIMEOUT_USEC 5000
958 fd_set readfds;
959 int quick_timeout, select_res;
960 int want_motion_time, want_keypress_time;
961 struct timeval value;
962#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
963 struct timeval tp;
964#endif
965
966 for (;;) {
967 /* loop until we can return something */
968
969 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
970 rxvt_tt_write(aR_ NULL, 0);
971
972#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
973 if (R->mouse_slip_wheel_speed) {
974 quick_timeout = 1;
975 if (!R->mouse_slip_wheel_delay--
976 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
977 abs(R->mouse_slip_wheel_speed))) {
978 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
979 R->refresh_type |= SMOOTH_REFRESH;
980 R->want_refresh = 1;
981 } 983 }
982 }
983#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
984#ifdef SELECTION_SCROLLING
985 if (R->pending_scroll_selection) {
986 quick_timeout = 1;
987 if (!R->scroll_selection_delay--
988 && rxvt_scr_page(aR_ R->scroll_selection_dir,
989 R->scroll_selection_lines)) {
990 rxvt_selection_extend(aR_ R->selection_save_x,
991 R->selection_save_y, R->selection_save_state);
992 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
993 R->refresh_type |= SMOOTH_REFRESH;
994 R->want_refresh = 1;
995 }
996 }
997#endif
998#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
999 if (scrollbar_isUp() || scrollbar_isDn()) {
1000 quick_timeout = 1;
1001 if (!R->scroll_arrow_delay--
1002 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
1003 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1004 R->refresh_type |= SMOOTH_REFRESH;
1005 R->want_refresh = 1;
1006 }
1007 }
1008#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1009
1010#ifdef TRANSPARENT
1011 quick_timeout |= R->want_full_refresh;
1012#endif
1013#endif
1014} 984}
1015 985
986#ifdef POINTER_BLANK
1016void 987void
1017rxvt_term::pointer_unblank () 988rxvt_term::pointer_unblank ()
1018{ 989{
1019 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 990 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1020 rxvt_recolour_cursor (this); 991 recolour_cursor ();
1021 992
1022#ifdef POINTER_BLANK
1023 hidden_pointer = 0; 993 hidden_pointer = 0;
1024 994
1025 if (Options & Opt_pointerBlank) 995 if (Options & Opt_pointerBlank)
1026 pointer_ev.start (NOW + pointerBlankDelay); 996 pointer_ev.start (NOW + pointerBlankDelay);
1027#endif
1028} 997}
1029 998
1030#ifdef POINTER_BLANK
1031void 999void
1032rxvt_term::pointer_blank () 1000rxvt_term::pointer_blank ()
1033{ 1001{
1034 pointer_ev.stop ();
1035
1036 if (!(Options & Opt_pointerBlank)) 1002 if (! (Options & Opt_pointerBlank))
1037 return; 1003 return;
1038 1004
1039 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1005 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1040 XFlush (Xdisplay); 1006 XFlush (display->display);
1041 1007
1042 hidden_pointer = 1; 1008 hidden_pointer = 1;
1043} 1009}
1044 1010
1045void 1011void
1046rxvt_term::pointer_cb (time_watcher &w) 1012rxvt_term::pointer_cb (time_watcher &w)
1047{ 1013{
1014 SET_R (this);
1015 SET_LOCALE (locale);
1016
1048 pointer_blank (); 1017 pointer_blank ();
1049} 1018}
1050#endif 1019#endif
1051 1020
1052/* INTPROTO */
1053void 1021void
1054rxvt_mouse_report(pR_ const XButtonEvent *ev) 1022rxvt_term::mouse_report (const XButtonEvent &ev)
1055{ 1023{
1056 int button_number, key_state = 0; 1024 int button_number, key_state = 0;
1057 int x, y; 1025 int x, y;
1058 1026
1059 x = ev->x; 1027 x = ev.x;
1060 y = ev->y; 1028 y = ev.y;
1061 rxvt_pixel_position(aR_ &x, &y); 1029 pixel_position (&x, &y);
1062 1030
1063 if (R->MEvent.button == AnyButton) { 1031 if (MEvent.button == AnyButton)
1032 {
1064 button_number = 3; 1033 button_number = 3;
1065 } else { 1034 }
1035 else
1036 {
1066 button_number = R->MEvent.button - Button1; 1037 button_number = MEvent.button - Button1;
1067 /* add 0x3D for wheel events, like xterm does */ 1038 /* add 0x3D for wheel events, like xterm does */
1068 if (button_number >= 3) 1039 if (button_number >= 3)
1069 button_number += (64 - 3); 1040 button_number += (64 - 3);
1070 } 1041 }
1071 1042
1072 if (R->PrivateModes & PrivMode_MouseX10) { 1043 if (PrivateModes & PrivMode_MouseX10)
1044 {
1073 /* 1045 /*
1074 * do not report ButtonRelease 1046 * do not report ButtonRelease
1075 * no state info allowed 1047 * no state info allowed
1076 */ 1048 */
1077 key_state = 0; 1049 key_state = 0;
1078 if (button_number == 3) 1050 if (button_number == 3)
1079 return; 1051 return;
1080 } else { 1052 }
1053 else
1054 {
1081 /* XTerm mouse reporting needs these values: 1055 /* XTerm mouse reporting needs these values:
1082 * 4 = Shift 1056 * 4 = Shift
1083 * 8 = Meta 1057 * 8 = Meta
1084 * 16 = Control 1058 * 16 = Control
1085 * plus will add in our own Double-Click reporting 1059 * plus will add in our own Double-Click reporting
1086 * 32 = Double Click 1060 * 32 = Double Click
1087 */ 1061 */
1088 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 1062 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1089 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 1063 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1090 + ((R->MEvent.state & ControlMask) ? 16 : 0); 1064 + ((MEvent.state & ControlMask) ? 16 : 0);
1091#ifdef MOUSE_REPORT_DOUBLECLICK 1065#ifdef MOUSE_REPORT_DOUBLECLICK
1092 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1066 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1093#endif 1067#endif
1068
1094 } 1069 }
1095 1070
1096#ifdef DEBUG_MOUSEREPORT 1071#ifdef DEBUG_MOUSEREPORT
1097 fprintf(stderr, "Mouse ["); 1072 fprintf (stderr, "Mouse [");
1098 if (key_state & 16) 1073 if (key_state & 16)
1099 fputc('C', stderr); 1074 fputc ('C', stderr);
1100 if (key_state & 4) 1075 if (key_state & 4)
1101 fputc('S', stderr); 1076 fputc ('S', stderr);
1102 if (key_state & 8) 1077 if (key_state & 8)
1103 fputc('A', stderr); 1078 fputc ('A', stderr);
1104 if (key_state & 32) 1079 if (key_state & 32)
1105 fputc('2', stderr); 1080 fputc ('2', stderr);
1106 fprintf(stderr, "]: <%d>, %d/%d\n", 1081 fprintf (stderr, "]: <%d>, %d/%d\n",
1107 button_number, 1082 button_number,
1108 x + 1, 1083 x + 1,
1109 y + 1); 1084 y + 1);
1110#else 1085#else
1111 rxvt_tt_printf(aR_ "\033[M%c%c%c", 1086 tt_printf ("\033[M%c%c%c",
1112 (32 + button_number + key_state), 1087 (32 + button_number + key_state),
1113 (32 + x + 1), 1088 (32 + x + 1),
1114 (32 + y + 1)); 1089 (32 + y + 1));
1115#endif 1090#endif
1116} 1091}
1117 1092
1118#ifdef USING_W11LIB 1093#ifdef USING_W11LIB
1119/* EXTPROTO */
1120void 1094void
1121rxvt_W11_process_x_event(XEvent *ev) 1095rxvt_W11_process_x_event (XEvent *ev)
1122{ 1096{
1123 rxvt_t *r = rxvt_get_r(); 1097 rxvt_t *r = rxvt_get_r ();
1124 1098
1125 rxvt_process_x_event(aR_ ev); 1099 x_cb (*ev);
1126} 1100}
1127#endif 1101#endif
1128 1102
1129/*{{{ process an X event */ 1103/*{{{ process an X event */
1130/* INTPROTO */
1131void 1104void
1132rxvt_process_x_event(pR_ XEvent *ev) 1105rxvt_term::x_cb (XEvent &ev)
1133{ 1106{
1134 int i, want_timeout; 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
1135 Window unused_root, unused_child; 1142 Window unused_root, unused_child;
1136 int unused_root_x, unused_root_y; 1143 int unused_root_x, unused_root_y;
1137 unsigned int unused_mask; 1144 unsigned int unused_mask;
1138 struct timeval tp;
1139 1145
1140#ifdef DEBUG_X 1146#ifdef DEBUG_X
1141 const char *const eventnames[] = 1147 const char *const eventnames[] =
1142 { /* mason - this matches my system */ 1148 { /* mason - this matches my system */
1143 "", 1149 "",
1144 "", 1150 "",
1145 "KeyPress", 1151 "KeyPress",
1146 "KeyRelease", 1152 "KeyRelease",
1147 "ButtonPress", 1153 "ButtonPress",
1148 "ButtonRelease", 1154 "ButtonRelease",
1149 "MotionNotify", 1155 "MotionNotify",
1150 "EnterNotify", 1156 "EnterNotify",
1151 "LeaveNotify", 1157 "LeaveNotify",
1152 "FocusIn", 1158 "FocusIn",
1153 "FocusOut", 1159 "FocusOut",
1154 "KeymapNotify", 1160 "KeymapNotify",
1155 "Expose", 1161 "Expose",
1156 "GraphicsExpose", 1162 "GraphicsExpose",
1157 "NoExpose", 1163 "NoExpose",
1158 "VisibilityNotify", 1164 "VisibilityNotify",
1159 "CreateNotify", 1165 "CreateNotify",
1160 "DestroyNotify", 1166 "DestroyNotify",
1161 "UnmapNotify", 1167 "UnmapNotify",
1162 "MapNotify", 1168 "MapNotify",
1163 "MapRequest", 1169 "MapRequest",
1164 "ReparentNotify", 1170 "ReparentNotify",
1165 "ConfigureNotify", 1171 "ConfigureNotify",
1166 "ConfigureRequest", 1172 "ConfigureRequest",
1167 "GravityNotify", 1173 "GravityNotify",
1168 "ResizeRequest", 1174 "ResizeRequest",
1169 "CirculateNotify", 1175 "CirculateNotify",
1170 "CirculateRequest", 1176 "CirculateRequest",
1171 "PropertyNotify", 1177 "PropertyNotify",
1172 "SelectionClear", 1178 "SelectionClear",
1173 "SelectionRequest", 1179 "SelectionRequest",
1174 "SelectionNotify", 1180 "SelectionNotify",
1175 "ColormapNotify", 1181 "ColormapNotify",
1176 "ClientMessage", 1182 "ClientMessage",
1177 "MappingNotify" 1183 "MappingNotify"
1178 }; 1184 };
1179 struct tm *ltt;
1180#endif 1185#endif
1181
1182 /*
1183 * check if we need to get the time for any timeouts
1184 */
1185
1186 for (i = NUM_TIMEOUTS; i--; )
1187 if (R->timeout[i].tv_sec) {
1188 want_timeout = 1;
1189 break;
1190 }
1191
1192#ifndef DEBUG_X
1193 if (want_timeout)
1194#endif
1195 (void)gettimeofday(&tp, NULL);
1196 1186
1197#ifdef DEBUG_X 1187#ifdef DEBUG_X
1188 struct timeval tp;
1189 struct tm *ltt;
1190 (void)gettimeofday (&tp, NULL);
1198 ltt = localtime(&(tp.tv_sec)); 1191 ltt = localtime (& (tp.tv_sec));
1199 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->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));
1200#endif 1193#endif
1201 1194
1202 /* X event timeouts */
1203 if (want_timeout)
1204 for (i = NUM_TIMEOUTS; i--; ) {
1205 if (R->timeout[i].tv_sec == 0)
1206 continue;
1207 if ((tp.tv_sec < R->timeout[i].tv_sec)
1208 || (tp.tv_sec == R->timeout[i].tv_sec
1209 && tp.tv_usec < R->timeout[i].tv_usec))
1210 continue;
1211 R->timeout[i].tv_sec = 0;
1212 switch(i) {
1213 case TIMEOUT_INCR:
1214 rxvt_print_error("data loss: timeout on INCR selection paste");
1215 R->selection_wait = Sel_none;
1216 break;
1217 default:
1218 break;
1219 }
1220 }
1221
1222 switch (ev->type) { 1195 switch (ev.type)
1196 {
1223 case KeyPress: 1197 case KeyPress:
1224 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1198 lookup_key (ev.xkey);
1225 break; 1199 break;
1226 1200
1227#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1228 case KeyRelease: 1202 case KeyRelease:
1229 { 1203 {
1230 if (!(ev->xkey.state & ControlMask)) 1204 if (! (ev.xkey.state & ControlMask))
1231 R->mouse_slip_wheel_speed = 0; 1205 mouse_slip_wheel_speed = 0;
1232 else { 1206 else
1233 KeySym ks; 1207 {
1234 1208 KeySym ks;
1209
1235 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1210 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1236 if (ks == XK_Control_L || ks == XK_Control_R) 1211 if (ks == XK_Control_L || ks == XK_Control_R)
1237 R->mouse_slip_wheel_speed = 0; 1212 mouse_slip_wheel_speed = 0;
1238 } 1213 }
1239 break; 1214 break;
1240 } 1215 }
1241#endif 1216#endif
1242 1217
1243 case ButtonPress: 1218 case ButtonPress:
1244 rxvt_button_press(aR_ (XButtonEvent *)ev); 1219 button_press (ev.xbutton);
1245 break; 1220 break;
1246 1221
1247 case ButtonRelease: 1222 case ButtonRelease:
1248 rxvt_button_release(aR_ (XButtonEvent *)ev); 1223 button_release (ev.xbutton);
1249 break; 1224 break;
1250 1225
1251 case ClientMessage: 1226 case ClientMessage:
1252 if (ev->xclient.format == 32 1227 if (ev.xclient.format == 32
1253 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1228 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1254 exit(EXIT_SUCCESS); 1229 destroy ();
1255#ifdef OFFIX_DND 1230#ifdef OFFIX_DND
1256 /* OffiX Dnd (drag 'n' drop) protocol */ 1231 /* OffiX Dnd (drag 'n' drop) protocol */
1257 if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1232 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1258 && (ev->xclient.data.l[0] == DndFile 1233 && (ev.xclient.data.l[0] == DndFile
1259 || ev->xclient.data.l[0] == DndDir 1234 || ev.xclient.data.l[0] == DndDir
1260 || ev->xclient.data.l[0] == DndLink)) { 1235 || ev.xclient.data.l[0] == DndLink))
1261 /* Get Dnd data */ 1236 {
1237 /* Get Dnd data */
1262 Atom ActualType; 1238 Atom ActualType;
1263 int ActualFormat; 1239 int ActualFormat;
1264 unsigned char *data; 1240 unsigned char *data;
1265 unsigned long Size, RemainingBytes; 1241 unsigned long Size, RemainingBytes;
1266 1242
1267 XGetWindowProperty(R->Xdisplay, Xroot, 1243 XGetWindowProperty (display->display, display->root,
1268 R->xa[XA_DNDSELECTION], 1244 xa[XA_DNDSELECTION],
1269 0L, 1000000L, 1245 0L, 1000000L,
1270 False, AnyPropertyType, 1246 False, AnyPropertyType,
1271 &ActualType, &ActualFormat, 1247 &ActualType, &ActualFormat,
1272 &Size, &RemainingBytes, 1248 &Size, &RemainingBytes,
1273 &data); 1249 &data);
1274 XChangeProperty(R->Xdisplay, Xroot, 1250 XChangeProperty (display->display, display->root,
1275 XA_CUT_BUFFER0, XA_STRING, 1251 XA_CUT_BUFFER0, XA_STRING,
1276 8, PropModeReplace, 1252 8, PropModeReplace,
1277 data, STRLEN(data)); 1253 data, STRLEN (data));
1278 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1254 selection_paste (display->root, XA_CUT_BUFFER0, True);
1279 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1280 } 1256 }
1281#endif /* OFFIX_DND */ 1257#endif /* OFFIX_DND */
1282 break; 1258 break;
1283 1259
1284 case MappingNotify: 1260 case MappingNotify:
1285 XRefreshKeyboardMapping(&(ev->xmapping)); 1261 XRefreshKeyboardMapping (& (ev.xmapping));
1286 break; 1262 break;
1287 1263
1288 /* 1264 /*
1289 * XXX: this is not the _current_ arrangement 1265 * XXX: this is not the _current_ arrangement
1290 * Here's my conclusion: 1266 * Here's my conclusion:
1291 * If the window is completely unobscured, use bitblt's 1267 * If the window is completely unobscured, use bitblt's
1292 * to scroll. Even then, they're only used when doing partial 1268 * to scroll. Even then, they're only used when doing partial
1293 * screen scrolling. When partially obscured, we have to fill 1269 * screen scrolling. When partially obscured, we have to fill
1294 * in the GraphicsExpose parts, which means that after each refresh, 1270 * in the GraphicsExpose parts, which means that after each refresh,
1295 * we need to wait for the graphics expose or Noexpose events, 1271 * we need to wait for the graphics expose or Noexpose events,
1296 * which ought to make things real slow! 1272 * which ought to make things real slow!
1297 */ 1273 */
1298 case VisibilityNotify: 1274 case VisibilityNotify:
1299 switch (ev->xvisibility.state) 1275 switch (ev.xvisibility.state)
1300 { 1276 {
1301 case VisibilityUnobscured: 1277 case VisibilityUnobscured:
1302 R->refresh_type = FAST_REFRESH; 1278 refresh_type = FAST_REFRESH;
1303 break; 1279 break;
1304 case VisibilityPartiallyObscured: 1280 case VisibilityPartiallyObscured:
1305 R->refresh_type = SLOW_REFRESH; 1281 refresh_type = SLOW_REFRESH;
1306 break; 1282 break;
1307 default: 1283 default:
1308 R->refresh_type = NO_REFRESH; 1284 refresh_type = NO_REFRESH;
1309 break; 1285 break;
1310 } 1286 }
1311 break; 1287 break;
1312 1288
1313 case FocusIn: 1289 case FocusIn:
1314 if (!R->TermWin.focus) { 1290 if (!TermWin.focus)
1315 R->TermWin.focus = 1; 1291 {
1316 R->want_refresh = 1; 1292 TermWin.focus = 1;
1293 want_refresh = 1;
1317#ifdef USE_XIM 1294#ifdef USE_XIM
1318 if (R->Input_Context != NULL) 1295 if (Input_Context != NULL)
1319 XSetICFocus(R->Input_Context); 1296 XSetICFocus (Input_Context);
1320#endif 1297#endif
1321#ifdef CURSOR_BLINK 1298#ifdef CURSOR_BLINK
1322 if (R->Options & Opt_cursorBlink) 1299 if (Options & Opt_cursorBlink)
1323 R->blink_ev.start (NOW + BLINK_INTERVAL); 1300 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1324#endif 1301#endif
1325 }
1326 break;
1327 1302
1303 }
1304 break;
1305
1328 case FocusOut: 1306 case FocusOut:
1329 if (R->TermWin.focus) { 1307 if (TermWin.focus)
1330 R->TermWin.focus = 0; 1308 {
1331 R->want_refresh = 1; 1309 TermWin.focus = 0;
1310 want_refresh = 1;
1332#ifdef USE_XIM 1311#ifdef USE_XIM
1333 if (R->Input_Context != NULL) 1312 if (Input_Context != NULL)
1334 XUnsetICFocus(R->Input_Context); 1313 XUnsetICFocus (Input_Context);
1335#endif 1314#endif
1336#ifdef CURSOR_BLINK 1315#ifdef CURSOR_BLINK
1337 if (R->Options & Opt_cursorBlink) 1316 if (Options & Opt_cursorBlink)
1338 R->blink_ev.stop (); 1317 cursor_blink_ev.stop ();
1339 R->hidden_cursor = 0; 1318 hidden_cursor = 0;
1340#endif 1319#endif
1341 }
1342 break;
1343 1320
1321 }
1322 break;
1323
1344 case ConfigureNotify: 1324 case ConfigureNotify:
1345 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1325 if (ev.xconfigure.window == TermWin.parent[0])
1346 int height, width; 1326 {
1327 int height, width;
1347 1328
1329 do
1348 do { /* Wrap lots of configures into one */ 1330 { /* Wrap lots of configures into one */
1349 width = ev->xconfigure.width; 1331 width = ev.xconfigure.width;
1350 height = ev->xconfigure.height; 1332 height = ev.xconfigure.height;
1351 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1333 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1352 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1334 }
1353 ConfigureNotify, ev)); 1335 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1336
1354 if (R->szHint.width != width || R->szHint.height != height) { 1337 if (szHint.width != width || szHint.height != height)
1338 {
1355 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1339 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1356 rxvt_resize_all_windows(aR_ (unsigned int)width, 1340 resize_all_windows (width, height, 1);
1357 (unsigned int)height, 1); 1341 }
1358 }
1359#ifdef DEBUG_SIZE 1342#ifdef DEBUG_SIZE
1360 else { 1343 else
1344 {
1361 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE ((stderr, "Size: Not resizing"));
1362 } 1346 }
1363#endif 1347#endif
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (R->Options & Opt_transparent) { 1349 if (Options & Opt_transparent)
1366 rxvt_check_our_parents(aR); 1350 {
1367 if (R->am_transparent) 1351 check_our_parents ();
1368 R->want_full_refresh = 1; 1352 if (am_transparent)
1369 } 1353 want_full_refresh = 1;
1354 }
1370#endif 1355#endif
1371 }
1372 break;
1373 1356
1357 }
1358 break;
1359
1374 case SelectionClear: 1360 case SelectionClear:
1375 rxvt_selection_clear(aR); 1361 display->set_selection_owner (0);
1376 break; 1362 break;
1377 1363
1378 case SelectionNotify: 1364 case SelectionNotify:
1379 if (R->selection_wait == Sel_normal) 1365 if (selection_wait == Sel_normal)
1380 rxvt_selection_paste(aR_ 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 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1371 selection_send (ev.xselectionrequest);
1386 break; 1372 break;
1387 1373
1388 case UnmapNotify: 1374 case UnmapNotify:
1389 R->TermWin.mapped = 0; 1375 TermWin.mapped = 0;
1390 break; 1376#ifdef TEXT_BLINK
1377 text_blink_ev.stop ();
1378#endif
1379 break;
1391 1380
1392 case MapNotify: 1381 case MapNotify:
1393 R->TermWin.mapped = 1; 1382 TermWin.mapped = 1;
1394 break; 1383#ifdef TEXT_BLINK
1395 1384 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1396 case PropertyNotify: 1385#endif
1397 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1398 if (ev->xproperty.state == PropertyNewValue)
1399 rxvt_selection_property(aR_ ev->xproperty.window,
1400 ev->xproperty.atom);
1401 break; 1386 break;
1402 } 1387
1403#ifdef TRANSPARENT 1388#ifdef TRANSPARENT
1404 /*
1405 * if user used some Esetroot compatible prog to set the root bg,
1406 * use the property to determine the pixmap. We use it later on.
1407 */
1408 if (R->xa[XA_XROOTPMAPID] == 0)
1409 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1410 "_XROOTPMAP_ID", False);
1411 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1412 break;
1413 /* FALLTHROUGH */
1414 case ReparentNotify: 1389 case ReparentNotify:
1415 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1390 rootwin_cb (ev);
1416 if (R->am_transparent) 1391 break;
1417 R->want_full_refresh = 1;
1418 }
1419#endif /* TRANSPARENT */ 1392#endif /* TRANSPARENT */
1420 break;
1421 1393
1422 case GraphicsExpose: 1394 case GraphicsExpose:
1423 case Expose: 1395 case Expose:
1424 if (ev->xany.window == R->TermWin.vt) { 1396 if (ev.xany.window == TermWin.vt)
1397 {
1425#ifdef NO_SLOW_LINK_SUPPORT 1398#ifdef NO_SLOW_LINK_SUPPORT
1426 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1399 scr_expose (ev.xexpose.x, ev.xexpose.y,
1427 ev->xexpose.width, ev->xexpose.height, False); 1400 ev.xexpose.width, ev.xexpose.height, False);
1428#else 1401#else
1429 // don't understand this, so commented it out 1402 // don't understand this, so commented it out
1430 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1403 scr_expose (ev.xexpose.x, ev.xexpose.y,
1431 ev->xexpose.width, ev->xexpose.height, False); 1404 ev.xexpose.width, ev.xexpose.height, False);
1432 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1405 //scr_expose (ev.xexpose.x, 0,
1433 // ev->xexpose.width, R->TermWin.height, False); 1406 // ev.xexpose.width, TermWin.height, False);
1434#endif 1407#endif
1435 R->want_refresh = 1; 1408 want_refresh = 1;
1436 } else { 1409 }
1437 XEvent unused_xevent; 1410 else
1411 {
1412 XEvent unused_event;
1438 1413
1439 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1440 Expose, 1415 Expose,
1441 &unused_xevent)) ; 1416 &unused_event)) ;
1442 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1443 GraphicsExpose, 1418 GraphicsExpose,
1444 &unused_xevent)) ; 1419 &unused_event)) ;
1445 if (isScrollbarWindow(ev->xany.window)) { 1420 if (isScrollbarWindow (ev.xany.window))
1446 scrollbar_setIdle(); 1421 {
1447 rxvt_scrollbar_show(aR_ 0); 1422 scrollBar.setIdle ();
1448 } 1423 scrollbar_show (0);
1424 }
1449#ifdef MENUBAR 1425#ifdef MENUBAR
1450 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1451 rxvt_menubar_expose(aR); 1427 menubar_expose ();
1452#endif 1428#endif
1453#ifdef RXVT_GRAPHICS 1429#ifdef RXVT_GRAPHICS
1454 rxvt_Gr_expose(aR_ ev->xany.window); 1430 Gr_expose (ev.xany.window);
1455#endif 1431#endif
1456 }
1457 break;
1458 1432
1433 }
1434 break;
1435
1459 case MotionNotify: 1436 case MotionNotify:
1460#ifdef POINTER_BLANK 1437#ifdef POINTER_BLANK
1461 if (R->hidden_pointer) 1438 if (hidden_pointer)
1462 R->pointer_unblank (); 1439 pointer_unblank ();
1463#endif 1440#endif
1464#if MENUBAR 1441#if MENUBAR
1465 if (isMenuBarWindow(ev->xany.window)) { 1442 if (isMenuBarWindow (ev.xany.window))
1466 rxvt_menubar_control(aR_ &(ev->xbutton)); 1443 {
1467 break; 1444 menubar_control (& (ev.xbutton));
1468 } 1445 break;
1446 }
1469#endif 1447#endif
1470 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1471 break; 1449 break;
1472 1450
1473 if (ev->xany.window == R->TermWin.vt) { 1451 if (ev.xany.window == TermWin.vt)
1452 {
1474 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1475 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1454 {
1476 MotionNotify, ev)) ; 1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1477 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1456 ;
1478 &unused_root, &unused_child, 1457
1479 &unused_root_x, &unused_root_y, 1458 XQueryPointer (display->display, TermWin.vt,
1480 &(ev->xbutton.x), &(ev->xbutton.y), 1459 &unused_root, &unused_child,
1481 &unused_mask); 1460 &unused_root_x, &unused_root_y,
1461 & (ev.xbutton.x), & (ev.xbutton.y),
1462 &unused_mask);
1482#ifdef MOUSE_THRESHOLD 1463#ifdef MOUSE_THRESHOLD
1483 /* deal with a `jumpy' mouse */ 1464 /* deal with a `jumpy' mouse */
1484 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1466 {
1485#endif 1467#endif
1486 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1487 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1469 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1488#ifdef SELECTION_SCROLLING 1470#ifdef SELECTION_SCROLLING
1489 if (ev->xbutton.y<R->TermWin.int_bwidth || 1471 if (ev.xbutton.y < TermWin.int_bwidth
1490 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1491 int dist; 1473 {
1492 1474 int dist;
1493 R->pending_scroll_selection=1; 1475
1494 1476 pending_scroll_selection=1;
1477
1495 /* don't clobber the current delay if we are 1478 /* don't clobber the current delay if we are
1496 * already in the middle of scrolling. 1479 * already in the middle of scrolling.
1497 */ 1480 */
1498 if (R->scroll_selection_delay<=0) 1481 if (scroll_selection_delay<=0)
1499 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1500 1483
1501 /* save the event params so we can highlight 1484 /* save the event params so we can highlight
1502 * the selection in the pending-scroll loop 1485 * the selection in the pending-scroll loop
1503 */ 1486 */
1504 R->selection_save_x=ev->xbutton.x; 1487 selection_save_x=ev.xbutton.x;
1505 R->selection_save_y=ev->xbutton.y; 1488 selection_save_y=ev.xbutton.y;
1506 R->selection_save_state= 1489 selection_save_state=
1507 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1490 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1508 1491
1509 /* calc number of lines to scroll */ 1492 /* calc number of lines to scroll */
1510 if (ev->xbutton.y<R->TermWin.int_bwidth) { 1493 if (ev.xbutton.y<TermWin.int_bwidth)
1511 R->scroll_selection_dir = UP; 1494 {
1512 dist = R->TermWin.int_bwidth - ev->xbutton.y; 1495 scroll_selection_dir = UP;
1513 } 1496 dist = TermWin.int_bwidth - ev.xbutton.y;
1514 else { 1497 }
1515 R->scroll_selection_dir = DN; 1498 else
1516 dist = ev->xbutton.y - 1499 {
1517 (R->TermWin.int_bwidth + R->TermWin.height); 1500 scroll_selection_dir = DN;
1518 } 1501 dist = ev.xbutton.y -
1519 R->scroll_selection_lines=(Pixel2Height(dist)/ 1502 (TermWin.int_bwidth + TermWin.height);
1520 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1503 }
1521 MIN_IT(R->scroll_selection_lines, 1504 scroll_selection_lines= (Pixel2Height (dist)/
1522 SELECTION_SCROLL_MAX_LINES); 1505 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1523 } 1506 MIN_IT (scroll_selection_lines,
1524 else { 1507 SELECTION_SCROLL_MAX_LINES);
1508 }
1509 else
1510 {
1525 /* we are within the text window, so we 1511 /* we are within the text window, so we
1526 * shouldn't be scrolling 1512 * shouldn't be scrolling
1527 */ 1513 */
1528 R->pending_scroll_selection = 0; 1514 pending_scroll_selection = 0;
1529 } 1515 }
1530#endif 1516#endif
1531#ifdef MOUSE_THRESHOLD 1517#ifdef MOUSE_THRESHOLD
1532 } 1518
1519 }
1533#endif 1520#endif
1521
1522 }
1523 }
1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1525 {
1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1527 MotionNotify, &ev)) ;
1528 XQueryPointer (display->display, scrollBar.win,
1529 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y,
1531 & (ev.xbutton.x), & (ev.xbutton.y),
1532 &unused_mask);
1533 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1534 scrollbar_size ());
1535 scr_refresh (refresh_type);
1536 refresh_limit = 0;
1537 scrollbar_show (1);
1538 }
1539 break;
1534 } 1540 }
1535 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1536 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win,
1537 MotionNotify, ev)) ;
1538 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1539 &unused_root, &unused_child,
1540 &unused_root_x, &unused_root_y,
1541 &(ev->xbutton.x), &(ev->xbutton.y),
1542 &unused_mask);
1543 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1544 scrollbar_size());
1545 rxvt_scr_refresh(aR_ R->refresh_type);
1546 R->refresh_limit = 0;
1547 rxvt_scrollbar_show(aR_ 1);
1548 }
1549 break;
1550 }
1551} 1541}
1552 1542
1553/* INTPROTO */
1554void 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
1555rxvt_button_press(pR_ XButtonEvent *ev) 1583rxvt_term::button_press (const XButtonEvent &ev)
1556{ 1584{
1557 int reportmode = 0, clickintime; 1585 int reportmode = 0, clickintime;
1558 1586
1559 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1560 if (!R->bypass_keystate) 1588 if (!bypass_keystate)
1561 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1589 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1562/* 1590 /*
1563 * VT window processing of button press 1591 * VT window processing of button press
1564 */ 1592 */
1565 if (ev->window == R->TermWin.vt) 1593 if (ev.window == TermWin.vt)
1566 { 1594 {
1567#if RXVT_GRAPHICS 1595#if RXVT_GRAPHICS
1568 if (ev->subwindow != None) 1596 if (ev.subwindow != None)
1569 rxvt_Gr_ButtonPress(ev->x, ev->y); 1597 rxvt_Gr_ButtonPress (ev.x, ev.y);
1570 else 1598 else
1571#endif 1599#endif
1600
1601 {
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1603 if (reportmode)
1572 { 1604 {
1573 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1605 /* mouse report from vt window */
1606 /* save the xbutton state (for ButtonRelease) */
1607 MEvent.state = ev.state;
1608#ifdef MOUSE_REPORT_DOUBLECLICK
1609 if (ev.button == MEvent.button && clickintime)
1610 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */
1616 MEvent.clicks = 2;
1617 mouse_report (ev);
1618
1619 /* don't report the release */
1620 MEvent.clicks = 0;
1621 MEvent.button = AnyButton;
1622 }
1623 }
1624 else
1625 {
1626 /* different button, or time expired */
1627 MEvent.clicks = 1;
1628 MEvent.button = ev.button;
1629 mouse_report (ev);
1630 }
1631#else
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634#endif /* MOUSE_REPORT_DOUBLECLICK */
1635
1636 }
1637 else
1638 {
1639 if (ev.button != MEvent.button)
1640 MEvent.clicks = 0;
1641 switch (ev.button)
1642 {
1643 case Button1:
1644 /* allow shift+left click to extend selection */
1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1646 {
1647 if (MEvent.button == Button1 && clickintime)
1648 selection_rotate (ev.x, ev.y);
1649 else
1650 selection_extend (ev.x, ev.y, 1);
1651 }
1652 else
1653 {
1654 if (MEvent.button == Button1 && clickintime)
1655 MEvent.clicks++;
1656 else
1657 MEvent.clicks = 1;
1658
1659 selection_click (MEvent.clicks, ev.x, ev.y);
1660 }
1661
1662 MEvent.button = Button1;
1663 break;
1664
1665 case Button3:
1666 if (MEvent.button == Button3 && clickintime)
1667 selection_rotate (ev.x, ev.y);
1668 else
1669 selection_extend (ev.x, ev.y, 1);
1670 MEvent.button = Button3;
1671 break;
1672 }
1673 }
1674 MEvent.time = ev.time;
1675 return;
1676 }
1677 }
1678
1679 /*
1680 * Scrollbar window processing of button press
1681 */
1682 if (isScrollbarWindow (ev.window))
1683 {
1684 scrollBar.setIdle ();
1685 /*
1686 * Rxvt-style scrollbar:
1687 * move up if mouse is above slider
1688 * move dn if mouse is below slider
1689 *
1690 * XTerm-style scrollbar:
1691 * Move display proportional to pointer location
1692 * pointer near top -> scroll one line
1693 * pointer near bot -> scroll full page
1694 */
1695#ifndef NO_SCROLLBAR_REPORT
1574 if (reportmode) 1696 if (reportmode)
1697 {
1698 /*
1699 * Mouse report disabled scrollbar:
1700 * arrow buttons - send up/down
1701 * click on scrollbar - send pageup/down
1702 */
1703 if ((scrollBar.style == R_SB_NEXT
1704 && scrollbarnext_upButton (ev.y))
1705 || (scrollBar.style == R_SB_RXVT
1706 && scrollbarrxvt_upButton (ev.y)))
1707 tt_printf ("\033[A");
1708 else if ((scrollBar.style == R_SB_NEXT
1709 && scrollbarnext_dnButton (ev.y))
1710 || (scrollBar.style == R_SB_RXVT
1711 && scrollbarrxvt_dnButton (ev.y)))
1712 tt_printf ("\033[B");
1713 else
1714 switch (ev.button)
1575 { 1715 {
1716 case Button2:
1717 tt_printf ("\014");
1718 break;
1719 case Button1:
1720 tt_printf ("\033[6~");
1721 break;
1722 case Button3:
1723 tt_printf ("\033[5~");
1724 break;
1725 }
1726 }
1727 else
1728#endif /* NO_SCROLLBAR_REPORT */
1729
1730 {
1731 char upordown = 0;
1732
1733 if (scrollBar.style == R_SB_NEXT)
1734 {
1735 if (scrollbarnext_upButton (ev.y))
1736 upordown = -1; /* up */
1737 else if (scrollbarnext_dnButton (ev.y))
1738 upordown = 1; /* down */
1739 }
1740 else if (scrollBar.style == R_SB_RXVT)
1741 {
1742 if (scrollbarrxvt_upButton (ev.y))
1743 upordown = -1; /* up */
1744 else if (scrollbarrxvt_dnButton (ev.y))
1745 upordown = 1; /* down */
1746 }
1747 if (upordown)
1748 {
1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1750 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1751#endif
1752 if (scr_page (upordown < 0 ? UP : DN, 1))
1753 {
1754 if (upordown < 0)
1755 scrollBar.setUp ();
1756 else
1757 scrollBar.setDn ();
1758 }
1759 }
1760 else
1761 switch (ev.button)
1762 {
1763 case Button2:
1764 switch (scrollbar_align)
1765 {
1766 case R_SB_ALIGN_TOP:
1767 csrO = 0;
1768 break;
1769 case R_SB_ALIGN_CENTRE:
1770 csrO = (scrollBar.bot - scrollBar.top) / 2;
1771 break;
1772 case R_SB_ALIGN_BOTTOM:
1773 csrO = scrollBar.bot - scrollBar.top;
1774 break;
1775 }
1776 if (scrollBar.style == R_SB_XTERM
1777 || scrollbar_above_slider (ev.y)
1778 || scrollbar_below_slider (ev.y))
1779 scr_move_to ( scrollbar_position (ev.y) - csrO,
1780 scrollbar_size ());
1781 scrollBar.setMotion ();
1782 break;
1783
1784 case Button1:
1785 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1786 csrO = ev.y - scrollBar.top;
1787 /* FALLTHROUGH */
1788
1789 case Button3:
1790 if (scrollBar.style != R_SB_XTERM)
1791 {
1792 if (scrollbar_above_slider (ev.y))
1793# ifdef RXVT_SCROLL_FULL
1794 scr_page (UP, TermWin.nrow - 1);
1795# else
1796 scr_page (UP, TermWin.nrow / 4);
1797# endif
1798 else if (scrollbar_below_slider (ev.y))
1799# ifdef RXVT_SCROLL_FULL
1800 scr_page (DN, TermWin.nrow - 1);
1801# else
1802 scr_page (DN, TermWin.nrow / 4);
1803# endif
1804 else
1805 scrollBar.setMotion ();
1806 }
1807 else
1808 {
1809 scr_page ((ev.button == Button1 ? DN : UP),
1810 (TermWin.nrow
1811 * scrollbar_position (ev.y)
1812 / scrollbar_size ()));
1813 }
1814 break;
1815 }
1816 }
1817 return;
1818 }
1819#if MENUBAR
1820 /*
1821 * Menubar window processing of button press
1822 */
1823 if (isMenuBarWindow (ev.window))
1824 menubar_control (ev);
1825#endif
1826}
1827
1828void
1829rxvt_term::button_release (const XButtonEvent &ev)
1830{
1831 int reportmode = 0;
1832
1833 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate)
1835 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1836
1837 if (scrollbar_isUpDn ())
1838 {
1839 scrollBar.setIdle ();
1840 scrollbar_show (0);
1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1842 refresh_type &= ~SMOOTH_REFRESH;
1843#endif
1844
1845 }
1846#ifdef SELECTION_SCROLLING
1847 pending_scroll_selection=0;
1848#endif
1849 if (ev.window == TermWin.vt)
1850 {
1851#ifdef RXVT_GRAPHICS
1852 if (ev.subwindow != None)
1853 rxvt_Gr_ButtonRelease (ev.x, ev.y);
1854 else
1855#endif
1856
1857 {
1858 if (reportmode)
1859 {
1576 /* mouse report from vt window */ 1860 /* mouse report from vt window */
1577 /* save the xbutton state (for ButtonRelease) */ 1861 /* don't report release of wheel "buttons" */
1578 R->MEvent.state = ev->state; 1862 if (ev.button >= 4)
1863 return;
1579#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1580 if (ev->button == R->MEvent.button && clickintime) 1865 /* only report the release of 'slow' single clicks */
1866 if (MEvent.button != AnyButton
1867 && (ev.button != MEvent.button
1868 || (ev.time - MEvent.time
1869 > MULTICLICK_TIME / 2)))
1581 { 1870 {
1582 /* same button, within alloted time */ 1871 MEvent.clicks = 0;
1583 R->MEvent.clicks++; 1872 MEvent.button = AnyButton;
1584 if (R->MEvent.clicks > 1) 1873 mouse_report (ev);
1585 {
1586 /* only report double clicks */
1587 R->MEvent.clicks = 2;
1588 rxvt_mouse_report(aR_ ev);
1589
1590 /* don't report the release */
1591 R->MEvent.clicks = 0;
1592 R->MEvent.button = AnyButton;
1593 }
1594 }
1595 else
1596 { 1874 }
1597 /* different button, or time expired */ 1875#else /* MOUSE_REPORT_DOUBLECLICK */
1598 R->MEvent.clicks = 1; 1876 MEvent.button = AnyButton;
1599 R->MEvent.button = ev->button; 1877 mouse_report (ev);
1600 rxvt_mouse_report(aR_ ev);
1601 }
1602#else
1603 R->MEvent.button = ev->button;
1604 rxvt_mouse_report(aR_ ev);
1605#endif /* MOUSE_REPORT_DOUBLECLICK */ 1878#endif /* MOUSE_REPORT_DOUBLECLICK */
1606 }
1607 else
1608 { 1879 return;
1609 if (ev->button != R->MEvent.button)
1610 R->MEvent.clicks = 0;
1611 switch (ev->button)
1612 {
1613 case Button1:
1614 if (R->MEvent.button == Button1 && clickintime)
1615 R->MEvent.clicks++;
1616 else
1617 R->MEvent.clicks = 1;
1618 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);
1619 R->MEvent.button = Button1;
1620 break;
1621
1622 case Button3:
1623 if (R->MEvent.button == Button3 && clickintime)
1624 rxvt_selection_rotate(aR_ ev->x, ev->y);
1625 else
1626 rxvt_selection_extend(aR_ ev->x, ev->y, 1);
1627 R->MEvent.button = Button3;
1628 break;
1629 } 1880 }
1630 }
1631 R->MEvent.time = ev->time;
1632 return;
1633 }
1634 }
1635
1636/*
1637 * Scrollbar window processing of button press
1638 */
1639 if (isScrollbarWindow(ev->window))
1640 {
1641 scrollbar_setIdle();
1642 /*
1643 * Rxvt-style scrollbar:
1644 * move up if mouse is above slider
1645 * move dn if mouse is below slider
1646 *
1647 * XTerm-style scrollbar:
1648 * Move display proportional to pointer location
1649 * pointer near top -> scroll one line
1650 * pointer near bot -> scroll full page
1651 */
1652#ifndef NO_SCROLLBAR_REPORT
1653 if (reportmode) {
1654 /*
1655 * Mouse report disabled scrollbar:
1656 * arrow buttons - send up/down
1657 * click on scrollbar - send pageup/down
1658 */
1659 if ((R->scrollBar.style == R_SB_NEXT
1660 && scrollbarnext_upButton(ev->y))
1661 || (R->scrollBar.style == R_SB_RXVT
1662 && scrollbarrxvt_upButton(ev->y)))
1663 rxvt_tt_printf(aR_ "\033[A");
1664 else if ((R->scrollBar.style == R_SB_NEXT
1665 && scrollbarnext_dnButton(ev->y))
1666 || (R->scrollBar.style == R_SB_RXVT
1667 && scrollbarrxvt_dnButton(ev->y)))
1668 rxvt_tt_printf(aR_ "\033[B");
1669 else
1670 switch (ev->button) {
1671 case Button2:
1672 rxvt_tt_printf(aR_ "\014");
1673 break;
1674 case Button1:
1675 rxvt_tt_printf(aR_ "\033[6~");
1676 break;
1677 case Button3:
1678 rxvt_tt_printf(aR_ "\033[5~");
1679 break;
1680 }
1681 }
1682 else
1683#endif /* NO_SCROLLBAR_REPORT */
1684 {
1685 char upordown = 0;
1686
1687 if (R->scrollBar.style == R_SB_NEXT) {
1688 if (scrollbarnext_upButton(ev->y))
1689 upordown = -1; /* up */
1690 else if (scrollbarnext_dnButton(ev->y))
1691 upordown = 1; /* down */
1692 } else if (R->scrollBar.style == R_SB_RXVT) {
1693 if (scrollbarrxvt_upButton(ev->y))
1694 upordown = -1; /* up */
1695 else if (scrollbarrxvt_dnButton(ev->y))
1696 upordown = 1; /* down */
1697 }
1698 if (upordown) {
1699#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1700 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1701#endif
1702 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1703 if (upordown < 0)
1704 scrollbar_setUp();
1705 else
1706 scrollbar_setDn();
1707 }
1708 } else
1709 switch (ev->button) {
1710 case Button2:
1711 switch (R->scrollbar_align) {
1712 case R_SB_ALIGN_TOP:
1713 R->csrO = 0;
1714 break;
1715 case R_SB_ALIGN_CENTRE:
1716 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1717 break;
1718 case R_SB_ALIGN_BOTTOM:
1719 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1720 break;
1721 }
1722 if (R->scrollBar.style == R_SB_XTERM
1723 || scrollbar_above_slider(ev->y)
1724 || scrollbar_below_slider(ev->y))
1725 rxvt_scr_move_to(aR_
1726 scrollbar_position(ev->y) - R->csrO,
1727 scrollbar_size());
1728 scrollbar_setMotion();
1729 break;
1730
1731 case Button1:
1732 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1733 R->csrO = ev->y - R->scrollBar.top;
1734 /* FALLTHROUGH */
1735
1736 case Button3:
1737 if (R->scrollBar.style != R_SB_XTERM) {
1738 if (scrollbar_above_slider(ev->y))
1739# ifdef RXVT_SCROLL_FULL
1740 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1);
1741# else
1742 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4);
1743# endif
1744 else if (scrollbar_below_slider(ev->y))
1745# ifdef RXVT_SCROLL_FULL
1746 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1747# else
1748 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1749# endif
1750 else
1751 scrollbar_setMotion();
1752 } else {
1753 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1754 (R->TermWin.nrow
1755 * scrollbar_position(ev->y)
1756 / scrollbar_size()));
1757 }
1758 break;
1759 }
1760 }
1761 return;
1762 }
1763#if MENUBAR
1764 /*
1765 * Menubar window processing of button press
1766 */
1767 if (isMenuBarWindow(ev->window))
1768 rxvt_menubar_control(aR_ ev);
1769#endif
1770}
1771
1772/* INTPROTO */
1773void
1774rxvt_button_release(pR_ XButtonEvent *ev)
1775{
1776 int reportmode = 0;
1777
1778 R->csrO = 0; /* reset csr Offset */
1779 if (!R->bypass_keystate)
1780 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1781
1782 if (scrollbar_isUpDn()) {
1783 scrollbar_setIdle();
1784 rxvt_scrollbar_show(aR_ 0);
1785#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1786 R->refresh_type &= ~SMOOTH_REFRESH;
1787#endif
1788 }
1789#ifdef SELECTION_SCROLLING
1790 R->pending_scroll_selection=0;
1791#endif
1792 if (ev->window == R->TermWin.vt)
1793 {
1794#ifdef RXVT_GRAPHICS
1795 if (ev->subwindow != None)
1796 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1797 else
1798#endif
1799 { 1881 /*
1800 if (reportmode)
1801 {
1802 /* mouse report from vt window */
1803 /* don't report release of wheel "buttons" */
1804 if (ev->button >= 4)
1805 return;
1806#ifdef MOUSE_REPORT_DOUBLECLICK
1807 /* only report the release of 'slow' single clicks */
1808 if (R->MEvent.button != AnyButton
1809 && (ev->button != R->MEvent.button
1810 || (ev->time - R->MEvent.time
1811 > MULTICLICK_TIME / 2)))
1812 {
1813 R->MEvent.clicks = 0;
1814 R->MEvent.button = AnyButton;
1815 rxvt_mouse_report(aR_ ev);
1816 }
1817#else /* MOUSE_REPORT_DOUBLECLICK */
1818 R->MEvent.button = AnyButton;
1819 rxvt_mouse_report(aR_ ev);
1820#endif /* MOUSE_REPORT_DOUBLECLICK */
1821 return;
1822 }
1823 /*
1824 * dumb hack to compensate for the failure of click-and-drag 1882 * dumb hack to compensate for the failure of click-and-drag
1825 * when overriding mouse reporting 1883 * when overriding mouse reporting
1826 */ 1884 */
1827 if (R->PrivateModes & PrivMode_mouse_report 1885 if (PrivateModes & PrivMode_mouse_report
1828 && R->bypass_keystate 1886 && bypass_keystate
1829 && ev->button == Button1 && R->MEvent.clicks <= 1) 1887 && ev.button == Button1 && MEvent.clicks <= 1)
1830 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1888 selection_extend (ev.x, ev.y, 0);
1831 1889
1832 switch (ev->button) { 1890 switch (ev.button)
1891 {
1833 case Button1: 1892 case Button1:
1834 case Button3: 1893 case Button3:
1835 rxvt_selection_make(aR_ ev->time); 1894 selection_make (ev.time);
1836 break; 1895 break;
1837 case Button2: 1896 case Button2:
1838 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1897 selection_request (ev.time, ev.x, ev.y);
1839 break; 1898 break;
1840#ifdef MOUSE_WHEEL 1899#ifdef MOUSE_WHEEL
1841 case Button4: 1900 case Button4:
1842 case Button5: 1901 case Button5:
1843 { 1902 {
1844 int i, v; 1903 int i;
1904 page_dirn v;
1845 1905
1846 v = (ev->button == Button4) ? UP : DN; 1906 v = (ev.button == Button4) ? UP : DN;
1847 if (ev->state & ShiftMask) 1907 if (ev.state & ShiftMask)
1848 i = 1; 1908 i = 1;
1849 else if ((R->Options & Opt_mouseWheelScrollPage)) 1909 else if ((Options & Opt_mouseWheelScrollPage))
1850 i = R->TermWin.nrow - 1; 1910 i = TermWin.nrow - 1;
1851 else 1911 else
1852 i = 5; 1912 i = 5;
1853# ifdef MOUSE_SLIP_WHEELING 1913# ifdef MOUSE_SLIP_WHEELING
1854 if (ev->state & ControlMask) 1914 if (ev.state & ControlMask)
1855 { 1915 {
1856 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1916 mouse_slip_wheel_speed += (v ? -1 : 1);
1857 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1858 } 1918 }
1859# endif 1919# endif
1860# ifdef JUMP_MOUSE_WHEEL 1920# ifdef JUMP_MOUSE_WHEEL
1861 rxvt_scr_page(aR_ v, i); 1921 scr_page (v, i);
1862 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1922 scr_refresh (SMOOTH_REFRESH);
1863 rxvt_scrollbar_show(aR_ 1); 1923 scrollbar_show (1);
1864# else 1924# else
1865 for (; i--;) 1925 while (i--)
1866 { 1926 {
1867 rxvt_scr_page(aR_ v, 1); 1927 scr_page (v, 1);
1868 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1928 scr_refresh (SMOOTH_REFRESH);
1869 rxvt_scrollbar_show(aR_ 1); 1929 scrollbar_show (1);
1870 } 1930 }
1871# endif 1931# endif
1872 } 1932
1873 break; 1933 }
1934 break;
1874#endif 1935#endif
1875 } 1936
1876 } 1937 }
1877 } 1938 }
1939 }
1878#ifdef MENUBAR 1940#ifdef MENUBAR
1879 else if (isMenuBarWindow(ev->window)) 1941 else if (isMenuBarWindow (ev.window))
1880 rxvt_menubar_control(aR_ ev); 1942 menubar_control (ev);
1881#endif 1943#endif
1882} 1944}
1883 1945
1884 1946
1885#ifdef TRANSPARENT 1947#ifdef TRANSPARENT
1886/* 1948/*
1887 * Check our parents are still who we think they are. 1949 * Check our parents are still who we think they are.
1888 * Do transparency updates if required 1950 * Do transparency updates if required
1889 */ 1951 */
1890/* EXTPROTO */
1891int 1952int
1892rxvt_check_our_parents(pR) 1953rxvt_term::check_our_parents ()
1893{ 1954{
1894 int i, pchanged, aformat, have_pixmap, rootdepth; 1955 int i, pchanged, aformat, have_pixmap, rootdepth;
1895 unsigned long nitems, bytes_after; 1956 unsigned long nitems, bytes_after;
1896 Atom atype; 1957 Atom atype;
1897 unsigned char *prop = NULL; 1958 unsigned char *prop = NULL;
1898 Window root, oldp, *list; 1959 Window root, oldp, *list;
1899 Pixmap rootpixmap = None; 1960 Pixmap rootpixmap = None;
1900 XWindowAttributes wattr, wrootattr; 1961 XWindowAttributes wattr, wrootattr;
1901 1962
1902 pchanged = 0; 1963 pchanged = 0;
1903 1964
1904 if (!(R->Options & Opt_transparent)) 1965 if (! (Options & Opt_transparent))
1905 return pchanged; /* Don't try any more */ 1966 return pchanged; /* Don't try any more */
1906 1967
1907 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1968 XGetWindowAttributes (display->display, display->root, &wrootattr);
1908 rootdepth = wrootattr.depth; 1969 rootdepth = wrootattr.depth;
1909 1970
1910 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1911 if (rootdepth != wattr.depth) { 1972 if (rootdepth != wattr.depth)
1973 {
1912 if (R->am_transparent) { 1974 if (am_transparent)
1975 {
1913 pchanged = 1; 1976 pchanged = 1;
1914 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1977 XSetWindowBackground (display->display, TermWin.vt,
1915 R->PixColors[Color_bg]); 1978 PixColors[Color_bg]);
1916 R->am_transparent = R->am_pixmap_trans = 0; 1979 am_transparent = am_pixmap_trans = 0;
1917 } 1980 }
1918 return pchanged; /* Don't try any more */ 1981 return pchanged; /* Don't try any more */
1919 } 1982 }
1920 1983
1921/* 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. */
1922 XSync(R->Xdisplay, False); 1985 XSync (display->display, False);
1923 1986
1924/* 1987 /*
1925 * Make the frame window set by the window manager have 1988 * Make the frame window set by the window manager have
1926 * the root background. Some window managers put multiple nested frame 1989 * the root background. Some window managers put multiple nested frame
1927 * 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.
1928 */ 1991 */
1929 i = (R->xa[XA_XROOTPMAPID] != 0 1992 i = (xa[XA_XROOTPMAPID] != 0
1930 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1931 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1932 &nitems, &bytes_after, &prop) == Success)); 1995 &nitems, &bytes_after, &prop) == Success));
1933 if (!i || prop == NULL) 1996 if (!i || prop == NULL)
1934 have_pixmap = 0; 1997 have_pixmap = 0;
1935 else { 1998 else
1999 {
1936 have_pixmap = 1; 2000 have_pixmap = 1;
1937 rootpixmap = *((Pixmap *)prop); 2001 rootpixmap = * ((Pixmap *)prop);
1938 XFree(prop); 2002 XFree (prop);
1939 } 2003 }
1940 if (have_pixmap) { 2004 if (have_pixmap)
1941/* 2005 {
2006 /*
1942 * Copy Xroot pixmap transparency 2007 * Copy display->root pixmap transparency
1943 */ 2008 */
1944 int sx, sy, nx, ny; 2009 int sx, sy, nx, ny;
1945 unsigned int nw, nh; 2010 unsigned int nw, nh;
1946 Window cr; 2011 Window cr;
1947 XImage *image; 2012 XImage *image;
1948 GC gc; 2013 GC gc;
1949 XGCValues gcvalue; 2014 XGCValues gcvalue;
1950 2015
1951 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1952 0, 0, &sx, &sy, &cr); 2017 0, 0, &sx, &sy, &cr);
1953 nw = (unsigned int)R->szHint.width; 2018 nw = (unsigned int)szHint.width;
1954 nh = (unsigned int)R->szHint.height; 2019 nh = (unsigned int)szHint.height;
1955 nx = ny = 0; 2020 nx = ny = 0;
1956 if (sx < 0) { 2021 if (sx < 0)
2022 {
1957 nw += sx; 2023 nw += sx;
1958 nx = -sx; 2024 nx = -sx;
1959 sx = 0; 2025 sx = 0;
1960 } 2026 }
1961 if (sy < 0) { 2027 if (sy < 0)
2028 {
1962 nh += sy; 2029 nh += sy;
1963 ny = -sy; 2030 ny = -sy;
1964 sy = 0; 2031 sy = 0;
1965 } 2032 }
1966 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1967 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1968 R->allowedxerror = -1; 2035 allowedxerror = -1;
1969 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1970 ZPixmap); 2037 ZPixmap);
1971 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1972 /* XXX: may need a delay here? */ 2039 /* XXX: may need a delay here? */
1973 R->allowedxerror = 0; 2040 allowedxerror = 0;
1974 if (image == NULL) { 2041 if (image == NULL)
2042 {
1975 if (R->am_transparent && R->am_pixmap_trans) { 2043 if (am_transparent && am_pixmap_trans)
1976 pchanged = 1; 2044 {
2045 pchanged = 1;
2046 if (TermWin.pixmap != None)
2047 {
2048 XFreePixmap (display->display, TermWin.pixmap);
2049 TermWin.pixmap = None;
2050 }
2051 }
2052 am_pixmap_trans = 0;
2053 }
2054 else
2055 {
1977 if (R->TermWin.pixmap != None) { 2056 if (TermWin.pixmap != None)
1978 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 2057 XFreePixmap (display->display, TermWin.pixmap);
1979 R->TermWin.pixmap = None; 2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1980 } 2059 (unsigned int)szHint.width,
2060 (unsigned int)szHint.height,
2061 (unsigned int)image->depth);
2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2064 nx, ny, (unsigned int)image->width,
2065 (unsigned int)image->height);
2066 XFreeGC (display->display, gc);
2067 XDestroyImage (image);
2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2069 TermWin.pixmap);
2070 if (!am_transparent || !am_pixmap_trans)
2071 pchanged = 1;
2072 am_transparent = am_pixmap_trans = 1;
2073 }
1981 } 2074 }
1982 R->am_pixmap_trans = 0;
1983 } else {
1984 if (R->TermWin.pixmap != None)
1985 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1986 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
1987 (unsigned int)R->szHint.width,
1988 (unsigned int)R->szHint.height,
1989 (unsigned int)image->depth);
1990 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue);
1991 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0,
1992 nx, ny, (unsigned int)image->width,
1993 (unsigned int)image->height);
1994 XFreeGC(R->Xdisplay, gc);
1995 XDestroyImage(image);
1996 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
1997 R->TermWin.pixmap);
1998 if (!R->am_transparent || !R->am_pixmap_trans)
1999 pchanged = 1;
2000 R->am_transparent = R->am_pixmap_trans = 1;
2001 }
2002 }
2003 if (!R->am_pixmap_trans) { 2075 if (!am_pixmap_trans)
2076 {
2004 unsigned int n; 2077 unsigned int n;
2005/* 2078 /*
2006 * InheritPixmap transparency 2079 * InheritPixmap transparency
2007 */ 2080 */
2008 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2009 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2010 i++) { 2083 i++)
2084 {
2011 oldp = R->TermWin.parent[i]; 2085 oldp = TermWin.parent[i];
2012 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 2086 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2013 &R->TermWin.parent[i], &list, &n); 2087 &TermWin.parent[i], &list, &n);
2014 XFree(list); 2088 XFree (list);
2015 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2016 if (R->TermWin.parent[i] == Xroot) { 2090 if (TermWin.parent[i] == display->root)
2017 if (oldp != None) 2091 {
2018 pchanged = 1; 2092 if (oldp != None)
2019 break; 2093 pchanged = 1;
2020 } 2094 break;
2095 }
2021 if (oldp != R->TermWin.parent[i]) 2096 if (oldp != TermWin.parent[i])
2022 pchanged = 1; 2097 pchanged = 1;
2023 } 2098 }
2024 n = 0; 2099 n = 0;
2025 if (pchanged) { 2100 if (pchanged)
2101 {
2026 for (; n < (unsigned int)i; n++) { 2102 for (; n < (unsigned int)i; n++)
2103 {
2027 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2028 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"));
2029 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2106 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2107 {
2030 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2031 break; 2109 break;
2032 } 2110 }
2033 } 2111 }
2034 } 2112 }
2035 if (n > (int)(sizeof(R->TermWin.parent) 2113 if (n > (int) (sizeof (TermWin.parent)
2036 / sizeof(R->TermWin.parent[0]))) { 2114 / sizeof (TermWin.parent[0])))
2115 {
2037 D_X((stderr, "InheritPixmap Turning off")); 2116 D_X ((stderr, "InheritPixmap Turning off"));
2038 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2117 XSetWindowBackground (display->display, TermWin.parent[0],
2039 R->PixColors[Color_fg]); 2118 PixColors[Color_fg]);
2040 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2119 XSetWindowBackground (display->display, TermWin.vt,
2041 R->PixColors[Color_bg]); 2120 PixColors[Color_bg]);
2042 R->am_transparent = 0; 2121 am_transparent = 0;
2043 /* XXX: also turn off Opt_transparent? */ 2122 /* XXX: also turn off Opt_transparent? */
2044 } else { 2123 }
2124 else
2125 {
2045 /* wait (an arbitrary period) for the WM to do its thing 2126 /* wait (an arbitrary period) for the WM to do its thing
2046 * needed for fvwm2.2.2 (and before?) */ 2127 * needed for fvwm2.2.2 (and before?) */
2047# ifdef HAVE_NANOSLEEP 2128# ifdef HAVE_NANOSLEEP
2048 struct timespec rqt; 2129 struct timespec rqt;
2049 2130
2050 rqt.tv_sec = 1; 2131 rqt.tv_sec = 1;
2051 rqt.tv_nsec = 0; 2132 rqt.tv_nsec = 0;
2052 nanosleep(&rqt, NULL); 2133 nanosleep (&rqt, NULL);
2053# else 2134# else
2054 sleep(1); 2135 sleep (1);
2055# endif 2136# endif
2056 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2057 for (n = 0; n < (unsigned int)i; n++) 2138 for (n = 0; n < (unsigned int)i; n++)
2058 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2059 ParentRelative); 2140 ParentRelative);
2060 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2061 ParentRelative); 2142 ParentRelative);
2062 R->am_transparent = 1; 2143 am_transparent = 1;
2063 } 2144 }
2064 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2065 R->TermWin.parent[i] = None; 2146 TermWin.parent[i] = None;
2066 } 2147 }
2067 return pchanged; 2148 return pchanged;
2068} 2149}
2069#endif 2150#endif
2070 2151
2071/*}}} */ 2152/*}}} */
2072 2153
2073/*{{{ print pipe */ 2154/*{{{ print pipe */
2074/*----------------------------------------------------------------------*/ 2155/*----------------------------------------------------------------------*/
2075#ifdef PRINTPIPE 2156#ifdef PRINTPIPE
2076/* EXTPROTO */ 2157FILE *
2077FILE *
2078rxvt_popen_printer(pR) 2158rxvt_term::popen_printer ()
2079{ 2159{
2080 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2160 FILE *stream = popen (rs[Rs_print_pipe], "w");
2081 2161
2082 if (stream == NULL) 2162 if (stream == NULL)
2083 rxvt_print_error("can't open printer pipe"); 2163 rxvt_print_error ("can't open printer pipe");
2084 return stream; 2164 return stream;
2085} 2165}
2086 2166
2087/* EXTPROTO */
2088int 2167int
2089rxvt_pclose_printer(FILE *stream) 2168rxvt_term::pclose_printer (FILE *stream)
2090{ 2169{
2091 fflush(stream); 2170 fflush (stream);
2092/* pclose() reported not to work on SunOS 4.1.3 */ 2171 /* pclose () reported not to work on SunOS 4.1.3 */
2093# if defined (__sun__) /* TODO: RESOLVE THIS */ 2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2094/* pclose works provided SIGCHLD handler uses waitpid */ 2173 /* pclose works provided SIGCHLD handler uses waitpid */
2095 return pclose(stream); /* return fclose (stream); */ 2174 return pclose (stream); /* return fclose (stream); */
2096# else 2175# else
2097 return pclose(stream); 2176 return pclose (stream);
2098# endif 2177# endif
2099} 2178}
2100 2179
2101/* 2180/*
2102 * simulate attached vt100 printer 2181 * simulate attached vt100 printer
2103 */ 2182 */
2104/* INTPROTO */
2105void 2183void
2106rxvt_process_print_pipe(pR) 2184rxvt_term::process_print_pipe ()
2107{ 2185{
2108 int done; 2186 int done;
2109 FILE *fd; 2187 FILE *fd;
2110 2188
2111 if ((fd = rxvt_popen_printer(aR)) == NULL) 2189 if ((fd = popen_printer ()) == NULL)
2112 return; 2190 return;
2113 2191
2114/* 2192 /*
2115 * Send all input to the printer until either ESC[4i or ESC[?4i 2193 * Send all input to the printer until either ESC[4i or ESC[?4i
2116 * is received. 2194 * is received.
2117 */ 2195 */
2118 for (done = 0; !done;) { 2196 for (done = 0; !done;)
2197 {
2119 unsigned char buf[8]; 2198 unsigned char buf[8];
2120 unsigned char ch; 2199 unsigned char ch;
2121 unsigned int i, len; 2200 unsigned int i, len;
2122 2201
2123 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2202 if ((ch = cmd_getc ()) != C0_ESC)
2203 {
2124 if (putc(ch, fd) == EOF) 2204 if (putc (ch, fd) == EOF)
2125 break; /* done = 1 */ 2205 break; /* done = 1 */
2126 } else { 2206 }
2207 else
2208 {
2127 len = 0; 2209 len = 0;
2128 buf[len++] = ch; 2210 buf[len++] = ch;
2129 2211
2130 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2212 if ((buf[len++] = cmd_getc ()) == '[')
2131 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2213 {
2132 buf[len++] = '?'; 2214 if ((ch = cmd_getc ()) == '?')
2133 ch = rxvt_cmd_getc(aR); 2215 {
2134 } 2216 buf[len++] = '?';
2217 ch = cmd_getc ();
2218 }
2135 if ((buf[len++] = ch) == '4') { 2219 if ((buf[len++] = ch) == '4')
2220 {
2136 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2221 if ((buf[len++] = cmd_getc ()) == 'i')
2137 break; /* done = 1 */ 2222 break; /* done = 1 */
2138 } 2223 }
2224 }
2225 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF)
2227 {
2228 done = 1;
2229 break;
2230 }
2231 }
2139 } 2232 }
2140 for (i = 0; i < len; i++)
2141 if (putc(buf[i], fd) == EOF) {
2142 done = 1;
2143 break;
2144 }
2145 }
2146 }
2147 rxvt_pclose_printer(fd); 2233 pclose_printer (fd);
2148} 2234}
2149#endif /* PRINTPIPE */ 2235#endif /* PRINTPIPE */
2150/*}}} */ 2236/*}}} */
2151 2237
2152/* *INDENT-OFF* */ 2238/* *INDENT-OFF* */
2153enum { 2239enum {
2154 C1_40 = 0x40, 2240 C1_40 = 0x40,
2155 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2241 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2156 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2242 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2157 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2243 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2158 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2244 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2159}; 2245};
2160/* *INDENT-ON* */ 2246/* *INDENT-ON* */
2161 2247
2162/*{{{ process non-printing single characters */ 2248/*{{{ process non-printing single characters */
2163/* INTPROTO */
2164void 2249void
2165rxvt_process_nonprinting(pR_ unsigned char ch) 2250rxvt_term::process_nonprinting (unsigned char ch)
2166{ 2251{
2167 switch (ch) { 2252 switch (ch)
2253 {
2168 case C0_ENQ: /* terminal Status */ 2254 case C0_ENQ: /* terminal Status */
2169 if (R->rs[Rs_answerbackstring]) 2255 if (rs[Rs_answerbackstring])
2170 rxvt_tt_write(aR_ 2256 tt_write (
2171 (const unsigned char *)R->rs[Rs_answerbackstring], 2257 (const unsigned char *)rs[Rs_answerbackstring],
2172 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2258 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2173 else 2259 else
2174 rxvt_tt_write(aR_ (unsigned char *)VT100_ANS, 2260 tt_write ((unsigned char *)VT100_ANS,
2175 (unsigned int)STRLEN(VT100_ANS)); 2261 (unsigned int)STRLEN (VT100_ANS));
2176 break; 2262 break;
2177 case C0_BEL: /* bell */ 2263 case C0_BEL: /* bell */
2178 rxvt_scr_bell(aR); 2264 scr_bell ();
2179 break; 2265 break;
2180 case C0_BS: /* backspace */ 2266 case C0_BS: /* backspace */
2181 rxvt_scr_backspace(aR); 2267 scr_backspace ();
2182 break; 2268 break;
2183 case C0_HT: /* tab */ 2269 case C0_HT: /* tab */
2184 rxvt_scr_tab(aR_ 1); 2270 scr_tab (1);
2185 break; 2271 break;
2186 case C0_CR: /* carriage return */ 2272 case C0_CR: /* carriage return */
2187 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2273 scr_gotorc (0, 0, R_RELATIVE);
2188 break; 2274 break;
2189 case C0_VT: /* vertical tab, form feed */ 2275 case C0_VT: /* vertical tab, form feed */
2190 case C0_FF: 2276 case C0_FF:
2191 case C0_LF: /* line feed */ 2277 case C0_LF: /* line feed */
2192 rxvt_scr_index(aR_ UP); 2278 scr_index (UP);
2193 break; 2279 break;
2194 case C0_SO: /* shift out - acs */ 2280 case C0_SO: /* shift out - acs */
2195 rxvt_scr_charset_choose(aR_ 1); 2281 scr_charset_choose (1);
2196 break; 2282 break;
2197 case C0_SI: /* shift in - acs */ 2283 case C0_SI: /* shift in - acs */
2198 rxvt_scr_charset_choose(aR_ 0); 2284 scr_charset_choose (0);
2199 break; 2285 break;
2200 } 2286 }
2201} 2287}
2202/*}}} */ 2288/*}}} */
2203 2289
2204 2290
2205/*{{{ process VT52 escape sequences */ 2291/*{{{ process VT52 escape sequences */
2206/* INTPROTO */
2207void 2292void
2208rxvt_process_escape_vt52(pR_ unsigned char ch) 2293rxvt_term::process_escape_vt52 (unsigned char ch)
2209{ 2294{
2210 int row, col; 2295 int row, col;
2296
2297 switch (ch)
2211 2298 {
2212 switch (ch) {
2213 case 'A': /* cursor up */ 2299 case 'A': /* cursor up */
2214 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2300 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2215 break; 2301 break;
2216 case 'B': /* cursor down */ 2302 case 'B': /* cursor down */
2217 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2303 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2218 break; 2304 break;
2219 case 'C': /* cursor right */ 2305 case 'C': /* cursor right */
2220 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2306 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2221 break; 2307 break;
2222 case 'D': /* cursor left */ 2308 case 'D': /* cursor left */
2223 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2309 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2224 break; 2310 break;
2225 case 'H': /* cursor home */ 2311 case 'H': /* cursor home */
2226 rxvt_scr_gotorc(aR_ 0, 0, 0); 2312 scr_gotorc (0, 0, 0);
2227 break; 2313 break;
2228 case 'I': /* cursor up and scroll down if needed */ 2314 case 'I': /* cursor up and scroll down if needed */
2229 rxvt_scr_index(aR_ DN); 2315 scr_index (DN);
2230 break; 2316 break;
2231 case 'J': /* erase to end of screen */ 2317 case 'J': /* erase to end of screen */
2232 rxvt_scr_erase_screen(aR_ 0); 2318 scr_erase_screen (0);
2233 break; 2319 break;
2234 case 'K': /* erase to end of line */ 2320 case 'K': /* erase to end of line */
2235 rxvt_scr_erase_line(aR_ 0); 2321 scr_erase_line (0);
2236 break; 2322 break;
2237 case 'Y': /* move to specified row and col */ 2323 case 'Y': /* move to specified row and col */
2238 /* full command is 'ESC Y row col' where row and col 2324 /* full command is 'ESC Y row col' where row and col
2239 * are encoded by adding 32 and sending the ascii 2325 * are encoded by adding 32 and sending the ascii
2240 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2326 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2241 * etc. */ 2327 * etc. */
2242 row = rxvt_cmd_getc(aR) - ' '; 2328 row = cmd_getc () - ' ';
2243 col = rxvt_cmd_getc(aR) - ' '; 2329 col = cmd_getc () - ' ';
2244 rxvt_scr_gotorc(aR_ row, col, 0); 2330 scr_gotorc (row, col, 0);
2245 break; 2331 break;
2246 case 'Z': /* identify the terminal type */ 2332 case 'Z': /* identify the terminal type */
2247 rxvt_tt_printf(aR_ "\033/Z"); /* I am a VT100 emulating a VT52 */ 2333 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2248 break; 2334 break;
2249 case '<': /* turn off VT52 mode */ 2335 case '<': /* turn off VT52 mode */
2250 PrivMode(0, PrivMode_vt52); 2336 PrivMode (0, PrivMode_vt52);
2251 break; 2337 break;
2252 case 'F': /* use special graphics character set */ 2338 case 'F': /* use special graphics character set */
2253 case 'G': /* use regular character set */ 2339 case 'G': /* use regular character set */
2254 /* unimplemented */ 2340 /* unimplemented */
2255 break; 2341 break;
2256 case '=': /* use alternate keypad mode */ 2342 case '=': /* use alternate keypad mode */
2257 case '>': /* use regular keypad mode */ 2343 case '>': /* use regular keypad mode */
2258 /* unimplemented */ 2344 /* unimplemented */
2259 break; 2345 break;
2260 } 2346 }
2261} 2347}
2262/*}}} */ 2348/*}}} */
2263 2349
2264 2350
2265/*{{{ process escape sequences */ 2351/*{{{ process escape sequences */
2266/* INTPROTO */
2267void 2352void
2268rxvt_process_escape_seq(pR) 2353rxvt_term::process_escape_seq ()
2269{ 2354{
2270 unsigned char ch = rxvt_cmd_getc(aR); 2355 unsigned char ch = cmd_getc ();
2271 2356
2272 if (R->PrivateModes & PrivMode_vt52) { 2357 if (PrivateModes & PrivMode_vt52)
2273 rxvt_process_escape_vt52(aR_ ch);
2274 return;
2275 }
2276 2358 {
2359 process_escape_vt52 (ch);
2360 return;
2361 }
2362
2277 switch (ch) { 2363 switch (ch)
2364 {
2278 /* case 1: do_tek_mode (); break; */ 2365 /* case 1: do_tek_mode (); break; */
2279 case '#': 2366 case '#':
2280 if (rxvt_cmd_getc(aR) == '8') 2367 if (cmd_getc () == '8')
2281 rxvt_scr_E(aR); 2368 scr_E ();
2282 break; 2369 break;
2283 case '(': 2370 case '(':
2284 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2371 scr_charset_set (0, (unsigned int)cmd_getc ());
2285 break; 2372 break;
2286 case ')': 2373 case ')':
2287 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2374 scr_charset_set (1, (unsigned int)cmd_getc ());
2288 break; 2375 break;
2289 case '*': 2376 case '*':
2290 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2377 scr_charset_set (2, (unsigned int)cmd_getc ());
2291 break; 2378 break;
2292 case '+': 2379 case '+':
2293 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2380 scr_charset_set (3, (unsigned int)cmd_getc ());
2294 break; 2381 break;
2295#ifdef MULTICHAR_SET 2382#ifdef MULTICHAR_SET
2296 case '$': 2383 case '$':
2297 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR)); 2384 scr_charset_set (-2, (unsigned int)cmd_getc ());
2298 break; 2385 break;
2299#endif 2386#endif
2300#ifndef NO_FRILLS 2387#ifndef NO_FRILLS
2301 case '6': 2388 case '6':
2302 rxvt_scr_backindex(aR); 2389 scr_backindex ();
2303 break; 2390 break;
2304#endif 2391#endif
2305 case '7': 2392 case '7':
2306 rxvt_scr_cursor(aR_ SAVE); 2393 scr_cursor (SAVE);
2307 break; 2394 break;
2308 case '8': 2395 case '8':
2309 rxvt_scr_cursor(aR_ RESTORE); 2396 scr_cursor (RESTORE);
2310 break; 2397 break;
2311#ifndef NO_FRILLS 2398#ifndef NO_FRILLS
2312 case '9': 2399 case '9':
2313 rxvt_scr_forwardindex(aR); 2400 scr_forwardindex ();
2314 break; 2401 break;
2315#endif 2402#endif
2316 case '=': 2403 case '=':
2317 case '>': 2404 case '>':
2318 PrivMode((ch == '='), PrivMode_aplKP); 2405 PrivMode ((ch == '='), PrivMode_aplKP);
2319 break; 2406 break;
2320 2407
2321 case C1_40: 2408 case C1_40:
2322 rxvt_cmd_getc(aR); 2409 cmd_getc ();
2323 break; 2410 break;
2324 case C1_44: 2411 case C1_44:
2325 rxvt_scr_index(aR_ UP); 2412 scr_index (UP);
2326 break; 2413 break;
2327 2414
2328 /* 8.3.87: NEXT LINE */ 2415 /* 8.3.87: NEXT LINE */
2329 case C1_NEL: /* ESC E */ 2416 case C1_NEL: /* ESC E */
2330 { 2417 {
2331 uint32_t nlcr[] = { '\n', '\r' }; 2418 uint32_t nlcr[] = { '\n', '\r' };
2332 rxvt_scr_add_lines(aR_ nlcr, 1, 2); 2419 scr_add_lines (nlcr, 1, 2);
2333 } 2420 }
2334 break; 2421 break;
2335 2422
2336 /* kidnapped escape sequence: Should be 8.3.48 */ 2423 /* kidnapped escape sequence: Should be 8.3.48 */
2337 case C1_ESA: /* ESC G */ 2424 case C1_ESA: /* ESC G */
2338 rxvt_process_graphics(aR); 2425 process_graphics ();
2339 break; 2426 break;
2340 2427
2341 /* 8.3.63: CHARACTER TABULATION SET */ 2428 /* 8.3.63: CHARACTER TABULATION SET */
2342 case C1_HTS: /* ESC H */ 2429 case C1_HTS: /* ESC H */
2343 rxvt_scr_set_tab(aR_ 1); 2430 scr_set_tab (1);
2344 break; 2431 break;
2345 2432
2346 /* 8.3.105: REVERSE LINE FEED */ 2433 /* 8.3.105: REVERSE LINE FEED */
2347 case C1_RI: /* ESC M */ 2434 case C1_RI: /* ESC M */
2348 rxvt_scr_index(aR_ DN); 2435 scr_index (DN);
2349 break; 2436 break;
2350 2437
2351 /* 8.3.142: SINGLE-SHIFT TWO */ 2438 /* 8.3.142: SINGLE-SHIFT TWO */
2352 /*case C1_SS2: scr_single_shift (2); break; */ 2439 /*case C1_SS2: scr_single_shift (2); break; */
2353 2440
2354 /* 8.3.143: SINGLE-SHIFT THREE */ 2441 /* 8.3.143: SINGLE-SHIFT THREE */
2355 /*case C1_SS3: scr_single_shift (3); break; */ 2442 /*case C1_SS3: scr_single_shift (3); break; */
2356 2443
2357 /* 8.3.27: DEVICE CONTROL STRING */ 2444 /* 8.3.27: DEVICE CONTROL STRING */
2358 case C1_DCS: /* ESC P */ 2445 case C1_DCS: /* ESC P */
2359 rxvt_process_dcs_seq(aR); 2446 process_dcs_seq ();
2360 break; 2447 break;
2361 2448
2362 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2449 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2363 case C1_SCI: /* ESC Z */ 2450 case C1_SCI: /* ESC Z */
2364 rxvt_tt_write(aR_ (const unsigned char *)ESCZ_ANSWER, 2451 tt_write ((const unsigned char *)ESCZ_ANSWER,
2365 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2452 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2366 break; /* steal obsolete ESC [ c */ 2453 break; /* steal obsolete ESC [ c */
2367 2454
2368 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2455 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2369 case C1_CSI: /* ESC [ */ 2456 case C1_CSI: /* ESC [ */
2370 rxvt_process_csi_seq(aR); 2457 process_csi_seq ();
2371 break; 2458 break;
2372 2459
2373 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2460 /* 8.3.90: OPERATING SYSTEM COMMAND */
2374 case C1_OSC: /* ESC ] */ 2461 case C1_OSC: /* ESC ] */
2375 rxvt_process_osc_seq(aR); 2462 process_osc_seq ();
2376 break; 2463 break;
2377 2464
2378 /* 8.3.106: RESET TO INITIAL STATE */ 2465 /* 8.3.106: RESET TO INITIAL STATE */
2379 case 'c': 2466 case 'c':
2380 rxvt_scr_poweron(aR); 2467 scr_poweron ();
2381 rxvt_scrollbar_show(aR_ 1); 2468 scrollbar_show (1);
2382 break; 2469 break;
2383 2470
2384 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2385 case 'n': 2472 case 'n':
2386 rxvt_scr_charset_choose(aR_ 2); 2473 scr_charset_choose (2);
2387 break; 2474 break;
2388 2475
2389 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2476 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2390 case 'o': 2477 case 'o':
2391 rxvt_scr_charset_choose(aR_ 3); 2478 scr_charset_choose (3);
2392 break; 2479 break;
2393 } 2480 }
2394} 2481}
2395/*}}} */ 2482/*}}} */
2396 2483
2397/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2398/* *INDENT-OFF* */ 2485/* *INDENT-OFF* */
2399enum { 2486enum {
2400 CSI_ICH = 0x40, 2487 CSI_ICH = 0x40,
2401 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2488 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2402 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2489 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2403 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2490 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2404 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2491 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2405 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2492 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2406 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2493 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2407 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2494 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2408 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2495 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2409}; 2496};
2410 2497
2411#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2498#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2412 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2499 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2413 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2500 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2414#define get_byte_array_bit(array, bit) \ 2501#define get_byte_array_bit(array, bit) \
2415 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2502 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2416 2503
2417const unsigned char csi_defaults[] = { 2504const unsigned char csi_defaults[] =
2505 {
2418 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, */
2419 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, */
2420 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, */
2421 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, [, \, ], ^, _, */
2422 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, */
2423 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, */
2424 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, */
2425 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, {, |, }, ~, */
2426}; 2514 };
2427/* *INDENT-ON* */ 2515/* *INDENT-ON* */
2428 2516
2429/* INTPROTO */
2430void 2517void
2431rxvt_process_csi_seq(pR) 2518rxvt_term::process_csi_seq ()
2432{ 2519{
2433 unsigned char ch, priv, i; 2520 unsigned char ch, priv, i;
2434 unsigned int nargs, p; 2521 unsigned int nargs, p;
2435 int n, ndef; 2522 int n, ndef;
2436 int arg[ESC_ARGS]; 2523 int arg[ESC_ARGS];
2437 2524
2438 for (nargs = ESC_ARGS; nargs > 0;) 2525 for (nargs = ESC_ARGS; nargs > 0;)
2439 arg[--nargs] = 0; 2526 arg[--nargs] = 0;
2440 2527
2441 priv = 0; 2528 priv = 0;
2529 ch = cmd_getc ();
2530 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */
2532 priv = ch;
2442 ch = rxvt_cmd_getc(aR); 2533 ch = cmd_getc ();
2443 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2444 priv = ch;
2445 ch = rxvt_cmd_getc(aR);
2446 } 2534 }
2447/* read any numerical arguments */ 2535 /* read any numerical arguments */
2448 for (n = -1; ch < CSI_ICH; ) { 2536 for (n = -1; ch < CSI_ICH; )
2537 {
2449 if (isdigit(ch)) { 2538 if (isdigit (ch))
2539 {
2450 if (n < 0) 2540 if (n < 0)
2451 n = ch - '0'; 2541 n = ch - '0';
2452 else 2542 else
2453 n = n * 10 + ch - '0'; 2543 n = n * 10 + ch - '0';
2544 }
2454 } else if (ch == ';') { 2545 else if (ch == ';')
2546 {
2455 if (nargs < ESC_ARGS) 2547 if (nargs < ESC_ARGS)
2456 arg[nargs++] = n; 2548 arg[nargs++] = n;
2457 n = -1; 2549 n = -1;
2550 }
2458 } else if (ch == '\b') { 2551 else if (ch == '\b')
2459 rxvt_scr_backspace(aR); 2552 {
2553 scr_backspace ();
2554 }
2460 } else if (ch == C0_ESC) { 2555 else if (ch == C0_ESC)
2461 rxvt_process_escape_seq(aR); 2556 {
2557 process_escape_seq ();
2558 return;
2559 }
2560 else if (ch < ' ')
2561 {
2562 process_nonprinting (ch);
2563 }
2564 ch = cmd_getc ();
2565 }
2566
2567 if (ch > CSI_7F)
2462 return; 2568 return;
2463 } else if (ch < ' ') {
2464 rxvt_process_nonprinting(aR_ ch);
2465 }
2466 ch = rxvt_cmd_getc(aR);
2467 }
2468 2569
2469 if (ch > CSI_7F)
2470 return;
2471
2472 if (nargs < ESC_ARGS) 2570 if (nargs < ESC_ARGS)
2473 arg[nargs++] = n; 2571 arg[nargs++] = n;
2474 2572
2475 i = ch - CSI_ICH; 2573 i = ch - CSI_ICH;
2476 ndef = get_byte_array_bit(csi_defaults, i); 2574 ndef = get_byte_array_bit (csi_defaults, i);
2477 for (p = 0; p < nargs; p++) 2575 for (p = 0; p < nargs; p++)
2478 if (arg[p] == -1) 2576 if (arg[p] == -1)
2479 arg[p] = ndef; 2577 arg[p] = ndef;
2480 2578
2481#ifdef DEBUG_CMD 2579#ifdef DEBUG_CMD
2482 fprintf(stderr, "CSI "); 2580 fprintf (stderr, "CSI ");
2483 for (p = 0; p < nargs; p++) 2581 for (p = 0; p < nargs; p++)
2484 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2582 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2485 fprintf(stderr, "%c\n", ch); 2583 fprintf (stderr, "%c\n", ch);
2486#endif 2584#endif
2487 2585
2488/* 2586 /*
2489 * private mode handling 2587 * private mode handling
2490 */ 2588 */
2491 if (priv) { 2589 if (priv)
2492 switch (priv) { 2590 {
2493 case '>': 2591 switch (priv)
2592 {
2593 case '>':
2494 if (ch == CSI_DA) /* secondary device attributes */ 2594 if (ch == CSI_DA) /* secondary device attributes */
2495 rxvt_tt_printf(aR_ "\033[>%d;%-.8s;0c", 'R', VSTRING); 2595 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2496 break; 2596 break;
2497 case '?': 2597 case '?':
2498 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2598 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2499 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2599 process_terminal_mode (ch, priv, nargs, arg);
2500 break; 2600 break;
2501 } 2601 }
2502 return; 2602 return;
2503 } 2603 }
2504 2604
2505 switch (ch) { 2605 switch (ch)
2506/* 2606 {
2607 /*
2507 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2608 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2508 */ 2609 */
2509#ifdef PRINTPIPE 2610#ifdef PRINTPIPE
2510 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2611 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2511 switch (arg[0]) { 2612 switch (arg[0])
2613 {
2512 case 0: /* initiate transfer to primary aux device */ 2614 case 0: /* initiate transfer to primary aux device */
2513 rxvt_scr_printscreen(aR_ 0); 2615 scr_printscreen (0);
2514 break; 2616 break;
2515 case 5: /* start relay to primary aux device */ 2617 case 5: /* start relay to primary aux device */
2516 rxvt_process_print_pipe(aR); 2618 process_print_pipe ();
2619 break;
2620 }
2517 break; 2621 break;
2518 }
2519 break;
2520#endif 2622#endif
2521 2623
2522 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2624 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2523 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2625 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2524 arg[0] = -arg[0]; 2626 arg[0] = -arg[0];
2525 /* FALLTHROUGH */ 2627 /* FALLTHROUGH */
2526 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2628 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2527 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2629 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2528 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2630 scr_gotorc (arg[0], 0, RELATIVE);
2529 break; 2631 break;
2530 2632
2531 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2633 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2532 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2634 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2533#ifdef ISO6429 2635#ifdef ISO6429
2534 arg[0] = -arg[0]; 2636 arg[0] = -arg[0];
2535#else /* emulate common DEC VTs */ 2637#else /* emulate common DEC VTs */
2536 arg[0] = arg[0] ? -arg[0] : -1; 2638 arg[0] = arg[0] ? -arg[0] : -1;
2537#endif 2639#endif
2538 /* FALLTHROUGH */ 2640 /* FALLTHROUGH */
2539 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2641 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2540 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2642 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2541#ifdef ISO6429 2643#ifdef ISO6429
2542 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2644 scr_gotorc (0, arg[0], RELATIVE);
2543#else /* emulate common DEC VTs */ 2645#else /* emulate common DEC VTs */
2544 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2646 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2545#endif 2647#endif
2546 break; 2648 break;
2547 2649
2548 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2650 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2549 arg[0] = -arg[0]; 2651 arg[0] = -arg[0];
2550 /* FALLTHROUGH */ 2652 /* FALLTHROUGH */
2551 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2653 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2552 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2654 scr_gotorc (arg[0], 0, R_RELATIVE);
2553 break; 2655 break;
2554 2656
2555 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2657 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2556 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2658 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2557 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2659 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2558 break; 2660 break;
2559 2661
2560 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2662 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2561 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2663 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2562 break; 2664 break;
2563 2665
2564 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2666 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2565 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2667 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2566 rxvt_scr_gotorc(aR_ arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2668 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2567 break; 2669 break;
2568 2670
2569 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2671 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2570 arg[0] = -arg[0]; 2672 arg[0] = -arg[0];
2571 /* FALLTHROUGH */ 2673 /* FALLTHROUGH */
2572 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2674 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2573 rxvt_scr_tab(aR_ arg[0]); 2675 scr_tab (arg[0]);
2574 break; 2676 break;
2575 2677
2576 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2678 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2577 rxvt_scr_erase_screen(aR_ arg[0]); 2679 scr_erase_screen (arg[0]);
2578 break; 2680 break;
2579 2681
2580 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2682 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2581 rxvt_scr_erase_line(aR_ arg[0]); 2683 scr_erase_line (arg[0]);
2582 break; 2684 break;
2583 2685
2584 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2686 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2585 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2687 scr_insdel_chars (arg[0], INSERT);
2586 break; 2688 break;
2587 2689
2588 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2690 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2589 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2691 scr_insdel_lines (arg[0], INSERT);
2590 break; 2692 break;
2591 2693
2592 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2694 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2593 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2695 scr_insdel_lines (arg[0], DELETE);
2594 break; 2696 break;
2595 2697
2596 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2698 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2597 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2699 scr_insdel_chars (arg[0], ERASE);
2598 break; 2700 break;
2599 2701
2600 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2702 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2601 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2703 scr_insdel_chars (arg[0], DELETE);
2602 break; 2704 break;
2603 2705
2604 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2706 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2605 arg[0] = -arg[0]; 2707 arg[0] = -arg[0];
2606 /* FALLTHROUGH */ 2708 /* FALLTHROUGH */
2607 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2709 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2608 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2609 break; 2711 break;
2610 2712
2611 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2612 rxvt_tt_write(aR_ (const unsigned char *)VT100_ANS, 2714 tt_write ((const unsigned char *)VT100_ANS,
2613 (unsigned int)(sizeof(VT100_ANS) - 1)); 2715 (unsigned int) (sizeof (VT100_ANS) - 1));
2614 break; 2716 break;
2615 2717
2616 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2617 rxvt_process_sgr_mode(aR_ nargs, arg); 2719 process_sgr_mode (nargs, arg);
2618 break; 2720 break;
2619 2721
2620 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2722 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2621 switch (arg[0]) { 2723 switch (arg[0])
2724 {
2622 case 5: /* DSR requested */ 2725 case 5: /* DSR requested */
2623 rxvt_tt_printf(aR_ "\033[0n"); 2726 tt_printf ("\033[0n");
2624 break; 2727 break;
2625 case 6: /* CPR requested */ 2728 case 6: /* CPR requested */
2626 rxvt_scr_report_position(aR); 2729 scr_report_position ();
2627 break; 2730 break;
2628#if defined (ENABLE_DISPLAY_ANSWER) 2731#if defined (ENABLE_DISPLAY_ANSWER)
2629 case 7: /* unofficial extension */ 2732 case 7: /* unofficial extension */
2630 rxvt_tt_printf(aR_ "%-.250s\n", R->rs[Rs_display_name]); 2733 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2631 break; 2734 break;
2632#endif 2735#endif
2633 case 8: /* unofficial extension */ 2736 case 8: /* unofficial extension */
2634 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2738 break;
2739 }
2635 break; 2740 break;
2636 }
2637 break;
2638 2741
2639 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2640 switch (arg[0]) { 2743 switch (arg[0])
2744 {
2641 case 0: /* char tab stop cleared at active position */ 2745 case 0: /* char tab stop cleared at active position */
2642 rxvt_scr_set_tab(aR_ 0); 2746 scr_set_tab (0);
2643 break; 2747 break;
2644 /* case 1: */ /* line tab stop cleared in active line */ 2748 /* case 1: */ /* line tab stop cleared in active line */
2645 /* case 2: */ /* char tab stops cleared in active line */ 2749 /* case 2: */ /* char tab stops cleared in active line */
2646 case 3: /* all char tab stops are cleared */ 2750 case 3: /* all char tab stops are cleared */
2647 /* case 4: */ /* all line tab stops are cleared */ 2751 /* case 4: */ /* all line tab stops are cleared */
2648 case 5: /* all tab stops are cleared */ 2752 case 5: /* all tab stops are cleared */
2649 rxvt_scr_set_tab(aR_ -1); 2753 scr_set_tab (-1);
2754 break;
2755 }
2650 break; 2756 break;
2651 }
2652 break;
2653 2757
2654 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2758 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2655 switch (arg[0]) { 2759 switch (arg[0])
2760 {
2656 case 0: /* char tab stop set at active position */ 2761 case 0: /* char tab stop set at active position */
2657 rxvt_scr_set_tab(aR_ 1); 2762 scr_set_tab (1);
2658 break; /* = ESC H */ 2763 break; /* = ESC H */
2659 /* case 1: */ /* line tab stop set at active line */ 2764 /* case 1: */ /* line tab stop set at active line */
2660 case 2: /* char tab stop cleared at active position */ 2765 case 2: /* char tab stop cleared at active position */
2661 rxvt_scr_set_tab(aR_ 0); 2766 scr_set_tab (0);
2662 break; /* = ESC [ 0 g */ 2767 break; /* = ESC [ 0 g */
2663 /* case 3: */ /* line tab stop cleared at active line */ 2768 /* case 3: */ /* line tab stop cleared at active line */
2664 /* case 4: */ /* char tab stops cleared at active line */ 2769 /* case 4: */ /* char tab stops cleared at active line */
2665 case 5: /* all char tab stops are cleared */ 2770 case 5: /* all char tab stops are cleared */
2666 rxvt_scr_set_tab(aR_ -1); 2771 scr_set_tab (-1);
2667 break; /* = ESC [ 3 g */ 2772 break; /* = ESC [ 3 g */
2668 /* case 6: */ /* all line tab stops are cleared */ 2773 /* case 6: */ /* all line tab stops are cleared */
2669 } 2774 }
2670 break; 2775 break;
2671 2776
2672 case CSI_RM: /* 8.3.107: RESET MODE */ 2777 case CSI_RM: /* 8.3.107: RESET MODE */
2673 if (arg[0] == 4) 2778 if (arg[0] == 4)
2674 rxvt_scr_insert_mode(aR_ 0); 2779 scr_insert_mode (0);
2675 break; 2780 break;
2676 2781
2677 case CSI_SM: /* 8.3.126: SET MODE */ 2782 case CSI_SM: /* 8.3.126: SET MODE */
2678 if (arg[0] == 4) 2783 if (arg[0] == 4)
2679 rxvt_scr_insert_mode(aR_ 1); 2784 scr_insert_mode (1);
2680 break; 2785 break;
2681 2786
2682/* 2787 /*
2683 * PRIVATE USE beyond this point. All CSI_7? sequences here 2788 * PRIVATE USE beyond this point. All CSI_7? sequences here
2684 */ 2789 */
2685 case CSI_72: /* DECSTBM: set top and bottom margins */ 2790 case CSI_72: /* DECSTBM: set top and bottom margins */
2686 if (nargs == 1) 2791 if (nargs == 1)
2687 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2792 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2688 else if (nargs == 0 || arg[0] >= arg[1]) 2793 else if (nargs == 0 || arg[0] >= arg[1])
2689 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2794 scr_scroll_region (0, MAX_ROWS - 1);
2690 else 2795 else
2691 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2796 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2692 break; 2797 break;
2693 2798
2694 case CSI_73: 2799 case CSI_73:
2695 rxvt_scr_cursor(aR_ SAVE); 2800 scr_cursor (SAVE);
2696 break; 2801 break;
2697 case CSI_75: 2802 case CSI_75:
2698 rxvt_scr_cursor(aR_ RESTORE); 2803 scr_cursor (RESTORE);
2699 break; 2804 break;
2700 2805
2701#ifndef NO_FRILLS 2806#ifndef NO_FRILLS
2702 case CSI_74: 2807 case CSI_74:
2703 rxvt_process_window_ops(aR_ arg, nargs); 2808 process_window_ops (arg, nargs);
2704 break; 2809 break;
2705#endif 2810#endif
2706 2811
2707 case CSI_78: /* DECREQTPARM */ 2812 case CSI_78: /* DECREQTPARM */
2708 if (arg[0] == 0 || arg[0] == 1) 2813 if (arg[0] == 0 || arg[0] == 1)
2709 rxvt_tt_printf(aR_ "\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2710 /* FALLTHROUGH */ 2815 /* FALLTHROUGH */
2711 2816
2712 default: 2817 default:
2713 break; 2818 break;
2714 } 2819 }
2715} 2820}
2716/*}}} */ 2821/*}}} */
2717 2822
2718#ifndef NO_FRILLS 2823#ifndef NO_FRILLS
2719/* ARGSUSED */ 2824/* ARGSUSED */
2720/* INTPROTO */
2721void 2825void
2722rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2826rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2723{ 2827{
2724 int x, y; 2828 int x, y;
2725#if 0 2829#if 0
2726 char *s; 2830 char *s;
2727#endif 2831#endif
2728 XWindowAttributes wattr; 2832 XWindowAttributes wattr;
2729 Window wdummy; 2833 Window wdummy;
2730 2834
2731 if (nargs == 0) 2835 if (nargs == 0)
2732 return; 2836 return;
2733 switch (args[0]) { 2837 switch (args[0])
2838 {
2734 /* 2839 /*
2735 * commands 2840 * commands
2736 */ 2841 */
2737 case 1: /* deiconify window */ 2842 case 1: /* deiconify window */
2738 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2843 XMapWindow (display->display, TermWin.parent[0]);
2739 break; 2844 break;
2740 case 2: /* iconify window */ 2845 case 2: /* iconify window */
2741 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2846 XIconifyWindow (display->display, TermWin.parent[0],
2742 DefaultScreen(R->Xdisplay)); 2847 DefaultScreen (display->display));
2743 break; 2848 break;
2744 case 3: /* set position (pixels) */ 2849 case 3: /* set position (pixels) */
2745 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2850 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2746 break; 2851 break;
2747 case 4: /* set size (pixels) */ 2852 case 4: /* set size (pixels) */
2748 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2853 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2749 break; 2854 break;
2750 case 5: /* raise window */ 2855 case 5: /* raise window */
2751 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2856 XRaiseWindow (display->display, TermWin.parent[0]);
2752 break; 2857 break;
2753 case 6: /* lower window */ 2858 case 6: /* lower window */
2754 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2859 XLowerWindow (display->display, TermWin.parent[0]);
2755 break; 2860 break;
2756 case 7: /* refresh window */ 2861 case 7: /* refresh window */
2757 rxvt_scr_touch(aR_ True); 2862 scr_touch (true);
2758 break; 2863 break;
2759 case 8: /* set size (chars) */ 2864 case 8: /* set size (chars) */
2760 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2761 (unsigned int)(args[1] * R->TermWin.fheight)); 2866 (unsigned int) (args[1] * TermWin.fheight));
2762 break; 2867 break;
2763 default: 2868 default:
2764 if (args[0] >= 24) /* set height (chars) */ 2869 if (args[0] >= 24) /* set height (chars) */
2765 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2870 set_widthheight ((unsigned int)TermWin.width,
2766 (unsigned int)(args[1] * R->TermWin.fheight)); 2871 (unsigned int) (args[1] * TermWin.fheight));
2767 break; 2872 break;
2768 /* 2873 /*
2769 * reports - some output format copied from XTerm 2874 * reports - some output format copied from XTerm
2770 */ 2875 */
2771 case 11: /* report window state */ 2876 case 11: /* report window state */
2772 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2773 rxvt_tt_printf(aR_ "\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2774 break; 2879 break;
2775 case 13: /* report window position */ 2880 case 13: /* report window position */
2776 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2777 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2778 -wattr.border_width, -wattr.border_width, 2883 -wattr.border_width, -wattr.border_width,
2779 &x, &y, &wdummy); 2884 &x, &y, &wdummy);
2780 rxvt_tt_printf(aR_ "\033[3;%d;%dt", x, y); 2885 tt_printf ("\033[3;%d;%dt", x, y);
2781 break; 2886 break;
2782 case 14: /* report window size (pixels) */ 2887 case 14: /* report window size (pixels) */
2783 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2784 rxvt_tt_printf(aR_ "\033[4;%d;%dt", wattr.height, wattr.width); 2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2785 break; 2890 break;
2786 case 18: /* report window size (chars) */ 2891 case 18: /* report window size (chars) */
2787 rxvt_tt_printf(aR_ "\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2788 break; 2893 break;
2789#if 0 /* XXX: currently disabled due to security concerns */ 2894#if 0 /* XXX: currently disabled due to security concerns */
2790 case 20: /* report icon label */ 2895 case 20: /* report icon label */
2791 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2896 XGetIconName (display->display, TermWin.parent[0], &s);
2792 rxvt_tt_printf(aR_ "\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2793 break; 2898 break;
2794 case 21: /* report window title */ 2899 case 21: /* report window title */
2795 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2900 XFetchName (display->display, TermWin.parent[0], &s);
2796 rxvt_tt_printf(aR_ "\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2797 break; 2902 break;
2798#endif 2903#endif
2904
2799 } 2905 }
2800} 2906}
2801#endif 2907#endif
2802 2908
2803/*----------------------------------------------------------------------*/ 2909/*----------------------------------------------------------------------*/
2804/* 2910/*
2805 * get input up until STRING TERMINATOR (or BEL) 2911 * get input up until STRING TERMINATOR (or BEL)
2806 * ends_how is terminator used. returned input must be free()d 2912 * ends_how is terminator used. returned input must be free ()d
2807 */ 2913 */
2808/* INTPROTO */
2809unsigned char * 2914unsigned char *
2810rxvt_get_to_st(pR_ unsigned char *ends_how) 2915rxvt_term::get_to_st (unsigned char *ends_how)
2811{ 2916{
2812 int seen_esc = 0; /* seen escape? */ 2917 int seen_esc = 0; /* seen escape? */
2813 unsigned int n = 0; 2918 unsigned int n = 0;
2814 unsigned char *s; 2919 unsigned char *s;
2815 unsigned char ch, string[STRING_MAX]; 2920 unsigned char ch, string[STRING_MAX];
2816 2921
2817 for (; (ch = rxvt_cmd_getc(aR));) { 2922 for (; (ch = cmd_getc ());)
2923 {
2818 if (ch == C0_BEL 2924 if (ch == C0_BEL
2819 || ch == CHAR_ST 2925 || ch == CHAR_ST
2820 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2821 break; 2927 break;
2822 if (ch == C0_ESC) { 2928 if (ch == C0_ESC)
2929 {
2823 seen_esc = 1; 2930 seen_esc = 1;
2824 continue; 2931 continue;
2932 }
2825 } else if (ch == '\t') 2933 else if (ch == '\t')
2826 ch = ' '; /* translate '\t' to space */ 2934 ch = ' '; /* translate '\t' to space */
2827 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2828 return NULL; /* other control character - exit */ 2936 return NULL; /* other control character - exit */
2829 if (n < sizeof(string) - 1) 2937 if (n < sizeof (string) - 1)
2830 string[n++] = ch; 2938 string[n++] = ch;
2831 seen_esc = 0; 2939 seen_esc = 0;
2832 } 2940 }
2833 string[n++] = '\0'; 2941 string[n++] = '\0';
2834 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2835 return NULL; 2943 return NULL;
2836 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2944 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2837 STRNCPY(s, string, n); 2945 STRNCPY (s, string, n);
2838 return s; 2946 return s;
2839} 2947}
2840 2948
2841/*----------------------------------------------------------------------*/ 2949/*----------------------------------------------------------------------*/
2842/* 2950/*
2843 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2951 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2844 */ 2952 */
2845/* INTPROTO */
2846void 2953void
2847rxvt_process_dcs_seq(pR) 2954rxvt_term::process_dcs_seq ()
2848{ 2955{
2849 unsigned char eh, *s; 2956 unsigned char eh, *s;
2850/* 2957 /*
2851 * Not handled yet 2958 * Not handled yet
2852 */ 2959 */
2853 s = rxvt_get_to_st(aR_ &eh); 2960 s = get_to_st (&eh);
2854 if (s) 2961 if (s)
2855 free(s); 2962 free (s);
2856 return; 2963 return;
2857} 2964}
2858 2965
2859/*----------------------------------------------------------------------*/ 2966/*----------------------------------------------------------------------*/
2860/* 2967/*
2861 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2862 */ 2969 */
2863/* INTPROTO */
2864void 2970void
2865rxvt_process_osc_seq(pR) 2971rxvt_term::process_osc_seq ()
2866{ 2972{
2867 unsigned char ch, eh, *s; 2973 unsigned char ch, eh, *s;
2868 int arg; 2974 int arg;
2869 2975
2870 ch = rxvt_cmd_getc(aR); 2976 ch = cmd_getc ();
2871 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2977 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2872 arg = arg * 10 + (ch - '0'); 2978 arg = arg * 10 + (ch - '0');
2873 2979
2874 if (ch == ';') { 2980 if (ch == ';')
2875 s = rxvt_get_to_st(aR_ &eh); 2981 {
2876 if (s) { 2982 s = get_to_st (&eh);
2877 /* 2983 if (s)
2984 {
2985 /*
2878 * rxvt_menubar_dispatch() violates the constness of the string, 2986 * rxvt_menubar_dispatch () violates the constness of the string,
2879 * so do it here 2987 * so do it here
2880 */ 2988 */
2881 if (arg == XTerm_Menu) 2989 if (arg == XTerm_Menu)
2882#if 0 /* XXX: currently disabled due to security concerns */ 2990#if 0 /* XXX: currently disabled due to security concerns */
2883 rxvt_menubar_dispatch(aR_ (char *)s); 2991 menubar_dispatch ((char *)s);
2884#else 2992#else
2885 0; 2993 (void)0;
2886#endif 2994#endif
2887 else 2995 else
2888 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2996 xterm_seq (arg, (char *)s, eh);
2889 free(s); 2997 free (s);
2890 } 2998 }
2891 } 2999 }
2892} 3000}
2893/* 3001/*
2894 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2895 * 0 = change iconName/title 3003 * 0 = change iconName/title
… …
2909 * 20 = bg pixmap 3017 * 20 = bg pixmap
2910 * 39 = change default fg color 3018 * 39 = change default fg color
2911 * 49 = change default bg color 3019 * 49 = change default bg color
2912 * 55 = dump scrollback buffer and all of screen 3020 * 55 = dump scrollback buffer and all of screen
2913 */ 3021 */
2914/* EXTPROTO */
2915void 3022void
2916rxvt_xterm_seq(pR_ int op, const char *str, unsigned char resp __attribute__((unused))) 3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
2917{ 3024{
2918 int changed = 0; 3025 int changed = 0;
2919 int color; 3026 int color;
2920 char *buf, *name; 3027 char *buf, *name;
2921 3028
2922 assert(str != NULL); 3029 assert (str != NULL);
2923 switch (op) { 3030 switch (op)
3031 {
2924 case XTerm_name: 3032 case XTerm_name:
2925 rxvt_set_title(aR_ str); 3033 set_title (str);
2926 /* FALLTHROUGH */ 3034 /* FALLTHROUGH */
2927 case XTerm_iconName: 3035 case XTerm_iconName:
2928 rxvt_set_iconName(aR_ str); 3036 set_iconName (str);
2929 break; 3037 break;
2930 case XTerm_title: 3038 case XTerm_title:
2931 rxvt_set_title(aR_ str); 3039 set_title (str);
2932 break; 3040 break;
2933 case XTerm_Color: 3041 case XTerm_Color:
2934 for (buf = (char *)str; buf && *buf;) { 3042 for (buf = (char *)str; buf && *buf;)
3043 {
2935 if ((name = STRCHR(buf, ';')) == NULL) 3044 if ((name = STRCHR (buf, ';')) == NULL)
2936 break; 3045 break;
2937 *name++ = '\0'; 3046 *name++ = '\0';
2938 color = atoi(buf); 3047 color = atoi (buf);
2939 if (color < 0 || color >= TOTAL_COLORS) 3048 if (color < 0 || color >= TOTAL_COLORS)
2940 break; 3049 break;
2941 if ((buf = STRCHR(name, ';')) != NULL) 3050 if ((buf = STRCHR (name, ';')) != NULL)
2942 *buf++ = '\0'; 3051 *buf++ = '\0';
2943 rxvt_set_window_color(aR_ color + minCOLOR, name); 3052 set_window_color (color + minCOLOR, name);
2944 } 3053 }
2945 break; 3054 break;
2946#ifndef NO_CURSORCOLOR 3055#ifndef NO_CURSORCOLOR
2947 case XTerm_Color_cursor: 3056 case XTerm_Color_cursor:
2948 rxvt_set_window_color(aR_ Color_cursor, str); 3057 set_window_color (Color_cursor, str);
2949 break; 3058 break;
2950#endif 3059#endif
2951 case XTerm_Color_pointer: 3060 case XTerm_Color_pointer:
2952 rxvt_set_window_color(aR_ Color_pointer, str); 3061 set_window_color (Color_pointer, str);
2953 break; 3062 break;
2954#ifndef NO_BOLD_UNDERLINE_REVERSE 3063#ifndef NO_BOLD_UNDERLINE_REVERSE
2955 case XTerm_Color_BD: 3064 case XTerm_Color_BD:
2956 rxvt_set_window_color(aR_ Color_BD, str); 3065 set_window_color (Color_BD, str);
2957 break; 3066 break;
2958 case XTerm_Color_UL: 3067 case XTerm_Color_UL:
2959 rxvt_set_window_color(aR_ Color_UL, str); 3068 set_window_color (Color_UL, str);
2960 break; 3069 break;
2961 case XTerm_Color_RV: 3070 case XTerm_Color_RV:
2962 rxvt_set_window_color(aR_ Color_RV, str); 3071 set_window_color (Color_RV, str);
2963 break; 3072 break;
2964#endif 3073#endif
2965 3074
2966 case XTerm_Menu: 3075 case XTerm_Menu:
2967 /* 3076 /*
2968 * rxvt_menubar_dispatch() violates the constness of the string, 3077 * rxvt_menubar_dispatch () violates the constness of the string,
2969 * so DON'T do it here 3078 * so DON'T do it here
2970 */ 3079 */
2971 break; 3080 break;
2972 case XTerm_Pixmap: 3081 case XTerm_Pixmap:
2973 if (*str != ';') { 3082 if (*str != ';')
3083 {
2974#if XPM_BACKGROUND 3084#if XPM_BACKGROUND
2975 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 3085 scale_pixmap (""); /* reset to default scaling */
2976 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 3086 set_bgPixmap (str); /* change pixmap */
2977#endif 3087#endif
2978 rxvt_scr_touch(aR_ True); 3088 scr_touch (true);
2979 } 3089 }
2980 while ((str = STRCHR(str, ';')) != NULL) { 3090 while ((str = STRCHR (str, ';')) != NULL)
2981 str++; 3091 {
3092 str++;
2982#if XPM_BACKGROUND 3093#if XPM_BACKGROUND
2983 changed += rxvt_scale_pixmap(aR_ str); 3094 changed += scale_pixmap (str);
2984#endif 3095#endif
2985 } 3096
2986 if (changed) { 3097 }
3098 if (changed)
3099 {
2987#ifdef XPM_BACKGROUND 3100#ifdef XPM_BACKGROUND
2988 rxvt_resize_pixmap(aR); 3101 resize_pixmap ();
2989#endif 3102#endif
2990 rxvt_scr_touch(aR_ True); 3103 scr_touch (true);
2991 } 3104 }
2992 break; 3105 break;
2993 3106
2994 case XTerm_restoreFG: 3107 case XTerm_restoreFG:
2995 rxvt_set_window_color(aR_ Color_fg, str); 3108 set_window_color (Color_fg, str);
2996 break; 3109 break;
2997 case XTerm_restoreBG: 3110 case XTerm_restoreBG:
2998 rxvt_set_window_color(aR_ Color_bg, str); 3111 set_window_color (Color_bg, str);
2999 break; 3112 break;
3000 case XTerm_logfile: 3113 case XTerm_logfile:
3001 break; 3114 break;
3002 case XTerm_font: 3115 case XTerm_font:
3003 rxvt_change_font(aR_ 0, str); 3116 change_font (0, str);
3004 break; 3117 break;
3005#if 0 3118#if 0
3006 case XTerm_dumpscreen: /* no error notices */ 3119 case XTerm_dumpscreen: /* no error notices */
3007 { 3120 {
3008 int fd; 3121 int fd;
3009 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)
3010 rxvt_scr_dump(aR_ fd); 3123 {
3011 close(fd); 3124 scr_dump (fd);
3012 } 3125 close (fd);
3013 } 3126 }
3014 break; 3127 }
3128 break;
3015#endif 3129#endif
3130
3016 } 3131 }
3017} 3132}
3018/*----------------------------------------------------------------------*/ 3133/*----------------------------------------------------------------------*/
3019 3134
3020/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3025 * 's' = save 3140 * 's' = save
3026 * 'r' = restore 3141 * 'r' = restore
3027 * 't' = toggle 3142 * 't' = toggle
3028 * so no need for fancy checking 3143 * so no need for fancy checking
3029 */ 3144 */
3030/* INTPROTO */
3031int 3145int
3032rxvt_privcases(pR_ int mode, unsigned long bit) 3146rxvt_term::privcases (int mode, unsigned long bit)
3033{ 3147{
3034 int state; 3148 int state;
3035 3149
3036 if (mode == 's') { 3150 if (mode == 's')
3151 {
3037 R->SavedModes |= (R->PrivateModes & bit); 3152 SavedModes |= (PrivateModes & bit);
3038 return -1; 3153 return -1;
3039 } else { 3154 }
3155 else
3156 {
3040 if (mode == 'r') 3157 if (mode == 'r')
3041 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3042 else 3159 else
3043 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3044 PrivMode(state, bit); 3161 PrivMode (state, bit);
3045 } 3162 }
3046 return state; 3163 return state;
3047} 3164}
3048 3165
3049/* we're not using priv _yet_ */ 3166/* we're not using priv _yet_ */
3050/* INTPROTO */
3051void 3167void
3052rxvt_process_terminal_mode(pR_ 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)
3053{ 3169{
3054 unsigned int i, j; 3170 unsigned int i, j;
3055 int state; 3171 int state;
3056 static const struct { 3172 static const struct
3173 {
3057 const int argval; 3174 const int argval;
3058 const unsigned long bit; 3175 const unsigned long bit;
3176 }
3059 } argtopriv[] = { 3177 argtopriv[] = {
3060 { 1, PrivMode_aplCUR }, 3178 { 1, PrivMode_aplCUR },
3061 { 2, PrivMode_vt52 }, 3179 { 2, PrivMode_vt52 },
3062 { 3, PrivMode_132 }, 3180 { 3, PrivMode_132 },
3063 { 4, PrivMode_smoothScroll }, 3181 { 4, PrivMode_smoothScroll },
3064 { 5, PrivMode_rVideo }, 3182 { 5, PrivMode_rVideo },
3065 { 6, PrivMode_relOrigin }, 3183 { 6, PrivMode_relOrigin },
3066 { 7, PrivMode_Autowrap }, 3184 { 7, PrivMode_Autowrap },
3067 { 9, PrivMode_MouseX10 }, 3185 { 9, PrivMode_MouseX10 },
3068#ifdef menuBar_esc 3186#ifdef menuBar_esc
3069 { menuBar_esc, PrivMode_menuBar }, 3187 { menuBar_esc, PrivMode_menuBar },
3070#endif 3188#endif
3071#ifdef scrollBar_esc 3189#ifdef scrollBar_esc
3072 { scrollBar_esc, PrivMode_scrollBar }, 3190 { scrollBar_esc, PrivMode_scrollBar },
3073#endif 3191#endif
3074 { 25, PrivMode_VisibleCursor }, 3192 { 25, PrivMode_VisibleCursor },
3075 { 35, PrivMode_ShiftKeys }, 3193 { 35, PrivMode_ShiftKeys },
3076 { 40, PrivMode_132OK }, 3194 { 40, PrivMode_132OK },
3077 { 47, PrivMode_Screen }, 3195 { 47, PrivMode_Screen },
3078 { 66, PrivMode_aplKP }, 3196 { 66, PrivMode_aplKP },
3079#ifndef NO_BACKSPACE_KEY 3197#ifndef NO_BACKSPACE_KEY
3080 { 67, PrivMode_BackSpace }, 3198 { 67, PrivMode_BackSpace },
3081#endif 3199#endif
3082 { 1000, PrivMode_MouseX11 }, 3200 { 1000, PrivMode_MouseX11 },
3083 { 1010, PrivMode_TtyOutputInh }, 3201 { 1010, PrivMode_TtyOutputInh },
3084 { 1011, PrivMode_Keypress }, 3202 { 1011, PrivMode_Keypress },
3085 { 1047, PrivMode_Screen }, 3203 { 1047, PrivMode_Screen },
3086 }; 3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3205 };
3087 3206
3088 if (nargs == 0) 3207 if (nargs == 0)
3089 return; 3208 return;
3090 3209
3091/* make lo/hi boolean */ 3210 /* make lo/hi boolean */
3092 if (mode == 'l') 3211 if (mode == 'l')
3093 mode = 0; /* reset */ 3212 mode = 0; /* reset */
3094 else if (mode == 'h') 3213 else if (mode == 'h')
3095 mode = 1; /* set */ 3214 mode = 1; /* set */
3096 3215
3097 for (i = 0; i < nargs; i++) { 3216 for (i = 0; i < nargs; i++)
3217 {
3098 state = -1; 3218 state = -1;
3099 3219
3100 /* basic handling */ 3220 /* basic handling */
3101 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3221 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3102 if (argtopriv[j].argval == arg[i]) { 3222 if (argtopriv[j].argval == arg[i])
3223 {
3103 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3224 state = privcases (mode, argtopriv[j].bit);
3104 break; 3225 break;
3105 } 3226 }
3106 3227
3107 /* extra handling for values with state unkept */ 3228 /* extra handling for values with state unkept */
3108 if (state == -1) 3229 if (state == -1)
3109 switch (arg[i]) { 3230 switch (arg[i])
3231 {
3110 case 1048: /* alternative cursor save */ 3232 case 1048: /* alternative cursor save */
3111 if (mode == 0) 3233 if (mode == 0)
3112 rxvt_scr_cursor(aR_ RESTORE); 3234 scr_cursor (RESTORE);
3113 else if (mode == 1) 3235 else if (mode == 1)
3114 rxvt_scr_cursor(aR_ SAVE); 3236 scr_cursor (SAVE);
3115 /* FALLTHROUGH */ 3237 /* FALLTHROUGH */
3116 default: 3238 default:
3117 continue; /* for(;i;) */ 3239 continue; /* for (;i;) */
3118 } 3240 }
3119 3241
3120 /* extra handling for values with valid 0 or 1 state */ 3242 /* extra handling for values with valid 0 or 1 state */
3121 switch (arg[i]) { 3243 switch (arg[i])
3244 {
3122 /* case 1: - application cursor keys */ 3245 /* case 1: - application cursor keys */
3123 case 2: /* VT52 mode */ 3246 case 2: /* VT52 mode */
3124 /* oddball mode. should be set regardless of set/reset 3247 /* oddball mode. should be set regardless of set/reset
3125 * parameter. Return from VT52 mode with an ESC < from 3248 * parameter. Return from VT52 mode with an ESC < from
3126 * within VT52 mode 3249 * within VT52 mode
3127 */ 3250 */
3128 PrivMode(1, PrivMode_vt52); 3251 PrivMode (1, PrivMode_vt52);
3129 break; 3252 break;
3130 case 3: /* 80/132 */ 3253 case 3: /* 80/132 */
3131 if (R->PrivateModes & PrivMode_132OK) 3254 if (PrivateModes & PrivMode_132OK)
3132 rxvt_set_widthheight(aR_
3133 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3134 (unsigned int)R->TermWin.height); 3256 (unsigned int)TermWin.height);
3135 break; 3257 break;
3136 case 4: /* smooth scrolling */ 3258 case 4: /* smooth scrolling */
3137 if (state) 3259 if (state)
3138 R->Options &= ~Opt_jumpScroll; 3260 Options &= ~Opt_jumpScroll;
3139 else 3261 else
3140 R->Options |= Opt_jumpScroll; 3262 Options |= Opt_jumpScroll;
3141 break; 3263 break;
3142 case 5: /* reverse video */ 3264 case 5: /* reverse video */
3143 rxvt_scr_rvideo_mode(aR_ state); 3265 scr_rvideo_mode (state);
3144 break; 3266 break;
3145 case 6: /* relative/absolute origins */ 3267 case 6: /* relative/absolute origins */
3146 rxvt_scr_relative_origin(aR_ state); 3268 scr_relative_origin (state);
3147 break; 3269 break;
3148 case 7: /* autowrap */ 3270 case 7: /* autowrap */
3149 rxvt_scr_autowrap(aR_ state); 3271 scr_autowrap (state);
3150 break; 3272 break;
3151 /* 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 */
3152 case 9: /* X10 mouse reporting */ 3274 case 9: /* X10 mouse reporting */
3153 if (state) /* orthogonal */ 3275 if (state) /* orthogonal */
3154 R->PrivateModes &= ~(PrivMode_MouseX11); 3276 PrivateModes &= ~ (PrivMode_MouseX11);
3155 break; 3277 break;
3156#ifdef menuBar_esc 3278#ifdef menuBar_esc
3157 case menuBar_esc: 3279 case menuBar_esc:
3158#ifdef MENUBAR 3280#ifdef MENUBAR
3159 rxvt_map_menuBar(aR_ state); 3281 map_menuBar (state);
3160#endif 3282#endif
3161 break; 3283 break;
3162#endif 3284#endif
3163#ifdef scrollBar_esc 3285#ifdef scrollBar_esc
3164 case scrollBar_esc: 3286 case scrollBar_esc:
3165 if (rxvt_scrollbar_mapping(aR_ state)) { 3287 if (scrollbar_mapping (state))
3166 rxvt_resize_all_windows(aR_ 0, 0, 0); 3288 {
3167 rxvt_scr_touch(aR_ True); 3289 resize_all_windows (0, 0, 0);
3168 } 3290 scr_touch (true);
3169 break; 3291 }
3292 break;
3170#endif 3293#endif
3171 case 25: /* visible/invisible cursor */ 3294 case 25: /* visible/invisible cursor */
3172 rxvt_scr_cursor_visible(aR_ state); 3295 scr_cursor_visible (state);
3173 break; 3296 break;
3174 /* case 35: - shift keys */ 3297 /* case 35: - shift keys */
3175 /* case 40: - 80 <--> 132 mode */ 3298 /* case 40: - 80 <--> 132 mode */
3176 case 47: /* secondary screen */ 3299 case 47: /* secondary screen */
3177 rxvt_scr_change_screen(aR_ state); 3300 scr_change_screen (state);
3178 break; 3301 break;
3179 /* case 66: - application key pad */ 3302 /* case 66: - application key pad */
3180 /* case 67: - backspace key */ 3303 /* case 67: - backspace key */
3181 case 1000: /* X11 mouse reporting */ 3304 case 1000: /* X11 mouse reporting */
3182 if (state) /* orthogonal */ 3305 if (state) /* orthogonal */
3183 R->PrivateModes &= ~(PrivMode_MouseX10); 3306 PrivateModes &= ~ (PrivMode_MouseX10);
3184 break; 3307 break;
3185#if 0 3308#if 0
3186 case 1001: 3309 case 1001:
3187 break; /* X11 mouse highlighting */ 3310 break; /* X11 mouse highlighting */
3188#endif 3311#endif
3189 case 1010: /* scroll to bottom on TTY output inhibit */ 3312 case 1010: /* scroll to bottom on TTY output inhibit */
3190 if (state) 3313 if (state)
3191 R->Options &= ~Opt_scrollTtyOutput; 3314 Options &= ~Opt_scrollTtyOutput;
3192 else 3315 else
3193 R->Options |= Opt_scrollTtyOutput; 3316 Options |= Opt_scrollTtyOutput;
3194 break; 3317 break;
3195 case 1011: /* scroll to bottom on key press */ 3318 case 1011: /* scroll to bottom on key press */
3196 if (state) 3319 if (state)
3197 R->Options |= Opt_scrollTtyKeypress; 3320 Options |= Opt_scrollTtyKeypress;
3198 else 3321 else
3199 R->Options &= ~Opt_scrollTtyKeypress; 3322 Options &= ~Opt_scrollTtyKeypress;
3200 break; 3323 break;
3201 case 1047: /* secondary screen w/ clearing */ 3324 case 1047: /* secondary screen w/ clearing */
3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3202 if (R->current_screen != PRIMARY) 3326 if (current_screen != PRIMARY)
3203 rxvt_scr_erase_screen(aR_ 2); 3327 scr_erase_screen (2);
3204 rxvt_scr_change_screen(aR_ state); 3328 scr_change_screen (state);
3205 /* FALLTHROUGH */ 3329 /* FALLTHROUGH */
3206 default: 3330 default:
3207 break; 3331 break;
3208 } 3332 }
3209 } 3333 }
3210} 3334}
3211/*}}} */ 3335/*}}} */
3212 3336
3213/*{{{ process sgr sequences */ 3337/*{{{ process sgr sequences */
3214/* INTPROTO */
3215void 3338void
3216rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3217{ 3340{
3218 unsigned int i; 3341 unsigned int i;
3219 short rendset; 3342 short rendset;
3220 int rendstyle; 3343 int rendstyle;
3221 3344
3222 if (nargs == 0) { 3345 if (nargs == 0)
3223 rxvt_scr_rendition(aR_ 0, ~RS_None);
3224 return;
3225 } 3346 {
3347 scr_rendition (0, ~RS_None);
3348 return;
3349 }
3226 for (i = 0; i < nargs; i++) { 3350 for (i = 0; i < nargs; i++)
3351 {
3227 rendset = -1; 3352 rendset = -1;
3228 switch (arg[i]) { 3353 switch (arg[i])
3229 case 0: 3354 {
3355 case 0:
3230 rendset = 0, rendstyle = ~RS_None; 3356 rendset = 0, rendstyle = ~RS_None;
3231 break; 3357 break;
3232 case 1: 3358 case 1:
3233 rendset = 1, rendstyle = RS_Bold; 3359 rendset = 1, rendstyle = RS_Bold;
3234 break; 3360 break;
3235 case 4: 3361 case 4:
3236 rendset = 1, rendstyle = RS_Uline; 3362 rendset = 1, rendstyle = RS_Uline;
3237 break; 3363 break;
3238 case 5: 3364 case 5:
3239 rendset = 1, rendstyle = RS_Blink; 3365 rendset = 1, rendstyle = RS_Blink;
3240 break; 3366 break;
3241 case 7: 3367 case 7:
3242 rendset = 1, rendstyle = RS_RVid; 3368 rendset = 1, rendstyle = RS_RVid;
3243 break; 3369 break;
3244 case 22: 3370 case 22:
3245 rendset = 0, rendstyle = RS_Bold; 3371 rendset = 0, rendstyle = RS_Bold;
3246 break; 3372 break;
3247 case 24: 3373 case 24:
3248 rendset = 0, rendstyle = RS_Uline; 3374 rendset = 0, rendstyle = RS_Uline;
3249 break; 3375 break;
3250 case 25: 3376 case 25:
3251 rendset = 0, rendstyle = RS_Blink; 3377 rendset = 0, rendstyle = RS_Blink;
3252 break; 3378 break;
3253 case 27: 3379 case 27:
3254 rendset = 0, rendstyle = RS_RVid; 3380 rendset = 0, rendstyle = RS_RVid;
3255 break; 3381 break;
3256 } 3382 }
3257 if (rendset != -1) { 3383 if (rendset != -1)
3258 rxvt_scr_rendition(aR_ rendset, rendstyle); 3384 {
3385 scr_rendition (rendset, rendstyle);
3259 continue; /* for(;i;) */ 3386 continue; /* for (;i;) */
3260 } 3387 }
3261 3388
3262 switch (arg[i]) { 3389 switch (arg[i])
3263 case 30: 3390 {
3391 case 30:
3264 case 31: /* set fg color */ 3392 case 31: /* set fg color */
3265 case 32: 3393 case 32:
3266 case 33: 3394 case 33:
3267 case 34: 3395 case 34:
3268 case 35: 3396 case 35:
3269 case 36: 3397 case 36:
3270 case 37: 3398 case 37:
3271 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3272 Color_fg); 3400 Color_fg);
3273 break; 3401 break;
3274#ifdef TTY_256COLOR 3402#ifdef TTY_256COLOR
3275 case 38: 3403 case 38:
3276 if (nargs > i + 2 && arg[i + 1] == 5) { 3404 if (nargs > i + 2 && arg[i + 1] == 5)
3405 {
3277 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3278 Color_fg); 3407 Color_fg);
3279 i += 2; 3408 i += 2;
3280 } 3409 }
3281 break; 3410 break;
3282#endif 3411#endif
3283 case 39: /* default fg */ 3412 case 39: /* default fg */
3284 rxvt_scr_color(aR_ Color_fg, Color_fg); 3413 scr_color (Color_fg, Color_fg);
3285 break; 3414 break;
3286 3415
3287 case 40: 3416 case 40:
3288 case 41: /* set bg color */ 3417 case 41: /* set bg color */
3289 case 42: 3418 case 42:
3290 case 43: 3419 case 43:
3291 case 44: 3420 case 44:
3292 case 45: 3421 case 45:
3293 case 46: 3422 case 46:
3294 case 47: 3423 case 47:
3295 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3296 Color_bg); 3425 Color_bg);
3297 break; 3426 break;
3298#ifdef TTY_256COLOR 3427#ifdef TTY_256COLOR
3299 case 48: 3428 case 48:
3300 if (nargs > i + 2 && arg[i + 1] == 5) { 3429 if (nargs > i + 2 && arg[i + 1] == 5)
3430 {
3301 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3302 Color_bg); 3432 Color_bg);
3303 i += 2; 3433 i += 2;
3304 } 3434 }
3305 break; 3435 break;
3306#endif 3436#endif
3307 case 49: /* default bg */ 3437 case 49: /* default bg */
3308 rxvt_scr_color(aR_ Color_bg, Color_bg); 3438 scr_color (Color_bg, Color_bg);
3309 break; 3439 break;
3310 3440
3311#ifndef NO_BRIGHTCOLOR 3441#ifndef NO_BRIGHTCOLOR
3312 case 90: 3442 case 90:
3313 case 91: /* set bright fg color */ 3443 case 91: /* set bright fg color */
3314 case 92: 3444 case 92:
3315 case 93: 3445 case 93:
3316 case 94: 3446 case 94:
3317 case 95: 3447 case 95:
3318 case 96: 3448 case 96:
3319 case 97: 3449 case 97:
3320 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3321 Color_fg); 3451 Color_fg);
3322 break; 3452 break;
3323 case 100: 3453 case 100:
3324 case 101: /* set bright bg color */ 3454 case 101: /* set bright bg color */
3325 case 102: 3455 case 102:
3326 case 103: 3456 case 103:
3327 case 104: 3457 case 104:
3328 case 105: 3458 case 105:
3329 case 106: 3459 case 106:
3330 case 107: 3460 case 107:
3331 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3332 Color_bg); 3462 Color_bg);
3333 break; 3463 break;
3334#endif 3464#endif
3335 } 3465
3466 }
3336 } 3467 }
3337} 3468}
3338/*}}} */ 3469/*}}} */
3339 3470
3340/*{{{ process Rob Nation's own graphics mode sequences */ 3471/*{{{ process Rob Nation's own graphics mode sequences */
3341/* INTPROTO */
3342void 3472void
3343rxvt_process_graphics(pR) 3473rxvt_term::process_graphics ()
3344{ 3474{
3345 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3475 unsigned char ch, cmd = cmd_getc ();
3346 3476
3347#ifndef RXVT_GRAPHICS 3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q')
3348 if (cmd == 'Q') { /* query graphics */ 3479 { /* query graphics */
3349 rxvt_tt_printf(aR_ "\033G0\n"); /* no graphics */ 3480 tt_printf ("\033G0\n"); /* no graphics */
3350 return; 3481 return;
3351 } 3482 }
3352/* swallow other graphics sequences until terminating ':' */ 3483 /* swallow other graphics sequences until terminating ':' */
3353 do 3484 do
3354 ch = rxvt_cmd_getc(aR); 3485 ch = cmd_getc ();
3355 while (ch != ':'); 3486 while (ch != ':');
3356#else 3487#else
3357 unsigned int nargs; 3488 unsigned int nargs;
3358 int args[NGRX_PTS]; 3489 int args[NGRX_PTS];
3359 unsigned char *text = NULL; 3490 unsigned char *text = NULL;
3360 3491
3492 if (cmd == 'Q')
3361 if (cmd == 'Q') { /* query graphics */ 3493 { /* query graphics */
3362 rxvt_tt_printf(aR_ "\033G1\n"); /* yes, graphics (color) */ 3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3363 return; 3495 return;
3364 } 3496 }
3365 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3498 {
3366 int neg; 3499 int neg;
3367 3500
3368 ch = rxvt_cmd_getc(aR); 3501 ch = cmd_getc ();
3369 neg = (ch == '-'); 3502 neg = (ch == '-');
3370 if (neg || ch == '+') 3503 if (neg || ch == '+')
3371 ch = rxvt_cmd_getc(aR); 3504 ch = cmd_getc ();
3372 3505
3373 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3374 args[nargs] = args[nargs] * 10 + (ch - '0'); 3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3375 if (neg) 3508 if (neg)
3376 args[nargs] = -args[nargs]; 3509 args[nargs] = -args[nargs];
3377 3510
3378 nargs++; 3511 nargs++;
3379 args[nargs] = 0; 3512 args[nargs] = 0;
3380 if (ch != ';') 3513 if (ch != ';')
3381 break; 3514 break;
3382 } 3515 }
3383 3516
3384 if ((cmd == 'T') && (nargs >= 5)) { 3517 if ((cmd == 'T') && (nargs >= 5))
3518 {
3385 int i, len = args[4]; 3519 int i, len = args[4];
3386 3520
3387 text = rxvt_malloc((len + 1) * sizeof(char)); 3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3388 3522
3389 if (text != NULL) { 3523 if (text != NULL)
3524 {
3390 for (i = 0; i < len; i++) 3525 for (i = 0; i < len; i++)
3391 text[i] = rxvt_cmd_getc(aR); 3526 text[i] = cmd_getc ();
3392 text[len] = '\0'; 3527 text[len] = '\0';
3393 } 3528 }
3394 } 3529 }
3395 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text); 3530 Gr_do_graphics (cmd, nargs, args, text);
3396#endif 3531#endif
3397} 3532}
3398/*}}} */ 3533/*}}} */
3399 3534
3400/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3401 3536
3402/* 3537/*
3403 * Send printf() formatted output to the command. 3538 * Send printf () formatted output to the command.
3404 * Only use for small amounts of data. 3539 * Only use for small amounts of data.
3405 */ 3540 */
3406/* EXTPROTO */
3407void 3541void
3408rxvt_tt_printf(pR_ const char *fmt,...) 3542rxvt_term::tt_printf (const char *fmt,...)
3409{ 3543{
3410 va_list arg_ptr; 3544 va_list arg_ptr;
3411 unsigned char buf[256]; 3545 unsigned char buf[256];
3412 3546
3413 va_start(arg_ptr, fmt); 3547 va_start (arg_ptr, fmt);
3414 vsprintf((char *)buf, fmt, arg_ptr); 3548 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3415 va_end(arg_ptr); 3549 va_end (arg_ptr);
3416 rxvt_tt_write(aR_ buf, (unsigned int)STRLEN(buf)); 3550 tt_write (buf, STRLEN (buf));
3417} 3551}
3418 3552
3419/* ---------------------------------------------------------------------- */ 3553/* ---------------------------------------------------------------------- */
3420/* Addresses pasting large amounts of data and rxvt hang
3421 * code pinched from xterm (v_write()) and applied originally to
3422 * rxvt-2.18 - Hops
3423 * Write data to the pty as typed by the user, pasted with the mouse, 3554/* Write data to the pty as typed by the user, pasted with the mouse,
3424 * or generated by us in response to a query ESC sequence. 3555 * or generated by us in response to a query ESC sequence.
3425 */ 3556 */
3426/* EXTPROTO */
3427void 3557void
3428rxvt_tt_write(pR_ const unsigned char *d, unsigned int len) 3558rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3429{ 3559{
3430#define MAX_PTY_WRITE 256 /* POSIX minimum MAX_INPUT */ 3560 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3431 int riten;
3432 unsigned int p;
3433 unsigned char *v_buffer, /* start of physical buffer */
3434 *v_bufstr, /* start of current buffer pending */
3435 *v_bufptr, /* end of current buffer pending */
3436 *v_bufend; /* end of physical buffer */
3437 3561
3438 if (R->v_bufstr == NULL && len > 0) { 3562 if (len)
3439 p = (len / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3440 v_buffer = v_bufstr = v_bufptr = (unsigned char *)rxvt_malloc(p);
3441 v_bufend = v_buffer + p;
3442 } else {
3443 v_buffer = R->v_buffer;
3444 v_bufstr = R->v_bufstr;
3445 v_bufptr = R->v_bufptr;
3446 v_bufend = R->v_bufend;
3447 } 3563 {
3564 if (v_buflen == 0)
3565 {
3566 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3448 3567
3449 /* 3568 if ((unsigned int)written == len)
3450 * Append to the block we already have. Always doing this simplifies the 3569 return;
3451 * code, and isn't too bad, either. If this is a short block, it isn't 3570
3452 * too expensive, and if this is a long block, we won't be able to write 3571 data += written;
3453 * it all anyway. 3572 len -= written;
3454 */ 3573 }
3455 if (len > 0) { 3574
3456 if (v_bufend < v_bufptr + len) { /* run out of room */ 3575
3457 if (v_bufstr != v_buffer) { 3576 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3458 /* there is unused space, move everything down */ 3577
3459 MEMMOVE(v_buffer, v_bufstr, 3578 memcpy (v_buffer + v_buflen, data, len);
3460 (unsigned int)(v_bufptr - v_bufstr)); 3579 v_buflen += len;
3461 v_bufptr -= v_bufstr - v_buffer;
3462 v_bufstr = v_buffer;
3463 } 3580 }
3464 if (v_bufend < v_bufptr + len) {
3465 /* still won't fit: get more space */
3466 /* use most basic realloc because an error is not fatal. */
3467 unsigned int size = v_bufptr - v_buffer;
3468 unsigned int reallocto;
3469 3581
3470 reallocto = ((size + len) / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE; 3582 for (;;)
3471 v_buffer = (unsigned char *)realloc(v_buffer, reallocto); 3583 {
3472 /* save across realloc */ 3584 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3473 if (v_buffer) { 3585
3474 v_bufstr = v_buffer; 3586 if (written > 0)
3475 v_bufptr = v_buffer + size; 3587 {
3476 v_bufend = v_buffer + reallocto; 3588 v_buflen -= written;
3477 } else { /* no memory: ignore entire write request */ 3589
3478 rxvt_print_error("data loss: cannot allocate buffer space"); 3590 if (v_buflen == 0)
3479 v_buffer = v_bufstr; /* restore clobbered pointer */ 3591 {
3480 } 3592 free (v_buffer);
3593 v_buffer = 0;
3594 v_buflen = 0;
3595
3596 pty_ev.set (EVENT_READ);
3597 return;
3598 }
3599
3600 memmove (v_buffer, v_buffer + written, v_buflen);
3601 }
3602 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3603 // original code just ignores this...
3604 destroy ();
3605 else
3606 {
3607 pty_ev.set (EVENT_READ | EVENT_WRITE);
3608 return;
3609 }
3481 } 3610 }
3482 }
3483 if (v_bufend >= v_bufptr + len) { /* new stuff will fit */
3484 MEMCPY(v_bufptr, d, len);
3485 v_bufptr += len;
3486 }
3487 }
3488
3489 /*
3490 * Write out as much of the buffer as we can.
3491 * Be careful not to overflow the pty's input silo.
3492 * We are conservative here and only write a small amount at a time.
3493 *
3494 * If we can't push all the data into the pty yet, we expect write
3495 * to return a non-negative number less than the length requested
3496 * (if some data written) or -1 and set errno to EAGAIN,
3497 * EWOULDBLOCK, or EINTR (if no data written).
3498 *
3499 * (Not all systems do this, sigh, so the code is actually
3500 * a little more forgiving.)
3501 */
3502 if ((p = v_bufptr - v_bufstr) > 0) {
3503 riten = write(R->cmd_fd, v_bufstr, min(p, MAX_PTY_WRITE));
3504 if (riten < 0)
3505 riten = 0;
3506 v_bufstr += riten;
3507 if (v_bufstr >= v_bufptr) /* we wrote it all */
3508 v_bufstr = v_bufptr = v_buffer;
3509 }
3510 /*
3511 * If we have lots of unused memory allocated, return it
3512 */
3513 if (v_bufend - v_bufptr > MAX_PTY_WRITE * 8) { /* arbitrary hysteresis */
3514 /* save pointers across realloc */
3515 unsigned int start = v_bufstr - v_buffer;
3516 unsigned int size = v_bufptr - v_buffer;
3517 unsigned int reallocto;
3518
3519 reallocto = (size / MAX_PTY_WRITE + 1) * MAX_PTY_WRITE;
3520 v_buffer = (unsigned char *)realloc(v_buffer, reallocto);
3521 if (v_buffer) {
3522 v_bufstr = v_buffer + start;
3523 v_bufptr = v_buffer + size;
3524 v_bufend = v_buffer + reallocto;
3525 } else {
3526 /* should we print a warning if couldn't return memory? */
3527 v_buffer = v_bufstr - start; /* restore clobbered pointer */
3528 }
3529 }
3530 R->v_buffer = v_buffer;
3531 R->v_bufstr = v_bufstr;
3532 R->v_bufptr = v_bufptr;
3533 R->v_bufend = v_bufend;
3534} 3611}
3612
3535/*----------------------- end-of-file (C source) -----------------------*/ 3613/*----------------------- end-of-file (C source) -----------------------*/
3536 3614

Diff Legend

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