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.8 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.37 by pcg, Sat Feb 21 20:35:33 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines