[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.223 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.308 by ayin, Tue Feb 19 13:01:32 2008 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: main.C	2	* File: main.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* 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>
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2008 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.
…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef TTY_GID_SUPPORT
44	# include <grp.h>
45	#endif
46
47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	43	#include <termios.h>
		44
		45	#ifdef HAVE_XSETLOCALE
		46	# define X_LOCALE
		47	# include <X11/Xlocale.h>
		48	#else
		49	# ifdef HAVE_SETLOCALE
		50	# include <clocale>
		51	# endif
49	#endif	52	#endif
50		53
51	vector<rxvt_term *> rxvt_term::termlist;	54	vector<rxvt_term *> rxvt_term::termlist;
52		55
53	// used to tell global functions which terminal instance is "active"	56	// used to tell global functions which terminal instance is "active"
…		…
56	static char curlocale[128], savelocale[128];	59	static char curlocale[128], savelocale[128];
57		60
58	bool	61	bool
59	rxvt_set_locale (const char *locale) NOTHROW	62	rxvt_set_locale (const char *locale) NOTHROW
60	{	63	{
		64	int size = strlen (locale) + 1;
		65
		66	if (size > sizeof (curlocale))
		67	rxvt_fatal ("locale string too long, aborting.\n");
		68
61	if (!locale \|\| !strncmp (locale, curlocale, 128))	69	if (!locale \|\| !memcmp (locale, curlocale, size))
62	return false;	70	return false;
63		71
64	strncpy (curlocale, locale, 128);	72	memcpy (curlocale, locale, size);
65	setlocale (LC_CTYPE, curlocale);	73	setlocale (LC_CTYPE, curlocale);
66	return true;	74	return true;
67	}	75	}
68		76
69	void	77	void
…		…
83	class rxvt_composite_vec rxvt_composite;	91	class rxvt_composite_vec rxvt_composite;
84		92
85	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86	{	94	{
87	compose_char *cc;	95	compose_char *cc;
88		96
89	// break compose chains, as stupid readline really likes to duplicate	97	// break compose chains, as stupid readline really likes to duplicate
90	// composing characters for some reason near the end of a line.	98	// composing characters for some reason near the end of a line.
91	cc = (*this)[c1];	99	cc = (*this)[c1];
92	while (cc)	100	while (cc)
93	{	101	{
…		…
142		150
143	}	151	}
144	#endif	152	#endif
145		153
146	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
147	:	155	{
148	#if TRANSPARENT	156	#if HAVE_BG_PIXMAP
149	rootwin_ev (this, &rxvt_term::rootwin_cb),	157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150	#endif
151	#ifdef HAVE_SCROLLBARS
152	scrollbar_ev (this, &rxvt_term::x_cb),
153	#endif	158	#endif
154	#ifdef CURSOR_BLINK	159	#ifdef CURSOR_BLINK
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156	#endif	161	#endif
157	#ifdef TEXT_BLINK	162	#ifdef TEXT_BLINK
158	text_blink_ev (this, &rxvt_term::text_blink_cb),	163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159	#endif	164	#endif
160	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING	165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),	166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162	#endif	167	#endif
163	#ifdef SELECTION_SCROLLING	168	#ifdef SELECTION_SCROLLING
164	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),	169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165	#endif	170	#endif
166	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),	172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
		174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
		175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
		176	#endif
		177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
		178	#ifdef USE_XIM
		179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168	#endif	180	#endif
169	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
170	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171	#endif	183	#endif
172	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),
174	#endif
175	#ifndef NO_BELL	184	#ifndef NO_BELL
176	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177	#endif	186	#endif
178	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185	incr_ev (this, &rxvt_term::incr_cb)	194
186	{
187	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188		196
189	termlist.push_back (this);	197	termlist.push_back (this);
190		198
191	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
193	#endif	201	#endif
194	}	202	}
195		203
196	// clean up the most important stuff, do not call x or free mem etc.	204	// clean up the most important stuff, do not call x or free mem etc.
197	// for use before an emergency exit	205	// for use before an emergency exit
		206	void
198	void rxvt_term::emergency_cleanup ()	207	rxvt_term::emergency_cleanup ()
199	{	208	{
200	if (cmd_pid)	209	if (cmd_pid)
201	kill (-cmd_pid, SIGHUP);	210	kill (-cmd_pid, SIGHUP);
202		211
203	pty_ev.stop ();	212	pty_ev.stop ();
…		…
215	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
216	delete fontset[i];	225	delete fontset[i];
217	#endif	226	#endif
218	delete fontset[0];	227	delete fontset[0];
219		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
		232
220	if (display)	233	if (display)
221	{	234	{
222	selection_clear ();	235	selection_clear ();
223		236
224	#ifdef USE_XIM	237	#ifdef USE_XIM
225	im_destroy ();	238	im_destroy ();
226	#endif	239	#endif
227	#ifdef XTERM_SCROLLBAR	240	scrollBar.destroy ();
228	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
229	if (ShadowGC) XFreeGC (dpy, ShadowGC);
230	#endif
231	#ifdef PLAIN_SCROLLBAR
232	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
233	#endif
234	#ifdef NEXT_SCROLLBAR
235	if (blackGC) XFreeGC (dpy, blackGC);
236	if (whiteGC) XFreeGC (dpy, whiteGC);
237	if (grayGC) XFreeGC (dpy, grayGC);
238	if (darkGC) XFreeGC (dpy, darkGC);
239	if (stippleGC) XFreeGC (dpy, stippleGC);
240	if (dimple) XFreePixmap (dpy, dimple);
241	if (upArrow) XFreePixmap (dpy, upArrow);
242	if (downArrow) XFreePixmap (dpy, downArrow);
243	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
244	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
245	#endif
246	#ifdef RXVT_SCROLLBAR
247	if (topShadowGC) XFreeGC (dpy, topShadowGC);
248	if (botShadowGC) XFreeGC (dpy, botShadowGC);
249	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
250	#endif
251	if (gc) XFreeGC (dpy, gc);	241	if (gc) XFreeGC (dpy, gc);
252		242
253	delete drawable;	243	delete drawable;
254	// destroy all windows	244	// destroy all windows
255	if (parent[0])	245	if (parent[0])
…		…
263	pix_colors_unfocused [i].free (this);	253	pix_colors_unfocused [i].free (this);
264	#endif	254	#endif
265	}	255	}
266		256
267	clear ();	257	clear ();
268	}
269		258
270	delete pix_colors_focused;	259	display->flush (); /* ideally .put should do this */
271	#if OFF_FOCUS_FADING
272	delete pix_colors_unfocused;
273	#endif
274
275	displays.put (display);	260	displays.put (display);
		261	}
276		262
277	scr_release ();	263	scr_release ();
278		264
279	/* clear all resources */	265	/* clear all resources */
280	for (int i = 0; i < allocated.size (); i++)	266	for (int i = 0; i < allocated.size (); i++)
…		…
292	delete argv;	278	delete argv;
293		279
294	#ifdef KEYSYM_RESOURCE	280	#ifdef KEYSYM_RESOURCE
295	delete keyboard;	281	delete keyboard;
296	#endif	282	#endif
		283	#ifndef NO_RESOURCES
		284	XrmDestroyDatabase (option_db);
		285	#endif
297	}	286	}
298		287
299	// child has exited, usually destroys	288	// child has exited, usually destroys
300	void	289	void
301	rxvt_term::child_cb (child_watcher &w, int status)	290	rxvt_term::child_cb (ev::child &w, int status)
302	{	291	{
303	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	292	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304		293
305	cmd_pid = 0;	294	cmd_pid = 0;
306		295
307	if (!OPTION (Opt_hold))	296	if (!option (Opt_hold))
308	destroy ();	297	destroy ();
309	}	298	}
310		299
311	void	300	void
312	rxvt_term::destroy ()	301	rxvt_term::destroy ()
313	{	302	{
314	if (destroy_ev.active)	303	if (destroy_ev.is_active ())
315	return;	304	return;
316		305
317	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	306	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
318		307
319	#if ENABLE_OVERLAY	308	#if ENABLE_OVERLAY
…		…
323	if (display)	312	if (display)
324	{	313	{
325	#if USE_XIM	314	#if USE_XIM
326	im_ev.stop (display);	315	im_ev.stop (display);
327	#endif	316	#endif
328	#if HAVE_SCROLLBARS
329	scrollbar_ev.stop (display);	317	scrollbar_ev.stop (display);
330	#endif	318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
331	#if TRANSPARENT
332	rootwin_ev.stop (display);	319	rootwin_ev.stop (display);
333	#endif	320	#endif
334	incr_ev.stop ();	321	incr_ev.stop ();
335	termwin_ev.stop (display);	322	termwin_ev.stop (display);
336	vt_ev.stop (display);	323	vt_ev.stop (display);
337	}	324	}
338		325
339	check_ev.stop ();	326	flush_ev.stop ();
340	pty_ev.stop ();	327	pty_ev.stop ();
341	#ifdef CURSOR_BLINK	328	#ifdef CURSOR_BLINK
342	cursor_blink_ev.stop ();	329	cursor_blink_ev.stop ();
343	#endif	330	#endif
344	#ifdef TEXT_BLINK	331	#ifdef TEXT_BLINK
…		…
352	#endif	339	#endif
353	#ifdef POINTER_BLANK	340	#ifdef POINTER_BLANK
354	pointer_ev.stop ();	341	pointer_ev.stop ();
355	#endif	342	#endif
356		343
357	destroy_ev.start (0);	344	destroy_ev.start ();
358	}	345	}
359		346
360	void	347	void
361	rxvt_term::destroy_cb (time_watcher &w)	348	rxvt_term::destroy_cb (ev::idle &w, int revents)
362	{	349	{
363	make_current ();	350	make_current ();
364		351
365	delete this;	352	delete this;
366	}	353	}
…		…
420	else	407	else
421	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	408	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
422	mesg, BUFSIZ);	409	mesg, BUFSIZ);
423	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
424	}	411	}
425	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	412	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
426	mesg, BUFSIZ);	413	mesg, BUFSIZ);
427	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
428	}	415	}
429	#endif	416	#endif
430		417
…		…
454	DisplayString (display));	441	DisplayString (display));
455	rxvt_emergency_cleanup ();	442	rxvt_emergency_cleanup ();
456	_exit (EXIT_FAILURE);	443	_exit (EXIT_FAILURE);
457	}	444	}
458		445
459	/----------------------------------------------------------------------/
460	bool
461	rxvt_term::init (int argc, const char const argv, stringvec *envv)
462	{
463	this->envv = envv;
464
465	SET_R (this);
466	set_locale ("");
467	set_environ (envv); // few things in X do not call setlocale :(
468
469	if (!init_vars ())
470	return false;
471
472	init_secondary ();
473
474	const char **cmd_argv = init_resources (argc, argv);
475
476	#ifdef KEYSYM_RESOURCE
477	keyboard->register_done ();
478	#endif
479
480	#ifdef HAVE_SCROLLBARS
481	if (OPTION (Opt_scrollBar))
482	scrollBar.setIdle (); /* set existence for size calculations */
483	#endif
484
485	pty = ptytty::create ();
486
487	create_windows (argc, argv);
488
489	init_xlocale ();
490
491	scr_reset (); // initialize screen
492
493	#if 0
494	XSynchronize (dpy, True);
495	#endif
496
497	#ifdef HAVE_SCROLLBARS
498	if (OPTION (Opt_scrollBar))
499	resize_scrollbar (); /* create and map scrollbar */
500	#endif
501	#ifdef TRANSPARENT
502	if (OPTION (Opt_transparent))
503	{
504	XSelectInput (dpy, display->root, PropertyChangeMask);
505	check_our_parents ();
506	rootwin_ev.start (display, display->root);
507	}
508	#endif
509
510	set_colorfgbg ();
511
512	init_command (cmd_argv);
513
514	free (cmd_argv);
515
516	if (pty->pty >= 0)
517	pty_ev.start (pty->pty, EVENT_READ);
518
519	check_ev.start ();
520
521	HOOK_INVOKE ((this, HOOK_START, DT_END));
522
523	#if ENABLE_XEMBED
524	if (rs[Rs_embed])
525	{
526	long info[2] = { 0, XEMBED_MAPPED };
527
528	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
529	32, PropModeReplace, (unsigned char *)&info, 2);
530	}
531	#endif
532
533	XMapWindow (dpy, vt);
534	XMapWindow (dpy, parent[0]);
535
536	return true;
537	}
538
539	static struct sig_handlers	446	static struct sig_handlers
540	{	447	{
541	sig_watcher sw_term, sw_int;	448	ev::sig sw_term, sw_int;
542		449
543	/*	450	/*
544	* Catch a fatal signal and tidy up before quitting	451	* Catch a fatal signal and tidy up before quitting
545	*/	452	*/
546	void	453	void sig_term (ev::sig &w, int revents);
547	sig_term (sig_watcher &w)	454
		455	sig_handlers ()
548	{	456	{
549	rxvt_emergency_cleanup ();	457	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
550	signal (w.signum, SIG_DFL);
551	kill (getpid (), w.signum);
552	}
553
554	sig_handlers ()
555	: sw_term (this, &sig_handlers::sig_term),
556	sw_int (this, &sig_handlers::sig_term)	458	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
557	{
558	}	459	}
559	} sig_handlers;	460	} sig_handlers;
560		461
		462	void
		463	sig_handlers::sig_term (ev::sig &w, int revents)
		464	{
		465	rxvt_emergency_cleanup ();
		466	w.stop ();
		467	kill (getpid (), w.signum);
		468	}
		469
561	char **rxvt_environ; // startup environment	470	char **rxvt_environ; // startup environment
562		471
563	void	472	void
564	rxvt_init ()	473	rxvt_init ()
565	{	474	{
566	ptytty::init ();	475	ptytty::init ();
		476
		477	if (!ev_default_loop (0))
		478	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
567		479
568	rxvt_environ = environ;	480	rxvt_environ = environ;
569		481
570	signal (SIGHUP, SIG_IGN);	482	signal (SIGHUP, SIG_IGN);
571	signal (SIGPIPE, SIG_IGN);	483	signal (SIGPIPE, SIG_IGN);
572		484
573	sig_handlers.sw_term.start (SIGTERM);	485	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
574	sig_handlers.sw_int.start (SIGINT);	486	sig_handlers.sw_int.start (SIGINT); ev_unref ();
575		487
576	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	488	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
577	/* signal (SIGURG, SIG_DFL); */	489	/* signal (SIGURG, SIG_DFL); */
578		490
579	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	491	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
…		…
581	XSetIOErrorHandler (rxvt_xioerror_handler);	493	XSetIOErrorHandler (rxvt_xioerror_handler);
582		494
583	XrmInitialize ();	495	XrmInitialize ();
584	}	496	}
585		497
586	/* ------------------------------------------------------------------------- *
587	* MEMORY ALLOCATION WRAPPERS *
588	* ------------------------------------------------------------------------- */
589	void *
590	rxvt_malloc (size_t size)
591	{
592	void *p = malloc (size);
593
594	if (!p)
595	rxvt_fatal ("memory allocation failure. aborting.\n");
596
597	return p;
598	}
599
600	void *
601	rxvt_calloc (size_t number, size_t size)
602	{
603	void *p = calloc (number, size);
604
605	if (!p)
606	rxvt_fatal ("memory allocation failure. aborting.\n");
607
608	return p;
609	}
610
611	void *
612	rxvt_realloc (void *ptr, size_t size)
613	{
614	void *p = realloc (ptr, size);
615
616	if (!p)
617	rxvt_fatal ("memory allocation failure. aborting.\n");
618
619	return p;
620	}
621
622	/----------------------------------------------------------------------/	498	/----------------------------------------------------------------------/
623	/*	499	/*
624	* window size/position calculcations for XSizeHint and other storage.	500	* window size/position calculations for XSizeHint and other storage.
625	* if width/height are non-zero then override calculated width/height	501	* if width/height are non-zero then override calculated width/height
626	*/	502	*/
627	void	503	void
628	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	504	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629	{	505	{
630	short recalc_x, recalc_y;	506	short recalc_x, recalc_y;
631	int x, y, sb_w, flags;	507	int x, y, flags;
632	unsigned int w, h;	508	unsigned int w, h;
633	unsigned int max_width, max_height;	509	unsigned int max_width, max_height;
634		510
635	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	511	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
636	szHint.win_gravity = NorthWestGravity;	512	szHint.win_gravity = NorthWestGravity;
…		…
693	max_width = MAX_COLS * fwidth;	569	max_width = MAX_COLS * fwidth;
694	max_height = MAX_ROWS * fheight;	570	max_height = MAX_ROWS * fheight;
695		571
696	szHint.base_width = szHint.base_height = 2 * int_bwidth;	572	szHint.base_width = szHint.base_height = 2 * int_bwidth;
697		573
698	sb_w = 0;
699	window_vt_x = window_vt_y = int_bwidth;	574	window_vt_x = window_vt_y = int_bwidth;
700		575
701	if (scrollBar.state)	576	if (scrollBar.state)
702	{	577	{
703	sb_w = scrollbar_TotalWidth ();	578	int sb_w = scrollBar.total_width ();
704	szHint.base_width += sb_w;	579	szHint.base_width += sb_w;
705		580
706	if (!OPTION (Opt_scrollBar_right))	581	if (!option (Opt_scrollBar_right))
707	window_vt_x += sb_w;	582	window_vt_x += sb_w;
708	}	583	}
709		584
710	szHint.width_inc = fwidth;	585	szHint.width_inc = fwidth;
711	szHint.height_inc = fheight;	586	szHint.height_inc = fheight;
…		…
731	else	606	else
732	{	607	{
733	min_it (height, max_height);	608	min_it (height, max_height);
734	szHint.height = szHint.base_height + height;	609	szHint.height = szHint.base_height + height;
735	}	610	}
736
737	if (scrollBar.state && OPTION (Opt_scrollBar_right))
738	window_sb_x = szHint.width - sb_w;
739		611
740	if (recalc_x)	612	if (recalc_x)
741	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	613	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742		614
743	if (recalc_y)	615	if (recalc_y)
…		…
765	ws.ws_xpixel = width;	637	ws.ws_xpixel = width;
766	ws.ws_ypixel = height;	638	ws.ws_ypixel = height;
767	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	639	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
768		640
769	#if 0	641	#if 0
770	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	642	// TIOCSWINSZ is supposed to do this automatically and correctly
771	if (cmd_pid) /* force through to the command */	643	if (cmd_pid) /* force through to the command */
772	kill (-cmd_pid, SIGWINCH);	644	kill (-cmd_pid, SIGWINCH);
773	#endif	645	#endif
774	}	646	}
775		647
…		…
804	delete fontset[0];	676	delete fontset[0];
805	fontset[0] = fs;	677	fontset[0] = fs;
806		678
807	prop = (*fs)[1]->properties ();	679	prop = (*fs)[1]->properties ();
808	prop.height += lineSpace;	680	prop.height += lineSpace;
		681
809	fs->set_prop (prop);	682	fs->set_prop (prop, false);
810		683
811	fwidth = prop.width;	684	fwidth = prop.width;
812	fheight = prop.height;	685	fheight = prop.height;
813	fbase = prop.ascent;	686	fbase = prop.ascent;
814		687
…		…
823	{	696	{
824	fontset[style] = fs = new rxvt_fontset (this);	697	fontset[style] = fs = new rxvt_fontset (this);
825	rxvt_fontprop prop2 = prop;	698	rxvt_fontprop prop2 = prop;
826		699
827	if (res)	700	if (res)
828	prop2.weight = prop2.slant = rxvt_fontprop::unset;	701	{
		702	fs->populate (res);
		703	fs->set_prop (prop2, false);
		704	}
829	else	705	else
830	{	706	{
831	res = fontset[0]->fontdesc;	707	fs->populate (fontset[0]->fontdesc);
832		708
833	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	709	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
834	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	710	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		711
		712	fs->set_prop (prop2, true);
835	}	713	}
836		714
837	fs->populate (res);
838	fs->set_prop (prop2);
839	}	715	}
840	#else	716	#else
841	fontset[style] = fontset[0];	717	fontset[style] = fontset[0];
842	#endif	718	#endif
843	}	719	}
…		…
845	if (parent[0])	721	if (parent[0])
846	{	722	{
847	resize_all_windows (0, 0, 0);	723	resize_all_windows (0, 0, 0);
848	scr_remap_chars ();	724	scr_remap_chars ();
849	scr_touch (true);	725	scr_touch (true);
850	}	726	}
851		727
852	return true;	728	return true;
853	}	729	}
854		730
		731	void
855	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	732	rxvt_term::set_string_property (Atom prop, const char *str, int len)
856	{	733	{
857	XChangeProperty (dpy, parent[0],	734	XChangeProperty (dpy, parent[0],
858	prop, XA_STRING, 8, PropModeReplace,	735	prop, XA_STRING, 8, PropModeReplace,
859	(const unsigned char *)str, len >= 0 ? len : strlen (str));	736	(const unsigned char *)str, len >= 0 ? len : strlen (str));
860	}	737	}
861		738
		739	void
862	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	740	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
863	{	741	{
864	wchar_t *ws = rxvt_mbstowcs (str, len);	742	wchar_t *ws = rxvt_mbstowcs (str, len);
865	char *s = rxvt_wcstoutf8 (ws);	743	char *s = rxvt_wcstoutf8 (ws);
866		744
867	XChangeProperty (dpy, parent[0],	745	XChangeProperty (dpy, parent[0],
…		…
891	#if ENABLE_EWMH	769	#if ENABLE_EWMH
892	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	770	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
893	#endif	771	#endif
894	}	772	}
895		773
		774	void
		775	rxvt_term::set_window_color (int idx, const char *color)
		776	{
896	#ifdef XTERM_COLOR_CHANGE	777	#ifdef XTERM_COLOR_CHANGE
897	void
898	rxvt_term::set_window_color (int idx, const char *color)
899	{
900	rxvt_color xcol;	778	rxvt_color xcol;
901	int i;	779
902
903	if (color == NULL \|\| *color == '\0')	780	if (color == NULL \|\| *color == '\0')
904	return;	781	return;
905		782
906	color = strdup (color);	783	color = strdup (color);
907	allocated.push_back ((void *)color);	784	allocated.push_back ((void *)color);
908	rs[Rs_color + idx] = color;	785	rs[Rs_color + idx] = color;
909		786
910	/* handle color aliases */	787	/* handle color aliases */
911	if (isdigit (*color))	788	if (isdigit (*color))
912	{	789	{
913	i = atoi (color);	790	int i = atoi (color);
914		791
915	if (i >= 8 && i <= 15)	792	if (i >= 8 && i <= 15)
		793	{
916	{ /* bright colors */	794	/* bright colors */
917	i -= 8;
918	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	795	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
919	goto done;	796	goto done;
920	}	797	}
921		798
922	if (i >= 0 && i <= 7)	799	if (i >= 0 && i <= 7)
		800	{
923	{ /* normal colors */	801	/* normal colors */
924	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	802	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
925	goto done;	803	goto done;
926	}	804	}
927	}	805	}
928		806
…		…
933	* so just keep gobbling up the colormap	811	* so just keep gobbling up the colormap
934	*/	812	*/
935		813
936	pix_colors_focused[idx] = xcol;	814	pix_colors_focused[idx] = xcol;
937		815
938	/* XSetWindowAttributes attr; */
939	/* Cursor cursor; */
940	done:	816	done:
941
942	#if OFF_FOCUS_FADING
943	if (rs[Rs_fade])
944	{
945	rgba c;
946	pix_colors [Color_fade].get (c);
947	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948	}
949	#endif
950
951	/TODO: handle Color_BD, scrollbar background, etc. /	817	/TODO: handle Color_BD, scrollbar background, etc. /
952		818
		819	update_fade_color (idx);
953	recolour_cursor ();	820	recolour_cursor ();
954	scr_recolour ();	821	scr_recolour ();
		822	#endif /* XTERM_COLOR_CHANGE */
955	}	823	}
956
957	#else
958	# define set_window_color (idx,color) ((void)0)
959	#endif /* XTERM_COLOR_CHANGE */
960		824
961	void	825	void
962	rxvt_term::recolour_cursor ()	826	rxvt_term::recolour_cursor ()
963	{	827	{
964	XColor fg, bg;	828	XColor fg, bg;
…		…
980	*/	844	*/
981	void	845	void
982	rxvt_term::set_colorfgbg ()	846	rxvt_term::set_colorfgbg ()
983	{	847	{
984	unsigned int i;	848	unsigned int i;
985	const char *xpmb = "\0";	849	const char *xpmb = "";
986	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	850	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
987		851
988	strcpy (fstr, "default");	852	strcpy (fstr, "default");
989	strcpy (bstr, "default");	853	strcpy (bstr, "default");
990	for (i = Color_Black; i <= Color_White; i++)	854	for (i = Color_Black; i <= Color_White; i++)
…		…
996		860
997	for (i = Color_Black; i <= Color_White; i++)	861	for (i = Color_Black; i <= Color_White; i++)
998	if (pix_colors[Color_bg] == pix_colors[i])	862	if (pix_colors[Color_bg] == pix_colors[i])
999	{	863	{
1000	sprintf (bstr, "%d", (i - Color_Black));	864	sprintf (bstr, "%d", (i - Color_Black));
1001	#ifdef XPM_BACKGROUND	865	#ifdef BG_IMAGE_FROM_FILE
1002	xpmb = "default;";	866	xpmb = "default;";
1003	#endif	867	#endif
1004	break;	868	break;
1005	}	869	}
1006		870
…		…
1091	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	955	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1092		956
1093	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	957	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1094	{	958	{
1095	if (scrollBar.state)	959	if (scrollBar.state)
1096	{	960	scrollBar.resize ();
1097	XMoveResizeWindow (dpy, scrollBar.win,
1098	window_sb_x, 0,
1099	scrollbar_TotalWidth (), szHint.height);
1100	resize_scrollbar ();
1101	}
1102		961
1103	XMoveResizeWindow (dpy, vt,	962	XMoveResizeWindow (dpy, vt,
1104	window_vt_x, window_vt_y,	963	window_vt_x, window_vt_y,
1105	width, height);	964	width, height);
1106		965
		966	#ifdef HAVE_BG_PIXMAP
		967	if (bgPixmap.window_size_sensitive ())
		968	update_background ();
		969	#endif
		970
1107	scr_clear ();	971	scr_clear ();
1108	#ifdef XPM_BACKGROUND
1109	resize_pixmap ();
1110	#endif
1111	}	972	}
1112		973
1113	if (fix_screen \|\| old_height == 0)	974	if (fix_screen \|\| old_height == 0)
1114	scr_reset ();	975	scr_reset ();
1115		976
1116	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	977	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117	//scr_touch (false);	978	//scr_touch (false);
1118		979
1119	#ifdef XPM_BACKGROUND	980	#ifdef HAVE_BG_PIXMAP
1120	if (pixmap)	981	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		982	// if (bgPixmap.pixmap)
1121	scr_touch (false);	983	// scr_touch (false);
1122	#endif	984	#endif
1123		985
1124	#ifdef USE_XIM	986	#ifdef USE_XIM
1125	IMSetPosition ();	987	IMSetPosition ();
1126	#endif	988	#endif
…		…
1297	if (term->rs[Rs_imLocale])	1159	if (term->rs[Rs_imLocale])
1298	SET_LOCALE (term->locale);	1160	SET_LOCALE (term->locale);
1299	}	1161	}
1300	else	1162	else
1301	str = (void *)text->string.wide_char;	1163	str = (void *)text->string.wide_char;
1302		1164
1303	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1165	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304	DT_INT, call_data->caret,	1166	DT_INT, call_data->caret,
1305	DT_INT, call_data->chg_first,	1167	DT_INT, call_data->chg_first,
1306	DT_INT, call_data->chg_length,	1168	DT_INT, call_data->chg_length,
1307	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1169	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1626		1488
1627	if (input_style & XIMPreeditPosition)	1489	if (input_style & XIMPreeditPosition)
1628	{	1490	{
1629	im_set_size (preedit_rect);	1491	im_set_size (preedit_rect);
1630	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1492	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631		1493
1632	XSetICValues (Input_Context,	1494	XSetICValues (Input_Context,
1633	XNPreeditAttributes, preedit_attr, NULL);	1495	XNPreeditAttributes, preedit_attr, NULL);
1634	}	1496	}
1635	else	1497	else
1636	{	1498	{
…		…
1653	XFree (status_attr);	1515	XFree (status_attr);
1654	}	1516	}
1655		1517
1656	XFree (preedit_attr);	1518	XFree (preedit_attr);
1657	}	1519	}
1658	#endif /* USE_XIM */	1520	#endif /* USE_XIM */
		1521
		1522	void
		1523	rxvt_term::get_window_origin (int &x, int &y)
		1524	{
		1525	Window cr;
		1526	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1527	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1528	}
		1529
		1530	Pixmap
		1531	rxvt_term::get_pixmap_property (int prop_id)
		1532	{
		1533	if (prop_id > 0 && prop_id < NUM_XA)
		1534	if (xa[prop_id])
		1535	{
		1536	int aformat;
		1537	unsigned long nitems, bytes_after;
		1538	Atom atype;
		1539	unsigned char *prop = NULL;
		1540	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1541	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1542	&nitems, &bytes_after, &prop);
		1543	if (result == Success && prop && atype == XA_PIXMAP)
		1544	return (Pixmap )prop;
		1545	}
		1546
		1547	return None;
		1548	}
		1549
		1550	#ifdef HAVE_BG_PIXMAP
		1551	# if TRACE_PIXMAPS
		1552	# undef update_background
		1553	void
		1554	rxvt_term::trace_update_background (const char *file, int line)
		1555	{
		1556	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1557	update_background ();
		1558	}
		1559	# endif
		1560
		1561	void
		1562	rxvt_term::update_background ()
		1563	{
		1564	if (update_background_ev.is_active ())
		1565	return;
		1566
		1567	bgPixmap.invalidate ();
		1568
		1569	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1570
		1571	if (to_wait <= 0.)
		1572	bgPixmap.render ();
		1573	else
		1574	update_background_ev.start (to_wait);
		1575	}
		1576
		1577	void
		1578	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1579	{
		1580	make_current ();
		1581
		1582	update_background_ev.stop ();
		1583	bgPixmap.render ();
		1584	refresh_check ();
		1585	}
		1586
		1587	#endif /* HAVE_BG_PIXMAP */
1659		1588
1660	/----------------------- end-of-file (C source) -----------------------/	1589	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.223 by root, Sat Feb 18 14:14:43 2006 UTC vs. Revision 1.308 by ayin, Tue Feb 19 13:01:32 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.223 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.308 by ayin, Tue Feb 19 13:01:32 2008 UTC