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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.242 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.308 by ayin, Tue Feb 19 13:01:32 2008 UTC

…		…
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"
…		…
88	class rxvt_composite_vec rxvt_composite;	91	class rxvt_composite_vec rxvt_composite;
89		92
90	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)
91	{	94	{
92	compose_char *cc;	95	compose_char *cc;
93		96
94	// break compose chains, as stupid readline really likes to duplicate	97	// break compose chains, as stupid readline really likes to duplicate
95	// composing characters for some reason near the end of a line.	98	// composing characters for some reason near the end of a line.
96	cc = (*this)[c1];	99	cc = (*this)[c1];
97	while (cc)	100	while (cc)
98	{	101	{
…		…
147		150
148	}	151	}
149	#endif	152	#endif
150		153
151	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
152	:	155	{
		156	#if HAVE_BG_PIXMAP
		157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
		158	#endif
		159	#ifdef CURSOR_BLINK
		160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
		161	#endif
		162	#ifdef TEXT_BLINK
		163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
		164	#endif
		165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
		167	#endif
		168	#ifdef SELECTION_SCROLLING
		169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
		170	#endif
		171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
153	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155	#endif	176	#endif
156	#if ENABLE_TRANSPARENCY	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157	check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),	178	#ifdef USE_XIM
158	#endif	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
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	180	#endif
177	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
178	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179	#endif	183	#endif
180	#ifdef USE_XIM
181	im_ev (this, &rxvt_term::im_cb),
182	#endif
183	#ifndef NO_BELL	184	#ifndef NO_BELL
184	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185	#endif	186	#endif
186	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	incr_ev (this, &rxvt_term::incr_cb)	194
194	{
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		196
197	termlist.push_back (this);	197	termlist.push_back (this);
198		198
199	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
201	#endif	201	#endif
202	}	202	}
203		203
204	// 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.
205	// for use before an emergency exit	205	// for use before an emergency exit
		206	void
206	void rxvt_term::emergency_cleanup ()	207	rxvt_term::emergency_cleanup ()
207	{	208	{
208	if (cmd_pid)	209	if (cmd_pid)
209	kill (-cmd_pid, SIGHUP);	210	kill (-cmd_pid, SIGHUP);
210		211
211	pty_ev.stop ();	212	pty_ev.stop ();
…		…
223	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
224	delete fontset[i];	225	delete fontset[i];
225	#endif	226	#endif
226	delete fontset[0];	227	delete fontset[0];
227		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
		232
228	if (display)	233	if (display)
229	{	234	{
230	selection_clear ();	235	selection_clear ();
231		236
232	#ifdef USE_XIM	237	#ifdef USE_XIM
233	im_destroy ();	238	im_destroy ();
234	#endif	239	#endif
235	#ifdef XTERM_SCROLLBAR	240	scrollBar.destroy ();
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);	241	if (gc) XFreeGC (dpy, gc);
260		242
261	delete drawable;	243	delete drawable;
262	// destroy all windows	244	// destroy all windows
263	if (parent[0])	245	if (parent[0])
…		…
271	pix_colors_unfocused [i].free (this);	253	pix_colors_unfocused [i].free (this);
272	#endif	254	#endif
273	}	255	}
274		256
275	clear ();	257	clear ();
276	}
277		258
278	delete [] pix_colors_focused;	259	display->flush (); /* ideally .put should do this */
279	#if OFF_FOCUS_FADING
280	delete [] pix_colors_unfocused;
281	#endif
282
283	displays.put (display);	260	displays.put (display);
		261	}
284		262
285	scr_release ();	263	scr_release ();
286		264
287	/* clear all resources */	265	/* clear all resources */
288	for (int i = 0; i < allocated.size (); i++)	266	for (int i = 0; i < allocated.size (); i++)
…		…
300	delete argv;	278	delete argv;
301		279
302	#ifdef KEYSYM_RESOURCE	280	#ifdef KEYSYM_RESOURCE
303	delete keyboard;	281	delete keyboard;
304	#endif	282	#endif
		283	#ifndef NO_RESOURCES
		284	XrmDestroyDatabase (option_db);
		285	#endif
305	}	286	}
306		287
307	// child has exited, usually destroys	288	// child has exited, usually destroys
308	void	289	void
309	rxvt_term::child_cb (child_watcher &w, int status)	290	rxvt_term::child_cb (ev::child &w, int status)
310	{	291	{
311	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	292	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312		293
313	cmd_pid = 0;	294	cmd_pid = 0;
314		295
…		…
317	}	298	}
318		299
319	void	300	void
320	rxvt_term::destroy ()	301	rxvt_term::destroy ()
321	{	302	{
322	if (destroy_ev.active)	303	if (destroy_ev.is_active ())
323	return;	304	return;
324		305
325	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	306	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326		307
327	#if ENABLE_OVERLAY	308	#if ENABLE_OVERLAY
…		…
331	if (display)	312	if (display)
332	{	313	{
333	#if USE_XIM	314	#if USE_XIM
334	im_ev.stop (display);	315	im_ev.stop (display);
335	#endif	316	#endif
336	#if HAVE_SCROLLBARS
337	scrollbar_ev.stop (display);	317	scrollbar_ev.stop (display);
338	#endif
339	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
340	rootwin_ev.stop (display);	319	rootwin_ev.stop (display);
341	#endif	320	#endif
342	incr_ev.stop ();	321	incr_ev.stop ();
343	termwin_ev.stop (display);	322	termwin_ev.stop (display);
344	vt_ev.stop (display);	323	vt_ev.stop (display);
345	}	324	}
346		325
347	check_ev.stop ();	326	flush_ev.stop ();
348	pty_ev.stop ();	327	pty_ev.stop ();
349	#ifdef CURSOR_BLINK	328	#ifdef CURSOR_BLINK
350	cursor_blink_ev.stop ();	329	cursor_blink_ev.stop ();
351	#endif	330	#endif
352	#ifdef TEXT_BLINK	331	#ifdef TEXT_BLINK
…		…
360	#endif	339	#endif
361	#ifdef POINTER_BLANK	340	#ifdef POINTER_BLANK
362	pointer_ev.stop ();	341	pointer_ev.stop ();
363	#endif	342	#endif
364		343
365	destroy_ev.start (0);	344	destroy_ev.start ();
366	}	345	}
367		346
368	void	347	void
369	rxvt_term::destroy_cb (time_watcher &w)	348	rxvt_term::destroy_cb (ev::idle &w, int revents)
370	{	349	{
371	make_current ();	350	make_current ();
372		351
373	delete this;	352	delete this;
374	}	353	}
…		…
428	else	407	else
429	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	408	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430	mesg, BUFSIZ);	409	mesg, BUFSIZ);
431	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432	}	411	}
433	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	412	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434	mesg, BUFSIZ);	413	mesg, BUFSIZ);
435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436	}	415	}
437	#endif	416	#endif
438		417
…		…
462	DisplayString (display));	441	DisplayString (display));
463	rxvt_emergency_cleanup ();	442	rxvt_emergency_cleanup ();
464	_exit (EXIT_FAILURE);	443	_exit (EXIT_FAILURE);
465	}	444	}
466		445
467	/----------------------------------------------------------------------/
468	bool
469	rxvt_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 ();
486	#endif
487
488	#ifdef HAVE_SCROLLBARS
489	if (option (Opt_scrollBar))
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);
531	}
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 ();
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
591	static struct sig_handlers	446	static struct sig_handlers
592	{	447	{
593	sig_watcher sw_term, sw_int;	448	ev::sig sw_term, sw_int;
594		449
595	/*	450	/*
596	* Catch a fatal signal and tidy up before quitting	451	* Catch a fatal signal and tidy up before quitting
597	*/	452	*/
598	void	453	void sig_term (ev::sig &w, int revents);
599	sig_term (sig_watcher &w)	454
		455	sig_handlers ()
600	{	456	{
601	rxvt_emergency_cleanup ();	457	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
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)	458	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
609	{
610	}	459	}
611	} sig_handlers;	460	} sig_handlers;
612		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
613	char **rxvt_environ; // startup environment	470	char **rxvt_environ; // startup environment
614		471
615	void	472	void
616	rxvt_init ()	473	rxvt_init ()
617	{	474	{
618	ptytty::init ();	475	ptytty::init ();
		476
		477	if (!ev_default_loop (0))
		478	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
619		479
620	rxvt_environ = environ;	480	rxvt_environ = environ;
621		481
622	signal (SIGHUP, SIG_IGN);	482	signal (SIGHUP, SIG_IGN);
623	signal (SIGPIPE, SIG_IGN);	483	signal (SIGPIPE, SIG_IGN);
624		484
625	sig_handlers.sw_term.start (SIGTERM);	485	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
626	sig_handlers.sw_int.start (SIGINT);	486	sig_handlers.sw_int.start (SIGINT); ev_unref ();
627		487
628	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	488	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
629	/* signal (SIGURG, SIG_DFL); */	489	/* signal (SIGURG, SIG_DFL); */
630		490
631	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	491	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
632	// TODO: handle this with exceptions and tolerate the memory loss	492	// TODO: handle this with exceptions and tolerate the memory loss
633	XSetIOErrorHandler (rxvt_xioerror_handler);	493	XSetIOErrorHandler (rxvt_xioerror_handler);
634		494
635	XrmInitialize ();	495	XrmInitialize ();
636	}
637
638	/* ------------------------------------------------------------------------- *
639	* MEMORY ALLOCATION WRAPPERS *
640	* ------------------------------------------------------------------------- */
641	void *
642	rxvt_malloc (size_t size)
643	{
644	void *p = malloc (size);
645
646	if (!p)
647	rxvt_fatal ("memory allocation failure. aborting.\n");
648
649	return p;
650	}
651
652	void *
653	rxvt_calloc (size_t number, size_t size)
654	{
655	void *p = calloc (number, size);
656
657	if (!p)
658	rxvt_fatal ("memory allocation failure. aborting.\n");
659
660	return p;
661	}
662
663	void *
664	rxvt_realloc (void *ptr, size_t size)
665	{
666	void *p = realloc (ptr, size);
667
668	if (!p)
669	rxvt_fatal ("memory allocation failure. aborting.\n");
670
671	return p;
672	}	496	}
673		497
674	/----------------------------------------------------------------------/	498	/----------------------------------------------------------------------/
675	/*	499	/*
676	* window size/position calculations for XSizeHint and other storage.	500	* window size/position calculations for XSizeHint and other storage.
…		…
678	*/	502	*/
679	void	503	void
680	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	504	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
681	{	505	{
682	short recalc_x, recalc_y;	506	short recalc_x, recalc_y;
683	int x, y, sb_w, flags;	507	int x, y, flags;
684	unsigned int w, h;	508	unsigned int w, h;
685	unsigned int max_width, max_height;	509	unsigned int max_width, max_height;
686		510
687	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	511	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
688	szHint.win_gravity = NorthWestGravity;	512	szHint.win_gravity = NorthWestGravity;
…		…
745	max_width = MAX_COLS * fwidth;	569	max_width = MAX_COLS * fwidth;
746	max_height = MAX_ROWS * fheight;	570	max_height = MAX_ROWS * fheight;
747		571
748	szHint.base_width = szHint.base_height = 2 * int_bwidth;	572	szHint.base_width = szHint.base_height = 2 * int_bwidth;
749		573
750	sb_w = 0;
751	window_vt_x = window_vt_y = int_bwidth;	574	window_vt_x = window_vt_y = int_bwidth;
752		575
753	if (scrollBar.state)	576	if (scrollBar.state)
754	{	577	{
755	sb_w = scrollbar_TotalWidth ();	578	int sb_w = scrollBar.total_width ();
756	szHint.base_width += sb_w;	579	szHint.base_width += sb_w;
757		580
758	if (!option (Opt_scrollBar_right))	581	if (!option (Opt_scrollBar_right))
759	window_vt_x += sb_w;	582	window_vt_x += sb_w;
760	}	583	}
…		…
783	else	606	else
784	{	607	{
785	min_it (height, max_height);	608	min_it (height, max_height);
786	szHint.height = szHint.base_height + height;	609	szHint.height = szHint.base_height + height;
787	}	610	}
788
789	if (scrollBar.state && option (Opt_scrollBar_right))
790	window_sb_x = szHint.width - sb_w;
791		611
792	if (recalc_x)	612	if (recalc_x)
793	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	613	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
794		614
795	if (recalc_y)	615	if (recalc_y)
…		…
817	ws.ws_xpixel = width;	637	ws.ws_xpixel = width;
818	ws.ws_ypixel = height;	638	ws.ws_ypixel = height;
819	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	639	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
820		640
821	#if 0	641	#if 0
822	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	642	// TIOCSWINSZ is supposed to do this automatically and correctly
823	if (cmd_pid) /* force through to the command */	643	if (cmd_pid) /* force through to the command */
824	kill (-cmd_pid, SIGWINCH);	644	kill (-cmd_pid, SIGWINCH);
825	#endif	645	#endif
826	}	646	}
827		647
…		…
901	if (parent[0])	721	if (parent[0])
902	{	722	{
903	resize_all_windows (0, 0, 0);	723	resize_all_windows (0, 0, 0);
904	scr_remap_chars ();	724	scr_remap_chars ();
905	scr_touch (true);	725	scr_touch (true);
906	}	726	}
907		727
908	return true;	728	return true;
909	}	729	}
910		730
		731	void
911	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)
912	{	733	{
913	XChangeProperty (dpy, parent[0],	734	XChangeProperty (dpy, parent[0],
914	prop, XA_STRING, 8, PropModeReplace,	735	prop, XA_STRING, 8, PropModeReplace,
915	(const unsigned char *)str, len >= 0 ? len : strlen (str));	736	(const unsigned char *)str, len >= 0 ? len : strlen (str));
916	}	737	}
917		738
		739	void
918	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)
919	{	741	{
920	wchar_t *ws = rxvt_mbstowcs (str, len);	742	wchar_t *ws = rxvt_mbstowcs (str, len);
921	char *s = rxvt_wcstoutf8 (ws);	743	char *s = rxvt_wcstoutf8 (ws);
922		744
923	XChangeProperty (dpy, parent[0],	745	XChangeProperty (dpy, parent[0],
…		…
947	#if ENABLE_EWMH	769	#if ENABLE_EWMH
948	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	770	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
949	#endif	771	#endif
950	}	772	}
951		773
		774	void
		775	rxvt_term::set_window_color (int idx, const char *color)
		776	{
952	#ifdef XTERM_COLOR_CHANGE	777	#ifdef XTERM_COLOR_CHANGE
953	void
954	rxvt_term::set_window_color (int idx, const char *color)
955	{
956	rxvt_color xcol;	778	rxvt_color xcol;
957	int i;	779
958
959	if (color == NULL \|\| *color == '\0')	780	if (color == NULL \|\| *color == '\0')
960	return;	781	return;
961		782
962	color = strdup (color);	783	color = strdup (color);
963	allocated.push_back ((void *)color);	784	allocated.push_back ((void *)color);
964	rs[Rs_color + idx] = color;	785	rs[Rs_color + idx] = color;
965		786
966	/* handle color aliases */	787	/* handle color aliases */
967	if (isdigit (*color))	788	if (isdigit (*color))
968	{	789	{
969	i = atoi (color);	790	int i = atoi (color);
970		791
971	if (i >= 8 && i <= 15)	792	if (i >= 8 && i <= 15)
		793	{
972	{ /* bright colors */	794	/* bright colors */
973	i -= 8;
974	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	795	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
975	goto done;	796	goto done;
976	}	797	}
977		798
978	if (i >= 0 && i <= 7)	799	if (i >= 0 && i <= 7)
		800	{
979	{ /* normal colors */	801	/* normal colors */
980	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	802	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
981	goto done;	803	goto done;
982	}	804	}
983	}	805	}
984		806
…		…
989	* so just keep gobbling up the colormap	811	* so just keep gobbling up the colormap
990	*/	812	*/
991		813
992	pix_colors_focused[idx] = xcol;	814	pix_colors_focused[idx] = xcol;
993		815
994	/* XSetWindowAttributes attr; */
995	/* Cursor cursor; */
996	done:	816	done:
997	/TODO: handle Color_BD, scrollbar background, etc. /	817	/TODO: handle Color_BD, scrollbar background, etc. /
998		818
999	update_fade_color (idx);	819	update_fade_color (idx);
1000	recolour_cursor ();	820	recolour_cursor ();
1001	scr_recolour ();	821	scr_recolour ();
		822	#endif /* XTERM_COLOR_CHANGE */
1002	}	823	}
1003
1004	#else
1005	# define set_window_color (idx,color) ((void)0)
1006	#endif /* XTERM_COLOR_CHANGE */
1007		824
1008	void	825	void
1009	rxvt_term::recolour_cursor ()	826	rxvt_term::recolour_cursor ()
1010	{	827	{
1011	XColor fg, bg;	828	XColor fg, bg;
…		…
1027	*/	844	*/
1028	void	845	void
1029	rxvt_term::set_colorfgbg ()	846	rxvt_term::set_colorfgbg ()
1030	{	847	{
1031	unsigned int i;	848	unsigned int i;
1032	const char *xpmb = "\0";	849	const char *xpmb = "";
1033	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	850	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1034		851
1035	strcpy (fstr, "default");	852	strcpy (fstr, "default");
1036	strcpy (bstr, "default");	853	strcpy (bstr, "default");
1037	for (i = Color_Black; i <= Color_White; i++)	854	for (i = Color_Black; i <= Color_White; i++)
…		…
1043		860
1044	for (i = Color_Black; i <= Color_White; i++)	861	for (i = Color_Black; i <= Color_White; i++)
1045	if (pix_colors[Color_bg] == pix_colors[i])	862	if (pix_colors[Color_bg] == pix_colors[i])
1046	{	863	{
1047	sprintf (bstr, "%d", (i - Color_Black));	864	sprintf (bstr, "%d", (i - Color_Black));
1048	#ifdef XPM_BACKGROUND	865	#ifdef BG_IMAGE_FROM_FILE
1049	xpmb = "default;";	866	xpmb = "default;";
1050	#endif	867	#endif
1051	break;	868	break;
1052	}	869	}
1053		870
…		…
1138	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	955	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1139		956
1140	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	957	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1141	{	958	{
1142	if (scrollBar.state)	959	if (scrollBar.state)
1143	{	960	scrollBar.resize ();
1144	XMoveResizeWindow (dpy, scrollBar.win,
1145	window_sb_x, 0,
1146	scrollbar_TotalWidth (), szHint.height);
1147	resize_scrollbar ();
1148	}
1149		961
1150	XMoveResizeWindow (dpy, vt,	962	XMoveResizeWindow (dpy, vt,
1151	window_vt_x, window_vt_y,	963	window_vt_x, window_vt_y,
1152	width, height);	964	width, height);
1153		965
1154	#ifdef XPM_BACKGROUND	966	#ifdef HAVE_BG_PIXMAP
1155	/* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1156	if (bgPixmap.window_size_sensitive ())	967	if (bgPixmap.window_size_sensitive ())
1157	bgPixmap.render ();	968	update_background ();
1158	#endif	969	#endif
1159		970
1160	scr_clear ();	971	scr_clear ();
1161	}	972	}
1162		973
…		…
1348	if (term->rs[Rs_imLocale])	1159	if (term->rs[Rs_imLocale])
1349	SET_LOCALE (term->locale);	1160	SET_LOCALE (term->locale);
1350	}	1161	}
1351	else	1162	else
1352	str = (void *)text->string.wide_char;	1163	str = (void *)text->string.wide_char;
1353		1164
1354	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1165	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1355	DT_INT, call_data->caret,	1166	DT_INT, call_data->caret,
1356	DT_INT, call_data->chg_first,	1167	DT_INT, call_data->chg_first,
1357	DT_INT, call_data->chg_length,	1168	DT_INT, call_data->chg_length,
1358	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,
…		…
1677		1488
1678	if (input_style & XIMPreeditPosition)	1489	if (input_style & XIMPreeditPosition)
1679	{	1490	{
1680	im_set_size (preedit_rect);	1491	im_set_size (preedit_rect);
1681	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1492	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1682		1493
1683	XSetICValues (Input_Context,	1494	XSetICValues (Input_Context,
1684	XNPreeditAttributes, preedit_attr, NULL);	1495	XNPreeditAttributes, preedit_attr, NULL);
1685	}	1496	}
1686	else	1497	else
1687	{	1498	{
…		…
1704	XFree (status_attr);	1515	XFree (status_attr);
1705	}	1516	}
1706		1517
1707	XFree (preedit_attr);	1518	XFree (preedit_attr);
1708	}	1519	}
1709	#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 */
1710		1588
1711	/----------------------- 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.242 by sasha, Wed Aug 15 22:41:52 2007 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.242 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.308 by ayin, Tue Feb 19 13:01:32 2008 UTC