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.302 by root, Mon Jun 12 13:26:14 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->focus_out;	310	$self->emit ("focus_out");
287
288	$self->emit (visibility_change => 0);	311	$self->emit (visibility_change => 0);
289	}	312	}
290		313
291	sub set_visibility {	314	sub set_visibility {
292	my ($self, $visible) = @_;	315	my ($self, $visible) = @_;
…		…
336	sub size_request {	359	sub size_request {
337	require Carp;	360	require Carp;
338	Carp::confess "size_request is abstract";	361	Carp::confess "size_request is abstract";
339	}	362	}
340		363
		364	sub baseline_shift {
		365	0
		366	}
		367
341	sub configure {	368	sub configure {
342	my ($self, $x, $y, $w, $h) = @_;	369	my ($self, $x, $y, $w, $h) = @_;
343		370
344	if ($self->{aspect}) {	371	if ($self->{aspect}) {
345	my ($ow, $oh) = ($w, $h);	372	my ($ow, $oh) = ($w, $h);
346		373
347	$w = List::Util::min $w, int $h * $self->{aspect};	374	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348	$h = List::Util::min $h, int $w / $self->{aspect};	375	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349		376
350	# use alignment to adjust x, y	377	# use alignment to adjust x, y
351		378
352	$x += int 0.5 * ($ow - $w);	379	$x += int 0.5 * ($ow - $w);
353	$y += int 0.5 * ($oh - $h);	380	$y += int 0.5 * ($oh - $h);
…		…
367		394
368	$self->{root}{size_alloc}{$self+0} = $self;	395	$self->{root}{size_alloc}{$self+0} = $self;
369	}	396	}
370	}	397	}
371		398
372	sub size_allocate {
373	# nothing to be done
374	}
375
376	sub children {	399	sub children {
377	# nop	400	# nop
378	}	401	}
379		402
380	sub visible_children {	403	sub visible_children {
…		…
398		421
399	return if $self->{tooltip} eq $tooltip;	422	return if $self->{tooltip} eq $tooltip;
400		423
401	$self->{tooltip} = $tooltip;	424	$self->{tooltip} = $tooltip;
402		425
403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	426	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404	delete $CFClient::UI::TOOLTIP->{owner};	427	delete $CFPlus::UI::TOOLTIP->{owner};
405	$CFClient::UI::TOOLTIP_WATCHER->cb->();	428	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
406	}	429	}
407	}	430	}
408		431
409	# translate global coordinates to local coordinate system	432	# translate global coordinates to local coordinate system
410	sub coord2local {	433	sub coord2local {
411	my ($self, $x, $y) = @_;	434	my ($self, $x, $y) = @_;
412		435
		436	Carp::confess unless $self->{parent};#d#
		437
413	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	438	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414	}	439	}
415		440
416	# translate local coordinates to global coordinate system	441	# translate local coordinates to global coordinate system
417	sub coord2global {	442	sub coord2global {
418	my ($self, $x, $y) = @_;	443	my ($self, $x, $y) = @_;
419		444
		445	Carp::confess unless $self->{parent};#d#
		446
420	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	447	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421	}	448	}
422		449
423	sub focus_in {	450	sub invoke_focus_in {
424	my ($self) = @_;	451	my ($self) = @_;
425		452
426	return if $FOCUS == $self;	453	return if $FOCUS == $self;
427	return unless $self->{can_focus};	454	return unless $self->{can_focus};
428		455
429	my $focus = $FOCUS; $FOCUS = $self;	456	$FOCUS = $self;
430		457
431	$self->_emit (focus_in => $focus);	458	$self->update;
432		459
433	$focus->update if $focus;	460	0
434	$FOCUS->update;
435	}	461	}
436		462
437	sub focus_out {	463	sub invoke_focus_out {
438	my ($self) = @_;	464	my ($self) = @_;
439		465
440	return unless $FOCUS == $self;	466	return unless $FOCUS == $self;
441		467
442	my $focus = $FOCUS; undef $FOCUS;	468	undef $FOCUS;
443		469
444	$self->_emit (focus_out => $focus);	470	$self->update;
445		471
446	$focus->update if $focus; #?
447
448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	472	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449	unless $FOCUS;	473	unless $FOCUS;
450	}
451		474
		475	0
		476	}
		477
		478	sub grab_focus {
		479	my ($self) = @_;
		480
		481	$FOCUS->emit ("focus_out") if $FOCUS;
		482	$self->emit ("focus_in");
		483	}
		484
452	sub mouse_motion { 0 }	485	sub invoke_mouse_motion { 0 }
453	sub button_up { 0 }	486	sub invoke_button_up { 0 }
454	sub key_down { 0 }	487	sub invoke_key_down { 0 }
455	sub key_up { 0 }	488	sub invoke_key_up { 0 }
		489	sub invoke_mouse_wheel { 0 }
456		490
457	sub button_down {	491	sub invoke_button_down {
458	my ($self, $ev, $x, $y) = @_;	492	my ($self, $ev, $x, $y) = @_;
459		493
460	$self->focus_in;	494	$self->grab_focus;
461		495
462	0	496	0
		497	}
		498
		499	sub connect {
		500	my ($self, $signal, $cb) = @_;
		501
		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	}
		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	);
		522
		523	sub emit {
		524	my ($self, $signal, @args) = @_;
		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
		536	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
		537	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
		538	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463	}	539	}
464		540
465	sub find_widget {	541	sub find_widget {
466	my ($self, $x, $y) = @_;	542	my ($self, $x, $y) = @_;
467		543
…		…
477	sub set_parent {	553	sub set_parent {
478	my ($self, $parent) = @_;	554	my ($self, $parent) = @_;
479		555
480	Scalar::Util::weaken ($self->{parent} = $parent);	556	Scalar::Util::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	557	$self->set_visible if $parent->{visible};
482	}
483
484	sub connect {
485	my ($self, $signal, $cb) = @_;
486
487	push @{ $self->{signal_cb}{$signal} }, $cb;
488	}
489
490	sub _emit {
491	my ($self, $signal, @args) = @_;
492
493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494	}
495
496	sub emit {
497	my ($self, $signal, @args) = @_;
498
499	$self->_emit ($signal, @args)
500	|| $self->$signal (@args);
501	}
502
503	sub visibility_change {
504	#my ($self, $visible) = @_;
505	}	558	}
506		559
507	sub realloc {	560	sub realloc {
508	my ($self) = @_;	561	my ($self) = @_;
509		562
…		…
542	return unless $self->{h} && $self->{w};	595	return unless $self->{h} && $self->{w};
543		596
544	# update screen rectangle	597	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};	598	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};	599	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549		600
550	# skip widgets that are entirely outside the drawing area	601	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	602	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	603	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553		604
…		…
576	glVertex $self->{w} - 1, 0;	627	glVertex $self->{w} - 1, 0;
577	glVertex $self->{w} - 1, $self->{h} - 1;	628	glVertex $self->{w} - 1, $self->{h} - 1;
578	glVertex 0 , $self->{h} - 1;	629	glVertex 0 , $self->{h} - 1;
579	glEnd;	630	glEnd;
580	glPopMatrix;	631	glPopMatrix;
581	#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;
582	}	633	}
583		634
584	$self->_draw;	635	$self->_draw;
585	glPopMatrix;	636	glPopMatrix;
586	}	637	}
…		…
592	}	643	}
593		644
594	sub DESTROY {	645	sub DESTROY {
595	my ($self) = @_;	646	my ($self) = @_;
596		647
597	delete $WIDGET{$self+0};	648	return if CFPlus::in_destruct;
598		649
599	eval { $self->destroy };	650	eval { $self->destroy };
600	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};
601	}	654	}
602		655
603	#############################################################################	656	#############################################################################
604		657
605	package CFClient::UI::DrawBG;	658	package CFPlus::UI::DrawBG;
606		659
607	our @ISA = CFClient::UI::Base::;	660	our @ISA = CFPlus::UI::Base::;
608		661
609	use strict;	662	use strict;
610	use CFClient::OpenGL;	663	use CFPlus::OpenGL;
611		664
612	sub new {	665	sub new {
613	my $class = shift;	666	my $class = shift;
614		667
615	# range [value, low, high, page]	668	# range [value, low, high, page]
…		…
646	}	699	}
647	}	700	}
648		701
649	#############################################################################	702	#############################################################################
650		703
651	package CFClient::UI::Empty;	704	package CFPlus::UI::Empty;
652		705
653	our @ISA = CFClient::UI::Base::;	706	our @ISA = CFPlus::UI::Base::;
654		707
655	sub new {	708	sub new {
656	my ($class, %arg) = @_;	709	my ($class, %arg) = @_;
657	$class->SUPER::new (can_events => 0, %arg);	710	$class->SUPER::new (can_events => 0, %arg);
658	}	711	}
…		…
665		718
666	sub draw { }	719	sub draw { }
667		720
668	#############################################################################	721	#############################################################################
669		722
670	package CFClient::UI::Container;	723	package CFPlus::UI::Container;
671		724
672	our @ISA = CFClient::UI::Base::;	725	our @ISA = CFPlus::UI::Base::;
673		726
674	sub new {	727	sub new {
675	my ($class, %arg) = @_;	728	my ($class, %arg) = @_;
676		729
677	my $children = delete $arg{children};	730	my $children = delete $arg{children};
…		…
686	if $children;	739	if $children;
687		740
688	$self	741	$self
689	}	742	}
690		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
691	sub add {	752	sub add {
692	my ($self, @widgets) = @_;	753	my ($self, @widgets) = @_;
693		754
694	$_->set_parent ($self)	755	$_->set_parent ($self)
695	for @widgets;	756	for @widgets;
…		…
755	$_->draw for @{$self->{children}};	816	$_->draw for @{$self->{children}};
756	}	817	}
757		818
758	#############################################################################	819	#############################################################################
759		820
760	package CFClient::UI::Bin;	821	package CFPlus::UI::Bin;
761		822
762	our @ISA = CFClient::UI::Container::;	823	our @ISA = CFPlus::UI::Container::;
763		824
764	sub new {	825	sub new {
765	my ($class, %arg) = @_;	826	my ($class, %arg) = @_;
766		827
767	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	828	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768		829
769	$class->SUPER::new (children => [$child], %arg)	830	$class->SUPER::new (children => [$child], %arg)
770	}	831	}
771		832
772	sub add {	833	sub add {
…		…
779	sub remove {	840	sub remove {
780	my ($self, $widget) = @_;	841	my ($self, $widget) = @_;
781		842
782	$self->SUPER::remove ($widget);	843	$self->SUPER::remove ($widget);
783		844
784	$self->{children} = [new CFClient::UI::Empty]	845	$self->{children} = [new CFPlus::UI::Empty]
785	unless @{$self->{children}};	846	unless @{$self->{children}};
786	}	847	}
787		848
788	sub child { $_[0]->{children}[0] }	849	sub child { $_[0]->{children}[0] }
789		850
790	sub size_request {	851	sub size_request {
791	$_[0]{children}[0]->size_request	852	$_[0]{children}[0]->size_request
792	}	853	}
793		854
794	sub size_allocate {	855	sub invoke_size_allocate {
795	my ($self, $w, $h) = @_;	856	my ($self, $w, $h) = @_;
796		857
797	$self->{children}[0]->configure (0, 0, $w, $h);	858	$self->{children}[0]->configure (0, 0, $w, $h);
		859
		860	1
798	}	861	}
799		862
800	#############################################################################	863	#############################################################################
801		864
802	# back-buffered drawing area	865	# back-buffered drawing area
803		866
804	package CFClient::UI::Window;	867	package CFPlus::UI::Window;
805		868
806	our @ISA = CFClient::UI::Bin::;	869	our @ISA = CFPlus::UI::Bin::;
807		870
808	use CFClient::OpenGL;	871	use CFPlus::OpenGL;
809		872
810	sub new {	873	sub new {
811	my ($class, %arg) = @_;	874	my ($class, %arg) = @_;
812		875
813	my $self = $class->SUPER::new (%arg);	876	my $self = $class->SUPER::new (%arg);
…		…
818		881
819	$ROOT->on_post_alloc ($self => sub { $self->render_child });	882	$ROOT->on_post_alloc ($self => sub { $self->render_child });
820	$self->SUPER::update;	883	$self->SUPER::update;
821	}	884	}
822		885
823	sub size_allocate {	886	sub invoke_size_allocate {
824	my ($self, $w, $h) = @_;	887	my ($self, $w, $h) = @_;
825		888
826	$self->SUPER::size_allocate ($w, $h);
827	$self->update;	889	$self->update;
		890
		891	$self->SUPER::invoke_size_allocate ($w, $h)
828	}	892	}
829		893
830	sub _render {	894	sub _render {
831	my ($self) = @_;	895	my ($self) = @_;
832		896
…		…
834	}	898	}
835		899
836	sub render_child {	900	sub render_child {
837	my ($self) = @_;	901	my ($self) = @_;
838		902
839	$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 {
840	glClearColor 0, 0, 0, 0;	904	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	905	glClear GL_COLOR_BUFFER_BIT;
842		906
843	{	907	{
844	package CFClient::UI::Base;	908	package CFPlus::UI::Base;
845		909
846	($draw_x, $draw_y, $draw_w, $draw_h) =	910	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	911	(0, 0, $self->{w}, $self->{h});
		912
		913	$self->_render;
848	}	914	}
849
850	$self->_render;
851	};	915	};
852	}	916	}
853		917
854	sub _draw {	918	sub _draw {
855	my ($self) = @_;	919	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		920
859	my $tex = $self->{texture}	921	my $tex = $self->{texture}
860	or return;	922	or return;
861		923
862	glEnable GL_TEXTURE_2D;	924	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	925	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	926	glColor 0, 0, 0, 1;
865		927
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	928	$tex->draw_quad_alpha_premultiplied (0, 0);
867		929
868	glDisable GL_TEXTURE_2D;	930	glDisable GL_TEXTURE_2D;
869	}	931	}
870		932
871	#############################################################################	933	#############################################################################
872		934
873	package CFClient::UI::ViewPort;	935	package CFPlus::UI::ViewPort;
874		936
875	our @ISA = CFClient::UI::Window::;	937	our @ISA = CFPlus::UI::Window::;
876		938
877	sub new {	939	sub new {
878	my $class = shift;	940	my $class = shift;
879		941
880	$class->SUPER::new (	942	$class->SUPER::new (
…		…
893	$h = 10 if $self->{scroll_y};	955	$h = 10 if $self->{scroll_y};
894		956
895	($w, $h)	957	($w, $h)
896	}	958	}
897		959
898	sub size_allocate {	960	sub invoke_size_allocate {
899	my ($self, $w, $h) = @_;	961	my ($self, $w, $h) = @_;
900		962
901	my $child = $self->child;	963	my $child = $self->child;
902		964
903	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	965	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	966	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905		967
906	$self->child->configure (0, 0, $w, $h);	968	$self->child->configure (0, 0, $w, $h);
907	$self->update;	969	$self->update;
		970
		971	1
908	}	972	}
909		973
910	sub set_offset {	974	sub set_offset {
911	my ($self, $x, $y) = @_;	975	my ($self, $x, $y) = @_;
912		976
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1002	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1003	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1004	) {
941	$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})
942	} else {	1006	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1007	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1008	}
945	}	1009	}
946		1010
947	sub _render {	1011	sub _render {
948	my ($self) = @_;	1012	my ($self) = @_;
949		1013
950	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};
951	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};
952		1016
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1017	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1018
955	$self->SUPER::_render;	1019	$self->SUPER::_render;
956	}	1020	}
957		1021
958	#############################################################################	1022	#############################################################################
959		1023
960	package CFClient::UI::ScrolledWindow;	1024	package CFPlus::UI::ScrolledWindow;
961		1025
962	our @ISA = CFClient::UI::HBox::;	1026	our @ISA = CFPlus::UI::HBox::;
963		1027
964	sub new {	1028	sub new {
965	my ($class, %arg) = @_;	1029	my ($class, %arg) = @_;
966		1030
967	my $child = delete $arg{child};	1031	my $child = delete $arg{child};
968		1032
969	my $self;	1033	my $self;
970		1034
971	my $slider = new CFClient::UI::Slider	1035	my $slider = new CFPlus::UI::Slider
972	vertical => 1,	1036	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1037	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1038	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1039	$self->{vp}->set_offset (0, $_[1]);
976	},	1040	},
977	;	1041	;
978		1042
979	$self = $class->SUPER::new (	1043	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1044	vp => (new CFPlus::UI::ViewPort expand => 1),
		1045	can_events => 1,
981	slider => $slider,	1046	slider => $slider,
982	%arg,	1047	%arg,
983	);	1048	);
984		1049
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1050	$self->SUPER::add ($self->{vp}, $self->{slider});
986	$self->add ($child) if $child;	1051	$self->add ($child) if $child;
987		1052
988	$self	1053	$self
989	}	1054	}
990		1055
		1056	#TODO# update range on size_allocate depending on child
		1057
991	sub add {	1058	sub add {
992	my ($self, $widget) = @_;	1059	my ($self, $widget) = @_;
993		1060
994	$self->{vp}->add ($self->{child} = $widget);	1061	$self->{vp}->add ($self->{child} = $widget);
995	}	1062	}
996		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
997	sub update {	1080	sub update {
998	my ($self) = @_;	1081	my ($self) = @_;
999		1082
1000	$self->SUPER::update;	1083	$self->SUPER::update;
1001		1084
1002	# todo: overwrite size_allocate of child	1085	$self->update_slider;
1003	my $child = $self->{vp}->child;
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005	}	1086	}
1006		1087
1007	sub size_allocate {	1088	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1089	my ($self, $w, $h) = @_;
1009		1090
		1091	$self->update_slider;
		1092
1010	$self->SUPER::size_allocate ($w, $h);	1093	$self->SUPER::invoke_size_allocate ($w, $h)
1011
1012	my $child = $self->{vp}->child;
1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014	}	1094	}
1015
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018		1095
1019	#############################################################################	1096	#############################################################################
1020		1097
1021	package CFClient::UI::Frame;	1098	package CFPlus::UI::Frame;
1022		1099
1023	our @ISA = CFClient::UI::Bin::;	1100	our @ISA = CFPlus::UI::Bin::;
1024		1101
1025	use CFClient::OpenGL;	1102	use CFPlus::OpenGL;
1026		1103
1027	sub new {	1104	sub new {
1028	my $class = shift;	1105	my $class = shift;
1029		1106
1030	$class->SUPER::new (	1107	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1133	$self->SUPER::_draw;
1057	}	1134	}
1058		1135
1059	#############################################################################	1136	#############################################################################
1060		1137
1061	package CFClient::UI::FancyFrame;	1138	package CFPlus::UI::FancyFrame;
1062		1139
1063	our @ISA = CFClient::UI::Bin::;	1140	our @ISA = CFPlus::UI::Bin::;
1064		1141
1065	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;
1066		1243
1067	my $bg =	1244	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1245	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1246	mipmap => 1, wrap => 1;
1070		1247
1071	my @border =	1248	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1249	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073	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);
1074		1251
1075	sub new {	1252	sub new {
1076	my ($class, %arg) = @_;	1253	my ($class, %arg) = @_;
1077		1254
1078	my $self = $class->SUPER::new (	1255	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1256	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1257	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1258	border => 0.6,
1082	can_events => 1,	1259	can_events => 1,
1083	min_w => 16,	1260	min_w => 64,
1084	min_h => 16,	1261	min_h => 32,
1085	%arg,	1262	%arg,
1086	);	1263	);
1087		1264
1088	$self->{title_widget} = new CFClient::UI::Label	1265	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1266	align => 0,
1090	valign => 1,	1267	valign => 1,
1091	text => $self->{title},	1268	text => $self->{title},
1092	fontsize => $self->{border},	1269	fontsize => $self->{border},
1093	if exists $self->{title};	1270	if exists $self->{title};
1094		1271
		1272	if ($self->{has_close_button}) {
		1273	$self->{close_button} =
		1274	new CFPlus::UI::ImageButton
		1275	path => 'x1_close.png',
		1276	on_activate => sub { $self->emit ("delete") };
		1277
		1278	$self->CFPlus::UI::Container::add ($self->{close_button});
		1279	}
		1280
1095	$self	1281	$self
1096	}	1282	}
1097		1283
1098	sub add {	1284	sub add {
1099	my ($self, @widgets) = @_;	1285	my ($self, @widgets) = @_;
1100		1286
1101	$self->SUPER::add (@widgets);	1287	$self->SUPER::add (@widgets);
		1288	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102	$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};
1103	}	1290	}
1104		1291
1105	sub border {	1292	sub border {
1106	int $_[0]{border} * $::FONTSIZE	1293	int $_[0]{border} * $::FONTSIZE
1107	}	1294	}
…		…
1109	sub size_request {	1296	sub size_request {
1110	my ($self) = @_;	1297	my ($self) = @_;
1111		1298
1112	$self->{title_widget}->size_request	1299	$self->{title_widget}->size_request
1113	if $self->{title_widget};	1300	if $self->{title_widget};
		1301
		1302	$self->{close_button}->size_request
		1303	if $self->{close_button};
1114		1304
1115	my ($w, $h) = $self->SUPER::size_request;	1305	my ($w, $h) = $self->SUPER::size_request;
1116		1306
1117	(	1307	(
1118	$w + $self->border * 2,	1308	$w + $self->border * 2,
1119	$h + $self->border * 2,	1309	$h + $self->border * 2,
1120	)	1310	)
1121	}	1311	}
1122		1312
1123	sub size_allocate {	1313	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1314	my ($self, $w, $h) = @_;
1125		1315
1126	if ($self->{title_widget}) {	1316	if ($self->{title_widget}) {
1127	$self->{title_widget}{w} = $w;	1317	$self->{title_widget}{w} = $w;
1128	$self->{title_widget}{h} = $h;	1318	$self->{title_widget}{h} = $h;
1129	$self->{title_widget}->size_allocate ($w, $h);	1319	$self->{title_widget}->invoke_size_allocate ($w, $h);
1130	}	1320	}
1131		1321
1132	my $border = $self->border;	1322	my $border = $self->border;
1133		1323
1134	$h -= List::Util::max 0, $border * 2;	1324	$h -= List::Util::max 0, $border * 2;
1135	$w -= List::Util::max 0, $border * 2;	1325	$w -= List::Util::max 0, $border * 2;
		1326
		1327	$self->child->configure ($border, $border, $w, $h);
		1328
		1329	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1330	if $self->{close_button};
		1331
		1332	1
		1333	}
		1334
		1335	sub invoke_delete {
		1336	my ($self) = @_;
		1337
		1338	$self->hide;
1136		1339
1137	$self->child->configure ($border, $border, $w, $h);	1340	1
1138	}	1341	}
1139		1342
1140	sub button_down {	1343	sub invoke_button_down {
1141	my ($self, $ev, $x, $y) = @_;	1344	my ($self, $ev, $x, $y) = @_;
1142		1345
1143	my ($w, $h) = @$self{qw(w h)};	1346	my ($w, $h) = @$self{qw(w h)};
1144	my $border = $self->border;	1347	my $border = $self->border;
1145		1348
…		…
1176		1379
1177	($x, $y) = ($ev->{x}, $ev->{y});	1380	($x, $y) = ($ev->{x}, $ev->{y});
1178		1381
1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1382	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180	# HACK: the next line is required to enforce placement	1383	# HACK: the next line is required to enforce placement
1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1384	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182	};	1385	};
1183	} else {	1386	} else {
1184	return 0;	1387	return 0;
1185	}	1388	}
1186		1389
1187	1	1390	1
1188	}	1391	}
1189		1392
1190	sub button_up {	1393	sub invoke_button_up {
1191	my ($self, $ev, $x, $y) = @_;	1394	my ($self, $ev, $x, $y) = @_;
1192		1395
1193	!!delete $self->{motion}	1396	! ! delete $self->{motion}
1194	}	1397	}
1195		1398
1196	sub mouse_motion {	1399	sub invoke_mouse_motion {
1197	my ($self, $ev, $x, $y) = @_;	1400	my ($self, $ev, $x, $y) = @_;
1198		1401
1199	$self->{motion}->($ev, $x, $y) if $self->{motion};	1402	$self->{motion}->($ev, $x, $y) if $self->{motion};
1200		1403
1201	!!$self->{motion}	1404	! ! $self->{motion}
		1405	}
		1406
		1407	sub invoke_visibility_change {
		1408	my ($self, $visible) = @_;
		1409
		1410	delete $self->{motion} unless $visible;
		1411
		1412	0
1202	}	1413	}
1203		1414
1204	sub _draw {	1415	sub _draw {
1205	my ($self) = @_;	1416	my ($self) = @_;
1206		1417
…		…
1235	$child->draw;	1446	$child->draw;
1236		1447
1237	if ($self->{title_widget}) {	1448	if ($self->{title_widget}) {
1238	glTranslate 0, $border - $self->{h};	1449	glTranslate 0, $border - $self->{h};
1239	$self->{title_widget}->_draw;	1450	$self->{title_widget}->_draw;
		1451
		1452	glTranslate 0, - ($border - $self->{h});
1240	}	1453	}
		1454
		1455	$self->{close_button}->draw
		1456	if $self->{close_button};
1241	}	1457	}
1242		1458
1243	#############################################################################	1459	#############################################################################
1244		1460
1245	package CFClient::UI::Table;	1461	package CFPlus::UI::Table;
1246		1462
1247	our @ISA = CFClient::UI::Base::;	1463	our @ISA = CFPlus::UI::Base::;
1248		1464
1249	use List::Util qw(max sum);	1465	use List::Util qw(max sum);
1250		1466
1251	use CFClient::OpenGL;	1467	use CFPlus::OpenGL;
1252		1468
1253	sub new {	1469	sub new {
1254	my $class = shift;	1470	my $class = shift;
1255		1471
1256	$class->SUPER::new (	1472	$class->SUPER::new (
…		…
1262	sub children {	1478	sub children {
1263	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1479	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264	}	1480	}
1265		1481
1266	sub add {	1482	sub add {
1267	my ($self, $x, $y, $child) = @_;	1483	my ($self) = shift;
1268		1484
		1485	while (@_) {
		1486	my ($x, $y, $child) = splice @_, 0, 3, ();
1269	$child->set_parent ($self);	1487	$child->set_parent ($self);
1270	$self->{children}[$y][$x] = $child;	1488	$self->{children}[$y][$x] = $child;
		1489	}
1271		1490
		1491	$self->{force_realloc} = 1;
		1492	$self->{force_size_alloc} = 1;
1272	$self->realloc;	1493	$self->realloc;
1273	}	1494	}
1274		1495
1275	sub remove {	1496	sub remove {
1276	my ($self, $child) = @_;	1497	my ($self, $child) = @_;
…		…
1324	(sum @$ws),	1545	(sum @$ws),
1325	(sum @$hs),	1546	(sum @$hs),
1326	)	1547	)
1327	}	1548	}
1328		1549
1329	sub size_allocate {	1550	sub invoke_size_allocate {
1330	my ($self, $w, $h) = @_;	1551	my ($self, $w, $h) = @_;
1331		1552
1332	my ($ws, $hs) = $self->get_wh;	1553	my ($ws, $hs) = $self->get_wh;
1333		1554
1334	my $req_w = (sum @$ws) || 1;	1555	my $req_w = (sum @$ws) || 1;
…		…
1341		1562
1342	# linearly scale sizes	1563	# linearly scale sizes
1343	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1564	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1565	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345		1566
1346	CFClient::UI::harmonize $ws;	1567	CFPlus::UI::harmonize $ws;
1347	CFClient::UI::harmonize $hs;	1568	CFPlus::UI::harmonize $hs;
1348		1569
1349	my $y;	1570	my $y;
1350		1571
1351	for my $r (0 .. $#{$self->{children}}) {	1572	for my $r (0 .. $#{$self->{children}}) {
1352	my $row = $self->{children}[$r]	1573	my $row = $self->{children}[$r]
…		…
1366	}	1587	}
1367		1588
1368	$y += $row_h;	1589	$y += $row_h;
1369	}	1590	}
1370		1591
		1592	1
1371	}	1593	}
1372		1594
1373	sub find_widget {	1595	sub find_widget {
1374	my ($self, $x, $y) = @_;	1596	my ($self, $x, $y) = @_;
1375		1597
…		…
1394	}	1616	}
1395	}	1617	}
1396		1618
1397	#############################################################################	1619	#############################################################################
1398		1620
1399	package CFClient::UI::Box;	1621	package CFPlus::UI::Box;
1400		1622
1401	our @ISA = CFClient::UI::Container::;	1623	our @ISA = CFPlus::UI::Container::;
1402		1624
1403	sub size_request {	1625	sub size_request {
1404	my ($self) = @_;	1626	my ($self) = @_;
1405		1627
1406	$self->{vertical}	1628	$self->{vertical}
…		…
1412	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1634	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1635	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1414	)	1636	)
1415	}	1637	}
1416		1638
1417	sub size_allocate {	1639	sub invoke_size_allocate {
1418	my ($self, $w, $h) = @_;	1640	my ($self, $w, $h) = @_;
1419		1641
1420	my $space = $self->{vertical} ? $h : $w;	1642	my $space = $self->{vertical} ? $h : $w;
1421	my $children = $self->{children};	1643	my @children = $self->visible_children;
1422		1644
1423	my @req;	1645	my @req;
1424		1646
1425	if ($self->{homogeneous}) {	1647	if ($self->{homogeneous}) {
1426	@req = ($space / (@$children || 1)) x @$children;	1648	@req = ($space / (@children || 1)) x @children;
1427	} else {	1649	} else {
1428	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1650	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429	my $req = List::Util::sum @req;	1651	my $req = List::Util::sum @req;
1430		1652
1431	if ($req > $space) {	1653	if ($req > $space) {
1432	# ah well, not enough space	1654	# ah well, not enough space
1433	$_ *= $space / $req for @req;	1655	$_ *= $space / $req for @req;
1434	} else {	1656	} else {
1435	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1657	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436		1658
1437	$space = ($space - $req) / $expand; # remaining space to give away	1659	$space = ($space - $req) / $expand; # remaining space to give away
1438		1660
1439	$req[$_] += $space * $children->[$_]{expand}	1661	$req[$_] += $space * $children[$_]{expand}
1440	for 0 .. $#$children;	1662	for 0 .. $#children;
1441	}	1663	}
1442	}	1664	}
1443		1665
1444	CFClient::UI::harmonize \@req;	1666	CFPlus::UI::harmonize \@req;
1445		1667
1446	my $pos = 0;	1668	my $pos = 0;
1447	for (0 .. $#$children) {	1669	for (0 .. $#children) {
1448	my $alloc = $req[$_];	1670	my $alloc = $req[$_];
1449	$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));
1450		1672
1451	$pos += $alloc;	1673	$pos += $alloc;
1452	}	1674	}
1453		1675
1454	1	1676	1
1455	}	1677	}
1456		1678
1457	#############################################################################	1679	#############################################################################
1458		1680
1459	package CFClient::UI::HBox;	1681	package CFPlus::UI::HBox;
1460		1682
1461	our @ISA = CFClient::UI::Box::;	1683	our @ISA = CFPlus::UI::Box::;
1462		1684
1463	sub new {	1685	sub new {
1464	my $class = shift;	1686	my $class = shift;
1465		1687
1466	$class->SUPER::new (	1688	$class->SUPER::new (
…		…
1469	)	1691	)
1470	}	1692	}
1471		1693
1472	#############################################################################	1694	#############################################################################
1473		1695
1474	package CFClient::UI::VBox;	1696	package CFPlus::UI::VBox;
1475		1697
1476	our @ISA = CFClient::UI::Box::;	1698	our @ISA = CFPlus::UI::Box::;
1477		1699
1478	sub new {	1700	sub new {
1479	my $class = shift;	1701	my $class = shift;
1480		1702
1481	$class->SUPER::new (	1703	$class->SUPER::new (
…		…
1484	)	1706	)
1485	}	1707	}
1486		1708
1487	#############################################################################	1709	#############################################################################
1488		1710
1489	package CFClient::UI::Label;	1711	package CFPlus::UI::Label;
1490		1712
1491	our @ISA = CFClient::UI::DrawBG::;	1713	our @ISA = CFPlus::UI::DrawBG::;
1492		1714
1493	use CFClient::OpenGL;	1715	use CFPlus::OpenGL;
1494		1716
1495	sub new {	1717	sub new {
1496	my ($class, %arg) = @_;	1718	my ($class, %arg) = @_;
1497		1719
1498	my $self = $class->SUPER::new (	1720	my $self = $class->SUPER::new (
…		…
1501	#active_bg => none	1723	#active_bg => none
1502	#font => default_font	1724	#font => default_font
1503	#text => initial text	1725	#text => initial text
1504	#markup => initial narkup	1726	#markup => initial narkup
1505	#max_w => maximum pixel width	1727	#max_w => maximum pixel width
		1728	#style => 0, # render flags
1506	ellipsise => 3, # end	1729	ellipsise => 3, # end
1507	layout => (new CFClient::Layout),	1730	layout => (new CFPlus::Layout),
1508	fontsize => 1,	1731	fontsize => 1,
1509	align => -1,	1732	align => -1,
1510	valign => -1,	1733	valign => -1,
1511	padding_x => 2,	1734	padding_x => 2,
1512	padding_y => 2,	1735	padding_y => 2,
1513	can_events => 0,	1736	can_events => 0,
1514	%arg	1737	%arg
1515	);	1738	);
1516		1739
1517	if (exists $self->{template}) {	1740	if (exists $self->{template}) {
1518	my $layout = new CFClient::Layout;	1741	my $layout = new CFPlus::Layout;
1519	$layout->set_text (delete $self->{template});	1742	$layout->set_text (delete $self->{template});
1520	$self->{template} = $layout;	1743	$self->{template} = $layout;
1521	}	1744	}
1522		1745
1523	if (exists $self->{markup}) {	1746	if (exists $self->{markup}) {
…		…
1527	}	1750	}
1528		1751
1529	$self	1752	$self
1530	}	1753	}
1531		1754
1532	sub escape($) {
1533	local $_ = $_[0];
1534
1535	s/&/&amp;/g;
1536	s/>/&gt;/g;
1537	s/</&lt;/g;
1538
1539	$_
1540	}
1541
1542	sub update {	1755	sub update {
1543	my ($self) = @_;	1756	my ($self) = @_;
1544		1757
1545	delete $self->{texture};	1758	delete $self->{texture};
1546	$self->SUPER::update;	1759	$self->SUPER::update;
…		…
1557	my ($self, $text) = @_;	1770	my ($self, $text) = @_;
1558		1771
1559	return if $self->{text} eq "T$text";	1772	return if $self->{text} eq "T$text";
1560	$self->{text} = "T$text";	1773	$self->{text} = "T$text";
1561		1774
1562	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563	$self->{layout}->set_text ($text);	1775	$self->{layout}->set_text ($text);
1564		1776
1565	delete $self->{size_req};	1777	delete $self->{size_req};
1566	$self->realloc;	1778	$self->realloc;
1567	$self->update;	1779	$self->update;
…		…
1573	return if $self->{text} eq "M$markup";	1785	return if $self->{text} eq "M$markup";
1574	$self->{text} = "M$markup";	1786	$self->{text} = "M$markup";
1575		1787
1576	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1788	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577		1789
1578	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579	$self->{layout}->set_markup ($markup);	1790	$self->{layout}->set_markup ($markup);
1580		1791
1581	delete $self->{size_req};	1792	delete $self->{size_req};
1582	$self->realloc;	1793	$self->realloc;
1583	$self->update;	1794	$self->update;
…		…
1595		1806
1596	my ($w, $h) = $self->{layout}->size;	1807	my ($w, $h) = $self->{layout}->size;
1597		1808
1598	if (exists $self->{template}) {	1809	if (exists $self->{template}) {
1599	$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);
1600	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1812	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601		1813
1602	my ($w2, $h2) = $self->{template}->size;	1814	my ($w2, $h2) = $self->{template}->size;
1603		1815
1604	$w = List::Util::max $w, $w2;	1816	$w = List::Util::max $w, $w2;
…		…
1609	};	1821	};
1610		1822
1611	@{ $self->{size_req} }	1823	@{ $self->{size_req} }
1612	}	1824	}
1613		1825
		1826	sub baseline_shift {
		1827	$_[0]{layout}->descent
		1828	}
		1829
1614	sub size_allocate {	1830	sub invoke_size_allocate {
1615	my ($self, $w, $h) = @_;	1831	my ($self, $w, $h) = @_;
1616		1832
1617	delete $self->{ox};	1833	delete $self->{ox};
1618		1834
1619	delete $self->{texture}	1835	delete $self->{texture}
1620	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1836	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1837
		1838	1
1621	}	1839	}
1622		1840
1623	sub set_fontsize {	1841	sub set_fontsize {
1624	my ($self, $fontsize) = @_;	1842	my ($self, $fontsize) = @_;
1625		1843
1626	$self->{fontsize} = $fontsize;	1844	$self->{fontsize} = $fontsize;
		1845	delete $self->{size_req};
1627	delete $self->{texture};	1846	delete $self->{texture};
1628		1847
1629	$self->realloc;	1848	$self->realloc;
1630	}	1849	}
1631		1850
1632	sub reconfigure {	1851	sub reconfigure {
1633	my ($self) = @_;	1852	my ($self) = @_;
1634		1853
1635	delete $self->{size_req};	1854	delete $self->{size_req};
		1855	delete $self->{texture};
1636		1856
1637	$self->SUPER::reconfigure;	1857	$self->SUPER::reconfigure;
1638	}	1858	}
1639		1859
1640	sub _draw {	1860	sub _draw {
1641	my ($self) = @_;	1861	my ($self) = @_;
1642		1862
1643	$self->SUPER::_draw; # draw background, if applicable	1863	$self->SUPER::_draw; # draw background, if applicable
1644		1864
1645	my $tex = $self->{texture} ||= do {	1865	my $size = $self->{texture} ||= do {
1646	$self->{layout}->set_foreground (@{$self->{fg}});	1866	$self->{layout}->set_foreground (@{$self->{fg}});
1647	$self->{layout}->set_font ($self->{font}) if $self->{font};	1867	$self->{layout}->set_font ($self->{font}) if $self->{font};
1648	$self->{layout}->set_width ($self->{w});	1868	$self->{layout}->set_width ($self->{w});
1649	$self->{layout}->set_ellipsise ($self->{ellipsise});	1869	$self->{layout}->set_ellipsise ($self->{ellipsise});
1650	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1870	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1871	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652		1872
1653	new_from_layout CFClient::Texture $self->{layout}	1873	[$self->{layout}->size]
1654	};	1874	};
1655		1875
1656	unless (exists $self->{ox}) {	1876	unless (exists $self->{ox}) {
1657	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1877	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1878	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659	: ($self->{w} - $tex->{w}) * 0.5);	1879	: ($self->{w} - $size->[0]) * 0.5);
1660		1880
1661	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1881	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1882	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663	: ($self->{h} - $tex->{h}) * 0.5);	1883	: ($self->{h} - $size->[1]) * 0.5);
1664	};	1884	};
1665		1885
1666	glEnable GL_TEXTURE_2D;
1667
1668	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1886	my $w = List::Util::min $self->{w} + 4, $size->[0];
1669	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1887	my $h = List::Util::min $self->{h} + 2, $size->[1];
1670		1888
1671	if ($tex->{format} == GL_ALPHA) {	1889	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673	glColor @{$self->{fg}};
1674	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675	} else {
1676	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678	}
1679
1680	glDisable GL_TEXTURE_2D;
1681	}	1890	}
1682		1891
1683	#############################################################################	1892	#############################################################################
1684		1893
1685	package CFClient::UI::EntryBase;	1894	package CFPlus::UI::EntryBase;
1686		1895
1687	our @ISA = CFClient::UI::Label::;	1896	our @ISA = CFPlus::UI::Label::;
1688		1897
1689	use CFClient::OpenGL;	1898	use CFPlus::OpenGL;
1690		1899
1691	sub new {	1900	sub new {
1692	my $class = shift;	1901	my $class = shift;
1693		1902
1694	$class->SUPER::new (	1903	$class->SUPER::new (
…		…
1698	active_fg => [0, 0, 0],	1907	active_fg => [0, 0, 0],
1699	can_hover => 1,	1908	can_hover => 1,
1700	can_focus => 1,	1909	can_focus => 1,
1701	valign => 0,	1910	valign => 0,
1702	can_events => 1,	1911	can_events => 1,
		1912	ellipsise => 0,
1703	#text => ...	1913	#text => ...
1704	#hidden => "*",	1914	#hidden => "*",
1705	@_	1915	@_
1706	)	1916	)
1707	}	1917	}
…		…
1718		1928
1719	$text =~ s/./*/g if $self->{hidden};	1929	$text =~ s/./*/g if $self->{hidden};
1720	$self->{layout}->set_text ("$text ");	1930	$self->{layout}->set_text ("$text ");
1721	delete $self->{size_req};	1931	delete $self->{size_req};
1722		1932
1723	$self->_emit (changed => $self->{text});	1933	$self->emit (changed => $self->{text});
1724		1934
1725	$self->realloc;	1935	$self->realloc;
1726	$self->update;	1936	$self->update;
1727	}	1937	}
1728		1938
…		…
1743	my ($w, $h) = $self->SUPER::size_request;	1953	my ($w, $h) = $self->SUPER::size_request;
1744		1954
1745	($w + 1, $h) # add 1 for cursor	1955	($w + 1, $h) # add 1 for cursor
1746	}	1956	}
1747		1957
1748	sub key_down {	1958	sub invoke_key_down {
1749	my ($self, $ev) = @_;	1959	my ($self, $ev) = @_;
1750		1960
1751	my $mod = $ev->{mod};	1961	my $mod = $ev->{mod};
1752	my $sym = $ev->{sym};	1962	my $sym = $ev->{sym};
1753	my $uni = $ev->{unicode};	1963	my $uni = $ev->{unicode};
…		…
1756		1966
1757	if ($uni == 8) {	1967	if ($uni == 8) {
1758	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1968	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759	} elsif ($uni == 127) {	1969	} elsif ($uni == 127) {
1760	substr $text, $self->{cursor}, 1, "";	1970	substr $text, $self->{cursor}, 1, "";
1761	} elsif ($sym == CFClient::SDLK_LEFT) {	1971	} elsif ($sym == CFPlus::SDLK_LEFT) {
1762	--$self->{cursor} if $self->{cursor};	1972	--$self->{cursor} if $self->{cursor};
1763	} elsif ($sym == CFClient::SDLK_RIGHT) {	1973	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1764	++$self->{cursor} if $self->{cursor} < length $self->{text};	1974	++$self->{cursor} if $self->{cursor} < length $self->{text};
1765	} elsif ($sym == CFClient::SDLK_HOME) {	1975	} elsif ($sym == CFPlus::SDLK_HOME) {
1766	$self->{cursor} = 0;	1976	$self->{cursor} = 0;
1767	} elsif ($sym == CFClient::SDLK_END) {	1977	} elsif ($sym == CFPlus::SDLK_END) {
1768	$self->{cursor} = length $text;	1978	$self->{cursor} = length $text;
		1979	} elsif ($uni == 21) { # ctrl-u
		1980	$text = "";
		1981	$self->{cursor} = 0;
1769	} elsif ($uni == 27) {	1982	} elsif ($uni == 27) {
1770	$self->_emit ('escape');	1983	$self->emit ('escape');
1771	} elsif ($uni) {	1984	} elsif ($uni >= 0x20 || $uni == 0x0d) {
1772	substr $text, $self->{cursor}++, 0, chr $uni;	1985	substr $text, $self->{cursor}++, 0, chr $uni;
1773	} else {	1986	} else {
1774	return 0;	1987	return 0;
1775	}	1988	}
1776		1989
1777	$self->_set_text ($text);	1990	$self->_set_text ($text);
1778		1991
1779	$self->realloc;	1992	$self->realloc;
		1993	$self->update;
1780		1994
1781	1	1995	1
1782	}	1996	}
1783		1997
1784	sub focus_in {	1998	sub invoke_focus_in {
1785	my ($self) = @_;	1999	my ($self) = @_;
1786		2000
1787	$self->{last_activity} = $::NOW;	2001	$self->{last_activity} = $::NOW;
1788		2002
1789	$self->SUPER::focus_in;	2003	$self->SUPER::invoke_focus_in
1790	}	2004	}
1791		2005
1792	sub button_down {	2006	sub invoke_button_down {
1793	my ($self, $ev, $x, $y) = @_;	2007	my ($self, $ev, $x, $y) = @_;
1794		2008
1795	$self->SUPER::button_down ($ev, $x, $y);	2009	$self->SUPER::invoke_button_down ($ev, $x, $y);
1796		2010
1797	my $idx = $self->{layout}->xy_to_index ($x, $y);	2011	my $idx = $self->{layout}->xy_to_index ($x, $y);
1798		2012
1799	# byte-index to char-index	2013	# byte-index to char-index
1800	my $text = $self->{text};	2014	my $text = $self->{text};
1801	utf8::encode $text;	2015	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802	$self->{cursor} = length substr $text, 0, $idx;	2016	$self->{cursor} = length $text;
1803		2017
1804	$self->_set_text ($self->{text});	2018	$self->_set_text ($self->{text});
1805	$self->update;	2019	$self->update;
1806		2020
1807	1	2021	1
1808	}	2022	}
1809		2023
1810	sub mouse_motion {	2024	sub invoke_mouse_motion {
1811	my ($self, $ev, $x, $y) = @_;	2025	my ($self, $ev, $x, $y) = @_;
1812	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2026	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813		2027
1814	0	2028	1
1815	}	2029	}
1816		2030
1817	sub _draw {	2031	sub _draw {
1818	my ($self) = @_;	2032	my ($self) = @_;
1819		2033
…		…
1846	utf8::encode $text;	2060	utf8::encode $text;
1847		2061
1848	@$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)
1849	}	2063	}
1850		2064
1851	glColor @{$self->{fg}};
1852	glBegin GL_LINES;	2065	glBegin GL_LINES;
1853	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};
1854	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};
1855	glEnd;	2068	glEnd;
1856	}	2069	}
1857	}	2070	}
1858		2071
		2072	#############################################################################
		2073
1859	package CFClient::UI::Entry;	2074	package CFPlus::UI::Entry;
1860		2075
1861	our @ISA = CFClient::UI::EntryBase::;	2076	our @ISA = CFPlus::UI::EntryBase::;
1862		2077
1863	use CFClient::OpenGL;	2078	use CFPlus::OpenGL;
1864		2079
1865	sub key_down {	2080	sub invoke_key_down {
1866	my ($self, $ev) = @_;	2081	my ($self, $ev) = @_;
1867		2082
1868	my $sym = $ev->{sym};	2083	my $sym = $ev->{sym};
1869		2084
1870	if ($sym == 13) {	2085	if ($ev->{uni} == 0x0d || $sym == 13) {
1871	unshift @{$self->{history}},	2086	unshift @{$self->{history}},
1872	my $txt = $self->get_text;	2087	my $txt = $self->get_text;
		2088
1873	$self->{history_pointer} = -1;	2089	$self->{history_pointer} = -1;
1874	$self->{history_saveback} = '';	2090	$self->{history_saveback} = '';
1875	$self->_emit (activate => $txt);	2091	$self->emit (activate => $txt);
1876	$self->update;	2092	$self->update;
1877		2093
1878	} elsif ($sym == CFClient::SDLK_UP) {	2094	} elsif ($sym == CFPlus::SDLK_UP) {
1879	if ($self->{history_pointer} < 0) {	2095	if ($self->{history_pointer} < 0) {
1880	$self->{history_saveback} = $self->get_text;	2096	$self->{history_saveback} = $self->get_text;
1881	}	2097	}
1882	if (@{$self->{history} || []} > 0) {	2098	if (@{$self->{history} || []} > 0) {
1883	$self->{history_pointer}++;	2099	$self->{history_pointer}++;
…		…
1885	$self->{history_pointer} = @{$self->{history} || []} - 1;	2101	$self->{history_pointer} = @{$self->{history} || []} - 1;
1886	}	2102	}
1887	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2103	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1888	}	2104	}
1889		2105
1890	} elsif ($sym == CFClient::SDLK_DOWN) {	2106	} elsif ($sym == CFPlus::SDLK_DOWN) {
1891	$self->{history_pointer}--;	2107	$self->{history_pointer}--;
1892	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2108	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893		2109
1894	if ($self->{history_pointer} >= 0) {	2110	if ($self->{history_pointer} >= 0) {
1895	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2111	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1896	} else {	2112	} else {
1897	$self->set_text ($self->{history_saveback});	2113	$self->set_text ($self->{history_saveback});
1898	}	2114	}
1899		2115
1900	} else {	2116	} else {
1901	return $self->SUPER::key_down ($ev)	2117	return $self->SUPER::invoke_key_down ($ev)
1902	}	2118	}
1903		2119
1904	1	2120	1
1905	}	2121	}
1906		2122
1907	#############################################################################	2123	#############################################################################
1908		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
1909	package CFClient::UI::Button;	2164	package CFPlus::UI::Button;
1910		2165
1911	our @ISA = CFClient::UI::Label::;	2166	our @ISA = CFPlus::UI::Label::;
1912		2167
1913	use CFClient::OpenGL;	2168	use CFPlus::OpenGL;
1914		2169
1915	my @tex =	2170	my @tex =
1916	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2171	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917	qw(b1_button_active.png);	2172	qw(b1_button_active.png);
1918		2173
1919	sub new {	2174	sub new {
1920	my $class = shift;	2175	my $class = shift;
1921		2176
…		…
1930	can_events => 1,	2185	can_events => 1,
1931	@_	2186	@_
1932	)	2187	)
1933	}	2188	}
1934		2189
1935	sub activate { }
1936
1937	sub button_up {	2190	sub invoke_button_up {
1938	my ($self, $ev, $x, $y) = @_;	2191	my ($self, $ev, $x, $y) = @_;
1939		2192
1940	$self->emit ("activate")	2193	$self->emit ("activate")
1941	if $x >= 0 && $x < $self->{w}	2194	if $x >= 0 && $x < $self->{w}
1942	&& $y >= 0 && $y < $self->{h};	2195	&& $y >= 0 && $y < $self->{h};
…		…
1960	$self->SUPER::_draw;	2213	$self->SUPER::_draw;
1961	}	2214	}
1962		2215
1963	#############################################################################	2216	#############################################################################
1964		2217
1965	package CFClient::UI::CheckBox;	2218	package CFPlus::UI::CheckBox;
1966		2219
1967	our @ISA = CFClient::UI::DrawBG::;	2220	our @ISA = CFPlus::UI::DrawBG::;
1968		2221
1969	my @tex =	2222	my @tex =
1970	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2224	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972		2225
1973	use CFClient::OpenGL;	2226	use CFPlus::OpenGL;
1974		2227
1975	sub new {	2228	sub new {
1976	my $class = shift;	2229	my $class = shift;
1977		2230
1978	$class->SUPER::new (	2231	$class->SUPER::new (
…		…
1992	my ($self) = @_;	2245	my ($self) = @_;
1993		2246
1994	(6) x 2	2247	(6) x 2
1995	}	2248	}
1996		2249
		2250	sub toggle {
		2251	my ($self) = @_;
		2252
		2253	$self->{state} = !$self->{state};
		2254	$self->emit (changed => $self->{state});
		2255	$self->update;
		2256	}
		2257
1997	sub button_down {	2258	sub invoke_button_down {
1998	my ($self, $ev, $x, $y) = @_;	2259	my ($self, $ev, $x, $y) = @_;
1999		2260
2000	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2261	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2262	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002	$self->{state} = !$self->{state};	2263	$self->toggle;
2003	$self->_emit (changed => $self->{state});
2004	} else {	2264	} else {
2005	return 0	2265	return 0
2006	}	2266	}
2007		2267
2008	1	2268	1
…		…
2028	glDisable GL_TEXTURE_2D;	2288	glDisable GL_TEXTURE_2D;
2029	}	2289	}
2030		2290
2031	#############################################################################	2291	#############################################################################
2032		2292
2033	package CFClient::UI::Image;	2293	package CFPlus::UI::Image;
2034		2294
2035	our @ISA = CFClient::UI::Base::;	2295	our @ISA = CFPlus::UI::Base::;
2036		2296
2037	use CFClient::OpenGL;	2297	use CFPlus::OpenGL;
2038	use Carp qw/confess/;
2039		2298
2040	our %loaded_images;	2299	our %texture_cache;
2041		2300
2042	sub new {	2301	sub new {
2043	my $class = shift;	2302	my $class = shift;
2044		2303
2045	my $self = $class->SUPER::new (can_events => 0, @_);	2304	my $self = $class->SUPER::new (
		2305	can_events => 0,
		2306	@_,
		2307	);
2046		2308
2047	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2309	$self->{path} || $self->{tex}
		2310	or Carp::croak "'path' or 'tex' attributes required";
2048		2311
2049	$loaded_images{$self->{image}} ||=	2312	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2050	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2313	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051		2314
2052	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2315	Scalar::Util::weaken $texture_cache{$self->{path}};
2053		2316
2054	Scalar::Util::weaken $loaded_images{$self->{image}};	2317	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056	$self->{aspect} = $tex->{w} / $tex->{h};
2057		2318
2058	$self	2319	$self
2059	}	2320	}
2060		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
2061	sub size_request {	2337	sub size_request {
2062	my ($self) = @_;	2338	my ($self) = @_;
2063		2339
2064	($self->{tex}->{w}, $self->{tex}->{h})	2340	($self->{tex}{w}, $self->{tex}{h})
2065	}	2341	}
2066		2342
2067	sub _draw {	2343	sub _draw {
2068	my ($self) = @_;	2344	my ($self) = @_;
2069		2345
…		…
2079	}	2355	}
2080		2356
2081	glEnable GL_TEXTURE_2D;	2357	glEnable GL_TEXTURE_2D;
2082	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2358	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083		2359
2084	$tex->draw_quad_alpha (0, 0, $w, $h);	2360	$tex->draw_quad (0, 0, $w, $h);
2085		2361
2086	glDisable GL_TEXTURE_2D;	2362	glDisable GL_TEXTURE_2D;
2087	}	2363	}
2088		2364
2089	#############################################################################	2365	#############################################################################
2090		2366
		2367	package CFPlus::UI::ImageButton;
		2368
		2369	our @ISA = CFPlus::UI::Image::;
		2370
		2371	use CFPlus::OpenGL;
		2372
		2373	my %textures;
		2374
		2375	sub new {
		2376	my $class = shift;
		2377
		2378	my $self = $class->SUPER::new (
		2379	padding_x => 4,
		2380	padding_y => 4,
		2381	fg => [1, 1, 1],
		2382	active_fg => [0, 0, 1],
		2383	can_hover => 1,
		2384	align => 0,
		2385	valign => 0,
		2386	can_events => 1,
		2387	@_
		2388	);
		2389	}
		2390
		2391	sub invoke_button_up {
		2392	my ($self, $ev, $x, $y) = @_;
		2393
		2394	$self->emit ("activate")
		2395	if $x >= 0 && $x < $self->{w}
		2396	&& $y >= 0 && $y < $self->{h};
		2397
		2398	1
		2399	}
		2400
		2401	#############################################################################
		2402
2091	package CFClient::UI::VGauge;	2403	package CFPlus::UI::VGauge;
2092		2404
2093	our @ISA = CFClient::UI::Base::;	2405	our @ISA = CFPlus::UI::Base::;
2094		2406
2095	use List::Util qw(min max);	2407	use List::Util qw(min max);
2096		2408
2097	use CFClient::OpenGL;	2409	use CFPlus::OpenGL;
2098		2410
2099	my %tex = (	2411	my %tex = (
2100	food => [	2412	food => [
2101	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2413	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2414	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103	],	2415	],
2104	grace => [	2416	grace => [
2105	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2417	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106	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/
2107	],	2419	],
2108	hp => [	2420	hp => [
2109	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2421	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2422	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111	],	2423	],
2112	mana => [	2424	mana => [
2113	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2425	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114	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/
2115	],	2427	],
2116	);	2428	);
2117		2429
2118	# eg. VGauge->new (gauge => 'food'), default gauge: food	2430	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2178	my $ycut1 = max 0, min 1, $ycut;	2490	my $ycut1 = max 0, min 1, $ycut;
2179	my $ycut2 = max 0, min 1, $ycut - 1;	2491	my $ycut2 = max 0, min 1, $ycut - 1;
2180		2492
2181	my $h1 = $self->{h} * (1 - $ycut1);	2493	my $h1 = $self->{h} * (1 - $ycut1);
2182	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);
2183		2498
2184	glEnable GL_BLEND;	2499	glEnable GL_BLEND;
2185	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2500	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2501	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187	glEnable GL_TEXTURE_2D;	2502	glEnable GL_TEXTURE_2D;
…		…
2206		2521
2207	if ($t3) {	2522	if ($t3) {
2208	glBindTexture GL_TEXTURE_2D, $t3->{name};	2523	glBindTexture GL_TEXTURE_2D, $t3->{name};
2209	glBegin GL_QUADS;	2524	glBegin GL_QUADS;
2210	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2525	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2526	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2527	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2528	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214	glEnd;	2529	glEnd;
2215	}	2530	}
2216		2531
2217	glDisable GL_BLEND;	2532	glDisable GL_BLEND;
2218	glDisable GL_TEXTURE_2D;	2533	glDisable GL_TEXTURE_2D;
2219	}	2534	}
2220		2535
2221	#############################################################################	2536	#############################################################################
2222		2537
2223	package CFClient::UI::Gauge;	2538	package CFPlus::UI::Gauge;
2224		2539
2225	our @ISA = CFClient::UI::VBox::;	2540	our @ISA = CFPlus::UI::VBox::;
2226		2541
2227	sub new {	2542	sub new {
2228	my ($class, %arg) = @_;	2543	my ($class, %arg) = @_;
2229		2544
2230	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
…		…
2232	can_hover => 1,	2547	can_hover => 1,
2233	can_events => 1,	2548	can_events => 1,
2234	%arg,	2549	%arg,
2235	);	2550	);
2236		2551
2237	$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");
2238	$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);
2239	$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");
2240		2555
2241	$self	2556	$self
2242	}	2557	}
2243		2558
2244	sub set_fontsize {	2559	sub set_fontsize {
…		…
2265	$self->{value}->set_text ($val);	2580	$self->{value}->set_text ($val);
2266	}	2581	}
2267		2582
2268	#############################################################################	2583	#############################################################################
2269		2584
2270	package CFClient::UI::Slider;	2585	package CFPlus::UI::Slider;
2271		2586
2272	use strict;	2587	use strict;
2273		2588
2274	use CFClient::OpenGL;	2589	use CFPlus::OpenGL;
2275		2590
2276	our @ISA = CFClient::UI::DrawBG::;	2591	our @ISA = CFPlus::UI::DrawBG::;
2277		2592
2278	my @tex =	2593	my @tex =
2279	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2594	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280	qw(s1_slider.png s1_slider_bg.png);	2595	qw(s1_slider.png s1_slider_bg.png);
2281		2596
2282	sub new {	2597	sub new {
2283	my $class = shift;	2598	my $class = shift;
2284		2599
…		…
2305	$self->update;	2620	$self->update;
2306		2621
2307	$self	2622	$self
2308	}	2623	}
2309		2624
2310	sub changed { }
2311
2312	sub set_range {	2625	sub set_range {
2313	my ($self, $range) = @_;	2626	my ($self, $range) = @_;
2314		2627
2315	($range, $self->{range}) = ($self->{range}, $range);	2628	($range, $self->{range}) = ($self->{range}, $range);
2316		2629
…		…
2336	if $unit;	2649	if $unit;
2337		2650
2338	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2651	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339		2652
2340	if ($value != $old_value) {	2653	if ($value != $old_value) {
2341	$self->_emit (changed => $value);	2654	$self->emit (changed => $value);
2342	$self->update;	2655	$self->update;
2343	}	2656	}
2344	}	2657	}
2345		2658
2346	sub size_request {	2659	sub size_request {
2347	my ($self) = @_;	2660	my ($self) = @_;
2348		2661
2349	($self->{req_w}, $self->{req_h})	2662	($self->{req_w}, $self->{req_h})
2350	}	2663	}
2351		2664
2352	sub button_down {	2665	sub invoke_button_down {
2353	my ($self, $ev, $x, $y) = @_;	2666	my ($self, $ev, $x, $y) = @_;
2354		2667
2355	$self->SUPER::button_down ($ev, $x, $y);	2668	$self->SUPER::invoke_button_down ($ev, $x, $y);
2356		2669
2357	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2670	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358		2671
2359	$self->mouse_motion ($ev, $x, $y)	2672	$self->invoke_mouse_motion ($ev, $x, $y)
2360	}	2673	}
2361		2674
2362	sub mouse_motion {	2675	sub invoke_mouse_motion {
2363	my ($self, $ev, $x, $y) = @_;	2676	my ($self, $ev, $x, $y) = @_;
2364		2677
2365	if ($GRAB == $self) {	2678	if ($GRAB == $self) {
2366	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2679	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367		2680
…		…
2373	} else {	2686	} else {
2374	return 0;	2687	return 0;
2375	}	2688	}
2376		2689
2377	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
2378	}	2701	}
2379		2702
2380	sub update {	2703	sub update {
2381	my ($self) = @_;	2704	my ($self) = @_;
2382		2705
…		…
2431	glDisable GL_TEXTURE_2D;	2754	glDisable GL_TEXTURE_2D;
2432	}	2755	}
2433		2756
2434	#############################################################################	2757	#############################################################################
2435		2758
2436	package CFClient::UI::ValSlider;	2759	package CFPlus::UI::ValSlider;
2437		2760
2438	our @ISA = CFClient::UI::HBox::;	2761	our @ISA = CFPlus::UI::HBox::;
2439		2762
2440	sub new {	2763	sub new {
2441	my ($class, %arg) = @_;	2764	my ($class, %arg) = @_;
2442		2765
2443	my $range = delete $arg{range};	2766	my $range = delete $arg{range};
2444		2767
2445	my $self = $class->SUPER::new (	2768	my $self = $class->SUPER::new (
2446	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2769	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2770	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448	to_value => sub { shift },	2771	to_value => sub { shift },
2449	from_value => sub { shift },	2772	from_value => sub { shift },
2450	%arg,	2773	%arg,
2451	);	2774	);
2452		2775
…		…
2472	sub set_range { shift->{slider}->set_range (@_) }	2795	sub set_range { shift->{slider}->set_range (@_) }
2473	sub set_value { shift->{slider}->set_value (@_) }	2796	sub set_value { shift->{slider}->set_value (@_) }
2474		2797
2475	#############################################################################	2798	#############################################################################
2476		2799
2477	package CFClient::UI::TextScroller;	2800	package CFPlus::UI::TextScroller;
2478		2801
2479	our @ISA = CFClient::UI::HBox::;	2802	our @ISA = CFPlus::UI::HBox::;
2480		2803
2481	use CFClient::OpenGL;	2804	use CFPlus::OpenGL;
2482		2805
2483	sub new {	2806	sub new {
2484	my $class = shift;	2807	my $class = shift;
2485		2808
2486	my $self = $class->SUPER::new (	2809	my $self = $class->SUPER::new (
2487	fontsize => 1,	2810	fontsize => 1,
2488	can_events => 0,	2811	can_events => 1,
2489	indent => 0,	2812	indent => 0,
2490	#font => default_font	2813	#font => default_font
2491	@_,	2814	@_,
2492		2815
2493	layout => (new CFClient::Layout 1),	2816	layout => (new CFPlus::Layout),
2494	par => [],	2817	par => [],
2495	height => 0,	2818	height => 0,
2496	children => [	2819	children => [
2497	(new CFClient::UI::Empty expand => 1),	2820	(new CFPlus::UI::Empty expand => 1),
2498	(new CFClient::UI::Slider vertical => 1),	2821	(new CFPlus::UI::Slider vertical => 1),
2499	],	2822	],
2500	);	2823	);
2501		2824
2502	$self->{children}[1]->connect (changed => sub { $self->update });	2825	$self->{children}[1]->connect (changed => sub { $self->update });
2503		2826
…		…
2509		2832
2510	$self->{fontsize} = $fontsize;	2833	$self->{fontsize} = $fontsize;
2511	$self->reflow;	2834	$self->reflow;
2512	}	2835	}
2513		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
2514	sub size_allocate {	2846	sub invoke_size_allocate {
2515	my ($self, $w, $h) = @_;	2847	my ($self, $w, $h) = @_;
2516		2848
2517	$self->SUPER::size_allocate ($w, $h);	2849	my ($empty, $slider, @other) = @{ $self->{children} };
		2850	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518		2851
2519	$self->{layout}->set_font ($self->{font}) if $self->{font};	2852	$self->{layout}->set_font ($self->{font}) if $self->{font};
2520	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2853	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521	$self->{layout}->set_width ($self->{children}[0]{w});	2854	$self->{layout}->set_width ($empty->{w});
2522	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2855	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523		2856
2524	$self->reflow;	2857	$self->reflow;
2525	}
2526		2858
2527	sub text_size {	2859	local $self->{children} = [$empty, $slider];
		2860	$self->SUPER::invoke_size_allocate ($w, $h)
		2861	}
		2862
		2863	sub invoke_mouse_wheel {
2528	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) = @_;
2529		2875
2530	my $layout = $self->{layout};	2876	my $layout = $self->{layout};
2531		2877
		2878	$layout->set_font ($self->{font}) if $self->{font};
		2879	$layout->set_foreground (@{$para->{fg}});
2532	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2880	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533	$layout->set_width ($self->{children}[0]{w} - $indent);	2881	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2882	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535	$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}}
2536		2889	);
		2890
2537	$layout->size	2891	$layout
2538	}	2892	}
2539		2893
2540	sub reflow {	2894	sub reflow {
2541	my ($self) = @_;	2895	my ($self) = @_;
2542		2896
…		…
2549		2903
2550	# todo: base offset on lines or so, not on pixels	2904	# todo: base offset on lines or so, not on pixels
2551	$self->{children}[1]->set_value ($offset);	2905	$self->{children}[1]->set_value ($offset);
2552	}	2906	}
2553		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
2554	sub clear {	2923	sub clear {
2555	my ($self) = @_;	2924	my ($self) = @_;
		2925
		2926	my (undef, undef, @other) = @{ $self->{children} };
		2927	$self->remove ($_) for @other;
2556		2928
2557	$self->{par} = [];	2929	$self->{par} = [];
2558	$self->{height} = 0;	2930	$self->{height} = 0;
2559	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2931	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560	}	2932	}
2561		2933
2562	sub add_paragraph {	2934	sub add_paragraph {
2563	my ($self, $color, $text, $indent) = @_;	2935	my $self = shift;
2564		2936
2565	for my $line (split /\n/, $text) {	2937	for my $para (@_) {
2566	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
2567	$self->{height} += $h;	2985	$self->{height} = $height;
2568	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2986	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569	}
2570		2987
2571	$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	}
2572	}	2994	}
2573		2995
2574	sub update {	2996	sub update {
2575	my ($self) = @_;	2997	my ($self) = @_;
2576		2998
…		…
2579	return unless $self->{h} > 0;	3001	return unless $self->{h} > 0;
2580		3002
2581	delete $self->{texture};	3003	delete $self->{texture};
2582		3004
2583	$ROOT->on_post_alloc ($self => sub {	3005	$ROOT->on_post_alloc ($self => sub {
		3006	$self->force_uptodate;
		3007
2584	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3008	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585		3009
2586	if (delete $self->{need_reflow}) {
2587	my $height = 0;
2588
2589	my $layout = $self->{layout};
2590
2591	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593	for (@{$self->{par}}) {
2594	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595	$layout->set_width ($W - $_->[3]);
2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597	$layout->set_markup ($_->[4]);
2598	my ($w, $h) = $layout->size;
2599	$_->[0] = $w + $_->[3];
2600	$_->[1] = $h;
2601	}
2602
2603	$height += $_->[1];
2604	}
2605
2606	$self->{height} = $height;
2607
2608	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610	delete $self->{texture};
2611	}
2612
2613	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3010	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614	glClearColor 0, 0, 0, 0;	3011	glClearColor 0, 0, 0, 0;
2615	glClear GL_COLOR_BUFFER_BIT;	3012	glClear GL_COLOR_BUFFER_BIT;
2616		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;
2617	my $top = int $self->{children}[1]{range}[0];	3022	my $top = int $self->{children}[1]{range}[0];
2618		3023
2619	my $y0 = $top;	3024	my $y0 = $top;
2620	my $y1 = $top + $H;	3025	my $y1 = $top + $H;
2621		3026
2622	my $y = 0;
2623
2624	my $layout = $self->{layout};
2625
2626	$layout->set_font ($self->{font}) if $self->{font};
2627
2628	glEnable GL_BLEND;
2629	#TODO# not correct in windows where rgba is forced off
2630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632	for my $par (@{$self->{par}}) {	3027	for my $para (@{$self->{par}}) {
2633	my $h = $par->[1];	3028	my $h = $para->{h};
		3029	my $y = $para->{y};
2634		3030
2635	if ($y0 < $y + $h && $y < $y1) {	3031	if ($y0 < $y + $h && $y < $y1) {
2636	$layout->set_foreground (@{ $par->[2] });	3032	my $layout = $self->get_layout ($para);
2637	$layout->set_width ($W - $par->[3]);
2638	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639	$layout->set_markup ($par->[4]);
2640		3033
2641	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3034	$layout->render ($para->{indent}, $y - $y0);
2642		3035
2643	glRasterPos $par->[3], $y - $y0;	3036	if (my @w = @{ $para->{widget} }) {
2644	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	}
2645	}	3048	}
2646		3049
2647	$y += $h;	3050	$paridx++;
		3051	$top_paragraph ||= $paridx if $y >= $top;
2648	}	3052	}
2649		3053
2650	glDisable GL_BLEND;	3054	$self->{top_paragraph} = $top_paragraph;
2651	};	3055	};
2652	});	3056	});
		3057	}
		3058
		3059	sub reconfigure {
		3060	my ($self) = @_;
		3061
		3062	$self->SUPER::reconfigure;
		3063
		3064	$_->{w} = 1e10 for @{ $self->{par} };
		3065	$self->reflow;
2653	}	3066	}
2654		3067
2655	sub _draw {	3068	sub _draw {
2656	my ($self) = @_;	3069	my ($self) = @_;
2657		3070
…		…
2660	glColor 0, 0, 0, 1;	3073	glColor 0, 0, 0, 1;
2661	$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});
2662	glDisable GL_TEXTURE_2D;	3075	glDisable GL_TEXTURE_2D;
2663		3076
2664	$self->{children}[1]->draw;	3077	$self->{children}[1]->draw;
2665
2666	}	3078	}
2667		3079
2668	#############################################################################	3080	#############################################################################
2669		3081
2670	package CFClient::UI::Animator;	3082	package CFPlus::UI::Animator;
2671		3083
2672	use CFClient::OpenGL;	3084	use CFPlus::OpenGL;
2673		3085
2674	our @ISA = CFClient::UI::Bin::;	3086	our @ISA = CFPlus::UI::Bin::;
2675		3087
2676	sub moveto {	3088	sub moveto {
2677	my ($self, $x, $y) = @_;	3089	my ($self, $x, $y) = @_;
2678		3090
2679	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3091	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2707	glPopMatrix;	3119	glPopMatrix;
2708	}	3120	}
2709		3121
2710	#############################################################################	3122	#############################################################################
2711		3123
2712	package CFClient::UI::Flopper;	3124	package CFPlus::UI::Flopper;
2713		3125
2714	our @ISA = CFClient::UI::Button::;	3126	our @ISA = CFPlus::UI::Button::;
2715		3127
2716	sub new {	3128	sub new {
2717	my $class = shift;	3129	my $class = shift;
2718		3130
2719	my $self = $class->SUPER::new (	3131	my $self = $class->SUPER::new (
…		…
2731	$self->{other}->toggle_visibility;	3143	$self->{other}->toggle_visibility;
2732	}	3144	}
2733		3145
2734	#############################################################################	3146	#############################################################################
2735		3147
2736	package CFClient::UI::Tooltip;	3148	package CFPlus::UI::Tooltip;
2737		3149
2738	our @ISA = CFClient::UI::Bin::;	3150	our @ISA = CFPlus::UI::Bin::;
2739		3151
2740	use CFClient::OpenGL;	3152	use CFPlus::OpenGL;
2741		3153
2742	sub new {	3154	sub new {
2743	my $class = shift;	3155	my $class = shift;
2744		3156
2745	$class->SUPER::new (	3157	$class->SUPER::new (
…		…
2748	)	3160	)
2749	}	3161	}
2750		3162
2751	sub set_tooltip_from {	3163	sub set_tooltip_from {
2752	my ($self, $widget) = @_;	3164	my ($self, $widget) = @_;
		3165
		3166	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3167	if $widget->{tooltip} =~ /^#(.*)$/;
2753		3168
2754	my $tooltip = $widget->{tooltip};	3169	my $tooltip = $widget->{tooltip};
2755		3170
2756	if ($ENV{CFPLUS_DEBUG} & 2) {	3171	if ($ENV{CFPLUS_DEBUG} & 2) {
2757	$tooltip .= "\n\n" . (ref $widget) . "\n"	3172	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2761	}	3176	}
2762		3177
2763	$tooltip =~ s/^\n+//;	3178	$tooltip =~ s/^\n+//;
2764	$tooltip =~ s/\n+$//;	3179	$tooltip =~ s/\n+$//;
2765		3180
2766	$self->add (new CFClient::UI::Label	3181	$self->add (new CFPlus::UI::Label
2767	markup => $tooltip,	3182	markup => $tooltip,
2768	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3183	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769	fontsize => 0.8,	3184	fontsize => 0.8,
2770	fg => [0, 0, 0, 1],	3185	style => 1, # FLAG_INVERSE
2771	ellipsise => 0,	3186	ellipsise => 0,
2772	font => ($widget->{tooltip_font} || $::FONT_PROP),	3187	font => ($widget->{tooltip_font} || $::FONT_PROP),
2773	);	3188	);
2774	}	3189	}
2775		3190
…		…
2779	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3194	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780		3195
2781	($w + 4, $h + 4)	3196	($w + 4, $h + 4)
2782	}	3197	}
2783		3198
2784	sub size_allocate {	3199	sub invoke_size_allocate {
2785	my ($self, $w, $h) = @_;	3200	my ($self, $w, $h) = @_;
2786		3201
2787	$self->SUPER::size_allocate ($w - 4, $h - 4);	3202	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788	}	3203	}
2789		3204
2790	sub visibility_change {	3205	sub invoke_visibility_change {
2791	my ($self, $visible) = @_;	3206	my ($self, $visible) = @_;
2792		3207
2793	return unless $visible;	3208	return unless $visible;
2794		3209
2795	$self->{root}->on_post_alloc ("move_$self" => sub {	3210	$self->{root}->on_post_alloc ("move_$self" => sub {
2796	my $widget = $self->{owner}	3211	my $widget = $self->{owner}
2797	or return;	3212	or return;
2798		3213
		3214	if ($widget->{visible}) {
2799	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3215	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800		3216
2801	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3217	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802	if $x + $self->{w} > $self->{root}{w};	3218	if $x + $self->{w} > $self->{root}{w};
2803		3219
2804	$self->move_abs ($x, $y);	3220	$self->move_abs ($x, $y);
		3221	} else {
		3222	$self->hide;
		3223	}
2805	});	3224	});
2806	}	3225	}
2807		3226
2808	sub _draw {	3227	sub _draw {
2809	my ($self) = @_;	3228	my ($self) = @_;
…		…
2833	$self->SUPER::_draw;	3252	$self->SUPER::_draw;
2834	}	3253	}
2835		3254
2836	#############################################################################	3255	#############################################################################
2837		3256
2838	package CFClient::UI::Face;	3257	package CFPlus::UI::Face;
2839		3258
2840	our @ISA = CFClient::UI::Base::;	3259	our @ISA = CFPlus::UI::DrawBG::;
2841		3260
2842	use CFClient::OpenGL;	3261	use CFPlus::OpenGL;
2843		3262
2844	sub new {	3263	sub new {
2845	my $class = shift;	3264	my $class = shift;
2846		3265
2847	my $self = $class->SUPER::new (	3266	my $self = $class->SUPER::new (
…		…
2882	sub _draw {	3301	sub _draw {
2883	my ($self) = @_;	3302	my ($self) = @_;
2884		3303
2885	return unless $::CONN;	3304	return unless $::CONN;
2886		3305
		3306	$self->SUPER::_draw;
		3307
2887	my $face;	3308	my $face;
2888		3309
2889	if ($self->{frame}) {	3310	if ($self->{frame}) {
2890	my $anim = $::CONN->{anim}[$self->{anim}];	3311	my $anim = $::CONN->{anim}[$self->{anim}];
2891		3312
…		…
2913	$self->SUPER::destroy;	3334	$self->SUPER::destroy;
2914	}	3335	}
2915		3336
2916	#############################################################################	3337	#############################################################################
2917		3338
2918	package CFClient::UI::Buttonbar;	3339	package CFPlus::UI::Buttonbar;
2919		3340
2920	our @ISA = CFClient::UI::HBox::;	3341	our @ISA = CFPlus::UI::HBox::;
2921		3342
2922	# TODO: should actualyl wrap buttons and other goodies.	3343	# TODO: should actually wrap buttons and other goodies.
2923		3344
2924	#############################################################################	3345	#############################################################################
2925		3346
2926	package CFClient::UI::Menu;	3347	package CFPlus::UI::Menu;
2927		3348
2928	our @ISA = CFClient::UI::FancyFrame::;	3349	our @ISA = CFPlus::UI::Toplevel::;
2929		3350
2930	use CFClient::OpenGL;	3351	use CFPlus::OpenGL;
2931		3352
2932	sub new {	3353	sub new {
2933	my $class = shift;	3354	my $class = shift;
2934		3355
2935	my $self = $class->SUPER::new (	3356	my $self = $class->SUPER::new (
2936	items => [],	3357	items => [],
2937	z => 100,	3358	z => 100,
2938	@_,	3359	@_,
2939	);	3360	);
2940		3361
2941	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3362	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942		3363
2943	for my $item (@{ $self->{items} }) {	3364	for my $item (@{ $self->{items} }) {
2944	my ($widget, $cb, $tooltip) = @$item;	3365	my ($widget, $cb, $tooltip) = @$item;
2945		3366
2946	# handle various types of items, only text for now	3367	# handle various types of items, only text for now
2947	if (!ref $widget) {	3368	if (!ref $widget) {
		3369	if ($widget =~ /\t/) {
		3370	my ($left, $right) = split /\t/, $widget, 2;
		3371
2948	$widget = new CFClient::UI::Label	3372	$widget = new CFPlus::UI::HBox
2949	can_hover => 1,	3373	can_hover => 1,
2950	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,
2951	markup => $widget,	3386	markup => $widget,
2952	tooltip => $tooltip	3387	tooltip => $tooltip;
		3388	}
2953	}	3389	}
2954		3390
2955	$self->{item}{$widget} = $item;	3391	$self->{item}{$widget} = $item;
2956		3392
2957	$self->{vbox}->add ($widget);	3393	$self->{vbox}->add ($widget);
…		…
2962		3398
2963	# popup given the event (must be a mouse button down event currently)	3399	# popup given the event (must be a mouse button down event currently)
2964	sub popup {	3400	sub popup {
2965	my ($self, $ev) = @_;	3401	my ($self, $ev) = @_;
2966		3402
2967	$self->_emit ("popdown");	3403	$self->emit ("popdown");
2968		3404
2969	# maybe save $GRAB? must be careful about events...	3405	# maybe save $GRAB? must be careful about events...
2970	$GRAB = $self;	3406	$GRAB = $self;
2971	$self->{button} = $ev->{button};	3407	$self->{button} = $ev->{button};
2972		3408
2973	$self->show;	3409	$self->show;
2974	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3410	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975	}	3411	}
2976		3412
2977	sub mouse_motion {	3413	sub invoke_mouse_motion {
2978	my ($self, $ev, $x, $y) = @_;	3414	my ($self, $ev, $x, $y) = @_;
2979		3415
2980	# TODO: should use vbox->find_widget or so	3416	# TODO: should use vbox->find_widget or so
2981	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3417	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982	$self->{hover} = $self->{item}{$HOVER};	3418	$self->{hover} = $self->{item}{$HOVER};
2983		3419
2984	0	3420	0
2985	}	3421	}
2986		3422
2987	sub button_up {	3423	sub invoke_button_up {
2988	my ($self, $ev, $x, $y) = @_;	3424	my ($self, $ev, $x, $y) = @_;
2989		3425
2990	if ($ev->{button} == $self->{button}) {	3426	if ($ev->{button} == $self->{button}) {
2991	undef $GRAB;	3427	undef $GRAB;
2992	$self->hide;	3428	$self->hide;
2993		3429
2994	$self->_emit ("popdown");	3430	$self->emit ("popdown");
2995	$self->{hover}[1]->() if $self->{hover};	3431	$self->{hover}[1]->() if $self->{hover};
2996	} else {	3432	} else {
2997	return 0	3433	return 0
2998	}	3434	}
2999		3435
3000	1	3436	1
3001	}	3437	}
3002		3438
3003	#############################################################################	3439	#############################################################################
3004		3440
3005	package CFClient::UI::Multiplexer;	3441	package CFPlus::UI::Multiplexer;
3006		3442
3007	our @ISA = CFClient::UI::Container::;	3443	our @ISA = CFPlus::UI::Container::;
3008		3444
3009	sub new {	3445	sub new {
3010	my $class = shift;	3446	my $class = shift;
3011		3447
3012	my $self = $class->SUPER::new (	3448	my $self = $class->SUPER::new (
…		…
3026		3462
3027	$self->{current} = $self->{children}[0]	3463	$self->{current} = $self->{children}[0]
3028	if @{ $self->{children} };	3464	if @{ $self->{children} };
3029	}	3465	}
3030		3466
		3467	sub get_current_page {
		3468	my ($self) = @_;
		3469
		3470	$self->{current}
		3471	}
		3472
3031	sub set_current_page {	3473	sub set_current_page {
3032	my ($self, $page_or_widget) = @_;	3474	my ($self, $page_or_widget) = @_;
3033		3475
3034	my $widget = ref $page_or_widget	3476	my $widget = ref $page_or_widget
3035	? $page_or_widget	3477	? $page_or_widget
3036	: $self->{children}[$page_or_widget];	3478	: $self->{children}[$page_or_widget];
3037		3479
3038	$self->{current} = $widget;	3480	$self->{current} = $widget;
3039	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3481	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040		3482
3041	$self->_emit (page_changed => $self->{current});	3483	$self->emit (page_changed => $self->{current});
3042		3484
3043	$self->realloc;	3485	$self->realloc;
3044	}	3486	}
3045		3487
3046	sub visible_children {	3488	sub visible_children {
…		…
3051	my ($self) = @_;	3493	my ($self) = @_;
3052		3494
3053	$self->{current}->size_request	3495	$self->{current}->size_request
3054	}	3496	}
3055		3497
3056	sub size_allocate {	3498	sub invoke_size_allocate {
3057	my ($self, $w, $h) = @_;	3499	my ($self, $w, $h) = @_;
3058		3500
3059	$self->{current}->configure (0, 0, $w, $h);	3501	$self->{current}->configure (0, 0, $w, $h);
		3502
		3503	1
3060	}	3504	}
3061		3505
3062	sub _draw {	3506	sub _draw {
3063	my ($self) = @_;	3507	my ($self) = @_;
3064		3508
3065	$self->{current}->draw;	3509	$self->{current}->draw;
3066	}	3510	}
3067		3511
3068	#############################################################################	3512	#############################################################################
3069		3513
3070	package CFClient::UI::Notebook;	3514	package CFPlus::UI::Notebook;
3071		3515
3072	our @ISA = CFClient::UI::VBox::;	3516	our @ISA = CFPlus::UI::VBox::;
3073		3517
3074	sub new {	3518	sub new {
3075	my $class = shift;	3519	my $class = shift;
3076		3520
3077	my $self = $class->SUPER::new (	3521	my $self = $class->SUPER::new (
3078	buttonbar => (new CFClient::UI::Buttonbar),	3522	buttonbar => (new CFPlus::UI::Buttonbar),
3079	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3523	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080	# filter => # will be put between multiplexer and $self	3524	# filter => # will be put between multiplexer and $self
3081	@_,	3525	@_,
3082	);	3526	);
3083		3527
3084	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3528	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3090	sub add {	3534	sub add {
3091	my ($self, $title, $widget, $tooltip) = @_;	3535	my ($self, $title, $widget, $tooltip) = @_;
3092		3536
3093	Scalar::Util::weaken $self;	3537	Scalar::Util::weaken $self;
3094		3538
3095	$self->{buttonbar}->add (new CFClient::UI::Button	3539	$self->{buttonbar}->add (new CFPlus::UI::Button
3096	markup => $title,	3540	markup => $title,
3097	tooltip => $tooltip,	3541	tooltip => $tooltip,
3098	on_activate => sub { $self->set_current_page ($widget) },	3542	on_activate => sub { $self->set_current_page ($widget) },
3099	);	3543	);
3100		3544
3101	$self->{multiplexer}->add ($widget);	3545	$self->{multiplexer}->add ($widget);
3102	}	3546	}
3103		3547
		3548	sub get_current_page {
		3549	my ($self) = @_;
		3550
		3551	$self->{multiplexer}->get_current_page
		3552	}
		3553
3104	sub set_current_page {	3554	sub set_current_page {
3105	my ($self, $page) = @_;	3555	my ($self, $page) = @_;
3106		3556
3107	$self->{multiplexer}->set_current_page ($page);	3557	$self->{multiplexer}->set_current_page ($page);
3108	$self->_emit (page_changed => $self->{multiplexer}{current});	3558	$self->emit (page_changed => $self->{multiplexer}{current});
3109	}	3559	}
3110		3560
3111	#############################################################################	3561	#############################################################################
3112		3562
3113	package CFClient::UI::Combobox;	3563	package CFPlus::UI::Selector;
3114		3564
3115	use utf8;	3565	use utf8;
3116		3566
3117	our @ISA = CFClient::UI::Button::;	3567	our @ISA = CFPlus::UI::Button::;
3118		3568
3119	sub new {	3569	sub new {
3120	my $class = shift;	3570	my $class = shift;
3121		3571
3122	my $self = $class->SUPER::new (	3572	my $self = $class->SUPER::new (
…		…
3128	$self->_set_value ($self->{value});	3578	$self->_set_value ($self->{value});
3129		3579
3130	$self	3580	$self
3131	}	3581	}
3132		3582
3133	sub button_down {	3583	sub invoke_button_down {
3134	my ($self, $ev) = @_;	3584	my ($self, $ev) = @_;
3135		3585
3136	my @menu_items;	3586	my @menu_items;
3137		3587
3138	for (@{ $self->{options} }) {	3588	for (@{ $self->{options} }) {
3139	my ($value, $title, $tooltip) = @$_;	3589	my ($value, $title, $tooltip) = @$_;
3140		3590
3141	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3591	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142	}	3592	}
3143		3593
3144	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3594	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145	}	3595	}
3146		3596
3147	sub _set_value {	3597	sub _set_value {
3148	my ($self, $value) = @_;	3598	my ($self, $value) = @_;
3149		3599
…		…
3159	my ($self, $value) = @_;	3609	my ($self, $value) = @_;
3160		3610
3161	return unless $self->{value} ne $value;	3611	return unless $self->{value} ne $value;
3162		3612
3163	$self->_set_value ($value);	3613	$self->_set_value ($value);
3164	$self->_emit (changed => $value);	3614	$self->emit (changed => $value);
3165	}	3615	}
3166		3616
3167	#############################################################################	3617	#############################################################################
3168		3618
3169	package CFClient::UI::Statusbox;	3619	package CFPlus::UI::Statusbox;
3170		3620
3171	our @ISA = CFClient::UI::VBox::;	3621	our @ISA = CFPlus::UI::VBox::;
3172		3622
3173	sub new {	3623	sub new {
3174	my $class = shift;	3624	my $class = shift;
3175		3625
3176	my $self = $class->SUPER::new (	3626	my $self = $class->SUPER::new (
…		…
3188	sub reorder {	3638	sub reorder {
3189	my ($self) = @_;	3639	my ($self) = @_;
3190	my $NOW = Time::HiRes::time;	3640	my $NOW = Time::HiRes::time;
3191		3641
3192	# freeze display when hovering over any label	3642	# freeze display when hovering over any label
3193	return if $CFClient::UI::TOOLTIP->{owner}	3643	return if $CFPlus::UI::TOOLTIP->{owner}
3194	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3644	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195	values %{ $self->{item} };	3645	values %{ $self->{item} };
3196		3646
3197	while (my ($k, $v) = each %{ $self->{item} }) {	3647	while (my ($k, $v) = each %{ $self->{item} }) {
3198	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3648	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199	}	3649	}
…		…
3220	for ($short) {	3670	for ($short) {
3221	s/^\s+//;	3671	s/^\s+//;
3222	s/\s+/ /g;	3672	s/\s+/ /g;
3223	}	3673	}
3224		3674
3225	new CFClient::UI::Label	3675	new CFPlus::UI::Label
3226	markup => $short,	3676	markup => $short,
3227	tooltip => $item->{tooltip},	3677	tooltip => $item->{tooltip},
3228	tooltip_font => $::FONT_PROP,	3678	tooltip_font => $::FONT_PROP,
3229	tooltip_width => 0.67,	3679	tooltip_width => 0.67,
3230	fontsize => $item->{fontsize} || $self->{fontsize},	3680	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3284	count => 1,	3734	count => 1,
3285	%arg,	3735	%arg,
3286	};	3736	};
3287	}	3737	}
3288		3738
		3739	$ROOT->on_refresh (reorder => sub {
3289	$self->reorder;	3740	$self->reorder;
		3741	});
3290	}	3742	}
3291		3743
3292	sub reconfigure {	3744	sub reconfigure {
3293	my ($self) = @_;	3745	my ($self) = @_;
3294		3746
…		…
3307	$self->SUPER::destroy;	3759	$self->SUPER::destroy;
3308	}	3760	}
3309		3761
3310	#############################################################################	3762	#############################################################################
3311		3763
3312	package CFClient::UI::Inventory;
3313
3314	our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316	sub new {
3317	my $class = shift;
3318
3319	my $self = $class->SUPER::new (
3320	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321	@_,
3322	);
3323
3324	$self
3325	}
3326
3327	sub set_items {
3328	my ($self, $items) = @_;
3329
3330	$self->{child}->clear;
3331	return unless $items;
3332
3333	my @items = sort {
3334	($a->{type} <=> $b->{type})
3335	or ($a->{name} cmp $b->{name})
3336	} @$items;
3337
3338	$self->{real_items} = \@items;
3339
3340	my $row = 0;
3341	for my $item (@items) {
3342	CFClient::Item::update_widgets $item;
3343
3344	$self->{child}->add (0, $row, $item->{face_widget});
3345	$self->{child}->add (1, $row, $item->{desc_widget});
3346	$self->{child}->add (2, $row, $item->{weight_widget});
3347
3348	$row++;
3349	}
3350	}
3351
3352	#############################################################################
3353
3354	package CFClient::UI::BindEditor;
3355
3356	our @ISA = CFClient::UI::FancyFrame::;
3357
3358	sub new {
3359	my $class = shift;
3360
3361	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363	$self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367	text => "start recording",
3368	tooltip => "Start/Stops recording of actions."
3369	."All subsequent actions after the recording started will be captured."
3370	."The actions are displayed after the record was stopped."
3371	."To bind the action you have to click on the 'Bind' button",
3372	on_activate => sub {
3373	unless ($self->{recording}) {
3374	$self->start;
3375	} else {
3376	$self->stop;
3377	}
3378	});
3379
3380	$vb->add (new CFClient::UI::Label text => "Actions:");
3381	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3384	$vb->add (my $hb = new CFClient::UI::HBox);
3385	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386	$hb->add (new CFClient::UI::Button
3387	text => "bind",
3388	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389	on_activate => sub {
3390	$self->ask_for_bind;
3391	});
3392
3393	$vb->add (my $hb = new CFClient::UI::HBox);
3394	$hb->add (new CFClient::UI::Button
3395	text => "ok",
3396	expand => 1,
3397	tooltip => "This closes the binding editor and saves the binding",
3398	on_activate => sub {
3399	$self->hide;
3400	$self->commit;
3401	});
3402
3403	$hb->add (new CFClient::UI::Button
3404	text => "cancel",
3405	expand => 1,
3406	tooltip => "This closes the binding editor without saving",
3407	on_activate => sub {
3408	$self->hide;
3409	$self->{binding_cancel}->()
3410	if $self->{binding_cancel};
3411	});
3412
3413	$self->update_binding_widgets;
3414
3415	$self
3416	}
3417
3418	sub commit {
3419	my ($self) = @_;
3420	my ($mod, $sym, $cmds) = $self->get_binding;
3421	if ($sym != 0 && @$cmds > 0) {
3422	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423	."'. Don't forget 'Save Config'!");
3424	$self->{binding_change}->($mod, $sym, $cmds)
3425	if $self->{binding_change};
3426	} else {
3427	$::STATUSBOX->add ("No action bound, no key or action specified!");
3428	$self->{binding_cancel}->()
3429	if $self->{binding_cancel};
3430	}
3431	}
3432
3433	sub start {
3434	my ($self) = @_;
3435
3436	$self->{rec_btn}->set_text ("stop recording");
3437	$self->{recording} = 1;
3438	$self->clear_command_list;
3439	$::CONN->start_record if $::CONN;
3440	}
3441
3442	sub stop {
3443	my ($self) = @_;
3444
3445	$self->{rec_btn}->set_text ("start recording");
3446	$self->{recording} = 0;
3447
3448	my $rec;
3449	$rec = $::CONN->stop_record if $::CONN;
3450	return unless ref $rec eq 'ARRAY';
3451	$self->set_command_list ($rec);
3452	}
3453
3454
3455	sub ask_for_bind_and_commit {
3456	my ($self) = @_;
3457	$self->ask_for_bind (1);
3458	}
3459
3460	sub ask_for_bind {
3461	my ($self, $commit) = @_;
3462
3463	CFClient::Binder::open_binding_dialog (sub {
3464	my ($mod, $sym) = @_;
3465	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466	$self->update_binding_widgets;
3467	$self->commit if $commit;
3468	});
3469	}
3470
3471	# $mod and $sym are the modifiers and key symbol
3472	# $cmds is a array ref of strings (the commands)
3473	# $cb is the callback that is executed on OK
3474	# $ccb is the callback that is executed on CANCEL and
3475	# when the binding was unsuccessful on OK
3476	sub set_binding {
3477	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479	$self->clear_command_list;
3480	$self->{recording} = 0;
3481	$self->{rec_btn}->set_text ("start recording");
3482
3483	$self->{binding} = [$mod, $sym];
3484	$self->{commands} = $cmds;
3485
3486	$self->{binding_change} = $cb;
3487	$self->{binding_cancel} = $ccb;
3488
3489	$self->update_binding_widgets;
3490	}
3491
3492	# this is a shortcut method that asks for a binding
3493	# and then just binds it.
3494	sub do_quick_binding {
3495	my ($self, $cmds) = @_;
3496	$self->set_binding (undef, undef, $cmds, sub {
3497	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498	});
3499	$self->ask_for_bind (1);
3500	}
3501
3502	sub update_binding_widgets {
3503	my ($self) = @_;
3504	my ($mod, $sym, $cmds) = $self->get_binding;
3505	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506	$self->set_command_list ($cmds);
3507	}
3508
3509	sub get_binding {
3510	my ($self) = @_;
3511	return (
3512	$self->{binding}->[0],
3513	$self->{binding}->[1],
3514	[ grep { defined $_ } @{$self->{commands}} ]
3515	);
3516	}
3517
3518	sub clear_command_list {
3519	my ($self) = @_;
3520	$self->{cmdbox}->clear ();
3521	}
3522
3523	sub set_command_list {
3524	my ($self, $cmds) = @_;
3525
3526	$self->{cmdbox}->clear ();
3527	$self->{commands} = $cmds;
3528
3529	my $idx = 0;
3530
3531	for (@$cmds) {
3532	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534	my $i = $idx;
3535	$hb->add (new CFClient::UI::Label text => $_);
3536	$hb->add (new CFClient::UI::Button
3537	text => "delete",
3538	tooltip => "Deletes the action from the record",
3539	on_activate => sub {
3540	$self->{cmdbox}->remove ($hb);
3541	$cmds->[$i] = undef;
3542	});
3543
3544
3545	$idx++
3546	}
3547	}
3548
3549	#############################################################################
3550
3551	package CFClient::UI::SpellList;
3552
3553	our @ISA = CFClient::UI::Table::;
3554
3555	sub new {
3556	my $class = shift;
3557
3558	my $self = $class->SUPER::new (
3559	binding => [],
3560	commands => [],
3561	@_,
3562	)
3563	}
3564
3565	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578	sub rebuild_spell_list {
3579	my ($self) = @_;
3580
3581	$CFClient::UI::ROOT->on_refresh ($self => sub {
3582	$self->clear;
3583
3584	return unless $::CONN;
3585
3586	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592	my $row = 0;
3593
3594	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595	my $spell = $self->{spell}{$_};
3596
3597	$row++;
3598
3599	my $spell_cb = sub {
3600	my ($widget, $ev) = @_;
3601
3602	if ($ev->{button} == 1) {
3603	$::CONN->user_send ("cast $spell->{name}");
3604	} elsif ($ev->{button} == 2) {
3605	$::CONN->user_send ("invoke $spell->{name}");
3606	} elsif ($ev->{button} == 3) {
3607	(new CFClient::UI::Menu
3608	items => [
3609	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611	],
3612	)->popup ($ev);
3613	} else {
3614	return 0;
3615	}
3616
3617	1
3618	};
3619
3620	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622	#TODO: add path info to tooltip
3623	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625	$self->add (0, $row, new CFClient::UI::Face
3626	face => $spell->{face},
3627	can_hover => 1,
3628	can_events => 1,
3629	tooltip => $tooltip,
3630	on_button_down => $spell_cb,
3631	);
3632
3633	$self->add (1, $row, new CFClient::UI::Label
3634	expand => 1,
3635	text => $spell->{name},
3636	can_hover => 1,
3637	can_events => 1,
3638	tooltip => $tooltip,
3639	on_button_down => $spell_cb,
3640	);
3641
3642	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646	}
3647	});
3648	}
3649
3650	sub add_spell {
3651	my ($self, $spell) = @_;
3652
3653	$self->{spell}->{$spell->{name}} = $spell;
3654	$self->rebuild_spell_list;
3655	}
3656
3657	sub remove_spell {
3658	my ($self, $spell) = @_;
3659
3660	delete $self->{spell}->{$spell->{name}};
3661	$self->rebuild_spell_list;
3662	}
3663
3664	sub clear_spells {
3665	my ($self) = @_;
3666
3667	$self->{spell} = {};
3668	$self->rebuild_spell_list;
3669	}
3670
3671	#############################################################################
3672
3673	package CFClient::UI::Root;	3764	package CFPlus::UI::Root;
3674		3765
3675	our @ISA = CFClient::UI::Container::;	3766	our @ISA = CFPlus::UI::Container::;
3676		3767
3677	use List::Util qw(min max);	3768	use List::Util qw(min max);
3678		3769
3679	use CFClient::OpenGL;	3770	use CFPlus::OpenGL;
3680		3771
3681	sub new {	3772	sub new {
3682	my $class = shift;	3773	my $class = shift;
3683		3774
3684	my $self = $class->SUPER::new (	3775	my $self = $class->SUPER::new (
…		…
3709	$coord = $max - $size if $coord > $max - $size;	3800	$coord = $max - $size if $coord > $max - $size;
3710		3801
3711	int $coord + 0.5	3802	int $coord + 0.5
3712	}	3803	}
3713		3804
3714	sub size_allocate {	3805	sub invoke_size_allocate {
3715	my ($self, $w, $h) = @_;	3806	my ($self, $w, $h) = @_;
3716		3807
3717	for my $child ($self->children) {	3808	for my $child ($self->children) {
3718	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3809	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719		3810
…		…
3723	$X = _to_pixel $X, $W, $self->{w};	3814	$X = _to_pixel $X, $W, $self->{w};
3724	$Y = _to_pixel $Y, $H, $self->{h};	3815	$Y = _to_pixel $Y, $H, $self->{h};
3725		3816
3726	$child->configure ($X, $Y, $W, $H);	3817	$child->configure ($X, $Y, $W, $H);
3727	}	3818	}
		3819
		3820	1
3728	}	3821	}
3729		3822
3730	sub coord2local {	3823	sub coord2local {
3731	my ($self, $x, $y) = @_;	3824	my ($self, $x, $y) = @_;
3732		3825
…		…
3858	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3951	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859		3952
3860	$w = 0 if $w < 0;	3953	$w = 0 if $w < 0;
3861	$h = 0 if $h < 0;	3954	$h = 0 if $h < 0;
3862		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
3863	$w = int $w + 0.5;	3965	$w = int $w + 0.5;
3864	$h = int $h + 0.5;	3966	$h = int $h + 0.5;
3865		3967
3866	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}) {
3867	$widget->{old_w} = $widget->{w};	3969	$widget->{old_w} = $widget->{w};
…		…
3890	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3992	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891	glMatrixMode GL_MODELVIEW;	3993	glMatrixMode GL_MODELVIEW;
3892	glLoadIdentity;	3994	glLoadIdentity;
3893		3995
3894	{	3996	{
3895	package CFClient::UI::Base;	3997	package CFPlus::UI::Base;
3896		3998
3897	($draw_x, $draw_y, $draw_w, $draw_h) =	3999	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898	(0, 0, $self->{w}, $self->{h});	4000	(0, 0, $self->{w}, $self->{h});
3899	}
3900		4001
3901	$self->_draw;	4002	$self->_draw;
		4003	}
3902	}	4004	}
3903		4005
3904	#############################################################################	4006	#############################################################################
3905		4007
3906	package CFClient::UI;	4008	package CFPlus::UI;
3907		4009
3908	$ROOT = new CFClient::UI::Root;	4010	$ROOT = new CFPlus::UI::Root;
3909	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4011	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910		4012
3911	1	4013	1
3912		4014

Diff Legend

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