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.6 by pcg, Tue Nov 25 17:11:33 2003 UTC vs.
Revision 1.50 by pcg, Sun Feb 22 08:09:37 2004 UTC

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

Diff Legend

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