ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.216 by root, Fri May 19 16:43:57 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
15		16
		17	our %WIDGET; # all widgets, weak-referenced
		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (exists $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
20		23
21	if ($TOOLTIP->{owner} != $widget) {	24	if ($TOOLTIP->{owner} != $widget) {
22	$TOOLTIP->{owner} = $widget;	25	$TOOLTIP->{owner} = $widget;
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_text ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	32	$TOOLTIP->show;
		33
		34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		35
		36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
		37	if $x + $TOOLTIP->{w} > $::WIDTH;
		38
		39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
31	}	42	}
32		43
33	return;	44	return;
34	}	45	}
35	}	46	}
…		…
39	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
40	}	51	}
41		52
42	# class methods for events	53	# class methods for events
43	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
44	$FOCUS->key_down ($_[0]) if $FOCUS;	55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		56	if $FOCUS;
45	}	57	}
46		58
47	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
48	$FOCUS->key_up ($_[0]) if $FOCUS;	60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		61	if $FOCUS;
49	}	62	}
50		63
51	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
52	my ($ev) = @_;	65	my ($ev) = @_;
53	my ($x, $y) = ($ev->{x}, $ev->{y});	66	my ($x, $y) = ($ev->{x}, $ev->{y});
…		…
61	check_tooltip;	74	check_tooltip;
62	}	75	}
63		76
64	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
65		78
66	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	79	if ($GRAB) {
		80	($x, $y) = $GRAB->coord2local ($x, $y);
		81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		82	}
67	}	83	}
68		84
69	sub feed_sdl_button_up_event {	85	sub feed_sdl_button_up_event {
70	my ($ev) = @_;	86	my ($ev) = @_;
71	my ($x, $y) = ($ev->{x}, $ev->{y});	87	my ($x, $y) = ($ev->{x}, $ev->{y});
72		88
73	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74		90
75	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76		92
77	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	93	if ($GRAB) {
		94	($x, $y) = $GRAB->coord2local ($x, $y);
		95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		96	}
78		97
79	if (!$BUTTON_STATE) {	98	if (!$BUTTON_STATE) {
80	my $grab = $GRAB; undef $GRAB;	99	my $grab = $GRAB; undef $GRAB;
81	$grab->update if $grab;	100	$grab->update if $grab;
82	$GRAB->update if $GRAB;	101	$GRAB->update if $GRAB;
…		…
98	$HOVER->update if $HOVER && $HOVER->{can_hover};	117	$HOVER->update if $HOVER && $HOVER->{can_hover};
99		118
100	check_tooltip;	119	check_tooltip;
101	}	120	}
102		121
103	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	122	if ($HOVER) {
		123	($x, $y) = $HOVER->coord2local ($x, $y);
		124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		125	}
104	}	126	}
105		127
106	# convert position array to integers	128	# convert position array to integers
107	sub harmonize {	129	sub harmonize {
108	my ($vals) = @_;	130	my ($vals) = @_;
…		…
114	$rem += $_ - $i;	136	$rem += $_ - $i;
115	$_ = $i;	137	$_ = $i;
116	}	138	}
117	}	139	}
118		140
		141	# call when resolution changes etc.
		142	sub rescale_widgets {
		143	my ($sx, $sy) = @_;
		144
		145	# make a copy, otherwise for complains about freed values.
		146	my @widgets = values %WIDGET;
		147
		148	for my $widget (@widgets) {
		149	if ($widget->{toplevel}) {
		150	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		151	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		152	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		153	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		154	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		155	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		156	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		157	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		158	}
		159
		160	$widget->reconfigure;
		161	}
		162	}
		163
119	#############################################################################	164	#############################################################################
120		165
121	package CFClient::UI::Base;	166	package CFClient::UI::Base;
122		167
123	use strict;	168	use strict;
…		…
126		171
127	sub new {	172	sub new {
128	my $class = shift;	173	my $class = shift;
129		174
130	my $self = bless {	175	my $self = bless {
131	x => 0,	176	x => 0,
132	y => 0,	177	y => 0,
133	z => 0,	178	z => 0,
134	can_events => 1,	179	can_events => 1,
135	@_	180	@_
136	}, $class;	181	}, $class;
137		182
138	for (keys %$self) {	183	for (keys %$self) {
139	if (/^connect_(.*)$/) {	184	if (/^connect_(.*)$/) {
140	$self->connect ($1 => delete $self->{$_});	185	$self->connect ($1 => delete $self->{$_});
141	}	186	}
142	}	187	}
143		188
		189	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		190
144	$self	191	$self
145	}	192	}
146		193
		194	sub destroy {
		195	my ($self) = @_;
		196
		197	$self->hide;
		198	%$self = ();
		199	}
		200
147	sub show {	201	sub show {
148	my ($self) = @_;	202	my ($self) = @_;
149		203
150	return if $self->{parent};	204	return if $self->{parent};
151		205
…		…
153	}	207	}
154		208
155	sub hide {	209	sub hide {
156	my ($self) = @_;	210	my ($self) = @_;
157		211
158	return unless $self->{parent};	212	undef $GRAB if $GRAB == $self;
		213	undef $HOVER if $HOVER == $self;
159		214
160	$self->{parent}->remove ($self);	215	$self->{parent}->remove ($self)
		216	if $self->{parent};
161	}	217	}
162		218
163	sub move {	219	sub move {
164	my ($self, $x, $y, $z) = @_;	220	my ($self, $x, $y, $z) = @_;
165		221
…		…
204	$self->{y} = $y;	260	$self->{y} = $y;
205	$self->update;	261	$self->update;
206	}	262	}
207		263
208	if ($self->{w} != $w || $self->{h} != $h) {	264	if ($self->{w} != $w || $self->{h} != $h) {
209	$self->{w} = $w;	265	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
210	$self->{h} = $h;
211
212	$self->size_allocate ($w, $h);
213	$self->update;
214	}	266	}
215	}	267	}
216		268
217	sub size_allocate {	269	sub size_allocate {
218	# nothing to be done	270	# nothing to be done
219	}	271	}
220		272
		273	sub reconfigure {
		274	my ($self) = @_;
		275
		276	$self->check_size (1);
		277	$self->update;
		278	}
		279
		280	sub children {
		281	}
		282
221	sub set_max_size {	283	sub set_max_size {
222	my ($self, $w, $h) = @_;	284	my ($self, $w, $h) = @_;
223		285
224	delete $self->{max_w}; $self->{max_w} = $w if $w;	286	delete $self->{max_w}; $self->{max_w} = $w if $w;
225	delete $self->{max_h}; $self->{max_h} = $h if $h;	287	delete $self->{max_h}; $self->{max_h} = $h if $h;
226	}	288	}
227		289
228	# return top left coordinates	290	sub set_tooltip {
229	sub _topleft {
230	my ($self, $x, $y) = @_;	291	my ($self, $tooltip) = @_;
231		292
232	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	293	$self->{tooltip} = $tooltip;
		294
		295	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		296	delete $CFClient::UI::TOOLTIP->{owner};
		297	CFClient::UI::check_tooltip;
		298	}
233	}	299	}
234		300
235	# translate global coordinates to local coordinate system	301	# translate global coordinates to local coordinate system
236	sub coord2local {	302	sub coord2local {
237	my ($self, $x, $y) = @_;	303	my ($self, $x, $y) = @_;
238		304
239	my ($X, $Y) = $self->_topleft;	305	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
240	($x - $X, $y - $Y)
241	}	306	}
242		307
243	# translate local coordinates to global coordinate system	308	# translate local coordinates to global coordinate system
244	sub coord2global {	309	sub coord2global {
245	my ($self, $x, $y) = @_;	310	my ($self, $x, $y) = @_;
246		311
247	my ($X, $Y) = $self->_topleft;	312	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
248	($x + $X, $y + $Y)
249	}	313	}
250		314
251	sub focus_in {	315	sub focus_in {
252	my ($self) = @_;	316	my ($self) = @_;
253		317
…		…
313	glVertex $x + $self->{w}, $y + $self->{h};	377	glVertex $x + $self->{w}, $y + $self->{h};
314	glVertex $x , $y + $self->{h};	378	glVertex $x , $y + $self->{h};
315	glEnd;	379	glEnd;
316	glDisable GL_BLEND;	380	glDisable GL_BLEND;
317	}	381	}
		382
		383	if ($ENV{PCLIENT_DEBUG}) {
		384	glPushMatrix;
		385	glColor 1, 1, 0, 1;
		386	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		387	glBegin GL_LINE_LOOP;
		388	glVertex 0 , 0;
		389	glVertex $self->{w}, 0;
		390	glVertex $self->{w}, $self->{h};
		391	glVertex 0 , $self->{h};
		392	glEnd;
		393	glPopMatrix;
		394	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		395	}
318	}	396	}
319		397
320	sub _draw {	398	sub _draw {
321	my ($self) = @_;	399	my ($self) = @_;
322		400
…		…
337		415
338	sub set_parent {	416	sub set_parent {
339	my ($self, $parent) = @_;	417	my ($self, $parent) = @_;
340		418
341	Scalar::Util::weaken ($self->{parent} = $parent);	419	Scalar::Util::weaken ($self->{parent} = $parent);
		420
		421	# TODO: req_w _does_change after ->reconfigure
		422	$self->check_size
		423	unless exists $self->{req_w};
342	}	424	}
343		425
344	sub check_size {	426	sub check_size {
345	my ($self) = @_;	427	my ($self, $forced) = @_;
346		428
347	$self->{parent}	429	$self->{force_alloc} = 1 if $forced;
348	or return 1;	430	$CFClient::UI::ROOT->{check_size}{$self} = $self;
349
350	my ($w, $h) = $self->{user_w} && $self->{user_h}
351	? @$self{qw(user_w user_h)}
352	: $self->size_request;
353
354	if ($w != $self->{req_w} || $h != $self->{req_h}) {
355	$self->{req_w} = $w;
356	$self->{req_h} = $h;
357
358	$self->{parent}->check_size
359	or $self->size_allocate (
360	(List::Util::max $self->{w}, $w),
361	(List::Util::max $self->{h}, $h),
362	);
363
364	1
365	} else {
366	0
367	}
368	}	431	}
369		432
370	sub update {	433	sub update {
371	my ($self) = @_;	434	my ($self) = @_;
372		435
…		…
381	}	444	}
382		445
383	sub emit {	446	sub emit {
384	my ($self, $signal, @args) = @_;	447	my ($self, $signal, @args) = @_;
385		448
386	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	449	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
387	$cb->($self, @args);
388	}
389	}	450	}
390		451
391	sub DESTROY {	452	sub DESTROY {
392	my ($self) = @_;	453	my ($self) = @_;
393		454
		455	delete $WIDGET{$self+0};
394	#$self->deactivate;	456	#$self->deactivate;
395	}	457	}
396		458
397	#############################################################################	459	#############################################################################
398		460
…		…
407	my $class = shift;	469	my $class = shift;
408		470
409	# range [value, low, high, page]	471	# range [value, low, high, page]
410		472
411	$class->SUPER::new (	473	$class->SUPER::new (
412	bg => [0, 0, 0, 0.2],	474	#bg => [0, 0, 0, 0.2],
413	active_bg => [1, 1, 1, 0.5],	475	#active_bg => [1, 1, 1, 0.5],
414	@_	476	@_
415	)	477	)
416	}	478	}
417		479
418	sub _draw {	480	sub _draw {
419	my ($self) = @_;	481	my ($self) = @_;
420		482
		483	my $color = $FOCUS == $self && $self->{active_bg}
		484	? $self->{active_bg}
		485	: $self->{bg};
		486
		487	if ($color && (@$color < 4 || $color->[3])) {
421	my ($w, $h) = @$self{qw(w h)};	488	my ($w, $h) = @$self{qw(w h)};
422		489
423	glEnable GL_BLEND;	490	glEnable GL_BLEND;
424	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
425	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	492	glColor @$color;
426		493
427	glBegin GL_QUADS;	494	glBegin GL_QUADS;
428	glVertex 0 , 0;	495	glVertex 0 , 0;
429	glVertex 0 , $h;	496	glVertex 0 , $h;
430	glVertex $w, $h;	497	glVertex $w, $h;
431	glVertex $w, 0;	498	glVertex $w, 0;
432	glEnd;	499	glEnd;
433		500
434	glDisable GL_BLEND;	501	glDisable GL_BLEND;
		502	}
435	}	503	}
436		504
437	#############################################################################	505	#############################################################################
438		506
439	package CFClient::UI::Empty;	507	package CFClient::UI::Empty;
…		…
460	sub new {	528	sub new {
461	my ($class, %arg) = @_;	529	my ($class, %arg) = @_;
462		530
463	my $children = delete $arg{children} || [];	531	my $children = delete $arg{children} || [];
464		532
465	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);	533	my $self = $class->SUPER::new (
		534	children => [],
		535	can_events => 0,
		536	%arg,
		537	);
466	$self->add ($_) for @$children;	538	$self->add ($_) for @$children;
467		539
468	$self	540	$self
469	}	541	}
470		542
471	sub add {	543	sub add {
472	my ($self, $child) = @_;	544	my ($self, @widgets) = @_;
473		545
474	$child->set_parent ($self);	546	$_->set_parent ($self)
		547	for @widgets;
475		548
476	use sort 'stable';	549	use sort 'stable';
477		550
478	$self->{children} = [	551	$self->{children} = [
479	sort { $a->{z} <=> $b->{z} }	552	sort { $a->{z} <=> $b->{z} }
480	@{$self->{children}}, $child	553	@{$self->{children}}, @widgets
481	];	554	];
482		555
483	$child->check_size;	556	$self->check_size (1);
		557	$self->update;
		558	}
		559
		560	sub children {
		561	@{ $_[0]{children} }
484	}	562	}
485		563
486	sub remove {	564	sub remove {
487	my ($self, $child) = @_;	565	my ($self, $child) = @_;
488		566
489	delete $child->{parent};	567	delete $child->{parent};
		568	$child->hide;
490		569
491	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	570	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		571
		572	$self->check_size;
		573	$self->update;
		574	}
		575
		576	sub clear {
		577	my ($self) = @_;
		578
		579	my $children = delete $self->{children};
		580	$self->{children} = [];
		581
		582	for (@$children) {
		583	delete $_->{parent};
		584	$_->hide;
		585	}
492		586
493	$self->check_size;	587	$self->check_size;
494	$self->update;	588	$self->update;
495	}	589	}
496		590
…		…
574	}	668	}
575		669
576	sub update {	670	sub update {
577	my ($self) = @_;	671	my ($self) = @_;
578		672
579	# we want to do this delayed...	673	$ROOT->on_post_alloc ($self => sub { $self->render_child });
580	$self->render_chld;
581	$self->SUPER::update;	674	$self->SUPER::update;
582	}
583
584	sub render_chld {
585	my ($self) = @_;
586
587	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
588	glClearColor 0, 0, 0, 1;
589	glClear GL_COLOR_BUFFER_BIT;
590	$self->child->draw;
591	};
592	}	675	}
593		676
594	sub size_allocate {	677	sub size_allocate {
595	my ($self, $w, $h) = @_;	678	my ($self, $w, $h) = @_;
596		679
597	$self->child->configure (0, 0, $w, $h);	680	$self->SUPER::size_allocate ($w, $h);
		681	$self->update;
		682	}
598		683
		684	sub _render {
		685	$_[0]{children}[0]->draw;
		686	}
		687
		688	sub render_child {
		689	my ($self) = @_;
		690
		691	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		692	glClearColor 0, 0, 0, 0;
		693	glClear GL_COLOR_BUFFER_BIT;
		694
599	$self->render_chld;	695	$self->_render;
		696	};
600	}	697	}
601		698
602	sub _draw {	699	sub _draw {
603	my ($self) = @_;	700	my ($self) = @_;
604		701
605	my ($w, $h) = ($self->w, $self->h);	702	my ($w, $h) = ($self->w, $self->h);
606		703
607	my $tex = $self->{texture}	704	my $tex = $self->{texture}
608	or return;	705	or return;
609		706
610	glEnable GL_BLEND;
611	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
612	glEnable GL_TEXTURE_2D;	707	glEnable GL_TEXTURE_2D;
613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		709	glColor 1, 1, 1, 1;
614		710
615	$tex->draw_quad (0, 0, $w, $h);	711	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
616		712
617	glDisable GL_BLEND;
618	glDisable GL_TEXTURE_2D;	713	glDisable GL_TEXTURE_2D;
619	}	714	}
620		715
621	#############################################################################	716	#############################################################################
622		717
623	package CFClient::UI::ViewPort;	718	package CFClient::UI::ViewPort;
624		719
625	our @ISA = CFClient::UI::Window::;	720	our @ISA = CFClient::UI::Window::;
626		721
627	sub new { die }
628
629	sub size_request {	722	sub size_request {
630	my ($self) = @_;	723	my ($self) = @_;
631		724
632	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	725	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
633	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	726	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
634		727
635	@$self{qw(child_w child_h)}	728	@$self{qw(child_w child_h)}
636	}	729	}
637		730
638	sub _draw {	731	sub size_allocate {
639	my ($self) = @_;	732	my ($self, $w, $h) = @_;
640		733
641	$self->{children}[1]->draw;	734	$self->update;
642	}	735	}
643		736
		737	sub set_offset {
		738	my ($self, $x, $y) = @_;
644		739
645	#############################################################################	740	$self->{view_x} = int $x;
		741	$self->{view_y} = int $y;
646		742
		743	$self->update;
		744	}
		745
		746	# hmm, this does not work for topleft of $self... but we should not ask for that
		747	sub coord2local {
		748	my ($self, $x, $y) = @_;
		749
		750	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		751	}
		752
		753	sub coord2global {
		754	my ($self, $x, $y) = @_;
		755
		756	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		757	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		758
		759	$self->SUPER::coord2global ($x, $y)
		760	}
		761
		762	sub find_widget {
		763	my ($self, $x, $y) = @_;
		764
		765	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		766	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		767	) {
		768	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		769	} else {
		770	$self->CFClient::UI::Base::find_widget ($x, $y)
		771	}
		772	}
		773
		774	sub _render {
		775	my ($self) = @_;
		776
		777	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		778
		779	$self->SUPER::_render;
		780	}
		781
		782	#############################################################################
		783
647	package CFClient::UI::Frame;	784	package CFClient::UI::ScrolledWindow;
648		785
649	our @ISA = CFClient::UI::Bin::;	786	our @ISA = CFClient::UI::HBox::;
650
651	use CFClient::OpenGL;
652		787
653	sub new {	788	sub new {
654	my $class = shift;	789	my $class = shift;
655		790
		791	my $self;
		792
		793	my $slider = new CFClient::UI::Slider
		794	vertical => 1,
		795	range => [0, 0, 1, 0.01], # HACK fix
		796	connect_changed => sub {
		797	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		798	},
		799	;
		800
656	my $self = $class->SUPER::new (	801	$self = $class->SUPER::new (
657	bg => [1, 1, 1, 1],	802	vp => (new CFClient::UI::ViewPort),
658	border_bg => [1, 1, 1, 1],	803	slider => $slider,
659	border => 0.8,
660	@_	804	@_,
661	);	805	);
662		806
		807	$self->{vp}->add ($self->{scrolled});
		808	$self->add ($self->{vp});
		809	$self->add ($self->{slider});
		810
663	$self	811	$self
664	}	812	}
665		813
		814	#TODO# update range on size_allocate depending on child
		815	# update viewport offset on scroll
		816
		817	#############################################################################
		818
		819	package CFClient::UI::Frame;
		820
		821	our @ISA = CFClient::UI::Bin::;
		822
		823	use CFClient::OpenGL;
		824
		825	sub new {
		826	my $class = shift;
		827
		828	$class->SUPER::new (
		829	bg => undef,
		830	@_,
		831	)
		832	}
		833
666	sub _draw {	834	sub _draw {
667	my ($self) = @_;	835	my ($self) = @_;
668		836
669	my ($w, $h) = ($self->{w}, $self->{h});	837	if ($self->{bg}) {
		838	my ($w, $h) = @$self{qw(w h)};
670		839
671	glEnable GL_BLEND;	840	glEnable GL_BLEND;
672	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	841	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
673	glEnable GL_TEXTURE_2D;	842	glColor @{ $self->{bg} };
674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675		843
676	# glBegin GL_QUADS;	844	glBegin GL_QUADS;
677	# glColor 0, 0, 0, 0;
678	# glVertex 0 , 0;	845	glVertex 0 , 0;
679	# glVertex 0 , $h;	846	glVertex 0 , $h;
680	# glVertex $w, $h;	847	glVertex $w, $h;
681	# glVertex $w, 0;	848	glVertex $w, 0;
682	# glEnd;	849	glEnd;
683		850
684
685	$self->child->draw;
686	glDisable GL_BLEND;	851	glDisable GL_BLEND;
687	glDisable GL_TEXTURE_2D;	852	}
		853
		854	$self->SUPER::_draw;
688	}	855	}
689		856
690	#############################################################################	857	#############################################################################
691		858
692	package CFClient::UI::FancyFrame;	859	package CFClient::UI::FancyFrame;
…		…
703	my $class = shift;	870	my $class = shift;
704		871
705	# TODO: user_x, user_y, overwrite moveto?	872	# TODO: user_x, user_y, overwrite moveto?
706		873
707	my $self = $class->SUPER::new (	874	my $self = $class->SUPER::new (
708	bg => [1, 1, 1, 1],	875	bg => [1, 1, 1, 1],
709	border_bg => [1, 1, 1, 1],	876	border_bg => [1, 1, 1, 1],
710	border => 0.8,	877	border => 0.6,
		878	toplevel => 1,
711	can_events => 1,	879	can_events => 1,
712	@_	880	@_
713	);	881	);
714		882
715	$self->{title} &&= new CFClient::UI::Label	883	$self->{title} &&= new CFClient::UI::Label
716	align => 0,	884	align => 0,
717	valign => 1,	885	valign => 1,
718	text => $self->{title},	886	text => $self->{title},
719	fontsize => 1;	887	fontsize => $self->{border};
720		888
721	$self	889	$self
722	}	890	}
723		891
724	sub border {	892	sub border {
…		…
740	my ($self, $w, $h) = @_;	908	my ($self, $w, $h) = @_;
741		909
742	$h -= List::Util::max 0, $self->border * 2;	910	$h -= List::Util::max 0, $self->border * 2;
743	$w -= List::Util::max 0, $self->border * 2;	911	$w -= List::Util::max 0, $self->border * 2;
744		912
745	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	913	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
746	if $self->{title};	914	if $self->{title};
747		915
748	$self->child->configure ($self->border, $self->border, $w, $h);	916	$self->child->configure ($self->border, $self->border, $w, $h);
749	}	917	}
750		918
751	sub button_down {	919	sub button_down {
752	my ($self, $ev, $x, $y) = @_;	920	my ($self, $ev, $x, $y) = @_;
753		921
		922	my ($w, $h) = @$self{qw(w h)};
754	my $border = $self->border;	923	my $border = $self->border;
755		924
756	if ($x < $self->{w} && $x >= $self->{w} - $border	925	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
757	&& $y < $self->{h} && $y >= $self->{h} - $border) {	926	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
758		927
		928	if ($lr & $td) {
		929	my ($wx, $wy) = ($self->{x}, $self->{y});
759	my ($ox, $oy) = ($ev->{x}, $ev->{y});	930	my ($ox, $oy) = ($ev->{x}, $ev->{y});
760	my ($bw, $bh) = ($self->{w}, $self->{h});	931	my ($bw, $bh) = ($self->{w}, $self->{h});
761		932
		933	my $mx = $x < $border;
		934	my $my = $y < $border;
		935
762	$self->{motion} = sub {	936	$self->{motion} = sub {
763	my ($ev, $x, $y) = @_;	937	my ($ev, $x, $y) = @_;
764		938
765	($x, $y) = ($ev->{x}, $ev->{y});	939	my $dx = $ev->{x} - $ox;
		940	my $dy = $ev->{y} - $oy;
766		941
767	$self->{user_w} = $bw + $x - $ox;	942	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
768	$self->{user_h} = $bh + $y - $oy;	943	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		944	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
769	$self->check_size;	945	$self->check_size;
770	};	946	};
771		947
772	} elsif ($x >= 0 && $x < $self->{w}	948	} elsif ($lr ^ $td) {
773	&& $y >= 0 && $y < $border) {
774
775	my ($ox, $oy) = ($ev->{x}, $ev->{y});	949	my ($ox, $oy) = ($ev->{x}, $ev->{y});
776	my ($bx, $by) = ($self->{x}, $self->{y});	950	my ($bx, $by) = ($self->{x}, $self->{y});
777		951
778	$self->{motion} = sub {	952	$self->{motion} = sub {
779	my ($ev, $x, $y) = @_;	953	my ($ev, $x, $y) = @_;
…		…
802	my ($self) = @_;	976	my ($self) = @_;
803		977
804	my ($w, $h ) = ($self->{w}, $self->{h});	978	my ($w, $h ) = ($self->{w}, $self->{h});
805	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	979	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
806		980
807	glEnable GL_BLEND;
808	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809	glEnable GL_TEXTURE_2D;	981	glEnable GL_TEXTURE_2D;
810	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	982	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
811		983
812	my $border = $self->border;	984	my $border = $self->border;
813		985
814	glColor @{ $self->{border_bg} };	986	glColor @{ $self->{border_bg} };
815	$tex[1]->draw_quad (0, 0, $w, $border);	987	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
816	$tex[3]->draw_quad (0, $border, $border, $ch);	988	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
817	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	989	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
818	$tex[4]->draw_quad (0, $h - $border, $w, $border);	990	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
819		991
		992	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
820	my $bg = $tex[0];	993	my $bg = $tex[0];
821		994
822	# TODO: repeat texture not scale	995	# TODO: repeat texture not scale
823	my $rep_x = $cw / $bg->{w};	996	my $rep_x = $cw / $bg->{w};
824	my $rep_y = $ch / $bg->{h};	997	my $rep_y = $ch / $bg->{h};
825		998
826	glColor @{ $self->{bg} };	999	glColor @{ $self->{bg} };
827		1000
828	$bg->{s} = $rep_x;	1001	$bg->{s} = $rep_x;
829	$bg->{t} = $rep_y;	1002	$bg->{t} = $rep_y;
830	$bg->{wrap_mode} = 1;	1003	$bg->{wrap_mode} = 1;
831	$bg->draw_quad ($border, $border, $cw, $ch);	1004	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1005	}
832		1006
833	glDisable GL_TEXTURE_2D;	1007	glDisable GL_TEXTURE_2D;
834	glDisable GL_BLEND;
835		1008
836	$self->{title}->draw if $self->{title};	1009	$self->{title}->draw if $self->{title};
		1010
837	$self->child->draw;	1011	$self->child->draw;
838	}	1012	}
839		1013
840	#############################################################################	1014	#############################################################################
841		1015
…		…
863	$self->{children}[$y][$x] = $child;	1037	$self->{children}[$y][$x] = $child;
864		1038
865	$child->check_size;	1039	$child->check_size;
866	}	1040	}
867		1041
		1042	sub children {
		1043	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1044	}
		1045
868	# TODO: move to container class maybe? send childs a signal on removal?	1046	# TODO: move to container class maybe? send childs a signal on removal?
869	sub clear {	1047	sub clear {
870	my ($self) = @_;	1048	my ($self) = @_;
871		1049
		1050	my @children = $self->children;
872	delete $self->{children};	1051	delete $self->{children};
		1052
		1053	for (@children) {
		1054	delete $_->{parent};
		1055	$_->hide;
		1056	}
		1057
873	$self->update;	1058	$self->update;
874	}	1059	}
875		1060
876	sub get_wh {	1061	sub get_wh {
877	my ($self) = @_;	1062	my ($self) = @_;
…		…
1054	}	1239	}
1055		1240
1056	sub size_allocate {	1241	sub size_allocate {
1057	my ($self, $w, $h) = @_;	1242	my ($self, $w, $h) = @_;
1058		1243
		1244	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1245
1059	my $children = $self->{children};	1246	my $children = $self->{children};
1060		1247
1061	my @h = map $_->{req_h}, @$children;	1248	my @h = map $_->{req_h}, @$children;
1062		1249
1063	my $req_h = List::Util::sum @h;	1250	my $req_h = List::Util::sum @h;
…		…
1092		1279
1093	#############################################################################	1280	#############################################################################
1094		1281
1095	package CFClient::UI::Label;	1282	package CFClient::UI::Label;
1096		1283
1097	our @ISA = CFClient::UI::Base::;	1284	our @ISA = CFClient::UI::DrawBG::;
1098		1285
1099	use CFClient::OpenGL;	1286	use CFClient::OpenGL;
1100		1287
1101	sub new {	1288	sub new {
1102	my ($class, %arg) = @_;	1289	my ($class, %arg) = @_;
1103		1290
1104	my $self = $class->SUPER::new (	1291	my $self = $class->SUPER::new (
1105	fg => [1, 1, 1],	1292	fg => [1, 1, 1],
		1293	#bg => none
		1294	#active_bg => none
1106	#font => default_font	1295	#font => default_font
		1296	#text => initial text
		1297	#markup => initial narkup
		1298	#max_w => maximum pixel width
		1299	ellipsise => 3, # end
		1300	layout => (new CFClient::Layout),
1107	fontsize => 1,	1301	fontsize => 1,
1108	text => "",
1109	align => -1,	1302	align => -1,
1110	valign => -1,	1303	valign => -1,
1111	padding => 2,	1304	padding => 2,
1112	layout => new CFClient::Layout,
1113	can_events => 0,	1305	can_events => 0,
1114	%arg	1306	%arg
1115	);	1307	);
1116		1308
1117	if (exists $self->{template}) {	1309	if (exists $self->{template}) {
1118	my $layout = new CFClient::Layout;	1310	my $layout = new CFClient::Layout;
1119	$layout->set_text (delete $self->{template});	1311	$layout->set_text (delete $self->{template});
1120	$self->{template} = $layout;	1312	$self->{template} = $layout;
1121	}	1313	}
1122		1314
1123	$self->set_text (delete $self->{text}) if exists $self->{text};	1315	if (exists $self->{markup}) {
1124	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1316	$self->set_markup (delete $self->{markup});
		1317	} else {
		1318	$self->set_text (delete $self->{text});
		1319	}
1125		1320
1126	$self	1321	$self
1127	}	1322	}
1128		1323
1129	sub escape_text {	1324	sub escape($) {
1130	local $_ = $_[1];	1325	local $_ = $_[0];
1131		1326
1132	s/&/&amp;/g;	1327	s/&/&amp;/g;
1133	s/>/&gt;/g;	1328	s/>/&gt;/g;
1134	s/</&lt;/g;	1329	s/</&lt;/g;
1135		1330
1136	$_[1]	1331	$_
		1332	}
		1333
		1334	sub update {
		1335	my ($self) = @_;
		1336
		1337	delete $self->{texture};
		1338	$self->SUPER::update;
1137	}	1339	}
1138		1340
1139	sub set_text {	1341	sub set_text {
1140	my ($self, $text) = @_;	1342	my ($self, $text) = @_;
1141		1343
		1344	return if $self->{text} eq "T$text";
		1345	$self->{text} = "T$text";
		1346
		1347	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1142	$self->{layout}->set_text ($text);	1348	$self->{layout}->set_text ($text);
1143		1349
1144	delete $self->{texture};	1350	$self->update;
1145	$self->check_size;	1351	$self->check_size;
1146	$self->update;
1147	}	1352	}
1148		1353
1149	sub set_markup {	1354	sub set_markup {
1150	my ($self, $markup) = @_;	1355	my ($self, $markup) = @_;
1151		1356
		1357	return if $self->{text} eq "M$markup";
		1358	$self->{text} = "M$markup";
		1359
		1360	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1361
		1362	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1152	$self->{layout}->set_markup ($markup);	1363	$self->{layout}->set_markup ($markup);
1153		1364
1154	delete $self->{texture};	1365	$self->update;
1155	$self->check_size;	1366	$self->check_size;
1156	$self->update;
1157	}	1367	}
1158		1368
1159	sub size_request {	1369	sub size_request {
1160	my ($self) = @_;	1370	my ($self) = @_;
1161		1371
1162	$self->{layout}->set_font ($self->{font}) if $self->{font};	1372	$self->{layout}->set_font ($self->{font}) if $self->{font};
1163	$self->{layout}->set_width ($self->{max_w} || -1);	1373	$self->{layout}->set_width ($self->{max_w} || -1);
		1374	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1375	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1164	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1376	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1165		1377
1166	my ($w, $h) = $self->{layout}->size;	1378	my ($w, $h) = $self->{layout}->size;
1167		1379
1168	if (exists $self->{template}) {	1380	if (exists $self->{template}) {
…		…
1190	sub set_fontsize {	1402	sub set_fontsize {
1191	my ($self, $fontsize) = @_;	1403	my ($self, $fontsize) = @_;
1192		1404
1193	$self->{fontsize} = $fontsize;	1405	$self->{fontsize} = $fontsize;
1194	delete $self->{texture};	1406	delete $self->{texture};
		1407
		1408	$self->update;
1195	$self->check_size;	1409	$self->check_size;
1196	$self->update;
1197	}	1410	}
1198		1411
1199	sub _draw {	1412	sub _draw {
1200	my ($self) = @_;	1413	my ($self) = @_;
1201		1414
		1415	$self->SUPER::_draw; # draw background, if applicable
		1416
1202	my $tex = $self->{texture} ||= do {	1417	my $tex = $self->{texture} ||= do {
		1418	$self->{layout}->set_foreground (@{$self->{fg}});
1203	$self->{layout}->set_font ($self->{font}) if $self->{font};	1419	$self->{layout}->set_font ($self->{font}) if $self->{font};
1204	$self->{layout}->set_width ($self->{w});	1420	$self->{layout}->set_width ($self->{w});
		1421	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1422	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1205	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1423	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1424
1206	new_from_layout CFClient::Texture $self->{layout}	1425	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1426
		1427	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1428	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1429	: ($self->{w} - $tex->{w}) * 0.5);
		1430
		1431	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1432	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1433	: ($self->{h} - $tex->{h}) * 0.5);
		1434
		1435	$tex
1207	};	1436	};
1208		1437
1209	glEnable GL_BLEND;
1210	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1211	glEnable GL_TEXTURE_2D;	1438	glEnable GL_TEXTURE_2D;
1212	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1439	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1213		1440
		1441	if ($tex->{format} == GL_ALPHA) {
1214	glColor @{$self->{fg}};	1442	glColor @{$self->{fg}};
1215
1216	$self->{ox} = int (
1217	$self->{align} < 0 ? $self->{padding}
1218	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1219	: ($self->{w} - $tex->{w}) * 0.5
1220	);
1221
1222	$self->{oy} = int (
1223	$self->{valign} < 0 ? $self->{padding}
1224	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1225	: ($self->{h} - $tex->{h}) * 0.5
1226	);
1227
1228	$tex->draw_quad ($self->{ox}, $self->{oy});	1443	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1444	} else {
		1445	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1446	}
1229		1447
1230	glDisable GL_TEXTURE_2D;	1448	glDisable GL_TEXTURE_2D;
1231	glDisable GL_BLEND;
1232	}	1449	}
1233		1450
1234	#############################################################################	1451	#############################################################################
1235		1452
1236	package CFClient::UI::EntryBase;	1453	package CFClient::UI::EntryBase;
…		…
1241		1458
1242	sub new {	1459	sub new {
1243	my $class = shift;	1460	my $class = shift;
1244		1461
1245	$class->SUPER::new (	1462	$class->SUPER::new (
1246	fg => [1, 1, 1],	1463	fg => [1, 1, 1],
1247	bg => [0, 0, 0, 0.2],	1464	bg => [0, 0, 0, 0.2],
1248	active_bg => [1, 1, 1, 0.5],	1465	active_bg => [1, 1, 1, 0.5],
1249	active_fg => [0, 0, 0],	1466	active_fg => [0, 0, 0],
1250	can_hover => 1,	1467	can_hover => 1,
1251	can_focus => 1,	1468	can_focus => 1,
1252	valign => 0,	1469	valign => 0,
1253	can_events => 1,	1470	can_events => 1,
1254	@_	1471	@_
1255	)	1472	)
1256	}	1473	}
1257		1474
…		…
1271	$self->{layout}->set_text ("$text ");	1488	$self->{layout}->set_text ("$text ");
1272		1489
1273	$self->emit (changed => $self->{text});	1490	$self->emit (changed => $self->{text});
1274	}	1491	}
1275		1492
1276	sub get_text {
1277	$_[0]{text}
1278	}
1279
1280	sub size_request {
1281	my ($self) = @_;
1282
1283	my ($w, $h) = $self->SUPER::size_request;
1284
1285	($w + 1, $h) # add 1 for cursor
1286	}
1287
1288	sub size_allocate {
1289	my ($self, $w, $h) = @_;
1290
1291	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1292	}
1293
1294	sub set_text {	1493	sub set_text {
1295	my ($self, $text) = @_;	1494	my ($self, $text) = @_;
1296		1495
1297	$self->{cursor} = length $text;	1496	$self->{cursor} = length $text;
1298	$self->_set_text ($text);	1497	$self->_set_text ($text);
1299	$self->update;	1498	$self->update;
		1499	$self->check_size;
		1500	}
		1501
		1502	sub get_text {
		1503	$_[0]{text}
		1504	}
		1505
		1506	sub size_request {
		1507	my ($self) = @_;
		1508
		1509	my ($w, $h) = $self->SUPER::size_request;
		1510
		1511	($w + 1, $h) # add 1 for cursor
		1512	}
		1513
		1514	sub size_allocate {
		1515	my ($self, $w, $h) = @_;
		1516
		1517	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1300	}	1518	}
1301		1519
1302	sub key_down {	1520	sub key_down {
1303	my ($self, $ev) = @_;	1521	my ($self, $ev) = @_;
1304		1522
…		…
1306	my $sym = $ev->{sym};	1524	my $sym = $ev->{sym};
1307	my $uni = $ev->{unicode};	1525	my $uni = $ev->{unicode};
1308		1526
1309	my $text = $self->get_text;	1527	my $text = $self->get_text;
1310		1528
1311	if ($sym == 8) {	1529	if ($uni == 8) {
1312	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1530	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1313	} elsif ($sym == 127) {	1531	} elsif ($uni == 127) {
1314	substr $text, $self->{cursor}, 1, "";	1532	substr $text, $self->{cursor}, 1, "";
1315	} elsif ($sym == CFClient::SDLK_LEFT) {	1533	} elsif ($sym == CFClient::SDLK_LEFT) {
1316	--$self->{cursor} if $self->{cursor};	1534	--$self->{cursor} if $self->{cursor};
1317	} elsif ($sym == CFClient::SDLK_RIGHT) {	1535	} elsif ($sym == CFClient::SDLK_RIGHT) {
1318	++$self->{cursor} if $self->{cursor} < length $self->{text};	1536	++$self->{cursor} if $self->{cursor} < length $self->{text};
1319	} elsif ($sym == CFClient::SDLK_HOME) {	1537	} elsif ($sym == CFClient::SDLK_HOME) {
1320	$self->{cursor} = 0;	1538	$self->{cursor} = 0;
1321	} elsif ($sym == CFClient::SDLK_END) {	1539	} elsif ($sym == CFClient::SDLK_END) {
1322	$self->{cursor} = length $text;	1540	$self->{cursor} = length $text;
1323	} elsif ($sym == 27) {	1541	} elsif ($uni == 27) {
1324	$self->emit ('escape');	1542	$self->emit ('escape');
1325	} elsif ($uni) {	1543	} elsif ($uni) {
1326	substr $text, $self->{cursor}++, 0, chr $uni;	1544	substr $text, $self->{cursor}++, 0, chr $uni;
1327	}	1545	}
1328		1546
1329	$self->_set_text ($text);	1547	$self->_set_text ($text);
1330	$self->update;	1548	$self->update;
		1549	$self->check_size;
1331	}	1550	}
1332		1551
1333	sub focus_in {	1552	sub focus_in {
1334	my ($self) = @_;	1553	my ($self) = @_;
1335		1554
…		…
1411	my ($self, $ev) = @_;	1630	my ($self, $ev) = @_;
1412		1631
1413	my $sym = $ev->{sym};	1632	my $sym = $ev->{sym};
1414		1633
1415	if ($sym == 13) {	1634	if ($sym == 13) {
		1635	unshift @{$self->{history}},
		1636	my $txt = $self->get_text;
		1637	$self->{history_pointer} = -1;
		1638	$self->{history_saveback} = '';
1416	$self->emit (activate => $self->get_text);	1639	$self->emit (activate => $txt);
1417	$self->update;	1640	$self->update;
		1641
		1642	} elsif ($sym == CFClient::SDLK_UP) {
		1643	if ($self->{history_pointer} < 0) {
		1644	$self->{history_saveback} = $self->get_text;
		1645	}
		1646	if (@{$self->{history} || []} > 0) {
		1647	$self->{history_pointer}++;
		1648	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1649	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1650	}
		1651	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1652	}
		1653
		1654	} elsif ($sym == CFClient::SDLK_DOWN) {
		1655	$self->{history_pointer}--;
		1656	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1657
		1658	if ($self->{history_pointer} >= 0) {
		1659	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1660	} else {
		1661	$self->set_text ($self->{history_saveback});
		1662	}
1418		1663
1419	} else {	1664	} else {
1420	$self->SUPER::key_down ($ev);	1665	$self->SUPER::key_down ($ev);
1421	}	1666	}
1422		1667
…		…
1436		1681
1437	sub new {	1682	sub new {
1438	my $class = shift;	1683	my $class = shift;
1439		1684
1440	$class->SUPER::new (	1685	$class->SUPER::new (
1441	padding => 4,	1686	padding => 4,
1442	fg => [1, 1, 1],	1687	fg => [1, 1, 1],
1443	bg => [1, 1, 1, 0.2],
1444	active_fg => [0, 0, 1],	1688	active_fg => [0, 0, 1],
1445	can_hover => 1,	1689	can_hover => 1,
1446	align => 0,	1690	align => 0,
1447	valign => 0,	1691	valign => 0,
1448	can_events => 1,	1692	can_events => 1,
1449	@_	1693	@_
1450	)	1694	)
1451	}	1695	}
1452		1696
…		…
1466		1710
1467	if ($GRAB == $self) {	1711	if ($GRAB == $self) {
1468	$self->{fg} = $self->{active_fg};	1712	$self->{fg} = $self->{active_fg};
1469	}	1713	}
1470		1714
1471	glEnable GL_BLEND;
1472	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1473	glEnable GL_TEXTURE_2D;	1715	glEnable GL_TEXTURE_2D;
1474	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1716	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1475	glColor 0, 0, 0, 1;	1717	glColor 0, 0, 0, 1;
1476		1718
1477	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1719	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1478		1720
1479	glDisable GL_TEXTURE_2D;	1721	glDisable GL_TEXTURE_2D;
1480	glDisable GL_BLEND;
1481		1722
1482	$self->SUPER::_draw;	1723	$self->SUPER::_draw;
1483	}	1724	}
1484		1725
1485	#############################################################################	1726	#############################################################################
…		…
1499		1740
1500	$class->SUPER::new (	1741	$class->SUPER::new (
1501	padding => 2,	1742	padding => 2,
1502	fg => [1, 1, 1],	1743	fg => [1, 1, 1],
1503	active_fg => [1, 1, 0],	1744	active_fg => [1, 1, 0],
		1745	bg => [0, 0, 0, 0.2],
		1746	active_bg => [1, 1, 1, 0.5],
1504	state => 0,	1747	state => 0,
1505	can_hover => 1,	1748	can_hover => 1,
1506	@_	1749	@_
1507	)	1750	)
1508	}	1751	}
…		…
1532		1775
1533	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1776	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1534		1777
1535	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1778	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1536		1779
1537	glEnable GL_BLEND;	1780	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1781
1538	glEnable GL_TEXTURE_2D;	1782	glEnable GL_TEXTURE_2D;
1539	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1540
1541	my $tex = $self->{state} ? $tex[1] : $tex[0];
1542
1543	$tex->draw_quad (0, 0, $s, $s);	1783	$tex->draw_quad_alpha (0, 0, $s, $s);
1544
1545	glDisable GL_TEXTURE_2D;	1784	glDisable GL_TEXTURE_2D;
1546	glDisable GL_BLEND;
1547	}	1785	}
1548		1786
1549	#############################################################################	1787	#############################################################################
1550		1788
1551	package CFClient::UI::Image;	1789	package CFClient::UI::Image;
…		…
1594	glTranslate 0, -$self->{w}, 0;	1832	glTranslate 0, -$self->{w}, 0;
1595		1833
1596	($w, $h) = ($h, $w);	1834	($w, $h) = ($h, $w);
1597	}	1835	}
1598		1836
1599	glEnable GL_BLEND;
1600	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601	glEnable GL_TEXTURE_2D;	1837	glEnable GL_TEXTURE_2D;
1602	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1838	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1603		1839
1604	$tex->draw_quad (0, 0, $w, $h);	1840	$tex->draw_quad_alpha (0, 0, $w, $h);
1605		1841
1606	glDisable GL_BLEND;
1607	glDisable GL_TEXTURE_2D;	1842	glDisable GL_TEXTURE_2D;
1608	}	1843	}
1609		1844
1610	#############################################################################	1845	#############################################################################
1611		1846
…		…
1659	}	1894	}
1660		1895
1661	sub set_max {	1896	sub set_max {
1662	my ($self, $max) = @_;	1897	my ($self, $max) = @_;
1663		1898
		1899	return if $self->{max_val} == $max;
		1900
1664	$self->{max_val} = $max;	1901	$self->{max_val} = $max;
		1902	$self->update;
1665	}	1903	}
1666		1904
1667	sub set_value {	1905	sub set_value {
1668	my ($self, $val, $max) = @_;	1906	my ($self, $val, $max) = @_;
1669		1907
1670	$self->set_max ($max)	1908	$self->set_max ($max)
1671	if defined $max;	1909	if defined $max;
1672		1910
1673	$max = $self->{max_val};	1911	return if $self->{val} == $val;
		1912
1674	$self->{val} = $val;	1913	$self->{val} = $val;
1675
1676	$self->update;	1914	$self->update;
1677	}	1915	}
1678		1916
1679	sub _draw {	1917	sub _draw {
1680	my ($self) = @_;	1918	my ($self) = @_;
…		…
1743		1981
1744	sub new {	1982	sub new {
1745	my ($class, %arg) = @_;	1983	my ($class, %arg) = @_;
1746		1984
1747	my $self = $class->SUPER::new (	1985	my $self = $class->SUPER::new (
1748	tooltip => $arg{type},	1986	tooltip => $arg{type},
		1987	can_hover => 1,
		1988	can_events => 1,
1749	%arg,	1989	%arg,
1750	);	1990	);
1751		1991
1752	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1);	1992	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1753	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1);	1993	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1754	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1);	1994	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755		1995
1756	$self	1996	$self
1757	}	1997	}
1758		1998
1759	sub set_fontsize {	1999	sub set_fontsize {
…		…
1761		2001
1762	$self->{value}->set_fontsize ($fsize);	2002	$self->{value}->set_fontsize ($fsize);
1763	$self->{max} ->set_fontsize ($fsize);	2003	$self->{max} ->set_fontsize ($fsize);
1764	}	2004	}
1765		2005
		2006	sub set_max {
		2007	my ($self, $max) = @_;
		2008
		2009	$self->{gauge}->set_max ($max);
		2010	$self->{max}->set_text ($max);
		2011	}
		2012
1766	sub set_value {	2013	sub set_value {
1767	my ($self, $val, $max) = @_;	2014	my ($self, $val, $max) = @_;
1768		2015
1769	$self->set_max ($max)	2016	$self->set_max ($max)
1770	if defined $max;	2017	if defined $max;
1771		2018
1772	$self->{gauge}->set_value ($val, $max);	2019	$self->{gauge}->set_value ($val, $max);
1773	$self->{value}->set_text ($val);	2020	$self->{value}->set_text ($val);
1774	}
1775
1776	sub set_max {
1777	my ($self, $max) = @_;
1778
1779	$self->{gauge}->set_max ($max);
1780	$self->{max}->set_text ($max);
1781	}	2021	}
1782		2022
1783	#############################################################################	2023	#############################################################################
1784		2024
1785	package CFClient::UI::Slider;	2025	package CFClient::UI::Slider;
…		…
1795	qw(s1_slider.png s1_slider_bg.png);	2035	qw(s1_slider.png s1_slider_bg.png);
1796		2036
1797	sub new {	2037	sub new {
1798	my $class = shift;	2038	my $class = shift;
1799		2039
1800	# range [value, low, high, page]	2040	# range [value, low, high, page, unit]
1801		2041
1802	# TODO: 0-width page	2042	# TODO: 0-width page
1803	# TODO: req_w/h are wrong with vertical	2043	# TODO: req_w/h are wrong with vertical
1804	# TODO: calculations are off	2044	# TODO: calculations are off
1805	my $self = $class->SUPER::new (	2045	my $self = $class->SUPER::new (
1806	fg => [1, 1, 1],	2046	fg => [1, 1, 1],
1807	active_fg => [0, 0, 0],	2047	active_fg => [0, 0, 0],
		2048	bg => [0, 0, 0, 0.2],
		2049	active_bg => [1, 1, 1, 0.5],
1808	range => [0, 0, 100, 10],	2050	range => [0, 0, 100, 10],
1809	req_w => 20,	2051	req_w => $::WIDTH / 80,
1810	req_h => 20,	2052	req_h => $::WIDTH / 80,
1811	vertical => 0,	2053	vertical => 0,
1812	can_hover => 1,	2054	can_hover => 1,
1813	inner_pad => 5,	2055	inner_pad => .05,
1814	@_	2056	@_
1815	);	2057	);
1816		2058
		2059	$self->set_value ($self->{range}[0]);
		2060	$self->update;
		2061
1817	$self	2062	$self
		2063	}
		2064
		2065	sub set_value {
		2066	my ($self, $value) = @_;
		2067
		2068	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2069
		2070	$hi = $lo + 1 if $hi <= $lo;
		2071
		2072	$value = $lo if $value < $lo;
		2073	$value = $hi if $value > $hi;
		2074
		2075	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2076	if $unit;
		2077
		2078	$page = $hi - $lo if $page > $hi - $lo;
		2079
		2080	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2081
		2082	if ($value != $old_value) {
		2083	$self->emit (changed => $value);
		2084	$self->update;
		2085	}
1818	}	2086	}
1819		2087
1820	sub size_request {	2088	sub size_request {
1821	my ($self) = @_;	2089	my ($self) = @_;
1822		2090
…		…
1835		2103
1836	sub mouse_motion {	2104	sub mouse_motion {
1837	my ($self, $ev, $x, $y) = @_;	2105	my ($self, $ev, $x, $y) = @_;
1838		2106
1839	if ($GRAB == $self) {	2107	if ($GRAB == $self) {
		2108	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2109
		2110	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2111
		2112	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2113
		2114	$self->set_value ($x * ($hi - $lo) + $lo);
		2115	}
		2116	}
		2117
		2118	sub update {
		2119	my ($self) = @_;
		2120
		2121	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2122	$self->set_value ($self->{range}[0]);
		2123
1840	my ($value, $lo, $hi, $page) = @{$self->{range}};	2124	my ($value, $lo, $hi, $page) = @{$self->{range}};
1841		2125
1842	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2126	my $inner_w = 1 - 2 * $self->{inner_pad};
1843		2127
1844	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2128	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1845	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1846		2129
1847	$x -= $inner_pad_px; # substract the padding	2130	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1848	$x = $x * ($hi - $lo) / $inner_w + $lo;	2131	$value = $self->{scale} * ($value - $lo);
1849	$x = $lo if $x < $lo;
1850	$x = $hi - $page if $x > $hi - $page;
1851	$self->{range}[0] = $x;
1852		2132
1853	$self->emit (changed => $x);	2133	$value = $self->{inner_pad} + ($value - $page * 0.5);
1854	$self->update;	2134
		2135	$value = 0 if $value < 0;
		2136	$page = 1 - $value if $value + $page > 1;
		2137
		2138	$self->{knob_x} = $value;
		2139	$self->{knob_w} = $page;
1855	}	2140	});
1856	}
1857		2141
1858	# the inner_* stuff is for generating a padding for the slider handle,	2142	$self->SUPER::update;
1859	# so that the handle doesn't leave the texture. This calculation isn't 100%
1860	# correct propably, but it does the job for now
1861	sub _calc_inner_pad_px {
1862	my ($self, $w) = @_;
1863	($w / 100) * $self->{inner_pad} # % to pixels
1864	}	2143	}
1865		2144
1866	sub _draw {	2145	sub _draw {
1867	my ($self) = @_;	2146	my ($self) = @_;
1868		2147
1869	$self->SUPER::_draw ();	2148	$self->SUPER::_draw ();
1870		2149
1871	my ($w, $h) = @$self{qw(w h)};	2150	glScale $self->{w}, $self->{h};
1872		2151
1873	if ($self->{vertical}) {	2152	if ($self->{vertical}) {
1874	# draw a vertical slider like a rotated horizontal slider	2153	# draw a vertical slider like a rotated horizontal slider
1875		2154
		2155	glTranslate 1, 0, 0;
1876	glRotate 90, 0, 0, 1;	2156	glRotate 90, 0, 0, 1;
1877	glTranslate 0, -$self->{w}, 0;
1878
1879	($w, $h) = ($h, $w);
1880	}	2157	}
1881		2158
1882	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2159	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1883	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2160	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1884		2161
1885	my ($value, $lo, $hi, $page) = @{$self->{range}};
1886
1887	$hi = $value + 1 if $lo == $hi;
1888
1889	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1890	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1891
1892	$page = int $page * $inner_w / ($hi - $lo);
1893	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1894
1895	$w -= $page;
1896	$page &= ~1;
1897	glTranslate $page * 0.5, 0, 0;
1898	$page ||= 2;
1899
1900	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1901	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1902
1903	glEnable GL_BLEND;
1904	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1905	glEnable GL_TEXTURE_2D;	2162	glEnable GL_TEXTURE_2D;
1906	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2163	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907		2164
1908	# draw background	2165	# draw background
1909	$tex[1]->draw_quad (0, 0, $w, $h);	2166	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
1910		2167
1911	# draw handle	2168	# draw handle
1912	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2169	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1913		2170
1914	glDisable GL_BLEND;
1915	glDisable GL_TEXTURE_2D;	2171	glDisable GL_TEXTURE_2D;
1916	}	2172	}
1917		2173
1918	#############################################################################	2174	#############################################################################
1919		2175
…		…
1925		2181
1926	sub new {	2182	sub new {
1927	my $class = shift;	2183	my $class = shift;
1928		2184
1929	my $self = $class->SUPER::new (	2185	my $self = $class->SUPER::new (
1930	fontsize => 1,	2186	fontsize => 1,
		2187	can_events => 0,
1931	#font => default_font	2188	#font => default_font
1932	@_,	2189	@_,
1933		2190
1934	layout => (new CFClient::Layout),	2191	layout => (new CFClient::Layout 1),
1935	par => [],	2192	par => [],
1936	height => 0,	2193	height => 0,
1937	children => [	2194	children => [
1938	(new CFClient::UI::Empty expand => 1),	2195	(new CFClient::UI::Empty expand => 1),
1939	(new CFClient::UI::Slider vertical => 1),	2196	(new CFClient::UI::Slider vertical => 1),
1940	],	2197	],
1941	);	2198	);
1942		2199
1943	$self->{children}[1]->connect (changed => sub {	2200	$self->{children}[1]->connect (changed => sub { $self->update });
1944	$self->update;
1945	});
1946		2201
1947	$self	2202	$self
1948	}	2203	}
1949		2204
1950	sub set_fontsize {	2205	sub set_fontsize {
…		…
1958	my ($self, $text) = @_;	2213	my ($self, $text) = @_;
1959		2214
1960	my $layout = $self->{layout};	2215	my $layout = $self->{layout};
1961		2216
1962	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2217	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1963	$layout->set_width ($self->{w});	2218	$layout->set_width ($self->{children}[0]{w});
1964	$layout->set_text ($text);	2219	$layout->set_markup ($text);
1965		2220
1966	($layout->size)[1]	2221	($layout->size)[1]
1967	}	2222	}
1968		2223
1969	sub reflow {	2224	sub reflow {
…		…
2007		2262
2008	return unless $self->{h} > 0;	2263	return unless $self->{h} > 0;
2009		2264
2010	delete $self->{texture};	2265	delete $self->{texture};
2011		2266
2012	$ROOT->on_refresh ($self, sub {	2267	$ROOT->on_post_alloc ($self, sub {
2013	if (delete $self->{need_reflow}) {	2268	if (delete $self->{need_reflow}) {
2014	my $height = 0;	2269	my $height = 0;
2015		2270
2016	$height += $_->[0] = $self->text_height ($_->[2])	2271	$height += $_->[0] = $self->text_height ($_->[2])
2017	for @{$self->{par}};	2272	for @{$self->{par}};
…		…
2021	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2276	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2022		2277
2023	delete $self->{texture};	2278	delete $self->{texture};
2024	}	2279	}
2025		2280
2026	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2281	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2027	glClearColor 0, 0, 0, 1;	2282	glClearColor 0.5, 0.5, 0.5, 0;
2028	glClear GL_COLOR_BUFFER_BIT;	2283	glClear GL_COLOR_BUFFER_BIT;
2029		2284
2030	glEnable GL_BLEND;
2031	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2032	glEnable GL_TEXTURE_2D;	2285	glEnable GL_TEXTURE_2D;
2033	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2286	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2034		2287
2035	my $top = int $self->{children}[1]{range}[0];	2288	my $top = int $self->{children}[1]{range}[0];
2036		2289
…		…
2045		2298
2046	for my $par (@{$self->{par}}) {	2299	for my $par (@{$self->{par}}) {
2047	my $h = $par->[0];	2300	my $h = $par->[0];
2048		2301
2049	if ($y0 < $y + $h && $y < $y1) {	2302	if ($y0 < $y + $h && $y < $y1) {
		2303	$layout->set_foreground (@{ $par->[1] });
2050	$layout->set_text ($par->[2]);	2304	$layout->set_markup ($par->[2]);
2051		2305
2052	glColor @{ $par->[1] };
2053	my ($W, $H) = $layout->size;	2306	my ($W, $H) = $layout->size;
2054	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2307	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2055	}	2308	}
2056		2309
2057	$y += $h;	2310	$y += $h;
2058	}	2311	}
2059		2312
2060	glDisable GL_TEXTURE_2D;	2313	glDisable GL_TEXTURE_2D;
2061	glDisable GL_BLEND;
2062	};	2314	};
2063	});	2315	});
2064	}	2316	}
2065		2317
2066	sub _draw {	2318	sub _draw {
2067	my ($self) = @_;	2319	my ($self) = @_;
2068		2320
2069	if ($self->{texture}) {
2070	glEnable GL_TEXTURE_2D;	2321	glEnable GL_TEXTURE_2D;
2071	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2322	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2323	glColor 1, 1, 1, 1;
2072	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2324	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2073	glDisable GL_TEXTURE_2D;	2325	glDisable GL_TEXTURE_2D;
2074	}
2075		2326
2076	$self->{children}[1]->draw;	2327	$self->{children}[1]->draw;
2077		2328
2078	}	2329	}
2079		2330
…		…
2127		2378
2128	sub new {	2379	sub new {
2129	my $class = shift;	2380	my $class = shift;
2130		2381
2131	my $self = $class->SUPER::new (	2382	my $self = $class->SUPER::new (
2132	state => 0,	2383	state => 0,
2133	connect_activate => \&toggle_flopper,	2384	connect_activate => \&toggle_flopper,
2134	can_events => 1,
2135	@_	2385	@_
2136	);	2386	);
2137		2387
2138	if ($self->{state}) {	2388	if ($self->{state}) {
2139	$self->{state} = 0;	2389	$self->{state} = 0;
…		…
2174	@_,	2424	@_,
2175	can_events => 0,	2425	can_events => 0,
2176	)	2426	)
2177	}	2427	}
2178		2428
2179	sub set_text {	2429	sub set_tooltip_from {
2180	my ($self, $text) = @_;	2430	my ($self, $widget) = @_;
2181		2431
2182	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2432	$self->add (new CFClient::UI::Label
2183	$self->{label}->set_text ($text);	2433	markup => $widget->{tooltip},
2184	$self->add ($self->{label});	2434	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2435	fontsize => 0.8,
		2436	fg => [0, 0, 0, 1],
		2437	ellipsise => 0,
		2438	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2439	);
2185	}	2440	}
2186		2441
2187	sub size_request {	2442	sub size_request {
2188	my ($self) = @_;	2443	my ($self) = @_;
2189		2444
2190	$self->child->set_max_size ($::WIDTH * 0.2);
2191
2192	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2445	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193		2446
2194	($w + 4, $h + 4)	2447	($w + 4, $h + 4)
2195	}	2448	}
2196		2449
		2450	sub size_allocate {
		2451	my ($self, $w, $h) = @_;
		2452
		2453	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2454	}
		2455
2197	sub _draw {	2456	sub _draw {
2198	my ($self) = @_;	2457	my ($self) = @_;
2199		2458
2200	glPushMatrix;
2201	glTranslate 0.375, 0.375;	2459	glTranslate 0.375, 0.375;
2202		2460
2203	my ($w, $h) = @$self{qw(w h)};	2461	my ($w, $h) = @$self{qw(w h)};
2204		2462
2205	glColor 1, 0.8, 0.4;	2463	glColor 1, 0.8, 0.4;
…		…
2216	glVertex 0 , $h;	2474	glVertex 0 , $h;
2217	glVertex $w, $h;	2475	glVertex $w, $h;
2218	glVertex $w, 0;	2476	glVertex $w, 0;
2219	glEnd;	2477	glEnd;
2220		2478
2221	glPopMatrix;	2479	glTranslate 2 - 0.375, 2 - 0.375;
2222
2223	glTranslate 2, 2;
2224	$self->SUPER::_draw;	2480	$self->SUPER::_draw;
2225	}	2481	}
2226		2482
2227	#############################################################################	2483	#############################################################################
2228		2484
		2485	package CFClient::UI::Face;
		2486
		2487	our @ISA = CFClient::UI::Base::;
		2488
		2489	use CFClient::OpenGL;
		2490
		2491	sub new {
		2492	my $class = shift;
		2493
		2494	$class->SUPER::new (
		2495	aspect => 1,
		2496	@_,
		2497	)
		2498	}
		2499
		2500	sub size_request {
		2501	(32, 8)
		2502	}
		2503
		2504	sub _draw {
		2505	my ($self) = @_;
		2506
		2507	return unless $::CONN;#d# manage and cache textures differently
		2508	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2509
		2510	# TODO animation
		2511	if ($tex) {
		2512	glEnable GL_TEXTURE_2D;
		2513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2514	glColor 1, 1, 1, 1;
		2515	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2516	glDisable GL_TEXTURE_2D;
		2517	}
		2518	}
		2519
		2520	#############################################################################
		2521
		2522	package CFClient::UI::InventoryItem;
		2523
		2524	our @ISA = CFClient::UI::HBox::;
		2525
		2526	sub _item_to_desc {
		2527	my ($item) = @_;
		2528
		2529	my $desc =
		2530	$item->{nrof} < 2
		2531	? $item->{name}
		2532	: "$item->{nrof} $item->{name_pl}";
		2533
		2534	$item->{flags} & Crossfire::Protocol::F_OPEN
		2535	and $desc .= " (open)";
		2536	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2537	and $desc .= " (applied)";
		2538	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2539	and $desc .= " (unpaid)";
		2540	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2541	and $desc .= " (magic)";
		2542	$item->{flags} & Crossfire::Protocol::F_CURSED
		2543	and $desc .= " (cursed)";
		2544	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2545	and $desc .= " (damned)";
		2546	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2547	and $desc .= " *";
		2548
		2549	$desc
		2550	}
		2551
		2552	sub new {
		2553	my $class = shift;
		2554
		2555	my %args = @_;
		2556
		2557	my $item = delete $args{item};
		2558
		2559	my $desc = _item_to_desc ($item);
		2560
		2561	my $self = $class->SUPER::new (
		2562	can_hover => 1,
		2563	can_events => 1,
		2564	tooltip => ((CFClient::UI::Label::escape $desc)
		2565	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2566	connect_button_down => sub {
		2567	my ($self, $ev, $x, $y) = @_;
		2568
		2569	# todo: maybe put examine on 1? but should just be a tooltip :(
		2570	if ($ev->{button} == 1) {
		2571	my $targ = $::CONN->{player}{tag};
		2572
		2573	if ($item->{container} == $::CONN->{player}{tag}) {
		2574	$targ = $main::OPENCONT;
		2575	}
		2576
		2577	$::CONN->send ("move $targ $item->{tag} 0");
		2578	} elsif ($ev->{button} == 2) {
		2579	$::CONN->send ("apply $item->{tag}");
		2580	} elsif ($ev->{button} == 3) {
		2581	my @menu_items = (
		2582	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2583	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2584	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2585	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2586	[
		2587	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2588	sub { $::CONN->send ("lock $item->{tag}") },
		2589	],
		2590	);
		2591
		2592	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2593	}
		2594
		2595	1
		2596	},
		2597	%args
		2598	);
		2599
		2600
		2601	$self->add (new CFClient::UI::Face
		2602	can_events => 0,
		2603	face => $item->{face},
		2604	anim => $item->{anim},
		2605	animspeed => $item->{animspeed},
		2606	);
		2607
		2608	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2609
		2610	$self->{item} = $item;
		2611
		2612	$self->update_item;
		2613
		2614	$self
		2615	}
		2616
		2617	sub update_item {
		2618	my ($self) = @_;
		2619
		2620	my $desc = _item_to_desc ($self->{item});
		2621
		2622	$self->{name_lbl}->set_text ($desc);
		2623	}
		2624
		2625	#############################################################################
		2626
		2627	package CFClient::UI::Inventory;
		2628
		2629	our @ISA = CFClient::UI::ScrolledWindow::;
		2630
		2631	sub new {
		2632	my $class = shift;
		2633
		2634	my $self = $class->SUPER::new (
		2635	scrolled => (new CFClient::UI::VBox),
		2636	@_,
		2637	);
		2638
		2639	$self
		2640	}
		2641
		2642	sub set_items {
		2643	my ($self, $items) = @_;
		2644
		2645	$self->{scrolled}->clear;
		2646	return unless $items;
		2647
		2648	my @items = sort {
		2649	($a->{type} <=> $b->{type})
		2650	or ($a->{name} cmp $b->{name})
		2651	} @$items;
		2652
		2653	$self->{real_items} = \@items;
		2654
		2655	for my $item (@items) {
		2656	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2657	$item->update_item ();
		2658	}
		2659
		2660	$self->{scrolled}->add (@items);
		2661
		2662	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2663	}
		2664
		2665	sub size_request {
		2666	my ($self) = @_;
		2667	($self->{req_w}, $self->{req_h});
		2668	}
		2669
		2670	#############################################################################
		2671
		2672	package CFClient::UI::Menu;
		2673
		2674	our @ISA = CFClient::UI::FancyFrame::;
		2675
		2676	use CFClient::OpenGL;
		2677
		2678	sub new {
		2679	my $class = shift;
		2680
		2681	my $self = $class->SUPER::new (
		2682	items => [],
		2683	z => 100,
		2684	@_,
		2685	);
		2686
		2687	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2688
		2689	for my $item (@{ $self->{items} }) {
		2690	my ($widget, $cb) = @$item;
		2691
		2692	# handle various types of items, only text for now
		2693	if (!ref $widget) {
		2694	$widget = new CFClient::UI::Label
		2695	can_hover => 1,
		2696	can_events => 1,
		2697	text => $widget;
		2698	}
		2699
		2700	$self->{item}{$widget} = $item;
		2701
		2702	$self->{vbox}->add ($widget);
		2703	}
		2704
		2705	$self
		2706	}
		2707
		2708	# popup given the event (must be a mouse button down event currently)
		2709	sub popup {
		2710	my ($self, $ev) = @_;
		2711
		2712	$self->emit ("popdown");
		2713
		2714	# maybe save $GRAB? must be careful about events...
		2715	$GRAB = $self;
		2716	$self->{button} = $ev->{button};
		2717
		2718	$self->show;
		2719	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2720	}
		2721
		2722	sub mouse_motion {
		2723	my ($self, $ev, $x, $y) = @_;
		2724
		2725	# TODO: should use vbox->find_widget or so
		2726	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2727	$self->{hover} = $self->{item}{$HOVER};
		2728	}
		2729
		2730	sub button_up {
		2731	my ($self, $ev, $x, $y) = @_;
		2732
		2733	if ($ev->{button} == $self->{button}) {
		2734	undef $GRAB;
		2735	$self->hide;
		2736
		2737	$self->emit ("popdown");
		2738	$self->{hover}[1]->() if $self->{hover};
		2739	}
		2740	}
		2741
		2742	#############################################################################
		2743
		2744	package CFClient::UI::Statusbox;
		2745
		2746	our @ISA = CFClient::UI::VBox::;
		2747
		2748	sub new {
		2749	my $class = shift;
		2750
		2751	$class->SUPER::new (
		2752	fontsize => 0.8,
		2753	@_,
		2754	)
		2755	}
		2756
		2757	sub reorder {
		2758	my ($self) = @_;
		2759	my $NOW = time;
		2760
		2761	while (my ($k, $v) = each %{ $self->{item} }) {
		2762	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2763	}
		2764
		2765	my @widgets;
		2766
		2767	my @items = sort {
		2768	$a->{pri} <=> $b->{pri}
		2769	or $b->{id} <=> $a->{id}
		2770	} values %{ $self->{item} };
		2771
		2772	my $count = 10 + 1;
		2773	for my $item (@items) {
		2774	last unless --$count;
		2775
		2776	push @widgets, $item->{label} ||= do {
		2777	# TODO: doesn't handle markup well (read as: at all)
		2778	my $short = $item->{count} > 1
		2779	? "<b>$item->{count} ×</b> $item->{text}"
		2780	: $item->{text};
		2781
		2782	for ($short) {
		2783	s/^\s+//;
		2784	s/\s+/ /g;
		2785	}
		2786
		2787	new CFClient::UI::Label
		2788	markup => $short,
		2789	tooltip => $item->{tooltip},
		2790	tooltip_font => $::FONT_PROP,
		2791	tooltip_width => 0.67,
		2792	fontsize => $item->{fontsize} || $self->{fontsize},
		2793	max_w => $::WIDTH * 0.44,
		2794	fg => $item->{fg},
		2795	can_events => 1,
		2796	can_hover => 1
		2797	};
		2798	}
		2799
		2800	$self->clear;
		2801	$self->SUPER::add (reverse @widgets);
		2802	}
		2803
		2804	sub add {
		2805	my ($self, $text, %arg) = @_;
		2806
		2807	$text =~ s/^\s+//;
		2808	$text =~ s/\s+$//;
		2809
		2810	my $timeout = time + ((delete $arg{timeout}) || 60);
		2811
		2812	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2813
		2814	if (my $item = $self->{item}{$group}) {
		2815	if ($item->{text} eq $text) {
		2816	$item->{count}++;
		2817	} else {
		2818	$item->{count} = 1;
		2819	$item->{text} = $item->{tooltip} = $text;
		2820	}
		2821	$item->{id} = ++$self->{id};
		2822	$item->{timeout} = $timeout;
		2823	delete $item->{label};
		2824	} else {
		2825	$self->{item}{$group} = {
		2826	id => ++$self->{id},
		2827	text => $text,
		2828	timeout => $timeout,
		2829	tooltip => $text,
		2830	fg => [0.8, 0.8, 0.8, 0.8],
		2831	pri => 0,
		2832	count => 1,
		2833	%arg,
		2834	};
		2835	}
		2836
		2837	$self->reorder;
		2838	}
		2839
		2840	sub reconfigure {
		2841	my ($self) = @_;
		2842
		2843	delete $_->{label}
		2844	for values %{ $self->{item} || {} };
		2845
		2846	$self->reorder;
		2847	$self->SUPER::reconfigure;
		2848	}
		2849
		2850	#############################################################################
		2851
2229	package CFClient::UI::Root;	2852	package CFClient::UI::Root;
2230		2853
2231	our @ISA = CFClient::UI::Container::;	2854	our @ISA = CFClient::UI::Container::;
2232		2855
2233	use CFClient::OpenGL;	2856	use CFClient::OpenGL;
2234		2857
2235	sub check_size {	2858	sub new {
2236	my ($self) = @_;	2859	my $class = shift;
2237		2860
2238	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2861	$class->SUPER::new (
2239	}	2862	@_,
2240		2863	)
2241	sub size_request {
2242	($::WIDTH, $::HEIGHT)
2243	}	2864	}
2244		2865
2245	sub configure {	2866	sub configure {
2246	my ($self, $x, $y, $w, $h) = @_;	2867	my ($self, $x, $y, $w, $h) = @_;
2247		2868
2248	$self->SUPER::configure ($x, $y, $w, $h);	2869	$self->{w} = $w;
		2870	$self->{h} = $h;
		2871	}
2249		2872
		2873	sub check_size {
		2874	my ($self) = @_;
		2875
		2876	$self->size_allocate ($self->{w}, $self->{h})
		2877	if $self->{w};
		2878	}
		2879
		2880	sub size_request {
		2881	my ($self) = @_;
		2882
		2883	($self->{w}, $self->{h})
		2884	}
		2885
		2886	sub size_allocate {
		2887	my ($self, $w, $h) = @_;
		2888
		2889	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2890	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2891
		2892	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2893	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2894
2250	for my $child (@{$self->{children}}) {	2895	for my $child ($self->children) {
2251	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2896	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2252		2897
		2898	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2899	if exists $child->{req_x};
		2900
		2901	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2902	if exists $child->{req_y};
		2903
2253	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2904	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2254	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2905	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2906
2255	$child->configure ($X, $Y, $W,$H);	2907	$child->configure ($X, $Y, $W, $H);
2256	}	2908	}
2257	}	2909	}
2258		2910
2259	sub _topleft {	2911	sub coord2local {
2260	my ($self, $x, $y) = @_;	2912	my ($self, $x, $y) = @_;
2261		2913
2262	($x, $y)	2914	($x, $y)
2263	}	2915	}
2264		2916
		2917	sub coord2global {
		2918	my ($self, $x, $y) = @_;
		2919
		2920	($x, $y)
		2921	}
		2922
2265	sub update {	2923	sub update {
2266	my ($self) = @_;	2924	my ($self) = @_;
2267		2925
2268	$self->check_size;	2926	$self->check_size;
2269	::refresh ();	2927	$::WANT_REFRESH++;
2270	}	2928	}
2271		2929
2272	sub add {	2930	sub add {
2273	my ($self, $child) = @_;	2931	my ($self, @children) = @_;
2274		2932
		2933	for my $child (@children) {
		2934	$child->{toplevel} = 1;
		2935
2275	# integerize window positions	2936	# integerise window positions
2276	$child->{x} = int $child->{x};	2937	$child->{x} = int $child->{x};
2277	$child->{y} = int $child->{y};	2938	$child->{y} = int $child->{y};
		2939	}
2278		2940
2279	$self->SUPER::add ($child);	2941	$self->SUPER::add (@children);
2280	}	2942	}
2281		2943
2282	sub on_refresh {	2944	sub on_refresh {
2283	my ($self, $id, $cb) = @_;	2945	my ($self, $id, $cb) = @_;
2284		2946
2285	$self->{refresh_hook}{$id} = $cb;	2947	$self->{refresh_hook}{$id} = $cb;
2286	}	2948	}
2287		2949
		2950	sub on_post_alloc {
		2951	my ($self, $id, $cb) = @_;
		2952
		2953	$self->{post_alloc_hook}{$id} = $cb;
		2954	}
		2955
2288	sub draw {	2956	sub draw {
2289	my ($self) = @_;	2957	my ($self) = @_;
2290		2958
2291	while (my $rcb = delete $self->{refresh_hook}) {	2959	while ($self->{refresh_hook}) {
2292	$_->() for values %$rcb;	2960	$_->()
		2961	for values %{delete $self->{refresh_hook}};
		2962	}
		2963
		2964	if ($self->{check_size}) {
		2965	my @queue = ([], []);
		2966
		2967	for (;;) {
		2968	if ($self->{check_size}) {
		2969	# heuristic: check containers last
		2970	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2971	for values %{delete $self->{check_size}}
		2972	}
		2973
		2974	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		2975
		2976	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2977	? @$widget{qw(user_w user_h)}
		2978	: $widget->size_request;
		2979
		2980	if (delete $widget->{force_alloc}
		2981	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		2982	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		2983
		2984	$widget->{req_w} = $w;
		2985	$widget->{req_h} = $h;
		2986
		2987	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		2988
		2989	$widget->{parent}->check_size
		2990	if $widget->{parent};
		2991	}
		2992	}
		2993	}
		2994
		2995	while ($self->{size_alloc}) {
		2996	for (values %{delete $self->{size_alloc}}) {
		2997	my ($widget, $w, $h) = @$_;
		2998
		2999	$w = 0 if $w < 0;
		3000	$h = 0 if $h < 0;
		3001
		3002	$widget->{w} = $w;
		3003	$widget->{h} = $h;
		3004	$widget->size_allocate ($w, $h);
		3005	$widget->emit (size_allocate => $w, $h);
		3006	}
		3007	}
		3008
		3009	while ($self->{post_alloc_hook}) {
		3010	$_->()
		3011	for values %{delete $self->{post_alloc_hook}};
2293	}	3012	}
2294		3013
2295	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3014	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3015	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297	glClear GL_COLOR_BUFFER_BIT;	3016	glClear GL_COLOR_BUFFER_BIT;
…		…
2308	#############################################################################	3027	#############################################################################
2309		3028
2310	package CFClient::UI;	3029	package CFClient::UI;
2311		3030
2312	$ROOT = new CFClient::UI::Root;	3031	$ROOT = new CFClient::UI::Root;
2313	$TOOLTIP = new CFClient::UI::Tooltip;	3032	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2314		3033
2315	1	3034	1
2316		3035

Diff Legend

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