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.399 by root, Sat Jul 21 16:07:53 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
699	];	771	];
700		772
701	$self->realloc;	773	$self->realloc;
		774
		775	map $_+0, @widgets
702	}	776	}
703		777
704	sub children {	778	sub children {
705	@{ $_[0]{children} }	779	@{ $_[0]{children} }
706	}	780	}
…		…
717	}	791	}
718		792
719	sub clear {	793	sub clear {
720	my ($self) = @_;	794	my ($self) = @_;
721		795
722	my $children = delete $self->{children};	796	my $children = $self->{children};
723	$self->{children} = [];	797	$self->{children} = [];
724		798
725	for (@$children) {	799	for (@$children) {
726	delete $_->{parent};	800	delete $_->{parent};
727	$_->hide;	801	$_->hide;
…		…
752	$_->draw for @{$self->{children}};	826	$_->draw for @{$self->{children}};
753	}	827	}
754		828
755	#############################################################################	829	#############################################################################
756		830
757	package CFClient::UI::Bin;	831	package CFPlus::UI::Bin;
758		832
759	our @ISA = CFClient::UI::Container::;	833	our @ISA = CFPlus::UI::Container::;
760		834
761	sub new {	835	sub new {
762	my ($class, %arg) = @_;	836	my ($class, %arg) = @_;
763		837
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	838	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		839
766	$class->SUPER::new (children => [$child], %arg)	840	$class->SUPER::new (children => [$child], %arg)
767	}	841	}
768		842
769	sub add {	843	sub add {
…		…
776	sub remove {	850	sub remove {
777	my ($self, $widget) = @_;	851	my ($self, $widget) = @_;
778		852
779	$self->SUPER::remove ($widget);	853	$self->SUPER::remove ($widget);
780		854
781	$self->{children} = [new CFClient::UI::Empty]	855	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	856	unless @{$self->{children}};
783	}	857	}
784		858
785	sub child { $_[0]->{children}[0] }	859	sub child { $_[0]->{children}[0] }
786		860
…		…
798		872
799	#############################################################################	873	#############################################################################
800		874
801	# back-buffered drawing area	875	# back-buffered drawing area
802		876
803	package CFClient::UI::Window;	877	package CFPlus::UI::Window;
804		878
805	our @ISA = CFClient::UI::Bin::;	879	our @ISA = CFPlus::UI::Bin::;
806		880
807	use CFClient::OpenGL;	881	use CFPlus::OpenGL;
808		882
809	sub new {	883	sub new {
810	my ($class, %arg) = @_;	884	my ($class, %arg) = @_;
811		885
812	my $self = $class->SUPER::new (%arg);	886	my $self = $class->SUPER::new (%arg);
…		…
834	}	908	}
835		909
836	sub render_child {	910	sub render_child {
837	my ($self) = @_;	911	my ($self) = @_;
838		912
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	913	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	914	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	915	glClear GL_COLOR_BUFFER_BIT;
842		916
843	{	917	{
844	package CFClient::UI::Base;	918	package CFPlus::UI::Base;
845		919
846	($draw_x, $draw_y, $draw_w, $draw_h) =	920	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	921	(0, 0, $self->{w}, $self->{h});
		922
		923	$self->_render;
848	}	924	}
849
850	$self->_render;
851	};	925	};
852	}	926	}
853		927
854	sub _draw {	928	sub _draw {
855	my ($self) = @_;	929	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		930
859	my $tex = $self->{texture}	931	my $tex = $self->{texture}
860	or return;	932	or return;
861		933
862	glEnable GL_TEXTURE_2D;	934	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	935	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	936	glColor 0, 0, 0, 1;
865		937
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	938	$tex->draw_quad_alpha_premultiplied (0, 0);
867		939
868	glDisable GL_TEXTURE_2D;	940	glDisable GL_TEXTURE_2D;
869	}	941	}
870		942
871	#############################################################################	943	#############################################################################
872		944
873	package CFClient::UI::ViewPort;	945	package CFPlus::UI::ViewPort;
874		946
		947	use List::Util qw(min max);
		948
875	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
876		950
877	sub new {	951	sub new {
878	my $class = shift;	952	my $class = shift;
879		953
880	$class->SUPER::new (	954	$class->SUPER::new (
…		…
887	sub size_request {	961	sub size_request {
888	my ($self) = @_;	962	my ($self) = @_;
889		963
890	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	964	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891		965
892	$w = 10 if $self->{scroll_x};	966	$w = 1 if $self->{scroll_x};
893	$h = 10 if $self->{scroll_y};	967	$h = 1 if $self->{scroll_y};
894		968
895	($w, $h)	969	($w, $h)
896	}	970	}
897		971
898	sub invoke_size_allocate {	972	sub invoke_size_allocate {
…		…
910	}	984	}
911		985
912	sub set_offset {	986	sub set_offset {
913	my ($self, $x, $y) = @_;	987	my ($self, $x, $y) = @_;
914		988
		989	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		990	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		991
		992	if ($x != $self->{view_x} or $y != $self->{view_y}) {
915	$self->{view_x} = int $x;	993	$self->{view_x} = $x;
916	$self->{view_y} = int $y;	994	$self->{view_y} = $y;
917		995
		996	$self->emit (changed => $x, $y);
918	$self->update;	997	$self->update;
		998	}
919	}	999	}
920		1000
921	# hmm, this does not work for topleft of $self... but we should not ask for that	1001	# hmm, this does not work for topleft of $self... but we should not ask for that
922	sub coord2local {	1002	sub coord2local {
923	my ($self, $x, $y) = @_;	1003	my ($self, $x, $y) = @_;
…		…
938	my ($self, $x, $y) = @_;	1018	my ($self, $x, $y) = @_;
939		1019
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1020	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1021	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	1022	) {
943	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1023	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944	} else {	1024	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1025	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1026	}
947	}	1027	}
948		1028
949	sub _render {	1029	sub _render {
950	my ($self) = @_;	1030	my ($self) = @_;
951		1031
952	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1032	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};	1033	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954		1034
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1035	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1036
957	$self->SUPER::_render;	1037	$self->SUPER::_render;
958	}	1038	}
959		1039
960	#############################################################################	1040	#############################################################################
961		1041
962	package CFClient::UI::ScrolledWindow;	1042	package CFPlus::UI::ScrolledWindow;
963		1043
964	our @ISA = CFClient::UI::HBox::;	1044	our @ISA = CFPlus::UI::Table::;
965		1045
966	sub new {	1046	sub new {
967	my ($class, %arg) = @_;	1047	my ($class, %arg) = @_;
968		1048
969	my $child = delete $arg{child};	1049	my $child = delete $arg{child};
970		1050
971	my $self;	1051	my $self;
972		1052
973	my $slider = new CFClient::UI::Slider	1053	my $hslider = new CFPlus::UI::Slider
		1054	col => 0,
		1055	row => 1,
		1056	vertical => 0,
		1057	range => [0, 0, 1, 0.01], # HACK fix
		1058	on_changed => sub {
		1059	$self->{hpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1061	},
		1062	;
		1063
		1064	my $vslider = new CFPlus::UI::Slider
		1065	col => 1,
		1066	row => 0,
974	vertical => 1,	1067	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1068	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1069	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1070	$self->{vpos} = $_[1];
		1071	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978	},	1072	},
979	;	1073	;
980		1074
981	$self = $class->SUPER::new (	1075	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1076	scroll_x => 0,
		1077	scroll_y => 1,
		1078	can_events => 1,
983	slider => $slider,	1079	hslider => $hslider,
		1080	vslider => $vslider,
		1081	col_expand => [1, 0],
		1082	row_expand => [1, 0],
984	%arg,	1083	%arg,
985	);	1084	);
986		1085
		1086	$self->{vp} = new CFPlus::UI::ViewPort
		1087	col => 0,
		1088	row => 0,
		1089	expand => 1,
		1090	scroll_x => $self->{scroll_x},
		1091	scroll_y => $self->{scroll_y},
		1092	on_changed => sub {
		1093	my ($vp, $x, $y) = @_;
		1094
		1095	$vp->{parent}{hslider}->set_value ($x);
		1096	$vp->{parent}{vslider}->set_value ($y);
		1097
		1098	0
		1099	},
		1100	;
		1101
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1102	$self->SUPER::add ($self->{vp});
		1103
988	$self->add ($child) if $child;	1104	$self->add ($child) if $child;
989		1105
990	$self	1106	$self
991	}	1107	}
992		1108
…		…
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
999	sub update {	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	$self->{hslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{hslider})
		1127	: $self->SUPER::remove ($self->{hslider});
		1128	}
		1129
		1130	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1131	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1132
		1133	my $visible = $h1 > $h2;
		1134	if ($visible != $self->{vslider_visible}) {
		1135	$self->{vslider_visible} = $visible;
		1136	$visible ? $self->SUPER::add ($self->{vslider})
		1137	: $self->SUPER::remove ($self->{vslider});
		1138	}
		1139	}
		1140
		1141	sub start_dragging {
1000	my ($self) = @_;	1142	my ($self, $ev) = @_;
1001		1143
1002	$self->SUPER::update;	1144	$self->grab_focus;
1003		1145
1004	# todo: overwrite size_allocate of child	1146	my $ox = $self->{vp}{view_x};
1005	my $child = $self->{vp}->child;	1147	my $oy = $self->{vp}{view_y};
1006	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1148
		1149	$self->{motion} = sub {
		1150	my ($ev, $x, $y) = @_;
		1151
		1152	$ox -= $ev->{xrel};
		1153	$oy -= $ev->{yrel};
		1154
		1155	$self->{vp}->set_offset ($ox, $oy);
		1156	};
		1157	}
		1158
		1159	sub invoke_mouse_wheel {
		1160	my ($self, $ev) = @_;
		1161
		1162	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1163	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1164
		1165	1
		1166	}
		1167
		1168	sub invoke_button_down {
		1169	my ($self, $ev, $x, $y) = @_;
		1170
		1171	if ($ev->{button} == 2) {
		1172	$self->start_dragging ($ev);
		1173	return 1;
		1174	}
		1175
		1176	0
		1177	}
		1178
		1179	sub invoke_button_up {
		1180	my ($self, $ev, $x, $y) = @_;
		1181
		1182	if (delete $self->{motion}) {
		1183	return 1;
		1184	}
		1185
		1186	0
		1187	}
		1188
		1189	sub invoke_mouse_motion {
		1190	my ($self, $ev, $x, $y) = @_;
		1191
		1192	if ($self->{motion}) {
		1193	$self->{motion}->($ev, $x, $y);
		1194	return 1;
		1195	}
		1196
		1197	0
1007	}	1198	}
1008		1199
1009	sub invoke_size_allocate {	1200	sub invoke_size_allocate {
1010	my ($self, $w, $h) = @_;	1201	my ($self, $w, $h) = @_;
1011		1202
1012	my $child = $self->{vp}->child;	1203	$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)	1204	$self->SUPER::invoke_size_allocate ($w, $h)
1016	}	1205	}
1017		1206
1018	#TODO# update range on size_allocate depending on child
1019	# update viewport offset on scroll
1020
1021	#############################################################################	1207	#############################################################################
1022		1208
1023	package CFClient::UI::Frame;	1209	package CFPlus::UI::Frame;
1024		1210
1025	our @ISA = CFClient::UI::Bin::;	1211	our @ISA = CFPlus::UI::Bin::;
1026		1212
1027	use CFClient::OpenGL;	1213	use CFPlus::OpenGL;
1028		1214
1029	sub new {	1215	sub new {
1030	my $class = shift;	1216	my $class = shift;
1031		1217
1032	$class->SUPER::new (	1218	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1244	$self->SUPER::_draw;
1059	}	1245	}
1060		1246
1061	#############################################################################	1247	#############################################################################
1062		1248
1063	package CFClient::UI::FancyFrame;	1249	package CFPlus::UI::FancyFrame;
1064		1250
1065	our @ISA = CFClient::UI::Bin::;	1251	our @ISA = CFPlus::UI::Bin::;
1066		1252
1067	use CFClient::OpenGL;	1253	use CFPlus::OpenGL;
		1254
		1255	sub new {
		1256	my ($class, %arg) = @_;
		1257
		1258	if ((exists $arg{label}) && !ref $arg{label}) {
		1259	$arg{label} = new CFPlus::UI::Label
		1260	align => 1,
		1261	valign => 0,
		1262	text => $arg{label},
		1263	fontsize => ($arg{border} || 0.8) * 0.75;
		1264	}
		1265
		1266	my $self = $class->SUPER::new (
		1267	# label => "",
		1268	fg => [0.6, 0.3, 0.1],
		1269	border => 0.8,
		1270	style => 'single',
		1271	%arg,
		1272	);
		1273
		1274	$self
		1275	}
		1276
		1277	sub add {
		1278	my ($self, @widgets) = @_;
		1279
		1280	$self->SUPER::add (@widgets);
		1281	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1282	}
		1283
		1284	sub border {
		1285	int $_[0]{border} * $::FONTSIZE
		1286	}
		1287
		1288	sub size_request {
		1289	my ($self) = @_;
		1290
		1291	($self->{label_w}, undef) = $self->{label}->size_request
		1292	if $self->{label};
		1293
		1294	my ($w, $h) = $self->SUPER::size_request;
		1295
		1296	(
		1297	$w + $self->border * 2,
		1298	$h + $self->border * 2,
		1299	)
		1300	}
		1301
		1302	sub invoke_size_allocate {
		1303	my ($self, $w, $h) = @_;
		1304
		1305	my $border = $self->border;
		1306
		1307	$w -= List::Util::max 0, $border * 2;
		1308	$h -= List::Util::max 0, $border * 2;
		1309
		1310	if (my $label = $self->{label}) {
		1311	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1312	$label->{h} = List::Util::min $h, $border;
		1313	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1314	}
		1315
		1316	$self->child->configure ($border, $border, $w, $h);
		1317
		1318	1
		1319	}
		1320
		1321	sub _draw {
		1322	my ($self) = @_;
		1323
		1324	my $child = $self->{children}[0];
		1325
		1326	my $border = $self->border;
		1327	my ($w, $h) = ($self->{w}, $self->{h});
		1328
		1329	$child->draw;
		1330
		1331	glColor @{$self->{fg}};
		1332	glBegin GL_LINE_STRIP;
		1333	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1334	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1335	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1336	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1337	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1338	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1339	glEnd;
		1340
		1341	if ($self->{label}) {
		1342	glTranslate $border * 2, 0;
		1343	$self->{label}->_draw;
		1344	}
		1345	}
		1346
		1347	#############################################################################
		1348
		1349	package CFPlus::UI::Toplevel;
		1350
		1351	our @ISA = CFPlus::UI::Bin::;
		1352
		1353	use CFPlus::OpenGL;
1068		1354
1069	my $bg =	1355	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1356	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1357	mipmap => 1, wrap => 1;
1072		1358
1073	my @border =	1359	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1360	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);	1361	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1362
		1363	my @icon =
		1364	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1365	qw(x1_move.png x1_resize.png);
1076		1366
1077	sub new {	1367	sub new {
1078	my ($class, %arg) = @_;	1368	my ($class, %arg) = @_;
1079		1369
1080	my $self = $class->SUPER::new (	1370	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1371	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1372	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1373	border => 0.6,
1084	can_events => 1,	1374	can_events => 1,
1085	min_w => 16,	1375	min_w => 64,
1086	min_h => 16,	1376	min_h => 32,
1087	%arg,	1377	%arg,
1088	);	1378	);
1089		1379
1090	$self->{title_widget} = new CFClient::UI::Label	1380	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1381	align => 0,
1092	valign => 1,	1382	valign => 1,
1093	text => $self->{title},	1383	text => $self->{title},
1094	fontsize => $self->{border},	1384	fontsize => $self->{border},
1095	if exists $self->{title};	1385	if exists $self->{title};
1096		1386
1097	if ($self->{has_close_button}) {	1387	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1388	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1389	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1390	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1391	on_activate => sub { $self->emit ("delete") };
1102		1392
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1393	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1394	}
1105		1395
1106	$self	1396	$self
1107	}	1397	}
1108		1398
1109	sub add {	1399	sub add {
1110	my ($self, @widgets) = @_;	1400	my ($self, @widgets) = @_;
1111		1401
1112	$self->SUPER::add (@widgets);	1402	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1403	$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};	1404	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1405	}
1116		1406
1117	sub border {	1407	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1408	int $_[0]{border} * $::FONTSIZE
1119	}	1409	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1442	$self->child->configure ($border, $border, $w, $h);
1153		1443
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1444	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1445	if $self->{close_button};
1156		1446
		1447	1
		1448	}
		1449
		1450	sub invoke_delete {
		1451	my ($self) = @_;
		1452
		1453	$self->hide;
		1454
1157	1	1455	1
1158	}	1456	}
1159		1457
1160	sub invoke_button_down {	1458	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1459	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1517	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1518
1221	! ! $self->{motion}	1519	! ! $self->{motion}
1222	}	1520	}
1223		1521
		1522	sub invoke_visibility_change {
		1523	my ($self, $visible) = @_;
		1524
		1525	delete $self->{motion} unless $visible;
		1526
		1527	0
		1528	}
		1529
1224	sub _draw {	1530	sub _draw {
1225	my ($self) = @_;	1531	my ($self) = @_;
1226		1532
1227	my $child = $self->{children}[0];	1533	my $child = $self->{children}[0];
1228		1534
…		…
1233	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1539	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234		1540
1235	my $border = $self->border;	1541	my $border = $self->border;
1236		1542
1237	glColor @{ $self->{border_bg} };	1543	glColor @{ $self->{border_bg} };
1238	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1544	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1545	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1546	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1547	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1548
		1549	# move
		1550	my $w2 = ($w - $border) * .5;
		1551	my $h2 = ($h - $border) * .5;
		1552	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1553	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1554	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1555
		1556	# resize
		1557	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1558	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1559	unless $self->{has_close_button};
		1560	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1561	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242		1562
1243	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1563	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244	glColor @{ $self->{bg} };	1564	glColor @{ $self->{bg} };
1245		1565
1246	# TODO: repeat texture not scale	1566	# TODO: repeat texture not scale
…		…
1265	if $self->{close_button};	1585	if $self->{close_button};
1266	}	1586	}
1267		1587
1268	#############################################################################	1588	#############################################################################
1269		1589
1270	package CFClient::UI::Table;	1590	package CFPlus::UI::Table;
1271		1591
1272	our @ISA = CFClient::UI::Base::;	1592	our @ISA = CFPlus::UI::Container::;
1273		1593
1274	use List::Util qw(max sum);	1594	use List::Util qw(max sum);
1275		1595
1276	use CFClient::OpenGL;	1596	use CFPlus::OpenGL;
1277		1597
1278	sub new {	1598	sub new {
1279	my $class = shift;	1599	my $class = shift;
1280		1600
1281	$class->SUPER::new (	1601	$class->SUPER::new (
1282	col_expand => [],	1602	col_expand => [],
		1603	row_expand => [],
1283	@_,	1604	@_,
1284	)	1605	)
1285	}	1606	}
1286		1607
1287	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}
1290
1291	sub add {	1608	sub add {
1292	my ($self, $x, $y, $child) = @_;	1609	my ($self, @widgets) = @_;
1293		1610
1294	$child->set_parent ($self);	1611	for my $child (@widgets) {
1295	$self->{children}[$y][$x] = $child;	1612	$child->{rowspan} ||= 1;
		1613	$child->{colspan} ||= 1;
		1614	}
1296		1615
1297	$self->realloc;	1616	$self->SUPER::add (@widgets);
1298	}	1617	}
1299		1618
1300	sub remove {	1619	sub add_at {
		1620	my $self = shift;
		1621
		1622	my @widgets;
		1623
		1624	while (@_) {
		1625	my ($col, $row, $child) = splice @_, 0, 3, ();
		1626
		1627	$child->{row} = $row;
		1628	$child->{col} = $col;
		1629
		1630	push @widgets, $child;
		1631	}
		1632
		1633	$self->add (@widgets);
		1634	}
		1635
		1636	sub get_wh {
1301	my ($self, $child) = @_;	1637	my ($self) = @_;
1302		1638
1303	# TODO: not yet implemented	1639	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		1640
1310	my @children = $self->children;	1641	my @children = $self->children;
1311	delete $self->{children};	1642
		1643	# first pass, columns
		1644	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1645	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1646
		1647	my $sw = sum @w[$c .. $c + $cs - 1];
		1648
		1649	if ($w > $sw) {
		1650	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1651	}
1312		1652	}
1313	for (@children) {
1314	delete $_->{parent};
1315	$_->hide;
1316	}
1317		1653
1318	$self->realloc;	1654	# second pass, rows
1319	}	1655	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)};	1656	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1334		1657
1335	$w[$x] = max $w[$x], $w;	1658	my $sh = sum @h[$r .. $r + $rs - 1];
1336	$h[$y] = max $h[$y], $h;	1659
		1660	if ($h > $sh) {
		1661	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337	}	1662	}
1338	}	1663	}
1339		1664
1340	(\@w, \@h)	1665	(\@w, \@h)
1341	}	1666	}
…		…
1357	my ($ws, $hs) = $self->get_wh;	1682	my ($ws, $hs) = $self->get_wh;
1358		1683
1359	my $req_w = (sum @$ws) || 1;	1684	my $req_w = (sum @$ws) || 1;
1360	my $req_h = (sum @$hs) || 1;	1685	my $req_h = (sum @$hs) || 1;
1361		1686
1362	# TODO: nicer code && do row_expand	1687	# now linearly scale the rows/columns to the allocated size
1363	my @col_expand = @{$self->{col_expand}};	1688	my @col_expand = @{$self->{col_expand}};
1364	@col_expand = (1) x @$ws unless @col_expand;	1689	@col_expand = (1) x @$ws unless @col_expand;
1365	my $col_expand = (sum @col_expand) || 1;	1690	my $col_expand = (sum @col_expand) || 1;
1366		1691
1367	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1692	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1693
1371	CFClient::UI::harmonize $ws;	1694	CFPlus::UI::harmonize $ws;
		1695
		1696	my @row_expand = @{$self->{row_expand}};
		1697	@row_expand = (1) x @$ws unless @row_expand;
		1698	my $row_expand = (sum @row_expand) || 1;
		1699
		1700	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1701
1372	CFClient::UI::harmonize $hs;	1702	CFPlus::UI::harmonize $hs;
1373		1703
1374	my $y;	1704	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1705	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375		1706
1376	for my $r (0 .. $#{$self->{children}}) {	1707	for my $widget ($self->children) {
1377	my $row = $self->{children}[$r]	1708	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1378	or next;
1379		1709
1380	my $x = 0;	1710	$widget->configure (
1381	my $row_h = $hs->[$r];	1711	$x[$c], $y[$r],
		1712	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382		1713	);
1383	for my $c (0 .. $#$row) {	1714	}
1384	my $col_w = $ws->[$c];
1385		1715
1386	if (my $widget = $row->[$c]) {	1716	1
1387	$widget->configure ($x, $y, $col_w, $row_h);	1717	}
1388	}
1389		1718
1390	$x += $col_w;	1719	#############################################################################
		1720
		1721	package CFPlus::UI::Fixed;
		1722
		1723	use List::Util qw(min max);
		1724
		1725	our @ISA = CFPlus::UI::Container::;
		1726
		1727	sub add {
		1728	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1729
		1730	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1731	$self->SUPER::add ($child);
		1732	}
		1733
		1734	sub _scale($$$) {
		1735	my ($mode, $val, $max) = @_;
		1736
		1737	$mode eq "abs" ? $val
		1738	: $mode eq "rel" ? $val * $max
		1739	: 0
		1740	}
		1741
		1742	sub size_request {
		1743	my ($self) = @_;
		1744
		1745	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1746
		1747	# determine overall size by querying abs widgets
		1748	for my $child ($self->visible_children) {
		1749	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1750
		1751	if ($pos eq "abs") {
		1752	$w = _scale $size, $w, $child->{req_w};
		1753	$h = _scale $size, $h, $child->{req_h};
		1754
		1755	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1756	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1391	}	1757	}
		1758	}
1392		1759
1393	$y += $row_h;	1760	my $W = $x2 - $x1;
		1761	my $H = $y2 - $y1;
		1762
		1763	# now layout remaining widgets
		1764	for my $child ($self->visible_children) {
		1765	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1766
		1767	if ($pos ne "abs") {
		1768	$x = _scale $pos, $x, $W;
		1769	$y = _scale $pos, $x, $H;
		1770	$w = _scale $size, $w, $child->{req_w};
		1771	$h = _scale $size, $h, $child->{req_h};
		1772
		1773	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1774	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1775	}
		1776	}
		1777
		1778	my $W = $x2 - $x1;
		1779	my $H = $y2 - $y1;
		1780
		1781	($W, $H)
		1782	}
		1783
		1784	sub invoke_size_allocate {
		1785	my ($self, $W, $H) = @_;
		1786
		1787	for my $child ($self->visible_children) {
		1788	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1789
		1790	$x = _scale $pos, $x, $W;
		1791	$y = _scale $pos, $x, $H;
		1792	$w = _scale $size, $w, $child->{req_w};
		1793	$h = _scale $size, $h, $child->{req_h};
		1794
		1795	$child->configure ($x, $y, $w, $h);
1394	}	1796	}
1395		1797
1396	1	1798	1
1397	}	1799	}
1398		1800
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	#############################################################################	1801	#############################################################################
1424		1802
1425	package CFClient::UI::Box;	1803	package CFPlus::UI::Box;
1426		1804
1427	our @ISA = CFClient::UI::Container::;	1805	our @ISA = CFPlus::UI::Container::;
1428		1806
1429	sub size_request {	1807	sub size_request {
1430	my ($self) = @_;	1808	my ($self) = @_;
1431		1809
1432	$self->{vertical}	1810	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1843	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1844	for 0 .. $#children;
1467	}	1845	}
1468	}	1846	}
1469		1847
1470	CFClient::UI::harmonize \@req;	1848	CFPlus::UI::harmonize \@req;
1471		1849
1472	my $pos = 0;	1850	my $pos = 0;
1473	for (0 .. $#children) {	1851	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1852	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1853	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1858	1
1481	}	1859	}
1482		1860
1483	#############################################################################	1861	#############################################################################
1484		1862
1485	package CFClient::UI::HBox;	1863	package CFPlus::UI::HBox;
1486		1864
1487	our @ISA = CFClient::UI::Box::;	1865	our @ISA = CFPlus::UI::Box::;
1488		1866
1489	sub new {	1867	sub new {
1490	my $class = shift;	1868	my $class = shift;
1491		1869
1492	$class->SUPER::new (	1870	$class->SUPER::new (
…		…
1495	)	1873	)
1496	}	1874	}
1497		1875
1498	#############################################################################	1876	#############################################################################
1499		1877
1500	package CFClient::UI::VBox;	1878	package CFPlus::UI::VBox;
1501		1879
1502	our @ISA = CFClient::UI::Box::;	1880	our @ISA = CFPlus::UI::Box::;
1503		1881
1504	sub new {	1882	sub new {
1505	my $class = shift;	1883	my $class = shift;
1506		1884
1507	$class->SUPER::new (	1885	$class->SUPER::new (
…		…
1510	)	1888	)
1511	}	1889	}
1512		1890
1513	#############################################################################	1891	#############################################################################
1514		1892
1515	package CFClient::UI::Label;	1893	package CFPlus::UI::Label;
1516		1894
1517	our @ISA = CFClient::UI::DrawBG::;	1895	our @ISA = CFPlus::UI::DrawBG::;
1518		1896
1519	use CFClient::OpenGL;	1897	use CFPlus::OpenGL;
1520		1898
1521	sub new {	1899	sub new {
1522	my ($class, %arg) = @_;	1900	my ($class, %arg) = @_;
1523		1901
1524	my $self = $class->SUPER::new (	1902	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1905	#active_bg => none
1528	#font => default_font	1906	#font => default_font
1529	#text => initial text	1907	#text => initial text
1530	#markup => initial narkup	1908	#markup => initial narkup
1531	#max_w => maximum pixel width	1909	#max_w => maximum pixel width
		1910	#style => 0, # render flags
1532	ellipsise => 3, # end	1911	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1912	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1913	fontsize => 1,
1535	align => -1,	1914	align => -1,
1536	valign => -1,	1915	valign => -1,
1537	padding_x => 2,	1916	padding_x => 2,
1538	padding_y => 2,	1917	padding_y => 2,
1539	can_events => 0,	1918	can_events => 0,
1540	%arg	1919	%arg
1541	);	1920	);
1542		1921
1543	if (exists $self->{template}) {	1922	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1923	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1924	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1925	$self->{template} = $layout;
1547	}	1926	}
1548		1927
1549	if (exists $self->{markup}) {	1928	if (exists $self->{markup}) {
…		…
1553	}	1932	}
1554		1933
1555	$self	1934	$self
1556	}	1935	}
1557		1936
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 {	1937	sub update {
1569	my ($self) = @_;	1938	my ($self) = @_;
1570		1939
1571	delete $self->{texture};	1940	delete $self->{texture};
1572	$self->SUPER::update;	1941	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1952	my ($self, $text) = @_;
1584		1953
1585	return if $self->{text} eq "T$text";	1954	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1955	$self->{text} = "T$text";
1587		1956
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1957	$self->{layout}->set_text ($text);
1590		1958
1591	delete $self->{size_req};	1959	delete $self->{size_req};
1592	$self->realloc;	1960	$self->realloc;
1593	$self->update;	1961	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1967	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1968	$self->{text} = "M$markup";
1601		1969
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1970	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1971
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1972	$self->{layout}->set_markup ($markup);
1606		1973
1607	delete $self->{size_req};	1974	delete $self->{size_req};
1608	$self->realloc;	1975	$self->realloc;
1609	$self->update;	1976	$self->update;
…		…
1621		1988
1622	my ($w, $h) = $self->{layout}->size;	1989	my ($w, $h) = $self->{layout}->size;
1623		1990
1624	if (exists $self->{template}) {	1991	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1992	$self->{template}->set_font ($self->{font}) if $self->{font};
		1993	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1994	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1995
1628	my ($w2, $h2) = $self->{template}->size;	1996	my ($w2, $h2) = $self->{template}->size;
1629		1997
1630	$w = List::Util::max $w, $w2;	1998	$w = List::Util::max $w, $w2;
…		…
1654		2022
1655	sub set_fontsize {	2023	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	2024	my ($self, $fontsize) = @_;
1657		2025
1658	$self->{fontsize} = $fontsize;	2026	$self->{fontsize} = $fontsize;
		2027	delete $self->{size_req};
1659	delete $self->{texture};	2028	delete $self->{texture};
1660		2029
1661	$self->realloc;	2030	$self->realloc;
1662	}	2031	}
1663		2032
1664	sub reconfigure {	2033	sub reconfigure {
1665	my ($self) = @_;	2034	my ($self) = @_;
1666		2035
1667	delete $self->{size_req};	2036	delete $self->{size_req};
		2037	delete $self->{texture};
1668		2038
1669	$self->SUPER::reconfigure;	2039	$self->SUPER::reconfigure;
1670	}	2040	}
1671		2041
1672	sub _draw {	2042	sub _draw {
1673	my ($self) = @_;	2043	my ($self) = @_;
1674		2044
1675	$self->SUPER::_draw; # draw background, if applicable	2045	$self->SUPER::_draw; # draw background, if applicable
1676		2046
1677	my $tex = $self->{texture} ||= do {	2047	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	2048	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	2049	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	2050	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	2051	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2052	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2053	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		2054
1685	new_from_layout CFClient::Texture $self->{layout}	2055	[$self->{layout}->size]
1686	};	2056	};
1687		2057
1688	unless (exists $self->{ox}) {	2058	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2059	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2060	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	2061	: ($self->{w} - $size->[0]) * 0.5);
1692		2062
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2063	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2064	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	2065	: ($self->{h} - $size->[1]) * 0.5);
1696	};	2066	};
1697		2067
1698	glEnable GL_TEXTURE_2D;
1699
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2068	my $w = List::Util::min $self->{w} + 4, $size->[0];
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2069	my $h = List::Util::min $self->{h} + 2, $size->[1];
1702		2070
1703	if ($tex->{format} == GL_ALPHA) {	2071	$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	}	2072	}
1714		2073
1715	#############################################################################	2074	#############################################################################
1716		2075
1717	package CFClient::UI::EntryBase;	2076	package CFPlus::UI::EntryBase;
1718		2077
1719	our @ISA = CFClient::UI::Label::;	2078	our @ISA = CFPlus::UI::Label::;
1720		2079
1721	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1722		2081
1723	sub new {	2082	sub new {
1724	my $class = shift;	2083	my $class = shift;
1725		2084
1726	$class->SUPER::new (	2085	$class->SUPER::new (
…		…
1730	active_fg => [0, 0, 0],	2089	active_fg => [0, 0, 0],
1731	can_hover => 1,	2090	can_hover => 1,
1732	can_focus => 1,	2091	can_focus => 1,
1733	valign => 0,	2092	valign => 0,
1734	can_events => 1,	2093	can_events => 1,
		2094	ellipsise => 0,
1735	#text => ...	2095	#text => ...
1736	#hidden => "*",	2096	#hidden => "*",
1737	@_	2097	@_
1738	)	2098	)
1739	}	2099	}
…		…
1784	my $sym = $ev->{sym};	2144	my $sym = $ev->{sym};
1785	my $uni = $ev->{unicode};	2145	my $uni = $ev->{unicode};
1786		2146
1787	my $text = $self->get_text;	2147	my $text = $self->get_text;
1788		2148
		2149	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2150
1789	if ($uni == 8) {	2151	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2152	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	2153	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	2154	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	2155	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	2156	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	2157	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	2158	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	2159	} elsif ($sym == CFPlus::SDLK_HOME) {
		2160	# what a hack
		2161	$self->{cursor} =
		2162	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2163	? length $1
		2164	: 0;
		2165	} elsif ($sym == CFPlus::SDLK_END) {
		2166	# uh, again
		2167	$self->{cursor} =
		2168	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2169	? $self->{cursor} + length $1
		2170	: length $self->{text};
		2171	} elsif ($uni == 21) { # ctrl-u
		2172	$text = "";
1798	$self->{cursor} = 0;	2173	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {
1800	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	2174	} elsif ($uni == 27) {
1802	$self->emit ('escape');	2175	$self->emit ('escape');
1803	} elsif ($uni) {	2176	} elsif ($uni == 0x0d) {
		2177	substr $text, $self->{cursor}++, 0, "\012";
		2178	} elsif ($uni >= 0x20) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	2179	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	2180	} else {
1806	return 0;	2181	return 0;
1807	}	2182	}
1808		2183
1809	$self->_set_text ($text);	2184	$self->_set_text ($text);
1810		2185
1811	$self->realloc;	2186	$self->realloc;
		2187	$self->update;
1812		2188
1813	1	2189	1
1814	}	2190	}
1815		2191
1816	sub invoke_focus_in {	2192	sub invoke_focus_in {
…		…
1828		2204
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2205	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2206
1831	# byte-index to char-index	2207	# byte-index to char-index
1832	my $text = $self->{text};	2208	my $text = $self->{text};
1833	utf8::encode $text;	2209	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2210	$self->{cursor} = length $text;
1835		2211
1836	$self->_set_text ($self->{text});	2212	$self->_set_text ($self->{text});
1837	$self->update;	2213	$self->update;
1838		2214
1839	1	2215	1
…		…
1878	utf8::encode $text;	2254	utf8::encode $text;
1879		2255
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2256	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	2257	}
1882		2258
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2259	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2260	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};	2261	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2262	glEnd;
1888	}	2263	}
1889	}	2264	}
1890		2265
		2266	#############################################################################
		2267
1891	package CFClient::UI::Entry;	2268	package CFPlus::UI::Entry;
1892		2269
1893	our @ISA = CFClient::UI::EntryBase::;	2270	our @ISA = CFPlus::UI::EntryBase::;
1894		2271
1895	use CFClient::OpenGL;	2272	use CFPlus::OpenGL;
1896		2273
1897	sub invoke_key_down {	2274	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2275	my ($self, $ev) = @_;
1899		2276
1900	my $sym = $ev->{sym};	2277	my $sym = $ev->{sym};
1901		2278
1902	if ($sym == 13) {	2279	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2280	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2281	my $txt = $self->get_text;
1905		2282
1906	$self->{history_pointer} = -1;	2283	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2284	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2285	$self->emit (activate => $txt);
1909	$self->update;	2286	$self->update;
1910		2287
1911	} elsif ($sym == CFClient::SDLK_UP) {	2288	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2289	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2290	$self->{history_saveback} = $self->get_text;
1914	}	2291	}
1915	if (@{$self->{history} || []} > 0) {	2292	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2293	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2295	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2296	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2297	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2298	}
1922		2299
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2300	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2301	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2302	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2303
1927	if ($self->{history_pointer} >= 0) {	2304	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2305	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2314	1
1938	}	2315	}
1939		2316
1940	#############################################################################	2317	#############################################################################
1941		2318
		2319	package CFPlus::UI::TextEdit;
		2320
		2321	our @ISA = CFPlus::UI::EntryBase::;
		2322
		2323	use CFPlus::OpenGL;
		2324
		2325	sub move_cursor_ver {
		2326	my ($self, $dy) = @_;
		2327
		2328	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2329
		2330	$y += $dy;
		2331
		2332	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2333	$self->{cursor} = $index;
		2334	delete $self->{cur_h};
		2335	$self->update;
		2336	return;
		2337	}
		2338	}
		2339
		2340	sub invoke_key_down {
		2341	my ($self, $ev) = @_;
		2342
		2343	my $sym = $ev->{sym};
		2344
		2345	if ($sym == CFPlus::SDLK_UP) {
		2346	$self->move_cursor_ver (-1);
		2347	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2348	$self->move_cursor_ver (+1);
		2349	} else {
		2350	return $self->SUPER::invoke_key_down ($ev)
		2351	}
		2352
		2353	1
		2354	}
		2355
		2356	#############################################################################
		2357
1942	package CFClient::UI::Button;	2358	package CFPlus::UI::Button;
1943		2359
1944	our @ISA = CFClient::UI::Label::;	2360	our @ISA = CFPlus::UI::Label::;
1945		2361
1946	use CFClient::OpenGL;	2362	use CFPlus::OpenGL;
1947		2363
1948	my @tex =	2364	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2365	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2366	qw(b1_button_inactive.png b1_button_active.png);
1951		2367
1952	sub new {	2368	sub new {
1953	my $class = shift;	2369	my $class = shift;
1954		2370
1955	$class->SUPER::new (	2371	$class->SUPER::new (
1956	padding_x => 4,	2372	padding_x => 4,
1957	padding_y => 4,	2373	padding_y => 4,
1958	fg => [1, 1, 1],	2374	fg => [1.0, 1.0, 1.0],
1959	active_fg => [0, 0, 1],	2375	active_fg => [0.8, 0.8, 0.8],
1960	can_hover => 1,	2376	can_hover => 1,
1961	align => 0,	2377	align => 0,
1962	valign => 0,	2378	valign => 0,
1963	can_events => 1,	2379	can_events => 1,
1964	@_	2380	@_
…		…
1982		2398
1983	glEnable GL_TEXTURE_2D;	2399	glEnable GL_TEXTURE_2D;
1984	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985	glColor 0, 0, 0, 1;	2401	glColor 0, 0, 0, 1;
1986		2402
		2403	my $tex = $tex[$GRAB == $self];
1987	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2404	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988		2405
1989	glDisable GL_TEXTURE_2D;	2406	glDisable GL_TEXTURE_2D;
1990		2407
1991	$self->SUPER::_draw;	2408	$self->SUPER::_draw;
1992	}	2409	}
1993		2410
1994	#############################################################################	2411	#############################################################################
1995		2412
		2413	package CFPlus::UI::CheckBox;
		2414
		2415	our @ISA = CFPlus::UI::DrawBG::;
		2416
		2417	my @tex =
		2418	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2419	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2420
		2421	use CFPlus::OpenGL;
		2422
		2423	sub new {
		2424	my $class = shift;
		2425
		2426	$class->SUPER::new (
		2427	padding_x => 2,
		2428	padding_y => 2,
		2429	fg => [1, 1, 1],
		2430	active_fg => [1, 1, 0],
		2431	bg => [0, 0, 0, 0.2],
		2432	active_bg => [1, 1, 1, 0.5],
		2433	state => 0,
		2434	can_hover => 1,
		2435	@_
		2436	)
		2437	}
		2438
		2439	sub size_request {
		2440	my ($self) = @_;
		2441
		2442	(6) x 2
		2443	}
		2444
		2445	sub toggle {
		2446	my ($self) = @_;
		2447
		2448	$self->{state} = !$self->{state};
		2449	$self->emit (changed => $self->{state});
		2450	$self->update;
		2451	}
		2452
		2453	sub invoke_button_down {
		2454	my ($self, $ev, $x, $y) = @_;
		2455
		2456	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2457	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2458	$self->toggle;
		2459	} else {
		2460	return 0
		2461	}
		2462
		2463	1
		2464	}
		2465
		2466	sub _draw {
		2467	my ($self) = @_;
		2468
		2469	$self->SUPER::_draw;
		2470
		2471	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2472
		2473	my ($w, $h) = @$self{qw(w h)};
		2474
		2475	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2476
		2477	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2478
		2479	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2480
		2481	glEnable GL_TEXTURE_2D;
		2482	$tex->draw_quad_alpha (0, 0, $s, $s);
		2483	glDisable GL_TEXTURE_2D;
		2484	}
		2485
		2486	#############################################################################
		2487
		2488	package CFPlus::UI::Image;
		2489
		2490	our @ISA = CFPlus::UI::Base::;
		2491
		2492	use CFPlus::OpenGL;
		2493
		2494	our %texture_cache;
		2495
		2496	sub new {
		2497	my $class = shift;
		2498
		2499	my $self = $class->SUPER::new (
		2500	can_events => 0,
		2501	@_,
		2502	);
		2503
		2504	$self->{path} || $self->{tex}
		2505	or Carp::croak "'path' or 'tex' attributes required";
		2506
		2507	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2508	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2509
		2510	CFPlus::weaken $texture_cache{$self->{path}};
		2511
		2512	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2513
		2514	$self
		2515	}
		2516
		2517	sub STORABLE_freeze {
		2518	my ($self, $cloning) = @_;
		2519
		2520	$self->{path}
		2521	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2522
		2523	$self->{path}
		2524	}
		2525
		2526	sub STORABLE_attach {
		2527	my ($self, $cloning, $path) = @_;
		2528
		2529	$self->new (path => $path)
		2530	}
		2531
		2532	sub size_request {
		2533	my ($self) = @_;
		2534
		2535	($self->{tex}{w}, $self->{tex}{h})
		2536	}
		2537
		2538	sub _draw {
		2539	my ($self) = @_;
		2540
		2541	my $tex = $self->{tex};
		2542
		2543	my ($w, $h) = ($self->{w}, $self->{h});
		2544
		2545	if ($self->{rot90}) {
		2546	glRotate 90, 0, 0, 1;
		2547	glTranslate 0, -$self->{w}, 0;
		2548
		2549	($w, $h) = ($h, $w);
		2550	}
		2551
		2552	glEnable GL_TEXTURE_2D;
		2553	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2554
		2555	$tex->draw_quad (0, 0, $w, $h);
		2556
		2557	glDisable GL_TEXTURE_2D;
		2558	}
		2559
		2560	#############################################################################
		2561
1996	package CFClient::UI::ImageButton;	2562	package CFPlus::UI::ImageButton;
1997		2563
1998	our @ISA = CFClient::UI::Image::;	2564	our @ISA = CFPlus::UI::Image::;
1999		2565
2000	use CFClient::OpenGL;	2566	use CFPlus::OpenGL;
2001		2567
2002	my %textures;	2568	my %textures;
2003		2569
2004	sub new {	2570	sub new {
2005	my $class = shift;	2571	my $class = shift;
…		…
2027	1	2593	1
2028	}	2594	}
2029		2595
2030	#############################################################################	2596	#############################################################################
2031		2597
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;	2598	package CFPlus::UI::VGauge;
2101		2599
2102	our @ISA = CFClient::UI::Base::;	2600	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		2601
2163	use List::Util qw(min max);	2602	use List::Util qw(min max);
2164		2603
2165	use CFClient::OpenGL;	2604	use CFPlus::OpenGL;
2166		2605
2167	my %tex = (	2606	my %tex = (
2168	food => [	2607	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2608	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2609	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2610	],
2172	grace => [	2611	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2612	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/	2613	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2614	],
2176	hp => [	2615	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2617	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2618	],
2180	mana => [	2619	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	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/	2621	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2622	],
2184	);	2623	);
2185		2624
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2625	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2685	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2686	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2687
2249	my $h1 = $self->{h} * (1 - $ycut1);	2688	my $h1 = $self->{h} * (1 - $ycut1);
2250	my $h2 = $self->{h} * (1 - $ycut2);	2689	my $h2 = $self->{h} * (1 - $ycut2);
		2690	my $h3 = $self->{h};
		2691
		2692	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251		2693
2252	glEnable GL_BLEND;	2694	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2695	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2696	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2697	glEnable GL_TEXTURE_2D;
…		…
2274		2716
2275	if ($t3) {	2717	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2718	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2719	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2720	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2721	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2722	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2723	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2724	glEnd;
2283	}	2725	}
2284		2726
2285	glDisable GL_BLEND;	2727	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2728	glDisable GL_TEXTURE_2D;
2287	}	2729	}
2288		2730
2289	#############################################################################	2731	#############################################################################
2290		2732
2291	package CFClient::UI::Gauge;	2733	package CFPlus::UI::Gauge;
2292		2734
2293	our @ISA = CFClient::UI::VBox::;	2735	our @ISA = CFPlus::UI::VBox::;
2294		2736
2295	sub new {	2737	sub new {
2296	my ($class, %arg) = @_;	2738	my ($class, %arg) = @_;
2297		2739
2298	my $self = $class->SUPER::new (	2740	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2742	can_hover => 1,
2301	can_events => 1,	2743	can_events => 1,
2302	%arg,	2744	%arg,
2303	);	2745	);
2304		2746
2305	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2747	$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);	2748	$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");	2749	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308		2750
2309	$self	2751	$self
2310	}	2752	}
2311		2753
2312	sub set_fontsize {	2754	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2775	$self->{value}->set_text ($val);
2334	}	2776	}
2335		2777
2336	#############################################################################	2778	#############################################################################
2337		2779
2338	package CFClient::UI::Slider;	2780	package CFPlus::UI::Slider;
2339		2781
2340	use strict;	2782	use strict;
2341		2783
2342	use CFClient::OpenGL;	2784	use CFPlus::OpenGL;
2343		2785
2344	our @ISA = CFClient::UI::DrawBG::;	2786	our @ISA = CFPlus::UI::DrawBG::;
2345		2787
2346	my @tex =	2788	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2789	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2790	qw(s1_slider.png s1_slider_bg.png);
2349		2791
2350	sub new {	2792	sub new {
2351	my $class = shift;	2793	my $class = shift;
2352		2794
…		…
2441	}	2883	}
2442		2884
2443	1	2885	1
2444	}	2886	}
2445		2887
		2888	sub invoke_mouse_wheel {
		2889	my ($self, $ev) = @_;
		2890
		2891	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2892
		2893	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2894
		2895	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2896
		2897	! ! $delta
		2898	}
		2899
2446	sub update {	2900	sub update {
2447	my ($self) = @_;	2901	my ($self) = @_;
2448		2902
2449	delete $self->{knob_w};	2903	delete $self->{knob_w};
2450	$self->SUPER::update;	2904	$self->SUPER::update;
…		…
2497	glDisable GL_TEXTURE_2D;	2951	glDisable GL_TEXTURE_2D;
2498	}	2952	}
2499		2953
2500	#############################################################################	2954	#############################################################################
2501		2955
2502	package CFClient::UI::ValSlider;	2956	package CFPlus::UI::ValSlider;
2503		2957
2504	our @ISA = CFClient::UI::HBox::;	2958	our @ISA = CFPlus::UI::HBox::;
2505		2959
2506	sub new {	2960	sub new {
2507	my ($class, %arg) = @_;	2961	my ($class, %arg) = @_;
2508		2962
2509	my $range = delete $arg{range};	2963	my $range = delete $arg{range};
2510		2964
2511	my $self = $class->SUPER::new (	2965	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2966	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2967	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	2968	to_value => sub { shift },
2515	from_value => sub { shift },	2969	from_value => sub { shift },
2516	%arg,	2970	%arg,
2517	);	2971	);
2518		2972
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	2992	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	2993	sub set_value { shift->{slider}->set_value (@_) }
2540		2994
2541	#############################################################################	2995	#############################################################################
2542		2996
2543	package CFClient::UI::TextScroller;	2997	package CFPlus::UI::TextScroller;
2544		2998
2545	our @ISA = CFClient::UI::HBox::;	2999	our @ISA = CFPlus::UI::HBox::;
2546		3000
2547	use CFClient::OpenGL;	3001	use CFPlus::OpenGL;
2548		3002
2549	sub new {	3003	sub new {
2550	my $class = shift;	3004	my $class = shift;
2551		3005
2552	my $self = $class->SUPER::new (	3006	my $self = $class->SUPER::new (
2553	fontsize => 1,	3007	fontsize => 1,
2554	can_events => 0,	3008	can_events => 1,
2555	indent => 0,	3009	indent => 0,
2556	#font => default_font	3010	#font => default_font
2557	@_,	3011	@_,
2558		3012
2559	layout => (new CFClient::Layout 1),	3013	layout => (new CFPlus::Layout),
2560	par => [],	3014	par => [],
		3015	max_par => 0,
2561	height => 0,	3016	height => 0,
2562	children => [	3017	children => [
2563	(new CFClient::UI::Empty expand => 1),	3018	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	3019	(new CFPlus::UI::Slider vertical => 1),
2565	],	3020	],
2566	);	3021	);
2567		3022
2568	$self->{children}[1]->connect (changed => sub { $self->update });	3023	$self->{children}[1]->connect (changed => sub { $self->update });
2569		3024
…		…
2575		3030
2576	$self->{fontsize} = $fontsize;	3031	$self->{fontsize} = $fontsize;
2577	$self->reflow;	3032	$self->reflow;
2578	}	3033	}
2579		3034
2580	sub visible_children {	3035	sub size_request {
2581	my ($self) = @_;	3036	my ($self) = @_;
2582		3037
2583	@{$self->{children}}[0,1]	3038	my ($empty, $slider) = @{ $self->{children} };
		3039
		3040	local $self->{children} = [$empty, $slider];
		3041	$self->SUPER::size_request
2584	}	3042	}
2585		3043
2586	sub invoke_size_allocate {	3044	sub invoke_size_allocate {
2587	my ($self, $w, $h) = @_;	3045	my ($self, $w, $h) = @_;
2588		3046
…		…
2594	$self->{layout}->set_width ($empty->{w});	3052	$self->{layout}->set_width ($empty->{w});
2595	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3053	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596		3054
2597	$self->reflow;	3055	$self->reflow;
2598		3056
		3057	local $self->{children} = [$empty, $slider];
2599	$self->SUPER::invoke_size_allocate ($w, $h)	3058	$self->SUPER::invoke_size_allocate ($w, $h)
		3059	}
		3060
		3061	sub invoke_mouse_wheel {
		3062	my ($self, $ev) = @_;
		3063
		3064	return 0 unless $ev->{dy}; # only vertical movements
		3065
		3066	$self->{children}[1]->emit (mouse_wheel => $ev);
		3067
		3068	1
2600	}	3069	}
2601		3070
2602	sub get_layout {	3071	sub get_layout {
2603	my ($self, $para) = @_;	3072	my ($self, $para) = @_;
2604		3073
…		…
2632		3101
2633	# todo: base offset on lines or so, not on pixels	3102	# todo: base offset on lines or so, not on pixels
2634	$self->{children}[1]->set_value ($offset);	3103	$self->{children}[1]->set_value ($offset);
2635	}	3104	}
2636		3105
		3106	sub current_paragraph {
		3107	my ($self) = @_;
		3108
		3109	$self->{top_paragraph} - 1
		3110	}
		3111
		3112	sub scroll_to {
		3113	my ($self, $para) = @_;
		3114
		3115	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3116
		3117	$self->{scroll_to} = $para;
		3118	$self->update;
		3119	}
		3120
2637	sub clear {	3121	sub clear {
2638	my ($self) = @_;	3122	my ($self) = @_;
2639		3123
2640	my (undef, undef, @other) = @{ $self->{children} };	3124	my (undef, undef, @other) = @{ $self->{children} };
2641	$self->remove ($_) for @other;	3125	$self->remove ($_) for @other;
…		…
2644	$self->{height} = 0;	3128	$self->{height} = 0;
2645	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3129	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646	}	3130	}
2647		3131
2648	sub add_paragraph {	3132	sub add_paragraph {
2649	my ($self, $color, $para, $indent) = @_;	3133	my $self = shift;
2650		3134
2651	my ($text, @w) = ref $para ? @$para : $para;	3135	for my $para (@_) {
2652
2653	$para = {	3136	$para = {
		3137	fg => [1, 1, 1, 1],
		3138	indent => 0,
		3139	markup => "",
		3140	widget => [],
		3141	ref $para ? %$para : (markup => $para),
2654	w => 1e10,	3142	w => 1e10,
2655	wrapped => 1,	3143	wrapped => 1,
2656	fg => $color,
2657	indent => $indent,
2658	markup => $text,
2659	widget => \@w,
2660	};	3144	};
2661		3145
2662	$self->add (@w) if @w;	3146	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663	push @{$self->{par}}, $para;	3147	push @{$self->{par}}, $para;
		3148	}
		3149
		3150	if (my $max = $self->{max_par}) {
		3151	shift @{$self->{par}} while @{$self->{par}} > $max;
		3152	}
2664		3153
2665	$self->{need_reflow}++;	3154	$self->{need_reflow}++;
2666	$self->update;	3155	$self->update;
2667	}	3156	}
2668		3157
2669	sub scroll_to_bottom {	3158	sub scroll_to_bottom {
2670	my ($self) = @_;	3159	my ($self) = @_;
2671		3160
2672	$self->{scroll_to_bottom} = 1;	3161	$self->{scroll_to} = $#{$self->{par}};
2673	$self->update;	3162	$self->update;
2674	}	3163	}
2675		3164
		3165	sub force_uptodate {
		3166	my ($self) = @_;
		3167
		3168	if (delete $self->{need_reflow}) {
		3169	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3170
		3171	my $height = 0;
		3172
		3173	for my $para (@{$self->{par}}) {
		3174	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3175	my $layout = $self->get_layout ($para);
		3176	my ($w, $h) = $layout->size;
		3177
		3178	$para->{w} = $w + $para->{indent};
		3179	$para->{h} = $h;
		3180	$para->{wrapped} = $layout->has_wrapped;
		3181	}
		3182
		3183	$para->{y} = $height;
		3184	$height += $para->{h};
		3185	}
		3186
		3187	$self->{height} = $height;
		3188	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3189
		3190	delete $self->{texture};
		3191	}
		3192
		3193	if (my $paridx = delete $self->{scroll_to}) {
		3194	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3195	}
		3196	}
		3197
2676	sub update {	3198	sub update {
2677	my ($self) = @_;	3199	my ($self) = @_;
2678		3200
2679	$self->SUPER::update;	3201	$self->SUPER::update;
2680		3202
2681	return unless $self->{h} > 0;	3203	return unless $self->{h} > 0;
2682		3204
2683	delete $self->{texture};	3205	delete $self->{texture};
2684		3206
2685	$ROOT->on_post_alloc ($self => sub {	3207	$ROOT->on_post_alloc ($self => sub {
		3208	$self->force_uptodate;
		3209
2686	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3210	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687		3211
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 {	3212	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716	glClearColor 0, 0, 0, 0;	3213	glClearColor 0, 0, 0, 0;
2717	glClear GL_COLOR_BUFFER_BIT;	3214	glClear GL_COLOR_BUFFER_BIT;
2718		3215
		3216	package CFPlus::UI::Base;
		3217	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3218	(0, 0, $self->{w}, $self->{h});
		3219
		3220	my $top = int $self->{children}[1]{range}[0];
		3221
		3222	my $paridx = 0;
		3223	my $top_paragraph;
2719	my $top = int $self->{children}[1]{range}[0];	3224	my $top = int $self->{children}[1]{range}[0];
2720		3225
2721	my $y0 = $top;	3226	my $y0 = $top;
2722	my $y1 = $top + $H;	3227	my $y1 = $top + $H;
2723		3228
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}}) {	3229	for my $para (@{$self->{par}}) {
2731	my $h = $para->{h};	3230	my $h = $para->{h};
		3231	my $y = $para->{y};
2732		3232
2733	if ($y0 < $y + $h && $y < $y1) {	3233	if ($y0 < $y + $h && $y < $y1) {
2734
2735	my $layout = $self->get_layout ($para);	3234	my $layout = $self->get_layout ($para);
2736		3235
2737	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739	glRasterPos $para->{indent}, $y - $y0;	3236	$layout->render ($para->{indent}, $y - $y0);
2740	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741		3237
2742	if (my @w = @{ $para->{widget} }) {	3238	if (my @w = @{ $para->{widget} }) {
2743	my @s = $layout->get_shapes;	3239	my @s = $layout->get_shapes;
2744		3240
2745	for (@w) {	3241	for (@w) {
…		…
2751	$_->draw;	3247	$_->draw;
2752	}	3248	}
2753	}	3249	}
2754	}	3250	}
2755		3251
2756	$y += $h;	3252	$paridx++;
		3253	$top_paragraph ||= $paridx if $y >= $top;
2757	}	3254	}
2758		3255
2759	glDisable GL_BLEND;	3256	$self->{top_paragraph} = $top_paragraph;
2760	};	3257	};
2761	});	3258	});
2762	}	3259	}
2763		3260
2764	sub reconfigure {	3261	sub reconfigure {
…		…
2782	$self->{children}[1]->draw;	3279	$self->{children}[1]->draw;
2783	}	3280	}
2784		3281
2785	#############################################################################	3282	#############################################################################
2786		3283
2787	package CFClient::UI::Animator;	3284	package CFPlus::UI::Animator;
2788		3285
2789	use CFClient::OpenGL;	3286	use CFPlus::OpenGL;
2790		3287
2791	our @ISA = CFClient::UI::Bin::;	3288	our @ISA = CFPlus::UI::Bin::;
2792		3289
2793	sub moveto {	3290	sub moveto {
2794	my ($self, $x, $y) = @_;	3291	my ($self, $x, $y) = @_;
2795		3292
2796	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3293	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2824	glPopMatrix;	3321	glPopMatrix;
2825	}	3322	}
2826		3323
2827	#############################################################################	3324	#############################################################################
2828		3325
2829	package CFClient::UI::Flopper;	3326	package CFPlus::UI::Flopper;
2830		3327
2831	our @ISA = CFClient::UI::Button::;	3328	our @ISA = CFPlus::UI::Button::;
2832		3329
2833	sub new {	3330	sub new {
2834	my $class = shift;	3331	my $class = shift;
2835		3332
2836	my $self = $class->SUPER::new (	3333	my $self = $class->SUPER::new (
…		…
2848	$self->{other}->toggle_visibility;	3345	$self->{other}->toggle_visibility;
2849	}	3346	}
2850		3347
2851	#############################################################################	3348	#############################################################################
2852		3349
2853	package CFClient::UI::Tooltip;	3350	package CFPlus::UI::Tooltip;
2854		3351
2855	our @ISA = CFClient::UI::Bin::;	3352	our @ISA = CFPlus::UI::Bin::;
2856		3353
2857	use CFClient::OpenGL;	3354	use CFPlus::OpenGL;
2858		3355
2859	sub new {	3356	sub new {
2860	my $class = shift;	3357	my $class = shift;
2861		3358
2862	$class->SUPER::new (	3359	$class->SUPER::new (
…		…
2865	)	3362	)
2866	}	3363	}
2867		3364
2868	sub set_tooltip_from {	3365	sub set_tooltip_from {
2869	my ($self, $widget) = @_;	3366	my ($self, $widget) = @_;
		3367
		3368	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3369	if $widget->{tooltip} =~ /^#(.*)$/;
2870		3370
2871	my $tooltip = $widget->{tooltip};	3371	my $tooltip = $widget->{tooltip};
2872		3372
2873	if ($ENV{CFPLUS_DEBUG} & 2) {	3373	if ($ENV{CFPLUS_DEBUG} & 2) {
2874	$tooltip .= "\n\n" . (ref $widget) . "\n"	3374	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2878	}	3378	}
2879		3379
2880	$tooltip =~ s/^\n+//;	3380	$tooltip =~ s/^\n+//;
2881	$tooltip =~ s/\n+$//;	3381	$tooltip =~ s/\n+$//;
2882		3382
2883	$self->add (new CFClient::UI::Label	3383	$self->add (new CFPlus::UI::Label
2884	markup => $tooltip,	3384	markup => $tooltip,
2885	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3385	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886	fontsize => 0.8,	3386	fontsize => 0.8,
2887	fg => [0, 0, 0, 1],	3387	style => 1, # FLAG_INVERSE
2888	ellipsise => 0,	3388	ellipsise => 0,
2889	font => ($widget->{tooltip_font} || $::FONT_PROP),	3389	font => ($widget->{tooltip_font} || $::FONT_PROP),
2890	);	3390	);
2891	}	3391	}
2892		3392
…		…
2911		3411
2912	$self->{root}->on_post_alloc ("move_$self" => sub {	3412	$self->{root}->on_post_alloc ("move_$self" => sub {
2913	my $widget = $self->{owner}	3413	my $widget = $self->{owner}
2914	or return;	3414	or return;
2915		3415
		3416	if ($widget->{visible}) {
2916	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3417	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917		3418
2918	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3419	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919	if $x + $self->{w} > $self->{root}{w};	3420	if $x + $self->{w} > $self->{root}{w};
2920		3421
2921	$self->move_abs ($x, $y);	3422	$self->move_abs ($x, $y);
		3423	} else {
		3424	$self->hide;
		3425	}
2922	});	3426	});
2923	}	3427	}
2924		3428
2925	sub _draw {	3429	sub _draw {
2926	my ($self) = @_;	3430	my ($self) = @_;
…		…
2950	$self->SUPER::_draw;	3454	$self->SUPER::_draw;
2951	}	3455	}
2952		3456
2953	#############################################################################	3457	#############################################################################
2954		3458
2955	package CFClient::UI::Face;	3459	package CFPlus::UI::Face;
2956		3460
2957	our @ISA = CFClient::UI::Base::;	3461	our @ISA = CFPlus::UI::DrawBG::;
2958		3462
2959	use CFClient::OpenGL;	3463	use CFPlus::OpenGL;
2960		3464
2961	sub new {	3465	sub new {
2962	my $class = shift;	3466	my $class = shift;
2963		3467
2964	my $self = $class->SUPER::new (	3468	my $self = $class->SUPER::new (
		3469	size_w => 32,
		3470	size_h => 8,
2965	aspect => 1,	3471	aspect => 1,
2966	can_events => 0,	3472	can_events => 0,
2967	@_,	3473	@_,
2968	);	3474	);
2969		3475
2970	if ($self->{anim} && $self->{animspeed}) {	3476	if ($self->{anim} && $self->{animspeed}) {
2971	Scalar::Util::weaken (my $widget = $self);	3477	CFPlus::weaken (my $widget = $self);
2972		3478
		3479	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3480	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2973	$self->{timer} = Event->timer (	3481	$self->{timer} = Event->timer (
2974	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975	hard => 1,	3482	parked => 1,
2976	interval => $self->{animspeed},
2977	cb => sub {	3483	cb => sub {
		3484	return unless $::CONN && $widget;
		3485
2978	++$widget->{frame};	3486	++$widget->{frame};
		3487	$widget->update_face;
2979	$widget->update;	3488	$widget->update;
		3489
		3490	$widget->update_timer;
2980	},	3491	},
2981	);	3492	);
		3493
		3494	$self->update_face;
		3495	$self->update_timer;
2982	}	3496	}
2983		3497
2984	$self	3498	$self
2985	}	3499	}
2986		3500
		3501	sub update_timer {
		3502	my ($self) = @_;
		3503
		3504	return unless $self->{timer};
		3505
		3506	if ($self->{visible}) {
		3507	$self->{timer}->at (
		3508	$self->{anim_start}
		3509	+ $self->{animspeed}
		3510	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3511	);
		3512	$self->{timer}->start;
		3513	} else {
		3514	$self->{timer}->stop;
		3515	}
		3516	}
		3517
		3518	sub update_face {
		3519	my ($self) = @_;
		3520
		3521	return unless $::CONN;
		3522
		3523	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3524	if ($anim && @$anim) {
		3525	delete $self->{wait_face};
		3526	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3527	}
		3528	}
		3529	}
		3530
2987	sub size_request {	3531	sub size_request {
2988	(32, 8)	3532	my ($self) = @_;
		3533
		3534	if ($::CONN) {
		3535	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3536	if (my $tex = $::CONN->{texture}[$faceid]) {
		3537	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3538	} else {
		3539	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3540	$self->realloc;
		3541	});
		3542	}
		3543	}
		3544	}
		3545
		3546	($self->{size_w} || 8, $self->{size_h} || 8)
2989	}	3547	}
2990		3548
2991	sub update {	3549	sub update {
2992	my ($self) = @_;	3550	my ($self) = @_;
2993		3551
2994	return unless $self->{visible};	3552	return unless $self->{visible};
2995		3553
2996	$self->SUPER::update;	3554	$self->SUPER::update;
2997	}	3555	}
2998		3556
		3557	sub invoke_visibility_change {
		3558	my ($self) = @_;
		3559
		3560	$self->update_timer;
		3561
		3562	0
		3563	}
		3564
2999	sub _draw {	3565	sub _draw {
3000	my ($self) = @_;	3566	my ($self) = @_;
3001		3567
3002	return unless $::CONN;	3568	return unless $::CONN;
3003		3569
3004	my $face;	3570	$self->SUPER::_draw;
3005		3571
3006	if ($self->{frame}) {
3007	my $anim = $::CONN->{anim}[$self->{anim}];	3572	my $faceid = $::CONN->{faceid}[$self->{face}]
3008		3573	or return;
3009	$face = $anim->[ $self->{frame} % @$anim ]
3010	if $anim && @$anim;
3011	}
3012		3574
3013	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3575	my $tex = $::CONN->{texture}[$faceid];
3014		3576
3015	if ($tex) {	3577	if ($tex) {
3016	glEnable GL_TEXTURE_2D;	3578	glEnable GL_TEXTURE_2D;
3017	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3579	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018	glColor 0, 0, 0, 1;	3580	glColor 0, 0, 0, 1;
…		…
3022	}	3584	}
3023		3585
3024	sub destroy {	3586	sub destroy {
3025	my ($self) = @_;	3587	my ($self) = @_;
3026		3588
3027	$self->{timer}->cancel	3589	(delete $self->{timer})->cancel
3028	if $self->{timer};	3590	if $self->{timer};
3029		3591
3030	$self->SUPER::destroy;	3592	$self->SUPER::destroy;
3031	}	3593	}
3032		3594
3033	#############################################################################	3595	#############################################################################
3034		3596
3035	package CFClient::UI::Buttonbar;	3597	package CFPlus::UI::Buttonbar;
3036		3598
3037	our @ISA = CFClient::UI::HBox::;	3599	our @ISA = CFPlus::UI::HBox::;
3038		3600
3039	# TODO: should actualyl wrap buttons and other goodies.	3601	# TODO: should actually wrap buttons and other goodies.
3040		3602
3041	#############################################################################	3603	#############################################################################
3042		3604
3043	package CFClient::UI::Menu;	3605	package CFPlus::UI::Menu;
3044		3606
3045	our @ISA = CFClient::UI::FancyFrame::;	3607	our @ISA = CFPlus::UI::Toplevel::;
3046		3608
3047	use CFClient::OpenGL;	3609	use CFPlus::OpenGL;
3048		3610
3049	sub new {	3611	sub new {
3050	my $class = shift;	3612	my $class = shift;
3051		3613
3052	my $self = $class->SUPER::new (	3614	my $self = $class->SUPER::new (
3053	items => [],	3615	items => [],
3054	z => 100,	3616	z => 100,
3055	@_,	3617	@_,
3056	);	3618	);
3057		3619
3058	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3620	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059		3621
3060	for my $item (@{ $self->{items} }) {	3622	for my $item (@{ $self->{items} }) {
3061	my ($widget, $cb, $tooltip) = @$item;	3623	my ($widget, $cb, $tooltip) = @$item;
3062		3624
3063	# handle various types of items, only text for now	3625	# handle various types of items, only text for now
3064	if (!ref $widget) {	3626	if (!ref $widget) {
		3627	if ($widget =~ /\t/) {
		3628	my ($left, $right) = split /\t/, $widget, 2;
		3629
3065	$widget = new CFClient::UI::Label	3630	$widget = new CFPlus::UI::HBox
3066	can_hover => 1,	3631	can_hover => 1,
3067	can_events => 1,	3632	can_events => 1,
		3633	tooltip => $tooltip,
		3634	children => [
		3635	(new CFPlus::UI::Label markup => $left, expand => 1),
		3636	(new CFPlus::UI::Label markup => $right, align => +1),
		3637	],
		3638	;
		3639
		3640	} else {
		3641	$widget = new CFPlus::UI::Label
		3642	can_hover => 1,
		3643	can_events => 1,
3068	markup => $widget,	3644	markup => $widget,
3069	tooltip => $tooltip	3645	tooltip => $tooltip;
		3646	}
3070	}	3647	}
3071		3648
3072	$self->{item}{$widget} = $item;	3649	$self->{item}{$widget} = $item;
3073		3650
3074	$self->{vbox}->add ($widget);	3651	$self->{vbox}->add ($widget);
…		…
3117	1	3694	1
3118	}	3695	}
3119		3696
3120	#############################################################################	3697	#############################################################################
3121		3698
3122	package CFClient::UI::Multiplexer;	3699	package CFPlus::UI::Multiplexer;
3123		3700
3124	our @ISA = CFClient::UI::Container::;	3701	our @ISA = CFPlus::UI::Container::;
3125		3702
3126	sub new {	3703	sub new {
3127	my $class = shift;	3704	my $class = shift;
3128		3705
3129	my $self = $class->SUPER::new (	3706	my $self = $class->SUPER::new (
…		…
3143		3720
3144	$self->{current} = $self->{children}[0]	3721	$self->{current} = $self->{children}[0]
3145	if @{ $self->{children} };	3722	if @{ $self->{children} };
3146	}	3723	}
3147		3724
		3725	sub get_current_page {
		3726	my ($self) = @_;
		3727
		3728	$self->{current}
		3729	}
		3730
3148	sub set_current_page {	3731	sub set_current_page {
3149	my ($self, $page_or_widget) = @_;	3732	my ($self, $page_or_widget) = @_;
3150		3733
3151	my $widget = ref $page_or_widget	3734	my $widget = ref $page_or_widget
3152	? $page_or_widget	3735	? $page_or_widget
…		…
3184	$self->{current}->draw;	3767	$self->{current}->draw;
3185	}	3768	}
3186		3769
3187	#############################################################################	3770	#############################################################################
3188		3771
3189	package CFClient::UI::Notebook;	3772	package CFPlus::UI::Notebook;
3190		3773
3191	our @ISA = CFClient::UI::VBox::;	3774	our @ISA = CFPlus::UI::VBox::;
3192		3775
3193	sub new {	3776	sub new {
3194	my $class = shift;	3777	my $class = shift;
3195		3778
3196	my $self = $class->SUPER::new (	3779	my $self = $class->SUPER::new (
3197	buttonbar => (new CFClient::UI::Buttonbar),	3780	buttonbar => (new CFPlus::UI::Buttonbar),
3198	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3781	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199	# filter => # will be put between multiplexer and $self	3782	# filter => # will be put between multiplexer and $self
3200	@_,	3783	@_,
3201	);	3784	);
3202		3785
3203	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3786	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3207	}	3790	}
3208		3791
3209	sub add {	3792	sub add {
3210	my ($self, $title, $widget, $tooltip) = @_;	3793	my ($self, $title, $widget, $tooltip) = @_;
3211		3794
3212	Scalar::Util::weaken $self;	3795	CFPlus::weaken $self;
3213		3796
3214	$self->{buttonbar}->add (new CFClient::UI::Button	3797	$self->{buttonbar}->add (new CFPlus::UI::Button
3215	markup => $title,	3798	markup => $title,
3216	tooltip => $tooltip,	3799	tooltip => $tooltip,
3217	on_activate => sub { $self->set_current_page ($widget) },	3800	on_activate => sub { $self->set_current_page ($widget) },
3218	);	3801	);
3219		3802
3220	$self->{multiplexer}->add ($widget);	3803	$self->{multiplexer}->add ($widget);
3221	}	3804	}
3222		3805
		3806	sub get_current_page {
		3807	my ($self) = @_;
		3808
		3809	$self->{multiplexer}->get_current_page
		3810	}
		3811
3223	sub set_current_page {	3812	sub set_current_page {
3224	my ($self, $page) = @_;	3813	my ($self, $page) = @_;
3225		3814
3226	$self->{multiplexer}->set_current_page ($page);	3815	$self->{multiplexer}->set_current_page ($page);
3227	$self->emit (page_changed => $self->{multiplexer}{current});	3816	$self->emit (page_changed => $self->{multiplexer}{current});
3228	}	3817	}
3229		3818
3230	#############################################################################	3819	#############################################################################
3231		3820
3232	package CFClient::UI::Combobox;	3821	package CFPlus::UI::Selector;
3233		3822
3234	use utf8;	3823	use utf8;
3235		3824
3236	our @ISA = CFClient::UI::Button::;	3825	our @ISA = CFPlus::UI::Button::;
3237		3826
3238	sub new {	3827	sub new {
3239	my $class = shift;	3828	my $class = shift;
3240		3829
3241	my $self = $class->SUPER::new (	3830	my $self = $class->SUPER::new (
…		…
3258	my ($value, $title, $tooltip) = @$_;	3847	my ($value, $title, $tooltip) = @$_;
3259		3848
3260	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3849	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261	}	3850	}
3262		3851
3263	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3852	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264	}	3853	}
3265		3854
3266	sub _set_value {	3855	sub _set_value {
3267	my ($self, $value) = @_;	3856	my ($self, $value) = @_;
3268		3857
…		…
3283	$self->emit (changed => $value);	3872	$self->emit (changed => $value);
3284	}	3873	}
3285		3874
3286	#############################################################################	3875	#############################################################################
3287		3876
3288	package CFClient::UI::Statusbox;	3877	package CFPlus::UI::Statusbox;
3289		3878
3290	our @ISA = CFClient::UI::VBox::;	3879	our @ISA = CFPlus::UI::VBox::;
3291		3880
3292	sub new {	3881	sub new {
3293	my $class = shift;	3882	my $class = shift;
3294		3883
3295	my $self = $class->SUPER::new (	3884	my $self = $class->SUPER::new (
3296	fontsize => 0.8,	3885	fontsize => 0.8,
3297	@_,	3886	@_,
3298	);	3887	);
3299		3888
3300	Scalar::Util::weaken (my $this = $self);	3889	CFPlus::weaken (my $this = $self);
3301		3890
3302	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3891	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303		3892
3304	$self	3893	$self
3305	}	3894	}
…		…
3307	sub reorder {	3896	sub reorder {
3308	my ($self) = @_;	3897	my ($self) = @_;
3309	my $NOW = Time::HiRes::time;	3898	my $NOW = Time::HiRes::time;
3310		3899
3311	# freeze display when hovering over any label	3900	# freeze display when hovering over any label
3312	return if $CFClient::UI::TOOLTIP->{owner}	3901	return if $CFPlus::UI::TOOLTIP->{owner}
3313	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3902	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314	values %{ $self->{item} };	3903	values %{ $self->{item} };
3315		3904
3316	while (my ($k, $v) = each %{ $self->{item} }) {	3905	while (my ($k, $v) = each %{ $self->{item} }) {
3317	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3906	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318	}	3907	}
…		…
3339	for ($short) {	3928	for ($short) {
3340	s/^\s+//;	3929	s/^\s+//;
3341	s/\s+/ /g;	3930	s/\s+/ /g;
3342	}	3931	}
3343		3932
3344	new CFClient::UI::Label	3933	new CFPlus::UI::Label
3345	markup => $short,	3934	markup => $short,
3346	tooltip => $item->{tooltip},	3935	tooltip => $item->{tooltip},
3347	tooltip_font => $::FONT_PROP,	3936	tooltip_font => $::FONT_PROP,
3348	tooltip_width => 0.67,	3937	tooltip_width => 0.67,
3349	fontsize => $item->{fontsize} || $self->{fontsize},	3938	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3403	count => 1,	3992	count => 1,
3404	%arg,	3993	%arg,
3405	};	3994	};
3406	}	3995	}
3407		3996
		3997	$ROOT->on_refresh (reorder => sub {
3408	$self->reorder;	3998	$self->reorder;
		3999	});
3409	}	4000	}
3410		4001
3411	sub reconfigure {	4002	sub reconfigure {
3412	my ($self) = @_;	4003	my ($self) = @_;
3413		4004
…		…
3426	$self->SUPER::destroy;	4017	$self->SUPER::destroy;
3427	}	4018	}
3428		4019
3429	#############################################################################	4020	#############################################################################
3430		4021
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;	4022	package CFPlus::UI::Root;
3804		4023
3805	our @ISA = CFClient::UI::Container::;	4024	our @ISA = CFPlus::UI::Container::;
3806		4025
3807	use List::Util qw(min max);	4026	use List::Util qw(min max);
3808		4027
3809	use CFClient::OpenGL;	4028	use CFPlus::OpenGL;
3810		4029
3811	sub new {	4030	sub new {
3812	my $class = shift;	4031	my $class = shift;
3813		4032
3814	my $self = $class->SUPER::new (	4033	my $self = $class->SUPER::new (
3815	visible => 1,	4034	visible => 1,
3816	@_,	4035	@_,
3817	);	4036	);
3818		4037
3819	Scalar::Util::weaken ($self->{root} = $self);	4038	CFPlus::weaken ($self->{root} = $self);
3820		4039
3821	$self	4040	$self
3822	}	4041	}
3823		4042
3824	sub size_request {	4043	sub size_request {
…		…
3990	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4209	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991		4210
3992	$w = 0 if $w < 0;	4211	$w = 0 if $w < 0;
3993	$h = 0 if $h < 0;	4212	$h = 0 if $h < 0;
3994		4213
		4214	$w = max $widget->{min_w}, $w;
		4215	$h = max $widget->{min_h}, $h;
		4216
		4217	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4218	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4219
		4220	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4221	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4222
3995	$w = int $w + 0.5;	4223	$w = int $w + 0.5;
3996	$h = int $h + 0.5;	4224	$h = int $h + 0.5;
3997		4225
3998	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4226	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999	$widget->{old_w} = $widget->{w};	4227	$widget->{old_w} = $widget->{w};
…		…
4009		4237
4010	while ($self->{post_alloc_hook}) {	4238	while ($self->{post_alloc_hook}) {
4011	$_->()	4239	$_->()
4012	for values %{delete $self->{post_alloc_hook}};	4240	for values %{delete $self->{post_alloc_hook}};
4013	}	4241	}
4014
4015		4242
4016	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4243	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4017	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4244	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4018	glClear GL_COLOR_BUFFER_BIT;	4245	glClear GL_COLOR_BUFFER_BIT;
4019		4246
…		…
4022	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4249	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023	glMatrixMode GL_MODELVIEW;	4250	glMatrixMode GL_MODELVIEW;
4024	glLoadIdentity;	4251	glLoadIdentity;
4025		4252
4026	{	4253	{
4027	package CFClient::UI::Base;	4254	package CFPlus::UI::Base;
4028		4255
4029	($draw_x, $draw_y, $draw_w, $draw_h) =	4256	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030	(0, 0, $self->{w}, $self->{h});	4257	(0, 0, $self->{w}, $self->{h});
4031	}
4032		4258
4033	$self->_draw;	4259	$self->_draw;
		4260	}
4034	}	4261	}
4035		4262
4036	#############################################################################	4263	#############################################################################
4037		4264
4038	package CFClient::UI;	4265	package CFPlus::UI;
4039		4266
4040	$ROOT = new CFClient::UI::Root;	4267	$ROOT = new CFPlus::UI::Root;
4041	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4268	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042		4269
4043	1	4270	1
4044		4271

Diff Legend

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