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.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.454 by root, Wed Dec 26 21:03:21 2007 UTC

1	package CFClient::UI;	1	package DC::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;
9		7
10	use CFClient;	8	use DC;
		9	use DC::Pod;
11	use CFClient::Texture;	10	use DC::Texture;
12		11
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		13
15	our $LAYOUT;	14	our $LAYOUT;
16	our $ROOT;	15	our $ROOT;
17	our $TOOLTIP;	16	our $TOOLTIP;
18	our $BUTTON_STATE;	17	our $BUTTON_STATE;
19		18
20	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
21		20
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	21	our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
		22	$_[0]->stop;
		23
23	if (!$GRAB) {	24	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
		28	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	29	$TOOLTIP->hide;
28		30
29	$TOOLTIP->{owner} = $widget;	31	$TOOLTIP->{owner} = $widget;
		32	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		33
31	return if $ENV{CFPLUS_DEBUG} & 8;	34	return if $ENV{CFPLUS_DEBUG} & 8;
32		35
33	my $tip = $widget->{tooltip};
34
35	$tip = $tip->($widget) if CODE:: eq ref $tip;
36
37	$TOOLTIP->set_tooltip_from ($widget);	36	$TOOLTIP->set_tooltip_from ($widget);
38	$TOOLTIP->show;	37	$TOOLTIP->show;
39	}	38	}
40		39
41	return;	40	return;
42	}	41	}
43	}	42	}
44	}	43	}
45		44
46	$TOOLTIP->hide;	45	$TOOLTIP->hide;
		46	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
48	});	48	};
49		49
50	sub get_layout {	50	sub get_layout {
51	my $layout;	51	my $layout;
52		52
53	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
79	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	80	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	81	if $FOCUS;
82	}	82	}
83		83
		84	sub check_hover {
		85	my ($widget) = @_;
		86
		87	if ($widget != $HOVER) {
		88	my $hover = $HOVER; $HOVER = $widget;
		89
		90	$hover->update if $hover && $hover->{can_hover};
		91	$HOVER->update if $HOVER && $HOVER->{can_hover};
		92
		93	$TOOLTIP_WATCHER->again;
		94	}
		95	}
		96
84	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	98	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	99	my ($x, $y) = ($ev->{x}, $ev->{y});
87		100
88	if (!$BUTTON_STATE) {	101	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		102
		103	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
90		105
91	$GRAB = $widget;	106	$GRAB = $widget;
92	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
93		108
94	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->invoke;
95	}	110	}
96		111
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	112	if ($GRAB) {
		113	if ($ev->{button} == 4 || $ev->{button} == 5) {
		114	# mousewheel
		115	my $delta = $ev->{button} * 2 - 9;
		116	my $shift = $ev->{mod} & DC::KMOD_SHIFT;
98		117
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	118	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	119	$ev->{dy} = $shift ? 0 : $delta;
		120
		121	$GRAB->emit (mouse_wheel => $ev);
		122	} else {
		123	$GRAB->emit (button_down => $ev)
		124	}
		125	}
101	}	126	}
102		127
103	sub feed_sdl_button_up_event {	128	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	129	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		130
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	131	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		132
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	133	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		134
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	135	$GRAB->emit (button_up => $ev)
112	if $GRAB;	136	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		137
114	if (!$BUTTON_STATE) {	138	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	139	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	140	$grab->update if $grab;
117	$GRAB->update if $GRAB;	141	$GRAB->update if $GRAB;
118		142
		143	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	144	$TOOLTIP_WATCHER->invoke;
120	}	145	}
121	}	146	}
122		147
123	sub feed_sdl_motion_event {	148	sub feed_sdl_motion_event {
124	my ($ev) = @_;	149	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	150	my ($x, $y) = ($ev->{x}, $ev->{y});
126		151
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	152	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		153
129	if ($widget != $HOVER) {	154	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		155
132	$hover->update if $hover && $hover->{can_hover};	156	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	157	if $HOVER;
140	}	158	}
141		159
142	# convert position array to integers	160	# convert position array to integers
143	sub harmonize {	161	sub harmonize {
…		…
193	reconfigure_widgets;	211	reconfigure_widgets;
194	}	212	}
195		213
196	#############################################################################	214	#############################################################################
197		215
		216	package DC::UI::Event;
		217
		218	sub xy {
		219	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		220	}
		221
		222	#############################################################################
		223
198	package CFClient::UI::Base;	224	package DC::UI::Base;
199		225
200	use strict;	226	use strict;
201		227
202	use CFClient::OpenGL;	228	use DC::OpenGL;
203		229
204	sub new {	230	sub new {
205	my $class = shift;	231	my $class = shift;
206		232
207	my $self = bless {	233	my $self = bless {
…		…
212	h => undef,	238	h => undef,
213	can_events => 1,	239	can_events => 1,
214	@_	240	@_
215	}, $class;	241	}, $class;
216		242
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	243	DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
218		244
219	for (keys %$self) {	245	for (keys %$self) {
220	if (/^on_(.*)$/) {	246	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	247	$self->connect ($1 => delete $self->{$_});
222	}	248	}
223	}	249	}
224		250
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	251	if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	252	$self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	253	$self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	254	$self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	255	$self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
230		256
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	257	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	258	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		259
234	$self->show if $layout->{show};	260	$self->show if $layout->{show};
…		…
239		265
240	sub destroy {	266	sub destroy {
241	my ($self) = @_;	267	my ($self) = @_;
242		268
243	$self->hide;	269	$self->hide;
		270	$self->emit ("destroy");
244	%$self = ();	271	%$self = ();
245	}	272	}
246		273
		274	sub TO_JSON {
		275	{ "\fw" => $_[0]{s_id} }
		276	}
		277
247	sub show {	278	sub show {
248	my ($self) = @_;	279	my ($self) = @_;
249		280
250	return if $self->{parent};	281	return if $self->{parent};
251		282
252	$CFClient::UI::ROOT->add ($self);	283	$DC::UI::ROOT->add ($self);
253	}	284	}
254		285
255	sub set_visible {	286	sub set_visible {
256	my ($self) = @_;	287	my ($self) = @_;
257		288
…		…
278	delete $self->{root};	309	delete $self->{root};
279		310
280	undef $GRAB if $GRAB == $self;	311	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	312	undef $HOVER if $HOVER == $self;
282		313
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	314	$DC::UI::TOOLTIP_WATCHER->invoke
284	if $TOOLTIP->{owner} == $self;	315	if $TOOLTIP->{owner} == $self;
285		316
286	$self->emit ("focus_out");	317	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	318	$self->emit (visibility_change => 0);
288	}	319	}
…		…
290	sub set_visibility {	321	sub set_visibility {
291	my ($self, $visible) = @_;	322	my ($self, $visible) = @_;
292		323
293	return if $self->{visible} == $visible;	324	return if $self->{visible} == $visible;
294		325
295	$visible ? $self->hide	326	$visible ? $self->show
296	: $self->show;	327	: $self->hide;
297	}	328	}
298		329
299	sub toggle_visibility {	330	sub toggle_visibility {
300	my ($self) = @_;	331	my ($self) = @_;
301		332
…		…
307	sub hide {	338	sub hide {
308	my ($self) = @_;	339	my ($self) = @_;
309		340
310	$self->set_invisible;	341	$self->set_invisible;
311		342
		343	# extra $parent copy for 5.8.8+ bug workaround
		344	# (otherwise $_[0] in remove gets freed
		345	if (my $parent = $self->{parent}) {
312	$self->{parent}->remove ($self)	346	$parent->remove ($self);
313	if $self->{parent};	347	}
314	}	348	}
315		349
316	sub move_abs {	350	sub move_abs {
317	my ($self, $x, $y, $z) = @_;	351	my ($self, $x, $y, $z) = @_;
318		352
…		…
330	$self->{force_h} = $h;	364	$self->{force_h} = $h;
331		365
332	$self->realloc;	366	$self->realloc;
333	}	367	}
334		368
		369	# traverse the widget chain up to find the maximum "physical" size constraints
		370	sub get_max_wh {
		371	my ($self) = @_;
		372
		373	return $self->{parent}->get_max_wh
		374	if $self->{parent};
		375
		376	($::WIDTH, $::HEIGHT)
		377	}
		378
335	sub size_request {	379	sub size_request {
336	require Carp;	380	require Carp;
337	Carp::confess "size_request is abstract";	381	Carp::confess "size_request is abstract";
338	}	382	}
339		383
…		…
345	my ($self, $x, $y, $w, $h) = @_;	389	my ($self, $x, $y, $w, $h) = @_;
346		390
347	if ($self->{aspect}) {	391	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	392	my ($ow, $oh) = ($w, $h);
349		393
350	$w = List::Util::min $w, int $h * $self->{aspect};	394	$w = List::Util::min $w, DC::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	395	$h = List::Util::min $h, DC::ceil $w / $self->{aspect};
352		396
353	# use alignment to adjust x, y	397	# use alignment to adjust x, y
354		398
355	$x += int 0.5 * ($ow - $w);	399	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	400	$y += int 0.5 * ($oh - $h);
…		…
397		441
398	return if $self->{tooltip} eq $tooltip;	442	return if $self->{tooltip} eq $tooltip;
399		443
400	$self->{tooltip} = $tooltip;	444	$self->{tooltip} = $tooltip;
401		445
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	446	if ($DC::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	447	delete $DC::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	448	$DC::UI::TOOLTIP_WATCHER->invoke;
405	}	449	}
406	}	450	}
407		451
408	# translate global coordinates to local coordinate system	452	# translate global coordinates to local coordinate system
409	sub coord2local {	453	sub coord2local {
410	my ($self, $x, $y) = @_;	454	my ($self, $x, $y) = @_;
411		455
		456	return (undef, undef) unless $self->{parent};
		457
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	458	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	459	}
414		460
415	# translate local coordinates to global coordinate system	461	# translate local coordinates to global coordinate system
416	sub coord2global {	462	sub coord2global {
417	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
418		464
		465	return (undef, undef) unless $self->{parent};
		466
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	467	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	468	}
421		469
422	sub invoke_focus_in {	470	sub invoke_focus_in {
423	my ($self) = @_;	471	my ($self) = @_;
…		…
452		500
453	$FOCUS->emit ("focus_out") if $FOCUS;	501	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	502	$self->emit ("focus_in");
455	}	503	}
456		504
457	sub invoke_mouse_motion { 1 }	505	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	506	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	507	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	508	sub invoke_key_up { 0 }
		509	sub invoke_mouse_wheel { 0 }
461		510
462	sub invoke_button_down {	511	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	512	my ($self, $ev, $x, $y) = @_;
464		513
465	$self->grab_focus;	514	$self->grab_focus;
466		515
467	1	516	0
468	}	517	}
469		518
470	sub connect {	519	sub connect {
471	my ($self, $signal, $cb) = @_;	520	my ($self, $signal, $cb) = @_;
472		521
473	push @{ $self->{signal_cb}{$signal} }, $cb;	522	push @{ $self->{signal_cb}{$signal} }, $cb;
		523
		524	defined wantarray and DC::guard {
		525	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		526	@{ $self->{signal_cb}{$signal} };
		527	}
474	}	528	}
		529
		530	sub disconnect_all {
		531	my ($self, $signal) = @_;
		532
		533	delete $self->{signal_cb}{$signal};
		534	}
		535
		536	my %has_coords = (
		537	button_down => 1,
		538	button_up => 1,
		539	mouse_motion => 1,
		540	mouse_wheel => 1,
		541	);
475		542
476	sub emit {	543	sub emit {
477	my ($self, $signal, @args) = @_;	544	my ($self, $signal, @args) = @_;
478		545
479	#d##TODO# stop propagating at first true, do not use sum	546	# I do not really like this solution, but I do not like duplication
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	547	# and needlessly verbose code, either.
		548	my @append
		549	= $has_coords{$signal}
		550	? $args[0]->xy ($self)
		551	: ();
		552
		553	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		554
		555	for my $cb (
		556	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	557	($self->can ("invoke_$signal") || sub { 1 }), # closure
		558	) {
		559	return $cb->($self, @args, @append) || next;
		560	}
		561
		562	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	563	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	564	}
484		565
485	sub find_widget {	566	#sub find_widget {
486	my ($self, $x, $y) = @_;	567	# in .xs
487
488	return () unless $self->{can_events};
489
490	return $self
491	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494	()
495	}
496		568
497	sub set_parent {	569	sub set_parent {
498	my ($self, $parent) = @_;	570	my ($self, $parent) = @_;
499		571
500	Scalar::Util::weaken ($self->{parent} = $parent);	572	DC::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	573	$self->set_visible if $parent->{visible};
502	}	574	}
503		575
504	sub realloc {	576	sub realloc {
505	my ($self) = @_;	577	my ($self) = @_;
…		…
531		603
532	# using global variables seems a bit hacky, but passing through all drawing	604	# using global variables seems a bit hacky, but passing through all drawing
533	# functions seems pointless.	605	# functions seems pointless.
534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	606	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535		607
536	sub draw {	608	#sub draw {
537	my ($self) = @_;	609	#CFPlus.xs
538
539	return unless $self->{h} && $self->{w};
540
541	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};
544
545	# skip widgets that are entirely outside the drawing area
546	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
548
549	glPushMatrix;
550	glTranslate $self->{x}, $self->{y}, 0;
551
552	if ($self == $HOVER && $self->{can_hover}) {
553	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
554	glEnable GL_BLEND;
555	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
556	glBegin GL_QUADS;
557	glVertex 0 , 0;
558	glVertex $self->{w}, 0;
559	glVertex $self->{w}, $self->{h};
560	glVertex 0 , $self->{h};
561	glEnd;
562	glDisable GL_BLEND;
563	}
564
565	if ($ENV{CFPLUS_DEBUG} & 1) {
566	glPushMatrix;
567	glColor 1, 1, 0, 1;
568	glTranslate 0.375, 0.375;
569	glBegin GL_LINE_LOOP;
570	glVertex 0 , 0;
571	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;
574	glEnd;
575	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}
578
579	$self->_draw;
580	glPopMatrix;
581	}
582		610
583	sub _draw {	611	sub _draw {
584	my ($self) = @_;	612	my ($self) = @_;
585		613
586	warn "no draw defined for $self\n";	614	warn "no draw defined for $self\n";
587	}	615	}
588		616
589	sub DESTROY {	617	sub DESTROY {
590	my ($self) = @_;	618	my ($self) = @_;
591		619
592	delete $WIDGET{$self+0};	620	return if DC::in_destruct;
593		621
		622	local $@;
594	eval { $self->destroy };	623	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	624	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		625
		626	delete $WIDGET{$self+0};
596	}	627	}
597		628
598	#############################################################################	629	#############################################################################
599		630
600	package CFClient::UI::DrawBG;	631	package DC::UI::DrawBG;
601		632
602	our @ISA = CFClient::UI::Base::;	633	our @ISA = DC::UI::Base::;
603		634
604	use strict;	635	use strict;
605	use CFClient::OpenGL;	636	use DC::OpenGL;
606		637
607	sub new {	638	sub new {
608	my $class = shift;	639	my $class = shift;
609
610	# range [value, low, high, page]
611		640
612	$class->SUPER::new (	641	$class->SUPER::new (
613	#bg => [0, 0, 0, 0.2],	642	#bg => [0, 0, 0, 0.2],
614	#active_bg => [1, 1, 1, 0.5],	643	#active_bg => [1, 1, 1, 0.5],
615	@_	644	@_
…		…
627	my ($w, $h) = @$self{qw(w h)};	656	my ($w, $h) = @$self{qw(w h)};
628		657
629	glEnable GL_BLEND;	658	glEnable GL_BLEND;
630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	659	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
631	glColor_premultiply @$color;	660	glColor_premultiply @$color;
632
633	glBegin GL_QUADS;
634	glVertex 0 , 0;
635	glVertex 0 , $h;
636	glVertex $w, $h;	661	glRect 0, 0, $w, $h;
637	glVertex $w, 0;
638	glEnd;
639
640	glDisable GL_BLEND;	662	glDisable GL_BLEND;
641	}	663	}
642	}	664	}
643		665
644	#############################################################################	666	#############################################################################
645		667
646	package CFClient::UI::Empty;	668	package DC::UI::Empty;
647		669
648	our @ISA = CFClient::UI::Base::;	670	our @ISA = DC::UI::Base::;
649		671
650	sub new {	672	sub new {
651	my ($class, %arg) = @_;	673	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	674	$class->SUPER::new (can_events => 0, %arg);
653	}	675	}
…		…
660		682
661	sub draw { }	683	sub draw { }
662		684
663	#############################################################################	685	#############################################################################
664		686
665	package CFClient::UI::Container;	687	package DC::UI::Container;
666		688
667	our @ISA = CFClient::UI::Base::;	689	our @ISA = DC::UI::Base::;
668		690
669	sub new {	691	sub new {
670	my ($class, %arg) = @_;	692	my ($class, %arg) = @_;
671		693
672	my $children = delete $arg{children};	694	my $children = delete $arg{children};
…		…
676	can_events => 0,	698	can_events => 0,
677	%arg,	699	%arg,
678	);	700	);
679		701
680	$self->add (@$children)	702	$self->add (@$children)
681	if $children;	703	if $children && @$children;
682		704
683	$self	705	$self
		706	}
		707
		708	sub realloc {
		709	my ($self) = @_;
		710
		711	$self->{force_realloc} = 1;
		712	$self->{force_size_alloc} = 1;
		713	$self->SUPER::realloc;
684	}	714	}
685		715
686	sub add {	716	sub add {
687	my ($self, @widgets) = @_;	717	my ($self, @widgets) = @_;
688		718
689	$_->set_parent ($self)	719	$_->set_parent ($self)
690	for @widgets;	720	for @widgets;
691		721
		722	# TODO: only do this in widgets that need it, e.g. root, fixed
692	use sort 'stable';	723	use sort 'stable';
693		724
694	$self->{children} = [	725	$self->{children} = [
695	sort { $a->{z} <=> $b->{z} }	726	sort { $a->{z} <=> $b->{z} }
696	@{$self->{children}}, @widgets	727	@{$self->{children}}, @widgets
697	];	728	];
698		729
699	$self->realloc;	730	$self->realloc;
		731
		732	$self->emit (c_add => \@widgets);
		733
		734	map $_+0, @widgets
700	}	735	}
701		736
702	sub children {	737	sub children {
703	@{ $_[0]{children} }	738	@{ $_[0]{children} }
704	}	739	}
705		740
706	sub remove {	741	sub remove {
707	my ($self, $child) = @_;	742	my ($self, @widgets) = @_;
708		743
		744	$self->emit (c_remove => \@widgets);
		745
		746	for my $child (@widgets) {
709	delete $child->{parent};	747	delete $child->{parent};
710	$child->hide;	748	$child->hide;
711
712	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	749	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		750	}
713		751
714	$self->realloc;	752	$self->realloc;
715	}	753	}
716		754
717	sub clear {	755	sub clear {
718	my ($self) = @_;	756	my ($self) = @_;
719		757
720	my $children = delete $self->{children};	758	my $children = $self->{children};
721	$self->{children} = [];	759	$self->{children} = [];
722		760
723	for (@$children) {	761	for (@$children) {
724	delete $_->{parent};	762	delete $_->{parent};
725	$_->hide;	763	$_->hide;
…		…
745	}	783	}
746		784
747	sub _draw {	785	sub _draw {
748	my ($self) = @_;	786	my ($self) = @_;
749		787
750	$_->draw for @{$self->{children}};	788	$_->draw for $self->visible_children;
751	}	789	}
752		790
753	#############################################################################	791	#############################################################################
754		792
755	package CFClient::UI::Bin;	793	package DC::UI::Bin;
756		794
757	our @ISA = CFClient::UI::Container::;	795	our @ISA = DC::UI::Container::;
758		796
759	sub new {	797	sub new {
760	my ($class, %arg) = @_;	798	my ($class, %arg) = @_;
761		799
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	800	my $child = (delete $arg{child}) || new DC::UI::Empty::;
763		801
764	$class->SUPER::new (children => [$child], %arg)	802	$class->SUPER::new (children => [$child], %arg)
765	}	803	}
766		804
767	sub add {	805	sub add {
768	my ($self, $child) = @_;	806	my ($self, $child) = @_;
769		807
770	$self->SUPER::remove ($_) for @{ $self->{children} };	808	$self->clear;
771	$self->SUPER::add ($child);	809	$self->SUPER::add ($child);
772	}	810	}
773		811
774	sub remove {	812	sub remove {
775	my ($self, $widget) = @_;	813	my ($self, $widget) = @_;
776		814
777	$self->SUPER::remove ($widget);	815	$self->SUPER::remove ($widget);
778		816
779	$self->{children} = [new CFClient::UI::Empty]	817	$self->{children} = [new DC::UI::Empty]
780	unless @{$self->{children}};	818	unless @{$self->{children}};
781	}	819	}
782		820
783	sub child { $_[0]->{children}[0] }	821	sub child { $_[0]->{children}[0] }
784		822
…		…
793		831
794	1	832	1
795	}	833	}
796		834
797	#############################################################################	835	#############################################################################
798
799	# back-buffered drawing area	836	# back-buffered drawing area
800		837
801	package CFClient::UI::Window;	838	package DC::UI::Window;
802		839
803	our @ISA = CFClient::UI::Bin::;	840	our @ISA = DC::UI::Bin::;
804		841
805	use CFClient::OpenGL;	842	use DC::OpenGL;
806		843
807	sub new {	844	sub new {
808	my ($class, %arg) = @_;	845	my ($class, %arg) = @_;
809		846
810	my $self = $class->SUPER::new (%arg);	847	my $self = $class->SUPER::new (%arg);
…		…
832	}	869	}
833		870
834	sub render_child {	871	sub render_child {
835	my ($self) = @_;	872	my ($self) = @_;
836		873
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	874	$self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	875	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	876	glClear GL_COLOR_BUFFER_BIT;
840		877
841	{	878	{
842	package CFClient::UI::Base;	879	package DC::UI::Base;
843		880
844	($draw_x, $draw_y, $draw_w, $draw_h) =	881	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	882	(0, 0, $self->{w}, $self->{h});
		883
		884	$self->_render;
846	}	885	}
847
848	$self->_render;
849	};	886	};
850	}	887	}
851		888
852	sub _draw {	889	sub _draw {
853	my ($self) = @_;	890	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		891
857	my $tex = $self->{texture}	892	my $tex = $self->{texture}
858	or return;	893	or return;
859		894
860	glEnable GL_TEXTURE_2D;	895	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	896	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	897	glColor 0, 0, 0, 1;
863		898
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	899	$tex->draw_quad_alpha_premultiplied (0, 0);
865		900
866	glDisable GL_TEXTURE_2D;	901	glDisable GL_TEXTURE_2D;
867	}	902	}
868		903
869	#############################################################################	904	#############################################################################
870		905
871	package CFClient::UI::ViewPort;	906	package DC::UI::ViewPort;
872		907
		908	use List::Util qw(min max);
		909
873	our @ISA = CFClient::UI::Window::;	910	our @ISA = DC::UI::Window::;
874		911
875	sub new {	912	sub new {
876	my $class = shift;	913	my $class = shift;
877		914
878	$class->SUPER::new (	915	$class->SUPER::new (
…		…
885	sub size_request {	922	sub size_request {
886	my ($self) = @_;	923	my ($self) = @_;
887		924
888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	925	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889		926
890	$w = 10 if $self->{scroll_x};	927	$w = 1 if $self->{scroll_x};
891	$h = 10 if $self->{scroll_y};	928	$h = 1 if $self->{scroll_y};
892		929
893	($w, $h)	930	($w, $h)
894	}	931	}
895		932
896	sub invoke_size_allocate {	933	sub invoke_size_allocate {
…		…
908	}	945	}
909		946
910	sub set_offset {	947	sub set_offset {
911	my ($self, $x, $y) = @_;	948	my ($self, $x, $y) = @_;
912		949
		950	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		951	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		952
		953	if ($x != $self->{view_x} or $y != $self->{view_y}) {
913	$self->{view_x} = int $x;	954	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	955	$self->{view_y} = $y;
915		956
		957	$self->emit (changed => $x, $y);
916	$self->update;	958	$self->update;
		959	}
		960	}
		961
		962	sub set_center {
		963	my ($self, $x, $y) = @_;
		964
		965	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		966	}
		967
		968	sub make_visible {
		969	my ($self, $x, $y, $border) = @_;
		970
		971	if ( $x < $self->{view_x} + $self->{w} * $border
		972	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		973	|| $y < $self->{view_y} + $self->{h} * $border
		974	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		975	) {
		976	$self->set_center ($x, $y);
		977	}
917	}	978	}
918		979
919	# hmm, this does not work for topleft of $self... but we should not ask for that	980	# hmm, this does not work for topleft of $self... but we should not ask for that
920	sub coord2local {	981	sub coord2local {
921	my ($self, $x, $y) = @_;	982	my ($self, $x, $y) = @_;
…		…
936	my ($self, $x, $y) = @_;	997	my ($self, $x, $y) = @_;
937		998
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	999	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1000	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1001	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1002	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1003	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1004	$self->DC::UI::Base::find_widget ($x, $y)
944	}	1005	}
945	}	1006	}
946		1007
947	sub _render {	1008	sub _render {
948	my ($self) = @_;	1009	my ($self) = @_;
949		1010
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1011	local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1012	local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
952		1013
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1014	DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1015
955	$self->SUPER::_render;	1016	$self->SUPER::_render;
956	}	1017	}
957		1018
958	#############################################################################	1019	#############################################################################
959		1020
960	package CFClient::UI::ScrolledWindow;	1021	package DC::UI::ScrolledWindow;
961		1022
962	our @ISA = CFClient::UI::HBox::;	1023	our @ISA = DC::UI::Table::;
963		1024
964	sub new {	1025	sub new {
965	my ($class, %arg) = @_;	1026	my ($class, %arg) = @_;
966		1027
967	my $child = delete $arg{child};	1028	my $child = delete $arg{child};
968		1029
969	my $self;	1030	my $self;
970		1031
971	my $slider = new CFClient::UI::Slider	1032	my $hslider = new DC::UI::Slider
		1033	c_col => 0,
		1034	c_row => 1,
		1035	vertical => 0,
		1036	range => [0, 0, 1, 0.01], # HACK fix
		1037	on_changed => sub {
		1038	$self->{hpos} = $_[1];
		1039	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1040	},
		1041	;
		1042
		1043	my $vslider = new DC::UI::Slider
		1044	c_col => 1,
		1045	c_row => 0,
972	vertical => 1,	1046	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1047	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1048	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1049	$self->{vpos} = $_[1];
		1050	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1051	},
977	;	1052	;
978		1053
979	$self = $class->SUPER::new (	1054	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1055	scroll_x => 0,
		1056	scroll_y => 1,
		1057	can_events => 1,
981	slider => $slider,	1058	hslider => $hslider,
		1059	vslider => $vslider,
		1060	col_expand => [1, 0],
		1061	row_expand => [1, 0],
982	%arg,	1062	%arg,
983	);	1063	);
984		1064
		1065	$self->{vp} = new DC::UI::ViewPort
		1066	c_col => 0,
		1067	c_row => 0,
		1068	expand => 1,
		1069	scroll_x => $self->{scroll_x},
		1070	scroll_y => $self->{scroll_y},
		1071	on_changed => sub {
		1072	my ($vp, $x, $y) = @_;
		1073
		1074	$vp->{parent}{hslider}->set_value ($x);
		1075	$vp->{parent}{vslider}->set_value ($y);
		1076
		1077	0
		1078	},
		1079	on_size_allocate => sub {
		1080	my ($vp, $w, $h) = @_;
		1081	$vp->{parent}->update_slider;
		1082	0
		1083	},
		1084	;
		1085
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1086	$self->SUPER::add ($self->{vp});
		1087
986	$self->add ($child) if $child;	1088	$self->add ($child) if $child;
987		1089
988	$self	1090	$self
989	}	1091	}
990
991	#TODO# update range on size_allocate depending on child
992		1092
993	sub add {	1093	sub add {
994	my ($self, $widget) = @_;	1094	my ($self, $widget) = @_;
995		1095
996	$self->{vp}->add ($self->{child} = $widget);	1096	$self->{vp}->add ($self->{child} = $widget);
997	}	1097	}
998		1098
		1099	sub set_offset { shift->{vp}->set_offset (@_) }
		1100	sub set_center { shift->{vp}->set_center (@_) }
		1101	sub make_visible { shift->{vp}->make_visible (@_) }
		1102
999	sub update_slider {	1103	sub update_slider {
1000	my ($self) = @_;	1104	my ($self) = @_;
1001		1105
		1106	my $child = ($self->{vp} or return)->child;
		1107
		1108	if ($self->{scroll_x}) {
		1109	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1110	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003	}
1004		1111
1005	sub update {	1112	my $visible = $w1 > $w2;
		1113	if ($visible != $self->{hslider_visible}) {
		1114	$self->{hslider_visible} = $visible;
		1115	$visible ? $self->SUPER::add ($self->{hslider})
		1116	: $self->SUPER::remove ($self->{hslider});
		1117	}
		1118	}
		1119
		1120	if ($self->{scroll_y}) {
		1121	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1122	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1123
		1124	my $visible = $h1 > $h2;
		1125	if ($visible != $self->{vslider_visible}) {
		1126	$self->{vslider_visible} = $visible;
		1127	$visible ? $self->SUPER::add ($self->{vslider})
		1128	: $self->SUPER::remove ($self->{vslider});
		1129	}
		1130	}
		1131	}
		1132
		1133	sub start_dragging {
1006	my ($self) = @_;	1134	my ($self, $ev) = @_;
1007		1135
1008	$self->SUPER::update;	1136	$self->grab_focus;
1009		1137
1010	$self->update_slider;	1138	my $ox = $self->{vp}{view_x};
		1139	my $oy = $self->{vp}{view_y};
		1140
		1141	$self->{motion} = sub {
		1142	my ($ev, $x, $y) = @_;
		1143
		1144	$ox -= $ev->{xrel};
		1145	$oy -= $ev->{yrel};
		1146
		1147	$self->{vp}->set_offset ($ox, $oy);
		1148	};
		1149	}
		1150
		1151	sub invoke_mouse_wheel {
		1152	my ($self, $ev) = @_;
		1153
		1154	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1155	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1156
		1157	1
		1158	}
		1159
		1160	sub invoke_button_down {
		1161	my ($self, $ev, $x, $y) = @_;
		1162
		1163	if ($ev->{button} == 2) {
		1164	$self->start_dragging ($ev);
		1165	return 1;
		1166	}
		1167
		1168	0
		1169	}
		1170
		1171	sub invoke_button_up {
		1172	my ($self, $ev, $x, $y) = @_;
		1173
		1174	if (delete $self->{motion}) {
		1175	return 1;
		1176	}
		1177
		1178	0
		1179	}
		1180
		1181	sub invoke_mouse_motion {
		1182	my ($self, $ev, $x, $y) = @_;
		1183
		1184	if ($self->{motion}) {
		1185	$self->{motion}->($ev, $x, $y);
		1186	return 1;
		1187	}
		1188
		1189	0
1011	}	1190	}
1012		1191
1013	sub invoke_size_allocate {	1192	sub invoke_size_allocate {
1014	my ($self, $w, $h) = @_;	1193	my ($self, $w, $h) = @_;
1015		1194
1016	$self->update_slider;	1195	$self->update_slider;
1017
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1196	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1197	}
1020		1198
1021	#############################################################################	1199	#############################################################################
1022		1200
1023	package CFClient::UI::Frame;	1201	package DC::UI::Frame;
1024		1202
1025	our @ISA = CFClient::UI::Bin::;	1203	our @ISA = DC::UI::Bin::;
1026		1204
1027	use CFClient::OpenGL;	1205	use DC::OpenGL;
1028		1206
1029	sub new {	1207	sub new {
1030	my $class = shift;	1208	my $class = shift;
1031		1209
1032	$class->SUPER::new (	1210	$class->SUPER::new (
…		…
1042	my ($w, $h) = @$self{qw(w h)};	1220	my ($w, $h) = @$self{qw(w h)};
1043		1221
1044	glEnable GL_BLEND;	1222	glEnable GL_BLEND;
1045	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1223	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1046	glColor_premultiply @{ $self->{bg} };	1224	glColor_premultiply @{ $self->{bg} };
1047
1048	glBegin GL_QUADS;
1049	glVertex 0 , 0;
1050	glVertex 0 , $h;
1051	glVertex $w, $h;	1225	glRect 0, 0, $w, $h;
1052	glVertex $w, 0;
1053	glEnd;
1054
1055	glDisable GL_BLEND;	1226	glDisable GL_BLEND;
1056	}	1227	}
1057		1228
1058	$self->SUPER::_draw;	1229	$self->SUPER::_draw;
1059	}	1230	}
1060		1231
1061	#############################################################################	1232	#############################################################################
1062		1233
1063	package CFClient::UI::FancyFrame;	1234	package DC::UI::FancyFrame;
1064		1235
1065	our @ISA = CFClient::UI::Bin::;	1236	our @ISA = DC::UI::Bin::;
1066		1237
1067	use CFClient::OpenGL;	1238	use DC::OpenGL;
		1239
		1240	sub new {
		1241	my ($class, %arg) = @_;
		1242
		1243	if ((exists $arg{label}) && !ref $arg{label}) {
		1244	$arg{label} = new DC::UI::Label
		1245	align => 1,
		1246	valign => 0,
		1247	text => $arg{label},
		1248	fontsize => ($arg{border} || 0.8) * 0.75;
		1249	}
		1250
		1251	my $self = $class->SUPER::new (
		1252	# label => "",
		1253	fg => [0.6, 0.3, 0.1],
		1254	border => 0.8,
		1255	style => 'single',
		1256	%arg,
		1257	);
		1258
		1259	$self
		1260	}
		1261
		1262	sub add {
		1263	my ($self, @widgets) = @_;
		1264
		1265	$self->SUPER::add (@widgets);
		1266	$self->DC::UI::Container::add ($self->{label}) if $self->{label};
		1267	}
		1268
		1269	sub border {
		1270	int $_[0]{border} * $::FONTSIZE
		1271	}
		1272
		1273	sub size_request {
		1274	my ($self) = @_;
		1275
		1276	($self->{label_w}, undef) = $self->{label}->size_request
		1277	if $self->{label};
		1278
		1279	my ($w, $h) = $self->SUPER::size_request;
		1280
		1281	(
		1282	$w + $self->border * 2,
		1283	$h + $self->border * 2,
		1284	)
		1285	}
		1286
		1287	sub invoke_size_allocate {
		1288	my ($self, $w, $h) = @_;
		1289
		1290	my $border = $self->border;
		1291
		1292	$w -= List::Util::max 0, $border * 2;
		1293	$h -= List::Util::max 0, $border * 2;
		1294
		1295	if (my $label = $self->{label}) {
		1296	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1297	$label->{h} = List::Util::min $h, $border;
		1298	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1299	}
		1300
		1301	$self->child->configure ($border, $border, $w, $h);
		1302
		1303	1
		1304	}
		1305
		1306	sub _draw {
		1307	my ($self) = @_;
		1308
		1309	my $child = $self->{children}[0];
		1310
		1311	my $border = $self->border;
		1312	my ($w, $h) = ($self->{w}, $self->{h});
		1313
		1314	$child->draw;
		1315
		1316	glColor @{$self->{fg}};
		1317	glBegin GL_LINE_STRIP;
		1318	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1319	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1320	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1321	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1322	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1323	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1324	glEnd;
		1325
		1326	if ($self->{label}) {
		1327	glTranslate $border * 2, 0;
		1328	$self->{label}->_draw;
		1329	}
		1330	}
		1331
		1332	#############################################################################
		1333
		1334	package DC::UI::Toplevel;
		1335
		1336	our @ISA = DC::UI::Bin::;
		1337
		1338	use DC::OpenGL;
1068		1339
1069	my $bg =	1340	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1341	new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1342	mipmap => 1, wrap => 1;
1072		1343
1073	my @border =	1344	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1345	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1346	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1347
		1348	my @icon =
		1349	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
		1350	qw(x1_move.png x1_resize.png);
1076		1351
1077	sub new {	1352	sub new {
1078	my ($class, %arg) = @_;	1353	my ($class, %arg) = @_;
1079		1354
1080	my $self = $class->SUPER::new (	1355	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1356	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1357	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1358	border => 0.6,
1084	can_events => 1,	1359	can_events => 1,
1085	min_w => 16,	1360	min_w => 64,
1086	min_h => 16,	1361	min_h => 32,
1087	%arg,	1362	%arg,
1088	);	1363	);
1089		1364
1090	$self->{title_widget} = new CFClient::UI::Label	1365	$self->{title_widget} = new DC::UI::Label
1091	align => 0,	1366	align => 0,
1092	valign => 1,	1367	valign => 1,
1093	text => $self->{title},	1368	text => $self->{title},
1094	fontsize => $self->{border},	1369	fontsize => $self->{border},
1095	if exists $self->{title};	1370	if exists $self->{title};
1096		1371
1097	if ($self->{has_close_button}) {	1372	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1373	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1374	new DC::UI::ImageButton
1100	path => 'x1_close.png',	1375	path => 'x1_close.png',
1101	on_activate => sub { $self->emit ("delete") };	1376	on_activate => sub { $self->emit ("delete") };
1102		1377
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1378	$self->DC::UI::Container::add ($self->{close_button});
1104	}	1379	}
1105		1380
1106	$self	1381	$self
1107	}	1382	}
1108		1383
1109	sub add {	1384	sub add {
1110	my ($self, @widgets) = @_;	1385	my ($self, @widgets) = @_;
1111		1386
1112	$self->SUPER::add (@widgets);	1387	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1388	$self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1389	$self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1390	}
1116		1391
1117	sub border {	1392	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1393	int $_[0]{border} * $::FONTSIZE
		1394	}
		1395
		1396	sub get_max_wh {
		1397	my ($self) = @_;
		1398
		1399	return ($self->{w}, $self->{h})
		1400	if $self->{visible} && $self->{w};
		1401
		1402	$self->SUPER::get_max_wh
1119	}	1403	}
1120		1404
1121	sub size_request {	1405	sub size_request {
1122	my ($self) = @_;	1406	my ($self) = @_;
1123		1407
…		…
1227	$self->{motion}->($ev, $x, $y) if $self->{motion};	1511	$self->{motion}->($ev, $x, $y) if $self->{motion};
1228		1512
1229	! ! $self->{motion}	1513	! ! $self->{motion}
1230	}	1514	}
1231		1515
		1516	sub invoke_visibility_change {
		1517	my ($self, $visible) = @_;
		1518
		1519	delete $self->{motion} unless $visible;
		1520
		1521	0
		1522	}
		1523
1232	sub _draw {	1524	sub _draw {
1233	my ($self) = @_;	1525	my ($self) = @_;
1234		1526
1235	my $child = $self->{children}[0];	1527	my $child = $self->{children}[0];
1236		1528
…		…
1241	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1242		1534
1243	my $border = $self->border;	1535	my $border = $self->border;
1244		1536
1245	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1246	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1247	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1248	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1249	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1250		1556
1251	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1252	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1253		1559
1254	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1273	if $self->{close_button};	1579	if $self->{close_button};
1274	}	1580	}
1275		1581
1276	#############################################################################	1582	#############################################################################
1277		1583
1278	package CFClient::UI::Table;	1584	package DC::UI::Table;
1279		1585
1280	our @ISA = CFClient::UI::Base::;	1586	our @ISA = DC::UI::Container::;
1281		1587
1282	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1283		1589
1284	use CFClient::OpenGL;	1590	use DC::OpenGL;
1285		1591
1286	sub new {	1592	sub new {
1287	my $class = shift;	1593	my $class = shift;
1288		1594
1289	$class->SUPER::new (	1595	$class->SUPER::new (
1290	col_expand => [],	1596	col_expand => [],
		1597	row_expand => [],
1291	@_,	1598	@_,
1292	)	1599	)
1293	}	1600	}
1294		1601
1295	sub children {
1296	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297	}
1298
1299	sub add {	1602	sub add {
1300	my ($self, $x, $y, $child) = @_;	1603	my ($self, @widgets) = @_;
1301		1604
1302	$child->set_parent ($self);	1605	for my $child (@widgets) {
1303	$self->{children}[$y][$x] = $child;	1606	$child->{c_rowspan} ||= 1;
		1607	$child->{c_colspan} ||= 1;
		1608	}
1304		1609
1305	$self->realloc;	1610	$self->SUPER::add (@widgets);
1306	}	1611	}
1307		1612
1308	sub remove {	1613	sub add_at {
		1614	my $self = shift;
		1615
		1616	my @widgets;
		1617
		1618	while (@_) {
		1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
		1621	$child->{c_row} = $row;
		1622	$child->{c_col} = $col;
		1623
		1624	push @widgets, $child;
		1625	}
		1626
		1627	$self->add (@widgets);
		1628	}
		1629
		1630	sub get_wh {
1309	my ($self, $child) = @_;	1631	my ($self) = @_;
1310		1632
1311	# TODO: not yet implemented	1633	my (@w, @h);
1312	}
1313
1314	# TODO: move to container class maybe? send children a signal on removal?
1315	sub clear {
1316	my ($self) = @_;
1317		1634
1318	my @children = $self->children;	1635	my @children = $self->children;
1319	delete $self->{children};	1636
		1637	# first pass, columns
		1638	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1639	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1640
		1641	my $sw = sum @w[$c .. $c + $cs - 1];
		1642
		1643	if ($w > $sw) {
		1644	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1645	}
1320		1646	}
1321	for (@children) {
1322	delete $_->{parent};
1323	$_->hide;
1324	}
1325		1647
1326	$self->realloc;	1648	# second pass, rows
1327	}	1649	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1328
1329	sub get_wh {
1330	my ($self) = @_;
1331
1332	my (@w, @h);
1333
1334	for my $y (0 .. $#{$self->{children}}) {
1335	my $row = $self->{children}[$y]
1336	or next;
1337
1338	for my $x (0 .. $#$row) {
1339	my $widget = $row->[$x]
1340	or next;
1341	my ($w, $h) = @$widget{qw(req_w req_h)};	1650	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1342		1651
1343	$w[$x] = max $w[$x], $w;	1652	my $sh = sum @h[$r .. $r + $rs - 1];
1344	$h[$y] = max $h[$y], $h;	1653
		1654	if ($h > $sh) {
		1655	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1345	}	1656	}
1346	}	1657	}
1347		1658
1348	(\@w, \@h)	1659	(\@w, \@h)
1349	}	1660	}
…		…
1365	my ($ws, $hs) = $self->get_wh;	1676	my ($ws, $hs) = $self->get_wh;
1366		1677
1367	my $req_w = (sum @$ws) || 1;	1678	my $req_w = (sum @$ws) || 1;
1368	my $req_h = (sum @$hs) || 1;	1679	my $req_h = (sum @$hs) || 1;
1369		1680
1370	# TODO: nicer code && do row_expand	1681	# now linearly scale the rows/columns to the allocated size
1371	my @col_expand = @{$self->{col_expand}};	1682	my @col_expand = @{$self->{col_expand}};
1372	@col_expand = (1) x @$ws unless @col_expand;	1683	@col_expand = (1) x @$ws unless @col_expand;
1373	my $col_expand = (sum @col_expand) || 1;	1684	my $col_expand = (sum @col_expand) || 1;
1374		1685
1375	# linearly scale sizes
1376	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1686	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378		1687
1379	CFClient::UI::harmonize $ws;	1688	DC::UI::harmonize $ws;
		1689
		1690	my @row_expand = @{$self->{row_expand}};
		1691	@row_expand = (1) x @$ws unless @row_expand;
		1692	my $row_expand = (sum @row_expand) || 1;
		1693
		1694	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1695
1380	CFClient::UI::harmonize $hs;	1696	DC::UI::harmonize $hs;
1381		1697
1382	my $y;	1698	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1699	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1383		1700
1384	for my $r (0 .. $#{$self->{children}}) {	1701	for my $widget ($self->children) {
1385	my $row = $self->{children}[$r]	1702	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1386	or next;
1387		1703
1388	my $x = 0;	1704	$widget->configure (
1389	my $row_h = $hs->[$r];	1705	$x[$c], $y[$r],
		1706	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1390		1707	);
1391	for my $c (0 .. $#$row) {	1708	}
1392	my $col_w = $ws->[$c];
1393		1709
1394	if (my $widget = $row->[$c]) {	1710	1
1395	$widget->configure ($x, $y, $col_w, $row_h);	1711	}
1396	}
1397		1712
1398	$x += $col_w;	1713	#############################################################################
		1714
		1715	package DC::UI::Fixed;
		1716
		1717	use List::Util qw(min max);
		1718
		1719	our @ISA = DC::UI::Container::;
		1720
		1721	sub _scale($$$) {
		1722	my ($rel, $val, $max) = @_;
		1723
		1724	$rel ? $val * $max : $val
		1725	}
		1726
		1727	sub size_request {
		1728	my ($self) = @_;
		1729
		1730	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1731
		1732	# determine overall size by querying abs widgets
		1733	for my $child ($self->visible_children) {
		1734	unless ($child->{c_rel}) {
		1735	my $x = $child->{c_x};
		1736	my $y = $child->{c_y};
		1737
		1738	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1739	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1399	}	1740	}
		1741	}
1400		1742
1401	$y += $row_h;	1743	my $W = $x2 - $x1;
		1744	my $H = $y2 - $y1;
		1745
		1746	# now layout remaining widgets
		1747	for my $child ($self->visible_children) {
		1748	if ($child->{c_rel}) {
		1749	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1750	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1751
		1752	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1753	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1754	}
		1755	}
		1756
		1757	my $W = $x2 - $x1;
		1758	my $H = $y2 - $y1;
		1759
		1760	($W, $H)
		1761	}
		1762
		1763	sub invoke_size_allocate {
		1764	my ($self, $W, $H) = @_;
		1765
		1766	for my $child ($self->visible_children) {
		1767	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1768	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1769
		1770	$x += $child->{c_halign} * $child->{req_w};
		1771	$y += $child->{c_valign} * $child->{req_h};
		1772
		1773	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1402	}	1774	}
1403		1775
1404	1	1776	1
1405	}	1777	}
1406		1778
1407	sub find_widget {
1408	my ($self, $x, $y) = @_;
1409
1410	$x -= $self->{x};
1411	$y -= $self->{y};
1412
1413	my $res;
1414
1415	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1416	$res = $_->find_widget ($x, $y)
1417	and return $res;
1418	}
1419
1420	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1421	}
1422
1423	sub _draw {
1424	my ($self) = @_;
1425
1426	for (grep $_, @{$self->{children}}) {
1427	$_->draw for grep $_, @$_;
1428	}
1429	}
1430
1431	#############################################################################	1779	#############################################################################
1432		1780
1433	package CFClient::UI::Box;	1781	package DC::UI::Box;
1434		1782
1435	our @ISA = CFClient::UI::Container::;	1783	our @ISA = DC::UI::Container::;
1436		1784
1437	sub size_request {	1785	sub size_request {
1438	my ($self) = @_;	1786	my ($self) = @_;
		1787
		1788	my @children = $self->visible_children;
1439		1789
1440	$self->{vertical}	1790	$self->{vertical}
1441	? (	1791	? (
1442	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1792	(List::Util::max map $_->{req_w}, @children),
1443	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_h}, @children),
1444	)	1794	)
1445	: (	1795	: (
1446	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1796	(List::Util::sum map $_->{req_w}, @children),
1447	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1797	(List::Util::max map $_->{req_h}, @children),
1448	)	1798	)
1449	}	1799	}
1450		1800
1451	sub invoke_size_allocate {	1801	sub invoke_size_allocate {
1452	my ($self, $w, $h) = @_;	1802	my ($self, $w, $h) = @_;
…		…
1473	$req[$_] += $space * $children[$_]{expand}	1823	$req[$_] += $space * $children[$_]{expand}
1474	for 0 .. $#children;	1824	for 0 .. $#children;
1475	}	1825	}
1476	}	1826	}
1477		1827
1478	CFClient::UI::harmonize \@req;	1828	DC::UI::harmonize \@req;
1479		1829
1480	my $pos = 0;	1830	my $pos = 0;
1481	for (0 .. $#children) {	1831	for (0 .. $#children) {
1482	my $alloc = $req[$_];	1832	my $alloc = $req[$_];
1483	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1833	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1488	1	1838	1
1489	}	1839	}
1490		1840
1491	#############################################################################	1841	#############################################################################
1492		1842
1493	package CFClient::UI::HBox;	1843	package DC::UI::HBox;
1494		1844
1495	our @ISA = CFClient::UI::Box::;	1845	our @ISA = DC::UI::Box::;
1496		1846
1497	sub new {	1847	sub new {
1498	my $class = shift;	1848	my $class = shift;
1499		1849
1500	$class->SUPER::new (	1850	$class->SUPER::new (
…		…
1503	)	1853	)
1504	}	1854	}
1505		1855
1506	#############################################################################	1856	#############################################################################
1507		1857
1508	package CFClient::UI::VBox;	1858	package DC::UI::VBox;
1509		1859
1510	our @ISA = CFClient::UI::Box::;	1860	our @ISA = DC::UI::Box::;
1511		1861
1512	sub new {	1862	sub new {
1513	my $class = shift;	1863	my $class = shift;
1514		1864
1515	$class->SUPER::new (	1865	$class->SUPER::new (
…		…
1518	)	1868	)
1519	}	1869	}
1520		1870
1521	#############################################################################	1871	#############################################################################
1522		1872
1523	package CFClient::UI::Label;	1873	package DC::UI::Label;
1524		1874
1525	our @ISA = CFClient::UI::DrawBG::;	1875	our @ISA = DC::UI::DrawBG::;
1526		1876
1527	use CFClient::OpenGL;	1877	use DC::OpenGL;
1528		1878
1529	sub new {	1879	sub new {
1530	my ($class, %arg) = @_;	1880	my ($class, %arg) = @_;
1531		1881
1532	my $self = $class->SUPER::new (	1882	my $self = $class->SUPER::new (
…		…
1535	#active_bg => none	1885	#active_bg => none
1536	#font => default_font	1886	#font => default_font
1537	#text => initial text	1887	#text => initial text
1538	#markup => initial narkup	1888	#markup => initial narkup
1539	#max_w => maximum pixel width	1889	#max_w => maximum pixel width
		1890	#style => 0, # render flags
1540	ellipsise => 3, # end	1891	ellipsise => 3, # end
1541	layout => (new CFClient::Layout),	1892	layout => (new DC::Layout),
1542	fontsize => 1,	1893	fontsize => 1,
1543	align => -1,	1894	align => -1,
1544	valign => -1,	1895	valign => -1,
1545	padding_x => 2,	1896	padding_x => 2,
1546	padding_y => 2,	1897	padding_y => 2,
1547	can_events => 0,	1898	can_events => 0,
1548	%arg	1899	%arg
1549	);	1900	);
1550		1901
1551	if (exists $self->{template}) {	1902	if (exists $self->{template}) {
1552	my $layout = new CFClient::Layout;	1903	my $layout = new DC::Layout;
1553	$layout->set_text (delete $self->{template});	1904	$layout->set_text (delete $self->{template});
1554	$self->{template} = $layout;	1905	$self->{template} = $layout;
1555	}	1906	}
1556		1907
1557	if (exists $self->{markup}) {	1908	if (exists $self->{markup}) {
…		…
1561	}	1912	}
1562		1913
1563	$self	1914	$self
1564	}	1915	}
1565		1916
1566	sub escape($) {
1567	local $_ = $_[0];
1568
1569	s/&/&amp;/g;
1570	s/>/&gt;/g;
1571	s/</&lt;/g;
1572
1573	$_
1574	}
1575
1576	sub update {	1917	sub update {
1577	my ($self) = @_;	1918	my ($self) = @_;
1578		1919
1579	delete $self->{texture};	1920	delete $self->{texture};
1580	$self->SUPER::update;	1921	$self->SUPER::update;
…		…
1585		1926
1586	delete $self->{ox};	1927	delete $self->{ox};
1587	$self->SUPER::realloc;	1928	$self->SUPER::realloc;
1588	}	1929	}
1589		1930
		1931	sub clear {
		1932	my ($self) = @_;
		1933
		1934	$self->set_text ("");
		1935	}
		1936
1590	sub set_text {	1937	sub set_text {
1591	my ($self, $text) = @_;	1938	my ($self, $text) = @_;
1592		1939
1593	return if $self->{text} eq "T$text";	1940	return if $self->{text} eq "T$text";
1594	$self->{text} = "T$text";	1941	$self->{text} = "T$text";
1595		1942
1596	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597	$self->{layout}->set_text ($text);	1943	$self->{layout}->set_text ($text);
1598		1944
1599	delete $self->{size_req};	1945	delete $self->{size_req};
1600	$self->realloc;	1946	$self->realloc;
1601	$self->update;	1947	$self->update;
…		…
1607	return if $self->{text} eq "M$markup";	1953	return if $self->{text} eq "M$markup";
1608	$self->{text} = "M$markup";	1954	$self->{text} = "M$markup";
1609		1955
1610	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1956	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611		1957
1612	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613	$self->{layout}->set_markup ($markup);	1958	$self->{layout}->set_markup ($markup);
1614		1959
1615	delete $self->{size_req};	1960	delete $self->{size_req};
1616	$self->realloc;	1961	$self->realloc;
1617	$self->update;	1962	$self->update;
…		…
1619		1964
1620	sub size_request {	1965	sub size_request {
1621	my ($self) = @_;	1966	my ($self) = @_;
1622		1967
1623	$self->{size_req} ||= do {	1968	$self->{size_req} ||= do {
		1969	my ($max_w, $max_h) = $self->get_max_wh;
		1970
1624	$self->{layout}->set_font ($self->{font}) if $self->{font};	1971	$self->{layout}->set_font ($self->{font}) if $self->{font};
1625	$self->{layout}->set_width ($self->{max_w} || -1);	1972	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1626	$self->{layout}->set_ellipsise ($self->{ellipsise});	1973	$self->{layout}->set_ellipsise ($self->{ellipsise});
1627	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1974	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1628	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1975	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1629		1976
1630	my ($w, $h) = $self->{layout}->size;	1977	my ($w, $h) = $self->{layout}->size;
1631		1978
1632	if (exists $self->{template}) {	1979	if (exists $self->{template}) {
1633	$self->{template}->set_font ($self->{font}) if $self->{font};	1980	$self->{template}->set_font ($self->{font}) if $self->{font};
		1981	$self->{template}->set_width ($self->{max_w} || -1);
1634	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1982	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635		1983
1636	my ($w2, $h2) = $self->{template}->size;	1984	my ($w2, $h2) = $self->{template}->size;
1637		1985
1638	$w = List::Util::max $w, $w2;	1986	$w = List::Util::max $w, $w2;
…		…
1672		2020
1673	sub reconfigure {	2021	sub reconfigure {
1674	my ($self) = @_;	2022	my ($self) = @_;
1675		2023
1676	delete $self->{size_req};	2024	delete $self->{size_req};
		2025	delete $self->{texture};
1677		2026
1678	$self->SUPER::reconfigure;	2027	$self->SUPER::reconfigure;
1679	}	2028	}
1680		2029
1681	sub _draw {	2030	sub _draw {
1682	my ($self) = @_;	2031	my ($self) = @_;
1683		2032
1684	$self->SUPER::_draw; # draw background, if applicable	2033	$self->SUPER::_draw; # draw background, if applicable
1685		2034
1686	my $tex = $self->{texture} ||= do {	2035	my $size = $self->{texture} ||= do {
1687	$self->{layout}->set_foreground (@{$self->{fg}});	2036	$self->{layout}->set_foreground (@{$self->{fg}});
1688	$self->{layout}->set_font ($self->{font}) if $self->{font};	2037	$self->{layout}->set_font ($self->{font}) if $self->{font};
1689	$self->{layout}->set_width ($self->{w});	2038	$self->{layout}->set_width ($self->{w});
1690	$self->{layout}->set_ellipsise ($self->{ellipsise});	2039	$self->{layout}->set_ellipsise ($self->{ellipsise});
1691	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2040	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2041	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693		2042
1694	new_from_layout CFClient::Texture $self->{layout}	2043	[$self->{layout}->size]
1695	};	2044	};
1696		2045
1697	unless (exists $self->{ox}) {	2046	unless (exists $self->{ox}) {
1698	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2047	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2048	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700	: ($self->{w} - $tex->{w}) * 0.5);	2049	: ($self->{w} - $size->[0]) * 0.5);
1701		2050
1702	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2051	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2052	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704	: ($self->{h} - $tex->{h}) * 0.5);	2053	: ($self->{h} - $size->[1]) * 0.5);
		2054
		2055	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1705	};	2056	};
1706		2057
1707	glEnable GL_TEXTURE_2D;	2058	# unless ($self->{list}) {
1708		2059	# $self->{list} = DC::OpenGL::glGenList;
1709	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2060	# DC::OpenGL::glNewList $self->{list};
1710	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2061	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1711		2062	# DC::OpenGL::glEndList;
1712	if ($tex->{format} == GL_ALPHA) {
1713	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714	glColor @{$self->{fg}};
1715	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716	} else {
1717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719	}	2063	# }
		2064	#
		2065	# DC::OpenGL::glCallList $self->{list};
1720		2066
1721	glDisable GL_TEXTURE_2D;	2067	$self->{layout}->draw;
1722	}	2068	}
		2069
		2070	#sub destroy {
		2071	# my ($self) = @_;
		2072	#
		2073	# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2074	#
		2075	# $self->SUPER::destroy;
		2076	#}
1723		2077
1724	#############################################################################	2078	#############################################################################
1725		2079
1726	package CFClient::UI::EntryBase;	2080	package DC::UI::EntryBase;
1727		2081
1728	our @ISA = CFClient::UI::Label::;	2082	our @ISA = DC::UI::Label::;
1729		2083
1730	use CFClient::OpenGL;	2084	use DC::OpenGL;
1731		2085
1732	sub new {	2086	sub new {
1733	my $class = shift;	2087	my $class = shift;
1734		2088
1735	$class->SUPER::new (	2089	$class->SUPER::new (
1736	fg => [1, 1, 1],	2090	fg => [1, 1, 1],
1737	bg => [0, 0, 0, 0.2],	2091	bg => [0, 0, 0, 0.2],
		2092	outline => [0.6, 0.3, 0.1],
1738	active_bg => [1, 1, 1, 0.5],	2093	active_bg => [0, 0, 1, .2],
1739	active_fg => [0, 0, 0],	2094	active_fg => [1, 1, 1],
		2095	active_outline => [1, 1, 0],
1740	can_hover => 1,	2096	can_hover => 1,
1741	can_focus => 1,	2097	can_focus => 1,
1742	valign => 0,	2098	valign => 0,
1743	can_events => 1,	2099	can_events => 1,
		2100	ellipsise => 0,
1744	#text => ...	2101	#text => ...
1745	#hidden => "*",	2102	#hidden => "*",
1746	@_	2103	@_
1747	)	2104	)
1748	}	2105	}
…		…
1793	my $sym = $ev->{sym};	2150	my $sym = $ev->{sym};
1794	my $uni = $ev->{unicode};	2151	my $uni = $ev->{unicode};
1795		2152
1796	my $text = $self->get_text;	2153	my $text = $self->get_text;
1797		2154
		2155	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2156
1798	if ($uni == 8) {	2157	if ($uni == 8) {
1799	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2158	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1800	} elsif ($uni == 127) {	2159	} elsif ($uni == 127) {
1801	substr $text, $self->{cursor}, 1, "";	2160	substr $text, $self->{cursor}, 1, "";
1802	} elsif ($sym == CFClient::SDLK_LEFT) {	2161	} elsif ($sym == DC::SDLK_LEFT) {
1803	--$self->{cursor} if $self->{cursor};	2162	--$self->{cursor} if $self->{cursor};
1804	} elsif ($sym == CFClient::SDLK_RIGHT) {	2163	} elsif ($sym == DC::SDLK_RIGHT) {
1805	++$self->{cursor} if $self->{cursor} < length $self->{text};	2164	++$self->{cursor} if $self->{cursor} < length $self->{text};
1806	} elsif ($sym == CFClient::SDLK_HOME) {	2165	} elsif ($sym == DC::SDLK_HOME) {
		2166	# what a hack
		2167	$self->{cursor} =
		2168	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2169	? length $1
		2170	: 0;
		2171	} elsif ($sym == DC::SDLK_END) {
		2172	# uh, again
		2173	$self->{cursor} =
		2174	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2175	? $self->{cursor} + length $1
		2176	: length $self->{text};
		2177	} elsif ($uni == 21) { # ctrl-u
		2178	$text = "";
1807	$self->{cursor} = 0;	2179	$self->{cursor} = 0;
1808	} elsif ($sym == CFClient::SDLK_END) {
1809	$self->{cursor} = length $text;
1810	} elsif ($uni == 27) {	2180	} elsif ($uni == 27) {
1811	$self->emit ('escape');	2181	$self->emit ('escape');
1812	} elsif ($uni) {	2182	} elsif ($uni == 0x0d) {
		2183	substr $text, $self->{cursor}++, 0, "\012";
		2184	} elsif ($uni >= 0x20) {
1813	substr $text, $self->{cursor}++, 0, chr $uni;	2185	substr $text, $self->{cursor}++, 0, chr $uni;
1814	} else {	2186	} else {
1815	return 0;	2187	return 0;
1816	}	2188	}
1817		2189
1818	$self->_set_text ($text);	2190	$self->_set_text ($text);
1819		2191
1820	$self->realloc;	2192	$self->realloc;
		2193	$self->update;
1821		2194
1822	1	2195	1
1823	}	2196	}
1824		2197
1825	sub invoke_focus_in {	2198	sub invoke_focus_in {
…		…
1837		2210
1838	my $idx = $self->{layout}->xy_to_index ($x, $y);	2211	my $idx = $self->{layout}->xy_to_index ($x, $y);
1839		2212
1840	# byte-index to char-index	2213	# byte-index to char-index
1841	my $text = $self->{text};	2214	my $text = $self->{text};
1842	utf8::encode $text;	2215	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843	$self->{cursor} = length substr $text, 0, $idx;	2216	$self->{cursor} = length $text;
1844		2217
1845	$self->_set_text ($self->{text});	2218	$self->_set_text ($self->{text});
1846	$self->update;	2219	$self->update;
1847		2220
1848	1	2221	1
…		…
1867	glColor_premultiply @{$self->{bg}};	2240	glColor_premultiply @{$self->{bg}};
1868	}	2241	}
1869		2242
1870	glEnable GL_BLEND;	2243	glEnable GL_BLEND;
1871	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2244	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1872	glBegin GL_QUADS;
1873	glVertex 0 , 0;
1874	glVertex 0 , $self->{h};
1875	glVertex $self->{w}, $self->{h};	2245	glRect 0, 0, $self->{w}, $self->{h};
1876	glVertex $self->{w}, 0;
1877	glEnd;
1878	glDisable GL_BLEND;	2246	glDisable GL_BLEND;
1879		2247
1880	$self->SUPER::_draw;	2248	$self->SUPER::_draw;
1881		2249
1882	#TODO: force update every cursor change :(	2250	#TODO: force update every cursor change :(
…		…
1884		2252
1885	unless (exists $self->{cur_h}) {	2253	unless (exists $self->{cur_h}) {
1886	my $text = substr $self->{text}, 0, $self->{cursor};	2254	my $text = substr $self->{text}, 0, $self->{cursor};
1887	utf8::encode $text;	2255	utf8::encode $text;
1888		2256
1889	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2257	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1890	}	2258	}
1891		2259
1892	glColor @{$self->{fg}};	2260	glColor_premultiply @{$self->{active_fg}};
1893	glBegin GL_LINES;	2261	glBegin GL_LINES;
1894	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2262	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2263	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1896	glEnd;	2264	glEnd;
1897	}
1898	}
1899		2265
		2266	glLineWidth 3;
		2267	glColor @{$self->{active_outline}};
		2268	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2269	glLineWidth 1;
		2270
		2271	} else {
		2272	glColor @{$self->{outline}};
		2273	glBegin GL_LINE_STRIP;
		2274	glVertex .5, $self->{h} * .5;
		2275	glVertex .5, $self->{h} - 2.5;
		2276	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2277	glVertex $self->{w} - .5, $self->{h} * .5;
		2278	glEnd;
		2279	}
		2280	}
		2281
		2282	#############################################################################
		2283
1900	package CFClient::UI::Entry;	2284	package DC::UI::Entry;
1901		2285
1902	our @ISA = CFClient::UI::EntryBase::;	2286	our @ISA = DC::UI::EntryBase::;
1903		2287
1904	use CFClient::OpenGL;	2288	use DC::OpenGL;
1905		2289
1906	sub invoke_key_down {	2290	sub invoke_key_down {
1907	my ($self, $ev) = @_;	2291	my ($self, $ev) = @_;
1908		2292
1909	my $sym = $ev->{sym};	2293	my $sym = $ev->{sym};
1910		2294
1911	if ($sym == 13) {	2295	if ($ev->{uni} == 0x0d || $sym == 13) {
1912	unshift @{$self->{history}},	2296	unshift @{$self->{history}},
1913	my $txt = $self->get_text;	2297	my $txt = $self->get_text;
1914		2298
1915	$self->{history_pointer} = -1;	2299	$self->{history_pointer} = -1;
1916	$self->{history_saveback} = '';	2300	$self->{history_saveback} = '';
1917	$self->emit (activate => $txt);	2301	$self->emit (activate => $txt);
1918	$self->update;	2302	$self->update;
1919		2303
1920	} elsif ($sym == CFClient::SDLK_UP) {	2304	} elsif ($sym == DC::SDLK_UP) {
1921	if ($self->{history_pointer} < 0) {	2305	if ($self->{history_pointer} < 0) {
1922	$self->{history_saveback} = $self->get_text;	2306	$self->{history_saveback} = $self->get_text;
1923	}	2307	}
1924	if (@{$self->{history} || []} > 0) {	2308	if (@{$self->{history} || []} > 0) {
1925	$self->{history_pointer}++;	2309	$self->{history_pointer}++;
…		…
1927	$self->{history_pointer} = @{$self->{history} || []} - 1;	2311	$self->{history_pointer} = @{$self->{history} || []} - 1;
1928	}	2312	}
1929	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2313	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1930	}	2314	}
1931		2315
1932	} elsif ($sym == CFClient::SDLK_DOWN) {	2316	} elsif ($sym == DC::SDLK_DOWN) {
1933	$self->{history_pointer}--;	2317	$self->{history_pointer}--;
1934	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2318	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1935		2319
1936	if ($self->{history_pointer} >= 0) {	2320	if ($self->{history_pointer} >= 0) {
1937	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2321	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1946	1	2330	1
1947	}	2331	}
1948		2332
1949	#############################################################################	2333	#############################################################################
1950		2334
		2335	package DC::UI::TextEdit;
		2336
		2337	our @ISA = DC::UI::EntryBase::;
		2338
		2339	use DC::OpenGL;
		2340
		2341	sub move_cursor_ver {
		2342	my ($self, $dy) = @_;
		2343
		2344	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2345
		2346	$y += $dy;
		2347
		2348	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2349	$self->{cursor} = $index;
		2350	delete $self->{cur_h};
		2351	$self->update;
		2352	return;
		2353	}
		2354	}
		2355
		2356	sub invoke_key_down {
		2357	my ($self, $ev) = @_;
		2358
		2359	my $sym = $ev->{sym};
		2360
		2361	if ($sym == DC::SDLK_UP) {
		2362	$self->move_cursor_ver (-1);
		2363	} elsif ($sym == DC::SDLK_DOWN) {
		2364	$self->move_cursor_ver (+1);
		2365	} else {
		2366	return $self->SUPER::invoke_key_down ($ev)
		2367	}
		2368
		2369	1
		2370	}
		2371
		2372	#############################################################################
		2373
1951	package CFClient::UI::Button;	2374	package DC::UI::ButtonBin;
1952		2375
1953	our @ISA = CFClient::UI::Label::;	2376	our @ISA = DC::UI::Bin::;
1954		2377
1955	use CFClient::OpenGL;	2378	use DC::OpenGL;
1956		2379
1957	my @tex =	2380	my @tex =
1958	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2381	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1959	qw(b1_button_active.png);	2382	qw(b1_button_inactive.png b1_button_active.png);
1960		2383
1961	sub new {	2384	sub new {
1962	my $class = shift;	2385	my $class = shift;
1963		2386
1964	$class->SUPER::new (	2387	$class->SUPER::new (
1965	padding_x => 4,
1966	padding_y => 4,
1967	fg => [1, 1, 1],
1968	active_fg => [0, 0, 1],
1969	can_hover => 1,	2388	can_hover => 1,
1970	align => 0,	2389	align => 0,
1971	valign => 0,	2390	valign => 0,
1972	can_events => 1,	2391	can_events => 1,
1973	@_	2392	@_
…		…
1985	}	2404	}
1986		2405
1987	sub _draw {	2406	sub _draw {
1988	my ($self) = @_;	2407	my ($self) = @_;
1989		2408
1990	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1991
1992	glEnable GL_TEXTURE_2D;	2409	glEnable GL_TEXTURE_2D;
1993	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2410	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1994	glColor 0, 0, 0, 1;	2411	glColor 0, 0, 0, 1;
1995		2412
		2413	my $tex = $tex[$GRAB == $self];
1996	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2414	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1997		2415
1998	glDisable GL_TEXTURE_2D;	2416	glDisable GL_TEXTURE_2D;
1999		2417
2000	$self->SUPER::_draw;	2418	$self->SUPER::_draw;
2001	}	2419	}
2002		2420
2003	#############################################################################	2421	#############################################################################
2004		2422
		2423	package DC::UI::Button;
		2424
		2425	our @ISA = DC::UI::Label::;
		2426
		2427	use DC::OpenGL;
		2428
		2429	my @tex =
		2430	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
		2431	qw(b1_button_inactive.png b1_button_active.png);
		2432
		2433	sub new {
		2434	my $class = shift;
		2435
		2436	$class->SUPER::new (
		2437	padding_x => 4,
		2438	padding_y => 4,
		2439	fg => [1.0, 1.0, 1.0],
		2440	active_fg => [0.8, 0.8, 0.8],
		2441	can_hover => 1,
		2442	align => 0,
		2443	valign => 0,
		2444	can_events => 1,
		2445	@_
		2446	)
		2447	}
		2448
		2449	sub invoke_button_up {
		2450	my ($self, $ev, $x, $y) = @_;
		2451
		2452	$self->emit ("activate")
		2453	if $x >= 0 && $x < $self->{w}
		2454	&& $y >= 0 && $y < $self->{h};
		2455
		2456	1
		2457	}
		2458
		2459	sub _draw {
		2460	my ($self) = @_;
		2461
		2462	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2463
		2464	glEnable GL_TEXTURE_2D;
		2465	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2466	glColor 0, 0, 0, 1;
		2467
		2468	my $tex = $tex[$GRAB == $self];
		2469	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2470
		2471	glDisable GL_TEXTURE_2D;
		2472
		2473	$self->SUPER::_draw;
		2474	}
		2475
		2476	#############################################################################
		2477
		2478	package DC::UI::CheckBox;
		2479
		2480	our @ISA = DC::UI::DrawBG::;
		2481
		2482	my @tex =
		2483	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
		2484	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2485
		2486	use DC::OpenGL;
		2487
		2488	sub new {
		2489	my $class = shift;
		2490
		2491	$class->SUPER::new (
		2492	padding_x => 2,
		2493	padding_y => 2,
		2494	fg => [1, 1, 1],
		2495	active_fg => [1, 1, 0],
		2496	bg => [0, 0, 0, 0.2],
		2497	active_bg => [1, 1, 1, 0.5],
		2498	state => 0,
		2499	can_hover => 1,
		2500	@_
		2501	)
		2502	}
		2503
		2504	sub size_request {
		2505	my ($self) = @_;
		2506
		2507	(6) x 2
		2508	}
		2509
		2510	sub toggle {
		2511	my ($self) = @_;
		2512
		2513	$self->{state} = !$self->{state};
		2514	$self->emit (changed => $self->{state});
		2515	$self->update;
		2516	}
		2517
		2518	sub invoke_button_down {
		2519	my ($self, $ev, $x, $y) = @_;
		2520
		2521	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2522	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2523	$self->toggle;
		2524	} else {
		2525	return 0
		2526	}
		2527
		2528	1
		2529	}
		2530
		2531	sub _draw {
		2532	my ($self) = @_;
		2533
		2534	$self->SUPER::_draw;
		2535
		2536	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
		2537
		2538	my ($w, $h) = @$self{qw(w h)};
		2539
		2540	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2541
		2542	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2543
		2544	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2545
		2546	glEnable GL_TEXTURE_2D;
		2547	$tex->draw_quad_alpha (0, 0, $s, $s);
		2548	glDisable GL_TEXTURE_2D;
		2549	}
		2550
		2551	#############################################################################
		2552
		2553	package DC::UI::Image;
		2554
		2555	our @ISA = DC::UI::Base::;
		2556
		2557	use DC::OpenGL;
		2558
		2559	our %texture_cache;
		2560
		2561	sub new {
		2562	my $class = shift;
		2563
		2564	my $self = $class->SUPER::new (
		2565	can_events => 0,
		2566	scale => 1,
		2567	@_,
		2568	);
		2569
		2570	$self->{path} || $self->{tex}
		2571	or Carp::croak "'path' or 'tex' attributes required";
		2572
		2573	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2574	new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
		2575
		2576	DC::weaken $texture_cache{$self->{path}};
		2577
		2578	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2579
		2580	$self
		2581	}
		2582
		2583	sub STORABLE_freeze {
		2584	my ($self, $cloning) = @_;
		2585
		2586	$self->{path}
		2587	or die "cannot serialise DC::UI::Image on non-loadable images\n";
		2588
		2589	$self->{path}
		2590	}
		2591
		2592	sub STORABLE_attach {
		2593	my ($self, $cloning, $path) = @_;
		2594
		2595	$self->new (path => $path)
		2596	}
		2597
		2598	sub size_request {
		2599	my ($self) = @_;
		2600
		2601	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
		2602	}
		2603
		2604	sub _draw {
		2605	my ($self) = @_;
		2606
		2607	my $tex = $self->{tex};
		2608
		2609	my ($w, $h) = ($self->{w}, $self->{h});
		2610
		2611	if ($self->{rot90}) {
		2612	glRotate 90, 0, 0, 1;
		2613	glTranslate 0, -$self->{w}, 0;
		2614
		2615	($w, $h) = ($h, $w);
		2616	}
		2617
		2618	glEnable GL_TEXTURE_2D;
		2619	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2620
		2621	$tex->draw_quad_alpha (0, 0, $w, $h);
		2622
		2623	glDisable GL_TEXTURE_2D;
		2624	}
		2625
		2626	#############################################################################
		2627
2005	package CFClient::UI::ImageButton;	2628	package DC::UI::ImageButton;
2006		2629
2007	our @ISA = CFClient::UI::Image::;	2630	our @ISA = DC::UI::Image::;
2008		2631
2009	use CFClient::OpenGL;	2632	use DC::OpenGL;
2010		2633
2011	my %textures;	2634	my %textures;
2012		2635
2013	sub new {	2636	sub new {
2014	my $class = shift;	2637	my $class = shift;
…		…
2024	can_events => 1,	2647	can_events => 1,
2025	@_	2648	@_
2026	);	2649	);
2027	}	2650	}
2028		2651
		2652	sub invoke_button_down {
		2653	my ($self, $ev, $x, $y) = @_;
		2654
		2655	1
		2656	}
		2657
2029	sub invoke_button_up {	2658	sub invoke_button_up {
2030	my ($self, $ev, $x, $y) = @_;	2659	my ($self, $ev, $x, $y) = @_;
2031		2660
2032	$self->emit ("activate")	2661	$self->emit ("activate")
2033	if $x >= 0 && $x < $self->{w}	2662	if $x >= 0 && $x < $self->{w}
…		…
2036	1	2665	1
2037	}	2666	}
2038		2667
2039	#############################################################################	2668	#############################################################################
2040		2669
2041	package CFClient::UI::CheckBox;	2670	package DC::UI::VGauge;
2042		2671
2043	our @ISA = CFClient::UI::DrawBG::;
2044
2045	my @tex =
2046	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2047	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2048
2049	use CFClient::OpenGL;
2050
2051	sub new {
2052	my $class = shift;
2053
2054	$class->SUPER::new (
2055	padding_x => 2,
2056	padding_y => 2,
2057	fg => [1, 1, 1],
2058	active_fg => [1, 1, 0],
2059	bg => [0, 0, 0, 0.2],
2060	active_bg => [1, 1, 1, 0.5],
2061	state => 0,
2062	can_hover => 1,
2063	@_
2064	)
2065	}
2066
2067	sub size_request {
2068	my ($self) = @_;
2069
2070	(6) x 2
2071	}
2072
2073	sub toggle {
2074	my ($self) = @_;
2075
2076	$self->{state} = !$self->{state};
2077	$self->emit (changed => $self->{state});
2078	$self->update;
2079	}
2080
2081	sub invoke_button_down {
2082	my ($self, $ev, $x, $y) = @_;
2083
2084	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2085	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2086	$self->toggle;
2087	} else {
2088	return 0
2089	}
2090
2091	1
2092	}
2093
2094	sub _draw {
2095	my ($self) = @_;
2096
2097	$self->SUPER::_draw;
2098
2099	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2100
2101	my ($w, $h) = @$self{qw(w h)};
2102
2103	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2104
2105	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2106
2107	my $tex = $self->{state} ? $tex[1] : $tex[0];
2108
2109	glEnable GL_TEXTURE_2D;
2110	$tex->draw_quad_alpha (0, 0, $s, $s);
2111	glDisable GL_TEXTURE_2D;
2112	}
2113
2114	#############################################################################
2115
2116	package CFClient::UI::Image;
2117
2118	our @ISA = CFClient::UI::Base::;	2672	our @ISA = DC::UI::Base::;
2119
2120	use CFClient::OpenGL;
2121
2122	our %texture_cache;
2123
2124	sub new {
2125	my $class = shift;
2126
2127	my $self = $class->SUPER::new (
2128	can_events => 0,
2129	@_,
2130	);
2131
2132	$self->{path}
2133	or Carp::croak "required attribute 'path' not set";
2134
2135	$self->{tex} = $texture_cache{$self->{path}} ||=
2136	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2137
2138	Scalar::Util::weaken $texture_cache{$self->{path}};
2139
2140	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2141
2142	$self
2143	}
2144
2145	sub size_request {
2146	my ($self) = @_;
2147
2148	($self->{tex}{w}, $self->{tex}{h})
2149	}
2150
2151	sub _draw {
2152	my ($self) = @_;
2153
2154	my $tex = $self->{tex};
2155
2156	my ($w, $h) = ($self->{w}, $self->{h});
2157
2158	if ($self->{rot90}) {
2159	glRotate 90, 0, 0, 1;
2160	glTranslate 0, -$self->{w}, 0;
2161
2162	($w, $h) = ($h, $w);
2163	}
2164
2165	glEnable GL_TEXTURE_2D;
2166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2167
2168	$tex->draw_quad_alpha (0, 0, $w, $h);
2169
2170	glDisable GL_TEXTURE_2D;
2171	}
2172
2173	#############################################################################
2174
2175	package CFClient::UI::VGauge;
2176
2177	our @ISA = CFClient::UI::Base::;
2178		2673
2179	use List::Util qw(min max);	2674	use List::Util qw(min max);
2180		2675
2181	use CFClient::OpenGL;	2676	use DC::OpenGL;
2182		2677
2183	my %tex = (	2678	my %tex = (
2184	food => [	2679	food => [
2185	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2680	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2186	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2681	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2187	],	2682	],
2188	grace => [	2683	grace => [
2189	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2684	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2190	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2685	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2191	],	2686	],
2192	hp => [	2687	hp => [
2193	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2688	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2194	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2689	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2195	],	2690	],
2196	mana => [	2691	mana => [
2197	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2692	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2198	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2693	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2199	],	2694	],
2200	);	2695	);
2201		2696
2202	# eg. VGauge->new (gauge => 'food'), default gauge: food	2697	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2305	glDisable GL_TEXTURE_2D;	2800	glDisable GL_TEXTURE_2D;
2306	}	2801	}
2307		2802
2308	#############################################################################	2803	#############################################################################
2309		2804
		2805	package DC::UI::Progress;
		2806
		2807	our @ISA = DC::UI::Label::;
		2808
		2809	use DC::OpenGL;
		2810
		2811	sub new {
		2812	my ($class, %arg) = @_;
		2813
		2814	my $self = $class->SUPER::new (
		2815	fg => [1, 1, 1],
		2816	bg => [0, 0, 1, 0.2],
		2817	bar => [0.7, 0.5, 0.1, 0.8],
		2818	outline => [0.4, 0.3, 0],
		2819	fontsize => 0.9,
		2820	valign => 0,
		2821	align => 0,
		2822	can_events => 1,
		2823	ellipsise => 1,
		2824	label => "%d%%",
		2825	%arg,
		2826	);
		2827
		2828	$self->set_value ($arg{value} || -1);
		2829
		2830	$self
		2831	}
		2832
		2833	sub set_label {
		2834	my ($self, $label) = @_;
		2835
		2836	return if $self->{label} eq $label;
		2837	$self->{label} = $label;
		2838
		2839	$self->DC::UI::Progress::set_value (0 + delete $self->{value});
		2840	}
		2841
		2842	sub set_value {
		2843	my ($self, $value) = @_;
		2844
		2845	if ($self->{value} ne $value) {
		2846	$self->{value} = $value;
		2847
		2848	if ($value < 0) {
		2849	$self->set_text ("-");
		2850	} else {
		2851	$self->set_text (sprintf $self->{label}, $value * 100);
		2852	}
		2853
		2854	$self->update;
		2855	}
		2856	}
		2857
		2858	sub _draw {
		2859	my ($self) = @_;
		2860
		2861	glEnable GL_BLEND;
		2862	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2863
		2864	if ($self->{value} >= 0) {
		2865	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2866
		2867	glColor_premultiply @{$self->{bar}};
		2868	glRect 2, 2, $s, $self->{h} - 2;
		2869	glColor_premultiply @{$self->{bg}};
		2870	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2871	}
		2872
		2873	glColor_premultiply @{$self->{outline}};
		2874	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2875
		2876	glDisable GL_BLEND;
		2877
		2878	{
		2879	local $self->{bg}; # do not draw background
		2880	$self->SUPER::_draw;
		2881	}
		2882	}
		2883
		2884	#############################################################################
		2885
		2886	package DC::UI::ExperienceProgress;
		2887
		2888	our @ISA = DC::UI::Progress::;
		2889
		2890	sub new {
		2891	my ($class, %arg) = @_;
		2892
		2893	my $self = $class->SUPER::new (
		2894	tooltip => sub {
		2895	my ($self) = @_;
		2896
		2897	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2898	$self->{lvl},
		2899	::formsep ($self->{exp}),
		2900	::formsep ($self->{nxt}),
		2901	::formsep ($self->{nxt} - $self->{exp}),
		2902	},
		2903	%arg
		2904	);
		2905
		2906	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2907	if $::CONN;
		2908
		2909	$self
		2910	}
		2911
		2912	sub DESTROY {
		2913	my ($self) = @_;
		2914
		2915	delete $::CONN->{on_exp_update}{$self+0}
		2916	if $::CONN;
		2917
		2918	$self->SUPER::DESTROY;
		2919	}
		2920
		2921	sub set_value {
		2922	my ($self, $lvl, $exp) = @_;
		2923
		2924	$self->{lvl} = $lvl;
		2925	$self->{exp} = $exp;
		2926
		2927	my $v = -1;
		2928
		2929	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2930	my $l0 = $table->[$lvl - 1];
		2931	my $l1 = $table->[$lvl];
		2932
		2933	$self->{nxt} = $l1;
		2934
		2935	$v = ($exp - $l0) / ($l1 - $l0);
		2936	}
		2937
		2938	$self->SUPER::set_value ($v);
		2939	}
		2940
		2941	#############################################################################
		2942
2310	package CFClient::UI::Gauge;	2943	package DC::UI::Gauge;
2311		2944
2312	our @ISA = CFClient::UI::VBox::;	2945	our @ISA = DC::UI::VBox::;
2313		2946
2314	sub new {	2947	sub new {
2315	my ($class, %arg) = @_;	2948	my ($class, %arg) = @_;
2316		2949
2317	my $self = $class->SUPER::new (	2950	my $self = $class->SUPER::new (
…		…
2319	can_hover => 1,	2952	can_hover => 1,
2320	can_events => 1,	2953	can_events => 1,
2321	%arg,	2954	%arg,
2322	);	2955	);
2323		2956
2324	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2957	$self->add ($self->{value} = new DC::UI::Label valign => +1, align => 0, template => "999");
2325	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2958	$self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2326	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2959	$self->add ($self->{max} = new DC::UI::Label valign => -1, align => 0, template => "999");
2327		2960
2328	$self	2961	$self
2329	}	2962	}
2330		2963
2331	sub set_fontsize {	2964	sub set_fontsize {
…		…
2352	$self->{value}->set_text ($val);	2985	$self->{value}->set_text ($val);
2353	}	2986	}
2354		2987
2355	#############################################################################	2988	#############################################################################
2356		2989
2357	package CFClient::UI::Slider;	2990	package DC::UI::Slider;
2358		2991
2359	use strict;	2992	use strict;
2360		2993
2361	use CFClient::OpenGL;	2994	use DC::OpenGL;
2362		2995
2363	our @ISA = CFClient::UI::DrawBG::;	2996	our @ISA = DC::UI::DrawBG::;
2364		2997
2365	my @tex =	2998	my @tex =
2366	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2999	map { new_from_file DC::Texture DC::find_rcfile $_ }
2367	qw(s1_slider.png s1_slider_bg.png);	3000	qw(s1_slider.png s1_slider_bg.png);
2368		3001
2369	sub new {	3002	sub new {
2370	my $class = shift;	3003	my $class = shift;
2371		3004
…		…
2439		3072
2440	$self->SUPER::invoke_button_down ($ev, $x, $y);	3073	$self->SUPER::invoke_button_down ($ev, $x, $y);
2441		3074
2442	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3075	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2443		3076
2444	$self->invoke_mouse_motion ($ev, $x, $y)	3077	$self->invoke_mouse_motion ($ev, $x, $y);
		3078
		3079	1
2445	}	3080	}
2446		3081
2447	sub invoke_mouse_motion {	3082	sub invoke_mouse_motion {
2448	my ($self, $ev, $x, $y) = @_;	3083	my ($self, $ev, $x, $y) = @_;
2449		3084
…		…
2456		3091
2457	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3092	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2458	} else {	3093	} else {
2459	return 0;	3094	return 0;
2460	}	3095	}
		3096
		3097	1
		3098	}
		3099
		3100	sub invoke_mouse_wheel {
		3101	my ($self, $ev) = @_;
		3102
		3103	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		3104
		3105	my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
		3106
		3107	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2461		3108
2462	1	3109	1
2463	}	3110	}
2464		3111
2465	sub update {	3112	sub update {
…		…
2516	glDisable GL_TEXTURE_2D;	3163	glDisable GL_TEXTURE_2D;
2517	}	3164	}
2518		3165
2519	#############################################################################	3166	#############################################################################
2520		3167
2521	package CFClient::UI::ValSlider;	3168	package DC::UI::ValSlider;
2522		3169
2523	our @ISA = CFClient::UI::HBox::;	3170	our @ISA = DC::UI::HBox::;
2524		3171
2525	sub new {	3172	sub new {
2526	my ($class, %arg) = @_;	3173	my ($class, %arg) = @_;
2527		3174
2528	my $range = delete $arg{range};	3175	my $range = delete $arg{range};
2529		3176
2530	my $self = $class->SUPER::new (	3177	my $self = $class->SUPER::new (
2531	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3178	slider => (new DC::UI::Slider expand => 1, range => $range),
2532	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3179	entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2533	to_value => sub { shift },	3180	to_value => sub { shift },
2534	from_value => sub { shift },	3181	from_value => sub { shift },
2535	%arg,	3182	%arg,
2536	);	3183	);
2537		3184
…		…
2557	sub set_range { shift->{slider}->set_range (@_) }	3204	sub set_range { shift->{slider}->set_range (@_) }
2558	sub set_value { shift->{slider}->set_value (@_) }	3205	sub set_value { shift->{slider}->set_value (@_) }
2559		3206
2560	#############################################################################	3207	#############################################################################
2561		3208
2562	package CFClient::UI::TextScroller;	3209	package DC::UI::TextScroller;
2563		3210
2564	our @ISA = CFClient::UI::HBox::;	3211	our @ISA = DC::UI::HBox::;
2565		3212
2566	use CFClient::OpenGL;	3213	use DC::OpenGL;
2567		3214
2568	sub new {	3215	sub new {
2569	my $class = shift;	3216	my $class = shift;
2570		3217
2571	my $self = $class->SUPER::new (	3218	my $self = $class->SUPER::new (
2572	fontsize => 1,	3219	fontsize => 1,
2573	can_events => 0,	3220	can_events => 1,
2574	indent => 0,	3221	indent => 0,
2575	#font => default_font	3222	#font => default_font
2576	@_,	3223	@_,
2577		3224
2578	layout => (new CFClient::Layout 1),	3225	layout => (new DC::Layout),
2579	par => [],	3226	par => [],
		3227	max_par => 0,
2580	height => 0,	3228	height => 0,
2581	children => [	3229	children => [
2582	(new CFClient::UI::Empty expand => 1),	3230	(new DC::UI::Empty expand => 1),
2583	(new CFClient::UI::Slider vertical => 1),	3231	(new DC::UI::Slider vertical => 1),
2584	],	3232	],
2585	);	3233	);
2586		3234
2587	$self->{children}[1]->connect (changed => sub { $self->update });	3235	$self->{children}[1]->connect (changed => sub { $self->update });
2588		3236
…		…
2597	}	3245	}
2598		3246
2599	sub size_request {	3247	sub size_request {
2600	my ($self) = @_;	3248	my ($self) = @_;
2601		3249
2602	my ($empty, $slider) = @{ $self->{children} };	3250	my ($empty, $slider) = $self->visible_children;
2603		3251
2604	local $self->{children} = [$empty, $slider];	3252	local $self->{children} = [$empty, $slider];
2605	$self->SUPER::size_request	3253	$self->SUPER::size_request
2606	}	3254	}
2607		3255
…		…
2618		3266
2619	$self->reflow;	3267	$self->reflow;
2620		3268
2621	local $self->{children} = [$empty, $slider];	3269	local $self->{children} = [$empty, $slider];
2622	$self->SUPER::invoke_size_allocate ($w, $h)	3270	$self->SUPER::invoke_size_allocate ($w, $h)
		3271	}
		3272
		3273	sub invoke_mouse_wheel {
		3274	my ($self, $ev) = @_;
		3275
		3276	return 0 unless $ev->{dy}; # only vertical movements
		3277
		3278	$self->{children}[1]->emit (mouse_wheel => $ev);
		3279
		3280	1
2623	}	3281	}
2624		3282
2625	sub get_layout {	3283	sub get_layout {
2626	my ($self, $para) = @_;	3284	my ($self, $para) = @_;
2627		3285
…		…
2655		3313
2656	# todo: base offset on lines or so, not on pixels	3314	# todo: base offset on lines or so, not on pixels
2657	$self->{children}[1]->set_value ($offset);	3315	$self->{children}[1]->set_value ($offset);
2658	}	3316	}
2659		3317
		3318	sub current_paragraph {
		3319	my ($self) = @_;
		3320
		3321	$self->{top_paragraph} - 1
		3322	}
		3323
		3324	sub scroll_to {
		3325	my ($self, $para) = @_;
		3326
		3327	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3328
		3329	$self->{scroll_to} = $para;
		3330	$self->update;
		3331	}
		3332
2660	sub clear {	3333	sub clear {
2661	my ($self) = @_;	3334	my ($self) = @_;
2662		3335
2663	my (undef, undef, @other) = @{ $self->{children} };	3336	my (undef, undef, @other) = @{ $self->{children} };
2664	$self->remove ($_) for @other;	3337	$self->remove ($_) for @other;
…		…
2667	$self->{height} = 0;	3340	$self->{height} = 0;
2668	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3341	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2669	}	3342	}
2670		3343
2671	sub add_paragraph {	3344	sub add_paragraph {
2672	my ($self, $color, $para, $indent) = @_;	3345	my $self = shift;
2673		3346
2674	my ($text, @w) = ref $para ? @$para : $para;	3347	for my $para (@_) {
2675
2676	$para = {	3348	$para = {
		3349	fg => [1, 1, 1, 1],
		3350	indent => 0,
		3351	markup => "",
		3352	widget => [],
		3353	ref $para ? %$para : (markup => $para),
2677	w => 1e10,	3354	w => 1e10,
2678	wrapped => 1,	3355	wrapped => 1,
2679	fg => $color,
2680	indent => $indent,
2681	markup => $text,
2682	widget => \@w,
2683	};	3356	};
2684		3357
2685	$self->add (@w) if @w;	3358	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2686	push @{$self->{par}}, $para;	3359	push @{$self->{par}}, $para;
		3360	}
		3361
		3362	if (my $max = $self->{max_par}) {
		3363	shift @{$self->{par}} while @{$self->{par}} > $max;
		3364	}
2687		3365
2688	$self->{need_reflow}++;	3366	$self->{need_reflow}++;
2689	$self->update;	3367	$self->update;
2690	}	3368	}
2691		3369
2692	sub scroll_to_bottom {	3370	sub scroll_to_bottom {
2693	my ($self) = @_;	3371	my ($self) = @_;
2694		3372
2695	$self->{scroll_to_bottom} = 1;	3373	$self->{scroll_to} = $#{$self->{par}};
2696	$self->update;	3374	$self->update;
2697	}	3375	}
2698		3376
		3377	sub force_uptodate {
		3378	my ($self) = @_;
		3379
		3380	if (delete $self->{need_reflow}) {
		3381	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3382
		3383	my $height = 0;
		3384
		3385	for my $para (@{$self->{par}}) {
		3386	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3387	my $layout = $self->get_layout ($para);
		3388	my ($w, $h) = $layout->size;
		3389
		3390	$para->{w} = $w + $para->{indent};
		3391	$para->{h} = $h;
		3392	$para->{wrapped} = $layout->has_wrapped;
		3393	}
		3394
		3395	$para->{y} = $height;
		3396	$height += $para->{h};
		3397	}
		3398
		3399	$self->{height} = $height;
		3400	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3401
		3402	delete $self->{texture};
		3403	}
		3404
		3405	if (my $paridx = delete $self->{scroll_to}) {
		3406	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3407	}
		3408	}
		3409
2699	sub update {	3410	sub update {
2700	my ($self) = @_;	3411	my ($self) = @_;
2701		3412
2702	$self->SUPER::update;	3413	$self->SUPER::update;
2703		3414
2704	return unless $self->{h} > 0;	3415	return unless $self->{h} > 0;
2705		3416
2706	delete $self->{texture};	3417	delete $self->{texture};
2707		3418
2708	$ROOT->on_post_alloc ($self => sub {	3419	$ROOT->on_post_alloc ($self => sub {
		3420	$self->force_uptodate;
		3421
2709	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3422	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2710		3423
2711	if (delete $self->{need_reflow}) {
2712	my $height = 0;
2713
2714	for my $para (@{$self->{par}}) {
2715	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2716	my $layout = $self->get_layout ($para);
2717	my ($w, $h) = $layout->size;
2718
2719	$para->{w} = $w + $para->{indent};
2720	$para->{h} = $h;
2721	$para->{wrapped} = $layout->has_wrapped;
2722	}
2723
2724	$height += $para->{h};
2725	}
2726
2727	$self->{height} = $height;
2728
2729	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2730
2731	delete $self->{texture};
2732	}
2733
2734	if (delete $self->{scroll_to_bottom}) {
2735	$self->{children}[1]->set_value (1e10);
2736	}
2737
2738	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3424	$self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2739	glClearColor 0, 0, 0, 0;	3425	glClearColor 0, 0, 0, 0;
2740	glClear GL_COLOR_BUFFER_BIT;	3426	glClear GL_COLOR_BUFFER_BIT;
2741		3427
		3428	package DC::UI::Base;
		3429	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3430	(0, 0, $self->{w}, $self->{h});
		3431
		3432	my $top = int $self->{children}[1]{range}[0];
		3433
		3434	my $paridx = 0;
		3435	my $top_paragraph;
2742	my $top = int $self->{children}[1]{range}[0];	3436	my $top = int $self->{children}[1]{range}[0];
2743		3437
2744	my $y0 = $top;	3438	my $y0 = $top;
2745	my $y1 = $top + $H;	3439	my $y1 = $top + $H;
2746		3440
2747	my $y = 0;
2748
2749	glEnable GL_BLEND;
2750	#TODO# not correct in windows where rgba is forced off
2751	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2752
2753	for my $para (@{$self->{par}}) {	3441	for my $para (@{$self->{par}}) {
2754	my $h = $para->{h};	3442	my $h = $para->{h};
		3443	my $y = $para->{y};
2755		3444
2756	if ($y0 < $y + $h && $y < $y1) {	3445	if ($y0 < $y + $h && $y < $y1) {
2757
2758	my $layout = $self->get_layout ($para);	3446	my $layout = $self->get_layout ($para);
2759		3447
2760	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762	glRasterPos $para->{indent}, $y - $y0;	3448	$layout->render ($para->{indent}, $y - $y0);
2763	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3449	$layout->draw;
2764		3450
2765	if (my @w = @{ $para->{widget} }) {	3451	if (my @w = @{ $para->{widget} }) {
2766	my @s = $layout->get_shapes;	3452	my @s = $layout->get_shapes;
2767		3453
2768	glDisable GL_BLEND;
2769	for (@w) {	3454	for (@w) {
2770	my ($dx, $dy) = splice @s, 0, 2, ();	3455	my ($dx, $dy) = splice @s, 0, 2, ();
2771		3456
2772	$_->{x} = $dx + $para->{indent};	3457	$_->{x} = $dx + $para->{indent};
2773	$_->{y} = $dy + $y - $y0;	3458	$_->{y} = $dy + $y - $y0;
2774		3459
2775	$_->draw;	3460	$_->draw;
2776	}	3461	}
2777	glEnable GL_BLEND;
2778	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779	}	3462	}
2780	}	3463	}
2781		3464
2782	$y += $h;	3465	$paridx++;
		3466	$top_paragraph ||= $paridx if $y >= $top;
2783	}	3467	}
2784		3468
2785	glDisable GL_BLEND;	3469	$self->{top_paragraph} = $top_paragraph;
2786	};	3470	};
2787	});	3471	});
2788	}	3472	}
2789		3473
2790	sub reconfigure {	3474	sub reconfigure {
…		…
2808	$self->{children}[1]->draw;	3492	$self->{children}[1]->draw;
2809	}	3493	}
2810		3494
2811	#############################################################################	3495	#############################################################################
2812		3496
2813	package CFClient::UI::Animator;	3497	package DC::UI::Animator;
2814		3498
2815	use CFClient::OpenGL;	3499	use DC::OpenGL;
2816		3500
2817	our @ISA = CFClient::UI::Bin::;	3501	our @ISA = DC::UI::Bin::;
2818		3502
2819	sub moveto {	3503	sub moveto {
2820	my ($self, $x, $y) = @_;	3504	my ($self, $x, $y) = @_;
2821		3505
2822	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3506	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2850	glPopMatrix;	3534	glPopMatrix;
2851	}	3535	}
2852		3536
2853	#############################################################################	3537	#############################################################################
2854		3538
2855	package CFClient::UI::Flopper;	3539	package DC::UI::Flopper;
2856		3540
2857	our @ISA = CFClient::UI::Button::;	3541	our @ISA = DC::UI::Button::;
2858		3542
2859	sub new {	3543	sub new {
2860	my $class = shift;	3544	my $class = shift;
2861		3545
2862	my $self = $class->SUPER::new (	3546	my $self = $class->SUPER::new (
…		…
2874	$self->{other}->toggle_visibility;	3558	$self->{other}->toggle_visibility;
2875	}	3559	}
2876		3560
2877	#############################################################################	3561	#############################################################################
2878		3562
2879	package CFClient::UI::Tooltip;	3563	package DC::UI::Tooltip;
2880		3564
2881	our @ISA = CFClient::UI::Bin::;	3565	our @ISA = DC::UI::Bin::;
2882		3566
2883	use CFClient::OpenGL;	3567	use DC::OpenGL;
2884		3568
2885	sub new {	3569	sub new {
2886	my $class = shift;	3570	my $class = shift;
2887		3571
2888	$class->SUPER::new (	3572	$class->SUPER::new (
…		…
2892	}	3576	}
2893		3577
2894	sub set_tooltip_from {	3578	sub set_tooltip_from {
2895	my ($self, $widget) = @_;	3579	my ($self, $widget) = @_;
2896		3580
2897	my $tooltip = $widget->{tooltip};	3581	my $tip = $widget->{tooltip};
		3582	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3583
		3584	$tip = DC::Pod::section_label tooltip => $1
		3585	if $tip =~ /^#(.*)$/;
2898		3586
2899	if ($ENV{CFPLUS_DEBUG} & 2) {	3587	if ($ENV{CFPLUS_DEBUG} & 2) {
2900	$tooltip .= "\n\n" . (ref $widget) . "\n"	3588	$tip .= "\n\n" . (ref $widget) . "\n"
2901	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3589	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2902	. "req $widget->{req_w} $widget->{req_h}\n"	3590	. "req $widget->{req_w} $widget->{req_h}\n"
2903	. "visible $widget->{visible}";	3591	. "visible $widget->{visible}";
2904	}	3592	}
2905		3593
2906	$tooltip =~ s/^\n+//;	3594	$tip =~ s/^\n+//;
2907	$tooltip =~ s/\n+$//;	3595	$tip =~ s/\n+$//;
2908		3596
2909	$self->add (new CFClient::UI::Label	3597	$self->add (new DC::UI::Label
2910	markup => $tooltip,	3598	markup => $tip,
2911	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3599	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2912	fontsize => 0.8,	3600	fontsize => 0.8,
2913	fg => [0, 0, 0, 1],	3601	style => 1, # FLAG_INVERSE
2914	ellipsise => 0,	3602	ellipsise => 0,
2915	font => ($widget->{tooltip_font} || $::FONT_PROP),	3603	font => ($widget->{tooltip_font} || $::FONT_PROP),
2916	);	3604	);
2917	}	3605	}
2918		3606
…		…
2937		3625
2938	$self->{root}->on_post_alloc ("move_$self" => sub {	3626	$self->{root}->on_post_alloc ("move_$self" => sub {
2939	my $widget = $self->{owner}	3627	my $widget = $self->{owner}
2940	or return;	3628	or return;
2941		3629
		3630	if ($widget->{visible}) {
2942	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3631	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943		3632
2944	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3633	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945	if $x + $self->{w} > $self->{root}{w};	3634	if $x + $self->{w} > $self->{root}{w};
2946		3635
2947	$self->move_abs ($x, $y);	3636	$self->move_abs ($x, $y);
		3637	} else {
		3638	$self->hide;
		3639	}
2948	});	3640	});
2949	}	3641	}
2950		3642
2951	sub _draw {	3643	sub _draw {
2952	my ($self) = @_;	3644	my ($self) = @_;
2953		3645
2954	glTranslate 0.375, 0.375;
2955
2956	my ($w, $h) = @$self{qw(w h)};	3646	my ($w, $h) = @$self{qw(w h)};
2957		3647
2958	glColor 1, 0.8, 0.4;	3648	glColor 1, 0.8, 0.4;
2959	glBegin GL_QUADS;	3649	glRect 0, 0, $w, $h;
2960	glVertex 0 , 0;
2961	glVertex 0 , $h;
2962	glVertex $w, $h;
2963	glVertex $w, 0;
2964	glEnd;
2965		3650
2966	glColor 0, 0, 0;	3651	glColor 0, 0, 0;
2967	glBegin GL_LINE_LOOP;	3652	glRect_lineloop .5, .5, $w + .5, $h + .5;
2968	glVertex 0 , 0;
2969	glVertex 0 , $h;
2970	glVertex $w, $h;
2971	glVertex $w, 0;
2972	glEnd;
2973		3653
2974	glTranslate 2 - 0.375, 2 - 0.375;	3654	glTranslate 2, 2;
2975		3655
2976	$self->SUPER::_draw;	3656	$self->SUPER::_draw;
2977	}	3657	}
2978		3658
2979	#############################################################################	3659	#############################################################################
2980		3660
2981	package CFClient::UI::Face;	3661	package DC::UI::Face;
2982		3662
2983	our @ISA = CFClient::UI::Base::;	3663	our @ISA = DC::UI::DrawBG::;
2984		3664
2985	use CFClient::OpenGL;	3665	use DC::OpenGL;
2986		3666
2987	sub new {	3667	sub new {
2988	my $class = shift;	3668	my $class = shift;
2989		3669
2990	my $self = $class->SUPER::new (	3670	my $self = $class->SUPER::new (
		3671	size_w => 32,
		3672	size_h => 8,
2991	aspect => 1,	3673	aspect => 1,
2992	can_events => 0,	3674	can_events => 0,
2993	@_,	3675	@_,
2994	);	3676	);
2995		3677
2996	if ($self->{anim} && $self->{animspeed}) {	3678	if ($self->{anim} && $self->{animspeed}) {
2997	Scalar::Util::weaken (my $widget = $self);	3679	DC::weaken (my $widget = $self);
2998		3680
2999	$self->{timer} = Event->timer (	3681	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3000	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3682	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3001	hard => 1,	3683	return unless $::CONN;
3002	interval => $self->{animspeed},	3684
3003	cb => sub {	3685	my $w = $widget
		3686	or return;
		3687
3004	++$widget->{frame};	3688	++$w->{frame};
		3689	$w->update_face;
		3690
		3691	# somehow, $widget can go away
3005	$widget->update;	3692	$w->update;
3006	},	3693	$w->update_timer;
3007	);	3694	};
		3695
		3696	$self->update_face;
		3697	$self->update_timer;
3008	}	3698	}
3009		3699
3010	$self	3700	$self
3011	}	3701	}
3012		3702
		3703	sub update_timer {
		3704	my ($self) = @_;
		3705
		3706	return unless $self->{timer};
		3707
		3708	if ($self->{visible}) {
		3709	$self->{timer}->start;
		3710	} else {
		3711	$self->{timer}->stop;
		3712	}
		3713	}
		3714
		3715	sub update_face {
		3716	my ($self) = @_;
		3717
		3718	if ($::CONN) {
		3719	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3720	if ($anim && @$anim) {
		3721	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3722	delete $self->{face_change_cb};
		3723
		3724	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3725	unless ($tex->{name} || $tex->{loading}) {
		3726	$tex->upload (sub { $self->reconfigure });
		3727	}
		3728	}
		3729	}
		3730	}
		3731	}
		3732	}
		3733
3013	sub size_request {	3734	sub size_request {
3014	(32, 8)	3735	my ($self) = @_;
		3736
		3737	if ($::CONN) {
		3738	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3739	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3740	if ($tex->{name}) {
		3741	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3742	} elsif (!$tex->{loading}) {
		3743	$tex->upload (sub { $self->reconfigure });
		3744	}
		3745	}
		3746
		3747	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3748	}
		3749	}
		3750
		3751	($self->{size_w} || 8, $self->{size_h} || 8)
3015	}	3752	}
3016		3753
3017	sub update {	3754	sub update {
3018	my ($self) = @_;	3755	my ($self) = @_;
3019		3756
3020	return unless $self->{visible};	3757	return unless $self->{visible};
3021		3758
3022	$self->SUPER::update;	3759	$self->SUPER::update;
3023	}	3760	}
3024		3761
		3762	sub invoke_visibility_change {
		3763	my ($self) = @_;
		3764
		3765	$self->update_timer;
		3766
		3767	0
		3768	}
		3769
3025	sub _draw {	3770	sub _draw {
3026	my ($self) = @_;	3771	my ($self) = @_;
3027		3772
3028	return unless $::CONN;	3773	$self->SUPER::_draw;
3029		3774
3030	my $face;	3775	if (my $tex = $self->{tex}) {
3031
3032	if ($self->{frame}) {
3033	my $anim = $::CONN->{anim}[$self->{anim}];
3034
3035	$face = $anim->[ $self->{frame} % @$anim ]
3036	if $anim && @$anim;
3037	}
3038
3039	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3040
3041	if ($tex) {
3042	glEnable GL_TEXTURE_2D;	3776	glEnable GL_TEXTURE_2D;
3043	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3777	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3044	glColor 0, 0, 0, 1;	3778	glColor 0, 0, 0, 1;
3045	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3779	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3046	glDisable GL_TEXTURE_2D;	3780	glDisable GL_TEXTURE_2D;
…		…
3048	}	3782	}
3049		3783
3050	sub destroy {	3784	sub destroy {
3051	my ($self) = @_;	3785	my ($self) = @_;
3052		3786
3053	$self->{timer}->cancel	3787	(delete $self->{timer})->cancel
3054	if $self->{timer};	3788	if $self->{timer};
3055		3789
3056	$self->SUPER::destroy;	3790	$self->SUPER::destroy;
3057	}	3791	}
3058		3792
3059	#############################################################################	3793	#############################################################################
3060		3794
3061	package CFClient::UI::Buttonbar;	3795	package DC::UI::Buttonbar;
3062		3796
3063	our @ISA = CFClient::UI::HBox::;	3797	our @ISA = DC::UI::HBox::;
3064		3798
3065	# TODO: should actualyl wrap buttons and other goodies.	3799	# TODO: should actually wrap buttons and other goodies.
3066		3800
3067	#############################################################################	3801	#############################################################################
3068		3802
3069	package CFClient::UI::Menu;	3803	package DC::UI::Menu;
3070		3804
3071	our @ISA = CFClient::UI::FancyFrame::;	3805	our @ISA = DC::UI::Toplevel::;
3072		3806
3073	use CFClient::OpenGL;	3807	use DC::OpenGL;
3074		3808
3075	sub new {	3809	sub new {
3076	my $class = shift;	3810	my $class = shift;
3077		3811
3078	my $self = $class->SUPER::new (	3812	my $self = $class->SUPER::new (
3079	items => [],	3813	items => [],
3080	z => 100,	3814	z => 100,
3081	@_,	3815	@_,
3082	);	3816	);
3083		3817
3084	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3818	$self->add ($self->{vbox} = new DC::UI::VBox);
3085		3819
3086	for my $item (@{ $self->{items} }) {	3820	for my $item (@{ $self->{items} }) {
3087	my ($widget, $cb, $tooltip) = @$item;	3821	my ($widget, $cb, $tooltip) = @$item;
3088		3822
3089	# handle various types of items, only text for now	3823	# handle various types of items, only text for now
3090	if (!ref $widget) {	3824	if (!ref $widget) {
		3825	if ($widget =~ /\t/) {
		3826	my ($left, $right) = split /\t/, $widget, 2;
		3827
3091	$widget = new CFClient::UI::Label	3828	$widget = new DC::UI::HBox
3092	can_hover => 1,	3829	can_hover => 1,
3093	can_events => 1,	3830	can_events => 1,
		3831	tooltip => $tooltip,
		3832	children => [
		3833	(new DC::UI::Label markup => $left, expand => 1),
		3834	(new DC::UI::Label markup => $right, align => +1),
		3835	],
		3836	;
		3837
		3838	} else {
		3839	$widget = new DC::UI::Label
		3840	can_hover => 1,
		3841	can_events => 1,
3094	markup => $widget,	3842	markup => $widget,
3095	tooltip => $tooltip	3843	tooltip => $tooltip;
		3844	}
3096	}	3845	}
3097		3846
3098	$self->{item}{$widget} = $item;	3847	$self->{item}{$widget} = $item;
3099		3848
3100	$self->{vbox}->add ($widget);	3849	$self->{vbox}->add ($widget);
…		…
3143	1	3892	1
3144	}	3893	}
3145		3894
3146	#############################################################################	3895	#############################################################################
3147		3896
3148	package CFClient::UI::Multiplexer;	3897	package DC::UI::Multiplexer;
3149		3898
3150	our @ISA = CFClient::UI::Container::;	3899	our @ISA = DC::UI::Container::;
3151		3900
3152	sub new {	3901	sub new {
3153	my $class = shift;	3902	my $class = shift;
3154		3903
3155	my $self = $class->SUPER::new (	3904	my $self = $class->SUPER::new (
…		…
3216	$self->{current}->draw;	3965	$self->{current}->draw;
3217	}	3966	}
3218		3967
3219	#############################################################################	3968	#############################################################################
3220		3969
3221	package CFClient::UI::Notebook;	3970	package DC::UI::Notebook;
3222		3971
		3972	use DC::OpenGL;
		3973
3223	our @ISA = CFClient::UI::VBox::;	3974	our @ISA = DC::UI::VBox::;
3224		3975
3225	sub new {	3976	sub new {
3226	my $class = shift;	3977	my $class = shift;
3227		3978
3228	my $self = $class->SUPER::new (	3979	my $self = $class->SUPER::new (
3229	buttonbar => (new CFClient::UI::Buttonbar),	3980	buttonbar => (new DC::UI::Buttonbar),
3230	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3981	multiplexer => (new DC::UI::Multiplexer expand => 1),
		3982	active_outline => [.7, .7, 0.2],
3231	# filter => # will be put between multiplexer and $self	3983	# filter => # will be put between multiplexer and $self
3232	@_,	3984	@_,
3233	);	3985	);
3234		3986
3235	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3987	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3236	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3988	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3237		3989
		3990	{
		3991	Scalar::Util::weaken (my $wself = $self);
		3992
		3993	$self->{multiplexer}->connect (c_add => sub {
		3994	my ($mplex, $widgets) = @_;
		3995
		3996	for my $child (@$widgets) {
		3997	Scalar::Util::weaken $child;
		3998	$child->{c_tab_} ||= do {
		3999	my $tab =
		4000	(UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
		4001	? $child->{c_tab}
		4002	: new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4003
		4004	$tab->connect (activate => sub {
		4005	$wself->set_current_page ($child);
		4006	});
		4007
		4008	$tab
		4009	};
		4010
		4011	$self->{buttonbar}->add ($child->{c_tab_});
		4012	}
		4013	});
		4014
		4015	$self->{multiplexer}->connect (c_remove => sub {
		4016	my ($mplex, $widgets) = @_;
		4017
		4018	for my $child (@$widgets) {
		4019	$wself->{buttonbar}->remove ($child->{c_tab_});
		4020	}
		4021	});
		4022	}
		4023
3238	$self	4024	$self
3239	}	4025	}
3240		4026
3241	sub add {	4027	sub add {
		4028	my ($self, @widgets) = @_;
		4029
		4030	$self->{multiplexer}->add (@widgets)
		4031	}
		4032
		4033	sub remove {
		4034	my ($self, @widgets) = @_;
		4035
		4036	$self->{multiplexer}->remove (@widgets)
		4037	}
		4038
		4039	sub pages {
		4040	my ($self) = @_;
		4041	$self->{multiplexer}->children
		4042	}
		4043
		4044	sub add_tab {
3242	my ($self, $title, $widget, $tooltip) = @_;	4045	my ($self, $title, $widget, $tooltip) = @_;
3243		4046
3244	Scalar::Util::weaken $self;	4047	$title = [$title, $tooltip] unless ref $title;
		4048	$widget->{c_tab} = $title;
3245		4049
3246	$self->{buttonbar}->add (new CFClient::UI::Button
3247	markup => $title,
3248	tooltip => $tooltip,
3249	on_activate => sub { $self->set_current_page ($widget) },
3250	);
3251
3252	$self->{multiplexer}->add ($widget);	4050	$self->add ($widget);
3253	}	4051	}
3254		4052
3255	sub get_current_page {	4053	sub get_current_page {
3256	my ($self) = @_;	4054	my ($self) = @_;
3257		4055
…		…
3263		4061
3264	$self->{multiplexer}->set_current_page ($page);	4062	$self->{multiplexer}->set_current_page ($page);
3265	$self->emit (page_changed => $self->{multiplexer}{current});	4063	$self->emit (page_changed => $self->{multiplexer}{current});
3266	}	4064	}
3267		4065
		4066	sub _draw {
		4067	my ($self) = @_;
		4068
		4069	$self->SUPER::_draw ();
		4070
		4071	if (my $cur = $self->{multiplexer}{current}) {
		4072	if ($cur = $cur->{c_tab_}) {
		4073	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4074	$self->{buttonbar}{y} + $cur->{y};
		4075	glLineWidth 3;
		4076	#glEnable GL_BLEND;
		4077	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4078	glColor @{$self->{active_outline}};
		4079	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4080	glLineWidth 1;
		4081	#glDisable GL_BLEND;
		4082	}
		4083	}
		4084	}
		4085
3268	#############################################################################	4086	#############################################################################
3269		4087
3270	package CFClient::UI::Combobox;	4088	package DC::UI::Selector;
3271		4089
3272	use utf8;	4090	use utf8;
3273		4091
3274	our @ISA = CFClient::UI::Button::;	4092	our @ISA = DC::UI::Button::;
3275		4093
3276	sub new {	4094	sub new {
3277	my $class = shift;	4095	my $class = shift;
3278		4096
3279	my $self = $class->SUPER::new (	4097	my $self = $class->SUPER::new (
…		…
3296	my ($value, $title, $tooltip) = @$_;	4114	my ($value, $title, $tooltip) = @$_;
3297		4115
3298	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4116	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299	}	4117	}
3300		4118
3301	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4119	DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302	}	4120	}
3303		4121
3304	sub _set_value {	4122	sub _set_value {
3305	my ($self, $value) = @_;	4123	my ($self, $value) = @_;
3306		4124
3307	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4125	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4126	$item ||= $self->{options}[0]
3308	or return;	4127	or return;
3309		4128
3310	$self->{value} = $item->[0];	4129	$self->{value} = $item->[0];
3311	$self->set_markup ("$item->[1] ⇓");	4130	$self->set_markup ("$item->[1] ⇓");
3312	$self->set_tooltip ($item->[2]);	4131	# $self->set_tooltip ($item->[2]);
3313	}	4132	}
3314		4133
3315	sub set_value {	4134	sub set_value {
3316	my ($self, $value) = @_;	4135	my ($self, $value) = @_;
3317		4136
…		…
3319		4138
3320	$self->_set_value ($value);	4139	$self->_set_value ($value);
3321	$self->emit (changed => $value);	4140	$self->emit (changed => $value);
3322	}	4141	}
3323		4142
		4143	sub set_options {
		4144	my ($self, $options) = @_;
		4145
		4146	$self->{options} = $options;
		4147	$self->_set_value ($self->{value});
		4148	}
		4149
3324	#############################################################################	4150	#############################################################################
3325		4151
3326	package CFClient::UI::Statusbox;	4152	package DC::UI::Statusbox;
3327		4153
3328	our @ISA = CFClient::UI::VBox::;	4154	our @ISA = DC::UI::VBox::;
3329		4155
3330	sub new {	4156	sub new {
3331	my $class = shift;	4157	my $class = shift;
3332		4158
3333	my $self = $class->SUPER::new (	4159	my $self = $class->SUPER::new (
3334	fontsize => 0.8,	4160	fontsize => 0.8,
3335	@_,	4161	@_,
3336	);	4162	);
3337		4163
3338	Scalar::Util::weaken (my $this = $self);	4164	DC::weaken (my $this = $self);
3339		4165
3340	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4166	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3341		4167
3342	$self	4168	$self
3343	}	4169	}
3344		4170
3345	sub reorder {	4171	sub reorder {
3346	my ($self) = @_;	4172	my ($self) = @_;
3347	my $NOW = Time::HiRes::time;	4173	my $NOW = Time::HiRes::time;
3348		4174
3349	# freeze display when hovering over any label	4175	# freeze display when hovering over any label
3350	return if $CFClient::UI::TOOLTIP->{owner}	4176	return if $DC::UI::TOOLTIP->{owner}
3351	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4177	&& grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3352	values %{ $self->{item} };	4178	values %{ $self->{item} };
3353		4179
3354	while (my ($k, $v) = each %{ $self->{item} }) {	4180	while (my ($k, $v) = each %{ $self->{item} }) {
3355	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4181	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3356	}	4182	}
		4183
		4184	$self->{timer}->set (1, 1);
3357		4185
3358	my @widgets;	4186	my @widgets;
3359		4187
3360	my @items = sort {	4188	my @items = sort {
3361	$a->{pri} <=> $b->{pri}	4189	$a->{pri} <=> $b->{pri}
3362	or $b->{id} <=> $a->{id}	4190	or $b->{id} <=> $a->{id}
3363	} values %{ $self->{item} };	4191	} values %{ $self->{item} };
3364
3365	$self->{timer}->interval (1);
3366		4192
3367	my $count = 10 + 1;	4193	my $count = 10 + 1;
3368	for my $item (@items) {	4194	for my $item (@items) {
3369	last unless --$count;	4195	last unless --$count;
3370		4196
…		…
3377	for ($short) {	4203	for ($short) {
3378	s/^\s+//;	4204	s/^\s+//;
3379	s/\s+/ /g;	4205	s/\s+/ /g;
3380	}	4206	}
3381		4207
3382	new CFClient::UI::Label	4208	new DC::UI::Label
3383	markup => $short,	4209	markup => $short,
3384	tooltip => $item->{tooltip},	4210	tooltip => $item->{tooltip},
3385	tooltip_font => $::FONT_PROP,	4211	tooltip_font => $::FONT_PROP,
3386	tooltip_width => 0.67,	4212	tooltip_width => 0.67,
3387	fontsize => $item->{fontsize} || $self->{fontsize},	4213	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3394	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4220	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3395	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4221	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3396	$label->update;	4222	$label->update;
3397	$label->set_max_size (undef, $label->{req_h} * $diff)	4223	$label->set_max_size (undef, $label->{req_h} * $diff)
3398	if $diff < 1;	4224	if $diff < 1;
3399	$self->{timer}->interval (1/30);	4225	$self->{timer}->set (1/30, 1/30);
3400	} else {	4226	} else {
3401	$label->{fg}[3] = $item->{fg}[3] || 1;	4227	$label->{fg}[3] = $item->{fg}[3] || 1;
3402	}	4228	}
3403		4229
3404	push @widgets, $label;	4230	push @widgets, $label;
…		…
3466	$self->SUPER::destroy;	4292	$self->SUPER::destroy;
3467	}	4293	}
3468		4294
3469	#############################################################################	4295	#############################################################################
3470		4296
3471	package CFClient::UI::Inventory;
3472
3473	our @ISA = CFClient::UI::Table::;
3474
3475	sub new {
3476	my $class = shift;
3477
3478	my $self = $class->SUPER::new (
3479	col_expand => [0, 1, 0],
3480	@_,
3481	);
3482
3483	$self
3484	}
3485
3486	sub set_items {
3487	my ($self, $items) = @_;
3488
3489	$self->clear;
3490	return unless $items;
3491
3492	my @items = sort {
3493	($a->{type} <=> $b->{type})
3494	or ($a->{name} cmp $b->{name})
3495	} values %$items;
3496
3497	$self->{real_items} = \@items;
3498
3499	my $row = 0;
3500	for my $item (@items) {
3501	CFClient::Item::update_widgets $item;
3502
3503	$self->add (0, $row, $item->{face_widget});
3504	$self->add (1, $row, $item->{desc_widget});
3505	$self->add (2, $row, $item->{weight_widget});
3506
3507	$row++;
3508	}
3509	}
3510
3511	#############################################################################
3512
3513	package CFClient::UI::SpellList;
3514
3515	our @ISA = CFClient::UI::Table::;
3516
3517	sub new {
3518	my $class = shift;
3519
3520	my $self = $class->SUPER::new (
3521	binding => [],
3522	commands => [],
3523	@_,
3524	)
3525	}
3526
3527	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539
3540	sub rebuild_spell_list {
3541	my ($self) = @_;
3542
3543	$CFClient::UI::ROOT->on_refresh ($self => sub {
3544	$self->clear;
3545
3546	return unless $::CONN;
3547
3548	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554	my $row = 0;
3555
3556	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557	my $spell = $self->{spell}{$_};
3558
3559	$row++;
3560
3561	my $spell_cb = sub {
3562	my ($widget, $ev) = @_;
3563
3564	if ($ev->{button} == 1) {
3565	$::CONN->user_send ("cast $spell->{name}");
3566	} elsif ($ev->{button} == 2) {
3567	$::CONN->user_send ("invoke $spell->{name}");
3568	} elsif ($ev->{button} == 3) {
3569	(new CFClient::UI::Menu
3570	items => [
3571	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573	],
3574	)->popup ($ev);
3575	} else {
3576	return 0;
3577	}
3578
3579	1
3580	};
3581
3582	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584	#TODO: add path info to tooltip
3585	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587	$self->add (0, $row, new CFClient::UI::Face
3588	face => $spell->{face},
3589	can_hover => 1,
3590	can_events => 1,
3591	tooltip => $tooltip,
3592	on_button_down => $spell_cb,
3593	);
3594
3595	$self->add (1, $row, new CFClient::UI::Label
3596	expand => 1,
3597	text => $spell->{name},
3598	can_hover => 1,
3599	can_events => 1,
3600	tooltip => $tooltip,
3601	on_button_down => $spell_cb,
3602	);
3603
3604	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608	}
3609	});
3610	}
3611
3612	sub add_spell {
3613	my ($self, $spell) = @_;
3614
3615	$self->{spell}->{$spell->{name}} = $spell;
3616	$self->rebuild_spell_list;
3617	}
3618
3619	sub remove_spell {
3620	my ($self, $spell) = @_;
3621
3622	delete $self->{spell}->{$spell->{name}};
3623	$self->rebuild_spell_list;
3624	}
3625
3626	sub clear_spells {
3627	my ($self) = @_;
3628
3629	$self->{spell} = {};
3630	$self->rebuild_spell_list;
3631	}
3632
3633	#############################################################################
3634
3635	package CFClient::UI::Root;	4297	package DC::UI::Root;
3636		4298
3637	our @ISA = CFClient::UI::Container::;	4299	our @ISA = DC::UI::Container::;
3638		4300
3639	use List::Util qw(min max);	4301	use List::Util qw(min max);
3640		4302
3641	use CFClient::OpenGL;	4303	use DC::OpenGL;
3642		4304
3643	sub new {	4305	sub new {
3644	my $class = shift;	4306	my $class = shift;
3645		4307
3646	my $self = $class->SUPER::new (	4308	my $self = $class->SUPER::new (
3647	visible => 1,	4309	visible => 1,
3648	@_,	4310	@_,
3649	);	4311	);
3650		4312
3651	Scalar::Util::weaken ($self->{root} = $self);	4313	DC::weaken ($self->{root} = $self);
3652		4314
3653	$self	4315	$self
3654	}	4316	}
3655		4317
3656	sub size_request {	4318	sub size_request {
…		…
3704	}	4366	}
3705		4367
3706	sub update {	4368	sub update {
3707	my ($self) = @_;	4369	my ($self) = @_;
3708		4370
3709	$::WANT_REFRESH++;	4371	$::WANT_REFRESH = 1;
3710	}	4372	}
3711		4373
3712	sub add {	4374	sub add {
3713	my ($self, @children) = @_;	4375	my ($self, @children) = @_;
3714		4376
…		…
3751	while ($self->{refresh_hook}) {	4413	while ($self->{refresh_hook}) {
3752	$_->()	4414	$_->()
3753	for values %{delete $self->{refresh_hook}};	4415	for values %{delete $self->{refresh_hook}};
3754	}	4416	}
3755		4417
3756	if ($self->{realloc}) {	4418	while ($self->{realloc}) {
3757	my %queue;	4419	my %queue;
3758	my @queue;	4420	my @queue;
3759	my $widget;	4421	my $widget;
3760		4422
3761	outer:	4423	outer:
…		…
3808	}	4470	}
3809	}	4471	}
3810		4472
3811	delete $self->{realloc}{$widget+0};	4473	delete $self->{realloc}{$widget+0};
3812	}	4474	}
3813	}
3814		4475
3815	while (my $size_alloc = delete $self->{size_alloc}) {	4476	while (my $size_alloc = delete $self->{size_alloc}) {
3816	my @queue = sort { $b->{visible} <=> $a->{visible} }	4477	my @queue = sort { $a->{visible} <=> $b->{visible} }
3817	values %$size_alloc;	4478	values %$size_alloc;
3818		4479
3819	while () {	4480	while () {
3820	my $widget = pop @queue || last;	4481	my $widget = pop @queue || last;
3821		4482
3822	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4483	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3823		4484
3824	$w = 0 if $w < 0;	4485	$w = max $widget->{min_w}, $w;
3825	$h = 0 if $h < 0;	4486	$h = max $widget->{min_h}, $h;
3826		4487
		4488	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4489	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4490
		4491	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4492	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4493
3827	$w = int $w + 0.5;	4494	$w = int $w + 0.5;
3828	$h = int $h + 0.5;	4495	$h = int $h + 0.5;
3829		4496
3830	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4497	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831	$widget->{old_w} = $widget->{w};	4498	$widget->{old_w} = $widget->{w};
3832	$widget->{old_h} = $widget->{h};	4499	$widget->{old_h} = $widget->{h};
3833		4500
3834	$widget->{w} = $w;	4501	$widget->{w} = $w;
3835	$widget->{h} = $h;	4502	$widget->{h} = $h;
3836		4503
3837	$widget->emit (size_allocate => $w, $h);	4504	$widget->emit (size_allocate => $w, $h);
		4505	}
3838	}	4506	}
3839	}	4507	}
3840	}	4508	}
3841		4509
3842	while ($self->{post_alloc_hook}) {	4510	while ($self->{post_alloc_hook}) {
3843	$_->()	4511	$_->()
3844	for values %{delete $self->{post_alloc_hook}};	4512	for values %{delete $self->{post_alloc_hook}};
3845	}	4513	}
3846
3847		4514
3848	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4515	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3849	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4516	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3850	glClear GL_COLOR_BUFFER_BIT;	4517	glClear GL_COLOR_BUFFER_BIT;
3851		4518
…		…
3854	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4521	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855	glMatrixMode GL_MODELVIEW;	4522	glMatrixMode GL_MODELVIEW;
3856	glLoadIdentity;	4523	glLoadIdentity;
3857		4524
3858	{	4525	{
3859	package CFClient::UI::Base;	4526	package DC::UI::Base;
3860		4527
3861	($draw_x, $draw_y, $draw_w, $draw_h) =	4528	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3862	(0, 0, $self->{w}, $self->{h});	4529	(0, 0, $self->{w}, $self->{h});
3863	}
3864		4530
3865	$self->_draw;	4531	$self->_draw;
		4532	}
3866	}	4533	}
3867		4534
3868	#############################################################################	4535	#############################################################################
3869		4536
3870	package CFClient::UI;	4537	package DC::UI;
3871		4538
3872	$ROOT = new CFClient::UI::Root;	4539	$ROOT = new DC::UI::Root;
3873	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4540	$TOOLTIP = new DC::UI::Tooltip z => 900;
3874		4541
3875	1	4542	1
3876		4543

Diff Legend

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