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.9 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.51 by pcg, Sun Feb 22 08:28:36 2004 UTC

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

Diff Legend

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