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

Diff Legend

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