ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.14 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.41 by pcg, Sun Feb 22 08:28:36 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.14 2003/12/18 00:29:29 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>
… …
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
… …
58{ 72{
59 free (p); 73 free (p);
60} 74}
61 75
62rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77 :
78 rootwin_ev (this, &rxvt_term::rootwin_cb),
79 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb), fixme
86#endif
64#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 92#endif
67#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 95#endif
96#ifdef USE_XIM
70 x_ev (this, &rxvt_term::x_cb), 97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb), 100 destroy_ev (this, &rxvt_term::destroy_cb),
72 check_ev (this, &rxvt_term::check_cb), 101 pty_ev (this, &rxvt_term::pty_cb),
73 incr_ev (this, &rxvt_term::incr_cb) 102 incr_ev (this, &rxvt_term::incr_cb)
74{ 103{
75 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
76} 105}
77 106
78rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
79{ 108{
80 scr_release ();
81
82#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
83 free (locale);
84#endif
85#ifndef NO_SETOWNER_TTYDEV
86 rxvt_privileged_ttydev (this, RESTORE);
87#endif
88#ifdef UTMP_SUPPORT
89 rxvt_privileged_utmp (this, RESTORE);
90#endif
91#ifdef USE_XIM
92 if (Input_Context != NULL)
93 {
94 XDestroyIC (Input_Context);
95 Input_Context = NULL;
96 }
97#endif
98
99 if (cmd_fd >= 0) 109 if (cmd_fd >= 0)
100 close (cmd_fd); 110 close (cmd_fd);
101 111
102 if (Xfd >= 0) 112#ifndef NO_SETOWNER_TTYDEV
103 XCloseDisplay (Xdisplay); 113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 if (TermWin.parent[0])
123 XDestroyWindow (display->display, TermWin.parent[0]);
124
125 // TODO: free pixcolours, colours should become part of rxvt_display
104 126
105 delete PixColors; 127 delete PixColors;
128
129 displays.put (display);
130
131 scr_release ();
132
133 free (env_windowid);
134 free (env_display);
135 free (env_term);
136 free (env_colorfgbg);
137 free (locale);
138 free (codeset);
139
140 delete envv;
141 delete argv;
106} 142}
107 143
108void 144void
109rxvt_term::destroy () 145rxvt_term::destroy ()
110{ 146{
147 if (display)
148 {
149 rootwin_ev.stop (display);
150 termwin_ev.stop (display);
151 vt_ev.stop (display);
152#ifdef USE_XIM
153 im_destroy ();
154 im_ev.stop (display);
155#endif
156#ifdef HAVE_SCROLLBARS
157 scrollbar_ev.stop (display);
158#endif
159#ifdef MENUBAR
160 menubar_ev.stop (display);
161#endif
162 }
163
111 check_ev.stop (); 164 check_ev.stop ();
112 pty_ev.stop (); 165 pty_ev.stop ();
113 x_ev.stop ();
114#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
167 cursor_blink_ev.stop ();
168#endif
169#ifdef TEXT_BLINK
115 blink_ev.stop (); 170 text_blink_ev.stop ();
116#endif 171#endif
117#ifdef POINTER_BLANK 172#ifdef POINTER_BLANK
118 pointer_ev.stop (); 173 pointer_ev.stop ();
119#endif 174#endif
120 175
… …
128 183
129 delete this; 184 delete this;
130} 185}
131 186
132/*----------------------------------------------------------------------*/ 187/*----------------------------------------------------------------------*/
133/* rxvt_init() */ 188/* rxvt_init () */
134/* LIBPROTO */ 189/* LIBPROTO */
135rxvt_t 190rxvt_t
136rxvt_init (int argc, const char *const *argv) 191rxvt_init (int argc, const char *const *argv)
137{ 192{
138 SET_R (new rxvt_term); 193 SET_R (new rxvt_term);
139 dR;
140 194
141 if (!R->init_vars () || !R->init (argc, argv)) 195 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
142 { 196 {
143 delete R; 197 delete GET_R;
144 return NULL; 198 SET_R (0);
145 } 199 }
146 200
147 return R; 201 return GET_R;
148} 202}
149 203
150/* EXTPROTO */ 204static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
205
151void 206void
152rxvt_init_signals () 207rxvt_init_signals ()
153{ 208{
154/* install exit handler for cleanup */ 209 /* install exit handler for cleanup */
155#if 0 210#if 0
156#ifdef HAVE_ATEXIT 211#ifdef HAVE_ATEXIT
157 atexit(rxvt_clean_exit); 212 atexit (rxvt_clean_exit);
158#else 213#else
159#endif 214#endif
160#endif 215#endif
161 216
162 struct sigaction sa; 217 struct sigaction sa;
… …
168 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 223 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
169 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 224 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
170 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 225 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
171 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 226 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
172 227
173/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 228 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
174/* signal (SIGURG, SIG_DFL); */ 229 /* signal (SIGURG, SIG_DFL); */
175 230
176 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 231 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
177 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 232 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
178} 233}
179 234
180bool 235bool
181rxvt_term::init (int argc, const char *const *argv) 236rxvt_term::init (int argc, const char *const *argv)
182{ 237{
183 dR;//TODO (scrollbar, setidle)
184
185 /* 238 /*
186 * Save and then give up any super-user privileges 239 * Save and then give up any super-user privileges
187 * If we need privileges in any area then we must specifically request it. 240 * If we need privileges in any area then we must specifically request it.
188 * We should only need to be root in these cases: 241 * We should only need to be root in these cases:
189 * 1. write utmp entries on some systems 242 * 1. write utmp entries on some systems
190 * 2. chown tty on some systems 243 * 2. chown tty on some systems
191 */ 244 */
192 rxvt_privileges (this, SAVE); 245 privileges (SAVE);
193 rxvt_privileges (this, IGNORE); 246 privileges (IGNORE);
194 247
195 rxvt_init_secondary (this); 248 init_secondary ();
196 249
197 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 250 const char **cmd_argv = init_resources (argc, argv);
251
252 set_locale ("");
198 253
199#if (MENUBAR_MAX) 254#if (MENUBAR_MAX)
200 rxvt_menubar_read (this, rs[Rs_menu]); 255 menubar_read (rs[Rs_menu]);
201#endif 256#endif
202#ifdef HAVE_SCROLLBARS 257#ifdef HAVE_SCROLLBARS
203 if (Options & Opt_scrollBar) 258 if (Options & Opt_scrollBar)
204 scrollbar_setIdle (); /* set existence for size calculations */ 259 scrollBar.setIdle (); /* set existence for size calculations */
205#endif 260#endif
206 261
207 rxvt_Create_Windows (this, argc, argv); 262 create_windows (argc, argv);
208 263
209 rxvt_init_xlocale (this); 264 init_xlocale ();
210 265
211 scr_reset (); /* initialize screen */ 266 scr_reset (); /* initialize screen */
212#ifdef RXVT_GRAPHICS
213 rxvt_Gr_reset (this); /* reset graphics */
214#endif
215 267
216#if 0 268#if 0
217#ifdef DEBUG_X
218 XSynchronize(Xdisplay, True); 269 XSynchronize (display->display, True);
219#endif
220#endif 270#endif
221 271
222#ifdef HAVE_SCROLLBARS 272#ifdef HAVE_SCROLLBARS
223 if (Options & Opt_scrollBar) 273 if (Options & Opt_scrollBar)
224 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 274 resize_scrollbar (); /* create and map scrollbar */
225#endif 275#endif
226#if (MENUBAR_MAX) 276#if (MENUBAR_MAX)
227 if (menubar_visible(r)) 277 if (menubar_visible (r))
228 XMapWindow (Xdisplay, menuBar.win); 278 XMapWindow (display->display, menuBar.win);
229#endif 279#endif
230#ifdef TRANSPARENT 280#ifdef TRANSPARENT
231 if (Options & Opt_transparent) 281 if (Options & Opt_transparent)
232 { 282 {
233 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 283 XSelectInput (display->display, display->root, PropertyChangeMask);
234 rxvt_check_our_parents (this); 284 check_our_parents ();
235 } 285 }
236#endif 286#endif
287
288 rootwin_ev.start (display, display->root);
289
237 XMapWindow (Xdisplay, TermWin.vt); 290 XMapWindow (display->display, TermWin.vt);
238 XMapWindow (Xdisplay, TermWin.parent[0]); 291 XMapWindow (display->display, TermWin.parent[0]);
239 292
240 rxvt_init_env (this);
241 rxvt_init_command (this, cmd_argv); 293 init_command (cmd_argv);
242 294
243 x_ev.start (Xfd, EVENT_READ);
244 pty_ev.start (cmd_fd, EVENT_READ); 295 pty_ev.start (cmd_fd, EVENT_READ);
245 296
246 check_ev.start (); 297 check_ev.start ();
247
248 process_x_events ();
249 298
250 return true; 299 return true;
251} 300}
252 301
253/* ------------------------------------------------------------------------- * 302/* ------------------------------------------------------------------------- *
… …
257 * Catch a SIGCHLD signal and exit if the direct child has died 306 * Catch a SIGCHLD signal and exit if the direct child has died
258 */ 307 */
259/* ARGSUSED */ 308/* ARGSUSED */
260/* EXTPROTO */ 309/* EXTPROTO */
261RETSIGTYPE 310RETSIGTYPE
262rxvt_Child_signal(int sig __attribute__ ((unused))) 311rxvt_Child_signal (int sig __attribute__ ((unused)))
263{ 312{
264 int pid, save_errno = errno; 313 int pid, save_errno = errno;
265 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 314 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
266 ; 315 ;
267 errno = save_errno; 316 errno = save_errno;
268 317
269#if 0 318#if 0
270 if (pid == R->cmd_pid) 319 if (pid == cmd_pid)
271 exit (EXIT_SUCCESS); 320 exit (EXIT_SUCCESS);
272#endif 321#endif
273} 322}
274 323
275/* 324/*
276 * Catch a fatal signal and tidy up before quitting 325 * Catch a fatal signal and tidy up before quitting
277 */ 326 */
278/* EXTPROTO */ 327/* EXTPROTO */
279RETSIGTYPE 328RETSIGTYPE
280rxvt_Exit_signal(int sig) 329rxvt_Exit_signal (int sig)
281{ 330{
282 signal(sig, SIG_DFL); 331 signal (sig, SIG_DFL);
283#ifdef DEBUG_CMD 332#ifdef DEBUG_CMD
284 rxvt_print_error("signal %d", sig); 333 rxvt_print_error ("signal %d", sig);
285#endif 334#endif
286 rxvt_clean_exit(); 335 rxvt_clean_exit ();
287 kill(getpid(), sig); 336 kill (getpid (), sig);
288} 337}
289 338
290/* ARGSUSED */
291/* INTPROTO */ 339/* INTPROTO */
292int 340int
293rxvt_xerror_handler(const Display * display 341rxvt_xerror_handler (Display *display, XErrorEvent *event)
294 __attribute__ ((unused)), const XErrorEvent * event)
295{ 342{
296 dR;
297
298 if (R->allowedxerror == -1) 343 if (GET_R->allowedxerror == -1)
299 R->allowedxerror = event->error_code; 344 GET_R->allowedxerror = event->error_code;
300 else 345 else
301 { 346 {
302 rxvt_print_error("XError: Request: %d . %d, Error: %d", 347 old_xerror_handler (display, event);
303 event->request_code, event->minor_code,
304 event->error_code);
305
306 R->destroy (); 348 GET_R->destroy ();
307 } 349 }
308 350
309 return 0; 351 return 0;
310} 352}
311 353
… …
316 */ 358 */
317/* EXTPROTO */ 359/* EXTPROTO */
318void 360void
319rxvt_clean_exit () 361rxvt_clean_exit ()
320{ 362{
321 dR; 363 // TODO: rxvtd should clean up all ressources
322 364 if (GET_R)
323 R->destroy (); 365 GET_R->destroy ();
324} 366}
325 367
326/* ------------------------------------------------------------------------- * 368/* ------------------------------------------------------------------------- *
327 * MEMORY ALLOCATION WRAPPERS * 369 * MEMORY ALLOCATION WRAPPERS *
328 * ------------------------------------------------------------------------- */ 370 * ------------------------------------------------------------------------- */
329/* EXTPROTO */ 371/* EXTPROTO */
330void * 372void *
331rxvt_malloc(size_t size) 373rxvt_malloc (size_t size)
332{ 374{
333 void *p; 375 void *p;
334 376
335 p = malloc(size); 377 p = malloc (size);
336 if (p) 378 if (p)
337 return p; 379 return p;
338 380
339 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 381 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
340 rxvt_clean_exit(); 382 rxvt_clean_exit ();
341 exit(EXIT_FAILURE); 383 exit (EXIT_FAILURE);
342/* NOTREACHED */ 384 /* NOTREACHED */
343} 385}
344 386
345/* EXTPROTO */ 387/* EXTPROTO */
346void * 388void *
347rxvt_calloc(size_t number, size_t size) 389rxvt_calloc (size_t number, size_t size)
348{ 390{
349 void *p; 391 void *p;
350 392
351 p = calloc(number, size); 393 p = calloc (number, size);
352 if (p) 394 if (p)
353 return p; 395 return p;
354 396
355 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 397 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
356 rxvt_clean_exit(); 398 rxvt_clean_exit ();
357 exit(EXIT_FAILURE); 399 exit (EXIT_FAILURE);
358/* NOTREACHED */ 400 /* NOTREACHED */
359} 401}
360 402
361/* EXTPROTO */ 403/* EXTPROTO */
362void * 404void *
363rxvt_realloc(void *ptr, size_t size) 405rxvt_realloc (void *ptr, size_t size)
364{ 406{
365 void *p; 407 void *p;
366 408
367 if (ptr) 409 if (ptr)
368 p = realloc(ptr, size); 410 p = realloc (ptr, size);
369 else 411 else
370 p = malloc(size); 412 p = malloc (size);
371 if (p) 413 if (p)
372 return p; 414 return p;
373 415
374 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 416 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
375 rxvt_clean_exit(); 417 rxvt_clean_exit ();
376 exit(EXIT_FAILURE); 418 exit (EXIT_FAILURE);
377/* NOTREACHED */ 419 /* NOTREACHED */
378} 420}
379 421
380/* ------------------------------------------------------------------------- * 422/* ------------------------------------------------------------------------- *
381 * PRIVILEGED OPERATIONS * 423 * PRIVILEGED OPERATIONS *
382 * ------------------------------------------------------------------------- */ 424 * ------------------------------------------------------------------------- */
383/* take care of suid/sgid super-user (root) privileges */ 425/* take care of suid/sgid super-user (root) privileges */
384/* INTPROTO */
385void 426void
386rxvt_privileges(pR_ int mode) 427rxvt_term::privileges (int mode)
387{ 428{
388#if ! defined(__CYGWIN32__) 429#if ! defined(__CYGWIN32__)
389# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 430# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
390/* setreuid() is the poor man's setuid(), seteuid() */ 431 /* setreuid () is the poor man's setuid (), seteuid () */
391# define seteuid(a) setreuid(-1, (a)) 432# define seteuid(a) setreuid(-1, (a))
392# define setegid(a) setregid(-1, (a)) 433# define setegid(a) setregid(-1, (a))
393# define HAVE_SETEUID 434# define HAVE_SETEUID
394# endif 435# endif
395# ifdef HAVE_SETEUID 436# ifdef HAVE_SETEUID
396 switch (mode) { 437 switch (mode)
438 {
397 case IGNORE: 439 case IGNORE:
398 /* 440 /*
399 * change effective uid/gid - not real uid/gid - so we can switch 441 * change effective uid/gid - not real uid/gid - so we can switch
400 * back to root later, as required 442 * back to root later, as required
401 */ 443 */
402 seteuid(getuid()); 444 seteuid (getuid ());
403 setegid(getgid()); 445 setegid (getgid ());
404 break; 446 break;
405 case SAVE: 447 case SAVE:
406 R->euid = geteuid(); 448 euid = geteuid ();
407 R->egid = getegid(); 449 egid = getegid ();
408 break; 450 break;
409 case RESTORE: 451 case RESTORE:
410 seteuid(R->euid); 452 seteuid (euid);
411 setegid(R->egid); 453 setegid (egid);
412 break; 454 break;
413 } 455 }
414# else 456# else
415 switch (mode) { 457 switch (mode)
458 {
416 case IGNORE: 459 case IGNORE:
417 setuid(getuid()); 460 setuid (getuid ());
418 setgid(getgid()); 461 setgid (getgid ());
419 /* FALLTHROUGH */ 462 /* FALLTHROUGH */
420 case SAVE: 463 case SAVE:
421 /* FALLTHROUGH */ 464 /* FALLTHROUGH */
422 case RESTORE: 465 case RESTORE:
423 break; 466 break;
424 } 467 }
425# endif 468# endif
426#endif 469#endif
427} 470}
428 471
429#ifdef UTMP_SUPPORT 472#ifdef UTMP_SUPPORT
430/* EXTPROTO */
431void 473void
432rxvt_privileged_utmp(pR_ char action) 474rxvt_term::privileged_utmp (char action)
433{ 475{
434 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 476 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
435 action, R->next_utmp_action, getpid())); 477 action, next_utmp_action, getpid ()));
436 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 478 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
437 || (R->Options & Opt_utmpInhibit) 479 || (Options & Opt_utmpInhibit)
438 || R->ttydev == NULL || *R->ttydev == '\0') 480 || ttydev == NULL || *ttydev == '\0')
439 return; 481 return;
440 482
441 rxvt_privileges(aR_ RESTORE); 483 privileges (RESTORE);
442 if (action == SAVE) { 484 if (action == SAVE)
485 {
443 R->next_utmp_action = RESTORE; 486 next_utmp_action = RESTORE;
444 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 487 makeutent (ttydev, rs[Rs_display_name]);
488 }
489 else
445 } else { /* action == RESTORE */ 490 { /* action == RESTORE */
446 R->next_utmp_action = IGNORE; 491 next_utmp_action = IGNORE;
447 rxvt_cleanutent(aR); 492 cleanutent ();
448 } 493 }
449 rxvt_privileges(aR_ IGNORE); 494 privileges (IGNORE);
450} 495}
451#endif 496#endif
452 497
453#ifndef NO_SETOWNER_TTYDEV 498#ifndef NO_SETOWNER_TTYDEV
454/* EXTPROTO */
455void 499void
456rxvt_privileged_ttydev(pR_ char action) 500rxvt_term::privileged_ttydev (char action)
457{ 501{
458 D_MAIN((stderr, 502 D_MAIN ((stderr,
459 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 503 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
460 action, R->next_tty_action, getpid())); 504 action, next_tty_action, getpid ()));
461 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 505 if (next_tty_action != action || (action != SAVE && action != RESTORE)
462 || R->ttydev == NULL || *R->ttydev == '\0') 506 || ttydev == NULL || *ttydev == '\0')
463 return; 507 return;
464 508
465 rxvt_privileges(aR_ RESTORE); 509 privileges (RESTORE);
466 510
467 if (action == SAVE) { 511 if (action == SAVE)
512 {
468 R->next_tty_action = RESTORE; 513 next_tty_action = RESTORE;
469# ifndef RESET_TTY_TO_COMMON_DEFAULTS 514# ifndef RESET_TTY_TO_COMMON_DEFAULTS
470/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 515 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
471 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 516 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
472 R->next_tty_action = IGNORE; 517 next_tty_action = IGNORE;
473 else 518 else
474# endif 519# endif
520
475 { 521 {
476 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 522 chown (ttydev, getuid (), ttygid); /* fail silently */
477 chmod(R->ttydev, R->ttymode); 523 chmod (ttydev, ttymode);
478# ifdef HAVE_REVOKE 524# ifdef HAVE_REVOKE
479 revoke(R->ttydev); 525 revoke (ttydev);
480# endif 526# endif
527
481 } 528 }
529 }
530 else
482 } else { /* action == RESTORE */ 531 { /* action == RESTORE */
483 R->next_tty_action = IGNORE; 532 next_tty_action = IGNORE;
484# ifndef RESET_TTY_TO_COMMON_DEFAULTS 533# ifndef RESET_TTY_TO_COMMON_DEFAULTS
485 chmod(R->ttydev, R->ttyfd_stat.st_mode); 534 chmod (ttydev, ttyfd_stat.st_mode);
486 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 535 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
487# else 536# else
488 chmod(R->ttydev, 537 chmod (ttydev,
489 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 538 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
490 chown(R->ttydev, 0, 0); 539 chown (ttydev, 0, 0);
491# endif 540# endif
492 }
493 541
542 }
543
494 rxvt_privileges(aR_ IGNORE); 544 privileges (IGNORE);
495 545
496# ifndef RESET_TTY_TO_COMMON_DEFAULTS 546# ifndef RESET_TTY_TO_COMMON_DEFAULTS
497 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 547 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
498 action == RESTORE ? "Restoring" : (action == 548 action == RESTORE ? "Restoring" : (action ==
499 SAVE ? "Saving" : 549 SAVE ? "Saving" :
500 "UNKNOWN ERROR for"), R->ttydev, 550 "UNKNOWN ERROR for"), ttydev,
501 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 551 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
502 R->ttyfd_stat.st_gid)); 552 ttyfd_stat.st_gid));
503# endif 553# endif
504} 554}
505#endif 555#endif
506 556
507/*----------------------------------------------------------------------*/ 557/*----------------------------------------------------------------------*/
508/* 558/*
509 * window size/position calculcations for XSizeHint and other storage. 559 * window size/position calculcations for XSizeHint and other storage.
510 * if width/height are non-zero then override calculated width/height 560 * if width/height are non-zero then override calculated width/height
511 */ 561 */
512/* EXTPROTO */
513void 562void
514rxvt_window_calc(pR_ unsigned int width, unsigned int height) 563rxvt_term::window_calc (unsigned int width, unsigned int height)
515{ 564{
516 short recalc_x, recalc_y; 565 short recalc_x, recalc_y;
517 int x, y, sb_w, mb_h, flags; 566 int x, y, sb_w, mb_h, flags;
518 unsigned int w, h; 567 unsigned int w, h;
519 unsigned int max_width, max_height; 568 unsigned int max_width, max_height;
520 569
521 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 570 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
522 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 571 TermWin.ncol, TermWin.nrow, szHint.width,
523 R->szHint.height)); 572 szHint.height));
524 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 573 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
525 R->szHint.win_gravity = NorthWestGravity; 574 szHint.win_gravity = NorthWestGravity;
526/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 575 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
527 576
528 recalc_x = recalc_y = 0; 577 recalc_x = recalc_y = 0;
529 flags = 0; 578 flags = 0;
530 if (!R->parsed_geometry) { 579 if (!parsed_geometry)
580 {
531 R->parsed_geometry = 1; 581 parsed_geometry = 1;
532 if (R->rs[Rs_geometry]) 582 if (rs[Rs_geometry])
533 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 583 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
534 if (flags & WidthValue) { 584 if (flags & WidthValue)
585 {
535 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 586 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
536 R->szHint.flags |= USSize; 587 szHint.flags |= USSize;
537 } 588 }
538 if (flags & HeightValue) { 589 if (flags & HeightValue)
590 {
539 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 591 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
540 R->szHint.flags |= USSize; 592 szHint.flags |= USSize;
541 } 593 }
542 if (flags & XValue) { 594 if (flags & XValue)
595 {
543 R->szHint.x = x; 596 szHint.x = x;
544 R->szHint.flags |= USPosition; 597 szHint.flags |= USPosition;
545 if (flags & XNegative) { 598 if (flags & XNegative)
599 {
546 recalc_x = 1; 600 recalc_x = 1;
547 R->szHint.win_gravity = NorthEastGravity; 601 szHint.win_gravity = NorthEastGravity;
548 } 602 }
549 } 603 }
550 if (flags & YValue) { 604 if (flags & YValue)
605 {
551 R->szHint.y = y; 606 szHint.y = y;
552 R->szHint.flags |= USPosition; 607 szHint.flags |= USPosition;
553 if (flags & YNegative) { 608 if (flags & YNegative)
609 {
554 recalc_y = 1; 610 recalc_y = 1;
555 if (R->szHint.win_gravity == NorthEastGravity) 611 if (szHint.win_gravity == NorthEastGravity)
556 R->szHint.win_gravity = SouthEastGravity; 612 szHint.win_gravity = SouthEastGravity;
557 else 613 else
558 R->szHint.win_gravity = SouthWestGravity; 614 szHint.win_gravity = SouthWestGravity;
559 } 615 }
560 } 616 }
561 } 617 }
562/* TODO: BOUNDS */ 618 /* TODO: BOUNDS */
563 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 619 TermWin.width = TermWin.ncol * TermWin.fwidth;
564 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 620 TermWin.height = TermWin.nrow * TermWin.fheight;
565 max_width = MAX_COLS * R->TermWin.fwidth; 621 max_width = MAX_COLS * TermWin.fwidth;
566 max_height = MAX_ROWS * R->TermWin.fheight; 622 max_height = MAX_ROWS * TermWin.fheight;
567 623
568 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 624 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
569 625
570 sb_w = mb_h = 0; 626 sb_w = mb_h = 0;
571 R->window_vt_x = R->window_vt_y = 0; 627 window_vt_x = window_vt_y = 0;
572 if (scrollbar_visible(R)) { 628 if (scrollbar_visible ())
629 {
573 sb_w = scrollbar_TotalWidth(); 630 sb_w = scrollbar_TotalWidth ();
574 R->szHint.base_width += sb_w; 631 szHint.base_width += sb_w;
575 if (!(R->Options & Opt_scrollBar_right)) 632 if (! (Options & Opt_scrollBar_right))
576 R->window_vt_x = sb_w; 633 window_vt_x = sb_w;
577 } 634 }
578 if (menubar_visible(R)) { 635 if (menubar_visible ())
636 {
579 mb_h = menuBar_TotalHeight(); 637 mb_h = menuBar_TotalHeight ();
580 R->szHint.base_height += mb_h; 638 szHint.base_height += mb_h;
581 R->window_vt_y = mb_h; 639 window_vt_y = mb_h;
582 } 640 }
583 R->szHint.width_inc = R->TermWin.fwidth; 641 szHint.width_inc = TermWin.fwidth;
584 R->szHint.height_inc = R->TermWin.fheight; 642 szHint.height_inc = TermWin.fheight;
585 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 643 szHint.min_width = szHint.base_width + szHint.width_inc;
586 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 644 szHint.min_height = szHint.base_height + szHint.height_inc;
587 645
588 if (width && width - R->szHint.base_width < max_width) { 646 if (width && width - szHint.base_width < max_width)
647 {
589 R->szHint.width = width; 648 szHint.width = width;
590 R->TermWin.width = width - R->szHint.base_width; 649 TermWin.width = width - szHint.base_width;
591 } else { 650 }
651 else
652 {
592 MIN_IT(R->TermWin.width, max_width); 653 MIN_IT (TermWin.width, max_width);
593 R->szHint.width = R->szHint.base_width + R->TermWin.width; 654 szHint.width = szHint.base_width + TermWin.width;
594 } 655 }
595 if (height && height - R->szHint.base_height < max_height) { 656 if (height && height - szHint.base_height < max_height)
657 {
596 R->szHint.height = height; 658 szHint.height = height;
597 R->TermWin.height = height - R->szHint.base_height; 659 TermWin.height = height - szHint.base_height;
598 } else { 660 }
661 else
662 {
599 MIN_IT(R->TermWin.height, max_height); 663 MIN_IT (TermWin.height, max_height);
600 R->szHint.height = R->szHint.base_height + R->TermWin.height; 664 szHint.height = szHint.base_height + TermWin.height;
601 } 665 }
602 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 666 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
603 R->window_sb_x = R->szHint.width - sb_w; 667 window_sb_x = szHint.width - sb_w;
604 668
605 if (recalc_x) 669 if (recalc_x)
606 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 670 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
607 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 671 - szHint.width - 2 * TermWin.ext_bwidth);
608 if (recalc_y) 672 if (recalc_y)
609 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 673 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
610 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 674 - szHint.height - 2 * TermWin.ext_bwidth);
611 675
612 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 676 TermWin.ncol = TermWin.width / TermWin.fwidth;
613 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 677 TermWin.nrow = TermWin.height / TermWin.fheight;
614 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 678 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
615 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 679 TermWin.ncol, TermWin.nrow, szHint.width,
616 R->szHint.height)); 680 szHint.height));
617 return; 681 return;
618} 682}
619 683
620/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
621/* 685/*
622 * Tell the teletype handler what size the window is. 686 * Tell the teletype handler what size the window is.
623 * Called after a window size change. 687 * Called after a window size change.
624 */ 688 */
625void 689void
626rxvt_term::tt_winch () 690rxvt_term::tt_winch ()
627{ 691{
628 struct winsize ws; 692 struct winsize ws;
629 693
630 if (cmd_fd < 0) 694 if (cmd_fd < 0)
631 return; 695 return;
632 696
633 ws.ws_col = TermWin.ncol; 697 ws.ws_col = TermWin.ncol;
… …
635 ws.ws_xpixel = ws.ws_ypixel = 0; 699 ws.ws_xpixel = ws.ws_ypixel = 0;
636#ifndef DEBUG_SIZE 700#ifndef DEBUG_SIZE
637 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 701 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
638#else 702#else
639 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 703 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
640 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 704 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
641# ifdef SIGWINCH 705# ifdef SIGWINCH
642 else if (cmd_pid) /* force through to the command */ 706 else if (cmd_pid) /* force through to the command */
643 kill (cmd_pid, SIGWINCH); 707 kill (cmd_pid, SIGWINCH);
644# endif 708# endif
645#endif 709#endif
646} 710}
647 711
648/*----------------------------------------------------------------------*/ 712/*----------------------------------------------------------------------*/
649/* rxvt_change_font() - Switch to a new font */ 713/* rxvt_change_font () - Switch to a new font */
650/* 714/*
651 * init = 1 - initialize 715 * init = 1 - initialize
652 * 716 *
653 * fontname == FONT_UP - switch to bigger font 717 * fontname == FONT_UP - switch to bigger font
654 * fontname == FONT_DN - switch to smaller font 718 * fontname == FONT_DN - switch to smaller font
655 */ 719 */
656/* EXTPROTO */ 720bool
657void
658rxvt_change_font(pR_ int init, const char *fontname) 721rxvt_term::change_font (const char *fontname)
659{ 722{
660} 723 if (fontname == FONT_UP)
724 {
725 // TODO
726 }
727 else if (fontname == FONT_DN)
728 {
729 // TODO
730 }
731 else
732 {
733 rxvt_fontset *fs = new rxvt_fontset (this);
661 734
662/* INTPROTO */ 735 if (fs && fs->populate (fontname))
663void 736 {
737 delete TermWin.fontset;
738 TermWin.fontset = fs;
739 TermWin.fwidth = fs->base_font ()->width;
740 TermWin.fheight = fs->base_font ()->height;
741 TermWin.fbase = fs->base_font ()->ascent;
742
743 // TODO: screen needs to be told about new fonts
744
745 return true;
746 }
747 }
748
749 return false;
750}
751
752bool
664rxvt_font_up_down(pR_ int n, int direction) 753rxvt_term::font_up_down (int n, int direction)
665{ 754{
755 return false;
666} 756}
667 757
668/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
669/*----------------------------------------------------------------------*/ 759/*----------------------------------------------------------------------*/
670/* xterm sequences - title, iconName, color (exptl) */ 760/* xterm sequences - title, iconName, color (exptl) */
671/* EXTPROTO */
672void 761void
673rxvt_set_title(pR_ const char *str) 762rxvt_term::set_title (const char *str)
674{ 763{
675#ifndef SMART_WINDOW_TITLE 764#ifndef SMART_WINDOW_TITLE
676 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 765 XStoreName (display->display, TermWin.parent[0], str);
677#else 766#else
678 char *name; 767 char *name;
679 768
680 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 769 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
681 name = NULL; 770 name = NULL;
682 if (name == NULL || STRCMP(name, str)) 771 if (name == NULL || STRCMP (name, str))
683 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 772 XStoreName (display->display, TermWin.parent[0], str);
684 if (name) 773 if (name)
685 XFree(name); 774 XFree (name);
686#endif 775#endif
687} 776}
688 777
689/* EXTPROTO */
690void 778void
691rxvt_set_iconName(pR_ const char *str) 779rxvt_term::set_iconName (const char *str)
692{ 780{
693#ifndef SMART_WINDOW_TITLE 781#ifndef SMART_WINDOW_TITLE
694 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 782 XSetIconName (display->display, TermWin.parent[0], str);
695#else 783#else
696 char *name; 784 char *name;
697 785
698 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 786 if (XGetIconName (display->display, TermWin.parent[0], &name))
699 name = NULL; 787 name = NULL;
700 if (name == NULL || STRCMP(name, str)) 788 if (name == NULL || STRCMP (name, str))
701 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 789 XSetIconName (display->display, TermWin.parent[0], str);
702 if (name) 790 if (name)
703 XFree(name); 791 XFree (name);
704#endif 792#endif
705} 793}
706 794
707#ifdef XTERM_COLOR_CHANGE 795#ifdef XTERM_COLOR_CHANGE
708/* EXTPROTO */
709void 796void
710rxvt_set_window_color(pR_ int idx, const char *color) 797rxvt_term::set_window_color (int idx, const char *color)
711{ 798{
712 rxvt_color xcol; 799 rxvt_color xcol;
713 int i; 800 int i;
714 801
715 if (color == NULL || *color == '\0') 802 if (color == NULL || *color == '\0')
716 return; 803 return;
717 804
718/* handle color aliases */ 805 /* handle color aliases */
719 if (isdigit(*color)) { 806 if (isdigit (*color))
807 {
720 i = atoi(color); 808 i = atoi (color);
809 if (i >= 8 && i <= 15)
721 if (i >= 8 && i <= 15) { /* bright colors */ 810 { /* bright colors */
722 i -= 8; 811 i -= 8;
723# ifndef NO_BRIGHTCOLOR 812# ifndef NO_BRIGHTCOLOR
724 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 813 PixColors[idx] = PixColors[minBrightCOLOR + i];
725 SET_PIXCOLOR(R, idx); 814 SET_PIXCOLOR (idx);
726 goto Done; 815 goto Done;
727# endif 816# endif
817
728 } 818 }
729 if (i >= 0 && i <= 7) { /* normal colors */ 819 if (i >= 0 && i <= 7)
820 { /* normal colors */
730 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 821 PixColors[idx] = PixColors[minCOLOR + i];
731 SET_PIXCOLOR(R, idx); 822 SET_PIXCOLOR (idx);
732 goto Done; 823 goto Done;
733 } 824 }
734 } 825 }
735 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 826 if (!rXParseAllocColor (& xcol, color))
736 return; 827 return;
737/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 828 /* XStoreColor (display->display, XCMAP, XColor*); */
738 829
739/* 830 /*
740 * FIXME: should free colors here, but no idea how to do it so instead, 831 * FIXME: should free colors here, but no idea how to do it so instead,
741 * so just keep gobbling up the colormap 832 * so just keep gobbling up the colormap
742 */ 833 */
743# if 0 834# if 0
744 for (i = Color_Black; i <= Color_White; i++) 835 for (i = Color_Black; i <= Color_White; i++)
745 if (R->PixColors[idx] == R->PixColors[i]) 836 if (PixColors[idx] == PixColors[i])
746 break; 837 break;
747 if (i > Color_White) { 838 if (i > Color_White)
839 {
748 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 840 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
749 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 841 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
750 DisplayPlanes(R->Xdisplay, Xscreen)); 842 DisplayPlanes (display->display, display->screen));
751 } 843 }
752# endif 844# endif
753 845
754 R->PixColors[idx] = xcol; 846 PixColors[idx] = xcol;
755 SET_PIXCOLOR(R, idx); 847 SET_PIXCOLOR (idx);
756 848
757/* XSetWindowAttributes attr; */ 849 /* XSetWindowAttributes attr; */
758/* Cursor cursor; */ 850 /* Cursor cursor; */
759 Done: 851Done:
760 if (idx == Color_bg && !(R->Options & Opt_transparent)) 852 if (idx == Color_bg && ! (Options & Opt_transparent))
761 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 853 XSetWindowBackground (display->display, TermWin.vt,
762 R->PixColors[Color_bg]); 854 PixColors[Color_bg]);
763 855
764/* handle Color_BD, scrollbar background, etc. */ 856 /* handle Color_BD, scrollbar background, etc. */
765 857
766 rxvt_set_colorfgbg(aR); 858 set_colorfgbg ();
767 rxvt_recolour_cursor(aR); 859 recolour_cursor ();
768/* the only reasonable way to enforce a clean update */ 860 /* the only reasonable way to enforce a clean update */
769 rxvt_scr_poweron(aR); 861 scr_poweron ();
770} 862}
771 863
772#else 864#else
773# define rxvt_set_window_color(aR_ idx,color) ((void)0) 865# define set_window_color (idx,color) ((void)0)
774#endif /* XTERM_COLOR_CHANGE */ 866#endif /* XTERM_COLOR_CHANGE */
775 867
776/* EXTPROTO */
777void 868void
778rxvt_recolour_cursor(pR) 869rxvt_term::recolour_cursor ()
779{ 870{
780 rxvt_color xcol[2];
781
782#if TODO 871#if TODO
872 rxvt_color xcol[2];
873
783 xcol[0] = R->PixColors[Color_pointer]; 874 xcol[0] = PixColors[Color_pointer];
784 xcol[1] = R->PixColors[Color_bg]; 875 xcol[1] = PixColors[Color_bg];
785 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 876 XQueryColors (display->display, XCMAP, xcol, 2);
786 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 877 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
787#endif 878#endif
788} 879}
789 880
790/*----------------------------------------------------------------------*/ 881/*----------------------------------------------------------------------*/
791/* 882/*
792 * find if fg/bg matches any of the normal (low-intensity) colors 883 * find if fg/bg matches any of the normal (low-intensity) colors
793 */ 884 */
794/* INTPROTO */
795void 885void
796rxvt_set_colorfgbg(pR) 886rxvt_term::set_colorfgbg ()
797{ 887{
798 unsigned int i; 888 unsigned int i;
799 const char *xpmb = "\0"; 889 const char *xpmb = "\0";
800 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 890 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
801 891
802 R->env_colorfgbg = 892 env_colorfgbg =
803 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 893 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
804 STRCPY(fstr, "default"); 894 STRCPY (fstr, "default");
805 STRCPY(bstr, "default"); 895 STRCPY (bstr, "default");
806 for (i = Color_Black; i <= Color_White; i++) 896 for (i = Color_Black; i <= Color_White; i++)
807 if (R->PixColors[Color_fg] == R->PixColors[i]) { 897 if (PixColors[Color_fg] == PixColors[i])
898 {
808 sprintf(fstr, "%d", (i - Color_Black)); 899 sprintf (fstr, "%d", (i - Color_Black));
809 break; 900 break;
810 } 901 }
811 for (i = Color_Black; i <= Color_White; i++) 902 for (i = Color_Black; i <= Color_White; i++)
812 if (R->PixColors[Color_bg] == R->PixColors[i]) { 903 if (PixColors[Color_bg] == PixColors[i])
904 {
813 sprintf(bstr, "%d", (i - Color_Black)); 905 sprintf (bstr, "%d", (i - Color_Black));
814#ifdef XPM_BACKGROUND 906#ifdef XPM_BACKGROUND
815 xpmb = "default;"; 907 xpmb = "default;";
816#endif 908#endif
817 break; 909 break;
818 } 910 }
911
819 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 912 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
820 putenv(R->env_colorfgbg);
821 913
822#ifndef NO_BRIGHTCOLOR 914#ifndef NO_BRIGHTCOLOR
823 R->colorfgbg = DEFAULT_RSTYLE; 915 colorfgbg = DEFAULT_RSTYLE;
824 for (i = minCOLOR; i <= maxCOLOR; i++) { 916 for (i = minCOLOR; i <= maxCOLOR; i++)
917 {
825 if (R->PixColors[Color_fg] == R->PixColors[i]) 918 if (PixColors[Color_fg] == PixColors[i])
826 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 919 colorfgbg = SET_FGCOLOR (colorfgbg, i);
827 if (R->PixColors[Color_bg] == R->PixColors[i]) 920 if (PixColors[Color_bg] == PixColors[i])
828 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 921 colorfgbg = SET_BGCOLOR (colorfgbg, i);
829 } 922 }
830#endif 923#endif
831} 924}
832 925
833/*----------------------------------------------------------------------*/ 926/*----------------------------------------------------------------------*/
834/* 927/*
835 * Colour determination for low colour displays, routine from 928 * Colour determination for low colour displays, routine from
836 * Hans de Goede <hans@highrise.nl> 929 * Hans de Goede <hans@highrise.nl>
837 */ 930 */
838 931
839/* EXTPROTO */
840int 932int
841rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 933rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
842{ 934{
843 screen_in_out->set(aR_ colour);
844
845 if (!screen_in_out->set(aR_ colour)) { 935 if (!screen_in_out->set (display, colour))
936 {
846 rxvt_print_error("can't allocate colour: %s", colour); 937 rxvt_print_error ("can't allocate colour: %s", colour);
847 return false; 938 return false;
848 } 939 }
849 940
850 return true; 941 return true;
851} 942}
852 943
853/* -------------------------------------------------------------------- * 944/* -------------------------------------------------------------------- *
854 * - WINDOW RESIZING - * 945 * - WINDOW RESIZING - *
855 * -------------------------------------------------------------------- */ 946 * -------------------------------------------------------------------- */
856/* EXTPROTO */
857void 947void
858rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 948rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
859 int ignoreparent)
860{ 949{
861 int fix_screen; 950 int fix_screen;
862 951
863#ifdef SMART_RESIZE 952#ifdef SMART_RESIZE
864 int old_width = R->szHint.width, old_height = R->szHint.height; 953 int old_width = szHint.width, old_height = szHint.height;
865#endif 954#endif
866 955
867 rxvt_window_calc(aR_ width, height); 956 window_calc (width, height);
868 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 957 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
869 if (!ignoreparent) { 958 if (!ignoreparent)
959 {
870#ifdef SMART_RESIZE 960#ifdef SMART_RESIZE
871/* 961 /*
872 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 962 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
873 * reposition window on resize depending on placement on screen 963 * reposition window on resize depending on placement on screen
874 */ 964 */
875 int x, y, x1, y1; 965 int x, y, x1, y1;
876 int dx, dy; 966 int dx, dy;
877 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 967 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
878 Window unused_cr; 968 Window unused_cr;
879 969
880 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 970 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
881 0, 0, &x, &y, &unused_cr); 971 0, 0, &x, &y, &unused_cr);
882 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 972 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
883 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 973 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
884 /* 974 /*
885 * if Xroot isn't the parent window, a WM will probably have offset 975 * if display->root isn't the parent window, a WM will probably have offset
886 * our position for handles and decorations. Counter it 976 * our position for handles and decorations. Counter it
887 */ 977 */
888 if (x1 != x || y1 != y) { 978 if (x1 != x || y1 != y)
979 {
889 x -= x1; 980 x -= x1;
890 y -= y1; 981 y -= y1;
891 } 982 }
892 983
893 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 984 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
894 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 985 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
895 dx = old_width - R->szHint.width; 986 dx = old_width - szHint.width;
896 dy = old_height - R->szHint.height; 987 dy = old_height - szHint.height;
897 988
898 /* Check position of the center of the window */ 989 /* Check position of the center of the window */
899 if (x < x1) /* left half */ 990 if (x < x1) /* left half */
900 dx = 0; 991 dx = 0;
901 else if (x == x1) /* exact center */ 992 else if (x == x1) /* exact center */
902 dx /= 2; 993 dx /= 2;
903 if (y < y1) /* top half */ 994 if (y < y1) /* top half */
904 dy = 0; 995 dy = 0;
905 else if (y == y1) /* exact center */ 996 else if (y == y1) /* exact center */
906 dy /= 2; 997 dy /= 2;
907 998
908 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 999 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
909 R->szHint.width, R->szHint.height); 1000 szHint.width, szHint.height);
910#else 1001#else
911 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1002 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
912 R->szHint.height); 1003 szHint.height);
913#endif 1004#endif
914 }
915 1005
1006 }
1007
916 fix_screen = (R->TermWin.ncol != R->prev_ncol 1008 fix_screen = (TermWin.ncol != prev_ncol
917 || R->TermWin.nrow != R->prev_nrow); 1009 || TermWin.nrow != prev_nrow);
1010
918 if (fix_screen || width != R->old_width || height != R->old_height) { 1011 if (fix_screen || width != old_width || height != old_height)
1012 {
919 if (scrollbar_visible(R)) { 1013 if (scrollbar_visible ())
1014 {
920 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1015 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
921 0, scrollbar_TotalWidth(), R->szHint.height); 1016 0, scrollbar_TotalWidth (), szHint.height);
922 rxvt_Resize_scrollBar(aR); 1017 resize_scrollbar ();
923 } 1018 }
1019
924 if (menubar_visible(R)) 1020 if (menubar_visible ())
925 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1021 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
926 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1022 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1023
927 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1024 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
928 R->window_vt_y, TermWin_TotalWidth(), 1025 window_vt_y, TermWin_TotalWidth (),
929 TermWin_TotalHeight()); 1026 TermWin_TotalHeight ());
930#ifdef RXVT_GRAPHICS
931 if (R->old_height)
932 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
933 R->old_height - R->szHint.base_height);
934#endif
935 rxvt_scr_clear(aR); 1027 scr_clear ();
936#ifdef XPM_BACKGROUND 1028#ifdef XPM_BACKGROUND
937 rxvt_resize_pixmap(aR); 1029 resize_pixmap ();
938#endif 1030#endif
939 }
940 1031
1032 }
1033
941 if (fix_screen || R->old_height == 0) { 1034 if (fix_screen || old_height == 0)
1035 {
942 int curr_screen = -1; 1036 int curr_screen = -1;
943 uint16_t old_ncol = R->prev_ncol; 1037 int old_ncol = prev_ncol;
944 1038
945 /* scr_reset only works on the primary screen */ 1039 /* scr_reset only works on the primary screen */
946 if (R->old_height) /* this is not the first time through */ 1040 if (old_height) /* this is not the first time through */
1041 {
1042 unsigned int ncol = TermWin.ncol;
1043 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
947 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1044 curr_screen = scr_change_screen (PRIMARY);
948 1045 TermWin.ncol = ncol;
949 R->scr_reset();
950
951 if (curr_screen >= 0) { /* this is not the first time through */
952 rxvt_scr_change_screen(aR_ curr_screen);
953 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
954 } 1046 }
955 }
956 1047
1048 scr_reset ();
1049
1050 if (curr_screen >= 0) /* this is not the first time through */
1051 {
1052 scr_change_screen (curr_screen);
1053 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1054 }
1055 }
1056
957 R->old_width = R->szHint.width; 1057 old_width = szHint.width;
958 R->old_height = R->szHint.height; 1058 old_height = szHint.height;
959 1059
960#ifdef USE_XIM 1060#ifdef USE_XIM
961 rxvt_IMSetStatusPosition(aR); 1061 IMSetStatusPosition ();
962#endif 1062#endif
963} 1063}
964 1064
965/* 1065/*
966 * Set the width/height of the vt window in characters. Units are pixels. 1066 * Set the width/height of the vt window in characters. Units are pixels.
967 * good for toggling 80/132 columns 1067 * good for toggling 80/132 columns
968 */ 1068 */
969/* EXTPROTO */
970void 1069void
971rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1070rxvt_term::set_widthheight (unsigned int width, unsigned int height)
972{ 1071{
973 XWindowAttributes wattr; 1072 XWindowAttributes wattr;
974 1073
975 if (width == 0 || height == 0) { 1074 if (width == 0 || height == 0)
1075 {
976 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1076 XGetWindowAttributes (display->display, display->root, &wattr);
977 if (width == 0) 1077 if (width == 0)
978 width = wattr.width - R->szHint.base_width; 1078 width = wattr.width - szHint.base_width;
979 if (height == 0) 1079 if (height == 0)
980 height = wattr.height - R->szHint.base_height; 1080 height = wattr.height - szHint.base_height;
981 } 1081 }
982 if (width != R->TermWin.width || height != R->TermWin.height) { 1082 if (width != TermWin.width || height != TermWin.height)
1083 {
983 width += R->szHint.base_width; 1084 width += szHint.base_width;
984 height += R->szHint.base_height; 1085 height += szHint.base_height;
985 rxvt_resize_all_windows(aR_ width, height, 0); 1086 resize_all_windows (width, height, 0);
986 } 1087 }
987} 1088}
988 1089
989/* -------------------------------------------------------------------- * 1090/* -------------------------------------------------------------------- *
990 * - X INPUT METHOD ROUTINES - * 1091 * - X INPUT METHOD ROUTINES - *
991 * -------------------------------------------------------------------- */ 1092 * -------------------------------------------------------------------- */
992#ifdef USE_XIM 1093#ifdef USE_XIM
993/* INTPROTO */ 1094
994void 1095void
995rxvt_setSize(pR_ XRectangle * size) 1096rxvt_term::im_set_size (XRectangle *size)
996{ 1097{
997 size->x = R->TermWin.int_bwidth; 1098 size->x = TermWin.int_bwidth;
998 size->y = R->TermWin.int_bwidth; 1099 size->y = TermWin.int_bwidth;
999 size->width = Width2Pixel(R->TermWin.ncol); 1100 size->width = Width2Pixel (TermWin.ncol);
1000 size->height = Height2Pixel(R->TermWin.nrow); 1101 size->height = Height2Pixel (TermWin.nrow);
1001} 1102}
1002 1103
1003/* INTPROTO */
1004void 1104void
1005rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1105rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1006{ 1106{
1007 *fg = R->PixColors[Color_fg]; 1107 *fg = PixColors[Color_fg];
1008 *bg = R->PixColors[Color_bg]; 1108 *bg = PixColors[Color_bg];
1009} 1109}
1010 1110
1011/* Checking whether input method is running. */ 1111/* Checking whether input method is running. */
1012/* INTPROTO */
1013Bool 1112bool
1014rxvt_IMisRunning(pR) 1113rxvt_term::IMisRunning ()
1015{ 1114{
1016 char *p; 1115 char *p;
1017 Atom atom; 1116 Atom atom;
1018 Window win; 1117 Window win;
1019 char server[IMBUFSIZ]; 1118 char server[IMBUFSIZ];
1020 1119
1021/* get current locale modifier */ 1120 /* get current locale modifier */
1022 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1121 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1122 {
1023 STRCPY(server, "@server="); 1123 STRCPY (server, "@server=");
1024 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1124 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1025 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1125 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1026 *p = '\0'; 1126 *p = '\0';
1027 1127
1028 atom = XInternAtom(R->Xdisplay, server, False); 1128 atom = XInternAtom (display->display, server, False);
1029 win = XGetSelectionOwner(R->Xdisplay, atom); 1129 win = XGetSelectionOwner (display->display, atom);
1030 if (win != None) 1130 if (win != None)
1031 return True; 1131 return True;
1032 } 1132 }
1033 return False; 1133 return False;
1034} 1134}
1035 1135
1036/* EXTPROTO */
1037void 1136void
1038rxvt_IMSendSpot(pR) 1137rxvt_term::IMSendSpot ()
1039{ 1138{
1040 XPoint spot; 1139 XPoint spot;
1041 XVaNestedList preedit_attr; 1140 XVaNestedList preedit_attr;
1042 1141
1043 if (R->Input_Context == NULL 1142 if (Input_Context == NULL
1044 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1143 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1045 || !(R->event_type == KeyPress 1144 || ! (event_type == KeyPress
1046 || R->event_type == Expose 1145 || event_type == Expose
1047 || R->event_type == NoExpose 1146 || event_type == NoExpose
1048 || R->event_type == SelectionNotify 1147 || event_type == SelectionNotify
1049 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1148 || event_type == ButtonRelease || event_type == FocusIn)
1050 || !rxvt_IMisRunning(aR)) 1149 || !IMisRunning ())
1051 return; 1150 return;
1052 1151
1053 rxvt_setPosition(aR_ & spot); 1152 im_set_position (&spot);
1054 1153
1055 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1154 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1056 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1155 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1057 XFree(preedit_attr); 1156 XFree (preedit_attr);
1058} 1157}
1059 1158
1060/* EXTPROTO */
1061void 1159void
1062rxvt_setTermFontSet(pR_ int idx)
1063{
1064 char *string;
1065 long length;
1066 int success = 0;
1067
1068 if (idx < 0 || idx >= MAX_NFONTS)
1069 return;
1070}
1071
1072/* INTPROTO */
1073void
1074rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1160rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1075 XRectangle * needed_rect) 1161 XRectangle * needed_rect)
1076{ 1162{
1077 int mbh, vtx = 0; 1163 int mbh, vtx = 0;
1078 1164
1079 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1165 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1080 vtx = scrollbar_TotalWidth(); 1166 vtx = scrollbar_TotalWidth ();
1167
1081 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1168 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1082 mbh -= R->TermWin.lineSpace; 1169 mbh -= TermWin.lineSpace;
1083 1170
1084 preedit_rect->x = needed_rect->width + vtx; 1171 preedit_rect->x = needed_rect->width + vtx;
1085 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1172 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1086 1173
1087 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1174 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1088 + vtx;
1089 preedit_rect->height = Height2Pixel(1); 1175 preedit_rect->height = Height2Pixel (1);
1090 1176
1091 status_rect->x = vtx; 1177 status_rect->x = vtx;
1092 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1178 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1093 1179
1094 status_rect->width = needed_rect->width ? needed_rect->width 1180 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1095 : Width2Pixel(R->TermWin.ncol + 1);
1096 status_rect->height = Height2Pixel(1); 1181 status_rect->height = Height2Pixel (1);
1097} 1182}
1098 1183
1099/* ARGSUSED */
1100/* INTPROTO */
1101void 1184void
1102rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1185rxvt_term::im_destroy ()
1103 __attribute__ ((unused)), XPointer call_data
1104 __attribute__ ((unused)))
1105{ 1186{
1106 dR; 1187 if (Input_Context)
1107 1188 {
1189 XDestroyIC (Input_Context);
1108 R->Input_Context = NULL; 1190 Input_Context = NULL;
1109/* To avoid Segmentation Fault in C locale: Solaris only? */ 1191 }
1110 if (STRCMP(R->locale, "C")) 1192
1111 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1193 if (input_method)
1112 rxvt_IMInstantiateCallback, NULL); 1194 {
1195 display->put_xim (input_method);
1196 input_method = 0;
1197 }
1113} 1198}
1114 1199
1115/* 1200/*
1116 * X manual pages and include files don't match on some systems: 1201 * Try to open a XIM with the current modifiers, then see if we can
1117 * some think this is an XIDProc and others an XIMProc so we can't 1202 * open a suitable preedit type
1118 * use the first argument - need to update this to be nice for
1119 * both types via some sort of configure detection
1120 */ 1203 */
1121/* ARGSUSED */ 1204bool
1122/* EXTPROTO */ 1205rxvt_term::IM_get_IC (const char *modifiers)
1123void
1124rxvt_IMInstantiateCallback(Display * unused
1125 __attribute__ ((unused)), XPointer client_data
1126 __attribute__ ((unused)), XPointer call_data
1127 __attribute__ ((unused)))
1128{ 1206{
1129 dR; 1207 int i, j, found;
1208 XIM xim;
1209 XPoint spot;
1210 XRectangle rect, status_rect, needed_rect;
1211 unsigned long fg, bg;
1212 const char *p;
1213 char **s;
1214 XIMStyles *xim_styles;
1215 XVaNestedList preedit_attr, status_attr;
1216
1217 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1218 return false;
1219
1220 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1221 input_method = display->get_xim (locale, modifiers);
1222 if (input_method == NULL)
1223 return false;
1224
1225 xim = input_method->xim;
1226
1227 xim_styles = NULL;
1228 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1229 || !xim_styles || !xim_styles->count_styles)
1230 {
1231 display->put_xim (input_method);
1232 return false;
1233 }
1234
1235 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1236 s = rxvt_splitcommastring (p);
1237 for (i = found = 0; !found && s[i]; i++)
1238 {
1239 if (!STRCMP (s[i], "OverTheSpot"))
1240 input_style = (XIMPreeditPosition | XIMStatusNothing);
1241 else if (!STRCMP (s[i], "OffTheSpot"))
1242 input_style = (XIMPreeditArea | XIMStatusArea);
1243 else if (!STRCMP (s[i], "Root"))
1244 input_style = (XIMPreeditNothing | XIMStatusNothing);
1245
1246 for (j = 0; j < xim_styles->count_styles; j++)
1247 if (input_style == xim_styles->supported_styles[j])
1248 {
1249 found = 1;
1250 break;
1251 }
1252 }
1253
1254 for (i = 0; s[i]; i++)
1255 free (s[i]);
1256
1257 free (s);
1258 XFree (xim_styles);
1259
1260 if (!found)
1261 {
1262 display->put_xim (input_method);
1263 return false;
1264 }
1265
1266 preedit_attr = status_attr = NULL;
1267
1268 if (input_style & XIMPreeditPosition)
1269 {
1270 im_set_size (&rect);
1271 im_set_position (&spot);
1272 im_set_color (&fg, &bg);
1273
1274 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1275 XNSpotLocation, &spot,
1276 XNForeground, fg, XNBackground, bg,
1277 //XNFontSet, TermWin.fontset,
1278 NULL);
1279 }
1280 else if (input_style & XIMPreeditArea)
1281 {
1282 im_set_color (&fg, &bg);
1283
1284 /*
1285 * The necessary width of preedit area is unknown
1286 * until create input context.
1287 */
1288 needed_rect.width = 0;
1289
1290 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1291
1292 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1293 XNForeground, fg, XNBackground, bg,
1294 //XNFontSet, TermWin.fontset,
1295 NULL);
1296 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1297 XNForeground, fg, XNBackground, bg,
1298 //XNFontSet, TermWin.fontset,
1299 NULL);
1300 }
1301
1302 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1303 XNClientWindow, TermWin.parent[0],
1304 XNFocusWindow, TermWin.parent[0],
1305 preedit_attr ? XNPreeditAttributes : NULL,
1306 preedit_attr,
1307 status_attr ? XNStatusAttributes : NULL,
1308 status_attr, NULL);
1309 if (preedit_attr) XFree (preedit_attr);
1310 if (status_attr) XFree (status_attr);
1311
1312 if (Input_Context == NULL)
1313 {
1314 rxvt_print_error ("failed to create input context");
1315 display->put_xim (input_method);
1316 return false;
1317 }
1318
1319 if (input_style & XIMPreeditArea)
1320 IMSetStatusPosition ();
1321
1322 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1323 return true;
1324}
1325
1326void
1327rxvt_term::im_cb ()
1328{
1130 int i, found, had_im; 1329 int i, found, had_im;
1131 const char *p; 1330 const char *p;
1132 char **s; 1331 char **s;
1133 char buf[IMBUFSIZ]; 1332 char buf[IMBUFSIZ];
1134 1333
1334 im_destroy ();
1335
1135 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1336 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1136 if (R->Input_Context) 1337 if (Input_Context)
1137 return; 1338 return;
1138 1339
1139#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1340#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1140 if (R->rs[Rs_imLocale]) 1341 if (rs[Rs_imLocale])
1141 setlocale (LC_CTYPE, R->rs[Rs_imLocale]); 1342 SET_LOCALE (rs[Rs_imLocale]);
1142#endif 1343#endif
1143 1344
1144 p = R->rs[Rs_inputMethod]; 1345 p = rs[Rs_inputMethod];
1145 if (p && *p) 1346 if (p && *p)
1146 { 1347 {
1147 bool found = false; 1348 bool found = false;
1148 1349
1149 s = rxvt_splitcommastring (p); 1350 s = rxvt_splitcommastring (p);
… …
1151 { 1352 {
1152 if (*s[i]) 1353 if (*s[i])
1153 { 1354 {
1154 STRCPY (buf, "@im="); 1355 STRCPY (buf, "@im=");
1155 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1356 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1156 if ((p = XSetLocaleModifiers (buf)) && *p 1357 if (IM_get_IC (buf))
1157 && rxvt_IM_get_IC (aR))
1158 { 1358 {
1159 found = true; 1359 found = true;
1160 break; 1360 break;
1161 } 1361 }
1162 } 1362 }
1163 } 1363 }
1164 for (i = 0; s[i]; i++) 1364 for (i = 0; s[i]; i++)
1165 free(s[i]); 1365 free (s[i]);
1166 free(s); 1366 free (s);
1167 1367
1168 if (found) 1368 if (found)
1169 goto done; 1369 goto done;
1170 } 1370 }
1171 1371
1172/* try with XMODIFIERS env. var. */ 1372 /* try with XMODIFIERS env. var. */
1173 if ((p = XSetLocaleModifiers ("")) && *p 1373 if (IM_get_IC (""))
1174 && rxvt_IM_get_IC (aR))
1175 goto done; 1374 goto done;
1176 1375
1177/* try with no modifiers base IF the user didn't specify an IM */ 1376 /* try with no modifiers base IF the user didn't specify an IM */
1178 if ((p = XSetLocaleModifiers ("@im=none")) && *p 1377 if (IM_get_IC ("@im=none"))
1179 && rxvt_IM_get_IC (aR) == True)
1180 goto done; 1378 goto done;
1181 1379
1182done: 1380done:
1183#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1381#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1184 if (R->rs[Rs_imLocale]) 1382 if (rs[Rs_imLocale])
1185 setlocale (LC_CTYPE, R->locale); 1383 SET_LOCALE (locale);
1186#endif 1384#endif
1187} 1385}
1188 1386
1189/*
1190 * Try to open a XIM with the current modifiers, then see if we can
1191 * open a suitable preedit type
1192 */
1193/* INTPROTO */
1194Bool
1195rxvt_IM_get_IC(pR)
1196{
1197 int i, j, found;
1198 XIM xim;
1199 XPoint spot;
1200 XRectangle rect, status_rect, needed_rect;
1201 unsigned long fg, bg;
1202 const char *p;
1203 char **s;
1204 XIMStyles *xim_styles;
1205 XVaNestedList preedit_attr, status_attr;
1206 XIMCallback ximcallback;
1207
1208 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1209 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL);
1210 if (xim == NULL)
1211 return False;
1212
1213 xim_styles = NULL;
1214 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)
1215 || !xim_styles || !xim_styles->count_styles) {
1216 XCloseIM(xim);
1217 return False;
1218 }
1219
1220 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType]
1221 : "OverTheSpot,OffTheSpot,Root";
1222 s = rxvt_splitcommastring(p);
1223 for (i = found = 0; !found && s[i]; i++) {
1224 if (!STRCMP(s[i], "OverTheSpot"))
1225 R->input_style = (XIMPreeditPosition | XIMStatusNothing);
1226 else if (!STRCMP(s[i], "OffTheSpot"))
1227 R->input_style = (XIMPreeditArea | XIMStatusArea);
1228 else if (!STRCMP(s[i], "Root"))
1229 R->input_style = (XIMPreeditNothing | XIMStatusNothing);
1230
1231 for (j = 0; j < xim_styles->count_styles; j++)
1232 if (R->input_style == xim_styles->supported_styles[j]) {
1233 found = 1;
1234 break;
1235 }
1236 }
1237 for (i = 0; s[i]; i++)
1238 free(s[i]);
1239 free(s);
1240 XFree(xim_styles);
1241
1242 if (!found) {
1243 XCloseIM(xim);
1244 return False;
1245 }
1246
1247 ximcallback.callback = rxvt_IMDestroyCallback;
1248
1249/* XXX: not sure why we need this (as well as IC one below) */
1250 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1251
1252 preedit_attr = status_attr = NULL;
1253
1254 if (R->input_style & XIMPreeditPosition) {
1255 rxvt_setSize(aR_ & rect);
1256 rxvt_setPosition(aR_ & spot);
1257 rxvt_setColor(aR_ & fg, &bg);
1258
1259 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1260 XNSpotLocation, &spot,
1261 XNForeground, fg, XNBackground, bg,
1262 //XNFontSet, R->TermWin.fontset,
1263 NULL);
1264 } else if (R->input_style & XIMPreeditArea) {
1265 rxvt_setColor(aR_ & fg, &bg);
1266
1267 /*
1268 * The necessary width of preedit area is unknown
1269 * until create input context.
1270 */
1271 needed_rect.width = 0;
1272
1273 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1274
1275 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1276 XNForeground, fg, XNBackground, bg,
1277 //XNFontSet, R->TermWin.fontset,
1278 NULL);
1279 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1280 XNForeground, fg, XNBackground, bg,
1281 //XNFontSet, R->TermWin.fontset,
1282 NULL);
1283 }
1284 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1285 XNClientWindow, R->TermWin.parent[0],
1286 XNFocusWindow, R->TermWin.parent[0],
1287 XNDestroyCallback, &ximcallback,
1288 preedit_attr ? XNPreeditAttributes : NULL,
1289 preedit_attr,
1290 status_attr ? XNStatusAttributes : NULL,
1291 status_attr, NULL);
1292 if (preedit_attr)
1293 XFree(preedit_attr);
1294 if (status_attr)
1295 XFree(status_attr);
1296 if (R->Input_Context == NULL) {
1297 rxvt_print_error("failed to create input context");
1298 XCloseIM(xim);
1299 return False;
1300 }
1301 if (R->input_style & XIMPreeditArea)
1302 rxvt_IMSetStatusPosition(aR);
1303 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1304 return True;
1305}
1306
1307/* EXTPROTO */
1308void 1387void
1309rxvt_IMSetStatusPosition(pR) 1388rxvt_term::IMSetStatusPosition ()
1310{ 1389{
1311 XRectangle preedit_rect, status_rect, *needed_rect; 1390 XRectangle preedit_rect, status_rect, *needed_rect;
1312 XVaNestedList preedit_attr, status_attr; 1391 XVaNestedList preedit_attr, status_attr;
1313 1392
1314 if (R->Input_Context == NULL 1393 if (Input_Context == NULL
1315 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1394 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1316 || !rxvt_IMisRunning(aR)) 1395 || !IMisRunning ())
1317 return; 1396 return;
1318 1397
1319/* Getting the necessary width of preedit area */ 1398 /* Getting the necessary width of preedit area */
1320 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1399 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1321 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1400 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1322 XFree(status_attr); 1401 XFree (status_attr);
1323 1402
1324 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1403 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1325 1404
1326 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1405 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1327 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1406 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1328 1407
1329 XSetICValues(R->Input_Context, 1408 XSetICValues (Input_Context,
1330 XNPreeditAttributes, preedit_attr, 1409 XNPreeditAttributes, preedit_attr,
1331 XNStatusAttributes, status_attr, NULL); 1410 XNStatusAttributes, status_attr, NULL);
1332 1411
1333 XFree(preedit_attr); 1412 XFree (preedit_attr);
1334 XFree(status_attr); 1413 XFree (status_attr);
1335} 1414}
1336#endif /* USE_XIM */ 1415#endif /* USE_XIM */
1337 1416
1338/*----------------------------------------------------------------------*/ 1417/*----------------------------------------------------------------------*/
1339rxvt_t rxvt_current_term; 1418rxvt_t rxvt_current_term;

Diff Legend

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