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.4 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.240 by sasha, Fri Aug 10 22:10:36 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.c 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.4 2003/11/25 15:25:17 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-2006 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.
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */ 35#include "keyboard.h"
36#include "rxvtperl.h"
36 37
38#include <limits>
39
37#include <signal.h> 40#include <csignal>
41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
40# include <grp.h> 44# include <grp.h>
41#endif 45#endif
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
51vector<rxvt_term *> rxvt_term::termlist;
52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
56static char curlocale[128], savelocale[128];
57
58bool
59rxvt_set_locale (const char *locale) NOTHROW
60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
66 if (!locale || !memcmp (locale, curlocale, size))
67 return false;
68
69 memcpy (curlocale, locale, size);
70 setlocale (LC_CTYPE, curlocale);
71 return true;
72}
73
47void * 74void
48rxvt_term::operator new (size_t s) 75rxvt_push_locale (const char *locale) NOTHROW
49{ 76{
50 void *p = malloc (s); 77 strcpy (savelocale, curlocale);
78 rxvt_set_locale (locale);
79}
51 80
52 MEMSET (p, 0, s); 81void
82rxvt_pop_locale () NOTHROW
83{
84 rxvt_set_locale (savelocale);
85}
86
87#if ENABLE_COMBINING
88class rxvt_composite_vec rxvt_composite;
89
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{
92 compose_char *cc;
93
94 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line.
96 cc = (*this)[c1];
97 while (cc)
98 {
99 if (cc->c2 == c2) return c1;
100 cc = (*this)[cc->c1];
101 }
102
103 // check to see wether this combination already exists otherwise
104 for (cc = v.end (); cc-- > v.begin (); )
105 {
106 if (cc->c1 == c1 && cc->c2 == c2)
107 return COMPOSE_LO + (cc - v.begin ());
108 }
109
110 // allocate a new combination
111 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
112 {
113 static int seen;
114
115 if (!seen++)
116 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
117
118 return REPLACEMENT_CHAR;
119 }
120
121 v.push_back (compose_char (c1, c2));
122
123 return v.size () - 1 + COMPOSE_LO;
124}
125
126int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
127{
128 compose_char *cc = (*this)[c];
129
130 if (!cc)
131 {
132 if (r) *r = c;
133 return 1;
134 }
135
136 int len = expand (cc->c1, r);
137
138 if (r) r += len;
139
140 if (cc->c2 != NOCHAR)
141 {
142 len++;
143 if (r) *r++ = cc->c2;
144 }
145
53 return p; 146 return len;
54}
55 147
56void
57rxvt_term::operator delete (void *p, size_t s)
58{
59 free (p);
60} 148}
149#endif
61 150
62rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
152 :
153#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
156#if ENABLE_TRANSPARENCY
157 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
158#endif
159#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb),
161#endif
162#ifdef CURSOR_BLINK
163 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
164#endif
165#ifdef TEXT_BLINK
166 text_blink_ev (this, &rxvt_term::text_blink_cb),
167#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170#endif
171#ifdef SELECTION_SCROLLING
172 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176#endif
177#ifdef POINTER_BLANK
178 pointer_ev (this, &rxvt_term::pointer_cb),
179#endif
180#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb),
182#endif
183#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb),
185#endif
186 termwin_ev (this, &rxvt_term::x_cb),
187 vt_ev (this, &rxvt_term::x_cb),
188 child_ev (this, &rxvt_term::child_cb),
189 check_ev (this, &rxvt_term::check_cb),
190 flush_ev (this, &rxvt_term::flush_cb),
191 destroy_ev (this, &rxvt_term::destroy_cb),
63: pty_ev(this, &rxvt_term::pty_cb), 192 pty_ev (this, &rxvt_term::pty_cb),
64 x_ev (this, &rxvt_term::x_cb) 193 incr_ev (this, &rxvt_term::incr_cb)
65{ 194{
66 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196
197 termlist.push_back (this);
198
199#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager;
201#endif
202}
203
204// clean up the most important stuff, do *not* call x or free mem etc.
205// for use before an emergency exit
206void rxvt_term::emergency_cleanup ()
207{
208 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP);
210
211 pty_ev.stop ();
212 delete pty; pty = 0;
67} 213}
68 214
69rxvt_term::~rxvt_term () 215rxvt_term::~rxvt_term ()
70{ 216{
71 delete PixColors; 217 termlist.erase (find (termlist.begin (), termlist.end(), this));
72}
73 218
74/*----------------------------------------------------------------------*/ 219 emergency_cleanup ();
75/* rxvt_init() */
76/* LIBPROTO */
77rxvt_t
78rxvt_init(int argc, const char *const *argv)
79{
80 SET_R(new rxvt_term);
81 dR;
82 220
83 if (!R->init_vars () || !R->init (argc, argv)) 221#if ENABLE_STYLES
84 { 222 for (int i = RS_styleCount; --i; )
85 delete R; 223 if (fontset[i] != fontset[0])
86 return NULL; 224 delete fontset[i];
225#endif
226 delete fontset[0];
227
228 if (display)
87 } 229 {
230 selection_clear ();
88 231
232#ifdef USE_XIM
233 im_destroy ();
234#endif
235#ifdef XTERM_SCROLLBAR
236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
238#endif
239#ifdef PLAIN_SCROLLBAR
240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
241#endif
242#ifdef NEXT_SCROLLBAR
243 if (blackGC) XFreeGC (dpy, blackGC);
244 if (whiteGC) XFreeGC (dpy, whiteGC);
245 if (grayGC) XFreeGC (dpy, grayGC);
246 if (darkGC) XFreeGC (dpy, darkGC);
247 if (stippleGC) XFreeGC (dpy, stippleGC);
248 if (dimple) XFreePixmap (dpy, dimple);
249 if (upArrow) XFreePixmap (dpy, upArrow);
250 if (downArrow) XFreePixmap (dpy, downArrow);
251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
253#endif
254#ifdef RXVT_SCROLLBAR
255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
258#endif
259 if (gc) XFreeGC (dpy, gc);
260
261 delete drawable;
262 // destroy all windows
263 if (parent[0])
264 XDestroyWindow (dpy, parent[0]);
265
266 for (int i = 0; i < TOTAL_COLORS; i++)
267 if (ISSET_PIXCOLOR (i))
268 {
269 pix_colors_focused [i].free (this);
270#if OFF_FOCUS_FADING
271 pix_colors_unfocused [i].free (this);
272#endif
273 }
274
275 clear ();
276 }
277
278 delete [] pix_colors_focused;
279#if OFF_FOCUS_FADING
280 delete [] pix_colors_unfocused;
281#endif
282
283 displays.put (display);
284
285 scr_release ();
286
287 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]);
290
291 free (selection.text);
292 // TODO: manage env vars in child only(!)
293 free (env_display);
294 free (env_term);
295 free (locale);
296 free (v_buffer);
297 free (incr_buf);
298
299 delete envv;
300 delete argv;
301
302#ifdef KEYSYM_RESOURCE
303 delete keyboard;
304#endif
305}
306
307// child has exited, usually destroys
308void
309rxvt_term::child_cb (child_watcher &w, int status)
310{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312
313 cmd_pid = 0;
314
315 if (!option (Opt_hold))
316 destroy ();
317}
318
319void
320rxvt_term::destroy ()
321{
322 if (destroy_ev.active)
89 return R; 323 return;
90}
91 324
92bool 325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
93rxvt_term::init (int argc, const char *const *argv)
94{
95 dR;//TODO (scrollbar, setidle)
96 326
97 /* 327#if ENABLE_OVERLAY
98 * Save and then give up any super-user privileges 328 scr_overlay_off ();
99 * If we need privileges in any area then we must specifically request it.
100 * We should only need to be root in these cases:
101 * 1. write utmp entries on some systems
102 * 2. chown tty on some systems
103 */
104 rxvt_privileges (this, SAVE);
105 rxvt_privileges (this, IGNORE);
106
107 rxvt_init_secondary (this);
108
109 const char **cmd_argv = rxvt_init_resources (this, argc, argv);
110
111#if (MENUBAR_MAX)
112 rxvt_menubar_read (this, rs[Rs_menu]);
113#endif 329#endif
330
331 if (display)
332 {
333#if USE_XIM
334 im_ev.stop (display);
335#endif
114#ifdef HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
115 if (Options & Opt_scrollBar) 337 scrollbar_ev.stop (display);
116 scrollbar_setIdle (); /* set existence for size calculations */
117#endif 338#endif
118 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
119 rxvt_Create_Windows (this, argc, argv); 340 rootwin_ev.stop (display);
120
121 rxvt_init_xlocale (this);
122
123 rxvt_scr_reset (this); /* initialize screen */
124#ifdef RXVT_GRAPHICS
125 rxvt_Gr_reset (this); /* reset graphics */
126#endif 341#endif
127 342 incr_ev.stop ();
128#if 0 343 termwin_ev.stop (display);
129#ifdef DEBUG_X 344 vt_ev.stop (display);
130 XSynchronize(Xdisplay, True);
131 XSetErrorHandler((XErrorHandler) abort);
132#else
133 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
134#endif
135#endif
136
137#ifdef HAVE_SCROLLBARS
138 if (Options & Opt_scrollBar)
139 rxvt_Resize_scrollBar (this); /* create and map scrollbar */
140#endif
141#if (MENUBAR_MAX)
142 if (menubar_visible(r))
143 XMapWindow (Xdisplay, menuBar.win);
144#endif
145#ifdef TRANSPARENT
146 if (Options & Opt_transparent)
147 { 345 }
148 XSelectInput (Xdisplay, Xroot, PropertyChangeMask);
149 rxvt_check_our_parents (this);
150 }
151#endif
152 XMapWindow (Xdisplay, TermWin.vt);
153 XMapWindow (Xdisplay, TermWin.parent[0]);
154 346
155 rxvt_init_env (this); 347 check_ev.stop ();
156 rxvt_init_command (this, cmd_argv); 348 pty_ev.stop ();
157 349#ifdef CURSOR_BLINK
158 x_ev.start (Xfd, EVENT_READ); 350 cursor_blink_ev.stop ();
159 pty_ev.start (cmd_fd, EVENT_READ);
160
161 return true;
162}
163
164/* ------------------------------------------------------------------------- *
165 * SIGNAL HANDLING & EXIT HANDLER *
166 * ------------------------------------------------------------------------- */
167/*
168 * Catch a SIGCHLD signal and exit if the direct child has died
169 */
170/* ARGSUSED */
171/* EXTPROTO */
172RETSIGTYPE
173rxvt_Child_signal(int sig __attribute__ ((unused)))
174{
175 dR;
176 int pid, save_errno = errno;
177
178 do {
179 errno = 0;
180 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR);
181
182 if (pid == R->cmd_pid)
183 exit(EXIT_SUCCESS);
184
185 errno = save_errno;
186 signal(SIGCHLD, rxvt_Child_signal);
187}
188
189/*
190 * Catch a fatal signal and tidy up before quitting
191 */
192/* EXTPROTO */
193RETSIGTYPE
194rxvt_Exit_signal(int sig)
195{
196 signal(sig, SIG_DFL);
197#ifdef DEBUG_CMD
198 rxvt_print_error("signal %d", sig);
199#endif 351#endif
200 rxvt_clean_exit(); 352#ifdef TEXT_BLINK
201 kill(getpid(), sig); 353 text_blink_ev.stop ();
202} 354#endif
355#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
356 cont_scroll_ev.stop ();
357#endif
358#ifdef SELECTION_SCROLLING
359 sel_scroll_ev.stop ();
360#endif
361#ifdef POINTER_BLANK
362 pointer_ev.stop ();
363#endif
203 364
204/* ARGSUSED */ 365 destroy_ev.start (0);
205/* INTPROTO */ 366}
206int
207rxvt_xerror_handler(const Display * display
208 __attribute__ ((unused)), const XErrorEvent * event)
209{
210 dR;
211 367
212 if (R->allowedxerror == -1) { 368void
213 R->allowedxerror = event->error_code; 369rxvt_term::destroy_cb (time_watcher &w)
214 return 0; /* ignored anyway */ 370{
215 } 371 make_current ();
216 rxvt_print_error("XError: Request: %d . %d, Error: %d", 372
217 event->request_code, event->minor_code, 373 delete this;
218 event->error_code);
219/* XXX: probably should call rxvt_clean_exit() bypassing X routines */
220 exit(EXIT_FAILURE);
221/* NOTREACHED */
222} 374}
223 375
224/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
225/* 377/*
226 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
227 * TODO: if debugging, this should free up any known resources if we can 379 * TODO: if debugging, this should free up any known resources if we can
228 */ 380 */
229/* EXTPROTO */ 381static XErrorHandler old_xerror_handler;
230void
231rxvt_clean_exit(void)
232{
233 dR;
234 382
235#ifdef DEBUG_SCREEN 383static void
236 rxvt_scr_release(aR); 384rxvt_emergency_cleanup ()
385{
386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
387 (*t)->emergency_cleanup ();
388}
389
390#if !ENABLE_MINIMAL
391static void
392print_x_error (Display *dpy, XErrorEvent *event)
393{
394 char buffer[BUFSIZ];
395 char mesg[BUFSIZ];
396 char number[32];
397 char *mtype = "XlibMessage";
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 rxvt_warn ("An X Error occured, trying to continue after report.\n");
401 rxvt_warn ("%s: %s\n", mesg, buffer);
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
404 sprintf(number, "%d", event->request_code);
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer);
407 if (event->request_code >= 128) {
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
409 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
411 }
412 if ((event->error_code == BadWindow) ||
413 (event->error_code == BadPixmap) ||
414 (event->error_code == BadCursor) ||
415 (event->error_code == BadFont) ||
416 (event->error_code == BadDrawable) ||
417 (event->error_code == BadColor) ||
418 (event->error_code == BadGC) ||
419 (event->error_code == BadIDChoice) ||
420 (event->error_code == BadValue) ||
421 (event->error_code == BadAtom)) {
422 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
424 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
427 mesg, BUFSIZ);
428 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436}
237#endif 437#endif
238#ifndef NO_SETOWNER_TTYDEV 438
239 rxvt_privileged_ttydev(aR_ RESTORE); 439int
440rxvt_xerror_handler (Display *display, XErrorEvent *event)
441{
442 if (GET_R->allowedxerror == -1)
443 GET_R->allowedxerror = event->error_code;
444 else
445 {
446 // GET_R is most likely not the terminal which caused the error,
447 // so just output the error and continue
448#if ENABLE_MINIMAL
449 old_xerror_handler (display, event);
450#else
451 print_x_error (display, event);
240#endif 452#endif
241#ifdef UTMP_SUPPORT 453 }
242 rxvt_privileged_utmp(aR_ RESTORE); 454
455 return 0;
456}
457
458int
459rxvt_xioerror_handler (Display *display)
460{
461 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
462 DisplayString (display));
463 rxvt_emergency_cleanup ();
464 _exit (EXIT_FAILURE);
465}
466
467/*----------------------------------------------------------------------*/
468bool
469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
470{
471 this->envv = envv;
472
473 SET_R (this);
474 set_locale ("");
475 set_environ (envv); // few things in X do not call setlocale :(
476
477 if (!init_vars ())
478 return false;
479
480 init_secondary ();
481
482 const char **cmd_argv = init_resources (argc, argv);
483
484#ifdef KEYSYM_RESOURCE
485 keyboard->register_done ();
243#endif 486#endif
244#ifdef USE_XIM 487
245 if (R->Input_Context != NULL) { 488#ifdef HAVE_SCROLLBARS
246 XDestroyIC(R->Input_Context); 489 if (option (Opt_scrollBar))
247 R->Input_Context = NULL; 490 scrollBar.setIdle (); /* set existence for size calculations */
491#endif
492
493 pty = ptytty::create ();
494
495 create_windows (argc, argv);
496
497 init_xlocale ();
498
499 scr_reset (); // initialize screen
500
501#if 0
502 XSynchronize (dpy, True);
503#endif
504
505#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */
508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bool changed = false;
512 bgPixmap.set_target (this);
513
514#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent))
516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526 changed = true;
527
528 bgPixmap.set_root_pixmap ();
529 XSelectInput (dpy, display->root, PropertyChangeMask);
530 rootwin_ev.start (display, display->root);
248 } 531 }
249#endif 532#endif
533
534#ifdef XPM_BACKGROUND
535 if (rs[Rs_backgroundPixmap] != NULL)
536 {
537 const char *p = rs[Rs_backgroundPixmap];
538
539 if ((p = strchr (p, ';')) != NULL)
540 {
541 p++;
542 bgPixmap.set_geometry (p);
543 }
544 else
545 bgPixmap.set_defaultGeometry ();
546
547 changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]);
548 }
549#endif
550 if (changed)
551 {
552 bgPixmap.render_background ();
553 scr_touch (true);
554 }
555 }
556#endif
557
558#if ENABLE_PERL
559 rootwin_ev.start (display, display->root);
560#endif
561
562 set_colorfgbg ();
563
564 init_command (cmd_argv);
565
566 free (cmd_argv);
567
568 if (pty->pty >= 0)
569 pty_ev.start (pty->pty, EVENT_READ);
570
571 check_ev.start ();
572
573 HOOK_INVOKE ((this, HOOK_START, DT_END));
574
575#if ENABLE_XEMBED
576 if (rs[Rs_embed])
577 {
578 long info[2] = { 0, XEMBED_MAPPED };
579
580 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
581 32, PropModeReplace, (unsigned char *)&info, 2);
582 }
583#endif
584
585 XMapWindow (dpy, vt);
586 XMapWindow (dpy, parent[0]);
587
588 return true;
589}
590
591static struct sig_handlers
592{
593 sig_watcher sw_term, sw_int;
594
595 /*
596 * Catch a fatal signal and tidy up before quitting
597 */
598 void
599 sig_term (sig_watcher &w)
600 {
601 rxvt_emergency_cleanup ();
602 signal (w.signum, SIG_DFL);
603 kill (getpid (), w.signum);
604 }
605
606 sig_handlers ()
607 : sw_term (this, &sig_handlers::sig_term),
608 sw_int (this, &sig_handlers::sig_term)
609 {
610 }
611} sig_handlers;
612
613char **rxvt_environ; // startup environment
614
615void
616rxvt_init ()
617{
618 ptytty::init ();
619
620 rxvt_environ = environ;
621
622 signal (SIGHUP, SIG_IGN);
623 signal (SIGPIPE, SIG_IGN);
624
625 sig_handlers.sw_term.start (SIGTERM);
626 sig_handlers.sw_int.start (SIGINT);
627
628 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
629 /* signal (SIGURG, SIG_DFL); */
630
631 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
632 // TODO: handle this with exceptions and tolerate the memory loss
633 XSetIOErrorHandler (rxvt_xioerror_handler);
634
635 XrmInitialize ();
250} 636}
251 637
252/* ------------------------------------------------------------------------- * 638/* ------------------------------------------------------------------------- *
253 * MEMORY ALLOCATION WRAPPERS * 639 * MEMORY ALLOCATION WRAPPERS *
254 * ------------------------------------------------------------------------- */ 640 * ------------------------------------------------------------------------- */
255/* EXTPROTO */ 641void *
256void *
257rxvt_malloc(size_t size) 642rxvt_malloc (size_t size)
258{ 643{
259 void *p;
260
261 p = malloc(size); 644 void *p = malloc (size);
645
262 if (p) 646 if (!p)
647 rxvt_fatal ("memory allocation failure. aborting.\n");
648
263 return p; 649 return p;
264
265 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
266 rxvt_clean_exit();
267 exit(EXIT_FAILURE);
268/* NOTREACHED */
269} 650}
270 651
271/* EXTPROTO */ 652void *
272void *
273rxvt_calloc(size_t number, size_t size) 653rxvt_calloc (size_t number, size_t size)
274{ 654{
275 void *p;
276
277 p = calloc(number, size); 655 void *p = calloc (number, size);
656
278 if (p) 657 if (!p)
658 rxvt_fatal ("memory allocation failure. aborting.\n");
659
279 return p; 660 return p;
280
281 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
282 rxvt_clean_exit();
283 exit(EXIT_FAILURE);
284/* NOTREACHED */
285} 661}
286 662
287/* EXTPROTO */ 663void *
288void *
289rxvt_realloc(void *ptr, size_t size) 664rxvt_realloc (void *ptr, size_t size)
290{ 665{
291 void *p;
292
293 if (ptr)
294 p = realloc(ptr, size); 666 void *p = realloc (ptr, size);
295 else 667
296 p = malloc(size);
297 if (p) 668 if (!p)
669 rxvt_fatal ("memory allocation failure. aborting.\n");
670
298 return p; 671 return p;
299
300 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
301 rxvt_clean_exit();
302 exit(EXIT_FAILURE);
303/* NOTREACHED */
304} 672}
305
306/* ------------------------------------------------------------------------- *
307 * PRIVILEGED OPERATIONS *
308 * ------------------------------------------------------------------------- */
309/* take care of suid/sgid super-user (root) privileges */
310/* INTPROTO */
311void
312rxvt_privileges(pR_ int mode)
313{
314#if ! defined(__CYGWIN32__)
315# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
316/* setreuid() is the poor man's setuid(), seteuid() */
317# define seteuid(a) setreuid(-1, (a))
318# define setegid(a) setregid(-1, (a))
319# define HAVE_SETEUID
320# endif
321# ifdef HAVE_SETEUID
322 switch (mode) {
323 case IGNORE:
324 /*
325 * change effective uid/gid - not real uid/gid - so we can switch
326 * back to root later, as required
327 */
328 seteuid(getuid());
329 setegid(getgid());
330 break;
331 case SAVE:
332 R->euid = geteuid();
333 R->egid = getegid();
334 break;
335 case RESTORE:
336 seteuid(R->euid);
337 setegid(R->egid);
338 break;
339 }
340# else
341 switch (mode) {
342 case IGNORE:
343 setuid(getuid());
344 setgid(getgid());
345 /* FALLTHROUGH */
346 case SAVE:
347 /* FALLTHROUGH */
348 case RESTORE:
349 break;
350 }
351# endif
352#endif
353}
354
355#ifdef UTMP_SUPPORT
356/* EXTPROTO */
357void
358rxvt_privileged_utmp(pR_ char action)
359{
360 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)",
361 action, R->next_utmp_action, getpid()));
362 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE)
363 || (R->Options & Opt_utmpInhibit)
364 || R->ttydev == NULL || *R->ttydev == '\0')
365 return;
366
367 rxvt_privileges(aR_ RESTORE);
368 if (action == SAVE) {
369 R->next_utmp_action = RESTORE;
370 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]);
371 } else { /* action == RESTORE */
372 R->next_utmp_action = IGNORE;
373 rxvt_cleanutent(aR);
374 }
375 rxvt_privileges(aR_ IGNORE);
376}
377#endif
378
379#ifndef NO_SETOWNER_TTYDEV
380/* EXTPROTO */
381void
382rxvt_privileged_ttydev(pR_ char action)
383{
384 D_MAIN((stderr,
385 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)",
386 action, R->next_tty_action, getpid()));
387 if (R->next_tty_action != action || (action != SAVE && action != RESTORE)
388 || R->ttydev == NULL || *R->ttydev == '\0')
389 return;
390
391 rxvt_privileges(aR_ RESTORE);
392
393 if (action == SAVE) {
394 R->next_tty_action = RESTORE;
395# ifndef RESET_TTY_TO_COMMON_DEFAULTS
396/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */
397 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */
398 R->next_tty_action = IGNORE;
399 else
400# endif
401 {
402 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */
403 chmod(R->ttydev, R->ttymode);
404# ifdef HAVE_REVOKE
405 revoke(R->ttydev);
406# endif
407 }
408 } else { /* action == RESTORE */
409 R->next_tty_action = IGNORE;
410# ifndef RESET_TTY_TO_COMMON_DEFAULTS
411 chmod(R->ttydev, R->ttyfd_stat.st_mode);
412 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid);
413# else
414 chmod(R->ttydev,
415 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
416 chown(R->ttydev, 0, 0);
417# endif
418 }
419
420 rxvt_privileges(aR_ IGNORE);
421
422# ifndef RESET_TTY_TO_COMMON_DEFAULTS
423 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
424 action == RESTORE ? "Restoring" : (action ==
425 SAVE ? "Saving" :
426 "UNKNOWN ERROR for"), R->ttydev,
427 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid,
428 R->ttyfd_stat.st_gid));
429# endif
430}
431#endif
432 673
433/*----------------------------------------------------------------------*/ 674/*----------------------------------------------------------------------*/
434/* 675/*
435 * window size/position calculcations for XSizeHint and other storage. 676 * window size/position calculations for XSizeHint and other storage.
436 * if width/height are non-zero then override calculated width/height 677 * if width/height are non-zero then override calculated width/height
437 */ 678 */
438/* EXTPROTO */
439void 679void
440rxvt_window_calc(pR_ unsigned int width, unsigned int height) 680rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
441{ 681{
442 short recalc_x, recalc_y; 682 short recalc_x, recalc_y;
443 int x, y, sb_w, mb_h, flags; 683 int x, y, sb_w, flags;
444 unsigned int w, h; 684 unsigned int w, h;
445 unsigned int max_width, max_height; 685 unsigned int max_width, max_height;
446 686
447 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
448 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width,
449 R->szHint.height));
450 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 687 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
451 R->szHint.win_gravity = NorthWestGravity; 688 szHint.win_gravity = NorthWestGravity;
452/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 689 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
453 690
454 recalc_x = recalc_y = 0; 691 recalc_x = recalc_y = 0;
455 flags = 0; 692 flags = 0;
693
456 if (!R->parsed_geometry) { 694 if (!parsed_geometry)
695 {
457 R->parsed_geometry = 1; 696 parsed_geometry = 1;
697
458 if (R->rs[Rs_geometry]) 698 if (rs[Rs_geometry])
459 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 699 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
700
460 if (flags & WidthValue) { 701 if (flags & WidthValue)
461 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 702 {
703 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
462 R->szHint.flags |= USSize; 704 szHint.flags |= USSize;
463 } 705 }
706
464 if (flags & HeightValue) { 707 if (flags & HeightValue)
465 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 708 {
709 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
466 R->szHint.flags |= USSize; 710 szHint.flags |= USSize;
467 } 711 }
712
468 if (flags & XValue) { 713 if (flags & XValue)
714 {
469 R->szHint.x = x; 715 szHint.x = x;
470 R->szHint.flags |= USPosition; 716 szHint.flags |= USPosition;
717
471 if (flags & XNegative) { 718 if (flags & XNegative)
719 {
472 recalc_x = 1; 720 recalc_x = 1;
473 R->szHint.win_gravity = NorthEastGravity; 721 szHint.win_gravity = NorthEastGravity;
474 } 722 }
475 } 723 }
724
476 if (flags & YValue) { 725 if (flags & YValue)
726 {
477 R->szHint.y = y; 727 szHint.y = y;
478 R->szHint.flags |= USPosition; 728 szHint.flags |= USPosition;
729
479 if (flags & YNegative) { 730 if (flags & YNegative)
731 {
480 recalc_y = 1; 732 recalc_y = 1;
733
481 if (R->szHint.win_gravity == NorthEastGravity) 734 if (szHint.win_gravity == NorthEastGravity)
482 R->szHint.win_gravity = SouthEastGravity; 735 szHint.win_gravity = SouthEastGravity;
483 else 736 else
484 R->szHint.win_gravity = SouthWestGravity; 737 szHint.win_gravity = SouthWestGravity;
485 } 738 }
486 } 739 }
487 } 740 }
741
488/* TODO: BOUNDS */ 742 /* TODO: BOUNDS */
489 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 743 width = ncol * fwidth;
490 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 744 height = nrow * fheight;
491 max_width = MAX_COLS * R->TermWin.fwidth; 745 max_width = MAX_COLS * fwidth;
492 max_height = MAX_ROWS * R->TermWin.fheight; 746 max_height = MAX_ROWS * fheight;
493 747
494 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 748 szHint.base_width = szHint.base_height = 2 * int_bwidth;
495 749
496 sb_w = mb_h = 0; 750 sb_w = 0;
497 R->window_vt_x = R->window_vt_y = 0; 751 window_vt_x = window_vt_y = int_bwidth;
498 if (scrollbar_visible(R)) { 752
753 if (scrollBar.state)
754 {
499 sb_w = scrollbar_TotalWidth(); 755 sb_w = scrollbar_TotalWidth ();
500 R->szHint.base_width += sb_w; 756 szHint.base_width += sb_w;
757
501 if (!(R->Options & Opt_scrollBar_right)) 758 if (!option (Opt_scrollBar_right))
502 R->window_vt_x = sb_w; 759 window_vt_x += sb_w;
503 } 760 }
504 if (menubar_visible(R)) { 761
505 mb_h = menuBar_TotalHeight();
506 R->szHint.base_height += mb_h;
507 R->window_vt_y = mb_h;
508 }
509 R->szHint.width_inc = R->TermWin.fwidth; 762 szHint.width_inc = fwidth;
510 R->szHint.height_inc = R->TermWin.fheight; 763 szHint.height_inc = fheight;
511 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 764 szHint.min_width = szHint.base_width + szHint.width_inc;
512 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 765 szHint.min_height = szHint.base_height + szHint.height_inc;
513 766
514 if (width && width - R->szHint.base_width < max_width) { 767 if (newwidth && newwidth - szHint.base_width < max_width)
768 {
515 R->szHint.width = width; 769 szHint.width = newwidth;
516 R->TermWin.width = width - R->szHint.base_width; 770 width = newwidth - szHint.base_width;
517 } else { 771 }
518 MIN_IT(R->TermWin.width, max_width); 772 else
773 {
774 min_it (width, max_width);
519 R->szHint.width = R->szHint.base_width + R->TermWin.width; 775 szHint.width = szHint.base_width + width;
520 } 776 }
777
521 if (height && height - R->szHint.base_height < max_height) { 778 if (newheight && newheight - szHint.base_height < max_height)
779 {
522 R->szHint.height = height; 780 szHint.height = newheight;
523 R->TermWin.height = height - R->szHint.base_height; 781 height = newheight - szHint.base_height;
524 } else { 782 }
525 MIN_IT(R->TermWin.height, max_height); 783 else
784 {
785 min_it (height, max_height);
526 R->szHint.height = R->szHint.base_height + R->TermWin.height; 786 szHint.height = szHint.base_height + height;
527 } 787 }
788
528 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 789 if (scrollBar.state && option (Opt_scrollBar_right))
529 R->window_sb_x = R->szHint.width - sb_w; 790 window_sb_x = szHint.width - sb_w;
530 791
531 if (recalc_x) 792 if (recalc_x)
532 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 793 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
533 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 794
534 if (recalc_y) 795 if (recalc_y)
535 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 796 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
536 - R->szHint.height - 2 * R->TermWin.ext_bwidth);
537 797
538 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 798 ncol = width / fwidth;
539 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 799 nrow = height / fheight;
540 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
541 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width,
542 R->szHint.height));
543 return;
544} 800}
545 801
546/*----------------------------------------------------------------------*/ 802/*----------------------------------------------------------------------*/
547/* 803/*
548 * Tell the teletype handler what size the window is. 804 * Tell the teletype handler what size the window is.
549 * Called after a window size change. 805 * Called after a window size change.
550 */ 806 */
551/* EXTPROTO */
552void 807void
553rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 808rxvt_term::tt_winch ()
554{ 809{
810 if (pty->pty < 0)
811 return;
812
555 struct winsize ws; 813 struct winsize ws;
556 814
557 if (fd < 0)
558 return;
559 ws.ws_col = col; 815 ws.ws_col = ncol;
560 ws.ws_row = row; 816 ws.ws_row = nrow;
561 ws.ws_xpixel = ws.ws_ypixel = 0; 817 ws.ws_xpixel = width;
562#ifndef DEBUG_SIZE 818 ws.ws_ypixel = height;
563 (void)ioctl(fd, TIOCSWINSZ, &ws); 819 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
564#else 820
565 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 821#if 0
566 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 822 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
567 }
568# ifdef SIGWINCH
569 else if (pid) /* force through to the command */ 823 if (cmd_pid) /* force through to the command */
570 kill(pid, SIGWINCH); 824 kill (-cmd_pid, SIGWINCH);
571# endif
572#endif 825#endif
573} 826}
574 827
575/*----------------------------------------------------------------------*/ 828/*----------------------------------------------------------------------*/
576/* rxvt_change_font() - Switch to a new font */ 829/* set_fonts () - load and set the various fonts
577/* 830 *
578 * init = 1 - initialize 831 * init = 1 - initialize
579 * 832 *
580 * fontname == FONT_UP - switch to bigger font 833 * fontname == FONT_UP - switch to bigger font
581 * fontname == FONT_DN - switch to smaller font 834 * fontname == FONT_DN - switch to smaller font
582 */ 835 */
583/* EXTPROTO */ 836bool
584void 837rxvt_term::set_fonts ()
585rxvt_change_font(pR_ int init, const char *fontname)
586{ 838{
587} 839 rxvt_fontset *fs = new rxvt_fontset (this);
840 rxvt_fontprop prop;
588 841
589/* INTPROTO */ 842 if (!fs
590void 843 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
591rxvt_font_up_down(pR_ int n, int direction) 844 || !fs->realize_font (1))
845 {
846 delete fs;
847 return false;
848 }
849
850#if ENABLE_STYLES
851 for (int i = RS_styleCount; --i; )
852 if (fontset[i] != fontset[0])
853 delete fontset[i];
854#endif
855
856 delete fontset[0];
857 fontset[0] = fs;
858
859 prop = (*fs)[1]->properties ();
860 prop.height += lineSpace;
861
862 fs->set_prop (prop, false);
863
864 fwidth = prop.width;
865 fheight = prop.height;
866 fbase = prop.ascent;
867
868 for (int style = 1; style < 4; style++)
869 {
870#if ENABLE_STYLES
871 const char *res = rs[Rs_font + style];
872
873 if (res && !*res)
874 fontset[style] = fontset[0];
875 else
876 {
877 fontset[style] = fs = new rxvt_fontset (this);
878 rxvt_fontprop prop2 = prop;
879
880 if (res)
881 {
882 fs->populate (res);
883 fs->set_prop (prop2, false);
884 }
885 else
886 {
887 fs->populate (fontset[0]->fontdesc);
888
889 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
890 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
891
892 fs->set_prop (prop2, true);
893 }
894
895 }
896#else
897 fontset[style] = fontset[0];
898#endif
899 }
900
901 if (parent[0])
902 {
903 resize_all_windows (0, 0, 0);
904 scr_remap_chars ();
905 scr_touch (true);
906 }
907
908 return true;
909}
910
911void rxvt_term::set_string_property (Atom prop, const char *str, int len)
592{ 912{
913 XChangeProperty (dpy, parent[0],
914 prop, XA_STRING, 8, PropModeReplace,
915 (const unsigned char *)str, len >= 0 ? len : strlen (str));
916}
917
918void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
919{
920 wchar_t *ws = rxvt_mbstowcs (str, len);
921 char *s = rxvt_wcstoutf8 (ws);
922
923 XChangeProperty (dpy, parent[0],
924 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
925 (const unsigned char *)s, strlen (s));
926
927 free (s);
928 free (ws);
593} 929}
594 930
595/*----------------------------------------------------------------------*/ 931/*----------------------------------------------------------------------*/
596/*----------------------------------------------------------------------*/ 932/*----------------------------------------------------------------------*/
597/* xterm sequences - title, iconName, color (exptl) */ 933/* xterm sequences - title, iconName, color (exptl) */
598/* EXTPROTO */
599void 934void
600rxvt_set_title(pR_ const char *str) 935rxvt_term::set_title (const char *str)
601{ 936{
602#ifndef SMART_WINDOW_TITLE 937 set_string_property (XA_WM_NAME, str);
603 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 938#if ENABLE_EWMH
939 set_utf8_property (xa[XA_NET_WM_NAME], str);
940#endif
941}
942
943void
944rxvt_term::set_icon_name (const char *str)
945{
946 set_string_property (XA_WM_ICON_NAME, str);
947#if ENABLE_EWMH
948 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
949#endif
950}
951
952#ifdef XTERM_COLOR_CHANGE
953void
954rxvt_term::set_window_color (int idx, const char *color)
955{
956 rxvt_color xcol;
957 int i;
958
959 if (color == NULL || *color == '\0')
960 return;
961
962 color = strdup (color);
963 allocated.push_back ((void *)color);
964 rs[Rs_color + idx] = color;
965
966 /* handle color aliases */
967 if (isdigit (*color))
968 {
969 i = atoi (color);
970
971 if (i >= 8 && i <= 15)
972 { /* bright colors */
973 i -= 8;
974 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
975 goto done;
976 }
977
978 if (i >= 0 && i <= 7)
979 { /* normal colors */
980 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
981 goto done;
982 }
983 }
984
985 set_color (xcol, color);
986
987 /*
988 * FIXME: should free colors here, but no idea how to do it so instead,
989 * so just keep gobbling up the colormap
990 */
991
992 pix_colors_focused[idx] = xcol;
993
994 /* XSetWindowAttributes attr; */
995 /* Cursor cursor; */
996done:
997 /*TODO: handle Color_BD, scrollbar background, etc. */
998
999 update_fade_color (idx);
1000 recolour_cursor ();
1001 scr_recolour ();
1002}
1003
604#else 1004#else
605 char *name;
606
607 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0)
608 name = NULL;
609 if (name == NULL || STRCMP(name, str))
610 XStoreName(R->Xdisplay, R->TermWin.parent[0], str);
611 if (name)
612 XFree(name);
613#endif
614}
615
616/* EXTPROTO */
617void
618rxvt_set_iconName(pR_ const char *str)
619{
620#ifndef SMART_WINDOW_TITLE
621 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str);
622#else
623 char *name;
624
625 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name))
626 name = NULL;
627 if (name == NULL || STRCMP(name, str))
628 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str);
629 if (name)
630 XFree(name);
631#endif
632}
633
634#ifdef XTERM_COLOR_CHANGE
635/* EXTPROTO */
636void
637rxvt_set_window_color(pR_ int idx, const char *color)
638{
639 rxvt_color xcol;
640 int i;
641
642 if (color == NULL || *color == '\0')
643 return;
644
645/* handle color aliases */
646 if (isdigit(*color)) {
647 i = atoi(color);
648 if (i >= 8 && i <= 15) { /* bright colors */
649 i -= 8;
650# ifndef NO_BRIGHTCOLOR
651 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i];
652 SET_PIXCOLOR(R, idx);
653 goto Done;
654# endif
655 }
656 if (i >= 0 && i <= 7) { /* normal colors */
657 R->PixColors[idx] = R->PixColors[minCOLOR + i];
658 SET_PIXCOLOR(R, idx);
659 goto Done;
660 }
661 }
662 if (!rxvt_rXParseAllocColor(aR_ & xcol, color))
663 return;
664/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */
665
666/*
667 * FIXME: should free colors here, but no idea how to do it so instead,
668 * so just keep gobbling up the colormap
669 */
670# if 0
671 for (i = Color_Black; i <= Color_White; i++)
672 if (R->PixColors[idx] == R->PixColors[i])
673 break;
674 if (i > Color_White) {
675 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */
676 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1,
677 DisplayPlanes(R->Xdisplay, Xscreen));
678 }
679# endif
680
681 R->PixColors[idx] = xcol;
682 SET_PIXCOLOR(R, idx);
683
684/* XSetWindowAttributes attr; */
685/* Cursor cursor; */
686 Done:
687 if (idx == Color_bg && !(R->Options & Opt_transparent))
688 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
689 R->PixColors[Color_bg]);
690
691/* handle Color_BD, scrollbar background, etc. */
692
693 rxvt_set_colorfgbg(aR);
694 rxvt_recolour_cursor(aR);
695/* the only reasonable way to enforce a clean update */
696 rxvt_scr_poweron(aR);
697}
698
699#else
700# define rxvt_set_window_color(aR_ idx,color) ((void)0) 1005# define set_window_color (idx,color) ((void)0)
701#endif /* XTERM_COLOR_CHANGE */ 1006#endif /* XTERM_COLOR_CHANGE */
702 1007
703/* EXTPROTO */
704void 1008void
705rxvt_recolour_cursor(pR) 1009rxvt_term::recolour_cursor ()
706{ 1010{
707 rxvt_color xcol[2]; 1011 XColor fg, bg;
708 1012
709#if TODO 1013 (ISSET_PIXCOLOR (Color_pointer_fg)
710 xcol[0] = R->PixColors[Color_pointer]; 1014 ? pix_colors_focused[Color_pointer_fg]
711 xcol[1] = R->PixColors[Color_bg]; 1015 : pix_colors_focused[Color_fg]).get (fg);
712 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 1016
713 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 1017 (ISSET_PIXCOLOR (Color_pointer_bg)
714#endif 1018 ? pix_colors_focused[Color_pointer_bg]
1019 : pix_colors_focused[Color_bg]).get (bg);
1020
1021 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
715} 1022}
716 1023
717/*----------------------------------------------------------------------*/ 1024/*----------------------------------------------------------------------*/
718/* 1025/*
719 * find if fg/bg matches any of the normal (low-intensity) colors 1026 * find if fg/bg matches any of the normal (low-intensity) colors
720 */ 1027 */
721/* INTPROTO */
722void 1028void
723rxvt_set_colorfgbg(pR) 1029rxvt_term::set_colorfgbg ()
724{ 1030{
725 unsigned int i; 1031 unsigned int i;
726 const char *xpmb = "\0"; 1032 const char *xpmb = "\0";
727 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 1033 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
728 1034
729 R->env_colorfgbg = 1035 strcpy (fstr, "default");
730 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 1036 strcpy (bstr, "default");
731 STRCPY(fstr, "default");
732 STRCPY(bstr, "default");
733 for (i = Color_Black; i <= Color_White; i++) 1037 for (i = Color_Black; i <= Color_White; i++)
734 if (R->PixColors[Color_fg] == R->PixColors[i]) { 1038 if (pix_colors[Color_fg] == pix_colors[i])
1039 {
735 sprintf(fstr, "%d", (i - Color_Black)); 1040 sprintf (fstr, "%d", (i - Color_Black));
736 break; 1041 break;
737 } 1042 }
1043
738 for (i = Color_Black; i <= Color_White; i++) 1044 for (i = Color_Black; i <= Color_White; i++)
739 if (R->PixColors[Color_bg] == R->PixColors[i]) { 1045 if (pix_colors[Color_bg] == pix_colors[i])
1046 {
740 sprintf(bstr, "%d", (i - Color_Black)); 1047 sprintf (bstr, "%d", (i - Color_Black));
741#ifdef XPM_BACKGROUND 1048#ifdef XPM_BACKGROUND
742 xpmb = "default;"; 1049 xpmb = "default;";
743#endif 1050#endif
744 break; 1051 break;
745 } 1052 }
1053
746 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1054 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
747 putenv(R->env_colorfgbg);
748
749#ifndef NO_BRIGHTCOLOR
750 R->colorfgbg = DEFAULT_RSTYLE;
751 for (i = minCOLOR; i <= maxCOLOR; i++) {
752 if (R->PixColors[Color_fg] == R->PixColors[i])
753 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i);
754 if (R->PixColors[Color_bg] == R->PixColors[i])
755 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i);
756 }
757#endif
758} 1055}
759 1056
760/*----------------------------------------------------------------------*/ 1057/*----------------------------------------------------------------------*/
761/*
762 * Colour determination for low colour displays, routine from
763 * Hans de Goede <hans@highrise.nl>
764 */
765 1058
766/* EXTPROTO */ 1059bool
767int 1060rxvt_term::set_color (rxvt_color &color, const char *name)
768rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour)
769{ 1061{
770 screen_in_out->set(aR_ colour); 1062 if (color.set (this, name))
771
772 if (!screen_in_out->set(aR_ colour)) {
773 rxvt_print_error("can't allocate colour: %s", colour);
774 return false;
775 }
776
777 return true; 1063 return true;
1064
1065 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1066 return false;
1067}
1068
1069void
1070rxvt_term::alias_color (int dst, int src)
1071{
1072 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
778} 1073}
779 1074
780/* -------------------------------------------------------------------- * 1075/* -------------------------------------------------------------------- *
781 * - WINDOW RESIZING - * 1076 * - WINDOW RESIZING - *
782 * -------------------------------------------------------------------- */ 1077 * -------------------------------------------------------------------- */
783/* EXTPROTO */
784void 1078void
785rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 1079rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
786 int ignoreparent)
787{ 1080{
788 int fix_screen; 1081 int fix_screen;
1082 int old_width = szHint.width;
1083 int old_height = szHint.height;
789 1084
1085 window_calc (newwidth, newheight);
1086
1087 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1088 XSetWMNormalHints (dpy, parent[0], &szHint);
1089
1090 if (!ignoreparent)
1091 {
790#ifdef SMART_RESIZE 1092#ifdef SMART_RESIZE
791 int old_width = R->szHint.width, old_height = R->szHint.height; 1093 /*
792#endif
793
794 rxvt_window_calc(aR_ width, height);
795 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint);
796 if (!ignoreparent) {
797#ifdef SMART_RESIZE
798/*
799 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1094 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
800 * reposition window on resize depending on placement on screen 1095 * reposition window on resize depending on placement on screen
801 */ 1096 */
802 int x, y, x1, y1; 1097 int x, y, x1, y1;
803 int dx, dy; 1098 int dx, dy;
804 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
805 Window unused_cr; 1100 Window unused_cr;
806 1101
807 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1102 XTranslateCoordinates (dpy, parent[0], display->root,
808 0, 0, &x, &y, &unused_cr); 1103 0, 0, &x, &y, &unused_cr);
809 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 1104 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
810 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
811 /* 1106 /*
812 * if Xroot isn't the parent window, a WM will probably have offset 1107 * if display->root isn't the parent window, a WM will probably have offset
813 * our position for handles and decorations. Counter it 1108 * our position for handles and decorations. Counter it
814 */ 1109 */
815 if (x1 != x || y1 != y) { 1110 if (x1 != x || y1 != y)
1111 {
816 x -= x1; 1112 x -= x1;
817 y -= y1; 1113 y -= y1;
818 } 1114 }
819 1115
820 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 1116 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
821 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 1117 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
822 dx = old_width - R->szHint.width; 1118 dx = old_width - szHint.width;
823 dy = old_height - R->szHint.height; 1119 dy = old_height - szHint.height;
824 1120
825 /* Check position of the center of the window */ 1121 /* Check position of the center of the window */
826 if (x < x1) /* left half */ 1122 if (x < x1) /* left half */
827 dx = 0; 1123 dx = 0;
828 else if (x == x1) /* exact center */ 1124 else if (x == x1) /* exact center */
829 dx /= 2; 1125 dx /= 2;
830 if (y < y1) /* top half */ 1126 if (y < y1) /* top half */
831 dy = 0; 1127 dy = 0;
832 else if (y == y1) /* exact center */ 1128 else if (y == y1) /* exact center */
833 dy /= 2; 1129 dy /= 2;
834 1130
835 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1131 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
836 R->szHint.width, R->szHint.height); 1132 szHint.width, szHint.height);
837#else 1133#else
838 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1134 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
839 R->szHint.height);
840#endif 1135#endif
841 } 1136 }
842 1137
843 fix_screen = (R->TermWin.ncol != R->prev_ncol 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
844 || R->TermWin.nrow != R->prev_nrow); 1139
845 if (fix_screen || width != R->old_width || height != R->old_height) { 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
846 if (scrollbar_visible(R)) { 1141 {
1142 if (scrollBar.state)
1143 {
847 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1144 XMoveResizeWindow (dpy, scrollBar.win,
1145 window_sb_x, 0,
848 0, scrollbar_TotalWidth(), R->szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
849 rxvt_Resize_scrollBar(aR); 1147 resize_scrollbar ();
850 } 1148 }
851 if (menubar_visible(R)) 1149
852 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1150 XMoveResizeWindow (dpy, vt,
853 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1151 window_vt_x, window_vt_y,
854 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x,
855 R->window_vt_y, TermWin_TotalWidth(),
856 TermWin_TotalHeight()); 1152 width, height);
857#ifdef RXVT_GRAPHICS 1153
858 if (R->old_height)
859 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
860 R->old_height - R->szHint.base_height);
861#endif
862 rxvt_scr_clear(aR); 1154 scr_clear ();
863#ifdef XPM_BACKGROUND 1155#ifdef XPM_BACKGROUND
864 rxvt_resize_pixmap(aR); 1156 /* TODO: should that really be here ? */
1157 bgPixmap.render_background ();
865#endif 1158#endif
866 } 1159 }
867 1160
868 if (fix_screen || R->old_height == 0) { 1161 if (fix_screen || old_height == 0)
869 int curr_screen = -1; 1162 scr_reset ();
870 uint16_t old_ncol = R->prev_ncol;
871 1163
872 /* scr_reset only works on the primary screen */ 1164 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
873 if (R->old_height) /* this is not the first time through */ 1165 //scr_touch (false);
874 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);
875 rxvt_scr_reset(aR);
876 if (curr_screen >= 0) { /* this is not the first time through */
877 rxvt_scr_change_screen(aR_ curr_screen);
878 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
879 }
880 }
881 1166
882 R->old_width = R->szHint.width; 1167#ifdef HAVE_BG_PIXMAP
883 R->old_height = R->szHint.height; 1168 if (bgPixmap.pixmap)
1169 scr_touch (false);
1170#endif
884 1171
885#ifdef USE_XIM 1172#ifdef USE_XIM
886 rxvt_IMSetStatusPosition(aR); 1173 IMSetPosition ();
887#endif 1174#endif
888} 1175}
889 1176
890/* 1177/*
891 * Set the width/height of the vt window in characters. Units are pixels. 1178 * Set the width/height of the vt window in characters. Units are pixels.
892 * good for toggling 80/132 columns 1179 * good for toggling 80/132 columns
893 */ 1180 */
894/* EXTPROTO */
895void 1181void
896rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1182rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
897{ 1183{
898 XWindowAttributes wattr; 1184 XWindowAttributes wattr;
899 1185
900 if (width == 0 || height == 0) { 1186 if (newwidth == 0 || newheight == 0)
1187 {
901 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1188 XGetWindowAttributes (dpy, display->root, &wattr);
1189
902 if (width == 0) 1190 if (newwidth == 0)
903 width = wattr.width - R->szHint.base_width; 1191 newwidth = wattr.width - szHint.base_width;
904 if (height == 0) 1192 if (newheight == 0)
905 height = wattr.height - R->szHint.base_height; 1193 newheight = wattr.height - szHint.base_height;
1194 }
1195
1196 if (newwidth != width || newheight != height)
906 } 1197 {
907 if (width != R->TermWin.width || height != R->TermWin.height) {
908 width += R->szHint.base_width; 1198 newwidth += szHint.base_width;
909 height += R->szHint.base_height; 1199 newheight += szHint.base_height;
910 rxvt_resize_all_windows(aR_ width, height, 0); 1200 resize_all_windows (newwidth, newheight, 0);
911 } 1201 }
912} 1202}
913 1203
914/* -------------------------------------------------------------------- * 1204/* -------------------------------------------------------------------- *
915 * - X INPUT METHOD ROUTINES - * 1205 * - X INPUT METHOD ROUTINES - *
916 * -------------------------------------------------------------------- */ 1206 * -------------------------------------------------------------------- */
917#ifdef USE_XIM 1207#ifdef USE_XIM
918/* INTPROTO */
919void
920rxvt_setSize(pR_ XRectangle * size)
921{
922 size->x = R->TermWin.int_bwidth;
923 size->y = R->TermWin.int_bwidth;
924 size->width = Width2Pixel(R->TermWin.ncol);
925 size->height = Height2Pixel(R->TermWin.nrow);
926}
927 1208
928/* INTPROTO */
929void 1209void
930rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
931{ 1211{
932 *fg = R->PixColors[Color_fg]; 1212 fg = pix_colors [Color_fg];
933 *bg = R->PixColors[Color_bg]; 1213 bg = pix_colors [Color_bg];
1214}
1215
1216void
1217rxvt_term::im_set_size (XRectangle &size)
1218{
1219 // the int_bwidth terms make no sense to me
1220 size.x = int_bwidth;
1221 size.y = int_bwidth;
1222 size.width = Width2Pixel (ncol) + int_bwidth;
1223 size.height = Height2Pixel (nrow) + int_bwidth;
1224}
1225
1226void
1227rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1228 XRectangle &status_rect,
1229 const XRectangle &needed_rect)
1230{
1231 preedit_rect.x = needed_rect.width;
1232 preedit_rect.y = 0;
1233 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1234 preedit_rect.height = fheight;
1235
1236 status_rect.x = 0;
1237 status_rect.y = 0;
1238 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1239 status_rect.height = fheight;
934} 1240}
935 1241
936/* Checking whether input method is running. */ 1242/* Checking whether input method is running. */
937/* INTPROTO */
938Bool 1243bool
939rxvt_IMisRunning(pR) 1244rxvt_term::IMisRunning ()
940{ 1245{
941 char *p; 1246 char *p;
942 Atom atom; 1247 Atom atom;
943 Window win; 1248 Window win;
944 char server[IMBUFSIZ]; 1249 char server[IMBUFSIZ];
945 1250
946/* get current locale modifier */ 1251 /* get current locale modifier */
947 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1252 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1253 {
948 STRCPY(server, "@server="); 1254 strcpy (server, "@server=");
949 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1256
950 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
951 *p = '\0'; 1258 *p = '\0';
952 1259
953 atom = XInternAtom(R->Xdisplay, server, False); 1260 atom = XInternAtom (dpy, server, False);
954 win = XGetSelectionOwner(R->Xdisplay, atom); 1261 win = XGetSelectionOwner (dpy, atom);
1262
955 if (win != None) 1263 if (win != None)
956 return True; 1264 return True;
957 } 1265 }
1266
958 return False; 1267 return False;
959} 1268}
960 1269
961/* EXTPROTO */
962void 1270void
963rxvt_IMSendSpot(pR) 1271rxvt_term::IMSendSpot ()
964{ 1272{
965 XPoint spot; 1273 XPoint nspot;
966 XVaNestedList preedit_attr; 1274 XVaNestedList preedit_attr;
967 1275
968 if (R->Input_Context == NULL 1276 if (!Input_Context
969 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1277 || !focus
970 || !(R->event_type == KeyPress 1278 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
971 || R->event_type == Expose
972 || R->event_type == NoExpose
973 || R->event_type == SelectionNotify
974 || R->event_type == ButtonRelease || R->event_type == FocusIn)
975 || !rxvt_IMisRunning(aR))
976 return; 1279 return;
977 1280
978 rxvt_setPosition(aR_ & spot); 1281 im_set_position (nspot);
979 1282
1283 if (nspot.x == spot.x && nspot.y == spot.y)
1284 return;
1285
1286 spot = nspot;
1287
980 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1288 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
981 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1289 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
982 XFree(preedit_attr); 1290 XFree (preedit_attr);
983} 1291}
984 1292
985/* EXTPROTO */
986void 1293void
987rxvt_setTermFontSet(pR_ int idx) 1294rxvt_term::im_destroy ()
988{ 1295{
989 char *string; 1296 if (input_method)
990 long length; 1297 {
991 int success = 0; 1298 if (Input_Context && input_method->xim)
1299 XDestroyIC (Input_Context);
992 1300
993 if (idx < 0 || idx >= MAX_NFONTS) 1301 display->put_xim (input_method);
994 return; 1302 input_method = 0;
995} 1303 }
996 1304
997/* INTPROTO */
998void
999rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect,
1000 XRectangle * needed_rect)
1001{
1002 int mbh, vtx = 0;
1003
1004 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right))
1005 vtx = scrollbar_TotalWidth();
1006 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0;
1007 mbh -= R->TermWin.lineSpace;
1008
1009 preedit_rect->x = needed_rect->width + vtx;
1010 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1011
1012 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width
1013 + vtx;
1014 preedit_rect->height = Height2Pixel(1);
1015
1016 status_rect->x = vtx;
1017 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1018
1019 status_rect->width = needed_rect->width ? needed_rect->width
1020 : Width2Pixel(R->TermWin.ncol + 1);
1021 status_rect->height = Height2Pixel(1);
1022}
1023
1024/* ARGSUSED */
1025/* INTPROTO */
1026void
1027rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data
1028 __attribute__ ((unused)), XPointer call_data
1029 __attribute__ ((unused)))
1030{
1031 dR;
1032
1033 R->Input_Context = NULL; 1305 Input_Context = 0;
1034/* To avoid Segmentation Fault in C locale: Solaris only? */
1035 if (STRCMP(R->locale, "C"))
1036 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1037 rxvt_IMInstantiateCallback, NULL);
1038} 1306}
1039 1307
1040/* 1308#ifdef ENABLE_XIM_ONTHESPOT
1041 * X manual pages and include files don't match on some systems:
1042 * some think this is an XIDProc and others an XIMProc so we can't
1043 * use the first argument - need to update this to be nice for
1044 * both types via some sort of configure detection
1045 */
1046/* ARGSUSED */
1047/* EXTPROTO */
1048void
1049rxvt_IMInstantiateCallback(Display * unused
1050 __attribute__ ((unused)), XPointer client_data
1051 __attribute__ ((unused)), XPointer call_data
1052 __attribute__ ((unused)))
1053{
1054 dR;
1055 int i, found, had_im;
1056 const char *p;
1057 char **s;
1058 char buf[IMBUFSIZ];
1059 1309
1060 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1310static void
1061 if (R->Input_Context) 1311xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1062 return; 1312{
1313 ((rxvt_term *)client_data)->make_current ();
1314 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1315}
1063 1316
1064 found = had_im = 0; 1317static void
1065 p = R->rs[Rs_inputMethod]; 1318xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1066 if (p && *p) { 1319{
1067 had_im = 1; 1320 ((rxvt_term *)client_data)->make_current ();
1068 s = rxvt_splitcommastring(p); 1321 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1069 for (i = 0; s[i]; i++) { 1322}
1070 if (*s[i]) { 1323
1071 STRCPY(buf, "@im="); 1324static void
1072 STRNCAT(buf, s[i], IMBUFSIZ - 5); 1325xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1073 if ((p = XSetLocaleModifiers(buf)) != NULL && *p 1326{
1074 && (rxvt_IM_get_IC(aR) == True)) { 1327 rxvt_term *term = (rxvt_term *)client_data;
1075 found = 1; 1328 XIMText *text = call_data->text;
1076 break; 1329
1077 } 1330 term->make_current ();
1078 } 1331
1332 if (text)
1333 {
1334 void *str;
1335
1336 if (!text->encoding_is_wchar && text->string.multi_byte)
1337 {
1338 // of course, X makes it ugly again
1339 if (term->rs[Rs_imLocale])
1340 SET_LOCALE (term->rs[Rs_imLocale]);
1341
1342 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1343 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1344
1345 if (term->rs[Rs_imLocale])
1346 SET_LOCALE (term->locale);
1079 } 1347 }
1080 for (i = 0; s[i]; i++) 1348 else
1081 free(s[i]); 1349 str = (void *)text->string.wide_char;
1082 free(s); 1350
1351 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1352 DT_INT, call_data->caret,
1353 DT_INT, call_data->chg_first,
1354 DT_INT, call_data->chg_length,
1355 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1356 DT_WCS_LEN, str, str ? (int)text->length : 0,
1357 DT_END));
1083 } 1358 }
1084 if (found) 1359 else
1085 return; 1360 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1086 1361 DT_INT, call_data->caret,
1087/* try with XMODIFIERS env. var. */ 1362 DT_INT, call_data->chg_first,
1088 if ((p = XSetLocaleModifiers("")) != NULL && *p) { 1363 DT_INT, call_data->chg_length,
1089 rxvt_IM_get_IC(aR); 1364 DT_END));
1090 return;
1091 }
1092
1093/* try with no modifiers base IF the user didn't specify an IM */
1094 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1095 && rxvt_IM_get_IC(aR) == True)
1096 return;
1097} 1365}
1366
1367#if 0
1368static void
1369xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1370{
1371 ((rxvt_term *)client_data)->make_current ();
1372 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1373 DT_INT, call_data->position,
1374 DT_INT, call_data->direction,
1375 DT_INT, call_data->style,
1376 DT_END));
1377}
1378#endif
1379
1380#endif
1098 1381
1099/* 1382/*
1100 * Try to open a XIM with the current modifiers, then see if we can 1383 * Try to open a XIM with the current modifiers, then see if we can
1101 * open a suitable preedit type 1384 * open a suitable preedit type
1102 */ 1385 */
1103/* INTPROTO */
1104Bool 1386bool
1105rxvt_IM_get_IC(pR) 1387rxvt_term::IM_get_IC (const char *modifiers)
1106{ 1388{
1107 int i, j, found; 1389 int i, j, found;
1108 XIM xim; 1390 XIM xim;
1109 XPoint spot; 1391 XPoint spot;
1110 XRectangle rect, status_rect, needed_rect; 1392 XRectangle rect, status_rect, needed_rect;
1111 unsigned long fg, bg; 1393 unsigned long fg, bg;
1112 const char *p; 1394 const char *p;
1113 char **s; 1395 char **s;
1114 XIMStyles *xim_styles; 1396 XIMStyles *xim_styles;
1115 XVaNestedList preedit_attr, status_attr; 1397#ifdef ENABLE_XIM_ONTHESPOT
1116 XIMCallback ximcallback; 1398 XIMCallback xcb[4];
1399#endif
1117 1400
1118 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1401 set_environ (envv);
1119 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1402
1120 if (xim == NULL) 1403 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1121 return False; 1404 return false;
1122 1405
1406 input_method = display->get_xim (locale, modifiers);
1407 if (input_method == NULL)
1408 return false;
1409
1410 xim = input_method->xim;
1411 spot.x = spot.y = -1;
1412
1123 xim_styles = NULL; 1413 xim_styles = NULL;
1124 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1414 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1125 || !xim_styles || !xim_styles->count_styles) { 1415 || !xim_styles || !xim_styles->count_styles)
1126 XCloseIM(xim); 1416 {
1417 im_destroy ();
1127 return False; 1418 return false;
1419 }
1420
1421 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1422
1423 for (int pi = 0; pi < 2; pi++)
1128 } 1424 {
1425 p = pet[pi];
1129 1426
1130 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1427 if (!p)
1131 : "OverTheSpot,OffTheSpot,Root"; 1428 continue;
1429
1132 s = rxvt_splitcommastring(p); 1430 s = rxvt_splitcommastring (p);
1431
1133 for (i = found = 0; !found && s[i]; i++) { 1432 for (i = found = 0; !found && s[i]; i++)
1433 {
1134 if (!STRCMP(s[i], "OverTheSpot")) 1434 if (!strcmp (s[i], "OverTheSpot"))
1135 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1435 input_style = XIMPreeditPosition | XIMStatusNothing;
1136 else if (!STRCMP(s[i], "OffTheSpot")) 1436 else if (!strcmp (s[i], "OffTheSpot"))
1137 R->input_style = (XIMPreeditArea | XIMStatusArea); 1437 input_style = XIMPreeditArea | XIMStatusArea;
1138 else if (!STRCMP(s[i], "Root")) 1438 else if (!strcmp (s[i], "Root"))
1139 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1439 input_style = XIMPreeditNothing | XIMStatusNothing;
1440 else if (!strcmp (s[i], "None"))
1441 input_style = XIMPreeditNone | XIMStatusNone;
1442#ifdef ENABLE_XIM_ONTHESPOT
1443 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1444 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1445#endif
1446 else
1447 input_style = XIMPreeditNothing | XIMStatusNothing;
1140 1448
1141 for (j = 0; j < xim_styles->count_styles; j++) 1449 for (j = 0; j < xim_styles->count_styles; j++)
1142 if (R->input_style == xim_styles->supported_styles[j]) { 1450 if (input_style == xim_styles->supported_styles[j])
1451 {
1452 rxvt_freecommastring (s);
1453
1143 found = 1; 1454 found = 1;
1455 goto foundpet;
1456 }
1457
1458 }
1459
1460 rxvt_freecommastring (s);
1461 }
1462
1463foundpet:
1464
1465 XFree (xim_styles);
1466
1467 if (!found)
1468 {
1469 im_destroy ();
1470 return false;
1471 }
1472
1473 XFontSet fs = 0;
1474 XVaNestedList preedit_attr = 0, status_attr = 0;
1475
1476 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1477 {
1478 // fake us a font-set, please
1479 char **missing_charset_list;
1480 int missing_charset_count;
1481 char *def_string;
1482 char pat[512];
1483
1484 sprintf (pat,
1485 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1486 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1487 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1488 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1489 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1490 "*",
1491 fheight,
1492 fheight + 1, fheight - 1,
1493 fheight - 2, fheight + 2);
1494
1495 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1496 &missing_charset_list, &missing_charset_count, &def_string);
1497
1498 if (missing_charset_list)
1499 XFreeStringList (missing_charset_list);
1500
1501 if (!fs)
1502 {
1503 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1504 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1505 }
1506 }
1507
1508 if (input_style & XIMPreeditPosition)
1509 {
1510 im_set_size (rect);
1511 im_set_position (spot);
1512 im_set_color (fg, bg);
1513
1514 preedit_attr = XVaCreateNestedList (0,
1515 XNForeground, fg,
1516 XNBackground, bg,
1517 XNArea, &rect,
1518 XNSpotLocation, &spot,
1519 XNFontSet, fs,
1520 NULL);
1521 }
1522 else if (input_style & XIMPreeditArea)
1523 {
1524 im_set_color (fg, bg);
1525
1526 /*
1527 * The necessary width of preedit area is unknown
1528 * until create input context.
1529 */
1530 needed_rect.width = 0;
1531 im_set_preedit_area (rect, status_rect, needed_rect);
1532
1533 preedit_attr = XVaCreateNestedList (0,
1534 XNForeground, fg,
1535 XNBackground, bg,
1536 XNArea, &rect,
1537 XNFontSet, fs,
1538 NULL);
1539 status_attr = XVaCreateNestedList (0,
1540 XNForeground, fg,
1541 XNBackground, bg,
1542 XNArea, &status_rect,
1543 XNFontSet, fs,
1544 NULL);
1545 }
1546#if ENABLE_XIM_ONTHESPOT
1547 else if (input_style & XIMPreeditCallbacks)
1548 {
1549 im_set_position (spot);
1550
1551 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1552 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1553 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1554# if 0
1555 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1556# endif
1557
1558 preedit_attr = XVaCreateNestedList (0,
1559 XNSpotLocation, &spot,
1560 XNPreeditStartCallback, &xcb[0],
1561 XNPreeditDoneCallback , &xcb[1],
1562 XNPreeditDrawCallback , &xcb[2],
1563# if 0
1564 XNPreeditCaretCallback, &xcb[3],
1565# endif
1566 NULL);
1567 }
1568#endif
1569
1570 Input_Context = XCreateIC (xim,
1571 XNInputStyle, input_style,
1572 XNClientWindow, vt,
1573 XNFocusWindow, parent[0],
1574 preedit_attr ? XNPreeditAttributes : NULL,
1575 preedit_attr,
1576 status_attr ? XNStatusAttributes : NULL,
1577 status_attr, NULL);
1578
1579 if (preedit_attr) XFree (preedit_attr);
1580 if (status_attr) XFree (status_attr);
1581 if (fs) XFreeFontSet (dpy, fs);
1582
1583 if (Input_Context == NULL)
1584 {
1585 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1586 im_destroy ();
1587 return false;
1588 }
1589
1590#if 0
1591 // unfortunately, only the focus window is used by XIM, hard to fix
1592 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1593 vt_select_input ();
1594#endif
1595
1596 IMSetPosition ();
1597
1598 return true;
1599}
1600
1601void
1602rxvt_term::im_cb ()
1603{
1604 int i;
1605 const char *p;
1606 char **s;
1607 char buf[IMBUFSIZ];
1608
1609 make_current ();
1610
1611 im_destroy ();
1612
1613 if (Input_Context)
1614 return;
1615
1616#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1617 if (rs[Rs_imLocale])
1618 SET_LOCALE (rs[Rs_imLocale]);
1619#endif
1620
1621 p = rs[Rs_inputMethod];
1622 if (p && *p)
1623 {
1624 bool found = false;
1625
1626 s = rxvt_splitcommastring (p);
1627
1628 for (i = 0; s[i]; i++)
1629 {
1630 if (*s[i])
1631 {
1632 strcpy (buf, "@im=");
1633 strncat (buf, s[i], IMBUFSIZ - 5);
1634 if (IM_get_IC (buf))
1635 {
1636 found = true;
1144 break; 1637 break;
1638 }
1145 } 1639 }
1146 } 1640 }
1147 for (i = 0; s[i]; i++)
1148 free(s[i]);
1149 free(s);
1150 XFree(xim_styles);
1151 1641
1642 rxvt_freecommastring (s);
1643
1152 if (!found) { 1644 if (found)
1153 XCloseIM(xim); 1645 goto done;
1154 return False;
1155 } 1646 }
1156 1647
1157 ximcallback.callback = rxvt_IMDestroyCallback; 1648 /* try with XMODIFIERS env. var. */
1649 if (IM_get_IC (""))
1650 goto done;
1158 1651
1159/* XXX: not sure why we need this (as well as IC one below) */ 1652 /* try with no modifiers base IF the user didn't specify an IM */
1160 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1653 if (IM_get_IC ("@im=none"))
1654 goto done;
1161 1655
1162 preedit_attr = status_attr = NULL; 1656done:
1163 1657#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1164 if (R->input_style & XIMPreeditPosition) { 1658 if (rs[Rs_imLocale])
1165 rxvt_setSize(aR_ & rect); 1659 SET_LOCALE (locale);
1166 rxvt_setPosition(aR_ & spot); 1660#endif
1167 rxvt_setColor(aR_ & fg, &bg);
1168
1169 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1170 XNSpotLocation, &spot,
1171 XNForeground, fg, XNBackground, bg,
1172 //XNFontSet, R->TermWin.fontset,
1173 NULL);
1174 } else if (R->input_style & XIMPreeditArea) {
1175 rxvt_setColor(aR_ & fg, &bg);
1176
1177 /*
1178 * The necessary width of preedit area is unknown
1179 * until create input context.
1180 */
1181 needed_rect.width = 0;
1182
1183 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1184
1185 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1186 XNForeground, fg, XNBackground, bg,
1187 //XNFontSet, R->TermWin.fontset,
1188 NULL);
1189 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1190 XNForeground, fg, XNBackground, bg,
1191 //XNFontSet, R->TermWin.fontset,
1192 NULL);
1193 }
1194 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1195 XNClientWindow, R->TermWin.parent[0],
1196 XNFocusWindow, R->TermWin.parent[0],
1197 XNDestroyCallback, &ximcallback,
1198 preedit_attr ? XNPreeditAttributes : NULL,
1199 preedit_attr,
1200 status_attr ? XNStatusAttributes : NULL,
1201 status_attr, NULL);
1202 if (preedit_attr)
1203 XFree(preedit_attr);
1204 if (status_attr)
1205 XFree(status_attr);
1206 if (R->Input_Context == NULL) {
1207 rxvt_print_error("failed to create input context");
1208 XCloseIM(xim);
1209 return False;
1210 }
1211 if (R->input_style & XIMPreeditArea)
1212 rxvt_IMSetStatusPosition(aR);
1213 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1214 return True;
1215} 1661}
1216 1662
1217/* EXTPROTO */
1218void 1663void
1219rxvt_IMSetStatusPosition(pR) 1664rxvt_term::IMSetPosition ()
1220{ 1665{
1221 XRectangle preedit_rect, status_rect, *needed_rect; 1666 XRectangle preedit_rect, status_rect, *needed_rect;
1222 XVaNestedList preedit_attr, status_attr; 1667 XVaNestedList preedit_attr, status_attr;
1223 1668
1224 if (R->Input_Context == NULL 1669 if (!Input_Context
1225 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1670 || !focus
1671 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1226 || !rxvt_IMisRunning(aR)) 1672 || !IMisRunning ())
1227 return; 1673 return;
1228 1674
1675 if (input_style & XIMPreeditPosition)
1676 {
1677 im_set_size (preedit_rect);
1678 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1679
1680 XSetICValues (Input_Context,
1681 XNPreeditAttributes, preedit_attr, NULL);
1682 }
1683 else
1684 {
1229/* Getting the necessary width of preedit area */ 1685 /* Getting the necessary width of preedit area */
1230 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1686 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1231 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1687 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1232 XFree(status_attr); 1688 XFree (status_attr);
1233 1689
1234 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1690 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1691 XFree (needed_rect);
1235 1692
1236 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1693 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1237 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1694 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1238 1695
1239 XSetICValues(R->Input_Context, 1696 XSetICValues (Input_Context,
1240 XNPreeditAttributes, preedit_attr, 1697 XNPreeditAttributes, preedit_attr,
1241 XNStatusAttributes, status_attr, NULL); 1698 XNStatusAttributes, status_attr,
1699 NULL);
1242 1700
1701 XFree (status_attr);
1702 }
1703
1243 XFree(preedit_attr); 1704 XFree (preedit_attr);
1244 XFree(status_attr);
1245} 1705}
1246#endif /* USE_XIM */ 1706#endif /* USE_XIM */
1247 1707
1248/*----------------------------------------------------------------------*/
1249rxvt_t rxvt_current_term;
1250
1251/*----------------------- end-of-file (C source) -----------------------*/ 1708/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines