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.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.213 by root, Wed May 17 15:18: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
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		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 (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
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_markup ($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
147	sub destroy {	194	sub destroy {
148	my ($self) = @_;	195	my ($self) = @_;
…		…
160	}	207	}
161		208
162	sub hide {	209	sub hide {
163	my ($self) = @_;	210	my ($self) = @_;
164		211
165	return unless $self->{parent};	212	undef $GRAB if $GRAB == $self;
		213	undef $HOVER if $HOVER == $self;
166		214
167	$self->{parent}->remove ($self);	215	$self->{parent}->remove ($self)
		216	if $self->{parent};
168	}	217	}
169		218
170	sub move {	219	sub move {
171	my ($self, $x, $y, $z) = @_;	220	my ($self, $x, $y, $z) = @_;
172		221
…		…
211	$self->{y} = $y;	260	$self->{y} = $y;
212	$self->update;	261	$self->update;
213	}	262	}
214		263
215	if ($self->{w} != $w || $self->{h} != $h) {	264	if ($self->{w} != $w || $self->{h} != $h) {
216	$self->{w} = $w;	265	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217	$self->{h} = $h;
218
219	$self->size_allocate ($w, $h);
220	$self->update;
221	}	266	}
222	}	267	}
223		268
224	sub size_allocate {	269	sub size_allocate {
225	# nothing to be done	270	# nothing to be done
226	}	271	}
227		272
		273	sub reconfigure {
		274	my ($self) = @_;
		275
		276	$self->check_size (1);
		277	$self->update;
		278	}
		279
		280	sub children {
		281	}
		282
228	sub set_max_size {	283	sub set_max_size {
229	my ($self, $w, $h) = @_;	284	my ($self, $w, $h) = @_;
230		285
231	delete $self->{max_w}; $self->{max_w} = $w if $w;	286	delete $self->{max_w}; $self->{max_w} = $w if $w;
232	delete $self->{max_h}; $self->{max_h} = $h if $h;	287	delete $self->{max_h}; $self->{max_h} = $h if $h;
233	}	288	}
234		289
235	# return top left coordinates	290	sub set_tooltip {
236	sub _topleft {
237	my ($self, $x, $y) = @_;	291	my ($self, $tooltip) = @_;
238		292
239	$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	}
240	}	299	}
241		300
242	# translate global coordinates to local coordinate system	301	# translate global coordinates to local coordinate system
243	sub coord2local {	302	sub coord2local {
244	my ($self, $x, $y) = @_;	303	my ($self, $x, $y) = @_;
245		304
246	my ($X, $Y) = $self->_topleft;	305	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247	($x - $X, $y - $Y)
248	}	306	}
249		307
250	# translate local coordinates to global coordinate system	308	# translate local coordinates to global coordinate system
251	sub coord2global {	309	sub coord2global {
252	my ($self, $x, $y) = @_;	310	my ($self, $x, $y) = @_;
253		311
254	my ($X, $Y) = $self->_topleft;	312	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255	($x + $X, $y + $Y)
256	}	313	}
257		314
258	sub focus_in {	315	sub focus_in {
259	my ($self) = @_;	316	my ($self) = @_;
260		317
…		…
332	glVertex $self->{w}, 0;	389	glVertex $self->{w}, 0;
333	glVertex $self->{w}, $self->{h};	390	glVertex $self->{w}, $self->{h};
334	glVertex 0 , $self->{h};	391	glVertex 0 , $self->{h};
335	glEnd;	392	glEnd;
336	glPopMatrix;	393	glPopMatrix;
337	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	394	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
338	}	395	}
339	}	396	}
340		397
341	sub _draw {	398	sub _draw {
342	my ($self) = @_;	399	my ($self) = @_;
…		…
358		415
359	sub set_parent {	416	sub set_parent {
360	my ($self, $parent) = @_;	417	my ($self, $parent) = @_;
361		418
362	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};
363	}	424	}
364		425
365	sub check_size {	426	sub check_size {
366	my ($self) = @_;	427	my ($self, $forced) = @_;
367		428
368	$self->{parent}	429	$self->{force_alloc} = 1 if $forced;
369	or return 1;	430	$CFClient::UI::ROOT->{check_size}{$self} = $self;
370
371	my ($w, $h) = $self->{user_w} && $self->{user_h}
372	? @$self{qw(user_w user_h)}
373	: $self->size_request;
374
375	if ($w != $self->{req_w} || $h != $self->{req_h}) {
376	$self->{req_w} = $w;
377	$self->{req_h} = $h;
378
379	$self->{parent}->check_size
380	or $self->size_allocate (
381	(List::Util::max $self->{w}, $w),
382	(List::Util::max $self->{h}, $h),
383	);
384
385	1
386	} else {
387	0
388	}
389	}	431	}
390		432
391	sub update {	433	sub update {
392	my ($self) = @_;	434	my ($self) = @_;
393		435
…		…
402	}	444	}
403		445
404	sub emit {	446	sub emit {
405	my ($self, $signal, @args) = @_;	447	my ($self, $signal, @args) = @_;
406		448
407	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	449	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
408	$cb->($self, @args);
409	}
410	}	450	}
411		451
412	sub DESTROY {	452	sub DESTROY {
413	my ($self) = @_;	453	my ($self) = @_;
414		454
		455	delete $WIDGET{$self+0};
415	#$self->deactivate;	456	#$self->deactivate;
416	}	457	}
417		458
418	#############################################################################	459	#############################################################################
419		460
…		…
428	my $class = shift;	469	my $class = shift;
429		470
430	# range [value, low, high, page]	471	# range [value, low, high, page]
431		472
432	$class->SUPER::new (	473	$class->SUPER::new (
433	bg => [0, 0, 0, 0.2],	474	#bg => [0, 0, 0, 0.2],
434	active_bg => [1, 1, 1, 0.5],	475	#active_bg => [1, 1, 1, 0.5],
435	@_	476	@_
436	)	477	)
437	}	478	}
438		479
439	sub _draw {	480	sub _draw {
440	my ($self) = @_;	481	my ($self) = @_;
441		482
		483	my $color = $FOCUS == $self && $self->{active_bg}
		484	? $self->{active_bg}
		485	: $self->{bg};
		486
		487	if ($color && (@$color < 4 || $color->[3])) {
442	my ($w, $h) = @$self{qw(w h)};	488	my ($w, $h) = @$self{qw(w h)};
443		489
444	glEnable GL_BLEND;	490	glEnable GL_BLEND;
445	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
446	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	492	glColor @$color;
447		493
448	glBegin GL_QUADS;	494	glBegin GL_QUADS;
449	glVertex 0 , 0;	495	glVertex 0 , 0;
450	glVertex 0 , $h;	496	glVertex 0 , $h;
451	glVertex $w, $h;	497	glVertex $w, $h;
452	glVertex $w, 0;	498	glVertex $w, 0;
453	glEnd;	499	glEnd;
454		500
455	glDisable GL_BLEND;	501	glDisable GL_BLEND;
		502	}
456	}	503	}
457		504
458	#############################################################################	505	#############################################################################
459		506
460	package CFClient::UI::Empty;	507	package CFClient::UI::Empty;
…		…
481	sub new {	528	sub new {
482	my ($class, %arg) = @_;	529	my ($class, %arg) = @_;
483		530
484	my $children = delete $arg{children} || [];	531	my $children = delete $arg{children} || [];
485		532
486	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	);
487	$self->add ($_) for @$children;	538	$self->add ($_) for @$children;
488		539
489	$self	540	$self
490	}	541	}
491		542
492	sub add {	543	sub add {
493	my ($self, $child) = @_;	544	my ($self, @widgets) = @_;
494		545
495	$child->set_parent ($self);	546	$_->set_parent ($self)
		547	for @widgets;
496		548
497	use sort 'stable';	549	use sort 'stable';
498		550
499	$self->{children} = [	551	$self->{children} = [
500	sort { $a->{z} <=> $b->{z} }	552	sort { $a->{z} <=> $b->{z} }
501	@{$self->{children}}, $child	553	@{$self->{children}}, @widgets
502	];	554	];
503		555
504	$child->check_size;	556	$self->check_size (1);
		557	$self->update;
		558	}
		559
		560	sub children {
		561	@{ $_[0]{children} }
505	}	562	}
506		563
507	sub remove {	564	sub remove {
508	my ($self, $child) = @_;	565	my ($self, $child) = @_;
509		566
510	delete $child->{parent};	567	delete $child->{parent};
		568	$child->hide;
511		569
512	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	570	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513		571
514	$self->check_size;	572	$self->check_size;
515	$self->update;	573	$self->update;
516	}	574	}
517		575
518	sub clear {	576	sub clear {
519	my ($self) = @_;	577	my ($self) = @_;
520		578
521	delete $_->{parent}	579	my $children = delete $self->{children};
522	for @{ delete $self->{children} };
523
524	$self->{children} = [];	580	$self->{children} = [];
		581
		582	for (@$children) {
		583	delete $_->{parent};
		584	$_->hide;
		585	}
		586
		587	$self->check_size;
		588	$self->update;
525	}	589	}
526		590
527	sub find_widget {	591	sub find_widget {
528	my ($self, $x, $y) = @_;	592	my ($self, $x, $y) = @_;
529		593
…		…
604	}	668	}
605		669
606	sub update {	670	sub update {
607	my ($self) = @_;	671	my ($self) = @_;
608		672
609	# we want to do this delayed...	673	$ROOT->on_post_alloc ($self => sub { $self->render_child });
610	$self->render_chld;
611	$self->SUPER::update;	674	$self->SUPER::update;
612	}
613
614	sub render_chld {
615	my ($self) = @_;
616
617	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
618	glClearColor 0, 0, 0, 1;
619	glClear GL_COLOR_BUFFER_BIT;
620	$self->child->draw;
621	};
622	}	675	}
623		676
624	sub size_allocate {	677	sub size_allocate {
625	my ($self, $w, $h) = @_;	678	my ($self, $w, $h) = @_;
626		679
627	$self->child->configure (0, 0, $w, $h);	680	$self->SUPER::size_allocate ($w, $h);
		681	$self->update;
		682	}
628		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
629	$self->render_chld;	695	$self->_render;
		696	# glColorMask 1, 1, 1, 0;
		697	# glEnable GL_BLEND;
		698	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		699	# glRasterPos 0, 0;
		700	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		701	# glDisable GL_BLEND;
		702	# glColorMask 1, 1, 1, 1;
		703	};
630	}	704	}
631		705
632	sub _draw {	706	sub _draw {
633	my ($self) = @_;	707	my ($self) = @_;
634		708
635	my ($w, $h) = ($self->w, $self->h);	709	my ($w, $h) = ($self->w, $self->h);
636		710
637	my $tex = $self->{texture}	711	my $tex = $self->{texture}
638	or return;	712	or return;
639		713
640	glEnable GL_BLEND;
641	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
642	glEnable GL_TEXTURE_2D;	714	glEnable GL_TEXTURE_2D;
643	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	715	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		716	glColor 0, 0, 0, 1;
644		717
645	$tex->draw_quad (0, 0, $w, $h);	718	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
646		719
647	glDisable GL_BLEND;
648	glDisable GL_TEXTURE_2D;	720	glDisable GL_TEXTURE_2D;
649	}	721	}
650		722
651	#############################################################################	723	#############################################################################
652		724
653	package CFClient::UI::ViewPort;	725	package CFClient::UI::ViewPort;
654		726
655	our @ISA = CFClient::UI::Window::;	727	our @ISA = CFClient::UI::Window::;
656		728
657	sub new { die }
658
659	sub size_request {	729	sub size_request {
660	my ($self) = @_;	730	my ($self) = @_;
661		731
662	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	732	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
663	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	733	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
664		734
665	@$self{qw(child_w child_h)}	735	@$self{qw(child_w child_h)}
666	}	736	}
667		737
668	sub _draw {	738	sub size_allocate {
669	my ($self) = @_;	739	my ($self, $w, $h) = @_;
670		740
671	$self->{children}[1]->draw;	741	$self->update;
672	}	742	}
673		743
		744	sub set_offset {
		745	my ($self, $x, $y) = @_;
674		746
675	#############################################################################	747	$self->{view_x} = int $x;
		748	$self->{view_y} = int $y;
676		749
		750	$self->update;
		751	}
		752
		753	# hmm, this does not work for topleft of $self... but we should not ask for that
		754	sub coord2local {
		755	my ($self, $x, $y) = @_;
		756
		757	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		758	}
		759
		760	sub coord2global {
		761	my ($self, $x, $y) = @_;
		762
		763	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		764	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		765
		766	$self->SUPER::coord2global ($x, $y)
		767	}
		768
		769	sub find_widget {
		770	my ($self, $x, $y) = @_;
		771
		772	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		773	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		774	) {
		775	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		776	} else {
		777	$self->CFClient::UI::Base::find_widget ($x, $y)
		778	}
		779	}
		780
		781	sub _render {
		782	my ($self) = @_;
		783
		784	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		785
		786	$self->SUPER::_render;
		787	}
		788
		789	#############################################################################
		790
677	package CFClient::UI::Frame;	791	package CFClient::UI::ScrolledWindow;
678		792
679	our @ISA = CFClient::UI::Bin::;	793	our @ISA = CFClient::UI::HBox::;
680
681	use CFClient::OpenGL;
682		794
683	sub new {	795	sub new {
684	my $class = shift;	796	my $class = shift;
685		797
		798	my $self;
		799
		800	my $slider = new CFClient::UI::Slider
		801	vertical => 1,
		802	range => [0, 0, 1, 0.01], # HACK fix
		803	connect_changed => sub {
		804	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		805	},
		806	;
		807
686	my $self = $class->SUPER::new (	808	$self = $class->SUPER::new (
687	bg => [1, 1, 1, 1],	809	vp => (new CFClient::UI::ViewPort),
688	border_bg => [1, 1, 1, 1],	810	slider => $slider,
689	border => 0.8,
690	@_	811	@_,
691	);	812	);
692		813
		814	$self->{vp}->add ($self->{scrolled});
		815	$self->add ($self->{vp});
		816	$self->add ($self->{slider});
		817
693	$self	818	$self
694	}	819	}
695		820
		821	#TODO# update range on size_allocate depending on child
		822	# update viewport offset on scroll
		823
		824	#############################################################################
		825
		826	package CFClient::UI::Frame;
		827
		828	our @ISA = CFClient::UI::Bin::;
		829
		830	use CFClient::OpenGL;
		831
		832	sub new {
		833	my $class = shift;
		834
		835	$class->SUPER::new (
		836	bg => undef,
		837	@_,
		838	)
		839	}
		840
696	sub _draw {	841	sub _draw {
697	my ($self) = @_;	842	my ($self) = @_;
698		843
699	my ($w, $h) = ($self->{w}, $self->{h});	844	if ($self->{bg}) {
		845	my ($w, $h) = @$self{qw(w h)};
700		846
701	glEnable GL_BLEND;	847	glEnable GL_BLEND;
702	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	848	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
703	glEnable GL_TEXTURE_2D;	849	glColor @{ $self->{bg} };
704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
705		850
706	# glBegin GL_QUADS;	851	glBegin GL_QUADS;
707	# glColor 0, 0, 0, 0;
708	# glVertex 0 , 0;	852	glVertex 0 , 0;
709	# glVertex 0 , $h;	853	glVertex 0 , $h;
710	# glVertex $w, $h;	854	glVertex $w, $h;
711	# glVertex $w, 0;	855	glVertex $w, 0;
712	# glEnd;	856	glEnd;
713		857
714
715	$self->child->draw;
716	glDisable GL_BLEND;	858	glDisable GL_BLEND;
717	glDisable GL_TEXTURE_2D;	859	}
		860
		861	$self->SUPER::_draw;
718	}	862	}
719		863
720	#############################################################################	864	#############################################################################
721		865
722	package CFClient::UI::FancyFrame;	866	package CFClient::UI::FancyFrame;
…		…
733	my $class = shift;	877	my $class = shift;
734		878
735	# TODO: user_x, user_y, overwrite moveto?	879	# TODO: user_x, user_y, overwrite moveto?
736		880
737	my $self = $class->SUPER::new (	881	my $self = $class->SUPER::new (
738	bg => [1, 1, 1, 1],	882	bg => [1, 1, 1, 1],
739	border_bg => [1, 1, 1, 1],	883	border_bg => [1, 1, 1, 1],
740	border => 0.8,	884	border => 0.6,
		885	toplevel => 1,
741	can_events => 1,	886	can_events => 1,
742	@_	887	@_
743	);	888	);
744		889
745	$self->{title} &&= new CFClient::UI::Label	890	$self->{title} &&= new CFClient::UI::Label
746	align => 0,	891	align => 0,
747	valign => 1,	892	valign => 1,
748	text => $self->{title},	893	text => $self->{title},
749	fontsize => 1;	894	fontsize => $self->{border};
750		895
751	$self	896	$self
752	}	897	}
753		898
754	sub border {	899	sub border {
…		…
770	my ($self, $w, $h) = @_;	915	my ($self, $w, $h) = @_;
771		916
772	$h -= List::Util::max 0, $self->border * 2;	917	$h -= List::Util::max 0, $self->border * 2;
773	$w -= List::Util::max 0, $self->border * 2;	918	$w -= List::Util::max 0, $self->border * 2;
774		919
775	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	920	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
776	if $self->{title};	921	if $self->{title};
777		922
778	$self->child->configure ($self->border, $self->border, $w, $h);	923	$self->child->configure ($self->border, $self->border, $w, $h);
779	}	924	}
780		925
781	sub button_down {	926	sub button_down {
782	my ($self, $ev, $x, $y) = @_;	927	my ($self, $ev, $x, $y) = @_;
783		928
		929	my ($w, $h) = @$self{qw(w h)};
784	my $border = $self->border;	930	my $border = $self->border;
785		931
786	if ($x < $self->{w} && $x >= $self->{w} - $border	932	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787	&& $y < $self->{h} && $y >= $self->{h} - $border) {	933	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788		934
		935	if ($lr & $td) {
		936	my ($wx, $wy) = ($self->{x}, $self->{y});
789	my ($ox, $oy) = ($ev->{x}, $ev->{y});	937	my ($ox, $oy) = ($ev->{x}, $ev->{y});
790	my ($bw, $bh) = ($self->{w}, $self->{h});	938	my ($bw, $bh) = ($self->{w}, $self->{h});
791		939
		940	my $mx = $x < $border;
		941	my $my = $y < $border;
		942
792	$self->{motion} = sub {	943	$self->{motion} = sub {
793	my ($ev, $x, $y) = @_;	944	my ($ev, $x, $y) = @_;
794		945
795	($x, $y) = ($ev->{x}, $ev->{y});	946	my $dx = $ev->{x} - $ox;
		947	my $dy = $ev->{y} - $oy;
796		948
797	$self->{user_w} = $bw + $x - $ox;	949	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
798	$self->{user_h} = $bh + $y - $oy;	950	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		951	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
799	$self->check_size;	952	$self->check_size;
800	};	953	};
801		954
802	} elsif ($x >= 0 && $x < $self->{w}	955	} elsif ($lr ^ $td) {
803	&& $y >= 0 && $y < $border) {
804
805	my ($ox, $oy) = ($ev->{x}, $ev->{y});	956	my ($ox, $oy) = ($ev->{x}, $ev->{y});
806	my ($bx, $by) = ($self->{x}, $self->{y});	957	my ($bx, $by) = ($self->{x}, $self->{y});
807		958
808	$self->{motion} = sub {	959	$self->{motion} = sub {
809	my ($ev, $x, $y) = @_;	960	my ($ev, $x, $y) = @_;
…		…
832	my ($self) = @_;	983	my ($self) = @_;
833		984
834	my ($w, $h ) = ($self->{w}, $self->{h});	985	my ($w, $h ) = ($self->{w}, $self->{h});
835	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	986	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
836		987
837	glEnable GL_BLEND;
838	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839	glEnable GL_TEXTURE_2D;	988	glEnable GL_TEXTURE_2D;
840	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	989	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
841		990
842	my $border = $self->border;	991	my $border = $self->border;
843		992
844	glColor @{ $self->{border_bg} };	993	glColor @{ $self->{border_bg} };
845	$tex[1]->draw_quad (0, 0, $w, $border);	994	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
846	$tex[3]->draw_quad (0, $border, $border, $ch);	995	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
847	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	996	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
848	$tex[4]->draw_quad (0, $h - $border, $w, $border);	997	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
849		998
		999	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
850	my $bg = $tex[0];	1000	my $bg = $tex[0];
851		1001
852	# TODO: repeat texture not scale	1002	# TODO: repeat texture not scale
853	my $rep_x = $cw / $bg->{w};	1003	my $rep_x = $cw / $bg->{w};
854	my $rep_y = $ch / $bg->{h};	1004	my $rep_y = $ch / $bg->{h};
855		1005
856	glColor @{ $self->{bg} };	1006	glColor @{ $self->{bg} };
857		1007
858	$bg->{s} = $rep_x;	1008	$bg->{s} = $rep_x;
859	$bg->{t} = $rep_y;	1009	$bg->{t} = $rep_y;
860	$bg->{wrap_mode} = 1;	1010	$bg->{wrap_mode} = 1;
861	$bg->draw_quad ($border, $border, $cw, $ch);	1011	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1012	}
862		1013
863	glDisable GL_TEXTURE_2D;	1014	glDisable GL_TEXTURE_2D;
864	glDisable GL_BLEND;
865		1015
866	$self->{title}->draw if $self->{title};	1016	$self->{title}->draw if $self->{title};
		1017
867	$self->child->draw;	1018	$self->child->draw;
868	}	1019	}
869		1020
870	#############################################################################	1021	#############################################################################
871		1022
…		…
893	$self->{children}[$y][$x] = $child;	1044	$self->{children}[$y][$x] = $child;
894		1045
895	$child->check_size;	1046	$child->check_size;
896	}	1047	}
897		1048
		1049	sub children {
		1050	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1051	}
		1052
898	# TODO: move to container class maybe? send childs a signal on removal?	1053	# TODO: move to container class maybe? send childs a signal on removal?
899	sub clear {	1054	sub clear {
900	my ($self) = @_;	1055	my ($self) = @_;
901		1056
		1057	my @children = $self->children;
902	delete $self->{children};	1058	delete $self->{children};
		1059
		1060	for (@children) {
		1061	delete $_->{parent};
		1062	$_->hide;
		1063	}
		1064
903	$self->update;	1065	$self->update;
904	}	1066	}
905		1067
906	sub get_wh {	1068	sub get_wh {
907	my ($self) = @_;	1069	my ($self) = @_;
…		…
1084	}	1246	}
1085		1247
1086	sub size_allocate {	1248	sub size_allocate {
1087	my ($self, $w, $h) = @_;	1249	my ($self, $w, $h) = @_;
1088		1250
		1251	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1252
1089	my $children = $self->{children};	1253	my $children = $self->{children};
1090		1254
1091	my @h = map $_->{req_h}, @$children;	1255	my @h = map $_->{req_h}, @$children;
1092		1256
1093	my $req_h = List::Util::sum @h;	1257	my $req_h = List::Util::sum @h;
…		…
1122		1286
1123	#############################################################################	1287	#############################################################################
1124		1288
1125	package CFClient::UI::Label;	1289	package CFClient::UI::Label;
1126		1290
1127	our @ISA = CFClient::UI::Base::;	1291	our @ISA = CFClient::UI::DrawBG::;
1128		1292
1129	use CFClient::OpenGL;	1293	use CFClient::OpenGL;
1130		1294
1131	sub new {	1295	sub new {
1132	my ($class, %arg) = @_;	1296	my ($class, %arg) = @_;
1133		1297
1134	my $self = $class->SUPER::new (	1298	my $self = $class->SUPER::new (
1135	fg => [1, 1, 1],	1299	fg => [1, 1, 1],
		1300	#bg => none
		1301	#active_bg => none
1136	#font => default_font	1302	#font => default_font
		1303	#text => initial text
		1304	#markup => initial narkup
		1305	#max_w => maximum pixel width
		1306	ellipsise => 3, # end
		1307	layout => (new CFClient::Layout),
1137	fontsize => 1,	1308	fontsize => 1,
1138	text => "",
1139	align => -1,	1309	align => -1,
1140	valign => -1,	1310	valign => -1,
1141	padding => 2,	1311	padding => 2,
1142	layout => new CFClient::Layout,
1143	can_events => 0,	1312	can_events => 0,
1144	%arg	1313	%arg
1145	);	1314	);
1146		1315
1147	if (exists $self->{template}) {	1316	if (exists $self->{template}) {
1148	my $layout = new CFClient::Layout;	1317	my $layout = new CFClient::Layout;
1149	$layout->set_text (delete $self->{template});	1318	$layout->set_text (delete $self->{template});
1150	$self->{template} = $layout;	1319	$self->{template} = $layout;
1151	}	1320	}
1152		1321
1153	$self->set_text (delete $self->{text}) if exists $self->{text};	1322	if (exists $self->{markup}) {
1154	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1323	$self->set_markup (delete $self->{markup});
		1324	} else {
		1325	$self->set_text (delete $self->{text});
		1326	}
1155		1327
1156	$self	1328	$self
1157	}	1329	}
1158		1330
1159	sub escape {	1331	sub escape($) {
1160	local $_ = $_[1];	1332	local $_ = $_[0];
1161		1333
1162	s/&/&amp;/g;	1334	s/&/&amp;/g;
1163	s/>/&gt;/g;	1335	s/>/&gt;/g;
1164	s/</&lt;/g;	1336	s/</&lt;/g;
1165		1337
1166	$_[1]	1338	$_
		1339	}
		1340
		1341	sub update {
		1342	my ($self) = @_;
		1343
		1344	delete $self->{texture};
		1345	$self->SUPER::update;
1167	}	1346	}
1168		1347
1169	sub set_text {	1348	sub set_text {
1170	my ($self, $text) = @_;	1349	my ($self, $text) = @_;
1171		1350
		1351	return if $self->{text} eq "T$text";
		1352	$self->{text} = "T$text";
		1353
		1354	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1172	$self->{layout}->set_text ($text);	1355	$self->{layout}->set_text ($text);
1173		1356
1174	delete $self->{texture};	1357	$self->update;
1175	$self->check_size;	1358	$self->check_size;
1176	$self->update;
1177	}	1359	}
1178		1360
1179	sub set_markup {	1361	sub set_markup {
1180	my ($self, $markup) = @_;	1362	my ($self, $markup) = @_;
1181		1363
		1364	return if $self->{text} eq "M$markup";
		1365	$self->{text} = "M$markup";
		1366
		1367	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1368
		1369	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1182	$self->{layout}->set_markup ($markup);	1370	$self->{layout}->set_markup ($markup);
1183		1371
1184	delete $self->{texture};	1372	$self->update;
1185	$self->check_size;	1373	$self->check_size;
1186	$self->update;
1187	}	1374	}
1188		1375
1189	sub size_request {	1376	sub size_request {
1190	my ($self) = @_;	1377	my ($self) = @_;
1191		1378
1192	$self->{layout}->set_font ($self->{font}) if $self->{font};	1379	$self->{layout}->set_font ($self->{font}) if $self->{font};
1193	$self->{layout}->set_width ($self->{max_w} || -1);	1380	$self->{layout}->set_width ($self->{max_w} || -1);
		1381	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1382	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1194	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1383	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1195		1384
1196	my ($w, $h) = $self->{layout}->size;	1385	my ($w, $h) = $self->{layout}->size;
1197		1386
1198	if (exists $self->{template}) {	1387	if (exists $self->{template}) {
…		…
1220	sub set_fontsize {	1409	sub set_fontsize {
1221	my ($self, $fontsize) = @_;	1410	my ($self, $fontsize) = @_;
1222		1411
1223	$self->{fontsize} = $fontsize;	1412	$self->{fontsize} = $fontsize;
1224	delete $self->{texture};	1413	delete $self->{texture};
		1414
		1415	$self->update;
1225	$self->check_size;	1416	$self->check_size;
1226	$self->update;
1227	}	1417	}
1228		1418
1229	sub _draw {	1419	sub _draw {
1230	my ($self) = @_;	1420	my ($self) = @_;
1231		1421
		1422	$self->SUPER::_draw; # draw background, if applicable
		1423
1232	my $tex = $self->{texture} ||= do {	1424	my $tex = $self->{texture} ||= do {
		1425	$self->{layout}->set_foreground (@{$self->{fg}});
1233	$self->{layout}->set_font ($self->{font}) if $self->{font};	1426	$self->{layout}->set_font ($self->{font}) if $self->{font};
1234	$self->{layout}->set_width ($self->{w});	1427	$self->{layout}->set_width ($self->{w});
		1428	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1429	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1235	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1430	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1431
1236	new_from_layout CFClient::Texture $self->{layout}	1432	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1433
		1434	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1435	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1436	: ($self->{w} - $tex->{w}) * 0.5);
		1437
		1438	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1439	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1440	: ($self->{h} - $tex->{h}) * 0.5);
		1441
		1442	$tex
1237	};	1443	};
1238		1444
1239	glEnable GL_BLEND;
1240	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241	glEnable GL_TEXTURE_2D;	1445	glEnable GL_TEXTURE_2D;
1242	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1243		1447
		1448	if ($tex->{format} == GL_ALPHA) {
1244	glColor @{$self->{fg}};	1449	glColor @{$self->{fg}};
1245
1246	$self->{ox} = int (
1247	$self->{align} < 0 ? $self->{padding}
1248	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1249	: ($self->{w} - $tex->{w}) * 0.5
1250	);
1251
1252	$self->{oy} = int (
1253	$self->{valign} < 0 ? $self->{padding}
1254	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1255	: ($self->{h} - $tex->{h}) * 0.5
1256	);
1257
1258	$tex->draw_quad ($self->{ox}, $self->{oy});	1450	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1451	} else {
		1452	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1453	}
1259		1454
1260	glDisable GL_TEXTURE_2D;	1455	glDisable GL_TEXTURE_2D;
1261	glDisable GL_BLEND;
1262	}	1456	}
1263		1457
1264	#############################################################################	1458	#############################################################################
1265		1459
1266	package CFClient::UI::EntryBase;	1460	package CFClient::UI::EntryBase;
…		…
1271		1465
1272	sub new {	1466	sub new {
1273	my $class = shift;	1467	my $class = shift;
1274		1468
1275	$class->SUPER::new (	1469	$class->SUPER::new (
1276	fg => [1, 1, 1],	1470	fg => [1, 1, 1],
1277	bg => [0, 0, 0, 0.2],	1471	bg => [0, 0, 0, 0.2],
1278	active_bg => [1, 1, 1, 0.5],	1472	active_bg => [1, 1, 1, 0.5],
1279	active_fg => [0, 0, 0],	1473	active_fg => [0, 0, 0],
1280	can_hover => 1,	1474	can_hover => 1,
1281	can_focus => 1,	1475	can_focus => 1,
1282	valign => 0,	1476	valign => 0,
1283	can_events => 1,	1477	can_events => 1,
1284	@_	1478	@_
1285	)	1479	)
1286	}	1480	}
1287		1481
…		…
1301	$self->{layout}->set_text ("$text ");	1495	$self->{layout}->set_text ("$text ");
1302		1496
1303	$self->emit (changed => $self->{text});	1497	$self->emit (changed => $self->{text});
1304	}	1498	}
1305		1499
1306	sub get_text {
1307	$_[0]{text}
1308	}
1309
1310	sub size_request {
1311	my ($self) = @_;
1312
1313	my ($w, $h) = $self->SUPER::size_request;
1314
1315	($w + 1, $h) # add 1 for cursor
1316	}
1317
1318	sub size_allocate {
1319	my ($self, $w, $h) = @_;
1320
1321	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1322	}
1323
1324	sub set_text {	1500	sub set_text {
1325	my ($self, $text) = @_;	1501	my ($self, $text) = @_;
1326		1502
1327	$self->{cursor} = length $text;	1503	$self->{cursor} = length $text;
1328	$self->_set_text ($text);	1504	$self->_set_text ($text);
1329	$self->update;	1505	$self->update;
		1506	$self->check_size;
		1507	}
		1508
		1509	sub get_text {
		1510	$_[0]{text}
		1511	}
		1512
		1513	sub size_request {
		1514	my ($self) = @_;
		1515
		1516	my ($w, $h) = $self->SUPER::size_request;
		1517
		1518	($w + 1, $h) # add 1 for cursor
		1519	}
		1520
		1521	sub size_allocate {
		1522	my ($self, $w, $h) = @_;
		1523
		1524	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1330	}	1525	}
1331		1526
1332	sub key_down {	1527	sub key_down {
1333	my ($self, $ev) = @_;	1528	my ($self, $ev) = @_;
1334		1529
…		…
1336	my $sym = $ev->{sym};	1531	my $sym = $ev->{sym};
1337	my $uni = $ev->{unicode};	1532	my $uni = $ev->{unicode};
1338		1533
1339	my $text = $self->get_text;	1534	my $text = $self->get_text;
1340		1535
1341	if ($sym == 8) {	1536	if ($uni == 8) {
1342	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1537	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1343	} elsif ($sym == 127) {	1538	} elsif ($uni == 127) {
1344	substr $text, $self->{cursor}, 1, "";	1539	substr $text, $self->{cursor}, 1, "";
1345	} elsif ($sym == CFClient::SDLK_LEFT) {	1540	} elsif ($sym == CFClient::SDLK_LEFT) {
1346	--$self->{cursor} if $self->{cursor};	1541	--$self->{cursor} if $self->{cursor};
1347	} elsif ($sym == CFClient::SDLK_RIGHT) {	1542	} elsif ($sym == CFClient::SDLK_RIGHT) {
1348	++$self->{cursor} if $self->{cursor} < length $self->{text};	1543	++$self->{cursor} if $self->{cursor} < length $self->{text};
1349	} elsif ($sym == CFClient::SDLK_HOME) {	1544	} elsif ($sym == CFClient::SDLK_HOME) {
1350	$self->{cursor} = 0;	1545	$self->{cursor} = 0;
1351	} elsif ($sym == CFClient::SDLK_END) {	1546	} elsif ($sym == CFClient::SDLK_END) {
1352	$self->{cursor} = length $text;	1547	$self->{cursor} = length $text;
1353	} elsif ($sym == 27) {	1548	} elsif ($uni == 27) {
1354	$self->emit ('escape');	1549	$self->emit ('escape');
1355	} elsif ($uni) {	1550	} elsif ($uni) {
1356	substr $text, $self->{cursor}++, 0, chr $uni;	1551	substr $text, $self->{cursor}++, 0, chr $uni;
1357	}	1552	}
1358		1553
1359	$self->_set_text ($text);	1554	$self->_set_text ($text);
1360	$self->update;	1555	$self->update;
		1556	$self->check_size;
1361	}	1557	}
1362		1558
1363	sub focus_in {	1559	sub focus_in {
1364	my ($self) = @_;	1560	my ($self) = @_;
1365		1561
…		…
1441	my ($self, $ev) = @_;	1637	my ($self, $ev) = @_;
1442		1638
1443	my $sym = $ev->{sym};	1639	my $sym = $ev->{sym};
1444		1640
1445	if ($sym == 13) {	1641	if ($sym == 13) {
		1642	unshift @{$self->{history}},
		1643	my $txt = $self->get_text;
		1644	$self->{history_pointer} = -1;
		1645	$self->{history_saveback} = '';
1446	$self->emit (activate => $self->get_text);	1646	$self->emit (activate => $txt);
1447	$self->update;	1647	$self->update;
		1648
		1649	} elsif ($sym == CFClient::SDLK_UP) {
		1650	if ($self->{history_pointer} < 0) {
		1651	$self->{history_saveback} = $self->get_text;
		1652	}
		1653	if (@{$self->{history} || []} > 0) {
		1654	$self->{history_pointer}++;
		1655	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1656	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1657	}
		1658	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1659	}
		1660
		1661	} elsif ($sym == CFClient::SDLK_DOWN) {
		1662	$self->{history_pointer}--;
		1663	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1664
		1665	if ($self->{history_pointer} >= 0) {
		1666	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1667	} else {
		1668	$self->set_text ($self->{history_saveback});
		1669	}
1448		1670
1449	} else {	1671	} else {
1450	$self->SUPER::key_down ($ev);	1672	$self->SUPER::key_down ($ev);
1451	}	1673	}
1452		1674
…		…
1466		1688
1467	sub new {	1689	sub new {
1468	my $class = shift;	1690	my $class = shift;
1469		1691
1470	$class->SUPER::new (	1692	$class->SUPER::new (
1471	padding => 4,	1693	padding => 4,
1472	fg => [1, 1, 1],	1694	fg => [1, 1, 1],
1473	bg => [1, 1, 1, 0.2],
1474	active_fg => [0, 0, 1],	1695	active_fg => [0, 0, 1],
1475	can_hover => 1,	1696	can_hover => 1,
1476	align => 0,	1697	align => 0,
1477	valign => 0,	1698	valign => 0,
1478	can_events => 1,	1699	can_events => 1,
1479	@_	1700	@_
1480	)	1701	)
1481	}	1702	}
1482		1703
…		…
1496		1717
1497	if ($GRAB == $self) {	1718	if ($GRAB == $self) {
1498	$self->{fg} = $self->{active_fg};	1719	$self->{fg} = $self->{active_fg};
1499	}	1720	}
1500		1721
1501	glEnable GL_BLEND;
1502	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1503	glEnable GL_TEXTURE_2D;	1722	glEnable GL_TEXTURE_2D;
1504	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1723	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1505	glColor 0, 0, 0, 1;	1724	glColor 0, 0, 0, 1;
1506		1725
1507	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1726	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1508		1727
1509	glDisable GL_TEXTURE_2D;	1728	glDisable GL_TEXTURE_2D;
1510	glDisable GL_BLEND;
1511		1729
1512	$self->SUPER::_draw;	1730	$self->SUPER::_draw;
1513	}	1731	}
1514		1732
1515	#############################################################################	1733	#############################################################################
…		…
1529		1747
1530	$class->SUPER::new (	1748	$class->SUPER::new (
1531	padding => 2,	1749	padding => 2,
1532	fg => [1, 1, 1],	1750	fg => [1, 1, 1],
1533	active_fg => [1, 1, 0],	1751	active_fg => [1, 1, 0],
		1752	bg => [0, 0, 0, 0.2],
		1753	active_bg => [1, 1, 1, 0.5],
1534	state => 0,	1754	state => 0,
1535	can_hover => 1,	1755	can_hover => 1,
1536	@_	1756	@_
1537	)	1757	)
1538	}	1758	}
…		…
1562		1782
1563	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1783	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1564		1784
1565	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1785	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1566		1786
1567	glEnable GL_BLEND;	1787	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1788
1568	glEnable GL_TEXTURE_2D;	1789	glEnable GL_TEXTURE_2D;
1569	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1570
1571	my $tex = $self->{state} ? $tex[1] : $tex[0];
1572
1573	$tex->draw_quad (0, 0, $s, $s);	1790	$tex->draw_quad_alpha (0, 0, $s, $s);
1574
1575	glDisable GL_TEXTURE_2D;	1791	glDisable GL_TEXTURE_2D;
1576	glDisable GL_BLEND;
1577	}	1792	}
1578		1793
1579	#############################################################################	1794	#############################################################################
1580		1795
1581	package CFClient::UI::Image;	1796	package CFClient::UI::Image;
…		…
1624	glTranslate 0, -$self->{w}, 0;	1839	glTranslate 0, -$self->{w}, 0;
1625		1840
1626	($w, $h) = ($h, $w);	1841	($w, $h) = ($h, $w);
1627	}	1842	}
1628		1843
1629	glEnable GL_BLEND;
1630	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1631	glEnable GL_TEXTURE_2D;	1844	glEnable GL_TEXTURE_2D;
1632	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1845	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1633		1846
1634	$tex->draw_quad (0, 0, $w, $h);	1847	$tex->draw_quad_alpha (0, 0, $w, $h);
1635		1848
1636	glDisable GL_BLEND;
1637	glDisable GL_TEXTURE_2D;	1849	glDisable GL_TEXTURE_2D;
1638	}	1850	}
1639		1851
1640	#############################################################################	1852	#############################################################################
1641		1853
…		…
1689	}	1901	}
1690		1902
1691	sub set_max {	1903	sub set_max {
1692	my ($self, $max) = @_;	1904	my ($self, $max) = @_;
1693		1905
		1906	return if $self->{max_val} == $max;
		1907
1694	$self->{max_val} = $max;	1908	$self->{max_val} = $max;
		1909	$self->update;
1695	}	1910	}
1696		1911
1697	sub set_value {	1912	sub set_value {
1698	my ($self, $val, $max) = @_;	1913	my ($self, $val, $max) = @_;
1699		1914
1700	$self->set_max ($max)	1915	$self->set_max ($max)
1701	if defined $max;	1916	if defined $max;
1702		1917
1703	$max = $self->{max_val};	1918	return if $self->{val} == $val;
		1919
1704	$self->{val} = $val;	1920	$self->{val} = $val;
1705
1706	$self->update;	1921	$self->update;
1707	}	1922	}
1708		1923
1709	sub _draw {	1924	sub _draw {
1710	my ($self) = @_;	1925	my ($self) = @_;
…		…
1773		1988
1774	sub new {	1989	sub new {
1775	my ($class, %arg) = @_;	1990	my ($class, %arg) = @_;
1776		1991
1777	my $self = $class->SUPER::new (	1992	my $self = $class->SUPER::new (
1778	tooltip => $arg{type},	1993	tooltip => $arg{type},
		1994	can_hover => 1,
1779	can_events => 1,	1995	can_events => 1,
1780	can_hover => 1,
1781	%arg,	1996	%arg,
1782	);	1997	);
1783		1998
1784	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	1999	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1785	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2000	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
…		…
1793		2008
1794	$self->{value}->set_fontsize ($fsize);	2009	$self->{value}->set_fontsize ($fsize);
1795	$self->{max} ->set_fontsize ($fsize);	2010	$self->{max} ->set_fontsize ($fsize);
1796	}	2011	}
1797		2012
		2013	sub set_max {
		2014	my ($self, $max) = @_;
		2015
		2016	$self->{gauge}->set_max ($max);
		2017	$self->{max}->set_text ($max);
		2018	}
		2019
1798	sub set_value {	2020	sub set_value {
1799	my ($self, $val, $max) = @_;	2021	my ($self, $val, $max) = @_;
1800		2022
1801	$self->set_max ($max)	2023	$self->set_max ($max)
1802	if defined $max;	2024	if defined $max;
1803		2025
1804	$self->{gauge}->set_value ($val, $max);	2026	$self->{gauge}->set_value ($val, $max);
1805	$self->{value}->set_text ($val);	2027	$self->{value}->set_text ($val);
1806	}
1807
1808	sub set_max {
1809	my ($self, $max) = @_;
1810
1811	$self->{gauge}->set_max ($max);
1812	$self->{max}->set_text ($max);
1813	}	2028	}
1814		2029
1815	#############################################################################	2030	#############################################################################
1816		2031
1817	package CFClient::UI::Slider;	2032	package CFClient::UI::Slider;
…		…
1827	qw(s1_slider.png s1_slider_bg.png);	2042	qw(s1_slider.png s1_slider_bg.png);
1828		2043
1829	sub new {	2044	sub new {
1830	my $class = shift;	2045	my $class = shift;
1831		2046
1832	# range [value, low, high, page]	2047	# range [value, low, high, page, unit]
1833		2048
1834	# TODO: 0-width page	2049	# TODO: 0-width page
1835	# TODO: req_w/h are wrong with vertical	2050	# TODO: req_w/h are wrong with vertical
1836	# TODO: calculations are off	2051	# TODO: calculations are off
1837	my $self = $class->SUPER::new (	2052	my $self = $class->SUPER::new (
1838	fg => [1, 1, 1],	2053	fg => [1, 1, 1],
1839	active_fg => [0, 0, 0],	2054	active_fg => [0, 0, 0],
		2055	bg => [0, 0, 0, 0.2],
		2056	active_bg => [1, 1, 1, 0.5],
1840	range => [0, 0, 100, 10],	2057	range => [0, 0, 100, 10],
1841	req_w => 20,	2058	req_w => $::WIDTH / 80,
1842	req_h => 20,	2059	req_h => $::WIDTH / 80,
1843	vertical => 0,	2060	vertical => 0,
1844	can_hover => 1,	2061	can_hover => 1,
1845	inner_pad => 5,	2062	inner_pad => .05,
1846	@_	2063	@_
1847	);	2064	);
1848		2065
		2066	$self->set_value ($self->{range}[0]);
		2067	$self->update;
		2068
1849	$self	2069	$self
		2070	}
		2071
		2072	sub set_value {
		2073	my ($self, $value) = @_;
		2074
		2075	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2076
		2077	$hi = $lo + 1 if $hi <= $lo;
		2078
		2079	$value = $lo if $value < $lo;
		2080	$value = $hi if $value > $hi;
		2081
		2082	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2083	if $unit;
		2084
		2085	$page = $hi - $lo if $page > $hi - $lo;
		2086
		2087	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2088
		2089	if ($value != $old_value) {
		2090	$self->emit (changed => $value);
		2091	$self->update;
		2092	}
1850	}	2093	}
1851		2094
1852	sub size_request {	2095	sub size_request {
1853	my ($self) = @_;	2096	my ($self) = @_;
1854		2097
…		…
1867		2110
1868	sub mouse_motion {	2111	sub mouse_motion {
1869	my ($self, $ev, $x, $y) = @_;	2112	my ($self, $ev, $x, $y) = @_;
1870		2113
1871	if ($GRAB == $self) {	2114	if ($GRAB == $self) {
		2115	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2116
		2117	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2118
		2119	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2120
		2121	$self->set_value ($x * ($hi - $lo) + $lo);
		2122	}
		2123	}
		2124
		2125	sub update {
		2126	my ($self) = @_;
		2127
		2128	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2129	$self->set_value ($self->{range}[0]);
		2130
1872	my ($value, $lo, $hi, $page) = @{$self->{range}};	2131	my ($value, $lo, $hi, $page) = @{$self->{range}};
1873		2132
1874	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2133	my $inner_w = 1 - 2 * $self->{inner_pad};
1875		2134
1876	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2135	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1877	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1878		2136
1879	$x -= $inner_pad_px; # substract the padding	2137	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1880	$x = $x * ($hi - $lo) / $inner_w + $lo;	2138	$value = $self->{scale} * ($value - $lo);
1881	$x = $lo if $x < $lo;
1882	$x = $hi - $page if $x > $hi - $page;
1883	$self->{range}[0] = $x;
1884		2139
1885	$self->emit (changed => $x);	2140	$value = $self->{inner_pad} + ($value - $page * 0.5);
1886	$self->update;	2141
		2142	$value = 0 if $value < 0;
		2143	$page = 1 - $value if $value + $page > 1;
		2144
		2145	$self->{knob_x} = $value;
		2146	$self->{knob_w} = $page;
1887	}	2147	});
1888	}
1889		2148
1890	# the inner_* stuff is for generating a padding for the slider handle,	2149	$self->SUPER::update;
1891	# so that the handle doesn't leave the texture. This calculation isn't 100%
1892	# correct propably, but it does the job for now
1893	sub _calc_inner_pad_px {
1894	my ($self, $w) = @_;
1895	($w / 100) * $self->{inner_pad} # % to pixels
1896	}	2150	}
1897		2151
1898	sub _draw {	2152	sub _draw {
1899	my ($self) = @_;	2153	my ($self) = @_;
1900		2154
1901	$self->SUPER::_draw ();	2155	$self->SUPER::_draw ();
1902		2156
1903	my ($w, $h) = @$self{qw(w h)};	2157	glScale $self->{w}, $self->{h};
1904		2158
1905	if ($self->{vertical}) {	2159	if ($self->{vertical}) {
1906	# draw a vertical slider like a rotated horizontal slider	2160	# draw a vertical slider like a rotated horizontal slider
1907		2161
1908	glRotate 90, 0, 0, 1;	2162	glRotate 90, 0, 0, 1;
1909	glTranslate 0, -$self->{w}, 0;	2163	glTranslate 0, 1, 0;
1910
1911	($w, $h) = ($h, $w);
1912	}	2164	}
1913		2165
1914	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2166	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1915	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2167	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1916		2168
1917	my ($value, $lo, $hi, $page) = @{$self->{range}};
1918
1919	$hi = $value + 1 if $lo == $hi;
1920
1921	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1922	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1923
1924	$page = int $page * $inner_w / ($hi - $lo);
1925	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1926
1927	$w -= $page;
1928	$page &= ~1;
1929	glTranslate $page * 0.5, 0, 0;
1930	$page ||= 2;
1931
1932	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1933	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1934
1935	glEnable GL_BLEND;
1936	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1937	glEnable GL_TEXTURE_2D;	2169	glEnable GL_TEXTURE_2D;
1938	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2170	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939		2171
1940	# draw background	2172	# draw background
1941	$tex[1]->draw_quad (0, 0, $w, $h);	2173	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
1942		2174
1943	# draw handle	2175	# draw handle
1944	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2176	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1945		2177
1946	glDisable GL_BLEND;
1947	glDisable GL_TEXTURE_2D;	2178	glDisable GL_TEXTURE_2D;
1948	}	2179	}
1949		2180
1950	#############################################################################	2181	#############################################################################
1951		2182
…		…
1957		2188
1958	sub new {	2189	sub new {
1959	my $class = shift;	2190	my $class = shift;
1960		2191
1961	my $self = $class->SUPER::new (	2192	my $self = $class->SUPER::new (
1962	fontsize => 1,	2193	fontsize => 1,
		2194	can_events => 0,
1963	#font => default_font	2195	#font => default_font
1964	@_,	2196	@_,
1965		2197
1966	layout => (new CFClient::Layout),	2198	layout => (new CFClient::Layout 1),
1967	par => [],	2199	par => [],
1968	height => 0,	2200	height => 0,
1969	children => [	2201	children => [
1970	(new CFClient::UI::Empty expand => 1),	2202	(new CFClient::UI::Empty expand => 1),
1971	(new CFClient::UI::Slider vertical => 1),	2203	(new CFClient::UI::Slider vertical => 1),
1972	],	2204	],
1973	);	2205	);
1974		2206
1975	$self->{children}[1]->connect (changed => sub {	2207	$self->{children}[1]->connect (changed => sub { $self->update });
1976	$self->update;
1977	});
1978		2208
1979	$self	2209	$self
1980	}	2210	}
1981		2211
1982	sub set_fontsize {	2212	sub set_fontsize {
…		…
1990	my ($self, $text) = @_;	2220	my ($self, $text) = @_;
1991		2221
1992	my $layout = $self->{layout};	2222	my $layout = $self->{layout};
1993		2223
1994	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2224	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1995	$layout->set_width ($self->{w});	2225	$layout->set_width ($self->{children}[0]{w});
1996	$layout->set_text ($text);	2226	$layout->set_markup ($text);
1997		2227
1998	($layout->size)[1]	2228	($layout->size)[1]
1999	}	2229	}
2000		2230
2001	sub reflow {	2231	sub reflow {
…		…
2039		2269
2040	return unless $self->{h} > 0;	2270	return unless $self->{h} > 0;
2041		2271
2042	delete $self->{texture};	2272	delete $self->{texture};
2043		2273
2044	$ROOT->on_refresh ($self, sub {	2274	$ROOT->on_post_alloc ($self, sub {
2045	if (delete $self->{need_reflow}) {	2275	if (delete $self->{need_reflow}) {
2046	my $height = 0;	2276	my $height = 0;
2047		2277
2048	$height += $_->[0] = $self->text_height ($_->[2])	2278	$height += $_->[0] = $self->text_height ($_->[2])
2049	for @{$self->{par}};	2279	for @{$self->{par}};
…		…
2053	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2283	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2054		2284
2055	delete $self->{texture};	2285	delete $self->{texture};
2056	}	2286	}
2057		2287
2058	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2288	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2059	glClearColor 0, 0, 0, 1;	2289	glClearColor 0, 0, 0, 0;
2060	glClear GL_COLOR_BUFFER_BIT;	2290	glClear GL_COLOR_BUFFER_BIT;
2061		2291
2062	glEnable GL_BLEND;
2063	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2064	glEnable GL_TEXTURE_2D;	2292	glEnable GL_TEXTURE_2D;
2065	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2293	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2066		2294
2067	my $top = int $self->{children}[1]{range}[0];	2295	my $top = int $self->{children}[1]{range}[0];
2068		2296
…		…
2077		2305
2078	for my $par (@{$self->{par}}) {	2306	for my $par (@{$self->{par}}) {
2079	my $h = $par->[0];	2307	my $h = $par->[0];
2080		2308
2081	if ($y0 < $y + $h && $y < $y1) {	2309	if ($y0 < $y + $h && $y < $y1) {
		2310	$layout->set_foreground (@{ $par->[1] });
2082	$layout->set_text ($par->[2]);	2311	$layout->set_markup ($par->[2]);
2083		2312
2084	glColor @{ $par->[1] };
2085	my ($W, $H) = $layout->size;	2313	my ($W, $H) = $layout->size;
2086	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2314	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2087	}	2315	}
2088		2316
2089	$y += $h;	2317	$y += $h;
2090	}	2318	}
2091		2319
2092	glDisable GL_TEXTURE_2D;	2320	glDisable GL_TEXTURE_2D;
2093	glDisable GL_BLEND;
2094	};	2321	};
2095	});	2322	});
2096	}	2323	}
2097		2324
2098	sub _draw {	2325	sub _draw {
2099	my ($self) = @_;	2326	my ($self) = @_;
2100		2327
2101	if ($self->{texture}) {
2102	glEnable GL_TEXTURE_2D;	2328	glEnable GL_TEXTURE_2D;
2103	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2329	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2104	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2330	glColor 1, 1, 1, 1;
		2331	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2105	glDisable GL_TEXTURE_2D;	2332	glDisable GL_TEXTURE_2D;
2106	}
2107		2333
2108	$self->{children}[1]->draw;	2334	$self->{children}[1]->draw;
2109		2335
2110	}	2336	}
2111		2337
…		…
2159		2385
2160	sub new {	2386	sub new {
2161	my $class = shift;	2387	my $class = shift;
2162		2388
2163	my $self = $class->SUPER::new (	2389	my $self = $class->SUPER::new (
2164	state => 0,	2390	state => 0,
2165	connect_activate => \&toggle_flopper,	2391	connect_activate => \&toggle_flopper,
2166	can_events => 1,
2167	@_	2392	@_
2168	);	2393	);
2169		2394
2170	if ($self->{state}) {	2395	if ($self->{state}) {
2171	$self->{state} = 0;	2396	$self->{state} = 0;
…		…
2206	@_,	2431	@_,
2207	can_events => 0,	2432	can_events => 0,
2208	)	2433	)
2209	}	2434	}
2210		2435
2211	sub set_markup {	2436	sub set_tooltip_from {
2212	my ($self, $text) = @_;	2437	my ($self, $widget) = @_;
2213		2438
2214	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2439	$self->add (new CFClient::UI::Label
2215	$self->{label}->set_markup ($text);	2440	markup => $widget->{tooltip},
2216	$self->add ($self->{label});	2441	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2442	fontsize => 0.8,
		2443	fg => [0, 0, 0, 1],
		2444	ellipsise => 0,
		2445	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2446	);
2217	}	2447	}
2218		2448
2219	sub size_request {	2449	sub size_request {
2220	my ($self) = @_;	2450	my ($self) = @_;
2221
2222	$self->child->set_max_size ($::WIDTH * 0.3);
2223		2451
2224	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2452	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2225		2453
2226	($w + 4, $h + 4)	2454	($w + 4, $h + 4)
2227	}	2455	}
…		…
2233	}	2461	}
2234		2462
2235	sub _draw {	2463	sub _draw {
2236	my ($self) = @_;	2464	my ($self) = @_;
2237		2465
2238	glPushMatrix;
2239	glTranslate 0.375, 0.375;	2466	glTranslate 0.375, 0.375;
2240		2467
2241	my ($w, $h) = @$self{qw(w h)};	2468	my ($w, $h) = @$self{qw(w h)};
2242		2469
2243	glColor 1, 0.8, 0.4;	2470	glColor 1, 0.8, 0.4;
…		…
2254	glVertex 0 , $h;	2481	glVertex 0 , $h;
2255	glVertex $w, $h;	2482	glVertex $w, $h;
2256	glVertex $w, 0;	2483	glVertex $w, 0;
2257	glEnd;	2484	glEnd;
2258		2485
2259	glPopMatrix;	2486	glTranslate 2 - 0.375, 2 - 0.375;
2260
2261	glTranslate 2, 2;
2262	$self->SUPER::_draw;	2487	$self->SUPER::_draw;
2263	}	2488	}
2264		2489
2265	#############################################################################	2490	#############################################################################
2266		2491
…		…
2281		2506
2282	sub size_request {	2507	sub size_request {
2283	(32, 8)	2508	(32, 8)
2284	}	2509	}
2285		2510
2286	sub draw {	2511	sub _draw {
2287	my ($self) = @_;	2512	my ($self) = @_;
2288		2513
		2514	return unless $::CONN;#d# manage and cache textures differently
2289	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2515	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2290		2516
		2517	# TODO animation
2291	if ($tex) {	2518	if ($tex) {
2292	glEnable GL_BLEND;
2293	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294	glEnable GL_TEXTURE_2D;	2519	glEnable GL_TEXTURE_2D;
2295	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296	glColor 1, 1, 1, 1;	2521	glColor 1, 1, 1, 1;
2297	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2522	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2298	glDisable GL_TEXTURE_2D;	2523	glDisable GL_TEXTURE_2D;
2299	glDisable GL_BLEND;	2524	}
		2525	}
		2526
		2527	#############################################################################
		2528
		2529	package CFClient::UI::InventoryItem;
		2530
		2531	our @ISA = CFClient::UI::HBox::;
		2532
		2533	sub _item_to_desc {
		2534	my ($item) = @_;
		2535
		2536	my $desc =
		2537	$item->{nrof} < 2
		2538	? $item->{name}
		2539	: "$item->{nrof} $item->{name_pl}";
		2540
		2541	$item->{flags} & Crossfire::Protocol::F_OPEN
		2542	and $desc .= " (open)";
		2543	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2544	and $desc .= " (applied)";
		2545	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2546	and $desc .= " (unpaid)";
		2547	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2548	and $desc .= " (magic)";
		2549	$item->{flags} & Crossfire::Protocol::F_CURSED
		2550	and $desc .= " (cursed)";
		2551	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2552	and $desc .= " (damned)";
		2553	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2554	and $desc .= " *";
		2555
		2556	$desc
		2557	}
		2558
		2559	sub new {
		2560	my $class = shift;
		2561
		2562	my %args = @_;
		2563
		2564	my $item = delete $args{item};
		2565
		2566	my $desc = _item_to_desc ($item);
		2567
		2568	my $self = $class->SUPER::new (
		2569	can_hover => 1,
		2570	can_events => 1,
		2571	tooltip => ((CFClient::UI::Label::escape $desc)
		2572	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2573	connect_button_down => sub {
		2574	my ($self, $ev, $x, $y) = @_;
		2575
		2576	# todo: maybe put examine on 1? but should just be a tooltip :(
		2577	if ($ev->{button} == 1) {
		2578	my $targ = $::CONN->{player}{tag};
		2579
		2580	if ($item->{container} == $::CONN->{player}{tag}) {
		2581	$targ = $main::OPENCONT;
		2582	}
		2583
		2584	$::CONN->send ("move $targ $item->{tag} 0");
		2585	} elsif ($ev->{button} == 2) {
		2586	$::CONN->send ("apply $item->{tag}");
		2587	} elsif ($ev->{button} == 3) {
		2588	my @menu_items = (
		2589	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2590	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2591	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2592	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2593	[
		2594	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2595	sub { $::CONN->send ("lock $item->{tag}") },
		2596	],
		2597	);
		2598
		2599	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2600	}
		2601
		2602	1
		2603	},
		2604	%args
		2605	);
		2606
		2607
		2608	$self->add (new CFClient::UI::Face
		2609	can_events => 0,
		2610	face => $item->{face},
		2611	anim => $item->{anim},
		2612	animspeed => $item->{animspeed},
		2613	);
		2614
		2615	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2616
		2617	$self->{item} = $item;
		2618
		2619	$self->update_item;
		2620
		2621	$self
		2622	}
		2623
		2624	sub update_item {
		2625	my ($self) = @_;
		2626
		2627	my $desc = _item_to_desc ($self->{item});
		2628
		2629	$self->{name_lbl}->set_text ($desc);
		2630	}
		2631
		2632	#############################################################################
		2633
		2634	package CFClient::UI::Inventory;
		2635
		2636	our @ISA = CFClient::UI::ScrolledWindow::;
		2637
		2638	sub new {
		2639	my $class = shift;
		2640
		2641	my $self = $class->SUPER::new (
		2642	scrolled => (new CFClient::UI::VBox),
		2643	@_,
		2644	);
		2645
		2646	$self
		2647	}
		2648
		2649	sub set_items {
		2650	my ($self, $items) = @_;
		2651
		2652	$self->{scrolled}->clear;
		2653	return unless $items;
		2654
		2655	my @items = sort {
		2656	($a->{type} <=> $b->{type})
		2657	or ($a->{name} cmp $b->{name})
		2658	} @$items;
		2659
		2660	$self->{real_items} = \@items;
		2661
		2662	for my $item (@items) {
		2663	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2664	$item->update_item ();
		2665	}
		2666
		2667	$self->{scrolled}->add (@items);
		2668
		2669	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2670	}
		2671
		2672	sub size_request {
		2673	my ($self) = @_;
		2674	($self->{req_w}, $self->{req_h});
		2675	}
		2676
		2677	#############################################################################
		2678
		2679	package CFClient::UI::Menu;
		2680
		2681	our @ISA = CFClient::UI::FancyFrame::;
		2682
		2683	use CFClient::OpenGL;
		2684
		2685	sub new {
		2686	my $class = shift;
		2687
		2688	my $self = $class->SUPER::new (
		2689	items => [],
		2690	z => 100,
		2691	@_,
		2692	);
		2693
		2694	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2695
		2696	for my $item (@{ $self->{items} }) {
		2697	my ($widget, $cb) = @$item;
		2698
		2699	# handle various types of items, only text for now
		2700	if (!ref $widget) {
		2701	$widget = new CFClient::UI::Label
		2702	can_hover => 1,
		2703	can_events => 1,
		2704	text => $widget;
		2705	}
		2706
		2707	$self->{item}{$widget} = $item;
		2708
		2709	$self->{vbox}->add ($widget);
		2710	}
		2711
		2712	$self
		2713	}
		2714
		2715	# popup given the event (must be a mouse button down event currently)
		2716	sub popup {
		2717	my ($self, $ev) = @_;
		2718
		2719	$self->emit ("popdown");
		2720
		2721	# maybe save $GRAB? must be careful about events...
		2722	$GRAB = $self;
		2723	$self->{button} = $ev->{button};
		2724
		2725	$self->show;
		2726	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2727	}
		2728
		2729	sub mouse_motion {
		2730	my ($self, $ev, $x, $y) = @_;
		2731
		2732	# TODO: should use vbox->find_widget or so
		2733	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2734	$self->{hover} = $self->{item}{$HOVER};
		2735	}
		2736
		2737	sub button_up {
		2738	my ($self, $ev, $x, $y) = @_;
		2739
		2740	if ($ev->{button} == $self->{button}) {
		2741	undef $GRAB;
		2742	$self->hide;
		2743
		2744	$self->emit ("popdown");
		2745	$self->{hover}[1]->() if $self->{hover};
		2746	}
		2747	}
		2748
		2749	#############################################################################
		2750
		2751	package CFClient::UI::Statusbox;
		2752
		2753	our @ISA = CFClient::UI::VBox::;
		2754
		2755	sub new {
		2756	my $class = shift;
		2757
		2758	$class->SUPER::new (
		2759	fontsize => 0.8,
		2760	@_,
2300	}	2761	)
		2762	}
		2763
		2764	sub reorder {
		2765	my ($self) = @_;
		2766	my $NOW = time;
		2767
		2768	while (my ($k, $v) = each %{ $self->{item} }) {
		2769	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2770	}
		2771
		2772	my @widgets;
		2773
		2774	my @items = sort {
		2775	$a->{pri} <=> $b->{pri}
		2776	or $b->{id} <=> $a->{id}
		2777	} values %{ $self->{item} };
		2778
		2779	my $count = 10 + 1;
		2780	for my $item (@items) {
		2781	last unless --$count;
		2782
		2783	push @widgets, $item->{label} ||= do {
		2784	# TODO: doesn't handle markup well (read as: at all)
		2785	my $short = $item->{count} > 1
		2786	? "<b>$item->{count} ×</b> $item->{text}"
		2787	: $item->{text};
		2788
		2789	for ($short) {
		2790	s/^\s+//;
		2791	s/\s+/ /g;
		2792	}
		2793
		2794	new CFClient::UI::Label
		2795	markup => $short,
		2796	tooltip => $item->{tooltip},
		2797	tooltip_font => $::FONT_PROP,
		2798	tooltip_width => 0.67,
		2799	fontsize => $item->{fontsize} || $self->{fontsize},
		2800	max_w => $::WIDTH * 0.44,
		2801	fg => $item->{fg},
		2802	can_events => 1,
		2803	can_hover => 1
		2804	};
		2805	}
		2806
		2807	$self->clear;
		2808	$self->SUPER::add (reverse @widgets);
		2809	}
		2810
		2811	sub add {
		2812	my ($self, $text, %arg) = @_;
		2813
		2814	$text =~ s/^\s+//;
		2815	$text =~ s/\s+$//;
		2816
		2817	my $timeout = time + ((delete $arg{timeout}) || 60);
		2818
		2819	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2820
		2821	if (my $item = $self->{item}{$group}) {
		2822	if ($item->{text} eq $text) {
		2823	$item->{count}++;
		2824	} else {
		2825	$item->{count} = 1;
		2826	$item->{text} = $item->{tooltip} = $text;
		2827	}
		2828	$item->{id} = ++$self->{id};
		2829	$item->{timeout} = $timeout;
		2830	delete $item->{label};
		2831	} else {
		2832	$self->{item}{$group} = {
		2833	id => ++$self->{id},
		2834	text => $text,
		2835	timeout => $timeout,
		2836	tooltip => $text,
		2837	fg => [0.8, 0.8, 0.8, 0.8],
		2838	pri => 0,
		2839	count => 1,
		2840	%arg,
		2841	};
		2842	}
		2843
		2844	$self->reorder;
		2845	}
		2846
		2847	sub reconfigure {
		2848	my ($self) = @_;
		2849
		2850	delete $_->{label}
		2851	for values %{ $self->{item} || {} };
		2852
		2853	$self->reorder;
		2854	$self->SUPER::reconfigure;
2301	}	2855	}
2302		2856
2303	#############################################################################	2857	#############################################################################
2304		2858
2305	package CFClient::UI::Root;	2859	package CFClient::UI::Root;
2306		2860
2307	our @ISA = CFClient::UI::Container::;	2861	our @ISA = CFClient::UI::Container::;
2308		2862
2309	use CFClient::OpenGL;	2863	use CFClient::OpenGL;
2310		2864
2311	sub check_size {	2865	sub new {
2312	my ($self) = @_;	2866	my $class = shift;
2313		2867
2314	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2868	$class->SUPER::new (
2315	}	2869	@_,
2316		2870	)
2317	sub size_request {
2318	($::WIDTH, $::HEIGHT)
2319	}	2871	}
2320		2872
2321	sub configure {	2873	sub configure {
2322	my ($self, $x, $y, $w, $h) = @_;	2874	my ($self, $x, $y, $w, $h) = @_;
2323		2875
2324	$self->SUPER::configure ($x, $y, $w, $h);	2876	$self->{w} = $w;
		2877	$self->{h} = $h;
		2878	}
2325		2879
		2880	sub check_size {
		2881	my ($self) = @_;
		2882
		2883	$self->size_allocate ($self->{w}, $self->{h})
		2884	if $self->{w};
		2885	}
		2886
		2887	sub size_request {
		2888	my ($self) = @_;
		2889
		2890	($self->{w}, $self->{h})
		2891	}
		2892
		2893	sub size_allocate {
		2894	my ($self, $w, $h) = @_;
		2895
		2896	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2897	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2898
		2899	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2900	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2901
2326	for my $child (@{$self->{children}}) {	2902	for my $child ($self->children) {
2327	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2903	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2328		2904
		2905	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2906	if exists $child->{req_x};
		2907
		2908	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2909	if exists $child->{req_y};
		2910
2329	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2911	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2330	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2912	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2913
2331	$child->configure ($X, $Y, $W,$H);	2914	$child->configure ($X, $Y, $W, $H);
2332	}	2915	}
2333	}	2916	}
2334		2917
2335	sub _topleft {	2918	sub coord2local {
2336	my ($self, $x, $y) = @_;	2919	my ($self, $x, $y) = @_;
2337		2920
2338	($x, $y)	2921	($x, $y)
2339	}	2922	}
2340		2923
		2924	sub coord2global {
		2925	my ($self, $x, $y) = @_;
		2926
		2927	($x, $y)
		2928	}
		2929
2341	sub update {	2930	sub update {
2342	my ($self) = @_;	2931	my ($self) = @_;
2343		2932
2344	$self->check_size;	2933	$self->check_size;
2345	::refresh ();	2934	$::WANT_REFRESH++;
2346	}	2935	}
2347		2936
2348	sub add {	2937	sub add {
2349	my ($self, $child) = @_;	2938	my ($self, @children) = @_;
2350		2939
		2940	for my $child (@children) {
		2941	$child->{toplevel} = 1;
		2942
2351	# integerize window positions	2943	# integerise window positions
2352	$child->{x} = int $child->{x};	2944	$child->{x} = int $child->{x};
2353	$child->{y} = int $child->{y};	2945	$child->{y} = int $child->{y};
		2946	}
2354		2947
2355	$self->SUPER::add ($child);	2948	$self->SUPER::add (@children);
2356	}	2949	}
2357		2950
2358	sub on_refresh {	2951	sub on_refresh {
2359	my ($self, $id, $cb) = @_;	2952	my ($self, $id, $cb) = @_;
2360		2953
2361	$self->{refresh_hook}{$id} = $cb;	2954	$self->{refresh_hook}{$id} = $cb;
2362	}	2955	}
2363		2956
		2957	sub on_post_alloc {
		2958	my ($self, $id, $cb) = @_;
		2959
		2960	$self->{post_alloc_hook}{$id} = $cb;
		2961	}
		2962
2364	sub draw {	2963	sub draw {
2365	my ($self) = @_;	2964	my ($self) = @_;
2366		2965
2367	while (my $rcb = delete $self->{refresh_hook}) {	2966	while ($self->{refresh_hook}) {
2368	$_->() for values %$rcb;	2967	$_->()
		2968	for values %{delete $self->{refresh_hook}};
		2969	}
		2970
		2971	if ($self->{check_size}) {
		2972	my @queue = ([], []);
		2973
		2974	for (;;) {
		2975	if ($self->{check_size}) {
		2976	# heuristic: check containers last
		2977	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2978	for values %{delete $self->{check_size}}
		2979	}
		2980
		2981	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		2982
		2983	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2984	? @$widget{qw(user_w user_h)}
		2985	: $widget->size_request;
		2986
		2987	if (delete $widget->{force_alloc}
		2988	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		2989	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		2990
		2991	$widget->{req_w} = $w;
		2992	$widget->{req_h} = $h;
		2993
		2994	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		2995
		2996	$widget->{parent}->check_size
		2997	if $widget->{parent};
		2998	}
		2999	}
		3000	}
		3001
		3002	while ($self->{size_alloc}) {
		3003	for (values %{delete $self->{size_alloc}}) {
		3004	my ($widget, $w, $h) = @$_;
		3005
		3006	$w = 0 if $w < 0;
		3007	$h = 0 if $h < 0;
		3008
		3009	$widget->{w} = $w;
		3010	$widget->{h} = $h;
		3011	$widget->size_allocate ($w, $h);
		3012	$widget->emit (size_allocate => $w, $h);
		3013	}
		3014	}
		3015
		3016	while ($self->{post_alloc_hook}) {
		3017	$_->()
		3018	for values %{delete $self->{post_alloc_hook}};
2369	}	3019	}
2370		3020
2371	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3021	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2372	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3022	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2373	glClear GL_COLOR_BUFFER_BIT;	3023	glClear GL_COLOR_BUFFER_BIT;
…		…
2384	#############################################################################	3034	#############################################################################
2385		3035
2386	package CFClient::UI;	3036	package CFClient::UI;
2387		3037
2388	$ROOT = new CFClient::UI::Root;	3038	$ROOT = new CFClient::UI::Root;
2389	$TOOLTIP = new CFClient::UI::Tooltip;	3039	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2390		3040
2391	1	3041	1
2392		3042

Diff Legend

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