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.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 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) = @_;
…		…
571	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
574	glEnd;	636	glEnd;
575	glPopMatrix;	637	glPopMatrix;
576	#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;
577	}	639	}
578		640
579	$self->_draw;	641	$self->_draw;
580	glPopMatrix;	642	glPopMatrix;
581	}	643	}
…		…
584	my ($self) = @_;	646	my ($self) = @_;
585		647
586	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
587	}	649	}
588		650
		651	my $cntx;#d#
589	sub DESTROY {	652	sub DESTROY {
590	my ($self) = @_;	653	my ($self) = @_;
591		654
592	delete $WIDGET{$self+0};	655	return if CFPlus::in_destruct;
593		656
594	eval { $self->destroy };	657	eval { $self->destroy };
595	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};
596	}	661	}
597		662
598	#############################################################################	663	#############################################################################
599		664
600	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
601		666
602	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
603		668
604	use strict;	669	use strict;
605	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
606		671
607	sub new {	672	sub new {
608	my $class = shift;	673	my $class = shift;
609		674
610	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
641	}	706	}
642	}	707	}
643		708
644	#############################################################################	709	#############################################################################
645		710
646	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
647		712
648	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
649		714
650	sub new {	715	sub new {
651	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
653	}	718	}
…		…
660		725
661	sub draw { }	726	sub draw { }
662		727
663	#############################################################################	728	#############################################################################
664		729
665	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
666		731
667	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
668		733
669	sub new {	734	sub new {
670	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
671		736
672	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
681	if $children;	746	if $children;
682		747
683	$self	748	$self
684	}	749	}
685		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
		757	}
		758
686	sub add {	759	sub add {
687	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
688		761
689	$_->set_parent ($self)	762	$_->set_parent ($self)
690	for @widgets;	763	for @widgets;
…		…
750	$_->draw for @{$self->{children}};	823	$_->draw for @{$self->{children}};
751	}	824	}
752		825
753	#############################################################################	826	#############################################################################
754		827
755	package CFClient::UI::Bin;	828	package CFPlus::UI::Bin;
756		829
757	our @ISA = CFClient::UI::Container::;	830	our @ISA = CFPlus::UI::Container::;
758		831
759	sub new {	832	sub new {
760	my ($class, %arg) = @_;	833	my ($class, %arg) = @_;
761		834
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	835	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		836
764	$class->SUPER::new (children => [$child], %arg)	837	$class->SUPER::new (children => [$child], %arg)
765	}	838	}
766		839
767	sub add {	840	sub add {
…		…
774	sub remove {	847	sub remove {
775	my ($self, $widget) = @_;	848	my ($self, $widget) = @_;
776		849
777	$self->SUPER::remove ($widget);	850	$self->SUPER::remove ($widget);
778		851
779	$self->{children} = [new CFClient::UI::Empty]	852	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	853	unless @{$self->{children}};
781	}	854	}
782		855
783	sub child { $_[0]->{children}[0] }	856	sub child { $_[0]->{children}[0] }
784		857
…		…
796		869
797	#############################################################################	870	#############################################################################
798		871
799	# back-buffered drawing area	872	# back-buffered drawing area
800		873
801	package CFClient::UI::Window;	874	package CFPlus::UI::Window;
802		875
803	our @ISA = CFClient::UI::Bin::;	876	our @ISA = CFPlus::UI::Bin::;
804		877
805	use CFClient::OpenGL;	878	use CFPlus::OpenGL;
806		879
807	sub new {	880	sub new {
808	my ($class, %arg) = @_;	881	my ($class, %arg) = @_;
809		882
810	my $self = $class->SUPER::new (%arg);	883	my $self = $class->SUPER::new (%arg);
…		…
832	}	905	}
833		906
834	sub render_child {	907	sub render_child {
835	my ($self) = @_;	908	my ($self) = @_;
836		909
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	910	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	911	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	912	glClear GL_COLOR_BUFFER_BIT;
840		913
841	{	914	{
842	package CFClient::UI::Base;	915	package CFPlus::UI::Base;
843		916
844	($draw_x, $draw_y, $draw_w, $draw_h) =	917	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	918	(0, 0, $self->{w}, $self->{h});
		919
		920	$self->_render;
846	}	921	}
847
848	$self->_render;
849	};	922	};
850	}	923	}
851		924
852	sub _draw {	925	sub _draw {
853	my ($self) = @_;	926	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		927
857	my $tex = $self->{texture}	928	my $tex = $self->{texture}
858	or return;	929	or return;
859		930
860	glEnable GL_TEXTURE_2D;	931	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	933	glColor 0, 0, 0, 1;
863		934
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	935	$tex->draw_quad_alpha_premultiplied (0, 0);
865		936
866	glDisable GL_TEXTURE_2D;	937	glDisable GL_TEXTURE_2D;
867	}	938	}
868		939
869	#############################################################################	940	#############################################################################
870		941
871	package CFClient::UI::ViewPort;	942	package CFPlus::UI::ViewPort;
872		943
		944	use List::Util qw(min max);
		945
873	our @ISA = CFClient::UI::Window::;	946	our @ISA = CFPlus::UI::Window::;
874		947
875	sub new {	948	sub new {
876	my $class = shift;	949	my $class = shift;
877		950
878	$class->SUPER::new (	951	$class->SUPER::new (
…		…
908	}	981	}
909		982
910	sub set_offset {	983	sub set_offset {
911	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
912		985
		986	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		987	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		988
		989	if ($x != $self->{view_x} or $y != $self->{view_y}) {
913	$self->{view_x} = int $x;	990	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	991	$self->{view_y} = $y;
915		992
		993	$self->emit (changed => $x, $y);
916	$self->update;	994	$self->update;
		995	}
917	}	996	}
918		997
919	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
920	sub coord2local {	999	sub coord2local {
921	my ($self, $x, $y) = @_;	1000	my ($self, $x, $y) = @_;
…		…
936	my ($self, $x, $y) = @_;	1015	my ($self, $x, $y) = @_;
937		1016
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1019	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1021	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1023	}
945	}	1024	}
946		1025
947	sub _render {	1026	sub _render {
948	my ($self) = @_;	1027	my ($self) = @_;
949		1028
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1029	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1031
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1033
955	$self->SUPER::_render;	1034	$self->SUPER::_render;
956	}	1035	}
957		1036
958	#############################################################################	1037	#############################################################################
959		1038
960	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
961		1040
962	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
963		1042
964	sub new {	1043	sub new {
965	my ($class, %arg) = @_;	1044	my ($class, %arg) = @_;
966		1045
967	my $child = delete $arg{child};	1046	my $child = delete $arg{child};
968		1047
969	my $self;	1048	my $self;
970		1049
971	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
972	vertical => 1,	1060	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1062	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1065	},
977	;	1066	;
978		1067
979	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
		1071	can_events => 1,
981	slider => $slider,	1072	hslider => $hslider,
		1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
982	%arg,	1076	%arg,
983	);	1077	);
984		1078
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085
		1086	$vp->{parent}{hslider}->set_value ($x);
		1087	$vp->{parent}{vslider}->set_value ($y);
		1088
		1089	0
		1090	},
		1091	;
		1092
		1093	$self->SUPER::add_at (0, 0, $self->{vp});
		1094
986	$self->add ($child) if $child;	1095	$self->add ($child) if $child;
987		1096
988	$self	1097	$self
989	}	1098	}
990		1099
…		…
997	}	1106	}
998		1107
999	sub update_slider {	1108	sub update_slider {
1000	my ($self) = @_;	1109	my ($self) = @_;
1001		1110
		1111	my $child = ($self->{vp} or return)->child;
		1112
		1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1115
		1116	my $visible = $w1 > $w2;
		1117	if ($visible != $self->{hslider}{visible}) {
		1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1119	: $self->{hslider}->hide;
		1120	}
		1121
		1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1124
		1125	my $visible = $h1 > $h2;
		1126	if ($visible != $self->{vslider}{visible}) {
		1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1128	: $self->{vslider}->hide;
		1129	}
1003	}	1130	}
1004		1131
1005	sub update {	1132	sub update {
1006	my ($self) = @_;	1133	my ($self) = @_;
1007		1134
		1135	$self->update_slider;
1008	$self->SUPER::update;	1136	$self->SUPER::update;
		1137	}
1009		1138
1010	$self->update_slider;	1139	sub invoke_mouse_wheel {
		1140	my ($self, $ev) = @_;
		1141
		1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
		1144
		1145	$self->{hslider}->emit (mouse_wheel => $ev)
		1146	if $ev->{dx};
		1147
		1148	1
		1149	}
		1150
		1151	sub invoke_button_down {
		1152	my ($self, $ev, $x, $y) = @_;
		1153
		1154	if ($ev->{button} == 2) {
		1155	$self->grab_focus;
		1156
		1157	my $ox = $self->{vp}{view_x} + $ev->{x};
		1158	my $oy = $self->{vp}{view_y} + $ev->{y};
		1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
		1162
		1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1164	$self->update;
		1165	};
		1166
		1167	return 1;
		1168	}
		1169
		1170	0
		1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_mouse_motion {
		1184	my ($self, $ev, $x, $y) = @_;
		1185
		1186	if ($self->{motion}) {
		1187	$self->{motion}->($ev, $x, $y);
		1188	return 1;
		1189	}
		1190
		1191	0
1011	}	1192	}
1012		1193
1013	sub invoke_size_allocate {	1194	sub invoke_size_allocate {
1014	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
1015		1196
1016	$self->update_slider;	1197	$self->update_slider;
1017
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1198	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1199	}
1020		1200
1021	#############################################################################	1201	#############################################################################
1022		1202
1023	package CFClient::UI::Frame;	1203	package CFPlus::UI::Frame;
1024		1204
1025	our @ISA = CFClient::UI::Bin::;	1205	our @ISA = CFPlus::UI::Bin::;
1026		1206
1027	use CFClient::OpenGL;	1207	use CFPlus::OpenGL;
1028		1208
1029	sub new {	1209	sub new {
1030	my $class = shift;	1210	my $class = shift;
1031		1211
1032	$class->SUPER::new (	1212	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1238	$self->SUPER::_draw;
1059	}	1239	}
1060		1240
1061	#############################################################################	1241	#############################################################################
1062		1242
1063	package CFClient::UI::FancyFrame;	1243	package CFPlus::UI::FancyFrame;
1064		1244
1065	our @ISA = CFClient::UI::Bin::;	1245	our @ISA = CFPlus::UI::Bin::;
1066		1246
1067	use CFClient::OpenGL;	1247	use CFPlus::OpenGL;
		1248
		1249	sub new {
		1250	my ($class, %arg) = @_;
		1251
		1252	if ((exists $arg{label}) && !ref $arg{label}) {
		1253	$arg{label} = new CFPlus::UI::Label
		1254	align => 1,
		1255	valign => 0,
		1256	text => $arg{label},
		1257	fontsize => ($arg{border} || 0.8) * 0.75;
		1258	}
		1259
		1260	my $self = $class->SUPER::new (
		1261	# label => "",
		1262	fg => [0.6, 0.3, 0.1],
		1263	border => 0.8,
		1264	style => 'single',
		1265	%arg,
		1266	);
		1267
		1268	$self
		1269	}
		1270
		1271	sub add {
		1272	my ($self, @widgets) = @_;
		1273
		1274	$self->SUPER::add (@widgets);
		1275	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1276	}
		1277
		1278	sub border {
		1279	int $_[0]{border} * $::FONTSIZE
		1280	}
		1281
		1282	sub size_request {
		1283	my ($self) = @_;
		1284
		1285	($self->{label_w}, undef) = $self->{label}->size_request
		1286	if $self->{label};
		1287
		1288	my ($w, $h) = $self->SUPER::size_request;
		1289
		1290	(
		1291	$w + $self->border * 2,
		1292	$h + $self->border * 2,
		1293	)
		1294	}
		1295
		1296	sub invoke_size_allocate {
		1297	my ($self, $w, $h) = @_;
		1298
		1299	my $border = $self->border;
		1300
		1301	$w -= List::Util::max 0, $border * 2;
		1302	$h -= List::Util::max 0, $border * 2;
		1303
		1304	if (my $label = $self->{label}) {
		1305	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1306	$label->{h} = List::Util::min $h, $border;
		1307	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1308	}
		1309
		1310	$self->child->configure ($border, $border, $w, $h);
		1311
		1312	1
		1313	}
		1314
		1315	sub _draw {
		1316	my ($self) = @_;
		1317
		1318	my $child = $self->{children}[0];
		1319
		1320	my $border = $self->border;
		1321	my ($w, $h) = ($self->{w}, $self->{h});
		1322
		1323	$child->draw;
		1324
		1325	glColor @{$self->{fg}};
		1326	glBegin GL_LINE_STRIP;
		1327	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1328	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1330	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1331	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1333	glEnd;
		1334
		1335	if ($self->{label}) {
		1336	glTranslate $border * 2, 0;
		1337	$self->{label}->_draw;
		1338	}
		1339	}
		1340
		1341	#############################################################################
		1342
		1343	package CFPlus::UI::Toplevel;
		1344
		1345	our @ISA = CFPlus::UI::Bin::;
		1346
		1347	use CFPlus::OpenGL;
1068		1348
1069	my $bg =	1349	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1350	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1351	mipmap => 1, wrap => 1;
1072		1352
1073	my @border =	1353	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1354	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);	1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
1076		1360
1077	sub new {	1361	sub new {
1078	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1079		1363
1080	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1365	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1366	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1367	border => 0.6,
1084	can_events => 1,	1368	can_events => 1,
1085	min_w => 16,	1369	min_w => 64,
1086	min_h => 16,	1370	min_h => 32,
1087	%arg,	1371	%arg,
1088	);	1372	);
1089		1373
1090	$self->{title_widget} = new CFClient::UI::Label	1374	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1375	align => 0,
1092	valign => 1,	1376	valign => 1,
1093	text => $self->{title},	1377	text => $self->{title},
1094	fontsize => $self->{border},	1378	fontsize => $self->{border},
1095	if exists $self->{title};	1379	if exists $self->{title};
1096		1380
1097	if ($self->{has_close_button}) {	1381	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1382	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1383	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1384	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1385	on_activate => sub { $self->emit ("delete") };
1102		1386
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1387	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1388	}
1105		1389
1106	$self	1390	$self
1107	}	1391	}
1108		1392
1109	sub add {	1393	sub add {
1110	my ($self, @widgets) = @_;	1394	my ($self, @widgets) = @_;
1111		1395
1112	$self->SUPER::add (@widgets);	1396	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1397	$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};	1398	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1399	}
1116		1400
1117	sub border {	1401	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1402	int $_[0]{border} * $::FONTSIZE
1119	}	1403	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1436	$self->child->configure ($border, $border, $w, $h);
1153		1437
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1438	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1439	if $self->{close_button};
1156		1440
		1441	1
		1442	}
		1443
		1444	sub invoke_delete {
		1445	my ($self) = @_;
		1446
		1447	$self->hide;
		1448
1157	1	1449	1
1158	}	1450	}
1159		1451
1160	sub invoke_button_down {	1452	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1453	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1511	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1512
1221	! ! $self->{motion}	1513	! ! $self->{motion}
1222	}	1514	}
1223		1515
		1516	sub invoke_visibility_change {
		1517	my ($self, $visible) = @_;
		1518
		1519	delete $self->{motion} unless $visible;
		1520
		1521	0
		1522	}
		1523
1224	sub _draw {	1524	sub _draw {
1225	my ($self) = @_;	1525	my ($self) = @_;
1226		1526
1227	my $child = $self->{children}[0];	1527	my $child = $self->{children}[0];
1228		1528
…		…
1233	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234		1534
1235	my $border = $self->border;	1535	my $border = $self->border;
1236		1536
1237	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1238	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242		1556
1243	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1245		1559
1246	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1265	if $self->{close_button};	1579	if $self->{close_button};
1266	}	1580	}
1267		1581
1268	#############################################################################	1582	#############################################################################
1269		1583
1270	package CFClient::UI::Table;	1584	package CFPlus::UI::Table;
1271		1585
1272	our @ISA = CFClient::UI::Base::;	1586	our @ISA = CFPlus::UI::Base::;
1273		1587
1274	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1275		1589
1276	use CFClient::OpenGL;	1590	use CFPlus::OpenGL;
1277		1591
1278	sub new {	1592	sub new {
1279	my $class = shift;	1593	my $class = shift;
1280		1594
1281	$class->SUPER::new (	1595	$class->SUPER::new (
		1596	children => [],
1282	col_expand => [],	1597	col_expand => [],
		1598	row_expand => [],
1283	@_,	1599	@_,
1284	)	1600	)
1285	}	1601	}
1286		1602
1287	sub children {	1603	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1605	}
1290		1606
		1607	# TODO: store row/col info in child widget and use standard add/del
1291	sub add {	1608	sub add {
1292	my ($self, $x, $y, $child) = @_;	1609	my $self = shift;
1293		1610
		1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1612	$self->add_at (@_);
		1613	}
		1614
		1615	sub add_at {
		1616	my $self = shift;
		1617
		1618	while (@_) {
		1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
1294	$child->set_parent ($self);	1621	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1622	$self->{children}[$row][$col] = $child;
		1623	}
1296		1624
		1625	$self->{force_realloc} = 1;
		1626	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1627	$self->realloc;
1298	}	1628	}
1299		1629
1300	sub remove {	1630	sub remove {
1301	my ($self, $child) = @_;	1631	my ($self, $child) = @_;
1302		1632
1303	# TODO: not yet implemented	1633	for (@{ $self->{children} }) {
		1634	for (@{ $_ || [] }) {
		1635	$_ = undef if $_ == $child;
		1636	}
		1637	}
1304	}	1638	}
1305		1639
1306	# TODO: move to container class maybe? send children a signal on removal?	1640	# TODO: move to container class maybe? send children a signal on removal?
1307	sub clear {	1641	sub clear {
1308	my ($self) = @_;	1642	my ($self) = @_;
…		…
1357	my ($ws, $hs) = $self->get_wh;	1691	my ($ws, $hs) = $self->get_wh;
1358		1692
1359	my $req_w = (sum @$ws) || 1;	1693	my $req_w = (sum @$ws) || 1;
1360	my $req_h = (sum @$hs) || 1;	1694	my $req_h = (sum @$hs) || 1;
1361		1695
1362	# TODO: nicer code && do row_expand	1696	# TODO: nicer code
1363	my @col_expand = @{$self->{col_expand}};	1697	my @col_expand = @{$self->{col_expand}};
1364	@col_expand = (1) x @$ws unless @col_expand;	1698	@col_expand = (1) x @$ws unless @col_expand;
1365	my $col_expand = (sum @col_expand) || 1;	1699	my $col_expand = (sum @col_expand) || 1;
1366		1700
1367	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1701	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1702
1371	CFClient::UI::harmonize $ws;	1703	CFPlus::UI::harmonize $ws;
		1704
		1705	my @row_expand = @{$self->{row_expand}};
		1706	@row_expand = (1) x @$ws unless @row_expand;
		1707	my $row_expand = (sum @row_expand) || 1;
		1708
		1709	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1710
1372	CFClient::UI::harmonize $hs;	1711	CFPlus::UI::harmonize $hs;
1373		1712
1374	my $y;	1713	my $y;
1375		1714
1376	for my $r (0 .. $#{$self->{children}}) {	1715	for my $r (0 .. $#{$self->{children}}) {
1377	my $row = $self->{children}[$r]	1716	my $row = $self->{children}[$r]
…		…
1420	}	1759	}
1421	}	1760	}
1422		1761
1423	#############################################################################	1762	#############################################################################
1424		1763
1425	package CFClient::UI::Box;	1764	package CFPlus::UI::Fixed;
1426		1765
		1766	use List::Util qw(min max);
		1767
1427	our @ISA = CFClient::UI::Container::;	1768	our @ISA = CFPlus::UI::Container::;
		1769
		1770	sub add {
		1771	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1772
		1773	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1774	$self->SUPER::add ($child);
		1775	}
		1776
		1777	sub _scale($$$) {
		1778	my ($mode, $val, $max) = @_;
		1779
		1780	$mode eq "abs" ? $val
		1781	: $mode eq "rel" ? $val * $max
		1782	: 0
		1783	}
		1784
		1785	sub size_request {
		1786	my ($self) = @_;
		1787
		1788	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1789
		1790	# determine overall size by querying abs widgets
		1791	for my $child ($self->visible_children) {
		1792	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1793
		1794	if ($pos eq "abs") {
		1795	$w = _scale $size, $w, $child->{req_w};
		1796	$h = _scale $size, $h, $child->{req_h};
		1797
		1798	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1799	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1800	}
		1801	}
		1802
		1803	my $W = $x2 - $x1;
		1804	my $H = $y2 - $y1;
		1805
		1806	# now layout remaining widgets
		1807	for my $child ($self->visible_children) {
		1808	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1809
		1810	if ($pos ne "abs") {
		1811	$x = _scale $pos, $x, $W;
		1812	$y = _scale $pos, $x, $H;
		1813	$w = _scale $size, $w, $child->{req_w};
		1814	$h = _scale $size, $h, $child->{req_h};
		1815
		1816	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1817	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1818	}
		1819	}
		1820
		1821	my $W = $x2 - $x1;
		1822	my $H = $y2 - $y1;
		1823
		1824	($W, $H)
		1825	}
		1826
		1827	sub invoke_size_allocate {
		1828	my ($self, $W, $H) = @_;
		1829
		1830	for my $child ($self->visible_children) {
		1831	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1832
		1833	$x = _scale $pos, $x, $W;
		1834	$y = _scale $pos, $x, $H;
		1835	$w = _scale $size, $w, $child->{req_w};
		1836	$h = _scale $size, $h, $child->{req_h};
		1837
		1838	$child->configure ($x, $y, $w, $h);
		1839	}
		1840
		1841	1
		1842	}
		1843
		1844	#############################################################################
		1845
		1846	package CFPlus::UI::Box;
		1847
		1848	our @ISA = CFPlus::UI::Container::;
1428		1849
1429	sub size_request {	1850	sub size_request {
1430	my ($self) = @_;	1851	my ($self) = @_;
1431		1852
1432	$self->{vertical}	1853	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1886	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1887	for 0 .. $#children;
1467	}	1888	}
1468	}	1889	}
1469		1890
1470	CFClient::UI::harmonize \@req;	1891	CFPlus::UI::harmonize \@req;
1471		1892
1472	my $pos = 0;	1893	my $pos = 0;
1473	for (0 .. $#children) {	1894	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1895	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1896	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1901	1
1481	}	1902	}
1482		1903
1483	#############################################################################	1904	#############################################################################
1484		1905
1485	package CFClient::UI::HBox;	1906	package CFPlus::UI::HBox;
1486		1907
1487	our @ISA = CFClient::UI::Box::;	1908	our @ISA = CFPlus::UI::Box::;
1488		1909
1489	sub new {	1910	sub new {
1490	my $class = shift;	1911	my $class = shift;
1491		1912
1492	$class->SUPER::new (	1913	$class->SUPER::new (
…		…
1495	)	1916	)
1496	}	1917	}
1497		1918
1498	#############################################################################	1919	#############################################################################
1499		1920
1500	package CFClient::UI::VBox;	1921	package CFPlus::UI::VBox;
1501		1922
1502	our @ISA = CFClient::UI::Box::;	1923	our @ISA = CFPlus::UI::Box::;
1503		1924
1504	sub new {	1925	sub new {
1505	my $class = shift;	1926	my $class = shift;
1506		1927
1507	$class->SUPER::new (	1928	$class->SUPER::new (
…		…
1510	)	1931	)
1511	}	1932	}
1512		1933
1513	#############################################################################	1934	#############################################################################
1514		1935
1515	package CFClient::UI::Label;	1936	package CFPlus::UI::Label;
1516		1937
1517	our @ISA = CFClient::UI::DrawBG::;	1938	our @ISA = CFPlus::UI::DrawBG::;
1518		1939
1519	use CFClient::OpenGL;	1940	use CFPlus::OpenGL;
1520		1941
1521	sub new {	1942	sub new {
1522	my ($class, %arg) = @_;	1943	my ($class, %arg) = @_;
1523		1944
1524	my $self = $class->SUPER::new (	1945	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1948	#active_bg => none
1528	#font => default_font	1949	#font => default_font
1529	#text => initial text	1950	#text => initial text
1530	#markup => initial narkup	1951	#markup => initial narkup
1531	#max_w => maximum pixel width	1952	#max_w => maximum pixel width
		1953	#style => 0, # render flags
1532	ellipsise => 3, # end	1954	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1955	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1956	fontsize => 1,
1535	align => -1,	1957	align => -1,
1536	valign => -1,	1958	valign => -1,
1537	padding_x => 2,	1959	padding_x => 2,
1538	padding_y => 2,	1960	padding_y => 2,
1539	can_events => 0,	1961	can_events => 0,
1540	%arg	1962	%arg
1541	);	1963	);
1542		1964
1543	if (exists $self->{template}) {	1965	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1966	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1967	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1968	$self->{template} = $layout;
1547	}	1969	}
1548		1970
1549	if (exists $self->{markup}) {	1971	if (exists $self->{markup}) {
…		…
1553	}	1975	}
1554		1976
1555	$self	1977	$self
1556	}	1978	}
1557		1979
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 {	1980	sub update {
1569	my ($self) = @_;	1981	my ($self) = @_;
1570		1982
1571	delete $self->{texture};	1983	delete $self->{texture};
1572	$self->SUPER::update;	1984	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1995	my ($self, $text) = @_;
1584		1996
1585	return if $self->{text} eq "T$text";	1997	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1998	$self->{text} = "T$text";
1587		1999
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	2000	$self->{layout}->set_text ($text);
1590		2001
1591	delete $self->{size_req};	2002	delete $self->{size_req};
1592	$self->realloc;	2003	$self->realloc;
1593	$self->update;	2004	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	2010	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	2011	$self->{text} = "M$markup";
1601		2012
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2013	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		2014
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	2015	$self->{layout}->set_markup ($markup);
1606		2016
1607	delete $self->{size_req};	2017	delete $self->{size_req};
1608	$self->realloc;	2018	$self->realloc;
1609	$self->update;	2019	$self->update;
…		…
1621		2031
1622	my ($w, $h) = $self->{layout}->size;	2032	my ($w, $h) = $self->{layout}->size;
1623		2033
1624	if (exists $self->{template}) {	2034	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	2035	$self->{template}->set_font ($self->{font}) if $self->{font};
		2036	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2037	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		2038
1628	my ($w2, $h2) = $self->{template}->size;	2039	my ($w2, $h2) = $self->{template}->size;
1629		2040
1630	$w = List::Util::max $w, $w2;	2041	$w = List::Util::max $w, $w2;
…		…
1664		2075
1665	sub reconfigure {	2076	sub reconfigure {
1666	my ($self) = @_;	2077	my ($self) = @_;
1667		2078
1668	delete $self->{size_req};	2079	delete $self->{size_req};
		2080	delete $self->{texture};
1669		2081
1670	$self->SUPER::reconfigure;	2082	$self->SUPER::reconfigure;
1671	}	2083	}
1672		2084
1673	sub _draw {	2085	sub _draw {
1674	my ($self) = @_;	2086	my ($self) = @_;
1675		2087
1676	$self->SUPER::_draw; # draw background, if applicable	2088	$self->SUPER::_draw; # draw background, if applicable
1677		2089
1678	my $tex = $self->{texture} ||= do {	2090	my $size = $self->{texture} ||= do {
1679	$self->{layout}->set_foreground (@{$self->{fg}});	2091	$self->{layout}->set_foreground (@{$self->{fg}});
1680	$self->{layout}->set_font ($self->{font}) if $self->{font};	2092	$self->{layout}->set_font ($self->{font}) if $self->{font};
1681	$self->{layout}->set_width ($self->{w});	2093	$self->{layout}->set_width ($self->{w});
1682	$self->{layout}->set_ellipsise ($self->{ellipsise});	2094	$self->{layout}->set_ellipsise ($self->{ellipsise});
1683	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2095	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2096	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685		2097
1686	new_from_layout CFClient::Texture $self->{layout}	2098	[$self->{layout}->size]
1687	};	2099	};
1688		2100
1689	unless (exists $self->{ox}) {	2101	unless (exists $self->{ox}) {
1690	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2102	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2103	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692	: ($self->{w} - $tex->{w}) * 0.5);	2104	: ($self->{w} - $size->[0]) * 0.5);
1693		2105
1694	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2106	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2107	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696	: ($self->{h} - $tex->{h}) * 0.5);	2108	: ($self->{h} - $size->[1]) * 0.5);
1697	};	2109	};
1698		2110
1699	glEnable GL_TEXTURE_2D;
1700
1701	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2111	my $w = List::Util::min $self->{w} + 4, $size->[0];
1702	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2112	my $h = List::Util::min $self->{h} + 2, $size->[1];
1703		2113
1704	if ($tex->{format} == GL_ALPHA) {	2114	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706	glColor @{$self->{fg}};
1707	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708	} else {
1709	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711	}
1712
1713	glDisable GL_TEXTURE_2D;
1714	}	2115	}
1715		2116
1716	#############################################################################	2117	#############################################################################
1717		2118
1718	package CFClient::UI::EntryBase;	2119	package CFPlus::UI::EntryBase;
1719		2120
1720	our @ISA = CFClient::UI::Label::;	2121	our @ISA = CFPlus::UI::Label::;
1721		2122
1722	use CFClient::OpenGL;	2123	use CFPlus::OpenGL;
1723		2124
1724	sub new {	2125	sub new {
1725	my $class = shift;	2126	my $class = shift;
1726		2127
1727	$class->SUPER::new (	2128	$class->SUPER::new (
…		…
1731	active_fg => [0, 0, 0],	2132	active_fg => [0, 0, 0],
1732	can_hover => 1,	2133	can_hover => 1,
1733	can_focus => 1,	2134	can_focus => 1,
1734	valign => 0,	2135	valign => 0,
1735	can_events => 1,	2136	can_events => 1,
		2137	ellipsise => 0,
1736	#text => ...	2138	#text => ...
1737	#hidden => "*",	2139	#hidden => "*",
1738	@_	2140	@_
1739	)	2141	)
1740	}	2142	}
…		…
1785	my $sym = $ev->{sym};	2187	my $sym = $ev->{sym};
1786	my $uni = $ev->{unicode};	2188	my $uni = $ev->{unicode};
1787		2189
1788	my $text = $self->get_text;	2190	my $text = $self->get_text;
1789		2191
		2192	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2193
1790	if ($uni == 8) {	2194	if ($uni == 8) {
1791	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2195	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1792	} elsif ($uni == 127) {	2196	} elsif ($uni == 127) {
1793	substr $text, $self->{cursor}, 1, "";	2197	substr $text, $self->{cursor}, 1, "";
1794	} elsif ($sym == CFClient::SDLK_LEFT) {	2198	} elsif ($sym == CFPlus::SDLK_LEFT) {
1795	--$self->{cursor} if $self->{cursor};	2199	--$self->{cursor} if $self->{cursor};
1796	} elsif ($sym == CFClient::SDLK_RIGHT) {	2200	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1797	++$self->{cursor} if $self->{cursor} < length $self->{text};	2201	++$self->{cursor} if $self->{cursor} < length $self->{text};
1798	} elsif ($sym == CFClient::SDLK_HOME) {	2202	} elsif ($sym == CFPlus::SDLK_HOME) {
		2203	# what a hack
		2204	$self->{cursor} =
		2205	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2206	? length $1
		2207	: 0;
		2208	} elsif ($sym == CFPlus::SDLK_END) {
		2209	# uh, again
		2210	$self->{cursor} =
		2211	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2212	? $self->{cursor} + length $1
		2213	: length $self->{text};
		2214	} elsif ($uni == 21) { # ctrl-u
		2215	$text = "";
1799	$self->{cursor} = 0;	2216	$self->{cursor} = 0;
1800	} elsif ($sym == CFClient::SDLK_END) {
1801	$self->{cursor} = length $text;
1802	} elsif ($uni == 27) {	2217	} elsif ($uni == 27) {
1803	$self->emit ('escape');	2218	$self->emit ('escape');
1804	} elsif ($uni) {	2219	} elsif ($uni == 0x0d) {
		2220	substr $text, $self->{cursor}++, 0, "\012";
		2221	} elsif ($uni >= 0x20) {
1805	substr $text, $self->{cursor}++, 0, chr $uni;	2222	substr $text, $self->{cursor}++, 0, chr $uni;
1806	} else {	2223	} else {
1807	return 0;	2224	return 0;
1808	}	2225	}
1809		2226
1810	$self->_set_text ($text);	2227	$self->_set_text ($text);
1811		2228
1812	$self->realloc;	2229	$self->realloc;
		2230	$self->update;
1813		2231
1814	1	2232	1
1815	}	2233	}
1816		2234
1817	sub invoke_focus_in {	2235	sub invoke_focus_in {
…		…
1829		2247
1830	my $idx = $self->{layout}->xy_to_index ($x, $y);	2248	my $idx = $self->{layout}->xy_to_index ($x, $y);
1831		2249
1832	# byte-index to char-index	2250	# byte-index to char-index
1833	my $text = $self->{text};	2251	my $text = $self->{text};
1834	utf8::encode $text;	2252	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835	$self->{cursor} = length substr $text, 0, $idx;	2253	$self->{cursor} = length $text;
1836		2254
1837	$self->_set_text ($self->{text});	2255	$self->_set_text ($self->{text});
1838	$self->update;	2256	$self->update;
1839		2257
1840	1	2258	1
…		…
1879	utf8::encode $text;	2297	utf8::encode $text;
1880		2298
1881	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2299	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1882	}	2300	}
1883		2301
1884	glColor @{$self->{fg}};
1885	glBegin GL_LINES;	2302	glBegin GL_LINES;
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2303	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1887	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2304	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1888	glEnd;	2305	glEnd;
1889	}	2306	}
1890	}	2307	}
1891		2308
		2309	#############################################################################
		2310
1892	package CFClient::UI::Entry;	2311	package CFPlus::UI::Entry;
1893		2312
1894	our @ISA = CFClient::UI::EntryBase::;	2313	our @ISA = CFPlus::UI::EntryBase::;
1895		2314
1896	use CFClient::OpenGL;	2315	use CFPlus::OpenGL;
1897		2316
1898	sub invoke_key_down {	2317	sub invoke_key_down {
1899	my ($self, $ev) = @_;	2318	my ($self, $ev) = @_;
1900		2319
1901	my $sym = $ev->{sym};	2320	my $sym = $ev->{sym};
1902		2321
1903	if ($sym == 13) {	2322	if ($ev->{uni} == 0x0d || $sym == 13) {
1904	unshift @{$self->{history}},	2323	unshift @{$self->{history}},
1905	my $txt = $self->get_text;	2324	my $txt = $self->get_text;
1906		2325
1907	$self->{history_pointer} = -1;	2326	$self->{history_pointer} = -1;
1908	$self->{history_saveback} = '';	2327	$self->{history_saveback} = '';
1909	$self->emit (activate => $txt);	2328	$self->emit (activate => $txt);
1910	$self->update;	2329	$self->update;
1911		2330
1912	} elsif ($sym == CFClient::SDLK_UP) {	2331	} elsif ($sym == CFPlus::SDLK_UP) {
1913	if ($self->{history_pointer} < 0) {	2332	if ($self->{history_pointer} < 0) {
1914	$self->{history_saveback} = $self->get_text;	2333	$self->{history_saveback} = $self->get_text;
1915	}	2334	}
1916	if (@{$self->{history} || []} > 0) {	2335	if (@{$self->{history} || []} > 0) {
1917	$self->{history_pointer}++;	2336	$self->{history_pointer}++;
…		…
1919	$self->{history_pointer} = @{$self->{history} || []} - 1;	2338	$self->{history_pointer} = @{$self->{history} || []} - 1;
1920	}	2339	}
1921	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2340	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1922	}	2341	}
1923		2342
1924	} elsif ($sym == CFClient::SDLK_DOWN) {	2343	} elsif ($sym == CFPlus::SDLK_DOWN) {
1925	$self->{history_pointer}--;	2344	$self->{history_pointer}--;
1926	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2345	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1927		2346
1928	if ($self->{history_pointer} >= 0) {	2347	if ($self->{history_pointer} >= 0) {
1929	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2348	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1938	1	2357	1
1939	}	2358	}
1940		2359
1941	#############################################################################	2360	#############################################################################
1942		2361
		2362	package CFPlus::UI::TextEdit;
		2363
		2364	our @ISA = CFPlus::UI::EntryBase::;
		2365
		2366	use CFPlus::OpenGL;
		2367
		2368	sub move_cursor_ver {
		2369	my ($self, $dy) = @_;
		2370
		2371	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2372
		2373	$y += $dy;
		2374
		2375	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2376	$self->{cursor} = $index;
		2377	delete $self->{cur_h};
		2378	$self->update;
		2379	return;
		2380	}
		2381	}
		2382
		2383	sub invoke_key_down {
		2384	my ($self, $ev) = @_;
		2385
		2386	my $sym = $ev->{sym};
		2387
		2388	if ($sym == CFPlus::SDLK_UP) {
		2389	$self->move_cursor_ver (-1);
		2390	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2391	$self->move_cursor_ver (+1);
		2392	} else {
		2393	return $self->SUPER::invoke_key_down ($ev)
		2394	}
		2395
		2396	1
		2397	}
		2398
		2399	#############################################################################
		2400
1943	package CFClient::UI::Button;	2401	package CFPlus::UI::Button;
1944		2402
1945	our @ISA = CFClient::UI::Label::;	2403	our @ISA = CFPlus::UI::Label::;
1946		2404
1947	use CFClient::OpenGL;	2405	use CFPlus::OpenGL;
1948		2406
1949	my @tex =	2407	my @tex =
1950	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2408	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951	qw(b1_button_active.png);	2409	qw(b1_button_inactive.png b1_button_active.png);
1952		2410
1953	sub new {	2411	sub new {
1954	my $class = shift;	2412	my $class = shift;
1955		2413
1956	$class->SUPER::new (	2414	$class->SUPER::new (
1957	padding_x => 4,	2415	padding_x => 4,
1958	padding_y => 4,	2416	padding_y => 4,
1959	fg => [1, 1, 1],	2417	fg => [1.0, 1.0, 1.0],
1960	active_fg => [0, 0, 1],	2418	active_fg => [0.8, 0.8, 0.8],
1961	can_hover => 1,	2419	can_hover => 1,
1962	align => 0,	2420	align => 0,
1963	valign => 0,	2421	valign => 0,
1964	can_events => 1,	2422	can_events => 1,
1965	@_	2423	@_
…		…
1983		2441
1984	glEnable GL_TEXTURE_2D;	2442	glEnable GL_TEXTURE_2D;
1985	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986	glColor 0, 0, 0, 1;	2444	glColor 0, 0, 0, 1;
1987		2445
		2446	my $tex = $tex[$GRAB == $self];
1988	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2447	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1989		2448
1990	glDisable GL_TEXTURE_2D;	2449	glDisable GL_TEXTURE_2D;
1991		2450
1992	$self->SUPER::_draw;	2451	$self->SUPER::_draw;
1993	}	2452	}
1994		2453
1995	#############################################################################	2454	#############################################################################
1996		2455
		2456	package CFPlus::UI::CheckBox;
		2457
		2458	our @ISA = CFPlus::UI::DrawBG::;
		2459
		2460	my @tex =
		2461	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2462	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2463
		2464	use CFPlus::OpenGL;
		2465
		2466	sub new {
		2467	my $class = shift;
		2468
		2469	$class->SUPER::new (
		2470	padding_x => 2,
		2471	padding_y => 2,
		2472	fg => [1, 1, 1],
		2473	active_fg => [1, 1, 0],
		2474	bg => [0, 0, 0, 0.2],
		2475	active_bg => [1, 1, 1, 0.5],
		2476	state => 0,
		2477	can_hover => 1,
		2478	@_
		2479	)
		2480	}
		2481
		2482	sub size_request {
		2483	my ($self) = @_;
		2484
		2485	(6) x 2
		2486	}
		2487
		2488	sub toggle {
		2489	my ($self) = @_;
		2490
		2491	$self->{state} = !$self->{state};
		2492	$self->emit (changed => $self->{state});
		2493	$self->update;
		2494	}
		2495
		2496	sub invoke_button_down {
		2497	my ($self, $ev, $x, $y) = @_;
		2498
		2499	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2500	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2501	$self->toggle;
		2502	} else {
		2503	return 0
		2504	}
		2505
		2506	1
		2507	}
		2508
		2509	sub _draw {
		2510	my ($self) = @_;
		2511
		2512	$self->SUPER::_draw;
		2513
		2514	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2515
		2516	my ($w, $h) = @$self{qw(w h)};
		2517
		2518	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2519
		2520	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2521
		2522	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2523
		2524	glEnable GL_TEXTURE_2D;
		2525	$tex->draw_quad_alpha (0, 0, $s, $s);
		2526	glDisable GL_TEXTURE_2D;
		2527	}
		2528
		2529	#############################################################################
		2530
		2531	package CFPlus::UI::Image;
		2532
		2533	our @ISA = CFPlus::UI::Base::;
		2534
		2535	use CFPlus::OpenGL;
		2536
		2537	our %texture_cache;
		2538
		2539	sub new {
		2540	my $class = shift;
		2541
		2542	my $self = $class->SUPER::new (
		2543	can_events => 0,
		2544	@_,
		2545	);
		2546
		2547	$self->{path} || $self->{tex}
		2548	or Carp::croak "'path' or 'tex' attributes required";
		2549
		2550	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2551	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2552
		2553	CFPlus::weaken $texture_cache{$self->{path}};
		2554
		2555	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2556
		2557	$self
		2558	}
		2559
		2560	sub STORABLE_freeze {
		2561	my ($self, $cloning) = @_;
		2562
		2563	$self->{path}
		2564	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2565
		2566	$self->{path}
		2567	}
		2568
		2569	sub STORABLE_attach {
		2570	my ($self, $cloning, $path) = @_;
		2571
		2572	$self->new (path => $path)
		2573	}
		2574
		2575	sub size_request {
		2576	my ($self) = @_;
		2577
		2578	($self->{tex}{w}, $self->{tex}{h})
		2579	}
		2580
		2581	sub _draw {
		2582	my ($self) = @_;
		2583
		2584	my $tex = $self->{tex};
		2585
		2586	my ($w, $h) = ($self->{w}, $self->{h});
		2587
		2588	if ($self->{rot90}) {
		2589	glRotate 90, 0, 0, 1;
		2590	glTranslate 0, -$self->{w}, 0;
		2591
		2592	($w, $h) = ($h, $w);
		2593	}
		2594
		2595	glEnable GL_TEXTURE_2D;
		2596	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2597
		2598	$tex->draw_quad (0, 0, $w, $h);
		2599
		2600	glDisable GL_TEXTURE_2D;
		2601	}
		2602
		2603	#############################################################################
		2604
1997	package CFClient::UI::ImageButton;	2605	package CFPlus::UI::ImageButton;
1998		2606
1999	our @ISA = CFClient::UI::Image::;	2607	our @ISA = CFPlus::UI::Image::;
2000		2608
2001	use CFClient::OpenGL;	2609	use CFPlus::OpenGL;
2002		2610
2003	my %textures;	2611	my %textures;
2004		2612
2005	sub new {	2613	sub new {
2006	my $class = shift;	2614	my $class = shift;
…		…
2028	1	2636	1
2029	}	2637	}
2030		2638
2031	#############################################################################	2639	#############################################################################
2032		2640
2033	package CFClient::UI::CheckBox;
2034
2035	our @ISA = CFClient::UI::DrawBG::;
2036
2037	my @tex =
2038	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2039	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2040
2041	use CFClient::OpenGL;
2042
2043	sub new {
2044	my $class = shift;
2045
2046	$class->SUPER::new (
2047	padding_x => 2,
2048	padding_y => 2,
2049	fg => [1, 1, 1],
2050	active_fg => [1, 1, 0],
2051	bg => [0, 0, 0, 0.2],
2052	active_bg => [1, 1, 1, 0.5],
2053	state => 0,
2054	can_hover => 1,
2055	@_
2056	)
2057	}
2058
2059	sub size_request {
2060	my ($self) = @_;
2061
2062	(6) x 2
2063	}
2064
2065	sub invoke_button_down {
2066	my ($self, $ev, $x, $y) = @_;
2067
2068	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070	$self->{state} = !$self->{state};
2071	$self->emit (changed => $self->{state});
2072	} else {
2073	return 0
2074	}
2075
2076	1
2077	}
2078
2079	sub _draw {
2080	my ($self) = @_;
2081
2082	$self->SUPER::_draw;
2083
2084	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2085
2086	my ($w, $h) = @$self{qw(w h)};
2087
2088	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2089
2090	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2091
2092	my $tex = $self->{state} ? $tex[1] : $tex[0];
2093
2094	glEnable GL_TEXTURE_2D;
2095	$tex->draw_quad_alpha (0, 0, $s, $s);
2096	glDisable GL_TEXTURE_2D;
2097	}
2098
2099	#############################################################################
2100
2101	package CFClient::UI::Image;	2641	package CFPlus::UI::VGauge;
2102		2642
2103	our @ISA = CFClient::UI::Base::;	2643	our @ISA = CFPlus::UI::Base::;
2104
2105	use CFClient::OpenGL;
2106
2107	our %texture_cache;
2108
2109	sub new {
2110	my $class = shift;
2111
2112	my $self = $class->SUPER::new (
2113	can_events => 0,
2114	@_,
2115	);
2116
2117	$self->{path}
2118	or Carp::croak "required attribute 'path' not set";
2119
2120	$self->{tex} = $texture_cache{$self->{path}} ||=
2121	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2122
2123	Scalar::Util::weaken $texture_cache{$self->{path}};
2124
2125	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2126
2127	$self
2128	}
2129
2130	sub size_request {
2131	my ($self) = @_;
2132
2133	($self->{tex}{w}, $self->{tex}{h})
2134	}
2135
2136	sub _draw {
2137	my ($self) = @_;
2138
2139	my $tex = $self->{tex};
2140
2141	my ($w, $h) = ($self->{w}, $self->{h});
2142
2143	if ($self->{rot90}) {
2144	glRotate 90, 0, 0, 1;
2145	glTranslate 0, -$self->{w}, 0;
2146
2147	($w, $h) = ($h, $w);
2148	}
2149
2150	glEnable GL_TEXTURE_2D;
2151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152
2153	$tex->draw_quad_alpha (0, 0, $w, $h);
2154
2155	glDisable GL_TEXTURE_2D;
2156	}
2157
2158	#############################################################################
2159
2160	package CFClient::UI::VGauge;
2161
2162	our @ISA = CFClient::UI::Base::;
2163		2644
2164	use List::Util qw(min max);	2645	use List::Util qw(min max);
2165		2646
2166	use CFClient::OpenGL;	2647	use CFPlus::OpenGL;
2167		2648
2168	my %tex = (	2649	my %tex = (
2169	food => [	2650	food => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2651	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2652	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2172	],	2653	],
2173	grace => [	2654	grace => [
2174	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2655	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2656	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2176	],	2657	],
2177	hp => [	2658	hp => [
2178	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2659	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2660	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2180	],	2661	],
2181	mana => [	2662	mana => [
2182	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2663	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2664	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2184	],	2665	],
2185	);	2666	);
2186		2667
2187	# eg. VGauge->new (gauge => 'food'), default gauge: food	2668	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2247	my $ycut1 = max 0, min 1, $ycut;	2728	my $ycut1 = max 0, min 1, $ycut;
2248	my $ycut2 = max 0, min 1, $ycut - 1;	2729	my $ycut2 = max 0, min 1, $ycut - 1;
2249		2730
2250	my $h1 = $self->{h} * (1 - $ycut1);	2731	my $h1 = $self->{h} * (1 - $ycut1);
2251	my $h2 = $self->{h} * (1 - $ycut2);	2732	my $h2 = $self->{h} * (1 - $ycut2);
		2733	my $h3 = $self->{h};
		2734
		2735	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2252		2736
2253	glEnable GL_BLEND;	2737	glEnable GL_BLEND;
2254	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2738	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2739	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256	glEnable GL_TEXTURE_2D;	2740	glEnable GL_TEXTURE_2D;
…		…
2275		2759
2276	if ($t3) {	2760	if ($t3) {
2277	glBindTexture GL_TEXTURE_2D, $t3->{name};	2761	glBindTexture GL_TEXTURE_2D, $t3->{name};
2278	glBegin GL_QUADS;	2762	glBegin GL_QUADS;
2279	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2763	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2764	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2765	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2766	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283	glEnd;	2767	glEnd;
2284	}	2768	}
2285		2769
2286	glDisable GL_BLEND;	2770	glDisable GL_BLEND;
2287	glDisable GL_TEXTURE_2D;	2771	glDisable GL_TEXTURE_2D;
2288	}	2772	}
2289		2773
2290	#############################################################################	2774	#############################################################################
2291		2775
2292	package CFClient::UI::Gauge;	2776	package CFPlus::UI::Gauge;
2293		2777
2294	our @ISA = CFClient::UI::VBox::;	2778	our @ISA = CFPlus::UI::VBox::;
2295		2779
2296	sub new {	2780	sub new {
2297	my ($class, %arg) = @_;	2781	my ($class, %arg) = @_;
2298		2782
2299	my $self = $class->SUPER::new (	2783	my $self = $class->SUPER::new (
…		…
2301	can_hover => 1,	2785	can_hover => 1,
2302	can_events => 1,	2786	can_events => 1,
2303	%arg,	2787	%arg,
2304	);	2788	);
2305		2789
2306	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2790	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2307	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2791	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2308	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2792	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2309		2793
2310	$self	2794	$self
2311	}	2795	}
2312		2796
2313	sub set_fontsize {	2797	sub set_fontsize {
…		…
2334	$self->{value}->set_text ($val);	2818	$self->{value}->set_text ($val);
2335	}	2819	}
2336		2820
2337	#############################################################################	2821	#############################################################################
2338		2822
2339	package CFClient::UI::Slider;	2823	package CFPlus::UI::Slider;
2340		2824
2341	use strict;	2825	use strict;
2342		2826
2343	use CFClient::OpenGL;	2827	use CFPlus::OpenGL;
2344		2828
2345	our @ISA = CFClient::UI::DrawBG::;	2829	our @ISA = CFPlus::UI::DrawBG::;
2346		2830
2347	my @tex =	2831	my @tex =
2348	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2832	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2349	qw(s1_slider.png s1_slider_bg.png);	2833	qw(s1_slider.png s1_slider_bg.png);
2350		2834
2351	sub new {	2835	sub new {
2352	my $class = shift;	2836	my $class = shift;
2353		2837
…		…
2442	}	2926	}
2443		2927
2444	1	2928	1
2445	}	2929	}
2446		2930
		2931	sub invoke_mouse_wheel {
		2932	my ($self, $ev) = @_;
		2933
		2934	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2935
		2936	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2937
		2938	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2939
		2940	! ! $delta
		2941	}
		2942
2447	sub update {	2943	sub update {
2448	my ($self) = @_;	2944	my ($self) = @_;
2449		2945
2450	delete $self->{knob_w};	2946	delete $self->{knob_w};
2451	$self->SUPER::update;	2947	$self->SUPER::update;
…		…
2498	glDisable GL_TEXTURE_2D;	2994	glDisable GL_TEXTURE_2D;
2499	}	2995	}
2500		2996
2501	#############################################################################	2997	#############################################################################
2502		2998
2503	package CFClient::UI::ValSlider;	2999	package CFPlus::UI::ValSlider;
2504		3000
2505	our @ISA = CFClient::UI::HBox::;	3001	our @ISA = CFPlus::UI::HBox::;
2506		3002
2507	sub new {	3003	sub new {
2508	my ($class, %arg) = @_;	3004	my ($class, %arg) = @_;
2509		3005
2510	my $range = delete $arg{range};	3006	my $range = delete $arg{range};
2511		3007
2512	my $self = $class->SUPER::new (	3008	my $self = $class->SUPER::new (
2513	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3009	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2514	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3010	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2515	to_value => sub { shift },	3011	to_value => sub { shift },
2516	from_value => sub { shift },	3012	from_value => sub { shift },
2517	%arg,	3013	%arg,
2518	);	3014	);
2519		3015
…		…
2539	sub set_range { shift->{slider}->set_range (@_) }	3035	sub set_range { shift->{slider}->set_range (@_) }
2540	sub set_value { shift->{slider}->set_value (@_) }	3036	sub set_value { shift->{slider}->set_value (@_) }
2541		3037
2542	#############################################################################	3038	#############################################################################
2543		3039
2544	package CFClient::UI::TextScroller;	3040	package CFPlus::UI::TextScroller;
2545		3041
2546	our @ISA = CFClient::UI::HBox::;	3042	our @ISA = CFPlus::UI::HBox::;
2547		3043
2548	use CFClient::OpenGL;	3044	use CFPlus::OpenGL;
2549		3045
2550	sub new {	3046	sub new {
2551	my $class = shift;	3047	my $class = shift;
2552		3048
2553	my $self = $class->SUPER::new (	3049	my $self = $class->SUPER::new (
2554	fontsize => 1,	3050	fontsize => 1,
2555	can_events => 0,	3051	can_events => 1,
2556	indent => 0,	3052	indent => 0,
2557	#font => default_font	3053	#font => default_font
2558	@_,	3054	@_,
2559		3055
2560	layout => (new CFClient::Layout 1),	3056	layout => (new CFPlus::Layout),
2561	par => [],	3057	par => [],
		3058	max_par => 0,
2562	height => 0,	3059	height => 0,
2563	children => [	3060	children => [
2564	(new CFClient::UI::Empty expand => 1),	3061	(new CFPlus::UI::Empty expand => 1),
2565	(new CFClient::UI::Slider vertical => 1),	3062	(new CFPlus::UI::Slider vertical => 1),
2566	],	3063	],
2567	);	3064	);
2568		3065
2569	$self->{children}[1]->connect (changed => sub { $self->update });	3066	$self->{children}[1]->connect (changed => sub { $self->update });
2570		3067
…		…
2600		3097
2601	$self->reflow;	3098	$self->reflow;
2602		3099
2603	local $self->{children} = [$empty, $slider];	3100	local $self->{children} = [$empty, $slider];
2604	$self->SUPER::invoke_size_allocate ($w, $h)	3101	$self->SUPER::invoke_size_allocate ($w, $h)
		3102	}
		3103
		3104	sub invoke_mouse_wheel {
		3105	my ($self, $ev) = @_;
		3106
		3107	return 0 unless $ev->{dy}; # only vertical movements
		3108
		3109	$self->{children}[1]->emit (mouse_wheel => $ev);
		3110
		3111	1
2605	}	3112	}
2606		3113
2607	sub get_layout {	3114	sub get_layout {
2608	my ($self, $para) = @_;	3115	my ($self, $para) = @_;
2609		3116
…		…
2637		3144
2638	# todo: base offset on lines or so, not on pixels	3145	# todo: base offset on lines or so, not on pixels
2639	$self->{children}[1]->set_value ($offset);	3146	$self->{children}[1]->set_value ($offset);
2640	}	3147	}
2641		3148
		3149	sub current_paragraph {
		3150	my ($self) = @_;
		3151
		3152	$self->{top_paragraph} - 1
		3153	}
		3154
		3155	sub scroll_to {
		3156	my ($self, $para) = @_;
		3157
		3158	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3159
		3160	$self->{scroll_to} = $para;
		3161	$self->update;
		3162	}
		3163
2642	sub clear {	3164	sub clear {
2643	my ($self) = @_;	3165	my ($self) = @_;
2644		3166
2645	my (undef, undef, @other) = @{ $self->{children} };	3167	my (undef, undef, @other) = @{ $self->{children} };
2646	$self->remove ($_) for @other;	3168	$self->remove ($_) for @other;
…		…
2649	$self->{height} = 0;	3171	$self->{height} = 0;
2650	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3172	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2651	}	3173	}
2652		3174
2653	sub add_paragraph {	3175	sub add_paragraph {
2654	my ($self, $color, $para, $indent) = @_;	3176	my $self = shift;
2655		3177
2656	my ($text, @w) = ref $para ? @$para : $para;	3178	for my $para (@_) {
2657
2658	$para = {	3179	$para = {
		3180	fg => [1, 1, 1, 1],
		3181	indent => 0,
		3182	markup => "",
		3183	widget => [],
		3184	ref $para ? %$para : (markup => $para),
2659	w => 1e10,	3185	w => 1e10,
2660	wrapped => 1,	3186	wrapped => 1,
2661	fg => $color,
2662	indent => $indent,
2663	markup => $text,
2664	widget => \@w,
2665	};	3187	};
2666		3188
2667	$self->add (@w) if @w;	3189	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2668	push @{$self->{par}}, $para;	3190	push @{$self->{par}}, $para;
		3191	}
		3192
		3193	if (my $max = $self->{max_par}) {
		3194	shift @{$self->{par}} while @{$self->{par}} > $max;
		3195	}
2669		3196
2670	$self->{need_reflow}++;	3197	$self->{need_reflow}++;
2671	$self->update;	3198	$self->update;
2672	}	3199	}
2673		3200
2674	sub scroll_to_bottom {	3201	sub scroll_to_bottom {
2675	my ($self) = @_;	3202	my ($self) = @_;
2676		3203
2677	$self->{scroll_to_bottom} = 1;	3204	$self->{scroll_to} = $#{$self->{par}};
2678	$self->update;	3205	$self->update;
2679	}	3206	}
2680		3207
		3208	sub force_uptodate {
		3209	my ($self) = @_;
		3210
		3211	if (delete $self->{need_reflow}) {
		3212	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3213
		3214	my $height = 0;
		3215
		3216	for my $para (@{$self->{par}}) {
		3217	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3218	my $layout = $self->get_layout ($para);
		3219	my ($w, $h) = $layout->size;
		3220
		3221	$para->{w} = $w + $para->{indent};
		3222	$para->{h} = $h;
		3223	$para->{wrapped} = $layout->has_wrapped;
		3224	}
		3225
		3226	$para->{y} = $height;
		3227	$height += $para->{h};
		3228	}
		3229
		3230	$self->{height} = $height;
		3231	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3232
		3233	delete $self->{texture};
		3234	}
		3235
		3236	if (my $paridx = delete $self->{scroll_to}) {
		3237	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3238	}
		3239	}
		3240
2681	sub update {	3241	sub update {
2682	my ($self) = @_;	3242	my ($self) = @_;
2683		3243
2684	$self->SUPER::update;	3244	$self->SUPER::update;
2685		3245
2686	return unless $self->{h} > 0;	3246	return unless $self->{h} > 0;
2687		3247
2688	delete $self->{texture};	3248	delete $self->{texture};
2689		3249
2690	$ROOT->on_post_alloc ($self => sub {	3250	$ROOT->on_post_alloc ($self => sub {
		3251	$self->force_uptodate;
		3252
2691	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3253	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2692		3254
2693	if (delete $self->{need_reflow}) {
2694	my $height = 0;
2695
2696	for my $para (@{$self->{par}}) {
2697	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2698	my $layout = $self->get_layout ($para);
2699	my ($w, $h) = $layout->size;
2700
2701	$para->{w} = $w + $para->{indent};
2702	$para->{h} = $h;
2703	$para->{wrapped} = $layout->has_wrapped;
2704	}
2705
2706	$height += $para->{h};
2707	}
2708
2709	$self->{height} = $height;
2710
2711	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2712
2713	delete $self->{texture};
2714	}
2715
2716	if (delete $self->{scroll_to_bottom}) {
2717	$self->{children}[1]->set_value (1e10);
2718	}
2719
2720	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3255	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2721	glClearColor 0, 0, 0, 0;	3256	glClearColor 0, 0, 0, 0;
2722	glClear GL_COLOR_BUFFER_BIT;	3257	glClear GL_COLOR_BUFFER_BIT;
2723		3258
		3259	package CFPlus::UI::Base;
		3260	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3261	(0, 0, $self->{w}, $self->{h});
		3262
		3263	my $top = int $self->{children}[1]{range}[0];
		3264
		3265	my $paridx = 0;
		3266	my $top_paragraph;
2724	my $top = int $self->{children}[1]{range}[0];	3267	my $top = int $self->{children}[1]{range}[0];
2725		3268
2726	my $y0 = $top;	3269	my $y0 = $top;
2727	my $y1 = $top + $H;	3270	my $y1 = $top + $H;
2728		3271
2729	my $y = 0;
2730
2731	glEnable GL_BLEND;
2732	#TODO# not correct in windows where rgba is forced off
2733	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735	for my $para (@{$self->{par}}) {	3272	for my $para (@{$self->{par}}) {
2736	my $h = $para->{h};	3273	my $h = $para->{h};
		3274	my $y = $para->{y};
2737		3275
2738	if ($y0 < $y + $h && $y < $y1) {	3276	if ($y0 < $y + $h && $y < $y1) {
2739
2740	my $layout = $self->get_layout ($para);	3277	my $layout = $self->get_layout ($para);
2741		3278
2742	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744	glRasterPos $para->{indent}, $y - $y0;	3279	$layout->render ($para->{indent}, $y - $y0);
2745	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746		3280
2747	if (my @w = @{ $para->{widget} }) {	3281	if (my @w = @{ $para->{widget} }) {
2748	my @s = $layout->get_shapes;	3282	my @s = $layout->get_shapes;
2749		3283
2750	glDisable GL_BLEND;
2751	for (@w) {	3284	for (@w) {
2752	my ($dx, $dy) = splice @s, 0, 2, ();	3285	my ($dx, $dy) = splice @s, 0, 2, ();
2753		3286
2754	$_->{x} = $dx + $para->{indent};	3287	$_->{x} = $dx + $para->{indent};
2755	$_->{y} = $dy + $y - $y0;	3288	$_->{y} = $dy + $y - $y0;
2756		3289
2757	$_->draw;	3290	$_->draw;
2758	}	3291	}
2759	glEnable GL_BLEND;
2760	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761	}	3292	}
2762	}	3293	}
2763		3294
2764	$y += $h;	3295	$paridx++;
		3296	$top_paragraph ||= $paridx if $y >= $top;
2765	}	3297	}
2766		3298
2767	glDisable GL_BLEND;	3299	$self->{top_paragraph} = $top_paragraph;
2768	};	3300	};
2769	});	3301	});
2770	}	3302	}
2771		3303
2772	sub reconfigure {	3304	sub reconfigure {
…		…
2790	$self->{children}[1]->draw;	3322	$self->{children}[1]->draw;
2791	}	3323	}
2792		3324
2793	#############################################################################	3325	#############################################################################
2794		3326
2795	package CFClient::UI::Animator;	3327	package CFPlus::UI::Animator;
2796		3328
2797	use CFClient::OpenGL;	3329	use CFPlus::OpenGL;
2798		3330
2799	our @ISA = CFClient::UI::Bin::;	3331	our @ISA = CFPlus::UI::Bin::;
2800		3332
2801	sub moveto {	3333	sub moveto {
2802	my ($self, $x, $y) = @_;	3334	my ($self, $x, $y) = @_;
2803		3335
2804	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3336	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2832	glPopMatrix;	3364	glPopMatrix;
2833	}	3365	}
2834		3366
2835	#############################################################################	3367	#############################################################################
2836		3368
2837	package CFClient::UI::Flopper;	3369	package CFPlus::UI::Flopper;
2838		3370
2839	our @ISA = CFClient::UI::Button::;	3371	our @ISA = CFPlus::UI::Button::;
2840		3372
2841	sub new {	3373	sub new {
2842	my $class = shift;	3374	my $class = shift;
2843		3375
2844	my $self = $class->SUPER::new (	3376	my $self = $class->SUPER::new (
…		…
2856	$self->{other}->toggle_visibility;	3388	$self->{other}->toggle_visibility;
2857	}	3389	}
2858		3390
2859	#############################################################################	3391	#############################################################################
2860		3392
2861	package CFClient::UI::Tooltip;	3393	package CFPlus::UI::Tooltip;
2862		3394
2863	our @ISA = CFClient::UI::Bin::;	3395	our @ISA = CFPlus::UI::Bin::;
2864		3396
2865	use CFClient::OpenGL;	3397	use CFPlus::OpenGL;
2866		3398
2867	sub new {	3399	sub new {
2868	my $class = shift;	3400	my $class = shift;
2869		3401
2870	$class->SUPER::new (	3402	$class->SUPER::new (
…		…
2873	)	3405	)
2874	}	3406	}
2875		3407
2876	sub set_tooltip_from {	3408	sub set_tooltip_from {
2877	my ($self, $widget) = @_;	3409	my ($self, $widget) = @_;
		3410
		3411	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3412	if $widget->{tooltip} =~ /^#(.*)$/;
2878		3413
2879	my $tooltip = $widget->{tooltip};	3414	my $tooltip = $widget->{tooltip};
2880		3415
2881	if ($ENV{CFPLUS_DEBUG} & 2) {	3416	if ($ENV{CFPLUS_DEBUG} & 2) {
2882	$tooltip .= "\n\n" . (ref $widget) . "\n"	3417	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2886	}	3421	}
2887		3422
2888	$tooltip =~ s/^\n+//;	3423	$tooltip =~ s/^\n+//;
2889	$tooltip =~ s/\n+$//;	3424	$tooltip =~ s/\n+$//;
2890		3425
2891	$self->add (new CFClient::UI::Label	3426	$self->add (new CFPlus::UI::Label
2892	markup => $tooltip,	3427	markup => $tooltip,
2893	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3428	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2894	fontsize => 0.8,	3429	fontsize => 0.8,
2895	fg => [0, 0, 0, 1],	3430	style => 1, # FLAG_INVERSE
2896	ellipsise => 0,	3431	ellipsise => 0,
2897	font => ($widget->{tooltip_font} || $::FONT_PROP),	3432	font => ($widget->{tooltip_font} || $::FONT_PROP),
2898	);	3433	);
2899	}	3434	}
2900		3435
…		…
2919		3454
2920	$self->{root}->on_post_alloc ("move_$self" => sub {	3455	$self->{root}->on_post_alloc ("move_$self" => sub {
2921	my $widget = $self->{owner}	3456	my $widget = $self->{owner}
2922	or return;	3457	or return;
2923		3458
		3459	if ($widget->{visible}) {
2924	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3460	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925		3461
2926	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3462	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927	if $x + $self->{w} > $self->{root}{w};	3463	if $x + $self->{w} > $self->{root}{w};
2928		3464
2929	$self->move_abs ($x, $y);	3465	$self->move_abs ($x, $y);
		3466	} else {
		3467	$self->hide;
		3468	}
2930	});	3469	});
2931	}	3470	}
2932		3471
2933	sub _draw {	3472	sub _draw {
2934	my ($self) = @_;	3473	my ($self) = @_;
…		…
2958	$self->SUPER::_draw;	3497	$self->SUPER::_draw;
2959	}	3498	}
2960		3499
2961	#############################################################################	3500	#############################################################################
2962		3501
2963	package CFClient::UI::Face;	3502	package CFPlus::UI::Face;
2964		3503
2965	our @ISA = CFClient::UI::Base::;	3504	our @ISA = CFPlus::UI::DrawBG::;
2966		3505
2967	use CFClient::OpenGL;	3506	use CFPlus::OpenGL;
2968		3507
2969	sub new {	3508	sub new {
2970	my $class = shift;	3509	my $class = shift;
2971		3510
2972	my $self = $class->SUPER::new (	3511	my $self = $class->SUPER::new (
		3512	size_w => 32,
		3513	size_h => 8,
2973	aspect => 1,	3514	aspect => 1,
2974	can_events => 0,	3515	can_events => 0,
2975	@_,	3516	@_,
2976	);	3517	);
2977		3518
2978	if ($self->{anim} && $self->{animspeed}) {	3519	if ($self->{anim} && $self->{animspeed}) {
2979	Scalar::Util::weaken (my $widget = $self);	3520	CFPlus::weaken (my $widget = $self);
2980		3521
		3522	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3523	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2981	$self->{timer} = Event->timer (	3524	$self->{timer} = Event->timer (
2982	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2983	hard => 1,	3525	parked => 1,
2984	interval => $self->{animspeed},
2985	cb => sub {	3526	cb => sub {
		3527	return unless $::CONN && $widget;
		3528
2986	++$widget->{frame};	3529	++$widget->{frame};
		3530	$widget->update_face;
2987	$widget->update;	3531	$widget->update;
		3532
		3533	$widget->update_timer;
2988	},	3534	},
2989	);	3535	);
		3536
		3537	$self->update_face;
		3538	$self->update_timer;
2990	}	3539	}
2991		3540
2992	$self	3541	$self
2993	}	3542	}
2994		3543
		3544	sub update_timer {
		3545	my ($self) = @_;
		3546
		3547	return unless $self->{timer};
		3548
		3549	if ($self->{visible}) {
		3550	$self->{timer}->at (
		3551	$self->{anim_start}
		3552	+ $self->{animspeed}
		3553	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3554	);
		3555	$self->{timer}->start;
		3556	} else {
		3557	$self->{timer}->stop;
		3558	}
		3559	}
		3560
		3561	sub update_face {
		3562	my ($self) = @_;
		3563
		3564	return unless $::CONN;
		3565
		3566	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3567	if ($anim && @$anim) {
		3568	delete $self->{wait_face};
		3569	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3570	}
		3571	}
		3572	}
		3573
2995	sub size_request {	3574	sub size_request {
2996	(32, 8)	3575	my ($self) = @_;
		3576
		3577	if ($::CONN) {
		3578	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3579	if (my $tex = $::CONN->{texture}[$faceid]) {
		3580	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3581	} else {
		3582	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3583	$self->realloc;
		3584	});
		3585	}
		3586	}
		3587	}
		3588
		3589	($self->{size_w} || 8, $self->{size_h} || 8)
2997	}	3590	}
2998		3591
2999	sub update {	3592	sub update {
3000	my ($self) = @_;	3593	my ($self) = @_;
3001		3594
3002	return unless $self->{visible};	3595	return unless $self->{visible};
3003		3596
3004	$self->SUPER::update;	3597	$self->SUPER::update;
3005	}	3598	}
3006		3599
		3600	sub invoke_visibility_change {
		3601	my ($self) = @_;
		3602
		3603	$self->update_timer;
		3604
		3605	0
		3606	}
		3607
3007	sub _draw {	3608	sub _draw {
3008	my ($self) = @_;	3609	my ($self) = @_;
3009		3610
3010	return unless $::CONN;	3611	return unless $::CONN;
3011		3612
3012	my $face;	3613	$self->SUPER::_draw;
3013		3614
3014	if ($self->{frame}) {
3015	my $anim = $::CONN->{anim}[$self->{anim}];	3615	my $faceid = $::CONN->{faceid}[$self->{face}]
3016		3616	or return;
3017	$face = $anim->[ $self->{frame} % @$anim ]
3018	if $anim && @$anim;
3019	}
3020		3617
3021	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3618	my $tex = $::CONN->{texture}[$faceid];
3022		3619
3023	if ($tex) {	3620	if ($tex) {
3024	glEnable GL_TEXTURE_2D;	3621	glEnable GL_TEXTURE_2D;
3025	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3026	glColor 0, 0, 0, 1;	3623	glColor 0, 0, 0, 1;
…		…
3030	}	3627	}
3031		3628
3032	sub destroy {	3629	sub destroy {
3033	my ($self) = @_;	3630	my ($self) = @_;
3034		3631
3035	$self->{timer}->cancel	3632	(delete $self->{timer})->cancel
3036	if $self->{timer};	3633	if $self->{timer};
3037		3634
3038	$self->SUPER::destroy;	3635	$self->SUPER::destroy;
3039	}	3636	}
3040		3637
3041	#############################################################################	3638	#############################################################################
3042		3639
3043	package CFClient::UI::Buttonbar;	3640	package CFPlus::UI::Buttonbar;
3044		3641
3045	our @ISA = CFClient::UI::HBox::;	3642	our @ISA = CFPlus::UI::HBox::;
3046		3643
3047	# TODO: should actualyl wrap buttons and other goodies.	3644	# TODO: should actually wrap buttons and other goodies.
3048		3645
3049	#############################################################################	3646	#############################################################################
3050		3647
3051	package CFClient::UI::Menu;	3648	package CFPlus::UI::Menu;
3052		3649
3053	our @ISA = CFClient::UI::FancyFrame::;	3650	our @ISA = CFPlus::UI::Toplevel::;
3054		3651
3055	use CFClient::OpenGL;	3652	use CFPlus::OpenGL;
3056		3653
3057	sub new {	3654	sub new {
3058	my $class = shift;	3655	my $class = shift;
3059		3656
3060	my $self = $class->SUPER::new (	3657	my $self = $class->SUPER::new (
3061	items => [],	3658	items => [],
3062	z => 100,	3659	z => 100,
3063	@_,	3660	@_,
3064	);	3661	);
3065		3662
3066	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3663	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3067		3664
3068	for my $item (@{ $self->{items} }) {	3665	for my $item (@{ $self->{items} }) {
3069	my ($widget, $cb, $tooltip) = @$item;	3666	my ($widget, $cb, $tooltip) = @$item;
3070		3667
3071	# handle various types of items, only text for now	3668	# handle various types of items, only text for now
3072	if (!ref $widget) {	3669	if (!ref $widget) {
		3670	if ($widget =~ /\t/) {
		3671	my ($left, $right) = split /\t/, $widget, 2;
		3672
3073	$widget = new CFClient::UI::Label	3673	$widget = new CFPlus::UI::HBox
3074	can_hover => 1,	3674	can_hover => 1,
3075	can_events => 1,	3675	can_events => 1,
		3676	tooltip => $tooltip,
		3677	children => [
		3678	(new CFPlus::UI::Label markup => $left, expand => 1),
		3679	(new CFPlus::UI::Label markup => $right, align => +1),
		3680	],
		3681	;
		3682
		3683	} else {
		3684	$widget = new CFPlus::UI::Label
		3685	can_hover => 1,
		3686	can_events => 1,
3076	markup => $widget,	3687	markup => $widget,
3077	tooltip => $tooltip	3688	tooltip => $tooltip;
		3689	}
3078	}	3690	}
3079		3691
3080	$self->{item}{$widget} = $item;	3692	$self->{item}{$widget} = $item;
3081		3693
3082	$self->{vbox}->add ($widget);	3694	$self->{vbox}->add ($widget);
…		…
3125	1	3737	1
3126	}	3738	}
3127		3739
3128	#############################################################################	3740	#############################################################################
3129		3741
3130	package CFClient::UI::Multiplexer;	3742	package CFPlus::UI::Multiplexer;
3131		3743
3132	our @ISA = CFClient::UI::Container::;	3744	our @ISA = CFPlus::UI::Container::;
3133		3745
3134	sub new {	3746	sub new {
3135	my $class = shift;	3747	my $class = shift;
3136		3748
3137	my $self = $class->SUPER::new (	3749	my $self = $class->SUPER::new (
…		…
3151		3763
3152	$self->{current} = $self->{children}[0]	3764	$self->{current} = $self->{children}[0]
3153	if @{ $self->{children} };	3765	if @{ $self->{children} };
3154	}	3766	}
3155		3767
		3768	sub get_current_page {
		3769	my ($self) = @_;
		3770
		3771	$self->{current}
		3772	}
		3773
3156	sub set_current_page {	3774	sub set_current_page {
3157	my ($self, $page_or_widget) = @_;	3775	my ($self, $page_or_widget) = @_;
3158		3776
3159	my $widget = ref $page_or_widget	3777	my $widget = ref $page_or_widget
3160	? $page_or_widget	3778	? $page_or_widget
…		…
3192	$self->{current}->draw;	3810	$self->{current}->draw;
3193	}	3811	}
3194		3812
3195	#############################################################################	3813	#############################################################################
3196		3814
3197	package CFClient::UI::Notebook;	3815	package CFPlus::UI::Notebook;
3198		3816
3199	our @ISA = CFClient::UI::VBox::;	3817	our @ISA = CFPlus::UI::VBox::;
3200		3818
3201	sub new {	3819	sub new {
3202	my $class = shift;	3820	my $class = shift;
3203		3821
3204	my $self = $class->SUPER::new (	3822	my $self = $class->SUPER::new (
3205	buttonbar => (new CFClient::UI::Buttonbar),	3823	buttonbar => (new CFPlus::UI::Buttonbar),
3206	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3824	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3207	# filter => # will be put between multiplexer and $self	3825	# filter => # will be put between multiplexer and $self
3208	@_,	3826	@_,
3209	);	3827	);
3210		3828
3211	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3829	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3215	}	3833	}
3216		3834
3217	sub add {	3835	sub add {
3218	my ($self, $title, $widget, $tooltip) = @_;	3836	my ($self, $title, $widget, $tooltip) = @_;
3219		3837
3220	Scalar::Util::weaken $self;	3838	CFPlus::weaken $self;
3221		3839
3222	$self->{buttonbar}->add (new CFClient::UI::Button	3840	$self->{buttonbar}->add (new CFPlus::UI::Button
3223	markup => $title,	3841	markup => $title,
3224	tooltip => $tooltip,	3842	tooltip => $tooltip,
3225	on_activate => sub { $self->set_current_page ($widget) },	3843	on_activate => sub { $self->set_current_page ($widget) },
3226	);	3844	);
3227		3845
3228	$self->{multiplexer}->add ($widget);	3846	$self->{multiplexer}->add ($widget);
3229	}	3847	}
3230		3848
		3849	sub get_current_page {
		3850	my ($self) = @_;
		3851
		3852	$self->{multiplexer}->get_current_page
		3853	}
		3854
3231	sub set_current_page {	3855	sub set_current_page {
3232	my ($self, $page) = @_;	3856	my ($self, $page) = @_;
3233		3857
3234	$self->{multiplexer}->set_current_page ($page);	3858	$self->{multiplexer}->set_current_page ($page);
3235	$self->emit (page_changed => $self->{multiplexer}{current});	3859	$self->emit (page_changed => $self->{multiplexer}{current});
3236	}	3860	}
3237		3861
3238	#############################################################################	3862	#############################################################################
3239		3863
3240	package CFClient::UI::Combobox;	3864	package CFPlus::UI::Selector;
3241		3865
3242	use utf8;	3866	use utf8;
3243		3867
3244	our @ISA = CFClient::UI::Button::;	3868	our @ISA = CFPlus::UI::Button::;
3245		3869
3246	sub new {	3870	sub new {
3247	my $class = shift;	3871	my $class = shift;
3248		3872
3249	my $self = $class->SUPER::new (	3873	my $self = $class->SUPER::new (
…		…
3266	my ($value, $title, $tooltip) = @$_;	3890	my ($value, $title, $tooltip) = @$_;
3267		3891
3268	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3892	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269	}	3893	}
3270		3894
3271	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3895	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272	}	3896	}
3273		3897
3274	sub _set_value {	3898	sub _set_value {
3275	my ($self, $value) = @_;	3899	my ($self, $value) = @_;
3276		3900
…		…
3291	$self->emit (changed => $value);	3915	$self->emit (changed => $value);
3292	}	3916	}
3293		3917
3294	#############################################################################	3918	#############################################################################
3295		3919
3296	package CFClient::UI::Statusbox;	3920	package CFPlus::UI::Statusbox;
3297		3921
3298	our @ISA = CFClient::UI::VBox::;	3922	our @ISA = CFPlus::UI::VBox::;
3299		3923
3300	sub new {	3924	sub new {
3301	my $class = shift;	3925	my $class = shift;
3302		3926
3303	my $self = $class->SUPER::new (	3927	my $self = $class->SUPER::new (
3304	fontsize => 0.8,	3928	fontsize => 0.8,
3305	@_,	3929	@_,
3306	);	3930	);
3307		3931
3308	Scalar::Util::weaken (my $this = $self);	3932	CFPlus::weaken (my $this = $self);
3309		3933
3310	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3934	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311		3935
3312	$self	3936	$self
3313	}	3937	}
…		…
3315	sub reorder {	3939	sub reorder {
3316	my ($self) = @_;	3940	my ($self) = @_;
3317	my $NOW = Time::HiRes::time;	3941	my $NOW = Time::HiRes::time;
3318		3942
3319	# freeze display when hovering over any label	3943	# freeze display when hovering over any label
3320	return if $CFClient::UI::TOOLTIP->{owner}	3944	return if $CFPlus::UI::TOOLTIP->{owner}
3321	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3945	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3322	values %{ $self->{item} };	3946	values %{ $self->{item} };
3323		3947
3324	while (my ($k, $v) = each %{ $self->{item} }) {	3948	while (my ($k, $v) = each %{ $self->{item} }) {
3325	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3949	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3326	}	3950	}
…		…
3347	for ($short) {	3971	for ($short) {
3348	s/^\s+//;	3972	s/^\s+//;
3349	s/\s+/ /g;	3973	s/\s+/ /g;
3350	}	3974	}
3351		3975
3352	new CFClient::UI::Label	3976	new CFPlus::UI::Label
3353	markup => $short,	3977	markup => $short,
3354	tooltip => $item->{tooltip},	3978	tooltip => $item->{tooltip},
3355	tooltip_font => $::FONT_PROP,	3979	tooltip_font => $::FONT_PROP,
3356	tooltip_width => 0.67,	3980	tooltip_width => 0.67,
3357	fontsize => $item->{fontsize} || $self->{fontsize},	3981	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3436	$self->SUPER::destroy;	4060	$self->SUPER::destroy;
3437	}	4061	}
3438		4062
3439	#############################################################################	4063	#############################################################################
3440		4064
3441	package CFClient::UI::Inventory;
3442
3443	our @ISA = CFClient::UI::ScrolledWindow::;
3444
3445	sub new {
3446	my $class = shift;
3447
3448	my $self = $class->SUPER::new (
3449	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3450	@_,
3451	);
3452
3453	$self
3454	}
3455
3456	sub set_items {
3457	my ($self, $items) = @_;
3458
3459	$self->{child}->clear;
3460	return unless $items;
3461
3462	my @items = sort {
3463	($a->{type} <=> $b->{type})
3464	or ($a->{name} cmp $b->{name})
3465	} values %$items;
3466
3467	$self->{real_items} = \@items;
3468
3469	my $row = 0;
3470	for my $item (@items) {
3471	CFClient::Item::update_widgets $item;
3472
3473	$self->{child}->add (0, $row, $item->{face_widget});
3474	$self->{child}->add (1, $row, $item->{desc_widget});
3475	$self->{child}->add (2, $row, $item->{weight_widget});
3476
3477	$row++;
3478	}
3479	}
3480
3481	#############################################################################
3482
3483	package CFClient::UI::SpellList;
3484
3485	our @ISA = CFClient::UI::Table::;
3486
3487	sub new {
3488	my $class = shift;
3489
3490	my $self = $class->SUPER::new (
3491	binding => [],
3492	commands => [],
3493	@_,
3494	)
3495	}
3496
3497	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510	sub rebuild_spell_list {
3511	my ($self) = @_;
3512
3513	$CFClient::UI::ROOT->on_refresh ($self => sub {
3514	$self->clear;
3515
3516	return unless $::CONN;
3517
3518	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524	my $row = 0;
3525
3526	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527	my $spell = $self->{spell}{$_};
3528
3529	$row++;
3530
3531	my $spell_cb = sub {
3532	my ($widget, $ev) = @_;
3533
3534	if ($ev->{button} == 1) {
3535	$::CONN->user_send ("cast $spell->{name}");
3536	} elsif ($ev->{button} == 2) {
3537	$::CONN->user_send ("invoke $spell->{name}");
3538	} elsif ($ev->{button} == 3) {
3539	(new CFClient::UI::Menu
3540	items => [
3541	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543	],
3544	)->popup ($ev);
3545	} else {
3546	return 0;
3547	}
3548
3549	1
3550	};
3551
3552	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554	#TODO: add path info to tooltip
3555	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557	$self->add (0, $row, new CFClient::UI::Face
3558	face => $spell->{face},
3559	can_hover => 1,
3560	can_events => 1,
3561	tooltip => $tooltip,
3562	on_button_down => $spell_cb,
3563	);
3564
3565	$self->add (1, $row, new CFClient::UI::Label
3566	expand => 1,
3567	text => $spell->{name},
3568	can_hover => 1,
3569	can_events => 1,
3570	tooltip => $tooltip,
3571	on_button_down => $spell_cb,
3572	);
3573
3574	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578	}
3579	});
3580	}
3581
3582	sub add_spell {
3583	my ($self, $spell) = @_;
3584
3585	$self->{spell}->{$spell->{name}} = $spell;
3586	$self->rebuild_spell_list;
3587	}
3588
3589	sub remove_spell {
3590	my ($self, $spell) = @_;
3591
3592	delete $self->{spell}->{$spell->{name}};
3593	$self->rebuild_spell_list;
3594	}
3595
3596	sub clear_spells {
3597	my ($self) = @_;
3598
3599	$self->{spell} = {};
3600	$self->rebuild_spell_list;
3601	}
3602
3603	#############################################################################
3604
3605	package CFClient::UI::Root;	4065	package CFPlus::UI::Root;
3606		4066
3607	our @ISA = CFClient::UI::Container::;	4067	our @ISA = CFPlus::UI::Container::;
3608		4068
3609	use List::Util qw(min max);	4069	use List::Util qw(min max);
3610		4070
3611	use CFClient::OpenGL;	4071	use CFPlus::OpenGL;
3612		4072
3613	sub new {	4073	sub new {
3614	my $class = shift;	4074	my $class = shift;
3615		4075
3616	my $self = $class->SUPER::new (	4076	my $self = $class->SUPER::new (
3617	visible => 1,	4077	visible => 1,
3618	@_,	4078	@_,
3619	);	4079	);
3620		4080
3621	Scalar::Util::weaken ($self->{root} = $self);	4081	CFPlus::weaken ($self->{root} = $self);
3622		4082
3623	$self	4083	$self
3624	}	4084	}
3625		4085
3626	sub size_request {	4086	sub size_request {
…		…
3792	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4252	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793		4253
3794	$w = 0 if $w < 0;	4254	$w = 0 if $w < 0;
3795	$h = 0 if $h < 0;	4255	$h = 0 if $h < 0;
3796		4256
		4257	$w = max $widget->{min_w}, $w;
		4258	$h = max $widget->{min_h}, $h;
		4259
		4260	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4261	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4262
		4263	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4264	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4265
3797	$w = int $w + 0.5;	4266	$w = int $w + 0.5;
3798	$h = int $h + 0.5;	4267	$h = int $h + 0.5;
3799		4268
3800	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4269	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3801	$widget->{old_w} = $widget->{w};	4270	$widget->{old_w} = $widget->{w};
…		…
3811		4280
3812	while ($self->{post_alloc_hook}) {	4281	while ($self->{post_alloc_hook}) {
3813	$_->()	4282	$_->()
3814	for values %{delete $self->{post_alloc_hook}};	4283	for values %{delete $self->{post_alloc_hook}};
3815	}	4284	}
3816
3817		4285
3818	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4286	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3819	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4287	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3820	glClear GL_COLOR_BUFFER_BIT;	4288	glClear GL_COLOR_BUFFER_BIT;
3821		4289
…		…
3824	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4292	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3825	glMatrixMode GL_MODELVIEW;	4293	glMatrixMode GL_MODELVIEW;
3826	glLoadIdentity;	4294	glLoadIdentity;
3827		4295
3828	{	4296	{
3829	package CFClient::UI::Base;	4297	package CFPlus::UI::Base;
3830		4298
3831	($draw_x, $draw_y, $draw_w, $draw_h) =	4299	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3832	(0, 0, $self->{w}, $self->{h});	4300	(0, 0, $self->{w}, $self->{h});
3833	}
3834		4301
3835	$self->_draw;	4302	$self->_draw;
		4303	}
3836	}	4304	}
3837		4305
3838	#############################################################################	4306	#############################################################################
3839		4307
3840	package CFClient::UI;	4308	package CFPlus::UI;
3841		4309
3842	$ROOT = new CFClient::UI::Root;	4310	$ROOT = new CFPlus::UI::Root;
3843	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4311	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3844		4312
3845	1	4313	1
3846		4314

Diff Legend

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