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.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.392 by root, Sat Jul 21 13:37:09 2007 UTC

1	package CFClient::UI;	1	package CFPlus::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;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		120
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
101	}	129	}
102		130
103	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	132	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		133
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		135
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		137
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
112	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		140
114	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	143	$grab->update if $grab;
117	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
118		145
		146	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	147	$TOOLTIP_WATCHER->cb->();
120	}	148	}
121	}	149	}
122		150
123	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
124	my ($ev) = @_;	152	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
126		154
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		156
129	if ($widget != $HOVER) {	157	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		158
132	$hover->update if $hover && $hover->{can_hover};	159	$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;	160	if $HOVER;
140	}	161	}
141		162
142	# convert position array to integers	163	# convert position array to integers
143	sub harmonize {	164	sub harmonize {
…		…
193	reconfigure_widgets;	214	reconfigure_widgets;
194	}	215	}
195		216
196	#############################################################################	217	#############################################################################
197		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
198	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
199		228
200	use strict;	229	use strict;
201		230
202	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
203		232
204	sub new {	233	sub new {
205	my $class = shift;	234	my $class = shift;
206		235
207	my $self = bless {	236	my $self = bless {
…		…
212	h => undef,	241	h => undef,
213	can_events => 1,	242	can_events => 1,
214	@_	243	@_
215	}, $class;	244	}, $class;
216		245
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		247
219	for (keys %$self) {	248	for (keys %$self) {
220	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
222	}	251	}
223	}	252	}
224		253
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		259
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		262
234	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
239		268
240	sub destroy {	269	sub destroy {
241	my ($self) = @_;	270	my ($self) = @_;
242		271
243	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
244	%$self = ();	274	%$self = ();
245	}	275	}
246		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
247	sub show {	281	sub show {
248	my ($self) = @_;	282	my ($self) = @_;
249		283
250	return if $self->{parent};	284	return if $self->{parent};
251		285
252	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
253	}	287	}
254		288
255	sub set_visible {	289	sub set_visible {
256	my ($self) = @_;	290	my ($self) = @_;
257		291
…		…
278	delete $self->{root};	312	delete $self->{root};
279		313
280	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
282		316
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
285		319
286	$self->emit ("focus_out");	320	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
288	}	322	}
…		…
290	sub set_visibility {	324	sub set_visibility {
291	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
292		326
293	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
294		328
295	$visible ? $self->hide	329	$visible ? $self->show
296	: $self->show;	330	: $self->hide;
297	}	331	}
298		332
299	sub toggle_visibility {	333	sub toggle_visibility {
300	my ($self) = @_;	334	my ($self) = @_;
301		335
…		…
345	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
346		380
347	if ($self->{aspect}) {	381	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
349		383
350	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		386
353	# use alignment to adjust x, y	387	# use alignment to adjust x, y
354		388
355	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
397		431
398	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
399		433
400	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
401		435
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	439	}
406	}	440	}
407		441
408	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
409	sub coord2local {	443	sub coord2local {
410	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
411		445
		446	Carp::confess unless $self->{parent};#d#
		447
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	449	}
414		450
415	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
416	sub coord2global {	452	sub coord2global {
417	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
418		454
		455	Carp::confess unless $self->{parent};#d#
		456
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	458	}
421		459
422	sub invoke_focus_in {	460	sub invoke_focus_in {
423	my ($self) = @_;	461	my ($self) = @_;
424		462
425	return if $FOCUS == $self;	463	return if $FOCUS == $self;
426	return unless $self->{can_focus};	464	return unless $self->{can_focus};
427		465
428	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
429		467
430	$focus->update if $focus;	468	$self->update;
431	$FOCUS->update;
432		469
433	0	470	0
434	}	471	}
435		472
436	sub invoke_focus_out {	473	sub invoke_focus_out {
437	my ($self) = @_;	474	my ($self) = @_;
438		475
439	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
440		477
441	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
442		479
443	$focus->update if $focus; #?	480	$self->update;
444		481
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	483	unless $FOCUS;
447		484
448	0	485	0
449	}	486	}
450		487
451	sub grab_focus {	488	sub grab_focus {
452	my ($self) = @_;	489	my ($self) = @_;
453		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	492	$self->emit ("focus_in");
455	}	493	}
456		494
457	sub invoke_mouse_motion { 1 }	495	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	496	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	497	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
461		500
462	sub invoke_button_down {	501	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
464		503
465	$self->grab_focus;	504	$self->grab_focus;
466		505
467	1	506	0
468	}	507	}
469		508
470	sub connect {	509	sub connect {
471	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
472		511
473	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
474	}	518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
475		532
476	sub emit {	533	sub emit {
477	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
478		535
479	#d##TODO# stop propagating at first true, do not use sum	536	# 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	537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	554	}
484		555
485	sub find_widget {	556	#sub find_widget {
486	my ($self, $x, $y) = @_;	557	# 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		558
497	sub set_parent {	559	sub set_parent {
498	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
499		561
500	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
502	}	564	}
503		565
504	sub realloc {	566	sub realloc {
505	my ($self) = @_;	567	my ($self) = @_;
…		…
539	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
540		602
541	# update screen rectangle	603	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};	604	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};	605	local $draw_y = $draw_y + $self->{y};
544	local $draw_w = $draw_x + $self->{w};
545	local $draw_h = $draw_y + $self->{h};
546		606
547	# skip widgets that are entirely outside the drawing area	607	# skip widgets that are entirely outside the drawing area
548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550		610
…		…
573	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
576	glEnd;	636	glEnd;
577	glPopMatrix;	637	glPopMatrix;
578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579	}	639	}
580		640
581	$self->_draw;	641	$self->_draw;
582	glPopMatrix;	642	glPopMatrix;
583	}	643	}
…		…
586	my ($self) = @_;	646	my ($self) = @_;
587		647
588	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
589	}	649	}
590		650
		651	my $cntx;#d#
591	sub DESTROY {	652	sub DESTROY {
592	my ($self) = @_;	653	my ($self) = @_;
593		654
594	delete $WIDGET{$self+0};	655	return if CFPlus::in_destruct;
595		656
596	eval { $self->destroy };	657	eval { $self->destroy };
597	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
598	}	661	}
599		662
600	#############################################################################	663	#############################################################################
601		664
602	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
603		666
604	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
605		668
606	use strict;	669	use strict;
607	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
608		671
609	sub new {	672	sub new {
610	my $class = shift;	673	my $class = shift;
611		674
612	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
643	}	706	}
644	}	707	}
645		708
646	#############################################################################	709	#############################################################################
647		710
648	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
649		712
650	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
651		714
652	sub new {	715	sub new {
653	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
655	}	718	}
…		…
662		725
663	sub draw { }	726	sub draw { }
664		727
665	#############################################################################	728	#############################################################################
666		729
667	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
668		731
669	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
670		733
671	sub new {	734	sub new {
672	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
673		736
674	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
678	can_events => 0,	741	can_events => 0,
679	%arg,	742	%arg,
680	);	743	);
681		744
682	$self->add (@$children)	745	$self->add (@$children)
683	if $children;	746	if $children && @$children;
684		747
685	$self	748	$self
		749	}
		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
686	}	757	}
687		758
688	sub add {	759	sub add {
689	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
690		761
691	$_->set_parent ($self)	762	$_->set_parent ($self)
692	for @widgets;	763	for @widgets;
693		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
694	use sort 'stable';	766	use sort 'stable';
695		767
696	$self->{children} = [	768	$self->{children} = [
697	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
698	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
…		…
752	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
753	}	825	}
754		826
755	#############################################################################	827	#############################################################################
756		828
757	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
758		830
759	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
760		832
761	sub new {	833	sub new {
762	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
763		835
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		837
766	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
767	}	839	}
768		840
769	sub add {	841	sub add {
…		…
776	sub remove {	848	sub remove {
777	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
778		850
779	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
780		852
781	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	854	unless @{$self->{children}};
783	}	855	}
784		856
785	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
786		858
…		…
798		870
799	#############################################################################	871	#############################################################################
800		872
801	# back-buffered drawing area	873	# back-buffered drawing area
802		874
803	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
804		876
805	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
806		878
807	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
808		880
809	sub new {	881	sub new {
810	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
811		883
812	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
834	}	906	}
835		907
836	sub render_child {	908	sub render_child {
837	my ($self) = @_;	909	my ($self) = @_;
838		910
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	911	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
842		914
843	{	915	{
844	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
845		917
846	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
848	}	922	}
849
850	$self->_render;
851	};	923	};
852	}	924	}
853		925
854	sub _draw {	926	sub _draw {
855	my ($self) = @_;	927	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		928
859	my $tex = $self->{texture}	929	my $tex = $self->{texture}
860	or return;	930	or return;
861		931
862	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
865		935
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
867		937
868	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
869	}	939	}
870		940
871	#############################################################################	941	#############################################################################
872		942
873	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
874		944
		945	use List::Util qw(min max);
		946
875	our @ISA = CFClient::UI::Window::;	947	our @ISA = CFPlus::UI::Window::;
876		948
877	sub new {	949	sub new {
878	my $class = shift;	950	my $class = shift;
879		951
880	$class->SUPER::new (	952	$class->SUPER::new (
…		…
887	sub size_request {	959	sub size_request {
888	my ($self) = @_;	960	my ($self) = @_;
889		961
890	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	962	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891		963
892	$w = 10 if $self->{scroll_x};	964	$w = 1 if $self->{scroll_x};
893	$h = 10 if $self->{scroll_y};	965	$h = 1 if $self->{scroll_y};
894		966
895	($w, $h)	967	($w, $h)
896	}	968	}
897		969
898	sub invoke_size_allocate {	970	sub invoke_size_allocate {
…		…
910	}	982	}
911		983
912	sub set_offset {	984	sub set_offset {
913	my ($self, $x, $y) = @_;	985	my ($self, $x, $y) = @_;
914		986
		987	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		988	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		989
		990	if ($x != $self->{view_x} or $y != $self->{view_y}) {
915	$self->{view_x} = int $x;	991	$self->{view_x} = $x;
916	$self->{view_y} = int $y;	992	$self->{view_y} = $y;
917		993
		994	$self->emit (changed => $x, $y);
918	$self->update;	995	$self->update;
		996	}
919	}	997	}
920		998
921	# hmm, this does not work for topleft of $self... but we should not ask for that	999	# hmm, this does not work for topleft of $self... but we should not ask for that
922	sub coord2local {	1000	sub coord2local {
923	my ($self, $x, $y) = @_;	1001	my ($self, $x, $y) = @_;
…		…
938	my ($self, $x, $y) = @_;	1016	my ($self, $x, $y) = @_;
939		1017
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1018	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1019	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	1020	) {
943	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1021	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944	} else {	1022	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1023	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1024	}
947	}	1025	}
948		1026
949	sub _render {	1027	sub _render {
950	my ($self) = @_;	1028	my ($self) = @_;
951		1029
952	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1030	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1031	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954		1032
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1033	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1034
957	$self->SUPER::_render;	1035	$self->SUPER::_render;
958	}	1036	}
959		1037
960	#############################################################################	1038	#############################################################################
961		1039
962	package CFClient::UI::ScrolledWindow;	1040	package CFPlus::UI::ScrolledWindow;
963		1041
964	our @ISA = CFClient::UI::HBox::;	1042	our @ISA = CFPlus::UI::Table::;
965		1043
966	sub new {	1044	sub new {
967	my ($class, %arg) = @_;	1045	my ($class, %arg) = @_;
968		1046
969	my $child = delete $arg{child};	1047	my $child = delete $arg{child};
970		1048
971	my $self;	1049	my $self;
972		1050
973	my $slider = new CFClient::UI::Slider	1051	my $hslider = new CFPlus::UI::Slider
		1052	col => 0,
		1053	row => 1,
		1054	vertical => 0,
		1055	range => [0, 0, 1, 0.01], # HACK fix
		1056	on_changed => sub {
		1057	$self->{hpos} = $_[1];
		1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1059	},
		1060	;
		1061
		1062	my $vslider = new CFPlus::UI::Slider
		1063	col => 1,
		1064	row => 0,
974	vertical => 1,	1065	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1067	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978	},	1070	},
979	;	1071	;
980		1072
981	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
		1076	can_events => 1,
983	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
984	%arg,	1081	%arg,
985	);	1082	);
986		1083
		1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	col => 0,
		1086	row => 0,
		1087	expand => 1,
		1088	scroll_x => $self->{scroll_x},
		1089	scroll_y => $self->{scroll_y},
		1090	on_changed => sub {
		1091	my ($vp, $x, $y) = @_;
		1092
		1093	$vp->{parent}{hslider}->set_value ($x);
		1094	$vp->{parent}{vslider}->set_value ($y);
		1095
		1096	0
		1097	},
		1098	;
		1099
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1100	$self->SUPER::add ($self->{vp});
		1101
988	$self->add ($child) if $child;	1102	$self->add ($child) if $child;
989		1103
990	$self	1104	$self
991	}	1105	}
		1106
		1107	#TODO# update range on size_allocate depending on child?
992		1108
993	sub add {	1109	sub add {
994	my ($self, $widget) = @_;	1110	my ($self, $widget) = @_;
995		1111
996	$self->{vp}->add ($self->{child} = $widget);	1112	$self->{vp}->add ($self->{child} = $widget);
997	}	1113	}
998		1114
		1115	sub update_slider {
		1116	my ($self) = @_;
		1117
		1118	my $child = ($self->{vp} or return)->child;
		1119
		1120	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1121	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1122
		1123	my $visible = $w1 > $w2;
		1124	if ($visible != $self->{hslider}{visible}) {
		1125	$visible ? $self->SUPER::add ($self->{hslider})
		1126	: $self->SUPER::remove ($self->{hslider});
		1127	}
		1128
		1129	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1130	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1131
		1132	my $visible = $h1 > $h2;
		1133	if ($visible != $self->{vslider}{visible}) {
		1134	$visible ? $self->SUPER::add ($self->{vslider})
		1135	: $self->SUPER::remove ($self->{vslider});
		1136	}
		1137	}
		1138
999	sub update {	1139	sub update {
1000	my ($self) = @_;	1140	my ($self) = @_;
1001		1141
		1142	$self->update_slider;
1002	$self->SUPER::update;	1143	$self->SUPER::update;
		1144	}
1003		1145
1004	# todo: overwrite size_allocate of child	1146	sub invoke_mouse_wheel {
1005	my $child = $self->{vp}->child;	1147	my ($self, $ev) = @_;
1006	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1148
		1149	$self->{vslider}->emit (mouse_wheel => $ev)
		1150	if $ev->{dy};
		1151
		1152	$self->{hslider}->emit (mouse_wheel => $ev)
		1153	if $ev->{dx};
		1154
		1155	1
		1156	}
		1157
		1158	sub invoke_button_down {
		1159	my ($self, $ev, $x, $y) = @_;
		1160
		1161	if ($ev->{button} == 2) {
		1162	$self->grab_focus;
		1163
		1164	my $ox = $self->{vp}{view_x} + $ev->{x};
		1165	my $oy = $self->{vp}{view_y} + $ev->{y};
		1166
		1167	$self->{motion} = sub {
		1168	my ($ev, $x, $y) = @_;
		1169
		1170	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1171	$self->update;
		1172	};
		1173
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_button_up {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if (delete $self->{motion}) {
		1184	return 1;
		1185	}
		1186
		1187	0
		1188	}
		1189
		1190	sub invoke_mouse_motion {
		1191	my ($self, $ev, $x, $y) = @_;
		1192
		1193	if ($self->{motion}) {
		1194	$self->{motion}->($ev, $x, $y);
		1195	return 1;
		1196	}
		1197
		1198	0
1007	}	1199	}
1008		1200
1009	sub invoke_size_allocate {	1201	sub invoke_size_allocate {
1010	my ($self, $w, $h) = @_;	1202	my ($self, $w, $h) = @_;
1011		1203
1012	my $child = $self->{vp}->child;	1204	$self->update_slider;
1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015	$self->SUPER::invoke_size_allocate ($w, $h)	1205	$self->SUPER::invoke_size_allocate ($w, $h)
1016	}	1206	}
1017		1207
1018	#TODO# update range on size_allocate depending on child
1019	# update viewport offset on scroll
1020
1021	#############################################################################	1208	#############################################################################
1022		1209
1023	package CFClient::UI::Frame;	1210	package CFPlus::UI::Frame;
1024		1211
1025	our @ISA = CFClient::UI::Bin::;	1212	our @ISA = CFPlus::UI::Bin::;
1026		1213
1027	use CFClient::OpenGL;	1214	use CFPlus::OpenGL;
1028		1215
1029	sub new {	1216	sub new {
1030	my $class = shift;	1217	my $class = shift;
1031		1218
1032	$class->SUPER::new (	1219	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1245	$self->SUPER::_draw;
1059	}	1246	}
1060		1247
1061	#############################################################################	1248	#############################################################################
1062		1249
1063	package CFClient::UI::FancyFrame;	1250	package CFPlus::UI::FancyFrame;
1064		1251
1065	our @ISA = CFClient::UI::Bin::;	1252	our @ISA = CFPlus::UI::Bin::;
1066		1253
1067	use CFClient::OpenGL;	1254	use CFPlus::OpenGL;
		1255
		1256	sub new {
		1257	my ($class, %arg) = @_;
		1258
		1259	if ((exists $arg{label}) && !ref $arg{label}) {
		1260	$arg{label} = new CFPlus::UI::Label
		1261	align => 1,
		1262	valign => 0,
		1263	text => $arg{label},
		1264	fontsize => ($arg{border} || 0.8) * 0.75;
		1265	}
		1266
		1267	my $self = $class->SUPER::new (
		1268	# label => "",
		1269	fg => [0.6, 0.3, 0.1],
		1270	border => 0.8,
		1271	style => 'single',
		1272	%arg,
		1273	);
		1274
		1275	$self
		1276	}
		1277
		1278	sub add {
		1279	my ($self, @widgets) = @_;
		1280
		1281	$self->SUPER::add (@widgets);
		1282	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1283	}
		1284
		1285	sub border {
		1286	int $_[0]{border} * $::FONTSIZE
		1287	}
		1288
		1289	sub size_request {
		1290	my ($self) = @_;
		1291
		1292	($self->{label_w}, undef) = $self->{label}->size_request
		1293	if $self->{label};
		1294
		1295	my ($w, $h) = $self->SUPER::size_request;
		1296
		1297	(
		1298	$w + $self->border * 2,
		1299	$h + $self->border * 2,
		1300	)
		1301	}
		1302
		1303	sub invoke_size_allocate {
		1304	my ($self, $w, $h) = @_;
		1305
		1306	my $border = $self->border;
		1307
		1308	$w -= List::Util::max 0, $border * 2;
		1309	$h -= List::Util::max 0, $border * 2;
		1310
		1311	if (my $label = $self->{label}) {
		1312	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1313	$label->{h} = List::Util::min $h, $border;
		1314	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1315	}
		1316
		1317	$self->child->configure ($border, $border, $w, $h);
		1318
		1319	1
		1320	}
		1321
		1322	sub _draw {
		1323	my ($self) = @_;
		1324
		1325	my $child = $self->{children}[0];
		1326
		1327	my $border = $self->border;
		1328	my ($w, $h) = ($self->{w}, $self->{h});
		1329
		1330	$child->draw;
		1331
		1332	glColor @{$self->{fg}};
		1333	glBegin GL_LINE_STRIP;
		1334	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1335	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1336	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1337	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1338	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1339	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1340	glEnd;
		1341
		1342	if ($self->{label}) {
		1343	glTranslate $border * 2, 0;
		1344	$self->{label}->_draw;
		1345	}
		1346	}
		1347
		1348	#############################################################################
		1349
		1350	package CFPlus::UI::Toplevel;
		1351
		1352	our @ISA = CFPlus::UI::Bin::;
		1353
		1354	use CFPlus::OpenGL;
1068		1355
1069	my $bg =	1356	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1357	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1358	mipmap => 1, wrap => 1;
1072		1359
1073	my @border =	1360	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1361	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1362	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1363
		1364	my @icon =
		1365	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1366	qw(x1_move.png x1_resize.png);
1076		1367
1077	sub new {	1368	sub new {
1078	my ($class, %arg) = @_;	1369	my ($class, %arg) = @_;
1079		1370
1080	my $self = $class->SUPER::new (	1371	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1372	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1373	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1374	border => 0.6,
1084	can_events => 1,	1375	can_events => 1,
1085	min_w => 16,	1376	min_w => 64,
1086	min_h => 16,	1377	min_h => 32,
1087	%arg,	1378	%arg,
1088	);	1379	);
1089		1380
1090	$self->{title_widget} = new CFClient::UI::Label	1381	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1382	align => 0,
1092	valign => 1,	1383	valign => 1,
1093	text => $self->{title},	1384	text => $self->{title},
1094	fontsize => $self->{border},	1385	fontsize => $self->{border},
1095	if exists $self->{title};	1386	if exists $self->{title};
1096		1387
1097	if ($self->{has_close_button}) {	1388	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1389	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1390	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1391	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1392	on_activate => sub { $self->emit ("delete") };
1102		1393
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1394	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1395	}
1105		1396
1106	$self	1397	$self
1107	}	1398	}
1108		1399
1109	sub add {	1400	sub add {
1110	my ($self, @widgets) = @_;	1401	my ($self, @widgets) = @_;
1111		1402
1112	$self->SUPER::add (@widgets);	1403	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1404	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1405	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1406	}
1116		1407
1117	sub border {	1408	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1409	int $_[0]{border} * $::FONTSIZE
1119	}	1410	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1443	$self->child->configure ($border, $border, $w, $h);
1153		1444
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1445	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1446	if $self->{close_button};
1156		1447
		1448	1
		1449	}
		1450
		1451	sub invoke_delete {
		1452	my ($self) = @_;
		1453
		1454	$self->hide;
		1455
1157	1	1456	1
1158	}	1457	}
1159		1458
1160	sub invoke_button_down {	1459	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1460	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1518	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1519
1221	! ! $self->{motion}	1520	! ! $self->{motion}
1222	}	1521	}
1223		1522
		1523	sub invoke_visibility_change {
		1524	my ($self, $visible) = @_;
		1525
		1526	delete $self->{motion} unless $visible;
		1527
		1528	0
		1529	}
		1530
1224	sub _draw {	1531	sub _draw {
1225	my ($self) = @_;	1532	my ($self) = @_;
1226		1533
1227	my $child = $self->{children}[0];	1534	my $child = $self->{children}[0];
1228		1535
…		…
1233	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1540	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234		1541
1235	my $border = $self->border;	1542	my $border = $self->border;
1236		1543
1237	glColor @{ $self->{border_bg} };	1544	glColor @{ $self->{border_bg} };
1238	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1545	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1546	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1547	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1548	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1549
		1550	# move
		1551	my $w2 = ($w - $border) * .5;
		1552	my $h2 = ($h - $border) * .5;
		1553	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1554	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1555	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1556
		1557	# resize
		1558	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1559	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1560	unless $self->{has_close_button};
		1561	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1562	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242		1563
1243	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1564	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244	glColor @{ $self->{bg} };	1565	glColor @{ $self->{bg} };
1245		1566
1246	# TODO: repeat texture not scale	1567	# TODO: repeat texture not scale
…		…
1265	if $self->{close_button};	1586	if $self->{close_button};
1266	}	1587	}
1267		1588
1268	#############################################################################	1589	#############################################################################
1269		1590
1270	package CFClient::UI::Table;	1591	package CFPlus::UI::Table;
1271		1592
1272	our @ISA = CFClient::UI::Base::;	1593	our @ISA = CFPlus::UI::Container::;
1273		1594
1274	use List::Util qw(max sum);	1595	use List::Util qw(max sum);
1275		1596
1276	use CFClient::OpenGL;	1597	use CFPlus::OpenGL;
1277		1598
1278	sub new {	1599	sub new {
1279	my $class = shift;	1600	my $class = shift;
1280		1601
1281	$class->SUPER::new (	1602	$class->SUPER::new (
1282	col_expand => [],	1603	col_expand => [],
		1604	row_expand => [],
1283	@_,	1605	@_,
1284	)	1606	)
1285	}	1607	}
1286		1608
1287	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}
1290
1291	sub add {	1609	sub add {
1292	my ($self, $x, $y, $child) = @_;	1610	my ($self, @widgets) = @_;
1293		1611
1294	$child->set_parent ($self);	1612	for my $child (@widgets) {
1295	$self->{children}[$y][$x] = $child;	1613	$child->{rowspan} ||= 1;
		1614	$child->{colspan} ||= 1;
		1615	}
1296		1616
1297	$self->realloc;	1617	$self->SUPER::add (@widgets);
1298	}	1618	}
1299		1619
1300	sub remove {	1620	sub add_at {
		1621	my $self = shift;
		1622
		1623	my @widgets;
		1624
		1625	while (@_) {
		1626	my ($col, $row, $child) = splice @_, 0, 3, ();
		1627
		1628	$child->{row} = $row;
		1629	$child->{col} = $col;
		1630
		1631	push @widgets, $child;
		1632	}
		1633
		1634	$self->add (@widgets);
		1635	}
		1636
		1637	sub get_wh {
1301	my ($self, $child) = @_;	1638	my ($self) = @_;
1302		1639
1303	# TODO: not yet implemented	1640	my (@w, @h);
1304	}
1305
1306	# TODO: move to container class maybe? send children a signal on removal?
1307	sub clear {
1308	my ($self) = @_;
1309		1641
1310	my @children = $self->children;	1642	my @children = $self->children;
1311	delete $self->{children};	1643
		1644	# first pass, columns
		1645	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1646	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1647
		1648	my $sw = sum @w[$c .. $c + $cs - 1];
		1649
		1650	if ($w > $sw) {
		1651	$_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
		1652	}
1312		1653	}
1313	for (@children) {
1314	delete $_->{parent};
1315	$_->hide;
1316	}
1317		1654
1318	$self->realloc;	1655	# second pass, rows
1319	}	1656	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1320
1321	sub get_wh {
1322	my ($self) = @_;
1323
1324	my (@w, @h);
1325
1326	for my $y (0 .. $#{$self->{children}}) {
1327	my $row = $self->{children}[$y]
1328	or next;
1329
1330	for my $x (0 .. $#$row) {
1331	my $widget = $row->[$x]
1332	or next;
1333	my ($w, $h) = @$widget{qw(req_w req_h)};	1657	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1334		1658
1335	$w[$x] = max $w[$x], $w;	1659	my $sh = sum @h[$r .. $r + $rs - 1];
1336	$h[$y] = max $h[$y], $h;	1660
		1661	if ($h > $sh) {
		1662	$_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1337	}	1663	}
1338	}	1664	}
1339		1665
1340	(\@w, \@h)	1666	(\@w, \@h)
1341	}	1667	}
…		…
1357	my ($ws, $hs) = $self->get_wh;	1683	my ($ws, $hs) = $self->get_wh;
1358		1684
1359	my $req_w = (sum @$ws) || 1;	1685	my $req_w = (sum @$ws) || 1;
1360	my $req_h = (sum @$hs) || 1;	1686	my $req_h = (sum @$hs) || 1;
1361		1687
1362	# TODO: nicer code && do row_expand	1688	# now linearly scale the rows/columns to the allocated size
1363	my @col_expand = @{$self->{col_expand}};	1689	my @col_expand = @{$self->{col_expand}};
1364	@col_expand = (1) x @$ws unless @col_expand;	1690	@col_expand = (1) x @$ws unless @col_expand;
1365	my $col_expand = (sum @col_expand) || 1;	1691	my $col_expand = (sum @col_expand) || 1;
1366		1692
1367	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1693	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1694
1371	CFClient::UI::harmonize $ws;	1695	CFPlus::UI::harmonize $ws;
		1696
		1697	my @row_expand = @{$self->{row_expand}};
		1698	@row_expand = (1) x @$ws unless @row_expand;
		1699	my $row_expand = (sum @row_expand) || 1;
		1700
		1701	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1702
1372	CFClient::UI::harmonize $hs;	1703	CFPlus::UI::harmonize $hs;
1373		1704
1374	my $y;	1705	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1706	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375		1707
1376	for my $r (0 .. $#{$self->{children}}) {	1708	for my $widget ($self->children) {
1377	my $row = $self->{children}[$r]	1709	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1378	or next;
1379		1710
1380	my $x = 0;	1711	$widget->configure (
1381	my $row_h = $hs->[$r];	1712	$x[$c], $y[$r],
		1713	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382		1714	);
1383	for my $c (0 .. $#$row) {	1715	}
1384	my $col_w = $ws->[$c];
1385		1716
1386	if (my $widget = $row->[$c]) {	1717	1
1387	$widget->configure ($x, $y, $col_w, $row_h);	1718	}
1388	}
1389		1719
1390	$x += $col_w;	1720	#############################################################################
		1721
		1722	package CFPlus::UI::Fixed;
		1723
		1724	use List::Util qw(min max);
		1725
		1726	our @ISA = CFPlus::UI::Container::;
		1727
		1728	sub add {
		1729	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1730
		1731	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1732	$self->SUPER::add ($child);
		1733	}
		1734
		1735	sub _scale($$$) {
		1736	my ($mode, $val, $max) = @_;
		1737
		1738	$mode eq "abs" ? $val
		1739	: $mode eq "rel" ? $val * $max
		1740	: 0
		1741	}
		1742
		1743	sub size_request {
		1744	my ($self) = @_;
		1745
		1746	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1747
		1748	# determine overall size by querying abs widgets
		1749	for my $child ($self->visible_children) {
		1750	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1751
		1752	if ($pos eq "abs") {
		1753	$w = _scale $size, $w, $child->{req_w};
		1754	$h = _scale $size, $h, $child->{req_h};
		1755
		1756	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1757	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1391	}	1758	}
		1759	}
1392		1760
1393	$y += $row_h;	1761	my $W = $x2 - $x1;
		1762	my $H = $y2 - $y1;
		1763
		1764	# now layout remaining widgets
		1765	for my $child ($self->visible_children) {
		1766	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1767
		1768	if ($pos ne "abs") {
		1769	$x = _scale $pos, $x, $W;
		1770	$y = _scale $pos, $x, $H;
		1771	$w = _scale $size, $w, $child->{req_w};
		1772	$h = _scale $size, $h, $child->{req_h};
		1773
		1774	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1775	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1776	}
		1777	}
		1778
		1779	my $W = $x2 - $x1;
		1780	my $H = $y2 - $y1;
		1781
		1782	($W, $H)
		1783	}
		1784
		1785	sub invoke_size_allocate {
		1786	my ($self, $W, $H) = @_;
		1787
		1788	for my $child ($self->visible_children) {
		1789	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1790
		1791	$x = _scale $pos, $x, $W;
		1792	$y = _scale $pos, $x, $H;
		1793	$w = _scale $size, $w, $child->{req_w};
		1794	$h = _scale $size, $h, $child->{req_h};
		1795
		1796	$child->configure ($x, $y, $w, $h);
1394	}	1797	}
1395		1798
1396	1	1799	1
1397	}	1800	}
1398		1801
1399	sub find_widget {
1400	my ($self, $x, $y) = @_;
1401
1402	$x -= $self->{x};
1403	$y -= $self->{y};
1404
1405	my $res;
1406
1407	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1408	$res = $_->find_widget ($x, $y)
1409	and return $res;
1410	}
1411
1412	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1413	}
1414
1415	sub _draw {
1416	my ($self) = @_;
1417
1418	for (grep $_, @{$self->{children}}) {
1419	$_->draw for grep $_, @$_;
1420	}
1421	}
1422
1423	#############################################################################	1802	#############################################################################
1424		1803
1425	package CFClient::UI::Box;	1804	package CFPlus::UI::Box;
1426		1805
1427	our @ISA = CFClient::UI::Container::;	1806	our @ISA = CFPlus::UI::Container::;
1428		1807
1429	sub size_request {	1808	sub size_request {
1430	my ($self) = @_;	1809	my ($self) = @_;
1431		1810
1432	$self->{vertical}	1811	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1844	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1845	for 0 .. $#children;
1467	}	1846	}
1468	}	1847	}
1469		1848
1470	CFClient::UI::harmonize \@req;	1849	CFPlus::UI::harmonize \@req;
1471		1850
1472	my $pos = 0;	1851	my $pos = 0;
1473	for (0 .. $#children) {	1852	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1853	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1854	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1859	1
1481	}	1860	}
1482		1861
1483	#############################################################################	1862	#############################################################################
1484		1863
1485	package CFClient::UI::HBox;	1864	package CFPlus::UI::HBox;
1486		1865
1487	our @ISA = CFClient::UI::Box::;	1866	our @ISA = CFPlus::UI::Box::;
1488		1867
1489	sub new {	1868	sub new {
1490	my $class = shift;	1869	my $class = shift;
1491		1870
1492	$class->SUPER::new (	1871	$class->SUPER::new (
…		…
1495	)	1874	)
1496	}	1875	}
1497		1876
1498	#############################################################################	1877	#############################################################################
1499		1878
1500	package CFClient::UI::VBox;	1879	package CFPlus::UI::VBox;
1501		1880
1502	our @ISA = CFClient::UI::Box::;	1881	our @ISA = CFPlus::UI::Box::;
1503		1882
1504	sub new {	1883	sub new {
1505	my $class = shift;	1884	my $class = shift;
1506		1885
1507	$class->SUPER::new (	1886	$class->SUPER::new (
…		…
1510	)	1889	)
1511	}	1890	}
1512		1891
1513	#############################################################################	1892	#############################################################################
1514		1893
1515	package CFClient::UI::Label;	1894	package CFPlus::UI::Label;
1516		1895
1517	our @ISA = CFClient::UI::DrawBG::;	1896	our @ISA = CFPlus::UI::DrawBG::;
1518		1897
1519	use CFClient::OpenGL;	1898	use CFPlus::OpenGL;
1520		1899
1521	sub new {	1900	sub new {
1522	my ($class, %arg) = @_;	1901	my ($class, %arg) = @_;
1523		1902
1524	my $self = $class->SUPER::new (	1903	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1906	#active_bg => none
1528	#font => default_font	1907	#font => default_font
1529	#text => initial text	1908	#text => initial text
1530	#markup => initial narkup	1909	#markup => initial narkup
1531	#max_w => maximum pixel width	1910	#max_w => maximum pixel width
		1911	#style => 0, # render flags
1532	ellipsise => 3, # end	1912	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1913	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1914	fontsize => 1,
1535	align => -1,	1915	align => -1,
1536	valign => -1,	1916	valign => -1,
1537	padding_x => 2,	1917	padding_x => 2,
1538	padding_y => 2,	1918	padding_y => 2,
1539	can_events => 0,	1919	can_events => 0,
1540	%arg	1920	%arg
1541	);	1921	);
1542		1922
1543	if (exists $self->{template}) {	1923	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1924	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1925	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1926	$self->{template} = $layout;
1547	}	1927	}
1548		1928
1549	if (exists $self->{markup}) {	1929	if (exists $self->{markup}) {
…		…
1553	}	1933	}
1554		1934
1555	$self	1935	$self
1556	}	1936	}
1557		1937
1558	sub escape($) {
1559	local $_ = $_[0];
1560
1561	s/&/&amp;/g;
1562	s/>/&gt;/g;
1563	s/</&lt;/g;
1564
1565	$_
1566	}
1567
1568	sub update {	1938	sub update {
1569	my ($self) = @_;	1939	my ($self) = @_;
1570		1940
1571	delete $self->{texture};	1941	delete $self->{texture};
1572	$self->SUPER::update;	1942	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1953	my ($self, $text) = @_;
1584		1954
1585	return if $self->{text} eq "T$text";	1955	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1956	$self->{text} = "T$text";
1587		1957
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1958	$self->{layout}->set_text ($text);
1590		1959
1591	delete $self->{size_req};	1960	delete $self->{size_req};
1592	$self->realloc;	1961	$self->realloc;
1593	$self->update;	1962	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1968	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1969	$self->{text} = "M$markup";
1601		1970
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1971	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1972
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1973	$self->{layout}->set_markup ($markup);
1606		1974
1607	delete $self->{size_req};	1975	delete $self->{size_req};
1608	$self->realloc;	1976	$self->realloc;
1609	$self->update;	1977	$self->update;
…		…
1621		1989
1622	my ($w, $h) = $self->{layout}->size;	1990	my ($w, $h) = $self->{layout}->size;
1623		1991
1624	if (exists $self->{template}) {	1992	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1993	$self->{template}->set_font ($self->{font}) if $self->{font};
		1994	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1995	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1996
1628	my ($w2, $h2) = $self->{template}->size;	1997	my ($w2, $h2) = $self->{template}->size;
1629		1998
1630	$w = List::Util::max $w, $w2;	1999	$w = List::Util::max $w, $w2;
…		…
1654		2023
1655	sub set_fontsize {	2024	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	2025	my ($self, $fontsize) = @_;
1657		2026
1658	$self->{fontsize} = $fontsize;	2027	$self->{fontsize} = $fontsize;
		2028	delete $self->{size_req};
1659	delete $self->{texture};	2029	delete $self->{texture};
1660		2030
1661	$self->realloc;	2031	$self->realloc;
1662	}	2032	}
1663		2033
1664	sub reconfigure {	2034	sub reconfigure {
1665	my ($self) = @_;	2035	my ($self) = @_;
1666		2036
1667	delete $self->{size_req};	2037	delete $self->{size_req};
		2038	delete $self->{texture};
1668		2039
1669	$self->SUPER::reconfigure;	2040	$self->SUPER::reconfigure;
1670	}	2041	}
1671		2042
1672	sub _draw {	2043	sub _draw {
1673	my ($self) = @_;	2044	my ($self) = @_;
1674		2045
1675	$self->SUPER::_draw; # draw background, if applicable	2046	$self->SUPER::_draw; # draw background, if applicable
1676		2047
1677	my $tex = $self->{texture} ||= do {	2048	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	2049	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	2050	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	2051	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	2052	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2053	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2054	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		2055
1685	new_from_layout CFClient::Texture $self->{layout}	2056	[$self->{layout}->size]
1686	};	2057	};
1687		2058
1688	unless (exists $self->{ox}) {	2059	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2060	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2061	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	2062	: ($self->{w} - $size->[0]) * 0.5);
1692		2063
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2064	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2065	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	2066	: ($self->{h} - $size->[1]) * 0.5);
1696	};	2067	};
1697		2068
1698	glEnable GL_TEXTURE_2D;
1699
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2069	my $w = List::Util::min $self->{w} + 4, $size->[0];
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2070	my $h = List::Util::min $self->{h} + 2, $size->[1];
1702		2071
1703	if ($tex->{format} == GL_ALPHA) {	2072	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705	glColor @{$self->{fg}};
1706	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707	} else {
1708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710	}
1711
1712	glDisable GL_TEXTURE_2D;
1713	}	2073	}
1714		2074
1715	#############################################################################	2075	#############################################################################
1716		2076
1717	package CFClient::UI::EntryBase;	2077	package CFPlus::UI::EntryBase;
1718		2078
1719	our @ISA = CFClient::UI::Label::;	2079	our @ISA = CFPlus::UI::Label::;
1720		2080
1721	use CFClient::OpenGL;	2081	use CFPlus::OpenGL;
1722		2082
1723	sub new {	2083	sub new {
1724	my $class = shift;	2084	my $class = shift;
1725		2085
1726	$class->SUPER::new (	2086	$class->SUPER::new (
…		…
1730	active_fg => [0, 0, 0],	2090	active_fg => [0, 0, 0],
1731	can_hover => 1,	2091	can_hover => 1,
1732	can_focus => 1,	2092	can_focus => 1,
1733	valign => 0,	2093	valign => 0,
1734	can_events => 1,	2094	can_events => 1,
		2095	ellipsise => 0,
1735	#text => ...	2096	#text => ...
1736	#hidden => "*",	2097	#hidden => "*",
1737	@_	2098	@_
1738	)	2099	)
1739	}	2100	}
…		…
1784	my $sym = $ev->{sym};	2145	my $sym = $ev->{sym};
1785	my $uni = $ev->{unicode};	2146	my $uni = $ev->{unicode};
1786		2147
1787	my $text = $self->get_text;	2148	my $text = $self->get_text;
1788		2149
		2150	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2151
1789	if ($uni == 8) {	2152	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2153	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	2154	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	2155	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	2156	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	2157	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	2158	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	2159	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	2160	} elsif ($sym == CFPlus::SDLK_HOME) {
		2161	# what a hack
		2162	$self->{cursor} =
		2163	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2164	? length $1
		2165	: 0;
		2166	} elsif ($sym == CFPlus::SDLK_END) {
		2167	# uh, again
		2168	$self->{cursor} =
		2169	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2170	? $self->{cursor} + length $1
		2171	: length $self->{text};
		2172	} elsif ($uni == 21) { # ctrl-u
		2173	$text = "";
1798	$self->{cursor} = 0;	2174	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {
1800	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	2175	} elsif ($uni == 27) {
1802	$self->emit ('escape');	2176	$self->emit ('escape');
1803	} elsif ($uni) {	2177	} elsif ($uni == 0x0d) {
		2178	substr $text, $self->{cursor}++, 0, "\012";
		2179	} elsif ($uni >= 0x20) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	2180	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	2181	} else {
1806	return 0;	2182	return 0;
1807	}	2183	}
1808		2184
1809	$self->_set_text ($text);	2185	$self->_set_text ($text);
1810		2186
1811	$self->realloc;	2187	$self->realloc;
		2188	$self->update;
1812		2189
1813	1	2190	1
1814	}	2191	}
1815		2192
1816	sub invoke_focus_in {	2193	sub invoke_focus_in {
…		…
1828		2205
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2206	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2207
1831	# byte-index to char-index	2208	# byte-index to char-index
1832	my $text = $self->{text};	2209	my $text = $self->{text};
1833	utf8::encode $text;	2210	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2211	$self->{cursor} = length $text;
1835		2212
1836	$self->_set_text ($self->{text});	2213	$self->_set_text ($self->{text});
1837	$self->update;	2214	$self->update;
1838		2215
1839	1	2216	1
…		…
1878	utf8::encode $text;	2255	utf8::encode $text;
1879		2256
1880	@$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)
1881	}	2258	}
1882		2259
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2260	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2261	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2262	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2263	glEnd;
1888	}	2264	}
1889	}	2265	}
1890		2266
		2267	#############################################################################
		2268
1891	package CFClient::UI::Entry;	2269	package CFPlus::UI::Entry;
1892		2270
1893	our @ISA = CFClient::UI::EntryBase::;	2271	our @ISA = CFPlus::UI::EntryBase::;
1894		2272
1895	use CFClient::OpenGL;	2273	use CFPlus::OpenGL;
1896		2274
1897	sub invoke_key_down {	2275	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2276	my ($self, $ev) = @_;
1899		2277
1900	my $sym = $ev->{sym};	2278	my $sym = $ev->{sym};
1901		2279
1902	if ($sym == 13) {	2280	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2281	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2282	my $txt = $self->get_text;
1905		2283
1906	$self->{history_pointer} = -1;	2284	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2285	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2286	$self->emit (activate => $txt);
1909	$self->update;	2287	$self->update;
1910		2288
1911	} elsif ($sym == CFClient::SDLK_UP) {	2289	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2290	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2291	$self->{history_saveback} = $self->get_text;
1914	}	2292	}
1915	if (@{$self->{history} || []} > 0) {	2293	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2294	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2296	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2297	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2298	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2299	}
1922		2300
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2301	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2302	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2303	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2304
1927	if ($self->{history_pointer} >= 0) {	2305	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2306	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2315	1
1938	}	2316	}
1939		2317
1940	#############################################################################	2318	#############################################################################
1941		2319
		2320	package CFPlus::UI::TextEdit;
		2321
		2322	our @ISA = CFPlus::UI::EntryBase::;
		2323
		2324	use CFPlus::OpenGL;
		2325
		2326	sub move_cursor_ver {
		2327	my ($self, $dy) = @_;
		2328
		2329	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2330
		2331	$y += $dy;
		2332
		2333	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2334	$self->{cursor} = $index;
		2335	delete $self->{cur_h};
		2336	$self->update;
		2337	return;
		2338	}
		2339	}
		2340
		2341	sub invoke_key_down {
		2342	my ($self, $ev) = @_;
		2343
		2344	my $sym = $ev->{sym};
		2345
		2346	if ($sym == CFPlus::SDLK_UP) {
		2347	$self->move_cursor_ver (-1);
		2348	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2349	$self->move_cursor_ver (+1);
		2350	} else {
		2351	return $self->SUPER::invoke_key_down ($ev)
		2352	}
		2353
		2354	1
		2355	}
		2356
		2357	#############################################################################
		2358
1942	package CFClient::UI::Button;	2359	package CFPlus::UI::Button;
1943		2360
1944	our @ISA = CFClient::UI::Label::;	2361	our @ISA = CFPlus::UI::Label::;
1945		2362
1946	use CFClient::OpenGL;	2363	use CFPlus::OpenGL;
1947		2364
1948	my @tex =	2365	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2366	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2367	qw(b1_button_inactive.png b1_button_active.png);
1951		2368
1952	sub new {	2369	sub new {
1953	my $class = shift;	2370	my $class = shift;
1954		2371
1955	$class->SUPER::new (	2372	$class->SUPER::new (
1956	padding_x => 4,	2373	padding_x => 4,
1957	padding_y => 4,	2374	padding_y => 4,
1958	fg => [1, 1, 1],	2375	fg => [1.0, 1.0, 1.0],
1959	active_fg => [0, 0, 1],	2376	active_fg => [0.8, 0.8, 0.8],
1960	can_hover => 1,	2377	can_hover => 1,
1961	align => 0,	2378	align => 0,
1962	valign => 0,	2379	valign => 0,
1963	can_events => 1,	2380	can_events => 1,
1964	@_	2381	@_
…		…
1982		2399
1983	glEnable GL_TEXTURE_2D;	2400	glEnable GL_TEXTURE_2D;
1984	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2401	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985	glColor 0, 0, 0, 1;	2402	glColor 0, 0, 0, 1;
1986		2403
		2404	my $tex = $tex[$GRAB == $self];
1987	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2405	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988		2406
1989	glDisable GL_TEXTURE_2D;	2407	glDisable GL_TEXTURE_2D;
1990		2408
1991	$self->SUPER::_draw;	2409	$self->SUPER::_draw;
1992	}	2410	}
1993		2411
1994	#############################################################################	2412	#############################################################################
1995		2413
		2414	package CFPlus::UI::CheckBox;
		2415
		2416	our @ISA = CFPlus::UI::DrawBG::;
		2417
		2418	my @tex =
		2419	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2420	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2421
		2422	use CFPlus::OpenGL;
		2423
		2424	sub new {
		2425	my $class = shift;
		2426
		2427	$class->SUPER::new (
		2428	padding_x => 2,
		2429	padding_y => 2,
		2430	fg => [1, 1, 1],
		2431	active_fg => [1, 1, 0],
		2432	bg => [0, 0, 0, 0.2],
		2433	active_bg => [1, 1, 1, 0.5],
		2434	state => 0,
		2435	can_hover => 1,
		2436	@_
		2437	)
		2438	}
		2439
		2440	sub size_request {
		2441	my ($self) = @_;
		2442
		2443	(6) x 2
		2444	}
		2445
		2446	sub toggle {
		2447	my ($self) = @_;
		2448
		2449	$self->{state} = !$self->{state};
		2450	$self->emit (changed => $self->{state});
		2451	$self->update;
		2452	}
		2453
		2454	sub invoke_button_down {
		2455	my ($self, $ev, $x, $y) = @_;
		2456
		2457	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2458	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2459	$self->toggle;
		2460	} else {
		2461	return 0
		2462	}
		2463
		2464	1
		2465	}
		2466
		2467	sub _draw {
		2468	my ($self) = @_;
		2469
		2470	$self->SUPER::_draw;
		2471
		2472	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2473
		2474	my ($w, $h) = @$self{qw(w h)};
		2475
		2476	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2477
		2478	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2479
		2480	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2481
		2482	glEnable GL_TEXTURE_2D;
		2483	$tex->draw_quad_alpha (0, 0, $s, $s);
		2484	glDisable GL_TEXTURE_2D;
		2485	}
		2486
		2487	#############################################################################
		2488
		2489	package CFPlus::UI::Image;
		2490
		2491	our @ISA = CFPlus::UI::Base::;
		2492
		2493	use CFPlus::OpenGL;
		2494
		2495	our %texture_cache;
		2496
		2497	sub new {
		2498	my $class = shift;
		2499
		2500	my $self = $class->SUPER::new (
		2501	can_events => 0,
		2502	@_,
		2503	);
		2504
		2505	$self->{path} || $self->{tex}
		2506	or Carp::croak "'path' or 'tex' attributes required";
		2507
		2508	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2509	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2510
		2511	CFPlus::weaken $texture_cache{$self->{path}};
		2512
		2513	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2514
		2515	$self
		2516	}
		2517
		2518	sub STORABLE_freeze {
		2519	my ($self, $cloning) = @_;
		2520
		2521	$self->{path}
		2522	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2523
		2524	$self->{path}
		2525	}
		2526
		2527	sub STORABLE_attach {
		2528	my ($self, $cloning, $path) = @_;
		2529
		2530	$self->new (path => $path)
		2531	}
		2532
		2533	sub size_request {
		2534	my ($self) = @_;
		2535
		2536	($self->{tex}{w}, $self->{tex}{h})
		2537	}
		2538
		2539	sub _draw {
		2540	my ($self) = @_;
		2541
		2542	my $tex = $self->{tex};
		2543
		2544	my ($w, $h) = ($self->{w}, $self->{h});
		2545
		2546	if ($self->{rot90}) {
		2547	glRotate 90, 0, 0, 1;
		2548	glTranslate 0, -$self->{w}, 0;
		2549
		2550	($w, $h) = ($h, $w);
		2551	}
		2552
		2553	glEnable GL_TEXTURE_2D;
		2554	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2555
		2556	$tex->draw_quad (0, 0, $w, $h);
		2557
		2558	glDisable GL_TEXTURE_2D;
		2559	}
		2560
		2561	#############################################################################
		2562
1996	package CFClient::UI::ImageButton;	2563	package CFPlus::UI::ImageButton;
1997		2564
1998	our @ISA = CFClient::UI::Image::;	2565	our @ISA = CFPlus::UI::Image::;
1999		2566
2000	use CFClient::OpenGL;	2567	use CFPlus::OpenGL;
2001		2568
2002	my %textures;	2569	my %textures;
2003		2570
2004	sub new {	2571	sub new {
2005	my $class = shift;	2572	my $class = shift;
…		…
2027	1	2594	1
2028	}	2595	}
2029		2596
2030	#############################################################################	2597	#############################################################################
2031		2598
2032	package CFClient::UI::CheckBox;
2033
2034	our @ISA = CFClient::UI::DrawBG::;
2035
2036	my @tex =
2037	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040	use CFClient::OpenGL;
2041
2042	sub new {
2043	my $class = shift;
2044
2045	$class->SUPER::new (
2046	padding_x => 2,
2047	padding_y => 2,
2048	fg => [1, 1, 1],
2049	active_fg => [1, 1, 0],
2050	bg => [0, 0, 0, 0.2],
2051	active_bg => [1, 1, 1, 0.5],
2052	state => 0,
2053	can_hover => 1,
2054	@_
2055	)
2056	}
2057
2058	sub size_request {
2059	my ($self) = @_;
2060
2061	(6) x 2
2062	}
2063
2064	sub invoke_button_down {
2065	my ($self, $ev, $x, $y) = @_;
2066
2067	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069	$self->{state} = !$self->{state};
2070	$self->emit (changed => $self->{state});
2071	} else {
2072	return 0
2073	}
2074
2075	1
2076	}
2077
2078	sub _draw {
2079	my ($self) = @_;
2080
2081	$self->SUPER::_draw;
2082
2083	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085	my ($w, $h) = @$self{qw(w h)};
2086
2087	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091	my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093	glEnable GL_TEXTURE_2D;
2094	$tex->draw_quad_alpha (0, 0, $s, $s);
2095	glDisable GL_TEXTURE_2D;
2096	}
2097
2098	#############################################################################
2099
2100	package CFClient::UI::Image;	2599	package CFPlus::UI::VGauge;
2101		2600
2102	our @ISA = CFClient::UI::Base::;	2601	our @ISA = CFPlus::UI::Base::;
2103
2104	use CFClient::OpenGL;
2105
2106	our %texture_cache;
2107
2108	sub new {
2109	my $class = shift;
2110
2111	my $self = $class->SUPER::new (
2112	can_events => 0,
2113	@_,
2114	);
2115
2116	$self->{path}
2117	or Carp::croak "required attribute 'path' not set";
2118
2119	$self->{tex} = $texture_cache{$self->{path}} ||=
2120	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122	Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126	$self
2127	}
2128
2129	sub size_request {
2130	my ($self) = @_;
2131
2132	($self->{tex}{w}, $self->{tex}{h})
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	my $tex = $self->{tex};
2139
2140	my ($w, $h) = ($self->{w}, $self->{h});
2141
2142	if ($self->{rot90}) {
2143	glRotate 90, 0, 0, 1;
2144	glTranslate 0, -$self->{w}, 0;
2145
2146	($w, $h) = ($h, $w);
2147	}
2148
2149	glEnable GL_TEXTURE_2D;
2150	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152	$tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154	glDisable GL_TEXTURE_2D;
2155	}
2156
2157	#############################################################################
2158
2159	package CFClient::UI::VGauge;
2160
2161	our @ISA = CFClient::UI::Base::;
2162		2602
2163	use List::Util qw(min max);	2603	use List::Util qw(min max);
2164		2604
2165	use CFClient::OpenGL;	2605	use CFPlus::OpenGL;
2166		2606
2167	my %tex = (	2607	my %tex = (
2168	food => [	2608	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2609	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2610	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2611	],
2172	grace => [	2612	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2613	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2614	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2615	],
2176	hp => [	2616	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2617	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2618	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2619	],
2180	mana => [	2620	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2621	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2622	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2623	],
2184	);	2624	);
2185		2625
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2626	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2686	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2687	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2688
2249	my $h1 = $self->{h} * (1 - $ycut1);	2689	my $h1 = $self->{h} * (1 - $ycut1);
2250	my $h2 = $self->{h} * (1 - $ycut2);	2690	my $h2 = $self->{h} * (1 - $ycut2);
		2691	my $h3 = $self->{h};
		2692
		2693	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251		2694
2252	glEnable GL_BLEND;	2695	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2696	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2697	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2698	glEnable GL_TEXTURE_2D;
…		…
2274		2717
2275	if ($t3) {	2718	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2719	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2720	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2721	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2722	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2723	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2724	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2725	glEnd;
2283	}	2726	}
2284		2727
2285	glDisable GL_BLEND;	2728	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2729	glDisable GL_TEXTURE_2D;
2287	}	2730	}
2288		2731
2289	#############################################################################	2732	#############################################################################
2290		2733
2291	package CFClient::UI::Gauge;	2734	package CFPlus::UI::Gauge;
2292		2735
2293	our @ISA = CFClient::UI::VBox::;	2736	our @ISA = CFPlus::UI::VBox::;
2294		2737
2295	sub new {	2738	sub new {
2296	my ($class, %arg) = @_;	2739	my ($class, %arg) = @_;
2297		2740
2298	my $self = $class->SUPER::new (	2741	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2743	can_hover => 1,
2301	can_events => 1,	2744	can_events => 1,
2302	%arg,	2745	%arg,
2303	);	2746	);
2304		2747
2305	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2748	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2749	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2750	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308		2751
2309	$self	2752	$self
2310	}	2753	}
2311		2754
2312	sub set_fontsize {	2755	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2776	$self->{value}->set_text ($val);
2334	}	2777	}
2335		2778
2336	#############################################################################	2779	#############################################################################
2337		2780
2338	package CFClient::UI::Slider;	2781	package CFPlus::UI::Slider;
2339		2782
2340	use strict;	2783	use strict;
2341		2784
2342	use CFClient::OpenGL;	2785	use CFPlus::OpenGL;
2343		2786
2344	our @ISA = CFClient::UI::DrawBG::;	2787	our @ISA = CFPlus::UI::DrawBG::;
2345		2788
2346	my @tex =	2789	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2790	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2791	qw(s1_slider.png s1_slider_bg.png);
2349		2792
2350	sub new {	2793	sub new {
2351	my $class = shift;	2794	my $class = shift;
2352		2795
…		…
2441	}	2884	}
2442		2885
2443	1	2886	1
2444	}	2887	}
2445		2888
		2889	sub invoke_mouse_wheel {
		2890	my ($self, $ev) = @_;
		2891
		2892	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2893
		2894	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2895
		2896	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2897
		2898	! ! $delta
		2899	}
		2900
2446	sub update {	2901	sub update {
2447	my ($self) = @_;	2902	my ($self) = @_;
2448		2903
2449	delete $self->{knob_w};	2904	delete $self->{knob_w};
2450	$self->SUPER::update;	2905	$self->SUPER::update;
…		…
2497	glDisable GL_TEXTURE_2D;	2952	glDisable GL_TEXTURE_2D;
2498	}	2953	}
2499		2954
2500	#############################################################################	2955	#############################################################################
2501		2956
2502	package CFClient::UI::ValSlider;	2957	package CFPlus::UI::ValSlider;
2503		2958
2504	our @ISA = CFClient::UI::HBox::;	2959	our @ISA = CFPlus::UI::HBox::;
2505		2960
2506	sub new {	2961	sub new {
2507	my ($class, %arg) = @_;	2962	my ($class, %arg) = @_;
2508		2963
2509	my $range = delete $arg{range};	2964	my $range = delete $arg{range};
2510		2965
2511	my $self = $class->SUPER::new (	2966	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2967	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2968	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	2969	to_value => sub { shift },
2515	from_value => sub { shift },	2970	from_value => sub { shift },
2516	%arg,	2971	%arg,
2517	);	2972	);
2518		2973
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	2993	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	2994	sub set_value { shift->{slider}->set_value (@_) }
2540		2995
2541	#############################################################################	2996	#############################################################################
2542		2997
2543	package CFClient::UI::TextScroller;	2998	package CFPlus::UI::TextScroller;
2544		2999
2545	our @ISA = CFClient::UI::HBox::;	3000	our @ISA = CFPlus::UI::HBox::;
2546		3001
2547	use CFClient::OpenGL;	3002	use CFPlus::OpenGL;
2548		3003
2549	sub new {	3004	sub new {
2550	my $class = shift;	3005	my $class = shift;
2551		3006
2552	my $self = $class->SUPER::new (	3007	my $self = $class->SUPER::new (
2553	fontsize => 1,	3008	fontsize => 1,
2554	can_events => 0,	3009	can_events => 1,
2555	indent => 0,	3010	indent => 0,
2556	#font => default_font	3011	#font => default_font
2557	@_,	3012	@_,
2558		3013
2559	layout => (new CFClient::Layout 1),	3014	layout => (new CFPlus::Layout),
2560	par => [],	3015	par => [],
		3016	max_par => 0,
2561	height => 0,	3017	height => 0,
2562	children => [	3018	children => [
2563	(new CFClient::UI::Empty expand => 1),	3019	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	3020	(new CFPlus::UI::Slider vertical => 1),
2565	],	3021	],
2566	);	3022	);
2567		3023
2568	$self->{children}[1]->connect (changed => sub { $self->update });	3024	$self->{children}[1]->connect (changed => sub { $self->update });
2569		3025
…		…
2575		3031
2576	$self->{fontsize} = $fontsize;	3032	$self->{fontsize} = $fontsize;
2577	$self->reflow;	3033	$self->reflow;
2578	}	3034	}
2579		3035
2580	sub visible_children {	3036	sub size_request {
2581	my ($self) = @_;	3037	my ($self) = @_;
2582		3038
2583	@{$self->{children}}[0,1]	3039	my ($empty, $slider) = @{ $self->{children} };
		3040
		3041	local $self->{children} = [$empty, $slider];
		3042	$self->SUPER::size_request
2584	}	3043	}
2585		3044
2586	sub invoke_size_allocate {	3045	sub invoke_size_allocate {
2587	my ($self, $w, $h) = @_;	3046	my ($self, $w, $h) = @_;
2588		3047
…		…
2594	$self->{layout}->set_width ($empty->{w});	3053	$self->{layout}->set_width ($empty->{w});
2595	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3054	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596		3055
2597	$self->reflow;	3056	$self->reflow;
2598		3057
		3058	local $self->{children} = [$empty, $slider];
2599	$self->SUPER::invoke_size_allocate ($w, $h)	3059	$self->SUPER::invoke_size_allocate ($w, $h)
		3060	}
		3061
		3062	sub invoke_mouse_wheel {
		3063	my ($self, $ev) = @_;
		3064
		3065	return 0 unless $ev->{dy}; # only vertical movements
		3066
		3067	$self->{children}[1]->emit (mouse_wheel => $ev);
		3068
		3069	1
2600	}	3070	}
2601		3071
2602	sub get_layout {	3072	sub get_layout {
2603	my ($self, $para) = @_;	3073	my ($self, $para) = @_;
2604		3074
…		…
2632		3102
2633	# todo: base offset on lines or so, not on pixels	3103	# todo: base offset on lines or so, not on pixels
2634	$self->{children}[1]->set_value ($offset);	3104	$self->{children}[1]->set_value ($offset);
2635	}	3105	}
2636		3106
		3107	sub current_paragraph {
		3108	my ($self) = @_;
		3109
		3110	$self->{top_paragraph} - 1
		3111	}
		3112
		3113	sub scroll_to {
		3114	my ($self, $para) = @_;
		3115
		3116	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3117
		3118	$self->{scroll_to} = $para;
		3119	$self->update;
		3120	}
		3121
2637	sub clear {	3122	sub clear {
2638	my ($self) = @_;	3123	my ($self) = @_;
2639		3124
2640	my (undef, undef, @other) = @{ $self->{children} };	3125	my (undef, undef, @other) = @{ $self->{children} };
2641	$self->remove ($_) for @other;	3126	$self->remove ($_) for @other;
…		…
2644	$self->{height} = 0;	3129	$self->{height} = 0;
2645	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3130	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646	}	3131	}
2647		3132
2648	sub add_paragraph {	3133	sub add_paragraph {
2649	my ($self, $color, $para, $indent) = @_;	3134	my $self = shift;
2650		3135
2651	my ($text, @w) = ref $para ? @$para : $para;	3136	for my $para (@_) {
2652
2653	$para = {	3137	$para = {
		3138	fg => [1, 1, 1, 1],
		3139	indent => 0,
		3140	markup => "",
		3141	widget => [],
		3142	ref $para ? %$para : (markup => $para),
2654	w => 1e10,	3143	w => 1e10,
2655	wrapped => 1,	3144	wrapped => 1,
2656	fg => $color,
2657	indent => $indent,
2658	markup => $text,
2659	widget => \@w,
2660	};	3145	};
2661		3146
2662	$self->add (@w) if @w;	3147	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663	push @{$self->{par}}, $para;	3148	push @{$self->{par}}, $para;
		3149	}
		3150
		3151	if (my $max = $self->{max_par}) {
		3152	shift @{$self->{par}} while @{$self->{par}} > $max;
		3153	}
2664		3154
2665	$self->{need_reflow}++;	3155	$self->{need_reflow}++;
2666	$self->update;	3156	$self->update;
2667	}	3157	}
2668		3158
2669	sub scroll_to_bottom {	3159	sub scroll_to_bottom {
2670	my ($self) = @_;	3160	my ($self) = @_;
2671		3161
2672	$self->{scroll_to_bottom} = 1;	3162	$self->{scroll_to} = $#{$self->{par}};
2673	$self->update;	3163	$self->update;
2674	}	3164	}
2675		3165
		3166	sub force_uptodate {
		3167	my ($self) = @_;
		3168
		3169	if (delete $self->{need_reflow}) {
		3170	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3171
		3172	my $height = 0;
		3173
		3174	for my $para (@{$self->{par}}) {
		3175	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3176	my $layout = $self->get_layout ($para);
		3177	my ($w, $h) = $layout->size;
		3178
		3179	$para->{w} = $w + $para->{indent};
		3180	$para->{h} = $h;
		3181	$para->{wrapped} = $layout->has_wrapped;
		3182	}
		3183
		3184	$para->{y} = $height;
		3185	$height += $para->{h};
		3186	}
		3187
		3188	$self->{height} = $height;
		3189	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3190
		3191	delete $self->{texture};
		3192	}
		3193
		3194	if (my $paridx = delete $self->{scroll_to}) {
		3195	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3196	}
		3197	}
		3198
2676	sub update {	3199	sub update {
2677	my ($self) = @_;	3200	my ($self) = @_;
2678		3201
2679	$self->SUPER::update;	3202	$self->SUPER::update;
2680		3203
2681	return unless $self->{h} > 0;	3204	return unless $self->{h} > 0;
2682		3205
2683	delete $self->{texture};	3206	delete $self->{texture};
2684		3207
2685	$ROOT->on_post_alloc ($self => sub {	3208	$ROOT->on_post_alloc ($self => sub {
		3209	$self->force_uptodate;
		3210
2686	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3211	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687		3212
2688	if (delete $self->{need_reflow}) {
2689	my $height = 0;
2690
2691	for my $para (@{$self->{par}}) {
2692	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2693	my $layout = $self->get_layout ($para);
2694	my ($w, $h) = $layout->size;
2695
2696	$para->{w} = $w + $para->{indent};
2697	$para->{h} = $h;
2698	$para->{wrapped} = $layout->has_wrapped;
2699	}
2700
2701	$height += $para->{h};
2702	}
2703
2704	$self->{height} = $height;
2705
2706	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2707
2708	delete $self->{texture};
2709	}
2710
2711	if (delete $self->{scroll_to_bottom}) {
2712	$self->{children}[1]->set_value (1e10);
2713	}
2714
2715	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3213	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716	glClearColor 0, 0, 0, 0;	3214	glClearColor 0, 0, 0, 0;
2717	glClear GL_COLOR_BUFFER_BIT;	3215	glClear GL_COLOR_BUFFER_BIT;
2718		3216
		3217	package CFPlus::UI::Base;
		3218	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3219	(0, 0, $self->{w}, $self->{h});
		3220
		3221	my $top = int $self->{children}[1]{range}[0];
		3222
		3223	my $paridx = 0;
		3224	my $top_paragraph;
2719	my $top = int $self->{children}[1]{range}[0];	3225	my $top = int $self->{children}[1]{range}[0];
2720		3226
2721	my $y0 = $top;	3227	my $y0 = $top;
2722	my $y1 = $top + $H;	3228	my $y1 = $top + $H;
2723		3229
2724	my $y = 0;
2725
2726	glEnable GL_BLEND;
2727	#TODO# not correct in windows where rgba is forced off
2728	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730	for my $para (@{$self->{par}}) {	3230	for my $para (@{$self->{par}}) {
2731	my $h = $para->{h};	3231	my $h = $para->{h};
		3232	my $y = $para->{y};
2732		3233
2733	if ($y0 < $y + $h && $y < $y1) {	3234	if ($y0 < $y + $h && $y < $y1) {
2734
2735	my $layout = $self->get_layout ($para);	3235	my $layout = $self->get_layout ($para);
2736		3236
2737	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739	glRasterPos $para->{indent}, $y - $y0;	3237	$layout->render ($para->{indent}, $y - $y0);
2740	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741		3238
2742	if (my @w = @{ $para->{widget} }) {	3239	if (my @w = @{ $para->{widget} }) {
2743	my @s = $layout->get_shapes;	3240	my @s = $layout->get_shapes;
2744		3241
2745	for (@w) {	3242	for (@w) {
…		…
2751	$_->draw;	3248	$_->draw;
2752	}	3249	}
2753	}	3250	}
2754	}	3251	}
2755		3252
2756	$y += $h;	3253	$paridx++;
		3254	$top_paragraph ||= $paridx if $y >= $top;
2757	}	3255	}
2758		3256
2759	glDisable GL_BLEND;	3257	$self->{top_paragraph} = $top_paragraph;
2760	};	3258	};
2761	});	3259	});
2762	}	3260	}
2763		3261
2764	sub reconfigure {	3262	sub reconfigure {
…		…
2782	$self->{children}[1]->draw;	3280	$self->{children}[1]->draw;
2783	}	3281	}
2784		3282
2785	#############################################################################	3283	#############################################################################
2786		3284
2787	package CFClient::UI::Animator;	3285	package CFPlus::UI::Animator;
2788		3286
2789	use CFClient::OpenGL;	3287	use CFPlus::OpenGL;
2790		3288
2791	our @ISA = CFClient::UI::Bin::;	3289	our @ISA = CFPlus::UI::Bin::;
2792		3290
2793	sub moveto {	3291	sub moveto {
2794	my ($self, $x, $y) = @_;	3292	my ($self, $x, $y) = @_;
2795		3293
2796	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3294	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2824	glPopMatrix;	3322	glPopMatrix;
2825	}	3323	}
2826		3324
2827	#############################################################################	3325	#############################################################################
2828		3326
2829	package CFClient::UI::Flopper;	3327	package CFPlus::UI::Flopper;
2830		3328
2831	our @ISA = CFClient::UI::Button::;	3329	our @ISA = CFPlus::UI::Button::;
2832		3330
2833	sub new {	3331	sub new {
2834	my $class = shift;	3332	my $class = shift;
2835		3333
2836	my $self = $class->SUPER::new (	3334	my $self = $class->SUPER::new (
…		…
2848	$self->{other}->toggle_visibility;	3346	$self->{other}->toggle_visibility;
2849	}	3347	}
2850		3348
2851	#############################################################################	3349	#############################################################################
2852		3350
2853	package CFClient::UI::Tooltip;	3351	package CFPlus::UI::Tooltip;
2854		3352
2855	our @ISA = CFClient::UI::Bin::;	3353	our @ISA = CFPlus::UI::Bin::;
2856		3354
2857	use CFClient::OpenGL;	3355	use CFPlus::OpenGL;
2858		3356
2859	sub new {	3357	sub new {
2860	my $class = shift;	3358	my $class = shift;
2861		3359
2862	$class->SUPER::new (	3360	$class->SUPER::new (
…		…
2865	)	3363	)
2866	}	3364	}
2867		3365
2868	sub set_tooltip_from {	3366	sub set_tooltip_from {
2869	my ($self, $widget) = @_;	3367	my ($self, $widget) = @_;
		3368
		3369	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3370	if $widget->{tooltip} =~ /^#(.*)$/;
2870		3371
2871	my $tooltip = $widget->{tooltip};	3372	my $tooltip = $widget->{tooltip};
2872		3373
2873	if ($ENV{CFPLUS_DEBUG} & 2) {	3374	if ($ENV{CFPLUS_DEBUG} & 2) {
2874	$tooltip .= "\n\n" . (ref $widget) . "\n"	3375	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2878	}	3379	}
2879		3380
2880	$tooltip =~ s/^\n+//;	3381	$tooltip =~ s/^\n+//;
2881	$tooltip =~ s/\n+$//;	3382	$tooltip =~ s/\n+$//;
2882		3383
2883	$self->add (new CFClient::UI::Label	3384	$self->add (new CFPlus::UI::Label
2884	markup => $tooltip,	3385	markup => $tooltip,
2885	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3386	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886	fontsize => 0.8,	3387	fontsize => 0.8,
2887	fg => [0, 0, 0, 1],	3388	style => 1, # FLAG_INVERSE
2888	ellipsise => 0,	3389	ellipsise => 0,
2889	font => ($widget->{tooltip_font} || $::FONT_PROP),	3390	font => ($widget->{tooltip_font} || $::FONT_PROP),
2890	);	3391	);
2891	}	3392	}
2892		3393
…		…
2911		3412
2912	$self->{root}->on_post_alloc ("move_$self" => sub {	3413	$self->{root}->on_post_alloc ("move_$self" => sub {
2913	my $widget = $self->{owner}	3414	my $widget = $self->{owner}
2914	or return;	3415	or return;
2915		3416
		3417	if ($widget->{visible}) {
2916	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3418	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917		3419
2918	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3420	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919	if $x + $self->{w} > $self->{root}{w};	3421	if $x + $self->{w} > $self->{root}{w};
2920		3422
2921	$self->move_abs ($x, $y);	3423	$self->move_abs ($x, $y);
		3424	} else {
		3425	$self->hide;
		3426	}
2922	});	3427	});
2923	}	3428	}
2924		3429
2925	sub _draw {	3430	sub _draw {
2926	my ($self) = @_;	3431	my ($self) = @_;
…		…
2950	$self->SUPER::_draw;	3455	$self->SUPER::_draw;
2951	}	3456	}
2952		3457
2953	#############################################################################	3458	#############################################################################
2954		3459
2955	package CFClient::UI::Face;	3460	package CFPlus::UI::Face;
2956		3461
2957	our @ISA = CFClient::UI::Base::;	3462	our @ISA = CFPlus::UI::DrawBG::;
2958		3463
2959	use CFClient::OpenGL;	3464	use CFPlus::OpenGL;
2960		3465
2961	sub new {	3466	sub new {
2962	my $class = shift;	3467	my $class = shift;
2963		3468
2964	my $self = $class->SUPER::new (	3469	my $self = $class->SUPER::new (
		3470	size_w => 32,
		3471	size_h => 8,
2965	aspect => 1,	3472	aspect => 1,
2966	can_events => 0,	3473	can_events => 0,
2967	@_,	3474	@_,
2968	);	3475	);
2969		3476
2970	if ($self->{anim} && $self->{animspeed}) {	3477	if ($self->{anim} && $self->{animspeed}) {
2971	Scalar::Util::weaken (my $widget = $self);	3478	CFPlus::weaken (my $widget = $self);
2972		3479
		3480	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3481	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2973	$self->{timer} = Event->timer (	3482	$self->{timer} = Event->timer (
2974	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975	hard => 1,	3483	parked => 1,
2976	interval => $self->{animspeed},
2977	cb => sub {	3484	cb => sub {
		3485	return unless $::CONN && $widget;
		3486
2978	++$widget->{frame};	3487	++$widget->{frame};
		3488	$widget->update_face;
2979	$widget->update;	3489	$widget->update;
		3490
		3491	$widget->update_timer;
2980	},	3492	},
2981	);	3493	);
		3494
		3495	$self->update_face;
		3496	$self->update_timer;
2982	}	3497	}
2983		3498
2984	$self	3499	$self
2985	}	3500	}
2986		3501
		3502	sub update_timer {
		3503	my ($self) = @_;
		3504
		3505	return unless $self->{timer};
		3506
		3507	if ($self->{visible}) {
		3508	$self->{timer}->at (
		3509	$self->{anim_start}
		3510	+ $self->{animspeed}
		3511	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3512	);
		3513	$self->{timer}->start;
		3514	} else {
		3515	$self->{timer}->stop;
		3516	}
		3517	}
		3518
		3519	sub update_face {
		3520	my ($self) = @_;
		3521
		3522	return unless $::CONN;
		3523
		3524	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3525	if ($anim && @$anim) {
		3526	delete $self->{wait_face};
		3527	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3528	}
		3529	}
		3530	}
		3531
2987	sub size_request {	3532	sub size_request {
2988	(32, 8)	3533	my ($self) = @_;
		3534
		3535	if ($::CONN) {
		3536	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3537	if (my $tex = $::CONN->{texture}[$faceid]) {
		3538	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3539	} else {
		3540	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3541	$self->realloc;
		3542	});
		3543	}
		3544	}
		3545	}
		3546
		3547	($self->{size_w} || 8, $self->{size_h} || 8)
2989	}	3548	}
2990		3549
2991	sub update {	3550	sub update {
2992	my ($self) = @_;	3551	my ($self) = @_;
2993		3552
2994	return unless $self->{visible};	3553	return unless $self->{visible};
2995		3554
2996	$self->SUPER::update;	3555	$self->SUPER::update;
2997	}	3556	}
2998		3557
		3558	sub invoke_visibility_change {
		3559	my ($self) = @_;
		3560
		3561	$self->update_timer;
		3562
		3563	0
		3564	}
		3565
2999	sub _draw {	3566	sub _draw {
3000	my ($self) = @_;	3567	my ($self) = @_;
3001		3568
3002	return unless $::CONN;	3569	return unless $::CONN;
3003		3570
3004	my $face;	3571	$self->SUPER::_draw;
3005		3572
3006	if ($self->{frame}) {
3007	my $anim = $::CONN->{anim}[$self->{anim}];	3573	my $faceid = $::CONN->{faceid}[$self->{face}]
3008		3574	or return;
3009	$face = $anim->[ $self->{frame} % @$anim ]
3010	if $anim && @$anim;
3011	}
3012		3575
3013	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3576	my $tex = $::CONN->{texture}[$faceid];
3014		3577
3015	if ($tex) {	3578	if ($tex) {
3016	glEnable GL_TEXTURE_2D;	3579	glEnable GL_TEXTURE_2D;
3017	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3580	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018	glColor 0, 0, 0, 1;	3581	glColor 0, 0, 0, 1;
…		…
3022	}	3585	}
3023		3586
3024	sub destroy {	3587	sub destroy {
3025	my ($self) = @_;	3588	my ($self) = @_;
3026		3589
3027	$self->{timer}->cancel	3590	(delete $self->{timer})->cancel
3028	if $self->{timer};	3591	if $self->{timer};
3029		3592
3030	$self->SUPER::destroy;	3593	$self->SUPER::destroy;
3031	}	3594	}
3032		3595
3033	#############################################################################	3596	#############################################################################
3034		3597
3035	package CFClient::UI::Buttonbar;	3598	package CFPlus::UI::Buttonbar;
3036		3599
3037	our @ISA = CFClient::UI::HBox::;	3600	our @ISA = CFPlus::UI::HBox::;
3038		3601
3039	# TODO: should actualyl wrap buttons and other goodies.	3602	# TODO: should actually wrap buttons and other goodies.
3040		3603
3041	#############################################################################	3604	#############################################################################
3042		3605
3043	package CFClient::UI::Menu;	3606	package CFPlus::UI::Menu;
3044		3607
3045	our @ISA = CFClient::UI::FancyFrame::;	3608	our @ISA = CFPlus::UI::Toplevel::;
3046		3609
3047	use CFClient::OpenGL;	3610	use CFPlus::OpenGL;
3048		3611
3049	sub new {	3612	sub new {
3050	my $class = shift;	3613	my $class = shift;
3051		3614
3052	my $self = $class->SUPER::new (	3615	my $self = $class->SUPER::new (
3053	items => [],	3616	items => [],
3054	z => 100,	3617	z => 100,
3055	@_,	3618	@_,
3056	);	3619	);
3057		3620
3058	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3621	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059		3622
3060	for my $item (@{ $self->{items} }) {	3623	for my $item (@{ $self->{items} }) {
3061	my ($widget, $cb, $tooltip) = @$item;	3624	my ($widget, $cb, $tooltip) = @$item;
3062		3625
3063	# handle various types of items, only text for now	3626	# handle various types of items, only text for now
3064	if (!ref $widget) {	3627	if (!ref $widget) {
		3628	if ($widget =~ /\t/) {
		3629	my ($left, $right) = split /\t/, $widget, 2;
		3630
3065	$widget = new CFClient::UI::Label	3631	$widget = new CFPlus::UI::HBox
3066	can_hover => 1,	3632	can_hover => 1,
3067	can_events => 1,	3633	can_events => 1,
		3634	tooltip => $tooltip,
		3635	children => [
		3636	(new CFPlus::UI::Label markup => $left, expand => 1),
		3637	(new CFPlus::UI::Label markup => $right, align => +1),
		3638	],
		3639	;
		3640
		3641	} else {
		3642	$widget = new CFPlus::UI::Label
		3643	can_hover => 1,
		3644	can_events => 1,
3068	markup => $widget,	3645	markup => $widget,
3069	tooltip => $tooltip	3646	tooltip => $tooltip;
		3647	}
3070	}	3648	}
3071		3649
3072	$self->{item}{$widget} = $item;	3650	$self->{item}{$widget} = $item;
3073		3651
3074	$self->{vbox}->add ($widget);	3652	$self->{vbox}->add ($widget);
…		…
3117	1	3695	1
3118	}	3696	}
3119		3697
3120	#############################################################################	3698	#############################################################################
3121		3699
3122	package CFClient::UI::Multiplexer;	3700	package CFPlus::UI::Multiplexer;
3123		3701
3124	our @ISA = CFClient::UI::Container::;	3702	our @ISA = CFPlus::UI::Container::;
3125		3703
3126	sub new {	3704	sub new {
3127	my $class = shift;	3705	my $class = shift;
3128		3706
3129	my $self = $class->SUPER::new (	3707	my $self = $class->SUPER::new (
…		…
3143		3721
3144	$self->{current} = $self->{children}[0]	3722	$self->{current} = $self->{children}[0]
3145	if @{ $self->{children} };	3723	if @{ $self->{children} };
3146	}	3724	}
3147		3725
		3726	sub get_current_page {
		3727	my ($self) = @_;
		3728
		3729	$self->{current}
		3730	}
		3731
3148	sub set_current_page {	3732	sub set_current_page {
3149	my ($self, $page_or_widget) = @_;	3733	my ($self, $page_or_widget) = @_;
3150		3734
3151	my $widget = ref $page_or_widget	3735	my $widget = ref $page_or_widget
3152	? $page_or_widget	3736	? $page_or_widget
…		…
3184	$self->{current}->draw;	3768	$self->{current}->draw;
3185	}	3769	}
3186		3770
3187	#############################################################################	3771	#############################################################################
3188		3772
3189	package CFClient::UI::Notebook;	3773	package CFPlus::UI::Notebook;
3190		3774
3191	our @ISA = CFClient::UI::VBox::;	3775	our @ISA = CFPlus::UI::VBox::;
3192		3776
3193	sub new {	3777	sub new {
3194	my $class = shift;	3778	my $class = shift;
3195		3779
3196	my $self = $class->SUPER::new (	3780	my $self = $class->SUPER::new (
3197	buttonbar => (new CFClient::UI::Buttonbar),	3781	buttonbar => (new CFPlus::UI::Buttonbar),
3198	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3782	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199	# filter => # will be put between multiplexer and $self	3783	# filter => # will be put between multiplexer and $self
3200	@_,	3784	@_,
3201	);	3785	);
3202		3786
3203	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3787	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3207	}	3791	}
3208		3792
3209	sub add {	3793	sub add {
3210	my ($self, $title, $widget, $tooltip) = @_;	3794	my ($self, $title, $widget, $tooltip) = @_;
3211		3795
3212	Scalar::Util::weaken $self;	3796	CFPlus::weaken $self;
3213		3797
3214	$self->{buttonbar}->add (new CFClient::UI::Button	3798	$self->{buttonbar}->add (new CFPlus::UI::Button
3215	markup => $title,	3799	markup => $title,
3216	tooltip => $tooltip,	3800	tooltip => $tooltip,
3217	on_activate => sub { $self->set_current_page ($widget) },	3801	on_activate => sub { $self->set_current_page ($widget) },
3218	);	3802	);
3219		3803
3220	$self->{multiplexer}->add ($widget);	3804	$self->{multiplexer}->add ($widget);
3221	}	3805	}
3222		3806
		3807	sub get_current_page {
		3808	my ($self) = @_;
		3809
		3810	$self->{multiplexer}->get_current_page
		3811	}
		3812
3223	sub set_current_page {	3813	sub set_current_page {
3224	my ($self, $page) = @_;	3814	my ($self, $page) = @_;
3225		3815
3226	$self->{multiplexer}->set_current_page ($page);	3816	$self->{multiplexer}->set_current_page ($page);
3227	$self->emit (page_changed => $self->{multiplexer}{current});	3817	$self->emit (page_changed => $self->{multiplexer}{current});
3228	}	3818	}
3229		3819
3230	#############################################################################	3820	#############################################################################
3231		3821
3232	package CFClient::UI::Combobox;	3822	package CFPlus::UI::Selector;
3233		3823
3234	use utf8;	3824	use utf8;
3235		3825
3236	our @ISA = CFClient::UI::Button::;	3826	our @ISA = CFPlus::UI::Button::;
3237		3827
3238	sub new {	3828	sub new {
3239	my $class = shift;	3829	my $class = shift;
3240		3830
3241	my $self = $class->SUPER::new (	3831	my $self = $class->SUPER::new (
…		…
3258	my ($value, $title, $tooltip) = @$_;	3848	my ($value, $title, $tooltip) = @$_;
3259		3849
3260	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3850	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261	}	3851	}
3262		3852
3263	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3853	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264	}	3854	}
3265		3855
3266	sub _set_value {	3856	sub _set_value {
3267	my ($self, $value) = @_;	3857	my ($self, $value) = @_;
3268		3858
…		…
3283	$self->emit (changed => $value);	3873	$self->emit (changed => $value);
3284	}	3874	}
3285		3875
3286	#############################################################################	3876	#############################################################################
3287		3877
3288	package CFClient::UI::Statusbox;	3878	package CFPlus::UI::Statusbox;
3289		3879
3290	our @ISA = CFClient::UI::VBox::;	3880	our @ISA = CFPlus::UI::VBox::;
3291		3881
3292	sub new {	3882	sub new {
3293	my $class = shift;	3883	my $class = shift;
3294		3884
3295	my $self = $class->SUPER::new (	3885	my $self = $class->SUPER::new (
3296	fontsize => 0.8,	3886	fontsize => 0.8,
3297	@_,	3887	@_,
3298	);	3888	);
3299		3889
3300	Scalar::Util::weaken (my $this = $self);	3890	CFPlus::weaken (my $this = $self);
3301		3891
3302	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3892	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303		3893
3304	$self	3894	$self
3305	}	3895	}
…		…
3307	sub reorder {	3897	sub reorder {
3308	my ($self) = @_;	3898	my ($self) = @_;
3309	my $NOW = Time::HiRes::time;	3899	my $NOW = Time::HiRes::time;
3310		3900
3311	# freeze display when hovering over any label	3901	# freeze display when hovering over any label
3312	return if $CFClient::UI::TOOLTIP->{owner}	3902	return if $CFPlus::UI::TOOLTIP->{owner}
3313	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3903	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314	values %{ $self->{item} };	3904	values %{ $self->{item} };
3315		3905
3316	while (my ($k, $v) = each %{ $self->{item} }) {	3906	while (my ($k, $v) = each %{ $self->{item} }) {
3317	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3907	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318	}	3908	}
…		…
3339	for ($short) {	3929	for ($short) {
3340	s/^\s+//;	3930	s/^\s+//;
3341	s/\s+/ /g;	3931	s/\s+/ /g;
3342	}	3932	}
3343		3933
3344	new CFClient::UI::Label	3934	new CFPlus::UI::Label
3345	markup => $short,	3935	markup => $short,
3346	tooltip => $item->{tooltip},	3936	tooltip => $item->{tooltip},
3347	tooltip_font => $::FONT_PROP,	3937	tooltip_font => $::FONT_PROP,
3348	tooltip_width => 0.67,	3938	tooltip_width => 0.67,
3349	fontsize => $item->{fontsize} || $self->{fontsize},	3939	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3403	count => 1,	3993	count => 1,
3404	%arg,	3994	%arg,
3405	};	3995	};
3406	}	3996	}
3407		3997
		3998	$ROOT->on_refresh (reorder => sub {
3408	$self->reorder;	3999	$self->reorder;
		4000	});
3409	}	4001	}
3410		4002
3411	sub reconfigure {	4003	sub reconfigure {
3412	my ($self) = @_;	4004	my ($self) = @_;
3413		4005
…		…
3426	$self->SUPER::destroy;	4018	$self->SUPER::destroy;
3427	}	4019	}
3428		4020
3429	#############################################################################	4021	#############################################################################
3430		4022
3431	package CFClient::UI::Inventory;
3432
3433	our @ISA = CFClient::UI::ScrolledWindow::;
3434
3435	sub new {
3436	my $class = shift;
3437
3438	my $self = $class->SUPER::new (
3439	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440	@_,
3441	);
3442
3443	$self
3444	}
3445
3446	sub set_items {
3447	my ($self, $items) = @_;
3448
3449	$self->{child}->clear;
3450	return unless $items;
3451
3452	my @items = sort {
3453	($a->{type} <=> $b->{type})
3454	or ($a->{name} cmp $b->{name})
3455	} @$items;
3456
3457	$self->{real_items} = \@items;
3458
3459	my $row = 0;
3460	for my $item (@items) {
3461	CFClient::Item::update_widgets $item;
3462
3463	$self->{child}->add (0, $row, $item->{face_widget});
3464	$self->{child}->add (1, $row, $item->{desc_widget});
3465	$self->{child}->add (2, $row, $item->{weight_widget});
3466
3467	$row++;
3468	}
3469	}
3470
3471	#############################################################################
3472
3473	package CFClient::UI::BindEditor;
3474
3475	our @ISA = CFClient::UI::FancyFrame::;
3476
3477	sub new {
3478	my $class = shift;
3479
3480	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482	$self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486	text => "start recording",
3487	tooltip => "Start/Stops recording of actions."
3488	."All subsequent actions after the recording started will be captured."
3489	."The actions are displayed after the record was stopped."
3490	."To bind the action you have to click on the 'Bind' button",
3491	on_activate => sub {
3492	unless ($self->{recording}) {
3493	$self->start;
3494	} else {
3495	$self->stop;
3496	}
3497	});
3498
3499	$vb->add (new CFClient::UI::Label text => "Actions:");
3500	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3503	$vb->add (my $hb = new CFClient::UI::HBox);
3504	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505	$hb->add (new CFClient::UI::Button
3506	text => "bind",
3507	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508	on_activate => sub {
3509	$self->ask_for_bind;
3510	});
3511
3512	$vb->add (my $hb = new CFClient::UI::HBox);
3513	$hb->add (new CFClient::UI::Button
3514	text => "ok",
3515	expand => 1,
3516	tooltip => "This closes the binding editor and saves the binding",
3517	on_activate => sub {
3518	$self->hide;
3519	$self->commit;
3520	});
3521
3522	$hb->add (new CFClient::UI::Button
3523	text => "cancel",
3524	expand => 1,
3525	tooltip => "This closes the binding editor without saving",
3526	on_activate => sub {
3527	$self->hide;
3528	$self->{binding_cancel}->()
3529	if $self->{binding_cancel};
3530	});
3531
3532	$self->update_binding_widgets;
3533
3534	$self
3535	}
3536
3537	sub cfg_bind {
3538	my ($self, $mod, $sym, $cmds) = @_;
3539	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540	::update_bindings ();
3541	}
3542
3543	sub cfg_unbind {
3544	my ($self, $mod, $sym, $cmds) = @_;
3545	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546	::update_bindings ();
3547	}
3548
3549	sub commit {
3550	my ($self) = @_;
3551	my ($mod, $sym, $cmds) = $self->get_binding;
3552	if ($sym != 0 && @$cmds > 0) {
3553	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554	."'. Don't forget 'Save Config'!");
3555	$self->{binding_change}->($mod, $sym, $cmds)
3556	if $self->{binding_change};
3557	} else {
3558	$::STATUSBOX->add ("No action bound, no key or action specified!");
3559	$self->{binding_cancel}->()
3560	if $self->{binding_cancel};
3561	}
3562	}
3563
3564	sub start {
3565	my ($self) = @_;
3566
3567	$self->{rec_btn}->set_text ("stop recording");
3568	$self->{recording} = 1;
3569	$self->clear_command_list;
3570	$::CONN->start_record if $::CONN;
3571	}
3572
3573	sub stop {
3574	my ($self) = @_;
3575
3576	$self->{rec_btn}->set_text ("start recording");
3577	$self->{recording} = 0;
3578
3579	my $rec;
3580	$rec = $::CONN->stop_record if $::CONN;
3581	return unless ref $rec eq 'ARRAY';
3582	$self->set_command_list ($rec);
3583	}
3584
3585
3586	sub ask_for_bind_and_commit {
3587	my ($self) = @_;
3588	$self->ask_for_bind (1);
3589	}
3590
3591	sub ask_for_bind {
3592	my ($self, $commit, $end_cb) = @_;
3593
3594	CFClient::Binder::open_binding_dialog (sub {
3595	my ($mod, $sym) = @_;
3596	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597	$self->update_binding_widgets;
3598	$self->commit if $commit;
3599	$end_cb->() if $end_cb;
3600	});
3601	}
3602
3603	# $mod and $sym are the modifiers and key symbol
3604	# $cmds is a array ref of strings (the commands)
3605	# $cb is the callback that is executed on OK
3606	# $ccb is the callback that is executed on CANCEL and
3607	# when the binding was unsuccessful on OK
3608	sub set_binding {
3609	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611	$self->clear_command_list;
3612	$self->{recording} = 0;
3613	$self->{rec_btn}->set_text ("start recording");
3614
3615	$self->{binding} = [$mod, $sym];
3616	$self->{commands} = $cmds;
3617
3618	$self->{binding_change} = $cb;
3619	$self->{binding_cancel} = $ccb;
3620
3621	$self->update_binding_widgets;
3622	}
3623
3624	# this is a shortcut method that asks for a binding
3625	# and then just binds it.
3626	sub do_quick_binding {
3627	my ($self, $cmds, $end_cb) = @_;
3628	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629	$self->ask_for_bind (1, $end_cb);
3630	}
3631
3632	sub update_binding_widgets {
3633	my ($self) = @_;
3634	my ($mod, $sym, $cmds) = $self->get_binding;
3635	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636	$self->set_command_list ($cmds);
3637	}
3638
3639	sub get_binding {
3640	my ($self) = @_;
3641	return (
3642	$self->{binding}->[0],
3643	$self->{binding}->[1],
3644	[ grep { defined $_ } @{$self->{commands}} ]
3645	);
3646	}
3647
3648	sub clear_command_list {
3649	my ($self) = @_;
3650	$self->{cmdbox}->clear ();
3651	}
3652
3653	sub set_command_list {
3654	my ($self, $cmds) = @_;
3655
3656	$self->{cmdbox}->clear ();
3657	$self->{commands} = $cmds;
3658
3659	my $idx = 0;
3660
3661	for (@$cmds) {
3662	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664	my $i = $idx;
3665	$hb->add (new CFClient::UI::Label text => $_);
3666	$hb->add (new CFClient::UI::Button
3667	text => "delete",
3668	tooltip => "Deletes the action from the record",
3669	on_activate => sub {
3670	$self->{cmdbox}->remove ($hb);
3671	$cmds->[$i] = undef;
3672	});
3673
3674
3675	$idx++
3676	}
3677	}
3678
3679	#############################################################################
3680
3681	package CFClient::UI::SpellList;
3682
3683	our @ISA = CFClient::UI::Table::;
3684
3685	sub new {
3686	my $class = shift;
3687
3688	my $self = $class->SUPER::new (
3689	binding => [],
3690	commands => [],
3691	@_,
3692	)
3693	}
3694
3695	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708	sub rebuild_spell_list {
3709	my ($self) = @_;
3710
3711	$CFClient::UI::ROOT->on_refresh ($self => sub {
3712	$self->clear;
3713
3714	return unless $::CONN;
3715
3716	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722	my $row = 0;
3723
3724	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725	my $spell = $self->{spell}{$_};
3726
3727	$row++;
3728
3729	my $spell_cb = sub {
3730	my ($widget, $ev) = @_;
3731
3732	if ($ev->{button} == 1) {
3733	$::CONN->user_send ("cast $spell->{name}");
3734	} elsif ($ev->{button} == 2) {
3735	$::CONN->user_send ("invoke $spell->{name}");
3736	} elsif ($ev->{button} == 3) {
3737	(new CFClient::UI::Menu
3738	items => [
3739	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741	],
3742	)->popup ($ev);
3743	} else {
3744	return 0;
3745	}
3746
3747	1
3748	};
3749
3750	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752	#TODO: add path info to tooltip
3753	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755	$self->add (0, $row, new CFClient::UI::Face
3756	face => $spell->{face},
3757	can_hover => 1,
3758	can_events => 1,
3759	tooltip => $tooltip,
3760	on_button_down => $spell_cb,
3761	);
3762
3763	$self->add (1, $row, new CFClient::UI::Label
3764	expand => 1,
3765	text => $spell->{name},
3766	can_hover => 1,
3767	can_events => 1,
3768	tooltip => $tooltip,
3769	on_button_down => $spell_cb,
3770	);
3771
3772	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776	}
3777	});
3778	}
3779
3780	sub add_spell {
3781	my ($self, $spell) = @_;
3782
3783	$self->{spell}->{$spell->{name}} = $spell;
3784	$self->rebuild_spell_list;
3785	}
3786
3787	sub remove_spell {
3788	my ($self, $spell) = @_;
3789
3790	delete $self->{spell}->{$spell->{name}};
3791	$self->rebuild_spell_list;
3792	}
3793
3794	sub clear_spells {
3795	my ($self) = @_;
3796
3797	$self->{spell} = {};
3798	$self->rebuild_spell_list;
3799	}
3800
3801	#############################################################################
3802
3803	package CFClient::UI::Root;	4023	package CFPlus::UI::Root;
3804		4024
3805	our @ISA = CFClient::UI::Container::;	4025	our @ISA = CFPlus::UI::Container::;
3806		4026
3807	use List::Util qw(min max);	4027	use List::Util qw(min max);
3808		4028
3809	use CFClient::OpenGL;	4029	use CFPlus::OpenGL;
3810		4030
3811	sub new {	4031	sub new {
3812	my $class = shift;	4032	my $class = shift;
3813		4033
3814	my $self = $class->SUPER::new (	4034	my $self = $class->SUPER::new (
3815	visible => 1,	4035	visible => 1,
3816	@_,	4036	@_,
3817	);	4037	);
3818		4038
3819	Scalar::Util::weaken ($self->{root} = $self);	4039	CFPlus::weaken ($self->{root} = $self);
3820		4040
3821	$self	4041	$self
3822	}	4042	}
3823		4043
3824	sub size_request {	4044	sub size_request {
…		…
3990	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4210	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991		4211
3992	$w = 0 if $w < 0;	4212	$w = 0 if $w < 0;
3993	$h = 0 if $h < 0;	4213	$h = 0 if $h < 0;
3994		4214
		4215	$w = max $widget->{min_w}, $w;
		4216	$h = max $widget->{min_h}, $h;
		4217
		4218	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4219	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4220
		4221	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4222	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4223
3995	$w = int $w + 0.5;	4224	$w = int $w + 0.5;
3996	$h = int $h + 0.5;	4225	$h = int $h + 0.5;
3997		4226
3998	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4227	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999	$widget->{old_w} = $widget->{w};	4228	$widget->{old_w} = $widget->{w};
…		…
4009		4238
4010	while ($self->{post_alloc_hook}) {	4239	while ($self->{post_alloc_hook}) {
4011	$_->()	4240	$_->()
4012	for values %{delete $self->{post_alloc_hook}};	4241	for values %{delete $self->{post_alloc_hook}};
4013	}	4242	}
4014
4015		4243
4016	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4244	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4017	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4245	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4018	glClear GL_COLOR_BUFFER_BIT;	4246	glClear GL_COLOR_BUFFER_BIT;
4019		4247
…		…
4022	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4250	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023	glMatrixMode GL_MODELVIEW;	4251	glMatrixMode GL_MODELVIEW;
4024	glLoadIdentity;	4252	glLoadIdentity;
4025		4253
4026	{	4254	{
4027	package CFClient::UI::Base;	4255	package CFPlus::UI::Base;
4028		4256
4029	($draw_x, $draw_y, $draw_w, $draw_h) =	4257	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030	(0, 0, $self->{w}, $self->{h});	4258	(0, 0, $self->{w}, $self->{h});
4031	}
4032		4259
4033	$self->_draw;	4260	$self->_draw;
		4261	}
4034	}	4262	}
4035		4263
4036	#############################################################################	4264	#############################################################################
4037		4265
4038	package CFClient::UI;	4266	package CFPlus::UI;
4039		4267
4040	$ROOT = new CFClient::UI::Root;	4268	$ROOT = new CFPlus::UI::Root;
4041	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4269	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042		4270
4043	1	4271	1
4044		4272

Diff Legend

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