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.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 2006 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 ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
90		106
91	$GRAB = $widget;	107	$GRAB = $widget;
92	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
93		109
94	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
95	}	111	}
96		112
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
98		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
100	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
101	}	123	}
102		124
103	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	126	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		127
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		129
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		131
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
112	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		134
114	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	137	$grab->update if $grab;
117	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
118		139
		140	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
120	}	142	}
121	}	143	}
122		144
123	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
124	my ($ev) = @_;	146	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
126		148
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		150
129	if ($widget != $HOVER) {	151	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		152
132	$hover->update if $hover && $hover->{can_hover};	153	$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;	154	if $HOVER;
140	}	155	}
141		156
142	# convert position array to integers	157	# convert position array to integers
143	sub harmonize {	158	sub harmonize {
…		…
193	reconfigure_widgets;	208	reconfigure_widgets;
194	}	209	}
195		210
196	#############################################################################	211	#############################################################################
197		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
198	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
199		222
200	use strict;	223	use strict;
201		224
202	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
203		226
204	sub new {	227	sub new {
205	my $class = shift;	228	my $class = shift;
206		229
207	my $self = bless {	230	my $self = bless {
…		…
212	h => undef,	235	h => undef,
213	can_events => 1,	236	can_events => 1,
214	@_	237	@_
215	}, $class;	238	}, $class;
216		239
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		241
219	for (keys %$self) {	242	for (keys %$self) {
220	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
222	}	245	}
223	}	246	}
224		247
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$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};	250	$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};	251	$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};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		253
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		256
234	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
239		262
240	sub destroy {	263	sub destroy {
241	my ($self) = @_;	264	my ($self) = @_;
242		265
243	$self->hide;	266	$self->hide;
		267	$self->emit ("destroy");
244	%$self = ();	268	%$self = ();
245	}	269	}
246		270
247	sub show {	271	sub show {
248	my ($self) = @_;	272	my ($self) = @_;
249		273
250	return if $self->{parent};	274	return if $self->{parent};
251		275
252	$CFClient::UI::ROOT->add ($self);	276	$CFPlus::UI::ROOT->add ($self);
253	}	277	}
254		278
255	sub set_visible {	279	sub set_visible {
256	my ($self) = @_;	280	my ($self) = @_;
257		281
…		…
278	delete $self->{root};	302	delete $self->{root};
279		303
280	undef $GRAB if $GRAB == $self;	304	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	305	undef $HOVER if $HOVER == $self;
282		306
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	307	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	308	if $TOOLTIP->{owner} == $self;
285		309
286	$self->emit ("focus_out");	310	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	311	$self->emit (visibility_change => 0);
288	}	312	}
…		…
335	sub size_request {	359	sub size_request {
336	require Carp;	360	require Carp;
337	Carp::confess "size_request is abstract";	361	Carp::confess "size_request is abstract";
338	}	362	}
339		363
		364	sub baseline_shift {
		365	0
		366	}
		367
340	sub configure {	368	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	369	my ($self, $x, $y, $w, $h) = @_;
342		370
343	if ($self->{aspect}) {	371	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	372	my ($ow, $oh) = ($w, $h);
345		373
346	$w = List::Util::min $w, int $h * $self->{aspect};	374	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	375	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		376
349	# use alignment to adjust x, y	377	# use alignment to adjust x, y
350		378
351	$x += int 0.5 * ($ow - $w);	379	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	380	$y += int 0.5 * ($oh - $h);
…		…
393		421
394	return if $self->{tooltip} eq $tooltip;	422	return if $self->{tooltip} eq $tooltip;
395		423
396	$self->{tooltip} = $tooltip;	424	$self->{tooltip} = $tooltip;
397		425
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	426	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	427	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	428	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	429	}
402	}	430	}
403		431
404	# translate global coordinates to local coordinate system	432	# translate global coordinates to local coordinate system
405	sub coord2local {	433	sub coord2local {
406	my ($self, $x, $y) = @_;	434	my ($self, $x, $y) = @_;
407		435
		436	Carp::confess unless $self->{parent};#d#
		437
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	438	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	439	}
410		440
411	# translate local coordinates to global coordinate system	441	# translate local coordinates to global coordinate system
412	sub coord2global {	442	sub coord2global {
413	my ($self, $x, $y) = @_;	443	my ($self, $x, $y) = @_;
414		444
		445	Carp::confess unless $self->{parent};#d#
		446
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	447	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	448	}
417		449
418	sub invoke_focus_in {	450	sub invoke_focus_in {
419	my ($self) = @_;	451	my ($self) = @_;
420		452
421	return if $FOCUS == $self;	453	return if $FOCUS == $self;
422	return unless $self->{can_focus};	454	return unless $self->{can_focus};
423		455
424	my $focus = $FOCUS; $FOCUS = $self;	456	$FOCUS = $self;
425		457
426	$focus->update if $focus;	458	$self->update;
427	$FOCUS->update;
428		459
429	0	460	0
430	}	461	}
431		462
432	sub invoke_focus_out {	463	sub invoke_focus_out {
433	my ($self) = @_;	464	my ($self) = @_;
434		465
435	return unless $FOCUS == $self;	466	return unless $FOCUS == $self;
436		467
437	my $focus = $FOCUS; undef $FOCUS;	468	undef $FOCUS;
438		469
439	$focus->update if $focus; #?	470	$self->update;
440		471
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	472	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	473	unless $FOCUS;
443		474
444	0	475	0
445	}	476	}
446		477
447	sub grab_focus {	478	sub grab_focus {
448	my ($self) = @_;	479	my ($self) = @_;
449		480
		481	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	482	$self->emit ("focus_in");
451	}	483	}
452		484
453	sub invoke_mouse_motion { 1 }	485	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	486	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	487	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	488	sub invoke_key_up { 0 }
		489	sub invoke_mouse_wheel { 0 }
457		490
458	sub invoke_button_down {	491	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	492	my ($self, $ev, $x, $y) = @_;
460		493
461	$self->grab_focus;	494	$self->grab_focus;
462		495
463	1	496	0
464	}	497	}
465		498
466	sub connect {	499	sub connect {
467	my ($self, $signal, $cb) = @_;	500	my ($self, $signal, $cb) = @_;
468		501
469	push @{ $self->{signal_cb}{$signal} }, $cb;	502	push @{ $self->{signal_cb}{$signal} }, $cb;
		503
		504	defined wantarray and CFPlus::guard {
		505	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		506	@{ $self->{signal_cb}{$signal} };
		507	}
470	}	508	}
		509
		510	sub disconnect_all {
		511	my ($self, $signal) = @_;
		512
		513	delete $self->{signal_cb}{$signal};
		514	}
		515
		516	my %has_coords = (
		517	button_down => 1,
		518	button_up => 1,
		519	mouse_motion => 1,
		520	mouse_wheel => 1,
		521	);
471		522
472	sub emit {	523	sub emit {
473	my ($self, $signal, @args) = @_;	524	my ($self, $signal, @args) = @_;
474		525
		526	# I do not really like this solution, but I do not like duplication
		527	# and needlessly verbose code, either.
		528	my @append
		529	= $has_coords{$signal}
		530	? $args[0]->xy ($self)
		531	: ();
		532
		533	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		534
		535	#d##TODO# stop propagating at first true, do not use sum
475	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before	536	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
476	($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure	537	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
477	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	538	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478	}	539	}
479		540
480	sub find_widget {	541	sub find_widget {
481	my ($self, $x, $y) = @_;	542	my ($self, $x, $y) = @_;
482		543
…		…
534	return unless $self->{h} && $self->{w};	595	return unless $self->{h} && $self->{w};
535		596
536	# update screen rectangle	597	# update screen rectangle
537	local $draw_x = $draw_x + $self->{x};	598	local $draw_x = $draw_x + $self->{x};
538	local $draw_y = $draw_y + $self->{y};	599	local $draw_y = $draw_y + $self->{y};
539	local $draw_w = $draw_x + $self->{w};
540	local $draw_h = $draw_y + $self->{h};
541		600
542	# skip widgets that are entirely outside the drawing area	601	# skip widgets that are entirely outside the drawing area
543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	602	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	603	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545		604
…		…
568	glVertex $self->{w} - 1, 0;	627	glVertex $self->{w} - 1, 0;
569	glVertex $self->{w} - 1, $self->{h} - 1;	628	glVertex $self->{w} - 1, $self->{h} - 1;
570	glVertex 0 , $self->{h} - 1;	629	glVertex 0 , $self->{h} - 1;
571	glEnd;	630	glEnd;
572	glPopMatrix;	631	glPopMatrix;
573	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	632	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
574	}	633	}
575		634
576	$self->_draw;	635	$self->_draw;
577	glPopMatrix;	636	glPopMatrix;
578	}	637	}
…		…
584	}	643	}
585		644
586	sub DESTROY {	645	sub DESTROY {
587	my ($self) = @_;	646	my ($self) = @_;
588		647
589	delete $WIDGET{$self+0};	648	return if CFPlus::in_destruct;
590		649
591	eval { $self->destroy };	650	eval { $self->destroy };
592	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	651	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		652
		653	delete $WIDGET{$self+0};
593	}	654	}
594		655
595	#############################################################################	656	#############################################################################
596		657
597	package CFClient::UI::DrawBG;	658	package CFPlus::UI::DrawBG;
598		659
599	our @ISA = CFClient::UI::Base::;	660	our @ISA = CFPlus::UI::Base::;
600		661
601	use strict;	662	use strict;
602	use CFClient::OpenGL;	663	use CFPlus::OpenGL;
603		664
604	sub new {	665	sub new {
605	my $class = shift;	666	my $class = shift;
606		667
607	# range [value, low, high, page]	668	# range [value, low, high, page]
…		…
638	}	699	}
639	}	700	}
640		701
641	#############################################################################	702	#############################################################################
642		703
643	package CFClient::UI::Empty;	704	package CFPlus::UI::Empty;
644		705
645	our @ISA = CFClient::UI::Base::;	706	our @ISA = CFPlus::UI::Base::;
646		707
647	sub new {	708	sub new {
648	my ($class, %arg) = @_;	709	my ($class, %arg) = @_;
649	$class->SUPER::new (can_events => 0, %arg);	710	$class->SUPER::new (can_events => 0, %arg);
650	}	711	}
…		…
657		718
658	sub draw { }	719	sub draw { }
659		720
660	#############################################################################	721	#############################################################################
661		722
662	package CFClient::UI::Container;	723	package CFPlus::UI::Container;
663		724
664	our @ISA = CFClient::UI::Base::;	725	our @ISA = CFPlus::UI::Base::;
665		726
666	sub new {	727	sub new {
667	my ($class, %arg) = @_;	728	my ($class, %arg) = @_;
668		729
669	my $children = delete $arg{children};	730	my $children = delete $arg{children};
…		…
678	if $children;	739	if $children;
679		740
680	$self	741	$self
681	}	742	}
682		743
		744	sub realloc {
		745	my ($self) = @_;
		746
		747	$self->{force_realloc} = 1;
		748	$self->{force_size_alloc} = 1;
		749	$self->SUPER::realloc;
		750	}
		751
683	sub add {	752	sub add {
684	my ($self, @widgets) = @_;	753	my ($self, @widgets) = @_;
685		754
686	$_->set_parent ($self)	755	$_->set_parent ($self)
687	for @widgets;	756	for @widgets;
…		…
747	$_->draw for @{$self->{children}};	816	$_->draw for @{$self->{children}};
748	}	817	}
749		818
750	#############################################################################	819	#############################################################################
751		820
752	package CFClient::UI::Bin;	821	package CFPlus::UI::Bin;
753		822
754	our @ISA = CFClient::UI::Container::;	823	our @ISA = CFPlus::UI::Container::;
755		824
756	sub new {	825	sub new {
757	my ($class, %arg) = @_;	826	my ($class, %arg) = @_;
758		827
759	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	828	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760		829
761	$class->SUPER::new (children => [$child], %arg)	830	$class->SUPER::new (children => [$child], %arg)
762	}	831	}
763		832
764	sub add {	833	sub add {
…		…
771	sub remove {	840	sub remove {
772	my ($self, $widget) = @_;	841	my ($self, $widget) = @_;
773		842
774	$self->SUPER::remove ($widget);	843	$self->SUPER::remove ($widget);
775		844
776	$self->{children} = [new CFClient::UI::Empty]	845	$self->{children} = [new CFPlus::UI::Empty]
777	unless @{$self->{children}};	846	unless @{$self->{children}};
778	}	847	}
779		848
780	sub child { $_[0]->{children}[0] }	849	sub child { $_[0]->{children}[0] }
781		850
…		…
793		862
794	#############################################################################	863	#############################################################################
795		864
796	# back-buffered drawing area	865	# back-buffered drawing area
797		866
798	package CFClient::UI::Window;	867	package CFPlus::UI::Window;
799		868
800	our @ISA = CFClient::UI::Bin::;	869	our @ISA = CFPlus::UI::Bin::;
801		870
802	use CFClient::OpenGL;	871	use CFPlus::OpenGL;
803		872
804	sub new {	873	sub new {
805	my ($class, %arg) = @_;	874	my ($class, %arg) = @_;
806		875
807	my $self = $class->SUPER::new (%arg);	876	my $self = $class->SUPER::new (%arg);
…		…
829	}	898	}
830		899
831	sub render_child {	900	sub render_child {
832	my ($self) = @_;	901	my ($self) = @_;
833		902
834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	903	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
835	glClearColor 0, 0, 0, 0;	904	glClearColor 0, 0, 0, 0;
836	glClear GL_COLOR_BUFFER_BIT;	905	glClear GL_COLOR_BUFFER_BIT;
837		906
838	{	907	{
839	package CFClient::UI::Base;	908	package CFPlus::UI::Base;
840		909
841	($draw_x, $draw_y, $draw_w, $draw_h) =	910	local ($draw_x, $draw_y, $draw_w, $draw_h) =
842	(0, 0, $self->{w}, $self->{h});	911	(0, 0, $self->{w}, $self->{h});
		912
		913	$self->_render;
843	}	914	}
844
845	$self->_render;
846	};	915	};
847	}	916	}
848		917
849	sub _draw {	918	sub _draw {
850	my ($self) = @_;	919	my ($self) = @_;
851
852	my ($w, $h) = @$self{qw(w h)};
853		920
854	my $tex = $self->{texture}	921	my $tex = $self->{texture}
855	or return;	922	or return;
856		923
857	glEnable GL_TEXTURE_2D;	924	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	925	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 0, 0, 0, 1;	926	glColor 0, 0, 0, 1;
860		927
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	928	$tex->draw_quad_alpha_premultiplied (0, 0);
862		929
863	glDisable GL_TEXTURE_2D;	930	glDisable GL_TEXTURE_2D;
864	}	931	}
865		932
866	#############################################################################	933	#############################################################################
867		934
868	package CFClient::UI::ViewPort;	935	package CFPlus::UI::ViewPort;
869		936
870	our @ISA = CFClient::UI::Window::;	937	our @ISA = CFPlus::UI::Window::;
871		938
872	sub new {	939	sub new {
873	my $class = shift;	940	my $class = shift;
874		941
875	$class->SUPER::new (	942	$class->SUPER::new (
…		…
935	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1002	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1003	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
937	) {	1004	) {
938	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1005	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939	} else {	1006	} else {
940	$self->CFClient::UI::Base::find_widget ($x, $y)	1007	$self->CFPlus::UI::Base::find_widget ($x, $y)
941	}	1008	}
942	}	1009	}
943		1010
944	sub _render {	1011	sub _render {
945	my ($self) = @_;	1012	my ($self) = @_;
946		1013
947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1014	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1015	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949		1016
950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1017	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951		1018
952	$self->SUPER::_render;	1019	$self->SUPER::_render;
953	}	1020	}
954		1021
955	#############################################################################	1022	#############################################################################
956		1023
957	package CFClient::UI::ScrolledWindow;	1024	package CFPlus::UI::ScrolledWindow;
958		1025
959	our @ISA = CFClient::UI::HBox::;	1026	our @ISA = CFPlus::UI::HBox::;
960		1027
961	sub new {	1028	sub new {
962	my ($class, %arg) = @_;	1029	my ($class, %arg) = @_;
963		1030
964	my $child = delete $arg{child};	1031	my $child = delete $arg{child};
965		1032
966	my $self;	1033	my $self;
967		1034
968	my $slider = new CFClient::UI::Slider	1035	my $slider = new CFPlus::UI::Slider
969	vertical => 1,	1036	vertical => 1,
970	range => [0, 0, 1, 0.01], # HACK fix	1037	range => [0, 0, 1, 0.01], # HACK fix
971	on_changed => sub {	1038	on_changed => sub {
972	$self->{vp}->set_offset (0, $_[1]);	1039	$self->{vp}->set_offset (0, $_[1]);
973	},	1040	},
974	;	1041	;
975		1042
976	$self = $class->SUPER::new (	1043	$self = $class->SUPER::new (
977	vp => (new CFClient::UI::ViewPort expand => 1),	1044	vp => (new CFPlus::UI::ViewPort expand => 1),
		1045	can_events => 1,
978	slider => $slider,	1046	slider => $slider,
979	%arg,	1047	%arg,
980	);	1048	);
981		1049
982	$self->SUPER::add ($self->{vp}, $self->{slider});	1050	$self->SUPER::add ($self->{vp}, $self->{slider});
983	$self->add ($child) if $child;	1051	$self->add ($child) if $child;
984		1052
985	$self	1053	$self
986	}	1054	}
987		1055
		1056	#TODO# update range on size_allocate depending on child
		1057
988	sub add {	1058	sub add {
989	my ($self, $widget) = @_;	1059	my ($self, $widget) = @_;
990		1060
991	$self->{vp}->add ($self->{child} = $widget);	1061	$self->{vp}->add ($self->{child} = $widget);
992	}	1062	}
993		1063
		1064	sub invoke_mouse_wheel {
		1065	my ($self, $ev) = @_;
		1066
		1067	return 0 unless $ev->{dy}; # only vertical movements
		1068
		1069	$self->{slider}->emit (mouse_wheel => $ev);
		1070
		1071	1
		1072	}
		1073
		1074	sub update_slider {
		1075	my ($self) = @_;
		1076
		1077	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1078	}
		1079
994	sub update {	1080	sub update {
995	my ($self) = @_;	1081	my ($self) = @_;
996		1082
997	$self->SUPER::update;	1083	$self->SUPER::update;
998		1084
999	# todo: overwrite size_allocate of child	1085	$self->update_slider;
1000	my $child = $self->{vp}->child;
1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002	}	1086	}
1003		1087
1004	sub invoke_size_allocate {	1088	sub invoke_size_allocate {
1005	my ($self, $w, $h) = @_;	1089	my ($self, $w, $h) = @_;
1006		1090
1007	my $child = $self->{vp}->child;	1091	$self->update_slider;
1008	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009		1092
1010	$self->SUPER::invoke_size_allocate ($w, $h)	1093	$self->SUPER::invoke_size_allocate ($w, $h)
1011	}	1094	}
1012		1095
1013	#TODO# update range on size_allocate depending on child
1014	# update viewport offset on scroll
1015
1016	#############################################################################	1096	#############################################################################
1017		1097
1018	package CFClient::UI::Frame;	1098	package CFPlus::UI::Frame;
1019		1099
1020	our @ISA = CFClient::UI::Bin::;	1100	our @ISA = CFPlus::UI::Bin::;
1021		1101
1022	use CFClient::OpenGL;	1102	use CFPlus::OpenGL;
1023		1103
1024	sub new {	1104	sub new {
1025	my $class = shift;	1105	my $class = shift;
1026		1106
1027	$class->SUPER::new (	1107	$class->SUPER::new (
…		…
1053	$self->SUPER::_draw;	1133	$self->SUPER::_draw;
1054	}	1134	}
1055		1135
1056	#############################################################################	1136	#############################################################################
1057		1137
1058	package CFClient::UI::FancyFrame;	1138	package CFPlus::UI::FancyFrame;
1059		1139
1060	our @ISA = CFClient::UI::Bin::;	1140	our @ISA = CFPlus::UI::Bin::;
1061		1141
1062	use CFClient::OpenGL;	1142	use CFPlus::OpenGL;
		1143
		1144	sub new {
		1145	my ($class, %arg) = @_;
		1146
		1147	if ((exists $arg{label}) && !ref $arg{label}) {
		1148	$arg{label} = new CFPlus::UI::Label
		1149	align => 1,
		1150	valign => 0,
		1151	text => $arg{label},
		1152	fontsize => ($arg{border} || 0.8) * 0.75;
		1153	}
		1154
		1155	my $self = $class->SUPER::new (
		1156	# label => "",
		1157	fg => [0.6, 0.3, 0.1],
		1158	border => 0.8,
		1159	style => 'single',
		1160	%arg,
		1161	);
		1162
		1163	$self
		1164	}
		1165
		1166	sub add {
		1167	my ($self, @widgets) = @_;
		1168
		1169	$self->SUPER::add (@widgets);
		1170	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1171	}
		1172
		1173	sub border {
		1174	int $_[0]{border} * $::FONTSIZE
		1175	}
		1176
		1177	sub size_request {
		1178	my ($self) = @_;
		1179
		1180	($self->{label_w}, undef) = $self->{label}->size_request
		1181	if $self->{label};
		1182
		1183	my ($w, $h) = $self->SUPER::size_request;
		1184
		1185	(
		1186	$w + $self->border * 2,
		1187	$h + $self->border * 2,
		1188	)
		1189	}
		1190
		1191	sub invoke_size_allocate {
		1192	my ($self, $w, $h) = @_;
		1193
		1194	my $border = $self->border;
		1195
		1196	$w -= List::Util::max 0, $border * 2;
		1197	$h -= List::Util::max 0, $border * 2;
		1198
		1199	if (my $label = $self->{label}) {
		1200	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1201	$label->{h} = List::Util::min $h, $border;
		1202	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1203	}
		1204
		1205	$self->child->configure ($border, $border, $w, $h);
		1206
		1207	1
		1208	}
		1209
		1210	sub _draw {
		1211	my ($self) = @_;
		1212
		1213	my $child = $self->{children}[0];
		1214
		1215	my $border = $self->border;
		1216	my ($w, $h) = ($self->{w}, $self->{h});
		1217
		1218	$child->draw;
		1219
		1220	glColor @{$self->{fg}};
		1221	glBegin GL_LINE_STRIP;
		1222	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1223	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1224	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1225	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1226	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1227	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1228	glEnd;
		1229
		1230	if ($self->{label}) {
		1231	glTranslate $border * 2, 0;
		1232	$self->{label}->_draw;
		1233	}
		1234	}
		1235
		1236	#############################################################################
		1237
		1238	package CFPlus::UI::Toplevel;
		1239
		1240	our @ISA = CFPlus::UI::Bin::;
		1241
		1242	use CFPlus::OpenGL;
1063		1243
1064	my $bg =	1244	my $bg =
1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1245	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066	mipmap => 1, wrap => 1;	1246	mipmap => 1, wrap => 1;
1067		1247
1068	my @border =	1248	my @border =
1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1249	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1250	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071		1251
1072	sub new {	1252	sub new {
1073	my ($class, %arg) = @_;	1253	my ($class, %arg) = @_;
1074		1254
1075	my $self = $class->SUPER::new (	1255	my $self = $class->SUPER::new (
1076	bg => [1, 1, 1, 1],	1256	bg => [1, 1, 1, 1],
1077	border_bg => [1, 1, 1, 1],	1257	border_bg => [1, 1, 1, 1],
1078	border => 0.6,	1258	border => 0.6,
1079	can_events => 1,	1259	can_events => 1,
1080	min_w => 16,	1260	min_w => 64,
1081	min_h => 16,	1261	min_h => 32,
1082	%arg,	1262	%arg,
1083	);	1263	);
1084		1264
1085	$self->{title_widget} = new CFClient::UI::Label	1265	$self->{title_widget} = new CFPlus::UI::Label
1086	align => 0,	1266	align => 0,
1087	valign => 1,	1267	valign => 1,
1088	text => $self->{title},	1268	text => $self->{title},
1089	fontsize => $self->{border},	1269	fontsize => $self->{border},
1090	if exists $self->{title};	1270	if exists $self->{title};
1091		1271
1092	if ($self->{has_close_button}) {	1272	if ($self->{has_close_button}) {
1093	$self->{close_button} =	1273	$self->{close_button} =
1094	new CFClient::UI::ImageButton	1274	new CFPlus::UI::ImageButton
1095	image => 'x1_close.png',	1275	path => 'x1_close.png',
1096	on_activate => sub { $self->hide };	1276	on_activate => sub { $self->emit ("delete") };
1097		1277
1098	$self->CFClient::UI::Container::add ($self->{close_button});	1278	$self->CFPlus::UI::Container::add ($self->{close_button});
1099	}	1279	}
1100		1280
1101	$self	1281	$self
1102	}	1282	}
1103		1283
1104	sub add {	1284	sub add {
1105	my ($self, @widgets) = @_;	1285	my ($self, @widgets) = @_;
1106		1286
1107	$self->SUPER::add (@widgets);	1287	$self->SUPER::add (@widgets);
1108	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1288	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1289	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110	}	1290	}
1111		1291
1112	sub border {	1292	sub border {
1113	int $_[0]{border} * $::FONTSIZE	1293	int $_[0]{border} * $::FONTSIZE
1114	}	1294	}
…		…
1147	$self->child->configure ($border, $border, $w, $h);	1327	$self->child->configure ($border, $border, $w, $h);
1148		1328
1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1329	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150	if $self->{close_button};	1330	if $self->{close_button};
1151		1331
		1332	1
		1333	}
		1334
		1335	sub invoke_delete {
		1336	my ($self) = @_;
		1337
		1338	$self->hide;
		1339
1152	1	1340	1
1153	}	1341	}
1154		1342
1155	sub invoke_button_down {	1343	sub invoke_button_down {
1156	my ($self, $ev, $x, $y) = @_;	1344	my ($self, $ev, $x, $y) = @_;
…		…
1214	$self->{motion}->($ev, $x, $y) if $self->{motion};	1402	$self->{motion}->($ev, $x, $y) if $self->{motion};
1215		1403
1216	! ! $self->{motion}	1404	! ! $self->{motion}
1217	}	1405	}
1218		1406
		1407	sub invoke_visibility_change {
		1408	my ($self, $visible) = @_;
		1409
		1410	delete $self->{motion} unless $visible;
		1411
		1412	0
		1413	}
		1414
1219	sub _draw {	1415	sub _draw {
1220	my ($self) = @_;	1416	my ($self) = @_;
1221		1417
1222	my $child = $self->{children}[0];	1418	my $child = $self->{children}[0];
1223		1419
…		…
1260	if $self->{close_button};	1456	if $self->{close_button};
1261	}	1457	}
1262		1458
1263	#############################################################################	1459	#############################################################################
1264		1460
1265	package CFClient::UI::Table;	1461	package CFPlus::UI::Table;
1266		1462
1267	our @ISA = CFClient::UI::Base::;	1463	our @ISA = CFPlus::UI::Base::;
1268		1464
1269	use List::Util qw(max sum);	1465	use List::Util qw(max sum);
1270		1466
1271	use CFClient::OpenGL;	1467	use CFPlus::OpenGL;
1272		1468
1273	sub new {	1469	sub new {
1274	my $class = shift;	1470	my $class = shift;
1275		1471
1276	$class->SUPER::new (	1472	$class->SUPER::new (
…		…
1282	sub children {	1478	sub children {
1283	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1479	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284	}	1480	}
1285		1481
1286	sub add {	1482	sub add {
1287	my ($self, $x, $y, $child) = @_;	1483	my ($self) = shift;
1288		1484
		1485	while (@_) {
		1486	my ($x, $y, $child) = splice @_, 0, 3, ();
1289	$child->set_parent ($self);	1487	$child->set_parent ($self);
1290	$self->{children}[$y][$x] = $child;	1488	$self->{children}[$y][$x] = $child;
		1489	}
1291		1490
		1491	$self->{force_realloc} = 1;
		1492	$self->{force_size_alloc} = 1;
1292	$self->realloc;	1493	$self->realloc;
1293	}	1494	}
1294		1495
1295	sub remove {	1496	sub remove {
1296	my ($self, $child) = @_;	1497	my ($self, $child) = @_;
…		…
1361		1562
1362	# linearly scale sizes	1563	# linearly scale sizes
1363	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1564	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1565	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365		1566
1366	CFClient::UI::harmonize $ws;	1567	CFPlus::UI::harmonize $ws;
1367	CFClient::UI::harmonize $hs;	1568	CFPlus::UI::harmonize $hs;
1368		1569
1369	my $y;	1570	my $y;
1370		1571
1371	for my $r (0 .. $#{$self->{children}}) {	1572	for my $r (0 .. $#{$self->{children}}) {
1372	my $row = $self->{children}[$r]	1573	my $row = $self->{children}[$r]
…		…
1415	}	1616	}
1416	}	1617	}
1417		1618
1418	#############################################################################	1619	#############################################################################
1419		1620
1420	package CFClient::UI::Box;	1621	package CFPlus::UI::Box;
1421		1622
1422	our @ISA = CFClient::UI::Container::;	1623	our @ISA = CFPlus::UI::Container::;
1423		1624
1424	sub size_request {	1625	sub size_request {
1425	my ($self) = @_;	1626	my ($self) = @_;
1426		1627
1427	$self->{vertical}	1628	$self->{vertical}
…		…
1437		1638
1438	sub invoke_size_allocate {	1639	sub invoke_size_allocate {
1439	my ($self, $w, $h) = @_;	1640	my ($self, $w, $h) = @_;
1440		1641
1441	my $space = $self->{vertical} ? $h : $w;	1642	my $space = $self->{vertical} ? $h : $w;
1442	my $children = $self->{children};	1643	my @children = $self->visible_children;
1443		1644
1444	my @req;	1645	my @req;
1445		1646
1446	if ($self->{homogeneous}) {	1647	if ($self->{homogeneous}) {
1447	@req = ($space / (@$children || 1)) x @$children;	1648	@req = ($space / (@children || 1)) x @children;
1448	} else {	1649	} else {
1449	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1650	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450	my $req = List::Util::sum @req;	1651	my $req = List::Util::sum @req;
1451		1652
1452	if ($req > $space) {	1653	if ($req > $space) {
1453	# ah well, not enough space	1654	# ah well, not enough space
1454	$_ *= $space / $req for @req;	1655	$_ *= $space / $req for @req;
1455	} else {	1656	} else {
1456	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1657	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457		1658
1458	$space = ($space - $req) / $expand; # remaining space to give away	1659	$space = ($space - $req) / $expand; # remaining space to give away
1459		1660
1460	$req[$_] += $space * $children->[$_]{expand}	1661	$req[$_] += $space * $children[$_]{expand}
1461	for 0 .. $#$children;	1662	for 0 .. $#children;
1462	}	1663	}
1463	}	1664	}
1464		1665
1465	CFClient::UI::harmonize \@req;	1666	CFPlus::UI::harmonize \@req;
1466		1667
1467	my $pos = 0;	1668	my $pos = 0;
1468	for (0 .. $#$children) {	1669	for (0 .. $#children) {
1469	my $alloc = $req[$_];	1670	my $alloc = $req[$_];
1470	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1671	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471		1672
1472	$pos += $alloc;	1673	$pos += $alloc;
1473	}	1674	}
1474		1675
1475	1	1676	1
1476	}	1677	}
1477		1678
1478	#############################################################################	1679	#############################################################################
1479		1680
1480	package CFClient::UI::HBox;	1681	package CFPlus::UI::HBox;
1481		1682
1482	our @ISA = CFClient::UI::Box::;	1683	our @ISA = CFPlus::UI::Box::;
1483		1684
1484	sub new {	1685	sub new {
1485	my $class = shift;	1686	my $class = shift;
1486		1687
1487	$class->SUPER::new (	1688	$class->SUPER::new (
…		…
1490	)	1691	)
1491	}	1692	}
1492		1693
1493	#############################################################################	1694	#############################################################################
1494		1695
1495	package CFClient::UI::VBox;	1696	package CFPlus::UI::VBox;
1496		1697
1497	our @ISA = CFClient::UI::Box::;	1698	our @ISA = CFPlus::UI::Box::;
1498		1699
1499	sub new {	1700	sub new {
1500	my $class = shift;	1701	my $class = shift;
1501		1702
1502	$class->SUPER::new (	1703	$class->SUPER::new (
…		…
1505	)	1706	)
1506	}	1707	}
1507		1708
1508	#############################################################################	1709	#############################################################################
1509		1710
1510	package CFClient::UI::Label;	1711	package CFPlus::UI::Label;
1511		1712
1512	our @ISA = CFClient::UI::DrawBG::;	1713	our @ISA = CFPlus::UI::DrawBG::;
1513		1714
1514	use CFClient::OpenGL;	1715	use CFPlus::OpenGL;
1515		1716
1516	sub new {	1717	sub new {
1517	my ($class, %arg) = @_;	1718	my ($class, %arg) = @_;
1518		1719
1519	my $self = $class->SUPER::new (	1720	my $self = $class->SUPER::new (
…		…
1522	#active_bg => none	1723	#active_bg => none
1523	#font => default_font	1724	#font => default_font
1524	#text => initial text	1725	#text => initial text
1525	#markup => initial narkup	1726	#markup => initial narkup
1526	#max_w => maximum pixel width	1727	#max_w => maximum pixel width
		1728	#style => 0, # render flags
1527	ellipsise => 3, # end	1729	ellipsise => 3, # end
1528	layout => (new CFClient::Layout),	1730	layout => (new CFPlus::Layout),
1529	fontsize => 1,	1731	fontsize => 1,
1530	align => -1,	1732	align => -1,
1531	valign => -1,	1733	valign => -1,
1532	padding_x => 2,	1734	padding_x => 2,
1533	padding_y => 2,	1735	padding_y => 2,
1534	can_events => 0,	1736	can_events => 0,
1535	%arg	1737	%arg
1536	);	1738	);
1537		1739
1538	if (exists $self->{template}) {	1740	if (exists $self->{template}) {
1539	my $layout = new CFClient::Layout;	1741	my $layout = new CFPlus::Layout;
1540	$layout->set_text (delete $self->{template});	1742	$layout->set_text (delete $self->{template});
1541	$self->{template} = $layout;	1743	$self->{template} = $layout;
1542	}	1744	}
1543		1745
1544	if (exists $self->{markup}) {	1746	if (exists $self->{markup}) {
…		…
1548	}	1750	}
1549		1751
1550	$self	1752	$self
1551	}	1753	}
1552		1754
1553	sub escape($) {
1554	local $_ = $_[0];
1555
1556	s/&/&amp;/g;
1557	s/>/&gt;/g;
1558	s/</&lt;/g;
1559
1560	$_
1561	}
1562
1563	sub update {	1755	sub update {
1564	my ($self) = @_;	1756	my ($self) = @_;
1565		1757
1566	delete $self->{texture};	1758	delete $self->{texture};
1567	$self->SUPER::update;	1759	$self->SUPER::update;
…		…
1578	my ($self, $text) = @_;	1770	my ($self, $text) = @_;
1579		1771
1580	return if $self->{text} eq "T$text";	1772	return if $self->{text} eq "T$text";
1581	$self->{text} = "T$text";	1773	$self->{text} = "T$text";
1582		1774
1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584	$self->{layout}->set_text ($text);	1775	$self->{layout}->set_text ($text);
1585		1776
1586	delete $self->{size_req};	1777	delete $self->{size_req};
1587	$self->realloc;	1778	$self->realloc;
1588	$self->update;	1779	$self->update;
…		…
1594	return if $self->{text} eq "M$markup";	1785	return if $self->{text} eq "M$markup";
1595	$self->{text} = "M$markup";	1786	$self->{text} = "M$markup";
1596		1787
1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1788	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598		1789
1599	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600	$self->{layout}->set_markup ($markup);	1790	$self->{layout}->set_markup ($markup);
1601		1791
1602	delete $self->{size_req};	1792	delete $self->{size_req};
1603	$self->realloc;	1793	$self->realloc;
1604	$self->update;	1794	$self->update;
…		…
1616		1806
1617	my ($w, $h) = $self->{layout}->size;	1807	my ($w, $h) = $self->{layout}->size;
1618		1808
1619	if (exists $self->{template}) {	1809	if (exists $self->{template}) {
1620	$self->{template}->set_font ($self->{font}) if $self->{font};	1810	$self->{template}->set_font ($self->{font}) if $self->{font};
		1811	$self->{template}->set_width ($self->{max_w} || -1);
1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1812	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622		1813
1623	my ($w2, $h2) = $self->{template}->size;	1814	my ($w2, $h2) = $self->{template}->size;
1624		1815
1625	$w = List::Util::max $w, $w2;	1816	$w = List::Util::max $w, $w2;
…		…
1630	};	1821	};
1631		1822
1632	@{ $self->{size_req} }	1823	@{ $self->{size_req} }
1633	}	1824	}
1634		1825
		1826	sub baseline_shift {
		1827	$_[0]{layout}->descent
		1828	}
		1829
1635	sub invoke_size_allocate {	1830	sub invoke_size_allocate {
1636	my ($self, $w, $h) = @_;	1831	my ($self, $w, $h) = @_;
1637		1832
1638	delete $self->{ox};	1833	delete $self->{ox};
1639		1834
…		…
1645		1840
1646	sub set_fontsize {	1841	sub set_fontsize {
1647	my ($self, $fontsize) = @_;	1842	my ($self, $fontsize) = @_;
1648		1843
1649	$self->{fontsize} = $fontsize;	1844	$self->{fontsize} = $fontsize;
		1845	delete $self->{size_req};
1650	delete $self->{texture};	1846	delete $self->{texture};
1651		1847
1652	$self->realloc;	1848	$self->realloc;
1653	}	1849	}
1654		1850
1655	sub reconfigure {	1851	sub reconfigure {
1656	my ($self) = @_;	1852	my ($self) = @_;
1657		1853
1658	delete $self->{size_req};	1854	delete $self->{size_req};
		1855	delete $self->{texture};
1659		1856
1660	$self->SUPER::reconfigure;	1857	$self->SUPER::reconfigure;
1661	}	1858	}
1662		1859
1663	sub _draw {	1860	sub _draw {
1664	my ($self) = @_;	1861	my ($self) = @_;
1665		1862
1666	$self->SUPER::_draw; # draw background, if applicable	1863	$self->SUPER::_draw; # draw background, if applicable
1667		1864
1668	my $tex = $self->{texture} ||= do {	1865	my $size = $self->{texture} ||= do {
1669	$self->{layout}->set_foreground (@{$self->{fg}});	1866	$self->{layout}->set_foreground (@{$self->{fg}});
1670	$self->{layout}->set_font ($self->{font}) if $self->{font};	1867	$self->{layout}->set_font ($self->{font}) if $self->{font};
1671	$self->{layout}->set_width ($self->{w});	1868	$self->{layout}->set_width ($self->{w});
1672	$self->{layout}->set_ellipsise ($self->{ellipsise});	1869	$self->{layout}->set_ellipsise ($self->{ellipsise});
1673	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1870	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1871	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675		1872
1676	new_from_layout CFClient::Texture $self->{layout}	1873	[$self->{layout}->size]
1677	};	1874	};
1678		1875
1679	unless (exists $self->{ox}) {	1876	unless (exists $self->{ox}) {
1680	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1877	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1878	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682	: ($self->{w} - $tex->{w}) * 0.5);	1879	: ($self->{w} - $size->[0]) * 0.5);
1683		1880
1684	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1881	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1882	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686	: ($self->{h} - $tex->{h}) * 0.5);	1883	: ($self->{h} - $size->[1]) * 0.5);
1687	};	1884	};
1688		1885
1689	glEnable GL_TEXTURE_2D;
1690
1691	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1886	my $w = List::Util::min $self->{w} + 4, $size->[0];
1692	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1887	my $h = List::Util::min $self->{h} + 2, $size->[1];
1693		1888
1694	if ($tex->{format} == GL_ALPHA) {	1889	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1696	glColor @{$self->{fg}};
1697	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1698	} else {
1699	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1700	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1701	}
1702
1703	glDisable GL_TEXTURE_2D;
1704	}	1890	}
1705		1891
1706	#############################################################################	1892	#############################################################################
1707		1893
1708	package CFClient::UI::EntryBase;	1894	package CFPlus::UI::EntryBase;
1709		1895
1710	our @ISA = CFClient::UI::Label::;	1896	our @ISA = CFPlus::UI::Label::;
1711		1897
1712	use CFClient::OpenGL;	1898	use CFPlus::OpenGL;
1713		1899
1714	sub new {	1900	sub new {
1715	my $class = shift;	1901	my $class = shift;
1716		1902
1717	$class->SUPER::new (	1903	$class->SUPER::new (
…		…
1721	active_fg => [0, 0, 0],	1907	active_fg => [0, 0, 0],
1722	can_hover => 1,	1908	can_hover => 1,
1723	can_focus => 1,	1909	can_focus => 1,
1724	valign => 0,	1910	valign => 0,
1725	can_events => 1,	1911	can_events => 1,
		1912	ellipsise => 0,
1726	#text => ...	1913	#text => ...
1727	#hidden => "*",	1914	#hidden => "*",
1728	@_	1915	@_
1729	)	1916	)
1730	}	1917	}
…		…
1779		1966
1780	if ($uni == 8) {	1967	if ($uni == 8) {
1781	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1968	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782	} elsif ($uni == 127) {	1969	} elsif ($uni == 127) {
1783	substr $text, $self->{cursor}, 1, "";	1970	substr $text, $self->{cursor}, 1, "";
1784	} elsif ($sym == CFClient::SDLK_LEFT) {	1971	} elsif ($sym == CFPlus::SDLK_LEFT) {
1785	--$self->{cursor} if $self->{cursor};	1972	--$self->{cursor} if $self->{cursor};
1786	} elsif ($sym == CFClient::SDLK_RIGHT) {	1973	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1787	++$self->{cursor} if $self->{cursor} < length $self->{text};	1974	++$self->{cursor} if $self->{cursor} < length $self->{text};
1788	} elsif ($sym == CFClient::SDLK_HOME) {	1975	} elsif ($sym == CFPlus::SDLK_HOME) {
1789	$self->{cursor} = 0;	1976	$self->{cursor} = 0;
1790	} elsif ($sym == CFClient::SDLK_END) {	1977	} elsif ($sym == CFPlus::SDLK_END) {
1791	$self->{cursor} = length $text;	1978	$self->{cursor} = length $text;
		1979	} elsif ($uni == 21) { # ctrl-u
		1980	$text = "";
		1981	$self->{cursor} = 0;
1792	} elsif ($uni == 27) {	1982	} elsif ($uni == 27) {
1793	$self->emit ('escape');	1983	$self->emit ('escape');
1794	} elsif ($uni) {	1984	} elsif ($uni >= 0x20 || $uni == 0x0d) {
1795	substr $text, $self->{cursor}++, 0, chr $uni;	1985	substr $text, $self->{cursor}++, 0, chr $uni;
1796	} else {	1986	} else {
1797	return 0;	1987	return 0;
1798	}	1988	}
1799		1989
1800	$self->_set_text ($text);	1990	$self->_set_text ($text);
1801		1991
1802	$self->realloc;	1992	$self->realloc;
		1993	$self->update;
1803		1994
1804	1	1995	1
1805	}	1996	}
1806		1997
1807	sub invoke_focus_in {	1998	sub invoke_focus_in {
…		…
1819		2010
1820	my $idx = $self->{layout}->xy_to_index ($x, $y);	2011	my $idx = $self->{layout}->xy_to_index ($x, $y);
1821		2012
1822	# byte-index to char-index	2013	# byte-index to char-index
1823	my $text = $self->{text};	2014	my $text = $self->{text};
1824	utf8::encode $text;	2015	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825	$self->{cursor} = length substr $text, 0, $idx;	2016	$self->{cursor} = length $text;
1826		2017
1827	$self->_set_text ($self->{text});	2018	$self->_set_text ($self->{text});
1828	$self->update;	2019	$self->update;
1829		2020
1830	1	2021	1
…		…
1869	utf8::encode $text;	2060	utf8::encode $text;
1870		2061
1871	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2062	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872	}	2063	}
1873		2064
1874	glColor @{$self->{fg}};
1875	glBegin GL_LINES;	2065	glBegin GL_LINES;
1876	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2066	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2067	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878	glEnd;	2068	glEnd;
1879	}	2069	}
1880	}	2070	}
1881		2071
		2072	#############################################################################
		2073
1882	package CFClient::UI::Entry;	2074	package CFPlus::UI::Entry;
1883		2075
1884	our @ISA = CFClient::UI::EntryBase::;	2076	our @ISA = CFPlus::UI::EntryBase::;
1885		2077
1886	use CFClient::OpenGL;	2078	use CFPlus::OpenGL;
1887		2079
1888	sub invoke_key_down {	2080	sub invoke_key_down {
1889	my ($self, $ev) = @_;	2081	my ($self, $ev) = @_;
1890		2082
1891	my $sym = $ev->{sym};	2083	my $sym = $ev->{sym};
1892		2084
1893	if ($sym == 13) {	2085	if ($ev->{uni} == 0x0d || $sym == 13) {
1894	unshift @{$self->{history}},	2086	unshift @{$self->{history}},
1895	my $txt = $self->get_text;	2087	my $txt = $self->get_text;
		2088
1896	$self->{history_pointer} = -1;	2089	$self->{history_pointer} = -1;
1897	$self->{history_saveback} = '';	2090	$self->{history_saveback} = '';
1898	$self->emit (activate => $txt);	2091	$self->emit (activate => $txt);
1899	$self->update;	2092	$self->update;
1900		2093
1901	} elsif ($sym == CFClient::SDLK_UP) {	2094	} elsif ($sym == CFPlus::SDLK_UP) {
1902	if ($self->{history_pointer} < 0) {	2095	if ($self->{history_pointer} < 0) {
1903	$self->{history_saveback} = $self->get_text;	2096	$self->{history_saveback} = $self->get_text;
1904	}	2097	}
1905	if (@{$self->{history} || []} > 0) {	2098	if (@{$self->{history} || []} > 0) {
1906	$self->{history_pointer}++;	2099	$self->{history_pointer}++;
…		…
1908	$self->{history_pointer} = @{$self->{history} || []} - 1;	2101	$self->{history_pointer} = @{$self->{history} || []} - 1;
1909	}	2102	}
1910	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2103	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1911	}	2104	}
1912		2105
1913	} elsif ($sym == CFClient::SDLK_DOWN) {	2106	} elsif ($sym == CFPlus::SDLK_DOWN) {
1914	$self->{history_pointer}--;	2107	$self->{history_pointer}--;
1915	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2108	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1916		2109
1917	if ($self->{history_pointer} >= 0) {	2110	if ($self->{history_pointer} >= 0) {
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2111	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1927	1	2120	1
1928	}	2121	}
1929		2122
1930	#############################################################################	2123	#############################################################################
1931		2124
		2125	package CFPlus::UI::TextEdit;
		2126
		2127	our @ISA = CFPlus::UI::EntryBase::;
		2128
		2129	use CFPlus::OpenGL;
		2130
		2131	sub move_cursor_ver {
		2132	my ($self, $dy) = @_;
		2133
		2134	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2135
		2136	$y += $dy;
		2137
		2138	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2139	$self->{cursor} = $index;
		2140	delete $self->{cur_h};
		2141	$self->update;
		2142	return;
		2143	}
		2144	}
		2145
		2146	sub invoke_key_down {
		2147	my ($self, $ev) = @_;
		2148
		2149	my $sym = $ev->{sym};
		2150
		2151	if ($sym == CFPlus::SDLK_UP) {
		2152	$self->move_cursor_ver (-1);
		2153	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2154	$self->move_cursor_ver (+1);
		2155	} else {
		2156	return $self->SUPER::invoke_key_down ($ev)
		2157	}
		2158
		2159	1
		2160	}
		2161
		2162	#############################################################################
		2163
1932	package CFClient::UI::Button;	2164	package CFPlus::UI::Button;
1933		2165
1934	our @ISA = CFClient::UI::Label::;	2166	our @ISA = CFPlus::UI::Label::;
1935		2167
1936	use CFClient::OpenGL;	2168	use CFPlus::OpenGL;
1937		2169
1938	my @tex =	2170	my @tex =
1939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2171	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1940	qw(b1_button_active.png);	2172	qw(b1_button_active.png);
1941		2173
1942	sub new {	2174	sub new {
1943	my $class = shift;	2175	my $class = shift;
1944		2176
…		…
1981	$self->SUPER::_draw;	2213	$self->SUPER::_draw;
1982	}	2214	}
1983		2215
1984	#############################################################################	2216	#############################################################################
1985		2217
		2218	package CFPlus::UI::CheckBox;
		2219
		2220	our @ISA = CFPlus::UI::DrawBG::;
		2221
		2222	my @tex =
		2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2224	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2225
		2226	use CFPlus::OpenGL;
		2227
		2228	sub new {
		2229	my $class = shift;
		2230
		2231	$class->SUPER::new (
		2232	padding_x => 2,
		2233	padding_y => 2,
		2234	fg => [1, 1, 1],
		2235	active_fg => [1, 1, 0],
		2236	bg => [0, 0, 0, 0.2],
		2237	active_bg => [1, 1, 1, 0.5],
		2238	state => 0,
		2239	can_hover => 1,
		2240	@_
		2241	)
		2242	}
		2243
		2244	sub size_request {
		2245	my ($self) = @_;
		2246
		2247	(6) x 2
		2248	}
		2249
		2250	sub toggle {
		2251	my ($self) = @_;
		2252
		2253	$self->{state} = !$self->{state};
		2254	$self->emit (changed => $self->{state});
		2255	$self->update;
		2256	}
		2257
		2258	sub invoke_button_down {
		2259	my ($self, $ev, $x, $y) = @_;
		2260
		2261	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2262	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2263	$self->toggle;
		2264	} else {
		2265	return 0
		2266	}
		2267
		2268	1
		2269	}
		2270
		2271	sub _draw {
		2272	my ($self) = @_;
		2273
		2274	$self->SUPER::_draw;
		2275
		2276	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2277
		2278	my ($w, $h) = @$self{qw(w h)};
		2279
		2280	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2281
		2282	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2283
		2284	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2285
		2286	glEnable GL_TEXTURE_2D;
		2287	$tex->draw_quad_alpha (0, 0, $s, $s);
		2288	glDisable GL_TEXTURE_2D;
		2289	}
		2290
		2291	#############################################################################
		2292
		2293	package CFPlus::UI::Image;
		2294
		2295	our @ISA = CFPlus::UI::Base::;
		2296
		2297	use CFPlus::OpenGL;
		2298
		2299	our %texture_cache;
		2300
		2301	sub new {
		2302	my $class = shift;
		2303
		2304	my $self = $class->SUPER::new (
		2305	can_events => 0,
		2306	@_,
		2307	);
		2308
		2309	$self->{path} || $self->{tex}
		2310	or Carp::croak "'path' or 'tex' attributes required";
		2311
		2312	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2313	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2314
		2315	Scalar::Util::weaken $texture_cache{$self->{path}};
		2316
		2317	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2318
		2319	$self
		2320	}
		2321
		2322	sub STORABLE_freeze {
		2323	my ($self, $cloning) = @_;
		2324
		2325	$self->{path}
		2326	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2327
		2328	$self->{path}
		2329	}
		2330
		2331	sub STORABLE_attach {
		2332	my ($self, $cloning, $path) = @_;
		2333
		2334	$self->new (path => $path)
		2335	}
		2336
		2337	sub size_request {
		2338	my ($self) = @_;
		2339
		2340	($self->{tex}{w}, $self->{tex}{h})
		2341	}
		2342
		2343	sub _draw {
		2344	my ($self) = @_;
		2345
		2346	my $tex = $self->{tex};
		2347
		2348	my ($w, $h) = ($self->{w}, $self->{h});
		2349
		2350	if ($self->{rot90}) {
		2351	glRotate 90, 0, 0, 1;
		2352	glTranslate 0, -$self->{w}, 0;
		2353
		2354	($w, $h) = ($h, $w);
		2355	}
		2356
		2357	glEnable GL_TEXTURE_2D;
		2358	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2359
		2360	$tex->draw_quad (0, 0, $w, $h);
		2361
		2362	glDisable GL_TEXTURE_2D;
		2363	}
		2364
		2365	#############################################################################
		2366
1986	package CFClient::UI::ImageButton;	2367	package CFPlus::UI::ImageButton;
1987		2368
1988	our @ISA = CFClient::UI::Image::;	2369	our @ISA = CFPlus::UI::Image::;
1989		2370
1990	use CFClient::OpenGL;	2371	use CFPlus::OpenGL;
1991		2372
1992	my %textures;	2373	my %textures;
1993		2374
1994	sub new {	2375	sub new {
1995	my $class = shift;	2376	my $class = shift;
…		…
2017	1	2398	1
2018	}	2399	}
2019		2400
2020	#############################################################################	2401	#############################################################################
2021		2402
2022	package CFClient::UI::CheckBox;
2023
2024	our @ISA = CFClient::UI::DrawBG::;
2025
2026	my @tex =
2027	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2028	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2029
2030	use CFClient::OpenGL;
2031
2032	sub new {
2033	my $class = shift;
2034
2035	$class->SUPER::new (
2036	padding_x => 2,
2037	padding_y => 2,
2038	fg => [1, 1, 1],
2039	active_fg => [1, 1, 0],
2040	bg => [0, 0, 0, 0.2],
2041	active_bg => [1, 1, 1, 0.5],
2042	state => 0,
2043	can_hover => 1,
2044	@_
2045	)
2046	}
2047
2048	sub size_request {
2049	my ($self) = @_;
2050
2051	(6) x 2
2052	}
2053
2054	sub invoke_button_down {
2055	my ($self, $ev, $x, $y) = @_;
2056
2057	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2058	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2059	$self->{state} = !$self->{state};
2060	$self->emit (changed => $self->{state});
2061	} else {
2062	return 0
2063	}
2064
2065	1
2066	}
2067
2068	sub _draw {
2069	my ($self) = @_;
2070
2071	$self->SUPER::_draw;
2072
2073	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2074
2075	my ($w, $h) = @$self{qw(w h)};
2076
2077	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2078
2079	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2080
2081	my $tex = $self->{state} ? $tex[1] : $tex[0];
2082
2083	glEnable GL_TEXTURE_2D;
2084	$tex->draw_quad_alpha (0, 0, $s, $s);
2085	glDisable GL_TEXTURE_2D;
2086	}
2087
2088	#############################################################################
2089
2090	package CFClient::UI::Image;	2403	package CFPlus::UI::VGauge;
2091		2404
2092	our @ISA = CFClient::UI::Base::;	2405	our @ISA = CFPlus::UI::Base::;
2093
2094	use CFClient::OpenGL;
2095	use Carp qw/confess/;
2096
2097	our %loaded_images;
2098
2099	sub new {
2100	my $class = shift;
2101
2102	my $self = $class->SUPER::new (can_events => 0, @_);
2103
2104	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2105
2106	$loaded_images{$self->{image}} ||=
2107	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2108
2109	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2110
2111	Scalar::Util::weaken $loaded_images{$self->{image}};
2112
2113	$self->{aspect} = $tex->{w} / $tex->{h};
2114
2115	$self
2116	}
2117
2118	sub size_request {
2119	my ($self) = @_;
2120
2121	($self->{tex}->{w}, $self->{tex}->{h})
2122	}
2123
2124	sub _draw {
2125	my ($self) = @_;
2126
2127	my $tex = $self->{tex};
2128
2129	my ($w, $h) = ($self->{w}, $self->{h});
2130
2131	if ($self->{rot90}) {
2132	glRotate 90, 0, 0, 1;
2133	glTranslate 0, -$self->{w}, 0;
2134
2135	($w, $h) = ($h, $w);
2136	}
2137
2138	glEnable GL_TEXTURE_2D;
2139	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2140
2141	$tex->draw_quad_alpha (0, 0, $w, $h);
2142
2143	glDisable GL_TEXTURE_2D;
2144	}
2145
2146	#############################################################################
2147
2148	package CFClient::UI::VGauge;
2149
2150	our @ISA = CFClient::UI::Base::;
2151		2406
2152	use List::Util qw(min max);	2407	use List::Util qw(min max);
2153		2408
2154	use CFClient::OpenGL;	2409	use CFPlus::OpenGL;
2155		2410
2156	my %tex = (	2411	my %tex = (
2157	food => [	2412	food => [
2158	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2413	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2159	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2414	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2160	],	2415	],
2161	grace => [	2416	grace => [
2162	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2417	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2163	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2418	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2164	],	2419	],
2165	hp => [	2420	hp => [
2166	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2421	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2167	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2422	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2168	],	2423	],
2169	mana => [	2424	mana => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2425	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2426	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2172	],	2427	],
2173	);	2428	);
2174		2429
2175	# eg. VGauge->new (gauge => 'food'), default gauge: food	2430	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2235	my $ycut1 = max 0, min 1, $ycut;	2490	my $ycut1 = max 0, min 1, $ycut;
2236	my $ycut2 = max 0, min 1, $ycut - 1;	2491	my $ycut2 = max 0, min 1, $ycut - 1;
2237		2492
2238	my $h1 = $self->{h} * (1 - $ycut1);	2493	my $h1 = $self->{h} * (1 - $ycut1);
2239	my $h2 = $self->{h} * (1 - $ycut2);	2494	my $h2 = $self->{h} * (1 - $ycut2);
		2495	my $h3 = $self->{h};
		2496
		2497	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2240		2498
2241	glEnable GL_BLEND;	2499	glEnable GL_BLEND;
2242	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2500	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2501	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244	glEnable GL_TEXTURE_2D;	2502	glEnable GL_TEXTURE_2D;
…		…
2263		2521
2264	if ($t3) {	2522	if ($t3) {
2265	glBindTexture GL_TEXTURE_2D, $t3->{name};	2523	glBindTexture GL_TEXTURE_2D, $t3->{name};
2266	glBegin GL_QUADS;	2524	glBegin GL_QUADS;
2267	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2525	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2526	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2527	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2528	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271	glEnd;	2529	glEnd;
2272	}	2530	}
2273		2531
2274	glDisable GL_BLEND;	2532	glDisable GL_BLEND;
2275	glDisable GL_TEXTURE_2D;	2533	glDisable GL_TEXTURE_2D;
2276	}	2534	}
2277		2535
2278	#############################################################################	2536	#############################################################################
2279		2537
2280	package CFClient::UI::Gauge;	2538	package CFPlus::UI::Gauge;
2281		2539
2282	our @ISA = CFClient::UI::VBox::;	2540	our @ISA = CFPlus::UI::VBox::;
2283		2541
2284	sub new {	2542	sub new {
2285	my ($class, %arg) = @_;	2543	my ($class, %arg) = @_;
2286		2544
2287	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
…		…
2289	can_hover => 1,	2547	can_hover => 1,
2290	can_events => 1,	2548	can_events => 1,
2291	%arg,	2549	%arg,
2292	);	2550	);
2293		2551
2294	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2552	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2295	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2553	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2296	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2554	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2297		2555
2298	$self	2556	$self
2299	}	2557	}
2300		2558
2301	sub set_fontsize {	2559	sub set_fontsize {
…		…
2322	$self->{value}->set_text ($val);	2580	$self->{value}->set_text ($val);
2323	}	2581	}
2324		2582
2325	#############################################################################	2583	#############################################################################
2326		2584
2327	package CFClient::UI::Slider;	2585	package CFPlus::UI::Slider;
2328		2586
2329	use strict;	2587	use strict;
2330		2588
2331	use CFClient::OpenGL;	2589	use CFPlus::OpenGL;
2332		2590
2333	our @ISA = CFClient::UI::DrawBG::;	2591	our @ISA = CFPlus::UI::DrawBG::;
2334		2592
2335	my @tex =	2593	my @tex =
2336	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2594	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2337	qw(s1_slider.png s1_slider_bg.png);	2595	qw(s1_slider.png s1_slider_bg.png);
2338		2596
2339	sub new {	2597	sub new {
2340	my $class = shift;	2598	my $class = shift;
2341		2599
…		…
2409		2667
2410	$self->SUPER::invoke_button_down ($ev, $x, $y);	2668	$self->SUPER::invoke_button_down ($ev, $x, $y);
2411		2669
2412	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2670	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413		2671
2414	$self->mouse_motion ($ev, $x, $y)	2672	$self->invoke_mouse_motion ($ev, $x, $y)
2415	}	2673	}
2416		2674
2417	sub invoke_mouse_motion {	2675	sub invoke_mouse_motion {
2418	my ($self, $ev, $x, $y) = @_;	2676	my ($self, $ev, $x, $y) = @_;
2419		2677
…		…
2428	} else {	2686	} else {
2429	return 0;	2687	return 0;
2430	}	2688	}
2431		2689
2432	1	2690	1
		2691	}
		2692
		2693	sub invoke_mouse_wheel {
		2694	my ($self, $ev) = @_;
		2695
		2696	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2697
		2698	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2699
		2700	! ! $delta
2433	}	2701	}
2434		2702
2435	sub update {	2703	sub update {
2436	my ($self) = @_;	2704	my ($self) = @_;
2437		2705
…		…
2486	glDisable GL_TEXTURE_2D;	2754	glDisable GL_TEXTURE_2D;
2487	}	2755	}
2488		2756
2489	#############################################################################	2757	#############################################################################
2490		2758
2491	package CFClient::UI::ValSlider;	2759	package CFPlus::UI::ValSlider;
2492		2760
2493	our @ISA = CFClient::UI::HBox::;	2761	our @ISA = CFPlus::UI::HBox::;
2494		2762
2495	sub new {	2763	sub new {
2496	my ($class, %arg) = @_;	2764	my ($class, %arg) = @_;
2497		2765
2498	my $range = delete $arg{range};	2766	my $range = delete $arg{range};
2499		2767
2500	my $self = $class->SUPER::new (	2768	my $self = $class->SUPER::new (
2501	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2769	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2502	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2770	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2503	to_value => sub { shift },	2771	to_value => sub { shift },
2504	from_value => sub { shift },	2772	from_value => sub { shift },
2505	%arg,	2773	%arg,
2506	);	2774	);
2507		2775
…		…
2527	sub set_range { shift->{slider}->set_range (@_) }	2795	sub set_range { shift->{slider}->set_range (@_) }
2528	sub set_value { shift->{slider}->set_value (@_) }	2796	sub set_value { shift->{slider}->set_value (@_) }
2529		2797
2530	#############################################################################	2798	#############################################################################
2531		2799
2532	package CFClient::UI::TextScroller;	2800	package CFPlus::UI::TextScroller;
2533		2801
2534	our @ISA = CFClient::UI::HBox::;	2802	our @ISA = CFPlus::UI::HBox::;
2535		2803
2536	use CFClient::OpenGL;	2804	use CFPlus::OpenGL;
2537		2805
2538	sub new {	2806	sub new {
2539	my $class = shift;	2807	my $class = shift;
2540		2808
2541	my $self = $class->SUPER::new (	2809	my $self = $class->SUPER::new (
2542	fontsize => 1,	2810	fontsize => 1,
2543	can_events => 0,	2811	can_events => 1,
2544	indent => 0,	2812	indent => 0,
2545	#font => default_font	2813	#font => default_font
2546	@_,	2814	@_,
2547		2815
2548	layout => (new CFClient::Layout 1),	2816	layout => (new CFPlus::Layout),
2549	par => [],	2817	par => [],
2550	height => 0,	2818	height => 0,
2551	children => [	2819	children => [
2552	(new CFClient::UI::Empty expand => 1),	2820	(new CFPlus::UI::Empty expand => 1),
2553	(new CFClient::UI::Slider vertical => 1),	2821	(new CFPlus::UI::Slider vertical => 1),
2554	],	2822	],
2555	);	2823	);
2556		2824
2557	$self->{children}[1]->connect (changed => sub { $self->update });	2825	$self->{children}[1]->connect (changed => sub { $self->update });
2558		2826
…		…
2564		2832
2565	$self->{fontsize} = $fontsize;	2833	$self->{fontsize} = $fontsize;
2566	$self->reflow;	2834	$self->reflow;
2567	}	2835	}
2568		2836
		2837	sub size_request {
		2838	my ($self) = @_;
		2839
		2840	my ($empty, $slider) = @{ $self->{children} };
		2841
		2842	local $self->{children} = [$empty, $slider];
		2843	$self->SUPER::size_request
		2844	}
		2845
2569	sub invoke_size_allocate {	2846	sub invoke_size_allocate {
2570	my ($self, $w, $h) = @_;	2847	my ($self, $w, $h) = @_;
2571		2848
		2849	my ($empty, $slider, @other) = @{ $self->{children} };
		2850	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		2851
2572	$self->{layout}->set_font ($self->{font}) if $self->{font};	2852	$self->{layout}->set_font ($self->{font}) if $self->{font};
2573	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2853	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574	$self->{layout}->set_width ($self->{children}[0]{w});	2854	$self->{layout}->set_width ($empty->{w});
2575	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2855	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576		2856
2577	$self->reflow;	2857	$self->reflow;
2578		2858
		2859	local $self->{children} = [$empty, $slider];
2579	$self->SUPER::invoke_size_allocate ($w, $h)	2860	$self->SUPER::invoke_size_allocate ($w, $h)
2580	}	2861	}
2581		2862
2582	sub text_size {	2863	sub invoke_mouse_wheel {
2583	my ($self, $text, $indent) = @_;	2864	my ($self, $ev) = @_;
		2865
		2866	return 0 unless $ev->{dy}; # only vertical movements
		2867
		2868	$self->{children}[1]->emit (mouse_wheel => $ev);
		2869
		2870	1
		2871	}
		2872
		2873	sub get_layout {
		2874	my ($self, $para) = @_;
2584		2875
2585	my $layout = $self->{layout};	2876	my $layout = $self->{layout};
2586		2877
		2878	$layout->set_font ($self->{font}) if $self->{font};
		2879	$layout->set_foreground (@{$para->{fg}});
2587	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2880	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588	$layout->set_width ($self->{children}[0]{w} - $indent);	2881	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2882	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590	$layout->set_markup ($text);	2883	$layout->set_markup ($para->{markup});
		2884
		2885	$layout->set_shapes (
		2886	map
		2887	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2888	@{$para->{widget}}
2591		2889	);
		2890
2592	$layout->size	2891	$layout
2593	}	2892	}
2594		2893
2595	sub reflow {	2894	sub reflow {
2596	my ($self) = @_;	2895	my ($self) = @_;
2597		2896
…		…
2604		2903
2605	# todo: base offset on lines or so, not on pixels	2904	# todo: base offset on lines or so, not on pixels
2606	$self->{children}[1]->set_value ($offset);	2905	$self->{children}[1]->set_value ($offset);
2607	}	2906	}
2608		2907
		2908	sub current_paragraph {
		2909	my ($self) = @_;
		2910
		2911	$self->{top_paragraph} - 1
		2912	}
		2913
		2914	sub scroll_to {
		2915	my ($self, $para) = @_;
		2916
		2917	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2918
		2919	$self->{scroll_to} = $para;
		2920	$self->update;
		2921	}
		2922
2609	sub clear {	2923	sub clear {
2610	my ($self) = @_;	2924	my ($self) = @_;
		2925
		2926	my (undef, undef, @other) = @{ $self->{children} };
		2927	$self->remove ($_) for @other;
2611		2928
2612	$self->{par} = [];	2929	$self->{par} = [];
2613	$self->{height} = 0;	2930	$self->{height} = 0;
2614	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2931	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615	}	2932	}
2616		2933
2617	sub add_paragraph {	2934	sub add_paragraph {
2618	my ($self, $color, $text, $indent) = @_;	2935	my $self = shift;
2619		2936
2620	for my $line (split /\n/, $text) {	2937	for my $para (@_) {
2621	my ($w, $h) = $self->text_size ($line);	2938	$para = {
		2939	fg => [1, 1, 1, 1],
		2940	indent => 0,
		2941	markup => "",
		2942	widget => [],
		2943	ref $para ? %$para : (markup => $para),
		2944	w => 1e10,
		2945	wrapped => 1,
		2946	};
		2947
		2948	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2949	push @{$self->{par}}, $para;
		2950	}
		2951
		2952	$self->{need_reflow}++;
		2953	$self->update;
		2954	}
		2955
		2956	sub scroll_to_bottom {
		2957	my ($self) = @_;
		2958
		2959	$self->{scroll_to} = $#{$self->{par}};
		2960	$self->update;
		2961	}
		2962
		2963	sub force_uptodate {
		2964	my ($self) = @_;
		2965
		2966	if (delete $self->{need_reflow}) {
		2967	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2968
		2969	my $height = 0;
		2970
		2971	for my $para (@{$self->{par}}) {
		2972	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2973	my $layout = $self->get_layout ($para);
		2974	my ($w, $h) = $layout->size;
		2975
		2976	$para->{w} = $w + $para->{indent};
		2977	$para->{h} = $h;
		2978	$para->{wrapped} = $layout->has_wrapped;
		2979	}
		2980
		2981	$para->{y} = $height;
		2982	$height += $para->{h};
		2983	}
		2984
2622	$self->{height} += $h;	2985	$self->{height} = $height;
2623	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2986	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2624	}
2625		2987
2626	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2988	delete $self->{texture};
		2989	}
		2990
		2991	if (my $paridx = delete $self->{scroll_to}) {
		2992	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2993	}
2627	}	2994	}
2628		2995
2629	sub update {	2996	sub update {
2630	my ($self) = @_;	2997	my ($self) = @_;
2631		2998
…		…
2634	return unless $self->{h} > 0;	3001	return unless $self->{h} > 0;
2635		3002
2636	delete $self->{texture};	3003	delete $self->{texture};
2637		3004
2638	$ROOT->on_post_alloc ($self => sub {	3005	$ROOT->on_post_alloc ($self => sub {
		3006	$self->force_uptodate;
		3007
2639	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3008	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640		3009
2641	if (delete $self->{need_reflow}) {
2642	my $height = 0;
2643
2644	my $layout = $self->{layout};
2645
2646	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2648	for (@{$self->{par}}) {
2649	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2650	$layout->set_width ($W - $_->[3]);
2651	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2652	$layout->set_markup ($_->[4]);
2653	my ($w, $h) = $layout->size;
2654	$_->[0] = $w + $_->[3];
2655	$_->[1] = $h;
2656	}
2657
2658	$height += $_->[1];
2659	}
2660
2661	$self->{height} = $height;
2662
2663	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2664
2665	delete $self->{texture};
2666	}
2667
2668	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3010	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2669	glClearColor 0, 0, 0, 0;	3011	glClearColor 0, 0, 0, 0;
2670	glClear GL_COLOR_BUFFER_BIT;	3012	glClear GL_COLOR_BUFFER_BIT;
2671		3013
		3014	package CFPlus::UI::Base;
		3015	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3016	(0, 0, $self->{w}, $self->{h});
		3017
		3018	my $top = int $self->{children}[1]{range}[0];
		3019
		3020	my $paridx = 0;
		3021	my $top_paragraph;
2672	my $top = int $self->{children}[1]{range}[0];	3022	my $top = int $self->{children}[1]{range}[0];
2673		3023
2674	my $y0 = $top;	3024	my $y0 = $top;
2675	my $y1 = $top + $H;	3025	my $y1 = $top + $H;
2676		3026
2677	my $y = 0;
2678
2679	my $layout = $self->{layout};
2680
2681	$layout->set_font ($self->{font}) if $self->{font};
2682
2683	glEnable GL_BLEND;
2684	#TODO# not correct in windows where rgba is forced off
2685	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2686
2687	for my $par (@{$self->{par}}) {	3027	for my $para (@{$self->{par}}) {
2688	my $h = $par->[1];	3028	my $h = $para->{h};
		3029	my $y = $para->{y};
2689		3030
2690	if ($y0 < $y + $h && $y < $y1) {	3031	if ($y0 < $y + $h && $y < $y1) {
2691	$layout->set_foreground (@{ $par->[2] });	3032	my $layout = $self->get_layout ($para);
2692	$layout->set_width ($W - $par->[3]);
2693	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2694	$layout->set_markup ($par->[4]);
2695		3033
2696	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3034	$layout->render ($para->{indent}, $y - $y0);
2697		3035
2698	glRasterPos $par->[3], $y - $y0;	3036	if (my @w = @{ $para->{widget} }) {
2699	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3037	my @s = $layout->get_shapes;
		3038
		3039	for (@w) {
		3040	my ($dx, $dy) = splice @s, 0, 2, ();
		3041
		3042	$_->{x} = $dx + $para->{indent};
		3043	$_->{y} = $dy + $y - $y0;
		3044
		3045	$_->draw;
		3046	}
		3047	}
2700	}	3048	}
2701		3049
2702	$y += $h;	3050	$paridx++;
		3051	$top_paragraph ||= $paridx if $y >= $top;
2703	}	3052	}
2704		3053
2705	glDisable GL_BLEND;	3054	$self->{top_paragraph} = $top_paragraph;
2706	};	3055	};
2707	});	3056	});
		3057	}
		3058
		3059	sub reconfigure {
		3060	my ($self) = @_;
		3061
		3062	$self->SUPER::reconfigure;
		3063
		3064	$_->{w} = 1e10 for @{ $self->{par} };
		3065	$self->reflow;
2708	}	3066	}
2709		3067
2710	sub _draw {	3068	sub _draw {
2711	my ($self) = @_;	3069	my ($self) = @_;
2712		3070
…		…
2715	glColor 0, 0, 0, 1;	3073	glColor 0, 0, 0, 1;
2716	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3074	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717	glDisable GL_TEXTURE_2D;	3075	glDisable GL_TEXTURE_2D;
2718		3076
2719	$self->{children}[1]->draw;	3077	$self->{children}[1]->draw;
2720
2721	}	3078	}
2722		3079
2723	#############################################################################	3080	#############################################################################
2724		3081
2725	package CFClient::UI::Animator;	3082	package CFPlus::UI::Animator;
2726		3083
2727	use CFClient::OpenGL;	3084	use CFPlus::OpenGL;
2728		3085
2729	our @ISA = CFClient::UI::Bin::;	3086	our @ISA = CFPlus::UI::Bin::;
2730		3087
2731	sub moveto {	3088	sub moveto {
2732	my ($self, $x, $y) = @_;	3089	my ($self, $x, $y) = @_;
2733		3090
2734	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3091	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2762	glPopMatrix;	3119	glPopMatrix;
2763	}	3120	}
2764		3121
2765	#############################################################################	3122	#############################################################################
2766		3123
2767	package CFClient::UI::Flopper;	3124	package CFPlus::UI::Flopper;
2768		3125
2769	our @ISA = CFClient::UI::Button::;	3126	our @ISA = CFPlus::UI::Button::;
2770		3127
2771	sub new {	3128	sub new {
2772	my $class = shift;	3129	my $class = shift;
2773		3130
2774	my $self = $class->SUPER::new (	3131	my $self = $class->SUPER::new (
…		…
2786	$self->{other}->toggle_visibility;	3143	$self->{other}->toggle_visibility;
2787	}	3144	}
2788		3145
2789	#############################################################################	3146	#############################################################################
2790		3147
2791	package CFClient::UI::Tooltip;	3148	package CFPlus::UI::Tooltip;
2792		3149
2793	our @ISA = CFClient::UI::Bin::;	3150	our @ISA = CFPlus::UI::Bin::;
2794		3151
2795	use CFClient::OpenGL;	3152	use CFPlus::OpenGL;
2796		3153
2797	sub new {	3154	sub new {
2798	my $class = shift;	3155	my $class = shift;
2799		3156
2800	$class->SUPER::new (	3157	$class->SUPER::new (
…		…
2803	)	3160	)
2804	}	3161	}
2805		3162
2806	sub set_tooltip_from {	3163	sub set_tooltip_from {
2807	my ($self, $widget) = @_;	3164	my ($self, $widget) = @_;
		3165
		3166	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3167	if $widget->{tooltip} =~ /^#(.*)$/;
2808		3168
2809	my $tooltip = $widget->{tooltip};	3169	my $tooltip = $widget->{tooltip};
2810		3170
2811	if ($ENV{CFPLUS_DEBUG} & 2) {	3171	if ($ENV{CFPLUS_DEBUG} & 2) {
2812	$tooltip .= "\n\n" . (ref $widget) . "\n"	3172	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2816	}	3176	}
2817		3177
2818	$tooltip =~ s/^\n+//;	3178	$tooltip =~ s/^\n+//;
2819	$tooltip =~ s/\n+$//;	3179	$tooltip =~ s/\n+$//;
2820		3180
2821	$self->add (new CFClient::UI::Label	3181	$self->add (new CFPlus::UI::Label
2822	markup => $tooltip,	3182	markup => $tooltip,
2823	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3183	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2824	fontsize => 0.8,	3184	fontsize => 0.8,
2825	fg => [0, 0, 0, 1],	3185	style => 1, # FLAG_INVERSE
2826	ellipsise => 0,	3186	ellipsise => 0,
2827	font => ($widget->{tooltip_font} || $::FONT_PROP),	3187	font => ($widget->{tooltip_font} || $::FONT_PROP),
2828	);	3188	);
2829	}	3189	}
2830		3190
…		…
2849		3209
2850	$self->{root}->on_post_alloc ("move_$self" => sub {	3210	$self->{root}->on_post_alloc ("move_$self" => sub {
2851	my $widget = $self->{owner}	3211	my $widget = $self->{owner}
2852	or return;	3212	or return;
2853		3213
		3214	if ($widget->{visible}) {
2854	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3215	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2855		3216
2856	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3217	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2857	if $x + $self->{w} > $self->{root}{w};	3218	if $x + $self->{w} > $self->{root}{w};
2858		3219
2859	$self->move_abs ($x, $y);	3220	$self->move_abs ($x, $y);
		3221	} else {
		3222	$self->hide;
		3223	}
2860	});	3224	});
2861	}	3225	}
2862		3226
2863	sub _draw {	3227	sub _draw {
2864	my ($self) = @_;	3228	my ($self) = @_;
…		…
2888	$self->SUPER::_draw;	3252	$self->SUPER::_draw;
2889	}	3253	}
2890		3254
2891	#############################################################################	3255	#############################################################################
2892		3256
2893	package CFClient::UI::Face;	3257	package CFPlus::UI::Face;
2894		3258
2895	our @ISA = CFClient::UI::Base::;	3259	our @ISA = CFPlus::UI::DrawBG::;
2896		3260
2897	use CFClient::OpenGL;	3261	use CFPlus::OpenGL;
2898		3262
2899	sub new {	3263	sub new {
2900	my $class = shift;	3264	my $class = shift;
2901		3265
2902	my $self = $class->SUPER::new (	3266	my $self = $class->SUPER::new (
…		…
2937	sub _draw {	3301	sub _draw {
2938	my ($self) = @_;	3302	my ($self) = @_;
2939		3303
2940	return unless $::CONN;	3304	return unless $::CONN;
2941		3305
		3306	$self->SUPER::_draw;
		3307
2942	my $face;	3308	my $face;
2943		3309
2944	if ($self->{frame}) {	3310	if ($self->{frame}) {
2945	my $anim = $::CONN->{anim}[$self->{anim}];	3311	my $anim = $::CONN->{anim}[$self->{anim}];
2946		3312
…		…
2968	$self->SUPER::destroy;	3334	$self->SUPER::destroy;
2969	}	3335	}
2970		3336
2971	#############################################################################	3337	#############################################################################
2972		3338
2973	package CFClient::UI::Buttonbar;	3339	package CFPlus::UI::Buttonbar;
2974		3340
2975	our @ISA = CFClient::UI::HBox::;	3341	our @ISA = CFPlus::UI::HBox::;
2976		3342
2977	# TODO: should actualyl wrap buttons and other goodies.	3343	# TODO: should actually wrap buttons and other goodies.
2978		3344
2979	#############################################################################	3345	#############################################################################
2980		3346
2981	package CFClient::UI::Menu;	3347	package CFPlus::UI::Menu;
2982		3348
2983	our @ISA = CFClient::UI::FancyFrame::;	3349	our @ISA = CFPlus::UI::Toplevel::;
2984		3350
2985	use CFClient::OpenGL;	3351	use CFPlus::OpenGL;
2986		3352
2987	sub new {	3353	sub new {
2988	my $class = shift;	3354	my $class = shift;
2989		3355
2990	my $self = $class->SUPER::new (	3356	my $self = $class->SUPER::new (
2991	items => [],	3357	items => [],
2992	z => 100,	3358	z => 100,
2993	@_,	3359	@_,
2994	);	3360	);
2995		3361
2996	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3362	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2997		3363
2998	for my $item (@{ $self->{items} }) {	3364	for my $item (@{ $self->{items} }) {
2999	my ($widget, $cb, $tooltip) = @$item;	3365	my ($widget, $cb, $tooltip) = @$item;
3000		3366
3001	# handle various types of items, only text for now	3367	# handle various types of items, only text for now
3002	if (!ref $widget) {	3368	if (!ref $widget) {
		3369	if ($widget =~ /\t/) {
		3370	my ($left, $right) = split /\t/, $widget, 2;
		3371
3003	$widget = new CFClient::UI::Label	3372	$widget = new CFPlus::UI::HBox
3004	can_hover => 1,	3373	can_hover => 1,
3005	can_events => 1,	3374	can_events => 1,
		3375	tooltip => $tooltip,
		3376	children => [
		3377	(new CFPlus::UI::Label markup => $left, expand => 1),
		3378	(new CFPlus::UI::Label markup => $right, align => +1),
		3379	],
		3380	;
		3381
		3382	} else {
		3383	$widget = new CFPlus::UI::Label
		3384	can_hover => 1,
		3385	can_events => 1,
3006	markup => $widget,	3386	markup => $widget,
3007	tooltip => $tooltip	3387	tooltip => $tooltip;
		3388	}
3008	}	3389	}
3009		3390
3010	$self->{item}{$widget} = $item;	3391	$self->{item}{$widget} = $item;
3011		3392
3012	$self->{vbox}->add ($widget);	3393	$self->{vbox}->add ($widget);
…		…
3055	1	3436	1
3056	}	3437	}
3057		3438
3058	#############################################################################	3439	#############################################################################
3059		3440
3060	package CFClient::UI::Multiplexer;	3441	package CFPlus::UI::Multiplexer;
3061		3442
3062	our @ISA = CFClient::UI::Container::;	3443	our @ISA = CFPlus::UI::Container::;
3063		3444
3064	sub new {	3445	sub new {
3065	my $class = shift;	3446	my $class = shift;
3066		3447
3067	my $self = $class->SUPER::new (	3448	my $self = $class->SUPER::new (
…		…
3081		3462
3082	$self->{current} = $self->{children}[0]	3463	$self->{current} = $self->{children}[0]
3083	if @{ $self->{children} };	3464	if @{ $self->{children} };
3084	}	3465	}
3085		3466
		3467	sub get_current_page {
		3468	my ($self) = @_;
		3469
		3470	$self->{current}
		3471	}
		3472
3086	sub set_current_page {	3473	sub set_current_page {
3087	my ($self, $page_or_widget) = @_;	3474	my ($self, $page_or_widget) = @_;
3088		3475
3089	my $widget = ref $page_or_widget	3476	my $widget = ref $page_or_widget
3090	? $page_or_widget	3477	? $page_or_widget
…		…
3122	$self->{current}->draw;	3509	$self->{current}->draw;
3123	}	3510	}
3124		3511
3125	#############################################################################	3512	#############################################################################
3126		3513
3127	package CFClient::UI::Notebook;	3514	package CFPlus::UI::Notebook;
3128		3515
3129	our @ISA = CFClient::UI::VBox::;	3516	our @ISA = CFPlus::UI::VBox::;
3130		3517
3131	sub new {	3518	sub new {
3132	my $class = shift;	3519	my $class = shift;
3133		3520
3134	my $self = $class->SUPER::new (	3521	my $self = $class->SUPER::new (
3135	buttonbar => (new CFClient::UI::Buttonbar),	3522	buttonbar => (new CFPlus::UI::Buttonbar),
3136	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3523	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3137	# filter => # will be put between multiplexer and $self	3524	# filter => # will be put between multiplexer and $self
3138	@_,	3525	@_,
3139	);	3526	);
3140		3527
3141	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3528	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3147	sub add {	3534	sub add {
3148	my ($self, $title, $widget, $tooltip) = @_;	3535	my ($self, $title, $widget, $tooltip) = @_;
3149		3536
3150	Scalar::Util::weaken $self;	3537	Scalar::Util::weaken $self;
3151		3538
3152	$self->{buttonbar}->add (new CFClient::UI::Button	3539	$self->{buttonbar}->add (new CFPlus::UI::Button
3153	markup => $title,	3540	markup => $title,
3154	tooltip => $tooltip,	3541	tooltip => $tooltip,
3155	on_activate => sub { $self->set_current_page ($widget) },	3542	on_activate => sub { $self->set_current_page ($widget) },
3156	);	3543	);
3157		3544
3158	$self->{multiplexer}->add ($widget);	3545	$self->{multiplexer}->add ($widget);
3159	}	3546	}
3160		3547
		3548	sub get_current_page {
		3549	my ($self) = @_;
		3550
		3551	$self->{multiplexer}->get_current_page
		3552	}
		3553
3161	sub set_current_page {	3554	sub set_current_page {
3162	my ($self, $page) = @_;	3555	my ($self, $page) = @_;
3163		3556
3164	$self->{multiplexer}->set_current_page ($page);	3557	$self->{multiplexer}->set_current_page ($page);
3165	$self->emit (page_changed => $self->{multiplexer}{current});	3558	$self->emit (page_changed => $self->{multiplexer}{current});
3166	}	3559	}
3167		3560
3168	#############################################################################	3561	#############################################################################
3169		3562
3170	package CFClient::UI::Combobox;	3563	package CFPlus::UI::Selector;
3171		3564
3172	use utf8;	3565	use utf8;
3173		3566
3174	our @ISA = CFClient::UI::Button::;	3567	our @ISA = CFPlus::UI::Button::;
3175		3568
3176	sub new {	3569	sub new {
3177	my $class = shift;	3570	my $class = shift;
3178		3571
3179	my $self = $class->SUPER::new (	3572	my $self = $class->SUPER::new (
…		…
3196	my ($value, $title, $tooltip) = @$_;	3589	my ($value, $title, $tooltip) = @$_;
3197		3590
3198	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3591	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199	}	3592	}
3200		3593
3201	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3594	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202	}	3595	}
3203		3596
3204	sub _set_value {	3597	sub _set_value {
3205	my ($self, $value) = @_;	3598	my ($self, $value) = @_;
3206		3599
…		…
3221	$self->emit (changed => $value);	3614	$self->emit (changed => $value);
3222	}	3615	}
3223		3616
3224	#############################################################################	3617	#############################################################################
3225		3618
3226	package CFClient::UI::Statusbox;	3619	package CFPlus::UI::Statusbox;
3227		3620
3228	our @ISA = CFClient::UI::VBox::;	3621	our @ISA = CFPlus::UI::VBox::;
3229		3622
3230	sub new {	3623	sub new {
3231	my $class = shift;	3624	my $class = shift;
3232		3625
3233	my $self = $class->SUPER::new (	3626	my $self = $class->SUPER::new (
…		…
3245	sub reorder {	3638	sub reorder {
3246	my ($self) = @_;	3639	my ($self) = @_;
3247	my $NOW = Time::HiRes::time;	3640	my $NOW = Time::HiRes::time;
3248		3641
3249	# freeze display when hovering over any label	3642	# freeze display when hovering over any label
3250	return if $CFClient::UI::TOOLTIP->{owner}	3643	return if $CFPlus::UI::TOOLTIP->{owner}
3251	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3644	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3252	values %{ $self->{item} };	3645	values %{ $self->{item} };
3253		3646
3254	while (my ($k, $v) = each %{ $self->{item} }) {	3647	while (my ($k, $v) = each %{ $self->{item} }) {
3255	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3648	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3256	}	3649	}
…		…
3277	for ($short) {	3670	for ($short) {
3278	s/^\s+//;	3671	s/^\s+//;
3279	s/\s+/ /g;	3672	s/\s+/ /g;
3280	}	3673	}
3281		3674
3282	new CFClient::UI::Label	3675	new CFPlus::UI::Label
3283	markup => $short,	3676	markup => $short,
3284	tooltip => $item->{tooltip},	3677	tooltip => $item->{tooltip},
3285	tooltip_font => $::FONT_PROP,	3678	tooltip_font => $::FONT_PROP,
3286	tooltip_width => 0.67,	3679	tooltip_width => 0.67,
3287	fontsize => $item->{fontsize} || $self->{fontsize},	3680	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3341	count => 1,	3734	count => 1,
3342	%arg,	3735	%arg,
3343	};	3736	};
3344	}	3737	}
3345		3738
		3739	$ROOT->on_refresh (reorder => sub {
3346	$self->reorder;	3740	$self->reorder;
		3741	});
3347	}	3742	}
3348		3743
3349	sub reconfigure {	3744	sub reconfigure {
3350	my ($self) = @_;	3745	my ($self) = @_;
3351		3746
…		…
3364	$self->SUPER::destroy;	3759	$self->SUPER::destroy;
3365	}	3760	}
3366		3761
3367	#############################################################################	3762	#############################################################################
3368		3763
3369	package CFClient::UI::Inventory;
3370
3371	our @ISA = CFClient::UI::ScrolledWindow::;
3372
3373	sub new {
3374	my $class = shift;
3375
3376	my $self = $class->SUPER::new (
3377	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3378	@_,
3379	);
3380
3381	$self
3382	}
3383
3384	sub set_items {
3385	my ($self, $items) = @_;
3386
3387	$self->{child}->clear;
3388	return unless $items;
3389
3390	my @items = sort {
3391	($a->{type} <=> $b->{type})
3392	or ($a->{name} cmp $b->{name})
3393	} @$items;
3394
3395	$self->{real_items} = \@items;
3396
3397	my $row = 0;
3398	for my $item (@items) {
3399	CFClient::Item::update_widgets $item;
3400
3401	$self->{child}->add (0, $row, $item->{face_widget});
3402	$self->{child}->add (1, $row, $item->{desc_widget});
3403	$self->{child}->add (2, $row, $item->{weight_widget});
3404
3405	$row++;
3406	}
3407	}
3408
3409	#############################################################################
3410
3411	package CFClient::UI::BindEditor;
3412
3413	our @ISA = CFClient::UI::FancyFrame::;
3414
3415	sub new {
3416	my $class = shift;
3417
3418	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3419
3420	$self->add (my $vb = new CFClient::UI::VBox);
3421
3422
3423	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3424	text => "start recording",
3425	tooltip => "Start/Stops recording of actions."
3426	."All subsequent actions after the recording started will be captured."
3427	."The actions are displayed after the record was stopped."
3428	."To bind the action you have to click on the 'Bind' button",
3429	on_activate => sub {
3430	unless ($self->{recording}) {
3431	$self->start;
3432	} else {
3433	$self->stop;
3434	}
3435	});
3436
3437	$vb->add (new CFClient::UI::Label text => "Actions:");
3438	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3439
3440	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3441	$vb->add (my $hb = new CFClient::UI::HBox);
3442	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3443	$hb->add (new CFClient::UI::Button
3444	text => "bind",
3445	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3446	on_activate => sub {
3447	$self->ask_for_bind;
3448	});
3449
3450	$vb->add (my $hb = new CFClient::UI::HBox);
3451	$hb->add (new CFClient::UI::Button
3452	text => "ok",
3453	expand => 1,
3454	tooltip => "This closes the binding editor and saves the binding",
3455	on_activate => sub {
3456	$self->hide;
3457	$self->commit;
3458	});
3459
3460	$hb->add (new CFClient::UI::Button
3461	text => "cancel",
3462	expand => 1,
3463	tooltip => "This closes the binding editor without saving",
3464	on_activate => sub {
3465	$self->hide;
3466	$self->{binding_cancel}->()
3467	if $self->{binding_cancel};
3468	});
3469
3470	$self->update_binding_widgets;
3471
3472	$self
3473	}
3474
3475	sub commit {
3476	my ($self) = @_;
3477	my ($mod, $sym, $cmds) = $self->get_binding;
3478	if ($sym != 0 && @$cmds > 0) {
3479	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3480	."'. Don't forget 'Save Config'!");
3481	$self->{binding_change}->($mod, $sym, $cmds)
3482	if $self->{binding_change};
3483	} else {
3484	$::STATUSBOX->add ("No action bound, no key or action specified!");
3485	$self->{binding_cancel}->()
3486	if $self->{binding_cancel};
3487	}
3488	}
3489
3490	sub start {
3491	my ($self) = @_;
3492
3493	$self->{rec_btn}->set_text ("stop recording");
3494	$self->{recording} = 1;
3495	$self->clear_command_list;
3496	$::CONN->start_record if $::CONN;
3497	}
3498
3499	sub stop {
3500	my ($self) = @_;
3501
3502	$self->{rec_btn}->set_text ("start recording");
3503	$self->{recording} = 0;
3504
3505	my $rec;
3506	$rec = $::CONN->stop_record if $::CONN;
3507	return unless ref $rec eq 'ARRAY';
3508	$self->set_command_list ($rec);
3509	}
3510
3511
3512	sub ask_for_bind_and_commit {
3513	my ($self) = @_;
3514	$self->ask_for_bind (1);
3515	}
3516
3517	sub ask_for_bind {
3518	my ($self, $commit, $end_cb) = @_;
3519
3520	CFClient::Binder::open_binding_dialog (sub {
3521	my ($mod, $sym) = @_;
3522	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3523	$self->update_binding_widgets;
3524	$self->commit if $commit;
3525	$end_cb->() if $end_cb;
3526	});
3527	}
3528
3529	# $mod and $sym are the modifiers and key symbol
3530	# $cmds is a array ref of strings (the commands)
3531	# $cb is the callback that is executed on OK
3532	# $ccb is the callback that is executed on CANCEL and
3533	# when the binding was unsuccessful on OK
3534	sub set_binding {
3535	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3536
3537	$self->clear_command_list;
3538	$self->{recording} = 0;
3539	$self->{rec_btn}->set_text ("start recording");
3540
3541	$self->{binding} = [$mod, $sym];
3542	$self->{commands} = $cmds;
3543
3544	$self->{binding_change} = $cb;
3545	$self->{binding_cancel} = $ccb;
3546
3547	$self->update_binding_widgets;
3548	}
3549
3550	# this is a shortcut method that asks for a binding
3551	# and then just binds it.
3552	sub do_quick_binding {
3553	my ($self, $cmds, $end_cb) = @_;
3554	$self->set_binding (undef, undef, $cmds, sub {
3555	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3556	});
3557	$self->ask_for_bind (1, $end_cb);
3558	}
3559
3560	sub update_binding_widgets {
3561	my ($self) = @_;
3562	my ($mod, $sym, $cmds) = $self->get_binding;
3563	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3564	$self->set_command_list ($cmds);
3565	}
3566
3567	sub get_binding {
3568	my ($self) = @_;
3569	return (
3570	$self->{binding}->[0],
3571	$self->{binding}->[1],
3572	[ grep { defined $_ } @{$self->{commands}} ]
3573	);
3574	}
3575
3576	sub clear_command_list {
3577	my ($self) = @_;
3578	$self->{cmdbox}->clear ();
3579	}
3580
3581	sub set_command_list {
3582	my ($self, $cmds) = @_;
3583
3584	$self->{cmdbox}->clear ();
3585	$self->{commands} = $cmds;
3586
3587	my $idx = 0;
3588
3589	for (@$cmds) {
3590	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3591
3592	my $i = $idx;
3593	$hb->add (new CFClient::UI::Label text => $_);
3594	$hb->add (new CFClient::UI::Button
3595	text => "delete",
3596	tooltip => "Deletes the action from the record",
3597	on_activate => sub {
3598	$self->{cmdbox}->remove ($hb);
3599	$cmds->[$i] = undef;
3600	});
3601
3602
3603	$idx++
3604	}
3605	}
3606
3607	#############################################################################
3608
3609	package CFClient::UI::SpellList;
3610
3611	our @ISA = CFClient::UI::Table::;
3612
3613	sub new {
3614	my $class = shift;
3615
3616	my $self = $class->SUPER::new (
3617	binding => [],
3618	commands => [],
3619	@_,
3620	)
3621	}
3622
3623	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3624
3625	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3626	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3627	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3629	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3630	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3631	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3633	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3635
3636	sub rebuild_spell_list {
3637	my ($self) = @_;
3638
3639	$CFClient::UI::ROOT->on_refresh ($self => sub {
3640	$self->clear;
3641
3642	return unless $::CONN;
3643
3644	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3645	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3646	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3647	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3648	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3649
3650	my $row = 0;
3651
3652	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3653	my $spell = $self->{spell}{$_};
3654
3655	$row++;
3656
3657	my $spell_cb = sub {
3658	my ($widget, $ev) = @_;
3659
3660	if ($ev->{button} == 1) {
3661	$::CONN->user_send ("cast $spell->{name}");
3662	} elsif ($ev->{button} == 2) {
3663	$::CONN->user_send ("invoke $spell->{name}");
3664	} elsif ($ev->{button} == 3) {
3665	(new CFClient::UI::Menu
3666	items => [
3667	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669	],
3670	)->popup ($ev);
3671	} else {
3672	return 0;
3673	}
3674
3675	1
3676	};
3677
3678	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3679
3680	#TODO: add path info to tooltip
3681	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3682
3683	$self->add (0, $row, new CFClient::UI::Face
3684	face => $spell->{face},
3685	can_hover => 1,
3686	can_events => 1,
3687	tooltip => $tooltip,
3688	on_button_down => $spell_cb,
3689	);
3690
3691	$self->add (1, $row, new CFClient::UI::Label
3692	expand => 1,
3693	text => $spell->{name},
3694	can_hover => 1,
3695	can_events => 1,
3696	tooltip => $tooltip,
3697	on_button_down => $spell_cb,
3698	);
3699
3700	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3701	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3702	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3703	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3704	}
3705	});
3706	}
3707
3708	sub add_spell {
3709	my ($self, $spell) = @_;
3710
3711	$self->{spell}->{$spell->{name}} = $spell;
3712	$self->rebuild_spell_list;
3713	}
3714
3715	sub remove_spell {
3716	my ($self, $spell) = @_;
3717
3718	delete $self->{spell}->{$spell->{name}};
3719	$self->rebuild_spell_list;
3720	}
3721
3722	sub clear_spells {
3723	my ($self) = @_;
3724
3725	$self->{spell} = {};
3726	$self->rebuild_spell_list;
3727	}
3728
3729	#############################################################################
3730
3731	package CFClient::UI::Root;	3764	package CFPlus::UI::Root;
3732		3765
3733	our @ISA = CFClient::UI::Container::;	3766	our @ISA = CFPlus::UI::Container::;
3734		3767
3735	use List::Util qw(min max);	3768	use List::Util qw(min max);
3736		3769
3737	use CFClient::OpenGL;	3770	use CFPlus::OpenGL;
3738		3771
3739	sub new {	3772	sub new {
3740	my $class = shift;	3773	my $class = shift;
3741		3774
3742	my $self = $class->SUPER::new (	3775	my $self = $class->SUPER::new (
…		…
3918	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3951	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919		3952
3920	$w = 0 if $w < 0;	3953	$w = 0 if $w < 0;
3921	$h = 0 if $h < 0;	3954	$h = 0 if $h < 0;
3922		3955
		3956	$w = max $widget->{min_w}, $w;
		3957	$h = max $widget->{min_h}, $h;
		3958
		3959	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3960	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3961
		3962	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3963	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3964
3923	$w = int $w + 0.5;	3965	$w = int $w + 0.5;
3924	$h = int $h + 0.5;	3966	$h = int $h + 0.5;
3925		3967
3926	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3968	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927	$widget->{old_w} = $widget->{w};	3969	$widget->{old_w} = $widget->{w};
…		…
3950	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3992	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3951	glMatrixMode GL_MODELVIEW;	3993	glMatrixMode GL_MODELVIEW;
3952	glLoadIdentity;	3994	glLoadIdentity;
3953		3995
3954	{	3996	{
3955	package CFClient::UI::Base;	3997	package CFPlus::UI::Base;
3956		3998
3957	($draw_x, $draw_y, $draw_w, $draw_h) =	3999	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3958	(0, 0, $self->{w}, $self->{h});	4000	(0, 0, $self->{w}, $self->{h});
3959	}
3960		4001
3961	$self->_draw;	4002	$self->_draw;
		4003	}
3962	}	4004	}
3963		4005
3964	#############################################################################	4006	#############################################################################
3965		4007
3966	package CFClient::UI;	4008	package CFPlus::UI;
3967		4009
3968	$ROOT = new CFClient::UI::Root;	4010	$ROOT = new CFPlus::UI::Root;
3969	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4011	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3970		4012
3971	1	4013	1
3972		4014

Diff Legend

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