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.286 by root, Mon Jun 5 03:48:49 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
…		…
272		296
273	return unless $self->{visible};	297	return unless $self->{visible};
274		298
275	$_->set_invisible for $self->children;	299	$_->set_invisible for $self->children;
276		300
		301	delete $self->{visible};
277	delete $self->{root};	302	delete $self->{root};
278	delete $self->{visible};
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) = @_;
…		…
315	}	338	}
316		339
317	sub move_abs {	340	sub move_abs {
318	my ($self, $x, $y, $z) = @_;	341	my ($self, $x, $y, $z) = @_;
319		342
320	$self->{x} = List::Util::max 0, int $x;	343	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321	$self->{y} = List::Util::max 0, int $y;	344	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322	$self->{z} = $z if defined $z;	345	$self->{z} = $z if defined $z;
323		346
324	$self->update;	347	$self->update;
325	}	348	}
326		349
…		…
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
		648	return if CFPlus::in_destruct;
		649
		650	eval { $self->destroy };
		651	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		652
597	delete $WIDGET{$self+0};	653	delete $WIDGET{$self+0};
598	#$self->deactivate;
599	}	654	}
600		655
601	#############################################################################	656	#############################################################################
602		657
603	package CFClient::UI::DrawBG;	658	package CFPlus::UI::DrawBG;
604		659
605	our @ISA = CFClient::UI::Base::;	660	our @ISA = CFPlus::UI::Base::;
606		661
607	use strict;	662	use strict;
608	use CFClient::OpenGL;	663	use CFPlus::OpenGL;
609		664
610	sub new {	665	sub new {
611	my $class = shift;	666	my $class = shift;
612		667
613	# range [value, low, high, page]	668	# range [value, low, high, page]
…		…
644	}	699	}
645	}	700	}
646		701
647	#############################################################################	702	#############################################################################
648		703
649	package CFClient::UI::Empty;	704	package CFPlus::UI::Empty;
650		705
651	our @ISA = CFClient::UI::Base::;	706	our @ISA = CFPlus::UI::Base::;
652		707
653	sub new {	708	sub new {
654	my ($class, %arg) = @_;	709	my ($class, %arg) = @_;
655	$class->SUPER::new (can_events => 0, %arg);	710	$class->SUPER::new (can_events => 0, %arg);
656	}	711	}
…		…
663		718
664	sub draw { }	719	sub draw { }
665		720
666	#############################################################################	721	#############################################################################
667		722
668	package CFClient::UI::Container;	723	package CFPlus::UI::Container;
669		724
670	our @ISA = CFClient::UI::Base::;	725	our @ISA = CFPlus::UI::Base::;
671		726
672	sub new {	727	sub new {
673	my ($class, %arg) = @_;	728	my ($class, %arg) = @_;
674		729
675	my $children = delete $arg{children};	730	my $children = delete $arg{children};
…		…
684	if $children;	739	if $children;
685		740
686	$self	741	$self
687	}	742	}
688		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
689	sub add {	752	sub add {
690	my ($self, @widgets) = @_;	753	my ($self, @widgets) = @_;
691		754
692	$_->set_parent ($self)	755	$_->set_parent ($self)
693	for @widgets;	756	for @widgets;
…		…
753	$_->draw for @{$self->{children}};	816	$_->draw for @{$self->{children}};
754	}	817	}
755		818
756	#############################################################################	819	#############################################################################
757		820
758	package CFClient::UI::Bin;	821	package CFPlus::UI::Bin;
759		822
760	our @ISA = CFClient::UI::Container::;	823	our @ISA = CFPlus::UI::Container::;
761		824
762	sub new {	825	sub new {
763	my ($class, %arg) = @_;	826	my ($class, %arg) = @_;
764		827
765	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	828	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766		829
767	$class->SUPER::new (children => [$child], %arg)	830	$class->SUPER::new (children => [$child], %arg)
768	}	831	}
769		832
770	sub add {	833	sub add {
771	my ($self, $child) = @_;	834	my ($self, $child) = @_;
772		835
773	$self->{children} = [];	836	$self->SUPER::remove ($_) for @{ $self->{children} };
774
775	$self->SUPER::add ($child);	837	$self->SUPER::add ($child);
776	}	838	}
777		839
778	sub remove {	840	sub remove {
779	my ($self, $widget) = @_;	841	my ($self, $widget) = @_;
780		842
781	$self->SUPER::remove ($widget);	843	$self->SUPER::remove ($widget);
782		844
783	$self->{children} = [new CFClient::UI::Empty]	845	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	846	unless @{$self->{children}};
785	}	847	}
786		848
787	sub child { $_[0]->{children}[0] }	849	sub child { $_[0]->{children}[0] }
788		850
789	sub size_request {	851	sub size_request {
790	$_[0]{children}[0]->size_request	852	$_[0]{children}[0]->size_request
791	}	853	}
792		854
793	sub size_allocate {	855	sub invoke_size_allocate {
794	my ($self, $w, $h) = @_;	856	my ($self, $w, $h) = @_;
795		857
796	$self->{children}[0]->configure (0, 0, $w, $h);	858	$self->{children}[0]->configure (0, 0, $w, $h);
		859
		860	1
797	}	861	}
798		862
799	#############################################################################	863	#############################################################################
800		864
801	# back-buffered drawing area	865	# back-buffered drawing area
802		866
803	package CFClient::UI::Window;	867	package CFPlus::UI::Window;
804		868
805	our @ISA = CFClient::UI::Bin::;	869	our @ISA = CFPlus::UI::Bin::;
806		870
807	use CFClient::OpenGL;	871	use CFPlus::OpenGL;
808		872
809	sub new {	873	sub new {
810	my ($class, %arg) = @_;	874	my ($class, %arg) = @_;
811		875
812	my $self = $class->SUPER::new (%arg);	876	my $self = $class->SUPER::new (%arg);
…		…
817		881
818	$ROOT->on_post_alloc ($self => sub { $self->render_child });	882	$ROOT->on_post_alloc ($self => sub { $self->render_child });
819	$self->SUPER::update;	883	$self->SUPER::update;
820	}	884	}
821		885
822	sub size_allocate {	886	sub invoke_size_allocate {
823	my ($self, $w, $h) = @_;	887	my ($self, $w, $h) = @_;
824		888
825	$self->SUPER::size_allocate ($w, $h);
826	$self->update;	889	$self->update;
		890
		891	$self->SUPER::invoke_size_allocate ($w, $h)
827	}	892	}
828		893
829	sub _render {	894	sub _render {
830	my ($self) = @_;	895	my ($self) = @_;
831		896
…		…
833	}	898	}
834		899
835	sub render_child {	900	sub render_child {
836	my ($self) = @_;	901	my ($self) = @_;
837		902
838	$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 {
839	glClearColor 0, 0, 0, 0;	904	glClearColor 0, 0, 0, 0;
840	glClear GL_COLOR_BUFFER_BIT;	905	glClear GL_COLOR_BUFFER_BIT;
841		906
842	{	907	{
843	package CFClient::UI::Base;	908	package CFPlus::UI::Base;
844		909
845	($draw_x, $draw_y, $draw_w, $draw_h) =	910	local ($draw_x, $draw_y, $draw_w, $draw_h) =
846	(0, 0, $self->{w}, $self->{h});	911	(0, 0, $self->{w}, $self->{h});
		912
		913	$self->_render;
847	}	914	}
848
849	$self->_render;
850	};	915	};
851	}	916	}
852		917
853	sub _draw {	918	sub _draw {
854	my ($self) = @_;	919	my ($self) = @_;
855
856	my ($w, $h) = @$self{qw(w h)};
857		920
858	my $tex = $self->{texture}	921	my $tex = $self->{texture}
859	or return;	922	or return;
860		923
861	glEnable GL_TEXTURE_2D;	924	glEnable GL_TEXTURE_2D;
862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	925	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863	glColor 0, 0, 0, 1;	926	glColor 0, 0, 0, 1;
864		927
865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	928	$tex->draw_quad_alpha_premultiplied (0, 0);
866		929
867	glDisable GL_TEXTURE_2D;	930	glDisable GL_TEXTURE_2D;
868	}	931	}
869		932
870	#############################################################################	933	#############################################################################
871		934
872	package CFClient::UI::ViewPort;	935	package CFPlus::UI::ViewPort;
873		936
874	our @ISA = CFClient::UI::Window::;	937	our @ISA = CFPlus::UI::Window::;
875		938
876	sub new {	939	sub new {
877	my $class = shift;	940	my $class = shift;
878		941
879	$class->SUPER::new (	942	$class->SUPER::new (
…		…
892	$h = 10 if $self->{scroll_y};	955	$h = 10 if $self->{scroll_y};
893		956
894	($w, $h)	957	($w, $h)
895	}	958	}
896		959
897	sub size_allocate {	960	sub invoke_size_allocate {
898	my ($self, $w, $h) = @_;	961	my ($self, $w, $h) = @_;
899		962
900	my $child = $self->child;	963	my $child = $self->child;
901		964
902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	965	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	966	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904		967
905	$self->child->configure (0, 0, $w, $h);	968	$self->child->configure (0, 0, $w, $h);
906	$self->update;	969	$self->update;
		970
		971	1
907	}	972	}
908		973
909	sub set_offset {	974	sub set_offset {
910	my ($self, $x, $y) = @_;	975	my ($self, $x, $y) = @_;
911		976
…		…
937	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1002	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1003	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
939	) {	1004	) {
940	$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})
941	} else {	1006	} else {
942	$self->CFClient::UI::Base::find_widget ($x, $y)	1007	$self->CFPlus::UI::Base::find_widget ($x, $y)
943	}	1008	}
944	}	1009	}
945		1010
946	sub _render {	1011	sub _render {
947	my ($self) = @_;	1012	my ($self) = @_;
948		1013
949	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};
950	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};
951		1016
952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1017	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953		1018
954	$self->SUPER::_render;	1019	$self->SUPER::_render;
955	}	1020	}
956		1021
957	#############################################################################	1022	#############################################################################
958		1023
959	package CFClient::UI::ScrolledWindow;	1024	package CFPlus::UI::ScrolledWindow;
960		1025
961	our @ISA = CFClient::UI::HBox::;	1026	our @ISA = CFPlus::UI::HBox::;
962		1027
963	sub new {	1028	sub new {
964	my ($class, %arg) = @_;	1029	my ($class, %arg) = @_;
965		1030
966	my $child = delete $arg{child};	1031	my $child = delete $arg{child};
967		1032
968	my $self;	1033	my $self;
969		1034
970	my $slider = new CFClient::UI::Slider	1035	my $slider = new CFPlus::UI::Slider
971	vertical => 1,	1036	vertical => 1,
972	range => [0, 0, 1, 0.01], # HACK fix	1037	range => [0, 0, 1, 0.01], # HACK fix
973	on_changed => sub {	1038	on_changed => sub {
974	$self->{vp}->set_offset (0, $_[1]);	1039	$self->{vp}->set_offset (0, $_[1]);
975	},	1040	},
976	;	1041	;
977		1042
978	$self = $class->SUPER::new (	1043	$self = $class->SUPER::new (
979	vp => (new CFClient::UI::ViewPort expand => 1),	1044	vp => (new CFPlus::UI::ViewPort expand => 1),
		1045	can_events => 1,
980	slider => $slider,	1046	slider => $slider,
981	%arg,	1047	%arg,
982	);	1048	);
983		1049
984	$self->SUPER::add ($self->{vp}, $self->{slider});	1050	$self->SUPER::add ($self->{vp}, $self->{slider});
985	$self->add ($child) if $child;	1051	$self->add ($child) if $child;
986		1052
987	$self	1053	$self
988	}	1054	}
989		1055
		1056	#TODO# update range on size_allocate depending on child
		1057
990	sub add {	1058	sub add {
991	my ($self, $widget) = @_;	1059	my ($self, $widget) = @_;
992		1060
993	$self->{vp}->add ($self->{child} = $widget);	1061	$self->{vp}->add ($self->{child} = $widget);
994	}	1062	}
995		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
996	sub update {	1080	sub update {
997	my ($self) = @_;	1081	my ($self) = @_;
998		1082
999	$self->SUPER::update;	1083	$self->SUPER::update;
1000		1084
1001	# todo: overwrite size_allocate of child	1085	$self->update_slider;
1002	my $child = $self->{vp}->child;
1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004	}	1086	}
1005		1087
1006	sub size_allocate {	1088	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1089	my ($self, $w, $h) = @_;
1008		1090
		1091	$self->update_slider;
		1092
1009	$self->SUPER::size_allocate ($w, $h);	1093	$self->SUPER::invoke_size_allocate ($w, $h)
1010
1011	my $child = $self->{vp}->child;
1012	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013	}	1094	}
1014
1015	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll
1017		1095
1018	#############################################################################	1096	#############################################################################
1019		1097
1020	package CFClient::UI::Frame;	1098	package CFPlus::UI::Frame;
1021		1099
1022	our @ISA = CFClient::UI::Bin::;	1100	our @ISA = CFPlus::UI::Bin::;
1023		1101
1024	use CFClient::OpenGL;	1102	use CFPlus::OpenGL;
1025		1103
1026	sub new {	1104	sub new {
1027	my $class = shift;	1105	my $class = shift;
1028		1106
1029	$class->SUPER::new (	1107	$class->SUPER::new (
…		…
1055	$self->SUPER::_draw;	1133	$self->SUPER::_draw;
1056	}	1134	}
1057		1135
1058	#############################################################################	1136	#############################################################################
1059		1137
1060	package CFClient::UI::FancyFrame;	1138	package CFPlus::UI::FancyFrame;
1061		1139
1062	our @ISA = CFClient::UI::Bin::;	1140	our @ISA = CFPlus::UI::Bin::;
1063		1141
1064	use CFClient::OpenGL;	1142	use CFPlus::OpenGL;
1065
1066	my $bg =
1067	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068	mipmap => 1, wrap => 1;
1069
1070	my @border =
1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073		1143
1074	sub new {	1144	sub new {
1075	my ($class, %arg) = @_;	1145	my ($class, %arg) = @_;
1076		1146
1077	my $title = delete $arg{title};	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;
		1243
		1244	my $bg =
		1245	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1246	mipmap => 1, wrap => 1;
		1247
		1248	my @border =
		1249	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1250	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1251
		1252	sub new {
		1253	my ($class, %arg) = @_;
1078		1254
1079	my $self = $class->SUPER::new (	1255	my $self = $class->SUPER::new (
1080	bg => [1, 1, 1, 1],	1256	bg => [1, 1, 1, 1],
1081	border_bg => [1, 1, 1, 1],	1257	border_bg => [1, 1, 1, 1],
1082	border => 0.6,	1258	border => 0.6,
1083	can_events => 1,	1259	can_events => 1,
1084	min_w => 16,	1260	min_w => 64,
1085	min_h => 16,	1261	min_h => 32,
1086	%arg,	1262	%arg,
1087	);	1263	);
1088		1264
1089	$self->{title} = new CFClient::UI::Label	1265	$self->{title_widget} = new CFPlus::UI::Label
1090	align => 0,	1266	align => 0,
1091	valign => 1,	1267	valign => 1,
1092	text => $title,	1268	text => $self->{title},
1093	fontsize => $self->{border}	1269	fontsize => $self->{border},
1094	if defined $title;	1270	if exists $self->{title};
		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	}
1095		1280
1096	$self	1281	$self
1097	}	1282	}
1098		1283
1099	sub add {	1284	sub add {
1100	my ($self, @widgets) = @_;	1285	my ($self, @widgets) = @_;
1101		1286
1102	$self->SUPER::add (@widgets);	1287	$self->SUPER::add (@widgets);
		1288	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1289	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104	}	1290	}
1105		1291
1106	sub border {	1292	sub border {
1107	int $_[0]{border} * $::FONTSIZE	1293	int $_[0]{border} * $::FONTSIZE
1108	}	1294	}
1109		1295
1110	sub size_request {	1296	sub size_request {
1111	my ($self) = @_;	1297	my ($self) = @_;
1112		1298
1113	$self->{title}->size_request	1299	$self->{title_widget}->size_request
1114	if $self->{title};	1300	if $self->{title_widget};
		1301
		1302	$self->{close_button}->size_request
		1303	if $self->{close_button};
1115		1304
1116	my ($w, $h) = $self->SUPER::size_request;	1305	my ($w, $h) = $self->SUPER::size_request;
1117		1306
1118	(	1307	(
1119	$w + $self->border * 2,	1308	$w + $self->border * 2,
1120	$h + $self->border * 2,	1309	$h + $self->border * 2,
1121	)	1310	)
1122	}	1311	}
1123		1312
1124	sub size_allocate {	1313	sub invoke_size_allocate {
1125	my ($self, $w, $h) = @_;	1314	my ($self, $w, $h) = @_;
1126		1315
1127	if ($self->{title}) {	1316	if ($self->{title_widget}) {
1128	$self->{title}{w} = $w;	1317	$self->{title_widget}{w} = $w;
1129	$self->{title}{h} = $h;	1318	$self->{title_widget}{h} = $h;
1130	$self->{title}->size_allocate ($w, $h);	1319	$self->{title_widget}->invoke_size_allocate ($w, $h);
1131	}	1320	}
1132		1321
1133	my $border = $self->border;	1322	my $border = $self->border;
1134		1323
1135	$h -= List::Util::max 0, $border * 2;	1324	$h -= List::Util::max 0, $border * 2;
1136	$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;
1137		1339
1138	$self->child->configure ($border, $border, $w, $h);	1340	1
1139	}	1341	}
1140		1342
1141	sub button_down {	1343	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1344	my ($self, $ev, $x, $y) = @_;
1143		1345
1144	my ($w, $h) = @$self{qw(w h)};	1346	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1347	my $border = $self->border;
1146		1348
…		…
1177		1379
1178	($x, $y) = ($ev->{x}, $ev->{y});	1380	($x, $y) = ($ev->{x}, $ev->{y});
1179		1381
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1382	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1383	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1384	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1385	};
1184	} else {	1386	} else {
1185	return 0;	1387	return 0;
1186	}	1388	}
1187		1389
1188	1	1390	1
1189	}	1391	}
1190		1392
1191	sub button_up {	1393	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1394	my ($self, $ev, $x, $y) = @_;
1193		1395
1194	!!delete $self->{motion}	1396	! ! delete $self->{motion}
1195	}	1397	}
1196		1398
1197	sub mouse_motion {	1399	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1400	my ($self, $ev, $x, $y) = @_;
1199		1401
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1402	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1403
1202	!!$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
1203	}	1413	}
1204		1414
1205	sub _draw {	1415	sub _draw {
1206	my ($self) = @_;	1416	my ($self) = @_;
1207		1417
…		…
1233		1443
1234	glDisable GL_TEXTURE_2D;	1444	glDisable GL_TEXTURE_2D;
1235		1445
1236	$child->draw;	1446	$child->draw;
1237		1447
1238	if ($self->{title}) {	1448	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1449	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1450	$self->{title_widget}->_draw;
		1451
		1452	glTranslate 0, - ($border - $self->{h});
1241	}	1453	}
		1454
		1455	$self->{close_button}->draw
		1456	if $self->{close_button};
1242	}	1457	}
1243		1458
1244	#############################################################################	1459	#############################################################################
1245		1460
1246	package CFClient::UI::Table;	1461	package CFPlus::UI::Table;
1247		1462
1248	our @ISA = CFClient::UI::Base::;	1463	our @ISA = CFPlus::UI::Base::;
1249		1464
1250	use List::Util qw(max sum);	1465	use List::Util qw(max sum);
1251		1466
1252	use CFClient::OpenGL;	1467	use CFPlus::OpenGL;
1253		1468
1254	sub new {	1469	sub new {
1255	my $class = shift;	1470	my $class = shift;
1256		1471
1257	$class->SUPER::new (	1472	$class->SUPER::new (
…		…
1263	sub children {	1478	sub children {
1264	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1479	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265	}	1480	}
1266		1481
1267	sub add {	1482	sub add {
1268	my ($self, $x, $y, $child) = @_;	1483	my ($self) = shift;
1269		1484
		1485	while (@_) {
		1486	my ($x, $y, $child) = splice @_, 0, 3, ();
1270	$child->set_parent ($self);	1487	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;	1488	$self->{children}[$y][$x] = $child;
		1489	}
1272		1490
		1491	$self->{force_realloc} = 1;
		1492	$self->{force_size_alloc} = 1;
1273	$self->realloc;	1493	$self->realloc;
		1494	}
		1495
		1496	sub remove {
		1497	my ($self, $child) = @_;
		1498
		1499	# TODO: not yet implemented
1274	}	1500	}
1275		1501
1276	# TODO: move to container class maybe? send children a signal on removal?	1502	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {	1503	sub clear {
1278	my ($self) = @_;	1504	my ($self) = @_;
…		…
1319	(sum @$ws),	1545	(sum @$ws),
1320	(sum @$hs),	1546	(sum @$hs),
1321	)	1547	)
1322	}	1548	}
1323		1549
1324	sub size_allocate {	1550	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1551	my ($self, $w, $h) = @_;
1326		1552
1327	my ($ws, $hs) = $self->get_wh;	1553	my ($ws, $hs) = $self->get_wh;
1328		1554
1329	my $req_w = (sum @$ws) || 1;	1555	my $req_w = (sum @$ws) || 1;
…		…
1336		1562
1337	# linearly scale sizes	1563	# linearly scale sizes
1338	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1564	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1565	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340		1566
1341	CFClient::UI::harmonize $ws;	1567	CFPlus::UI::harmonize $ws;
1342	CFClient::UI::harmonize $hs;	1568	CFPlus::UI::harmonize $hs;
1343		1569
1344	my $y;	1570	my $y;
1345		1571
1346	for my $r (0 .. $#{$self->{children}}) {	1572	for my $r (0 .. $#{$self->{children}}) {
1347	my $row = $self->{children}[$r]	1573	my $row = $self->{children}[$r]
…		…
1361	}	1587	}
1362		1588
1363	$y += $row_h;	1589	$y += $row_h;
1364	}	1590	}
1365		1591
		1592	1
1366	}	1593	}
1367		1594
1368	sub find_widget {	1595	sub find_widget {
1369	my ($self, $x, $y) = @_;	1596	my ($self, $x, $y) = @_;
1370		1597
…		…
1389	}	1616	}
1390	}	1617	}
1391		1618
1392	#############################################################################	1619	#############################################################################
1393		1620
1394	package CFClient::UI::Box;	1621	package CFPlus::UI::Box;
1395		1622
1396	our @ISA = CFClient::UI::Container::;	1623	our @ISA = CFPlus::UI::Container::;
1397		1624
1398	sub size_request {	1625	sub size_request {
1399	my ($self) = @_;	1626	my ($self) = @_;
1400		1627
1401	$self->{vertical}	1628	$self->{vertical}
…		…
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1634	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1635	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1409	)	1636	)
1410	}	1637	}
1411		1638
1412	sub size_allocate {	1639	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1640	my ($self, $w, $h) = @_;
1414		1641
1415	my $space = $self->{vertical} ? $h : $w;	1642	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1643	my @children = $self->visible_children;
1417		1644
1418	my @req;	1645	my @req;
1419		1646
1420	if ($self->{homogeneous}) {	1647	if ($self->{homogeneous}) {
1421	@req = ($space / (@$children || 1)) x @$children;	1648	@req = ($space / (@children || 1)) x @children;
1422	} else {	1649	} else {
1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1650	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424	my $req = List::Util::sum @req;	1651	my $req = List::Util::sum @req;
1425		1652
1426	if ($req > $space) {	1653	if ($req > $space) {
1427	# ah well, not enough space	1654	# ah well, not enough space
1428	$_ *= $space / $req for @req;	1655	$_ *= $space / $req for @req;
1429	} else {	1656	} else {
1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1657	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431		1658
1432	$space = ($space - $req) / $expand; # remaining space to give away	1659	$space = ($space - $req) / $expand; # remaining space to give away
1433		1660
1434	$req[$_] += $space * $children->[$_]{expand}	1661	$req[$_] += $space * $children[$_]{expand}
1435	for 0 .. $#$children;	1662	for 0 .. $#children;
1436	}	1663	}
1437	}	1664	}
1438		1665
1439	CFClient::UI::harmonize \@req;	1666	CFPlus::UI::harmonize \@req;
1440		1667
1441	my $pos = 0;	1668	my $pos = 0;
1442	for (0 .. $#$children) {	1669	for (0 .. $#children) {
1443	my $alloc = $req[$_];	1670	my $alloc = $req[$_];
1444	$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));
1445		1672
1446	$pos += $alloc;	1673	$pos += $alloc;
1447	}	1674	}
1448		1675
1449	1	1676	1
1450	}	1677	}
1451		1678
1452	#############################################################################	1679	#############################################################################
1453		1680
1454	package CFClient::UI::HBox;	1681	package CFPlus::UI::HBox;
1455		1682
1456	our @ISA = CFClient::UI::Box::;	1683	our @ISA = CFPlus::UI::Box::;
1457		1684
1458	sub new {	1685	sub new {
1459	my $class = shift;	1686	my $class = shift;
1460		1687
1461	$class->SUPER::new (	1688	$class->SUPER::new (
…		…
1464	)	1691	)
1465	}	1692	}
1466		1693
1467	#############################################################################	1694	#############################################################################
1468		1695
1469	package CFClient::UI::VBox;	1696	package CFPlus::UI::VBox;
1470		1697
1471	our @ISA = CFClient::UI::Box::;	1698	our @ISA = CFPlus::UI::Box::;
1472		1699
1473	sub new {	1700	sub new {
1474	my $class = shift;	1701	my $class = shift;
1475		1702
1476	$class->SUPER::new (	1703	$class->SUPER::new (
…		…
1479	)	1706	)
1480	}	1707	}
1481		1708
1482	#############################################################################	1709	#############################################################################
1483		1710
1484	package CFClient::UI::Label;	1711	package CFPlus::UI::Label;
1485		1712
1486	our @ISA = CFClient::UI::DrawBG::;	1713	our @ISA = CFPlus::UI::DrawBG::;
1487		1714
1488	use CFClient::OpenGL;	1715	use CFPlus::OpenGL;
1489		1716
1490	sub new {	1717	sub new {
1491	my ($class, %arg) = @_;	1718	my ($class, %arg) = @_;
1492		1719
1493	my $self = $class->SUPER::new (	1720	my $self = $class->SUPER::new (
…		…
1496	#active_bg => none	1723	#active_bg => none
1497	#font => default_font	1724	#font => default_font
1498	#text => initial text	1725	#text => initial text
1499	#markup => initial narkup	1726	#markup => initial narkup
1500	#max_w => maximum pixel width	1727	#max_w => maximum pixel width
		1728	#style => 0, # render flags
1501	ellipsise => 3, # end	1729	ellipsise => 3, # end
1502	layout => (new CFClient::Layout),	1730	layout => (new CFPlus::Layout),
1503	fontsize => 1,	1731	fontsize => 1,
1504	align => -1,	1732	align => -1,
1505	valign => -1,	1733	valign => -1,
1506	padding_x => 2,	1734	padding_x => 2,
1507	padding_y => 2,	1735	padding_y => 2,
1508	can_events => 0,	1736	can_events => 0,
1509	%arg	1737	%arg
1510	);	1738	);
1511		1739
1512	if (exists $self->{template}) {	1740	if (exists $self->{template}) {
1513	my $layout = new CFClient::Layout;	1741	my $layout = new CFPlus::Layout;
1514	$layout->set_text (delete $self->{template});	1742	$layout->set_text (delete $self->{template});
1515	$self->{template} = $layout;	1743	$self->{template} = $layout;
1516	}	1744	}
1517		1745
1518	if (exists $self->{markup}) {	1746	if (exists $self->{markup}) {
…		…
1522	}	1750	}
1523		1751
1524	$self	1752	$self
1525	}	1753	}
1526		1754
1527	sub escape($) {
1528	local $_ = $_[0];
1529
1530	s/&/&amp;/g;
1531	s/>/&gt;/g;
1532	s/</&lt;/g;
1533
1534	$_
1535	}
1536
1537	sub update {	1755	sub update {
1538	my ($self) = @_;	1756	my ($self) = @_;
1539		1757
1540	delete $self->{texture};	1758	delete $self->{texture};
1541	$self->SUPER::update;	1759	$self->SUPER::update;
…		…
1552	my ($self, $text) = @_;	1770	my ($self, $text) = @_;
1553		1771
1554	return if $self->{text} eq "T$text";	1772	return if $self->{text} eq "T$text";
1555	$self->{text} = "T$text";	1773	$self->{text} = "T$text";
1556		1774
1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558	$self->{layout}->set_text ($text);	1775	$self->{layout}->set_text ($text);
		1776
1559	delete $self->{req_h};	1777	delete $self->{size_req};
1560
1561	$self->realloc;	1778	$self->realloc;
1562	$self->update;	1779	$self->update;
1563	}	1780	}
1564		1781
1565	sub set_markup {	1782	sub set_markup {
…		…
1568	return if $self->{text} eq "M$markup";	1785	return if $self->{text} eq "M$markup";
1569	$self->{text} = "M$markup";	1786	$self->{text} = "M$markup";
1570		1787
1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1788	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572		1789
1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574	$self->{layout}->set_markup ($markup);	1790	$self->{layout}->set_markup ($markup);
		1791
1575	delete $self->{req_h};	1792	delete $self->{size_req};
1576
1577	$self->realloc;	1793	$self->realloc;
1578	$self->update;	1794	$self->update;
1579	}	1795	}
1580		1796
1581	sub size_request {	1797	sub size_request {
1582	my ($self) = @_;	1798	my ($self) = @_;
1583		1799
1584	if (exists $self->{req_h}) {	1800	$self->{size_req} ||= do {
1585	@$self{qw(req_w req_h)}
1586	} else {
1587	$self->{layout}->set_font ($self->{font}) if $self->{font};	1801	$self->{layout}->set_font ($self->{font}) if $self->{font};
1588	$self->{layout}->set_width ($self->{max_w} || -1);	1802	$self->{layout}->set_width ($self->{max_w} || -1);
1589	$self->{layout}->set_ellipsise ($self->{ellipsise});	1803	$self->{layout}->set_ellipsise ($self->{ellipsise});
1590	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1804	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1805	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592		1806
1593	my ($w, $h) = $self->{layout}->size;	1807	my ($w, $h) = $self->{layout}->size;
1594		1808
1595	if (exists $self->{template}) {	1809	if (exists $self->{template}) {
1596	$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);
1597	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1812	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598		1813
1599	my ($w2, $h2) = $self->{template}->size;	1814	my ($w2, $h2) = $self->{template}->size;
1600		1815
1601	$w = List::Util::max $w, $w2;	1816	$w = List::Util::max $w, $w2;
1602	$h = List::Util::max $h, $h2;	1817	$h = List::Util::max $h, $h2;
1603	}	1818	}
1604		1819
1605	($w, $h)	1820	[$w, $h]
1606	}	1821	};
1607	}
1608		1822
		1823	@{ $self->{size_req} }
		1824	}
		1825
		1826	sub baseline_shift {
		1827	$_[0]{layout}->descent
		1828	}
		1829
1609	sub size_allocate {	1830	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	1831	my ($self, $w, $h) = @_;
1611		1832
1612	delete $self->{ox};	1833	delete $self->{ox};
1613		1834
1614	delete $self->{texture}	1835	delete $self->{texture}
1615	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
1616	}	1839	}
1617		1840
1618	sub set_fontsize {	1841	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	1842	my ($self, $fontsize) = @_;
1620		1843
1621	$self->{fontsize} = $fontsize;	1844	$self->{fontsize} = $fontsize;
		1845	delete $self->{size_req};
1622	delete $self->{texture};	1846	delete $self->{texture};
1623		1847
1624	$self->realloc;	1848	$self->realloc;
1625	}	1849	}
1626		1850
		1851	sub reconfigure {
		1852	my ($self) = @_;
		1853
		1854	delete $self->{size_req};
		1855	delete $self->{texture};
		1856
		1857	$self->SUPER::reconfigure;
		1858	}
		1859
1627	sub _draw {	1860	sub _draw {
1628	my ($self) = @_;	1861	my ($self) = @_;
1629		1862
1630	$self->SUPER::_draw; # draw background, if applicable	1863	$self->SUPER::_draw; # draw background, if applicable
1631		1864
1632	my $tex = $self->{texture} ||= do {	1865	my $size = $self->{texture} ||= do {
1633	$self->{layout}->set_foreground (@{$self->{fg}});	1866	$self->{layout}->set_foreground (@{$self->{fg}});
1634	$self->{layout}->set_font ($self->{font}) if $self->{font};	1867	$self->{layout}->set_font ($self->{font}) if $self->{font};
1635	$self->{layout}->set_width ($self->{w});	1868	$self->{layout}->set_width ($self->{w});
1636	$self->{layout}->set_ellipsise ($self->{ellipsise});	1869	$self->{layout}->set_ellipsise ($self->{ellipsise});
1637	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1870	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1871	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639		1872
1640	new_from_layout CFClient::Texture $self->{layout}	1873	[$self->{layout}->size]
1641	};	1874	};
1642		1875
1643	unless (exists $self->{ox}) {	1876	unless (exists $self->{ox}) {
1644	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1877	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1878	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646	: ($self->{w} - $tex->{w}) * 0.5);	1879	: ($self->{w} - $size->[0]) * 0.5);
1647		1880
1648	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1881	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1882	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650	: ($self->{h} - $tex->{h}) * 0.5);	1883	: ($self->{h} - $size->[1]) * 0.5);
1651	};	1884	};
1652		1885
1653	glEnable GL_TEXTURE_2D;	1886	my $w = List::Util::min $self->{w} + 4, $size->[0];
1654	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1887	my $h = List::Util::min $self->{h} + 2, $size->[1];
1655		1888
1656	if ($tex->{format} == GL_ALPHA) {	1889	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1657	glColor @{$self->{fg}};
1658	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659	} else {
1660	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1661	}
1662
1663	glDisable GL_TEXTURE_2D;
1664	}	1890	}
1665		1891
1666	#############################################################################	1892	#############################################################################
1667		1893
1668	package CFClient::UI::EntryBase;	1894	package CFPlus::UI::EntryBase;
1669		1895
1670	our @ISA = CFClient::UI::Label::;	1896	our @ISA = CFPlus::UI::Label::;
1671		1897
1672	use CFClient::OpenGL;	1898	use CFPlus::OpenGL;
1673		1899
1674	sub new {	1900	sub new {
1675	my $class = shift;	1901	my $class = shift;
1676		1902
1677	$class->SUPER::new (	1903	$class->SUPER::new (
…		…
1681	active_fg => [0, 0, 0],	1907	active_fg => [0, 0, 0],
1682	can_hover => 1,	1908	can_hover => 1,
1683	can_focus => 1,	1909	can_focus => 1,
1684	valign => 0,	1910	valign => 0,
1685	can_events => 1,	1911	can_events => 1,
		1912	ellipsise => 0,
1686	#text => ...	1913	#text => ...
		1914	#hidden => "*",
1687	@_	1915	@_
1688	)	1916	)
1689	}	1917	}
1690		1918
1691	sub _set_text {	1919	sub _set_text {
…		…
1698	$self->{last_activity} = $::NOW;	1926	$self->{last_activity} = $::NOW;
1699	$self->{text} = $text;	1927	$self->{text} = $text;
1700		1928
1701	$text =~ s/./*/g if $self->{hidden};	1929	$text =~ s/./*/g if $self->{hidden};
1702	$self->{layout}->set_text ("$text ");	1930	$self->{layout}->set_text ("$text ");
1703	delete $self->{req_h};	1931	delete $self->{size_req};
1704		1932
1705	$self->_emit (changed => $self->{text});	1933	$self->emit (changed => $self->{text});
1706		1934
1707	$self->realloc;	1935	$self->realloc;
1708	$self->update;	1936	$self->update;
1709	}	1937	}
1710		1938
…		…
1725	my ($w, $h) = $self->SUPER::size_request;	1953	my ($w, $h) = $self->SUPER::size_request;
1726		1954
1727	($w + 1, $h) # add 1 for cursor	1955	($w + 1, $h) # add 1 for cursor
1728	}	1956	}
1729		1957
1730	sub key_down {	1958	sub invoke_key_down {
1731	my ($self, $ev) = @_;	1959	my ($self, $ev) = @_;
1732		1960
1733	my $mod = $ev->{mod};	1961	my $mod = $ev->{mod};
1734	my $sym = $ev->{sym};	1962	my $sym = $ev->{sym};
1735	my $uni = $ev->{unicode};	1963	my $uni = $ev->{unicode};
…		…
1738		1966
1739	if ($uni == 8) {	1967	if ($uni == 8) {
1740	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1968	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1741	} elsif ($uni == 127) {	1969	} elsif ($uni == 127) {
1742	substr $text, $self->{cursor}, 1, "";	1970	substr $text, $self->{cursor}, 1, "";
1743	} elsif ($sym == CFClient::SDLK_LEFT) {	1971	} elsif ($sym == CFPlus::SDLK_LEFT) {
1744	--$self->{cursor} if $self->{cursor};	1972	--$self->{cursor} if $self->{cursor};
1745	} elsif ($sym == CFClient::SDLK_RIGHT) {	1973	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1746	++$self->{cursor} if $self->{cursor} < length $self->{text};	1974	++$self->{cursor} if $self->{cursor} < length $self->{text};
1747	} elsif ($sym == CFClient::SDLK_HOME) {	1975	} elsif ($sym == CFPlus::SDLK_HOME) {
1748	$self->{cursor} = 0;	1976	$self->{cursor} = 0;
1749	} elsif ($sym == CFClient::SDLK_END) {	1977	} elsif ($sym == CFPlus::SDLK_END) {
1750	$self->{cursor} = length $text;	1978	$self->{cursor} = length $text;
		1979	} elsif ($uni == 21) { # ctrl-u
		1980	$text = "";
		1981	$self->{cursor} = 0;
1751	} elsif ($uni == 27) {	1982	} elsif ($uni == 27) {
1752	$self->_emit ('escape');	1983	$self->emit ('escape');
1753	} elsif ($uni) {	1984	} elsif ($uni >= 0x20 || $uni == 0x0d) {
1754	substr $text, $self->{cursor}++, 0, chr $uni;	1985	substr $text, $self->{cursor}++, 0, chr $uni;
1755	} else {	1986	} else {
1756	return 0;	1987	return 0;
1757	}	1988	}
1758		1989
1759	$self->_set_text ($text);	1990	$self->_set_text ($text);
1760		1991
1761	$self->realloc;	1992	$self->realloc;
		1993	$self->update;
1762		1994
1763	1	1995	1
1764	}	1996	}
1765		1997
1766	sub focus_in {	1998	sub invoke_focus_in {
1767	my ($self) = @_;	1999	my ($self) = @_;
1768		2000
1769	$self->{last_activity} = $::NOW;	2001	$self->{last_activity} = $::NOW;
1770		2002
1771	$self->SUPER::focus_in;	2003	$self->SUPER::invoke_focus_in
1772	}	2004	}
1773		2005
1774	sub button_down {	2006	sub invoke_button_down {
1775	my ($self, $ev, $x, $y) = @_;	2007	my ($self, $ev, $x, $y) = @_;
1776		2008
1777	$self->SUPER::button_down ($ev, $x, $y);	2009	$self->SUPER::invoke_button_down ($ev, $x, $y);
1778		2010
1779	my $idx = $self->{layout}->xy_to_index ($x, $y);	2011	my $idx = $self->{layout}->xy_to_index ($x, $y);
1780		2012
1781	# byte-index to char-index	2013	# byte-index to char-index
1782	my $text = $self->{text};	2014	my $text = $self->{text};
1783	utf8::encode $text;	2015	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1784	$self->{cursor} = length substr $text, 0, $idx;	2016	$self->{cursor} = length $text;
1785		2017
1786	$self->_set_text ($self->{text});	2018	$self->_set_text ($self->{text});
1787	$self->update;	2019	$self->update;
1788		2020
1789	1	2021	1
1790	}	2022	}
1791		2023
1792	sub mouse_motion {	2024	sub invoke_mouse_motion {
1793	my ($self, $ev, $x, $y) = @_;	2025	my ($self, $ev, $x, $y) = @_;
1794	# 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#
1795		2027
1796	0	2028	1
1797	}	2029	}
1798		2030
1799	sub _draw {	2031	sub _draw {
1800	my ($self) = @_;	2032	my ($self) = @_;
1801		2033
…		…
1828	utf8::encode $text;	2060	utf8::encode $text;
1829		2061
1830	@$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)
1831	}	2063	}
1832		2064
1833	glColor @{$self->{fg}};
1834	glBegin GL_LINES;	2065	glBegin GL_LINES;
1835	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};
1836	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};
1837	glEnd;	2068	glEnd;
1838	}	2069	}
1839	}	2070	}
1840		2071
		2072	#############################################################################
		2073
1841	package CFClient::UI::Entry;	2074	package CFPlus::UI::Entry;
1842		2075
1843	our @ISA = CFClient::UI::EntryBase::;	2076	our @ISA = CFPlus::UI::EntryBase::;
1844		2077
1845	use CFClient::OpenGL;	2078	use CFPlus::OpenGL;
1846		2079
1847	sub key_down {	2080	sub invoke_key_down {
1848	my ($self, $ev) = @_;	2081	my ($self, $ev) = @_;
1849		2082
1850	my $sym = $ev->{sym};	2083	my $sym = $ev->{sym};
1851		2084
1852	if ($sym == 13) {	2085	if ($ev->{uni} == 0x0d || $sym == 13) {
1853	unshift @{$self->{history}},	2086	unshift @{$self->{history}},
1854	my $txt = $self->get_text;	2087	my $txt = $self->get_text;
		2088
1855	$self->{history_pointer} = -1;	2089	$self->{history_pointer} = -1;
1856	$self->{history_saveback} = '';	2090	$self->{history_saveback} = '';
1857	$self->_emit (activate => $txt);	2091	$self->emit (activate => $txt);
1858	$self->update;	2092	$self->update;
1859		2093
1860	} elsif ($sym == CFClient::SDLK_UP) {	2094	} elsif ($sym == CFPlus::SDLK_UP) {
1861	if ($self->{history_pointer} < 0) {	2095	if ($self->{history_pointer} < 0) {
1862	$self->{history_saveback} = $self->get_text;	2096	$self->{history_saveback} = $self->get_text;
1863	}	2097	}
1864	if (@{$self->{history} || []} > 0) {	2098	if (@{$self->{history} || []} > 0) {
1865	$self->{history_pointer}++;	2099	$self->{history_pointer}++;
…		…
1867	$self->{history_pointer} = @{$self->{history} || []} - 1;	2101	$self->{history_pointer} = @{$self->{history} || []} - 1;
1868	}	2102	}
1869	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2103	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1870	}	2104	}
1871		2105
1872	} elsif ($sym == CFClient::SDLK_DOWN) {	2106	} elsif ($sym == CFPlus::SDLK_DOWN) {
1873	$self->{history_pointer}--;	2107	$self->{history_pointer}--;
1874	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2108	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1875		2109
1876	if ($self->{history_pointer} >= 0) {	2110	if ($self->{history_pointer} >= 0) {
1877	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2111	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1878	} else {	2112	} else {
1879	$self->set_text ($self->{history_saveback});	2113	$self->set_text ($self->{history_saveback});
1880	}	2114	}
1881		2115
1882	} else {	2116	} else {
1883	return $self->SUPER::key_down ($ev)	2117	return $self->SUPER::invoke_key_down ($ev)
1884	}	2118	}
1885		2119
1886	1	2120	1
1887	}	2121	}
1888		2122
1889	#############################################################################	2123	#############################################################################
1890		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
1891	package CFClient::UI::Button;	2164	package CFPlus::UI::Button;
1892		2165
1893	our @ISA = CFClient::UI::Label::;	2166	our @ISA = CFPlus::UI::Label::;
1894		2167
1895	use CFClient::OpenGL;	2168	use CFPlus::OpenGL;
1896		2169
1897	my @tex =	2170	my @tex =
1898	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2171	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1899	qw(b1_button_active.png);	2172	qw(b1_button_active.png);
1900		2173
1901	sub new {	2174	sub new {
1902	my $class = shift;	2175	my $class = shift;
1903		2176
…		…
1912	can_events => 1,	2185	can_events => 1,
1913	@_	2186	@_
1914	)	2187	)
1915	}	2188	}
1916		2189
1917	sub activate { }
1918
1919	sub button_up {	2190	sub invoke_button_up {
1920	my ($self, $ev, $x, $y) = @_;	2191	my ($self, $ev, $x, $y) = @_;
1921		2192
1922	$self->emit ("activate")	2193	$self->emit ("activate")
1923	if $x >= 0 && $x < $self->{w}	2194	if $x >= 0 && $x < $self->{w}
1924	&& $y >= 0 && $y < $self->{h};	2195	&& $y >= 0 && $y < $self->{h};
…		…
1942	$self->SUPER::_draw;	2213	$self->SUPER::_draw;
1943	}	2214	}
1944		2215
1945	#############################################################################	2216	#############################################################################
1946		2217
1947	package CFClient::UI::CheckBox;	2218	package CFPlus::UI::CheckBox;
1948		2219
1949	our @ISA = CFClient::UI::DrawBG::;	2220	our @ISA = CFPlus::UI::DrawBG::;
1950		2221
1951	my @tex =	2222	my @tex =
1952	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1953	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2224	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1954		2225
1955	use CFClient::OpenGL;	2226	use CFPlus::OpenGL;
1956		2227
1957	sub new {	2228	sub new {
1958	my $class = shift;	2229	my $class = shift;
1959		2230
1960	$class->SUPER::new (	2231	$class->SUPER::new (
…		…
1974	my ($self) = @_;	2245	my ($self) = @_;
1975		2246
1976	(6) x 2	2247	(6) x 2
1977	}	2248	}
1978		2249
		2250	sub toggle {
		2251	my ($self) = @_;
		2252
		2253	$self->{state} = !$self->{state};
		2254	$self->emit (changed => $self->{state});
		2255	$self->update;
		2256	}
		2257
1979	sub button_down {	2258	sub invoke_button_down {
1980	my ($self, $ev, $x, $y) = @_;	2259	my ($self, $ev, $x, $y) = @_;
1981		2260
1982	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2261	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1983	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2262	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1984	$self->{state} = !$self->{state};	2263	$self->toggle;
1985	$self->_emit (changed => $self->{state});
1986	} else {	2264	} else {
1987	return 0	2265	return 0
1988	}	2266	}
1989		2267
1990	1	2268	1
…		…
2010	glDisable GL_TEXTURE_2D;	2288	glDisable GL_TEXTURE_2D;
2011	}	2289	}
2012		2290
2013	#############################################################################	2291	#############################################################################
2014		2292
2015	package CFClient::UI::Image;	2293	package CFPlus::UI::Image;
2016		2294
2017	our @ISA = CFClient::UI::Base::;	2295	our @ISA = CFPlus::UI::Base::;
2018		2296
2019	use CFClient::OpenGL;	2297	use CFPlus::OpenGL;
2020	use Carp qw/confess/;
2021		2298
2022	our %loaded_images;	2299	our %texture_cache;
2023		2300
2024	sub new {	2301	sub new {
2025	my $class = shift;	2302	my $class = shift;
2026		2303
2027	my $self = $class->SUPER::new (can_events => 0, @_);	2304	my $self = $class->SUPER::new (
		2305	can_events => 0,
		2306	@_,
		2307	);
2028		2308
2029	$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";
2030		2311
2031	$loaded_images{$self->{image}} ||=	2312	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2032	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;
2033		2314
2034	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2315	Scalar::Util::weaken $texture_cache{$self->{path}};
2035		2316
2036	Scalar::Util::weaken $loaded_images{$self->{image}};	2317	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2037
2038	$self->{aspect} = $tex->{w} / $tex->{h};
2039		2318
2040	$self	2319	$self
2041	}	2320	}
2042		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
2043	sub size_request {	2337	sub size_request {
2044	my ($self) = @_;	2338	my ($self) = @_;
2045		2339
2046	($self->{tex}->{w}, $self->{tex}->{h})	2340	($self->{tex}{w}, $self->{tex}{h})
2047	}	2341	}
2048		2342
2049	sub _draw {	2343	sub _draw {
2050	my ($self) = @_;	2344	my ($self) = @_;
2051		2345
…		…
2061	}	2355	}
2062		2356
2063	glEnable GL_TEXTURE_2D;	2357	glEnable GL_TEXTURE_2D;
2064	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2358	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2065		2359
2066	$tex->draw_quad_alpha (0, 0, $w, $h);	2360	$tex->draw_quad (0, 0, $w, $h);
2067		2361
2068	glDisable GL_TEXTURE_2D;	2362	glDisable GL_TEXTURE_2D;
2069	}	2363	}
2070		2364
2071	#############################################################################	2365	#############################################################################
2072		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
2073	package CFClient::UI::VGauge;	2403	package CFPlus::UI::VGauge;
2074		2404
2075	our @ISA = CFClient::UI::Base::;	2405	our @ISA = CFPlus::UI::Base::;
2076		2406
2077	use List::Util qw(min max);	2407	use List::Util qw(min max);
2078		2408
2079	use CFClient::OpenGL;	2409	use CFPlus::OpenGL;
2080		2410
2081	my %tex = (	2411	my %tex = (
2082	food => [	2412	food => [
2083	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2413	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2084	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2414	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2085	],	2415	],
2086	grace => [	2416	grace => [
2087	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2417	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2088	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/
2089	],	2419	],
2090	hp => [	2420	hp => [
2091	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2421	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2092	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2422	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2093	],	2423	],
2094	mana => [	2424	mana => [
2095	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2425	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2096	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/
2097	],	2427	],
2098	);	2428	);
2099		2429
2100	# eg. VGauge->new (gauge => 'food'), default gauge: food	2430	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2160	my $ycut1 = max 0, min 1, $ycut;	2490	my $ycut1 = max 0, min 1, $ycut;
2161	my $ycut2 = max 0, min 1, $ycut - 1;	2491	my $ycut2 = max 0, min 1, $ycut - 1;
2162		2492
2163	my $h1 = $self->{h} * (1 - $ycut1);	2493	my $h1 = $self->{h} * (1 - $ycut1);
2164	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);
2165		2498
2166	glEnable GL_BLEND;	2499	glEnable GL_BLEND;
2167	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2500	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2501	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169	glEnable GL_TEXTURE_2D;	2502	glEnable GL_TEXTURE_2D;
…		…
2188		2521
2189	if ($t3) {	2522	if ($t3) {
2190	glBindTexture GL_TEXTURE_2D, $t3->{name};	2523	glBindTexture GL_TEXTURE_2D, $t3->{name};
2191	glBegin GL_QUADS;	2524	glBegin GL_QUADS;
2192	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2525	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2193	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2526	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2194	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2527	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2195	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2528	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2196	glEnd;	2529	glEnd;
2197	}	2530	}
2198		2531
2199	glDisable GL_BLEND;	2532	glDisable GL_BLEND;
2200	glDisable GL_TEXTURE_2D;	2533	glDisable GL_TEXTURE_2D;
2201	}	2534	}
2202		2535
2203	#############################################################################	2536	#############################################################################
2204		2537
2205	package CFClient::UI::Gauge;	2538	package CFPlus::UI::Gauge;
2206		2539
2207	our @ISA = CFClient::UI::VBox::;	2540	our @ISA = CFPlus::UI::VBox::;
2208		2541
2209	sub new {	2542	sub new {
2210	my ($class, %arg) = @_;	2543	my ($class, %arg) = @_;
2211		2544
2212	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
…		…
2214	can_hover => 1,	2547	can_hover => 1,
2215	can_events => 1,	2548	can_events => 1,
2216	%arg,	2549	%arg,
2217	);	2550	);
2218		2551
2219	$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");
2220	$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);
2221	$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");
2222		2555
2223	$self	2556	$self
2224	}	2557	}
2225		2558
2226	sub set_fontsize {	2559	sub set_fontsize {
…		…
2247	$self->{value}->set_text ($val);	2580	$self->{value}->set_text ($val);
2248	}	2581	}
2249		2582
2250	#############################################################################	2583	#############################################################################
2251		2584
2252	package CFClient::UI::Slider;	2585	package CFPlus::UI::Slider;
2253		2586
2254	use strict;	2587	use strict;
2255		2588
2256	use CFClient::OpenGL;	2589	use CFPlus::OpenGL;
2257		2590
2258	our @ISA = CFClient::UI::DrawBG::;	2591	our @ISA = CFPlus::UI::DrawBG::;
2259		2592
2260	my @tex =	2593	my @tex =
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2594	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2262	qw(s1_slider.png s1_slider_bg.png);	2595	qw(s1_slider.png s1_slider_bg.png);
2263		2596
2264	sub new {	2597	sub new {
2265	my $class = shift;	2598	my $class = shift;
2266		2599
…		…
2287	$self->update;	2620	$self->update;
2288		2621
2289	$self	2622	$self
2290	}	2623	}
2291		2624
2292	sub changed { }
2293
2294	sub set_range {	2625	sub set_range {
2295	my ($self, $range) = @_;	2626	my ($self, $range) = @_;
2296		2627
2297	($range, $self->{range}) = ($self->{range}, $range);	2628	($range, $self->{range}) = ($self->{range}, $range);
2298		2629
2299	$self->update
2300	if "@$range" ne "@{$self->{range}}";	2630	if ("@$range" ne "@{$self->{range}}") {
		2631	$self->update;
		2632	$self->set_value ($self->{range}[0]);
		2633	}
2301	}	2634	}
2302		2635
2303	sub set_value {	2636	sub set_value {
2304	my ($self, $value) = @_;	2637	my ($self, $value) = @_;
2305		2638
…		…
2316	if $unit;	2649	if $unit;
2317		2650
2318	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2651	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2319		2652
2320	if ($value != $old_value) {	2653	if ($value != $old_value) {
2321	$self->_emit (changed => $value);	2654	$self->emit (changed => $value);
2322	$self->update;	2655	$self->update;
2323	}	2656	}
2324	}	2657	}
2325		2658
2326	sub size_request {	2659	sub size_request {
2327	my ($self) = @_;	2660	my ($self) = @_;
2328		2661
2329	($self->{req_w}, $self->{req_h})	2662	($self->{req_w}, $self->{req_h})
2330	}	2663	}
2331		2664
2332	sub button_down {	2665	sub invoke_button_down {
2333	my ($self, $ev, $x, $y) = @_;	2666	my ($self, $ev, $x, $y) = @_;
2334		2667
2335	$self->SUPER::button_down ($ev, $x, $y);	2668	$self->SUPER::invoke_button_down ($ev, $x, $y);
2336		2669
2337	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2670	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2338		2671
2339	$self->mouse_motion ($ev, $x, $y)	2672	$self->invoke_mouse_motion ($ev, $x, $y)
2340	}	2673	}
2341		2674
2342	sub mouse_motion {	2675	sub invoke_mouse_motion {
2343	my ($self, $ev, $x, $y) = @_;	2676	my ($self, $ev, $x, $y) = @_;
2344		2677
2345	if ($GRAB == $self) {	2678	if ($GRAB == $self) {
2346	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2679	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2347		2680
…		…
2353	} else {	2686	} else {
2354	return 0;	2687	return 0;
2355	}	2688	}
2356		2689
2357	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
2358	}	2701	}
2359		2702
2360	sub update {	2703	sub update {
2361	my ($self) = @_;	2704	my ($self) = @_;
2362		2705
…		…
2411	glDisable GL_TEXTURE_2D;	2754	glDisable GL_TEXTURE_2D;
2412	}	2755	}
2413		2756
2414	#############################################################################	2757	#############################################################################
2415		2758
2416	package CFClient::UI::ValSlider;	2759	package CFPlus::UI::ValSlider;
2417		2760
2418	our @ISA = CFClient::UI::HBox::;	2761	our @ISA = CFPlus::UI::HBox::;
2419		2762
2420	sub new {	2763	sub new {
2421	my ($class, %arg) = @_;	2764	my ($class, %arg) = @_;
2422		2765
2423	my $range = delete $arg{range};	2766	my $range = delete $arg{range};
2424		2767
2425	my $self = $class->SUPER::new (	2768	my $self = $class->SUPER::new (
2426	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2769	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2427	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2770	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2428	to_value => sub { shift },	2771	to_value => sub { shift },
2429	from_value => sub { shift },	2772	from_value => sub { shift },
2430	%arg,	2773	%arg,
2431	);	2774	);
2432		2775
…		…
2452	sub set_range { shift->{slider}->set_range (@_) }	2795	sub set_range { shift->{slider}->set_range (@_) }
2453	sub set_value { shift->{slider}->set_value (@_) }	2796	sub set_value { shift->{slider}->set_value (@_) }
2454		2797
2455	#############################################################################	2798	#############################################################################
2456		2799
2457	package CFClient::UI::TextView;	2800	package CFPlus::UI::TextScroller;
2458		2801
2459	our @ISA = CFClient::UI::HBox::;	2802	our @ISA = CFPlus::UI::HBox::;
2460		2803
2461	use CFClient::OpenGL;	2804	use CFPlus::OpenGL;
2462		2805
2463	sub new {	2806	sub new {
2464	my $class = shift;	2807	my $class = shift;
2465		2808
2466	my $self = $class->SUPER::new (	2809	my $self = $class->SUPER::new (
2467	fontsize => 1,	2810	fontsize => 1,
2468	can_events => 0,	2811	can_events => 1,
		2812	indent => 0,
2469	#font => default_font	2813	#font => default_font
2470	@_,	2814	@_,
2471		2815
2472	layout => (new CFClient::Layout 1),	2816	layout => (new CFPlus::Layout),
2473	par => [],	2817	par => [],
2474	height => 0,	2818	height => 0,
2475	children => [	2819	children => [
2476	(new CFClient::UI::Empty expand => 1),	2820	(new CFPlus::UI::Empty expand => 1),
2477	(new CFClient::UI::Slider vertical => 1),	2821	(new CFPlus::UI::Slider vertical => 1),
2478	],	2822	],
2479	);	2823	);
2480		2824
2481	$self->{children}[1]->connect (changed => sub { $self->update });	2825	$self->{children}[1]->connect (changed => sub { $self->update });
2482		2826
…		…
2488		2832
2489	$self->{fontsize} = $fontsize;	2833	$self->{fontsize} = $fontsize;
2490	$self->reflow;	2834	$self->reflow;
2491	}	2835	}
2492		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
2493	sub size_allocate {	2846	sub invoke_size_allocate {
2494	my ($self, $w, $h) = @_;	2847	my ($self, $w, $h) = @_;
2495		2848
2496	$self->SUPER::size_allocate ($w, $h);	2849	my ($empty, $slider, @other) = @{ $self->{children} };
		2850	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2497		2851
2498	$self->{layout}->set_font ($self->{font}) if $self->{font};	2852	$self->{layout}->set_font ($self->{font}) if $self->{font};
2499	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2853	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2500	$self->{layout}->set_width ($self->{children}[0]{w});	2854	$self->{layout}->set_width ($empty->{w});
		2855	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501		2856
2502	$self->reflow;	2857	$self->reflow;
2503	}
2504		2858
2505	sub text_size {	2859	local $self->{children} = [$empty, $slider];
		2860	$self->SUPER::invoke_size_allocate ($w, $h)
		2861	}
		2862
		2863	sub invoke_mouse_wheel {
2506	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) = @_;
2507		2875
2508	my $layout = $self->{layout};	2876	my $layout = $self->{layout};
2509		2877
		2878	$layout->set_font ($self->{font}) if $self->{font};
		2879	$layout->set_foreground (@{$para->{fg}});
2510	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2880	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511	$layout->set_width ($self->{children}[0]{w} - $indent);	2881	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2882	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512	$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}}
2513		2889	);
		2890
2514	$layout->size	2891	$layout
2515	}	2892	}
2516		2893
2517	sub reflow {	2894	sub reflow {
2518	my ($self) = @_;	2895	my ($self) = @_;
2519		2896
…		…
2526		2903
2527	# todo: base offset on lines or so, not on pixels	2904	# todo: base offset on lines or so, not on pixels
2528	$self->{children}[1]->set_value ($offset);	2905	$self->{children}[1]->set_value ($offset);
2529	}	2906	}
2530		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
2531	sub clear {	2923	sub clear {
2532	my ($self) = @_;	2924	my ($self) = @_;
		2925
		2926	my (undef, undef, @other) = @{ $self->{children} };
		2927	$self->remove ($_) for @other;
2533		2928
2534	$self->{par} = [];	2929	$self->{par} = [];
2535	$self->{height} = 0;	2930	$self->{height} = 0;
2536	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2931	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2537	}	2932	}
2538		2933
2539	sub add_paragraph {	2934	sub add_paragraph {
2540	my ($self, $color, $text, $indent) = @_;	2935	my $self = shift;
2541		2936
2542	for my $line (split /\n/, $text) {	2937	for my $para (@_) {
2543	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
2544	$self->{height} += $h;	2985	$self->{height} = $height;
2545	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2986	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2546	}
2547		2987
2548	$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	}
2549	}	2994	}
2550		2995
2551	sub update {	2996	sub update {
2552	my ($self) = @_;	2997	my ($self) = @_;
2553		2998
…		…
2555		3000
2556	return unless $self->{h} > 0;	3001	return unless $self->{h} > 0;
2557		3002
2558	delete $self->{texture};	3003	delete $self->{texture};
2559		3004
2560	$ROOT->on_post_alloc ($self, sub {	3005	$ROOT->on_post_alloc ($self => sub {
		3006	$self->force_uptodate;
		3007
2561	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3008	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2562		3009
2563	if (delete $self->{need_reflow}) {
2564	my $height = 0;
2565
2566	my $layout = $self->{layout};
2567
2568	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2569
2570	for (@{$self->{par}}) {
2571	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2572	$layout->set_width ($W - $_->[3]);
2573	$layout->set_markup ($_->[4]);
2574	my ($w, $h) = $layout->size;
2575	$_->[0] = $w + $_->[3];
2576	$_->[1] = $h;
2577	}
2578
2579	$height += $_->[1];
2580	}
2581
2582	$self->{height} = $height;
2583
2584	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2585
2586	delete $self->{texture};
2587	}
2588
2589	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3010	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2590	glClearColor 0, 0, 0, 0;	3011	glClearColor 0, 0, 0, 0;
2591	glClear GL_COLOR_BUFFER_BIT;	3012	glClear GL_COLOR_BUFFER_BIT;
2592		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;
2593	my $top = int $self->{children}[1]{range}[0];	3022	my $top = int $self->{children}[1]{range}[0];
2594		3023
2595	my $y0 = $top;	3024	my $y0 = $top;
2596	my $y1 = $top + $H;	3025	my $y1 = $top + $H;
2597		3026
2598	my $y = 0;
2599
2600	my $layout = $self->{layout};
2601
2602	$layout->set_font ($self->{font}) if $self->{font};
2603
2604	glEnable GL_BLEND;
2605	#TODO# not correct in windows where rgba is forced off
2606	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2607
2608	for my $par (@{$self->{par}}) {	3027	for my $para (@{$self->{par}}) {
2609	my $h = $par->[1];	3028	my $h = $para->{h};
		3029	my $y = $para->{y};
2610		3030
2611	if ($y0 < $y + $h && $y < $y1) {	3031	if ($y0 < $y + $h && $y < $y1) {
2612	$layout->set_foreground (@{ $par->[2] });	3032	my $layout = $self->get_layout ($para);
2613	$layout->set_width ($W - $par->[3]);
2614	$layout->set_markup ($par->[4]);
2615		3033
2616	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3034	$layout->render ($para->{indent}, $y - $y0);
2617		3035
2618	glRasterPos $par->[3], $y - $y0;	3036	if (my @w = @{ $para->{widget} }) {
2619	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	}
2620	}	3048	}
2621		3049
2622	$y += $h;	3050	$paridx++;
		3051	$top_paragraph ||= $paridx if $y >= $top;
2623	}	3052	}
2624		3053
2625	glDisable GL_BLEND;	3054	$self->{top_paragraph} = $top_paragraph;
2626	};	3055	};
2627	});	3056	});
		3057	}
		3058
		3059	sub reconfigure {
		3060	my ($self) = @_;
		3061
		3062	$self->SUPER::reconfigure;
		3063
		3064	$_->{w} = 1e10 for @{ $self->{par} };
		3065	$self->reflow;
2628	}	3066	}
2629		3067
2630	sub _draw {	3068	sub _draw {
2631	my ($self) = @_;	3069	my ($self) = @_;
2632		3070
…		…
2635	glColor 0, 0, 0, 1;	3073	glColor 0, 0, 0, 1;
2636	$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});
2637	glDisable GL_TEXTURE_2D;	3075	glDisable GL_TEXTURE_2D;
2638		3076
2639	$self->{children}[1]->draw;	3077	$self->{children}[1]->draw;
2640
2641	}	3078	}
2642		3079
2643	#############################################################################	3080	#############################################################################
2644		3081
2645	package CFClient::UI::Animator;	3082	package CFPlus::UI::Animator;
2646		3083
2647	use CFClient::OpenGL;	3084	use CFPlus::OpenGL;
2648		3085
2649	our @ISA = CFClient::UI::Bin::;	3086	our @ISA = CFPlus::UI::Bin::;
2650		3087
2651	sub moveto {	3088	sub moveto {
2652	my ($self, $x, $y) = @_;	3089	my ($self, $x, $y) = @_;
2653		3090
2654	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3091	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2682	glPopMatrix;	3119	glPopMatrix;
2683	}	3120	}
2684		3121
2685	#############################################################################	3122	#############################################################################
2686		3123
2687	package CFClient::UI::Flopper;	3124	package CFPlus::UI::Flopper;
2688		3125
2689	our @ISA = CFClient::UI::Button::;	3126	our @ISA = CFPlus::UI::Button::;
2690		3127
2691	sub new {	3128	sub new {
2692	my $class = shift;	3129	my $class = shift;
2693		3130
2694	my $self = $class->SUPER::new (	3131	my $self = $class->SUPER::new (
…		…
2706	$self->{other}->toggle_visibility;	3143	$self->{other}->toggle_visibility;
2707	}	3144	}
2708		3145
2709	#############################################################################	3146	#############################################################################
2710		3147
2711	package CFClient::UI::Tooltip;	3148	package CFPlus::UI::Tooltip;
2712		3149
2713	our @ISA = CFClient::UI::Bin::;	3150	our @ISA = CFPlus::UI::Bin::;
2714		3151
2715	use CFClient::OpenGL;	3152	use CFPlus::OpenGL;
2716		3153
2717	sub new {	3154	sub new {
2718	my $class = shift;	3155	my $class = shift;
2719		3156
2720	$class->SUPER::new (	3157	$class->SUPER::new (
…		…
2723	)	3160	)
2724	}	3161	}
2725		3162
2726	sub set_tooltip_from {	3163	sub set_tooltip_from {
2727	my ($self, $widget) = @_;	3164	my ($self, $widget) = @_;
		3165
		3166	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3167	if $widget->{tooltip} =~ /^#(.*)$/;
2728		3168
2729	my $tooltip = $widget->{tooltip};	3169	my $tooltip = $widget->{tooltip};
2730		3170
2731	if ($ENV{CFPLUS_DEBUG} & 2) {	3171	if ($ENV{CFPLUS_DEBUG} & 2) {
2732	$tooltip .= "\n\n" . (ref $widget) . "\n"	3172	$tooltip .= "\n\n" . (ref $widget) . "\n"
2733	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3173	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734	. "req $widget->{req_w} $widget->{req_h}\n"	3174	. "req $widget->{req_w} $widget->{req_h}\n"
2735	. "visible $widget->{visible}";	3175	. "visible $widget->{visible}";
2736	}	3176	}
2737		3177
		3178	$tooltip =~ s/^\n+//;
		3179	$tooltip =~ s/\n+$//;
		3180
2738	$self->add (new CFClient::UI::Label	3181	$self->add (new CFPlus::UI::Label
2739	markup => $tooltip,	3182	markup => $tooltip,
2740	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3183	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2741	fontsize => 0.8,	3184	fontsize => 0.8,
2742	fg => [0, 0, 0, 1],	3185	style => 1, # FLAG_INVERSE
2743	ellipsise => 0,	3186	ellipsise => 0,
2744	font => ($widget->{tooltip_font} || $::FONT_PROP),	3187	font => ($widget->{tooltip_font} || $::FONT_PROP),
2745	);	3188	);
2746	}	3189	}
2747		3190
…		…
2751	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3194	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2752		3195
2753	($w + 4, $h + 4)	3196	($w + 4, $h + 4)
2754	}	3197	}
2755		3198
2756	sub size_allocate {	3199	sub invoke_size_allocate {
2757	my ($self, $w, $h) = @_;	3200	my ($self, $w, $h) = @_;
2758		3201
2759	$self->SUPER::size_allocate ($w - 4, $h - 4);	3202	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2760	}	3203	}
2761		3204
2762	sub visibility_change {	3205	sub invoke_visibility_change {
2763	my ($self, $visible) = @_;	3206	my ($self, $visible) = @_;
2764		3207
2765	return unless $visible;	3208	return unless $visible;
2766		3209
2767	$self->{root}->on_post_alloc ("move_$self" => sub {	3210	$self->{root}->on_post_alloc ("move_$self" => sub {
2768	my $widget = $self->{owner}	3211	my $widget = $self->{owner}
2769	or return;	3212	or return;
2770		3213
		3214	if ($widget->{visible}) {
2771	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3215	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772		3216
2773	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3217	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774	if $x + $self->{w} > $::WIDTH;	3218	if $x + $self->{w} > $self->{root}{w};
2775		3219
2776	$self->move_abs ($x, $y);	3220	$self->move_abs ($x, $y);
		3221	} else {
		3222	$self->hide;
		3223	}
2777	});	3224	});
2778	}	3225	}
2779		3226
2780	sub _draw {	3227	sub _draw {
2781	my ($self) = @_;	3228	my ($self) = @_;
…		…
2805	$self->SUPER::_draw;	3252	$self->SUPER::_draw;
2806	}	3253	}
2807		3254
2808	#############################################################################	3255	#############################################################################
2809		3256
2810	package CFClient::UI::Face;	3257	package CFPlus::UI::Face;
2811		3258
2812	our @ISA = CFClient::UI::Base::;	3259	our @ISA = CFPlus::UI::DrawBG::;
2813		3260
2814	use CFClient::OpenGL;	3261	use CFPlus::OpenGL;
2815		3262
2816	sub new {	3263	sub new {
2817	my $class = shift;	3264	my $class = shift;
2818		3265
2819	my $self = $class->SUPER::new (	3266	my $self = $class->SUPER::new (
…		…
2854	sub _draw {	3301	sub _draw {
2855	my ($self) = @_;	3302	my ($self) = @_;
2856		3303
2857	return unless $::CONN;	3304	return unless $::CONN;
2858		3305
		3306	$self->SUPER::_draw;
		3307
2859	my $face;	3308	my $face;
2860		3309
2861	if ($self->{frame}) {	3310	if ($self->{frame}) {
2862	my $anim = $::CONN->{anim}[$self->{anim}];	3311	my $anim = $::CONN->{anim}[$self->{anim}];
2863		3312
…		…
2874	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3323	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2875	glDisable GL_TEXTURE_2D;	3324	glDisable GL_TEXTURE_2D;
2876	}	3325	}
2877	}	3326	}
2878		3327
2879	sub DESTROY {	3328	sub destroy {
2880	my ($self) = @_;	3329	my ($self) = @_;
2881		3330
2882	$self->{timer}->cancel	3331	$self->{timer}->cancel
2883	if $self->{timer};	3332	if $self->{timer};
2884		3333
2885	$self->SUPER::DESTROY;	3334	$self->SUPER::destroy;
2886	}	3335	}
2887		3336
2888	#############################################################################	3337	#############################################################################
2889		3338
2890	package CFClient::UI::Buttonbar;	3339	package CFPlus::UI::Buttonbar;
2891		3340
2892	our @ISA = CFClient::UI::HBox::;	3341	our @ISA = CFPlus::UI::HBox::;
2893		3342
2894	# TODO: should actualyl wrap buttons and other goodies.	3343	# TODO: should actually wrap buttons and other goodies.
2895		3344
2896	#############################################################################	3345	#############################################################################
2897		3346
2898	package CFClient::UI::Menu;	3347	package CFPlus::UI::Menu;
2899		3348
2900	our @ISA = CFClient::UI::FancyFrame::;	3349	our @ISA = CFPlus::UI::Toplevel::;
2901		3350
2902	use CFClient::OpenGL;	3351	use CFPlus::OpenGL;
2903		3352
2904	sub new {	3353	sub new {
2905	my $class = shift;	3354	my $class = shift;
2906		3355
2907	my $self = $class->SUPER::new (	3356	my $self = $class->SUPER::new (
2908	items => [],	3357	items => [],
2909	z => 100,	3358	z => 100,
2910	@_,	3359	@_,
2911	);	3360	);
2912		3361
2913	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3362	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2914		3363
2915	for my $item (@{ $self->{items} }) {	3364	for my $item (@{ $self->{items} }) {
2916	my ($widget, $cb) = @$item;	3365	my ($widget, $cb, $tooltip) = @$item;
2917		3366
2918	# handle various types of items, only text for now	3367	# handle various types of items, only text for now
2919	if (!ref $widget) {	3368	if (!ref $widget) {
		3369	if ($widget =~ /\t/) {
		3370	my ($left, $right) = split /\t/, $widget, 2;
		3371
2920	$widget = new CFClient::UI::Label	3372	$widget = new CFPlus::UI::HBox
2921	can_hover => 1,	3373	can_hover => 1,
2922	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,
2923	text => $widget;	3386	markup => $widget,
		3387	tooltip => $tooltip;
		3388	}
2924	}	3389	}
2925		3390
2926	$self->{item}{$widget} = $item;	3391	$self->{item}{$widget} = $item;
2927		3392
2928	$self->{vbox}->add ($widget);	3393	$self->{vbox}->add ($widget);
…		…
2933		3398
2934	# 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)
2935	sub popup {	3400	sub popup {
2936	my ($self, $ev) = @_;	3401	my ($self, $ev) = @_;
2937		3402
2938	$self->_emit ("popdown");	3403	$self->emit ("popdown");
2939		3404
2940	# maybe save $GRAB? must be careful about events...	3405	# maybe save $GRAB? must be careful about events...
2941	$GRAB = $self;	3406	$GRAB = $self;
2942	$self->{button} = $ev->{button};	3407	$self->{button} = $ev->{button};
2943		3408
2944	$self->show;	3409	$self->show;
2945	$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);
2946	}	3411	}
2947		3412
2948	sub mouse_motion {	3413	sub invoke_mouse_motion {
2949	my ($self, $ev, $x, $y) = @_;	3414	my ($self, $ev, $x, $y) = @_;
2950		3415
2951	# TODO: should use vbox->find_widget or so	3416	# TODO: should use vbox->find_widget or so
2952	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3417	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2953	$self->{hover} = $self->{item}{$HOVER};	3418	$self->{hover} = $self->{item}{$HOVER};
2954		3419
2955	0	3420	0
2956	}	3421	}
2957		3422
2958	sub button_up {	3423	sub invoke_button_up {
2959	my ($self, $ev, $x, $y) = @_;	3424	my ($self, $ev, $x, $y) = @_;
2960		3425
2961	if ($ev->{button} == $self->{button}) {	3426	if ($ev->{button} == $self->{button}) {
2962	undef $GRAB;	3427	undef $GRAB;
2963	$self->hide;	3428	$self->hide;
2964		3429
2965	$self->_emit ("popdown");	3430	$self->emit ("popdown");
2966	$self->{hover}[1]->() if $self->{hover};	3431	$self->{hover}[1]->() if $self->{hover};
2967	} else {	3432	} else {
2968	return 0	3433	return 0
2969	}	3434	}
2970		3435
2971	1	3436	1
2972	}	3437	}
2973		3438
2974	#############################################################################	3439	#############################################################################
2975		3440
2976	package CFClient::UI::Multiplexer;	3441	package CFPlus::UI::Multiplexer;
2977		3442
2978	our @ISA = CFClient::UI::Container::;	3443	our @ISA = CFPlus::UI::Container::;
2979		3444
2980	sub new {	3445	sub new {
2981	my $class = shift;	3446	my $class = shift;
2982		3447
2983	my $self = $class->SUPER::new (	3448	my $self = $class->SUPER::new (
…		…
2997		3462
2998	$self->{current} = $self->{children}[0]	3463	$self->{current} = $self->{children}[0]
2999	if @{ $self->{children} };	3464	if @{ $self->{children} };
3000	}	3465	}
3001		3466
		3467	sub get_current_page {
		3468	my ($self) = @_;
		3469
		3470	$self->{current}
		3471	}
		3472
3002	sub set_current_page {	3473	sub set_current_page {
3003	my ($self, $page_or_widget) = @_;	3474	my ($self, $page_or_widget) = @_;
3004		3475
3005	my $widget = ref $page_or_widget	3476	my $widget = ref $page_or_widget
3006	? $page_or_widget	3477	? $page_or_widget
3007	: $self->{children}[$page_or_widget];	3478	: $self->{children}[$page_or_widget];
3008		3479
3009	$self->{current} = $widget;	3480	$self->{current} = $widget;
3010	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3481	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011		3482
3012	$self->_emit (page_changed => $self->{current});	3483	$self->emit (page_changed => $self->{current});
3013		3484
3014	$self->realloc;	3485	$self->realloc;
3015	}	3486	}
3016		3487
3017	sub visible_children {	3488	sub visible_children {
…		…
3022	my ($self) = @_;	3493	my ($self) = @_;
3023		3494
3024	$self->{current}->size_request	3495	$self->{current}->size_request
3025	}	3496	}
3026		3497
3027	sub size_allocate {	3498	sub invoke_size_allocate {
3028	my ($self, $w, $h) = @_;	3499	my ($self, $w, $h) = @_;
3029		3500
3030	$self->{current}->configure (0, 0, $w, $h);	3501	$self->{current}->configure (0, 0, $w, $h);
		3502
		3503	1
3031	}	3504	}
3032		3505
3033	sub _draw {	3506	sub _draw {
3034	my ($self) = @_;	3507	my ($self) = @_;
3035		3508
3036	$self->{current}->draw;	3509	$self->{current}->draw;
3037	}	3510	}
3038		3511
3039	#############################################################################	3512	#############################################################################
3040		3513
3041	package CFClient::UI::Notebook;	3514	package CFPlus::UI::Notebook;
3042		3515
3043	our @ISA = CFClient::UI::VBox::;	3516	our @ISA = CFPlus::UI::VBox::;
3044		3517
3045	sub new {	3518	sub new {
3046	my $class = shift;	3519	my $class = shift;
3047		3520
3048	my $self = $class->SUPER::new (	3521	my $self = $class->SUPER::new (
3049	buttonbar => (new CFClient::UI::Buttonbar),	3522	buttonbar => (new CFPlus::UI::Buttonbar),
3050	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3523	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3051	# filter => # will be put between multiplexer and $self	3524	# filter => # will be put between multiplexer and $self
3052	@_,	3525	@_,
3053	);	3526	);
3054		3527
3055	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3528	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3061	sub add {	3534	sub add {
3062	my ($self, $title, $widget, $tooltip) = @_;	3535	my ($self, $title, $widget, $tooltip) = @_;
3063		3536
3064	Scalar::Util::weaken $self;	3537	Scalar::Util::weaken $self;
3065		3538
3066	$self->{buttonbar}->add (new CFClient::UI::Button	3539	$self->{buttonbar}->add (new CFPlus::UI::Button
3067	markup => $title,	3540	markup => $title,
3068	tooltip => $tooltip,	3541	tooltip => $tooltip,
3069	on_activate => sub { $self->set_current_page ($widget) },	3542	on_activate => sub { $self->set_current_page ($widget) },
3070	);	3543	);
3071		3544
3072	$self->{multiplexer}->add ($widget);	3545	$self->{multiplexer}->add ($widget);
3073	}	3546	}
3074		3547
		3548	sub get_current_page {
		3549	my ($self) = @_;
		3550
		3551	$self->{multiplexer}->get_current_page
		3552	}
		3553
3075	sub set_current_page {	3554	sub set_current_page {
3076	my ($self, $page) = @_;	3555	my ($self, $page) = @_;
3077		3556
3078	$self->{multiplexer}->set_current_page ($page);	3557	$self->{multiplexer}->set_current_page ($page);
3079	$self->_emit (page_changed => $self->{multiplexer}{current});	3558	$self->emit (page_changed => $self->{multiplexer}{current});
3080	}	3559	}
3081		3560
3082	#############################################################################	3561	#############################################################################
3083		3562
		3563	package CFPlus::UI::Selector;
		3564
		3565	use utf8;
		3566
		3567	our @ISA = CFPlus::UI::Button::;
		3568
		3569	sub new {
		3570	my $class = shift;
		3571
		3572	my $self = $class->SUPER::new (
		3573	options => [], # [value, title, longdesc], ...
		3574	value => undef,
		3575	@_,
		3576	);
		3577
		3578	$self->_set_value ($self->{value});
		3579
		3580	$self
		3581	}
		3582
		3583	sub invoke_button_down {
		3584	my ($self, $ev) = @_;
		3585
		3586	my @menu_items;
		3587
		3588	for (@{ $self->{options} }) {
		3589	my ($value, $title, $tooltip) = @$_;
		3590
		3591	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3592	}
		3593
		3594	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3595	}
		3596
		3597	sub _set_value {
		3598	my ($self, $value) = @_;
		3599
		3600	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3601	or return;
		3602
		3603	$self->{value} = $item->[0];
		3604	$self->set_markup ("$item->[1] ⇓");
		3605	$self->set_tooltip ($item->[2]);
		3606	}
		3607
		3608	sub set_value {
		3609	my ($self, $value) = @_;
		3610
		3611	return unless $self->{value} ne $value;
		3612
		3613	$self->_set_value ($value);
		3614	$self->emit (changed => $value);
		3615	}
		3616
		3617	#############################################################################
		3618
3084	package CFClient::UI::Statusbox;	3619	package CFPlus::UI::Statusbox;
3085		3620
3086	our @ISA = CFClient::UI::VBox::;	3621	our @ISA = CFPlus::UI::VBox::;
3087		3622
3088	sub new {	3623	sub new {
3089	my $class = shift;	3624	my $class = shift;
3090		3625
3091	my $self = $class->SUPER::new (	3626	my $self = $class->SUPER::new (
…		…
3103	sub reorder {	3638	sub reorder {
3104	my ($self) = @_;	3639	my ($self) = @_;
3105	my $NOW = Time::HiRes::time;	3640	my $NOW = Time::HiRes::time;
3106		3641
3107	# freeze display when hovering over any label	3642	# freeze display when hovering over any label
3108	return if $CFClient::UI::TOOLTIP->{owner}	3643	return if $CFPlus::UI::TOOLTIP->{owner}
3109	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3644	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3110	values %{ $self->{item} };	3645	values %{ $self->{item} };
3111		3646
3112	while (my ($k, $v) = each %{ $self->{item} }) {	3647	while (my ($k, $v) = each %{ $self->{item} }) {
3113	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3648	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3114	}	3649	}
…		…
3135	for ($short) {	3670	for ($short) {
3136	s/^\s+//;	3671	s/^\s+//;
3137	s/\s+/ /g;	3672	s/\s+/ /g;
3138	}	3673	}
3139		3674
3140	new CFClient::UI::Label	3675	new CFPlus::UI::Label
3141	markup => $short,	3676	markup => $short,
3142	tooltip => $item->{tooltip},	3677	tooltip => $item->{tooltip},
3143	tooltip_font => $::FONT_PROP,	3678	tooltip_font => $::FONT_PROP,
3144	tooltip_width => 0.67,	3679	tooltip_width => 0.67,
3145	fontsize => $item->{fontsize} || $self->{fontsize},	3680	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3183	$item->{count}++;	3718	$item->{count}++;
3184	} else {	3719	} else {
3185	$item->{count} = 1;	3720	$item->{count} = 1;
3186	$item->{text} = $item->{tooltip} = $text;	3721	$item->{text} = $item->{tooltip} = $text;
3187	}	3722	}
3188	$item->{id} = ++$self->{id};	3723	$item->{id} += 0.2;#d#
3189	$item->{timeout} = $timeout;	3724	$item->{timeout} = $timeout;
3190	delete $item->{label};	3725	delete $item->{label};
3191	} else {	3726	} else {
3192	$self->{item}{$group} = {	3727	$self->{item}{$group} = {
3193	id => ++$self->{id},	3728	id => ++$self->{id},
…		…
3199	count => 1,	3734	count => 1,
3200	%arg,	3735	%arg,
3201	};	3736	};
3202	}	3737	}
3203		3738
		3739	$ROOT->on_refresh (reorder => sub {
3204	$self->reorder;	3740	$self->reorder;
		3741	});
3205	}	3742	}
3206		3743
3207	sub reconfigure {	3744	sub reconfigure {
3208	my ($self) = @_;	3745	my ($self) = @_;
3209		3746
…		…
3212		3749
3213	$self->reorder;	3750	$self->reorder;
3214	$self->SUPER::reconfigure;	3751	$self->SUPER::reconfigure;
3215	}	3752	}
3216		3753
3217	sub DESTROY {	3754	sub destroy {
3218	my ($self) = @_;	3755	my ($self) = @_;
3219		3756
3220	$self->{timer}->cancel;	3757	$self->{timer}->cancel;
3221		3758
3222	$self->SUPER::DESTROY;	3759	$self->SUPER::destroy;
3223	}	3760	}
3224		3761
3225	#############################################################################	3762	#############################################################################
3226		3763
3227	package CFClient::UI::Inventory;
3228
3229	our @ISA = CFClient::UI::ScrolledWindow::;
3230
3231	sub new {
3232	my $class = shift;
3233
3234	my $self = $class->SUPER::new (
3235	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3236	@_,
3237	);
3238
3239	$self
3240	}
3241
3242	sub set_items {
3243	my ($self, $items) = @_;
3244
3245	$self->{child}->clear;
3246	return unless $items;
3247
3248	my @items = sort {
3249	($a->{type} <=> $b->{type})
3250	or ($a->{name} cmp $b->{name})
3251	} @$items;
3252
3253	$self->{real_items} = \@items;
3254
3255	my $row = 0;
3256	for my $item (@items) {
3257	CFClient::Item::update_widgets $item;
3258
3259	$self->{child}->add (0, $row, $item->{face_widget});
3260	$self->{child}->add (1, $row, $item->{desc_widget});
3261	$self->{child}->add (2, $row, $item->{weight_widget});
3262
3263	$row++;
3264	}
3265	}
3266
3267	#############################################################################
3268
3269	package CFClient::UI::BindEditor;
3270
3271	our @ISA = CFClient::UI::FancyFrame::;
3272
3273	sub new {
3274	my $class = shift;
3275
3276	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3277
3278	$self->add (my $vb = new CFClient::UI::VBox);
3279
3280
3281	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3282	text => "start recording",
3283	tooltip => "Start/Stops recording of actions."
3284	."All subsequent actions after the recording started will be captured."
3285	."The actions are displayed after the record was stopped."
3286	."To bind the action you have to click on the 'Bind' button",
3287	on_activate => sub {
3288	unless ($self->{recording}) {
3289	$self->start;
3290	} else {
3291	$self->stop;
3292	}
3293	});
3294
3295	$vb->add (new CFClient::UI::Label text => "Actions:");
3296	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3297
3298	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3299	$vb->add (my $hb = new CFClient::UI::HBox);
3300	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3301	$hb->add (new CFClient::UI::Button
3302	text => "bind",
3303	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3304	on_activate => sub {
3305	$self->ask_for_bind;
3306	});
3307
3308	$vb->add (my $hb = new CFClient::UI::HBox);
3309	$hb->add (new CFClient::UI::Button
3310	text => "ok",
3311	expand => 1,
3312	tooltip => "This closes the binding editor and saves the binding",
3313	on_activate => sub {
3314	$self->hide;
3315	$self->commit;
3316	});
3317
3318	$hb->add (new CFClient::UI::Button
3319	text => "cancel",
3320	expand => 1,
3321	tooltip => "This closes the binding editor without saving",
3322	on_activate => sub {
3323	$self->hide;
3324	$self->{binding_cancel}->()
3325	if $self->{binding_cancel};
3326	});
3327
3328	$self->update_binding_widgets;
3329
3330	$self
3331	}
3332
3333	sub commit {
3334	my ($self) = @_;
3335	my ($mod, $sym, $cmds) = $self->get_binding;
3336	if ($sym != 0 && @$cmds > 0) {
3337	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3338	."'. Don't forget 'Save Config'!");
3339	$self->{binding_change}->($mod, $sym, $cmds)
3340	if $self->{binding_change};
3341	} else {
3342	$::STATUSBOX->add ("No action bound, no key or action specified!");
3343	$self->{binding_cancel}->()
3344	if $self->{binding_cancel};
3345	}
3346	}
3347
3348	sub start {
3349	my ($self) = @_;
3350
3351	$self->{rec_btn}->set_text ("stop recording");
3352	$self->{recording} = 1;
3353	$self->clear_command_list;
3354	$::CONN->start_record if $::CONN;
3355	}
3356
3357	sub stop {
3358	my ($self) = @_;
3359
3360	$self->{rec_btn}->set_text ("start recording");
3361	$self->{recording} = 0;
3362
3363	my $rec;
3364	$rec = $::CONN->stop_record if $::CONN;
3365	return unless ref $rec eq 'ARRAY';
3366	$self->set_command_list ($rec);
3367	}
3368
3369
3370	sub ask_for_bind_and_commit {
3371	my ($self) = @_;
3372	$self->ask_for_bind (1);
3373	}
3374
3375	sub ask_for_bind {
3376	my ($self, $commit) = @_;
3377
3378	CFClient::Binder::open_binding_dialog (sub {
3379	my ($mod, $sym) = @_;
3380	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381	$self->update_binding_widgets;
3382	$self->commit if $commit;
3383	});
3384	}
3385
3386	# $mod and $sym are the modifiers and key symbol
3387	# $cmds is a array ref of strings (the commands)
3388	# $cb is the callback that is executed on OK
3389	# $ccb is the callback that is executed on CANCEL and
3390	# when the binding was unsuccessful on OK
3391	sub set_binding {
3392	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3393
3394	$self->clear_command_list;
3395	$self->{recording} = 0;
3396	$self->{rec_btn}->set_text ("start recording");
3397
3398	$self->{binding} = [$mod, $sym];
3399	$self->{commands} = $cmds;
3400
3401	$self->{binding_change} = $cb;
3402	$self->{binding_cancel} = $ccb;
3403
3404	$self->update_binding_widgets;
3405	}
3406
3407	# this is a shortcut method that asks for a binding
3408	# and then just binds it.
3409	sub do_quick_binding {
3410	my ($self, $cmds) = @_;
3411	$self->set_binding (undef, undef, $cmds, sub {
3412	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413	});
3414	$self->ask_for_bind (1);
3415	}
3416
3417	sub update_binding_widgets {
3418	my ($self) = @_;
3419	my ($mod, $sym, $cmds) = $self->get_binding;
3420	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3421	$self->set_command_list ($cmds);
3422	}
3423
3424	sub get_binding {
3425	my ($self) = @_;
3426	return (
3427	$self->{binding}->[0],
3428	$self->{binding}->[1],
3429	[ grep { defined $_ } @{$self->{commands}} ]
3430	);
3431	}
3432
3433	sub clear_command_list {
3434	my ($self) = @_;
3435	$self->{cmdbox}->clear ();
3436	}
3437
3438	sub set_command_list {
3439	my ($self, $cmds) = @_;
3440
3441	$self->{cmdbox}->clear ();
3442	$self->{commands} = $cmds;
3443
3444	my $idx = 0;
3445
3446	for (@$cmds) {
3447	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3448
3449	my $i = $idx;
3450	$hb->add (new CFClient::UI::Label text => $_);
3451	$hb->add (new CFClient::UI::Button
3452	text => "delete",
3453	tooltip => "Deletes the action from the record",
3454	on_activate => sub {
3455	$self->{cmdbox}->remove ($hb);
3456	$cmds->[$i] = undef;
3457	});
3458
3459
3460	$idx++
3461	}
3462	}
3463
3464	#############################################################################
3465
3466	package CFClient::UI::SpellList;
3467
3468	our @ISA = CFClient::UI::Table::;
3469
3470	sub new {
3471	my $class = shift;
3472
3473	my $self = $class->SUPER::new (
3474	binding => [],
3475	commands => [],
3476	@_,
3477	)
3478	}
3479
3480	# XXX: Do sorting? Argl...
3481	sub add_spell {
3482	my ($self, $spell) = @_;
3483	$self->{spells}->{$spell->{name}} = $spell;
3484
3485	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486	face => $spell->{face},
3487	can_hover => 1,
3488	can_events => 1,
3489	tooltip => $spell->{message});
3490
3491	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492	text => $spell->{name},
3493	can_hover => 1,
3494	can_events => 1,
3495	tooltip => $spell->{message},
3496	expand => 1);
3497
3498	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501	expand => 1);
3502
3503	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504	text => "bind to key",
3505	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506	}
3507
3508	sub rebuild_spell_list {
3509	my ($self) = @_;
3510	$self->{tbl_idx} = 0;
3511	$self->add_spell ($_) for values %{$self->{spells}};
3512	}
3513
3514	sub remove_spell {
3515	my ($self, $spell) = @_;
3516	delete $self->{spells}->{$spell->{name}};
3517	$self->rebuild_spell_list;
3518	}
3519
3520	#############################################################################
3521
3522	package CFClient::UI::Root;	3764	package CFPlus::UI::Root;
3523		3765
3524	our @ISA = CFClient::UI::Container::;	3766	our @ISA = CFPlus::UI::Container::;
3525		3767
3526	use List::Util qw(min max);	3768	use List::Util qw(min max);
3527		3769
3528	use CFClient::OpenGL;	3770	use CFPlus::OpenGL;
3529		3771
3530	sub new {	3772	sub new {
3531	my $class = shift;	3773	my $class = shift;
3532		3774
3533	my $self = $class->SUPER::new (	3775	my $self = $class->SUPER::new (
…		…
3558	$coord = $max - $size if $coord > $max - $size;	3800	$coord = $max - $size if $coord > $max - $size;
3559		3801
3560	int $coord + 0.5	3802	int $coord + 0.5
3561	}	3803	}
3562		3804
3563	sub size_allocate {	3805	sub invoke_size_allocate {
3564	my ($self, $w, $h) = @_;	3806	my ($self, $w, $h) = @_;
3565		3807
3566	for my $child ($self->children) {	3808	for my $child ($self->children) {
3567	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)};
3568		3810
…		…
3572	$X = _to_pixel $X, $W, $self->{w};	3814	$X = _to_pixel $X, $W, $self->{w};
3573	$Y = _to_pixel $Y, $H, $self->{h};	3815	$Y = _to_pixel $Y, $H, $self->{h};
3574		3816
3575	$child->configure ($X, $Y, $W, $H);	3817	$child->configure ($X, $Y, $W, $H);
3576	}	3818	}
		3819
		3820	1
3577	}	3821	}
3578		3822
3579	sub coord2local {	3823	sub coord2local {
3580	my ($self, $x, $y) = @_;	3824	my ($self, $x, $y) = @_;
3581		3825
…		…
3707	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3951	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3708		3952
3709	$w = 0 if $w < 0;	3953	$w = 0 if $w < 0;
3710	$h = 0 if $h < 0;	3954	$h = 0 if $h < 0;
3711		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
3712	$w = int $w + 0.5;	3965	$w = int $w + 0.5;
3713	$h = int $h + 0.5;	3966	$h = int $h + 0.5;
3714		3967
3715	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}) {
3716	$widget->{old_w} = $widget->{w};	3969	$widget->{old_w} = $widget->{w};
…		…
3739	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3992	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3740	glMatrixMode GL_MODELVIEW;	3993	glMatrixMode GL_MODELVIEW;
3741	glLoadIdentity;	3994	glLoadIdentity;
3742		3995
3743	{	3996	{
3744	package CFClient::UI::Base;	3997	package CFPlus::UI::Base;
3745		3998
3746	($draw_x, $draw_y, $draw_w, $draw_h) =	3999	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3747	(0, 0, $self->{w}, $self->{h});	4000	(0, 0, $self->{w}, $self->{h});
3748	}
3749		4001
3750	$self->_draw;	4002	$self->_draw;
		4003	}
3751	}	4004	}
3752		4005
3753	#############################################################################	4006	#############################################################################
3754		4007
3755	package CFClient::UI;	4008	package CFPlus::UI;
3756		4009
3757	$ROOT = new CFClient::UI::Root;	4010	$ROOT = new CFPlus::UI::Root;
3758	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4011	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3759		4012
3760	1	4013	1
3761		4014

Diff Legend

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