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.295 by root, Tue Jun 6 09:19:28 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 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};
…		…
247	sub show {	270	sub show {
248	my ($self) = @_;	271	my ($self) = @_;
249		272
250	return if $self->{parent};	273	return if $self->{parent};
251		274
252	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
253	}	276	}
254		277
255	sub set_visible {	278	sub set_visible {
256	my ($self) = @_;	279	my ($self) = @_;
257		280
…		…
272		295
273	return unless $self->{visible};	296	return unless $self->{visible};
274		297
275	$_->set_invisible for $self->children;	298	$_->set_invisible for $self->children;
276		299
		300	delete $self->{visible};
277	delete $self->{root};	301	delete $self->{root};
278	delete $self->{visible};
279		302
280	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
282		305
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
285		308
286	$self->focus_out;	309	$self->emit ("focus_out");
287
288	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
289	}	311	}
290		312
291	sub set_visibility {	313	sub set_visibility {
292	my ($self, $visible) = @_;	314	my ($self, $visible) = @_;
…		…
315	}	337	}
316		338
317	sub move_abs {	339	sub move_abs {
318	my ($self, $x, $y, $z) = @_;	340	my ($self, $x, $y, $z) = @_;
319		341
320	$self->{x} = List::Util::max 0, int $x;	342	$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;	343	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322	$self->{z} = $z if defined $z;	344	$self->{z} = $z if defined $z;
323		345
324	$self->update;	346	$self->update;
325	}	347	}
326		348
…		…
336	sub size_request {	358	sub size_request {
337	require Carp;	359	require Carp;
338	Carp::confess "size_request is abstract";	360	Carp::confess "size_request is abstract";
339	}	361	}
340		362
		363	sub baseline_shift {
		364	0
		365	}
		366
341	sub configure {	367	sub configure {
342	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
343		369
344	if ($self->{aspect}) {	370	if ($self->{aspect}) {
345	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
346		372
347	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349		375
350	# use alignment to adjust x, y	376	# use alignment to adjust x, y
351		377
352	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
353	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
367		393
368	$self->{root}{size_alloc}{$self+0} = $self;	394	$self->{root}{size_alloc}{$self+0} = $self;
369	}	395	}
370	}	396	}
371		397
372	sub size_allocate {
373	# nothing to be done
374	}
375
376	sub children {	398	sub children {
377	# nop	399	# nop
378	}	400	}
379		401
380	sub visible_children {	402	sub visible_children {
…		…
398		420
399	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
400		422
401	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
402		424
403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
405	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
406	}	428	}
407	}	429	}
408		430
409	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
410	sub coord2local {	432	sub coord2local {
411	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
412		434
		435	Carp::confess unless $self->{parent};#d#
		436
413	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414	}	438	}
415		439
416	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
417	sub coord2global {	441	sub coord2global {
418	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
419		443
		444	Carp::confess unless $self->{parent};#d#
		445
420	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421	}	447	}
422		448
423	sub focus_in {	449	sub invoke_focus_in {
424	my ($self) = @_;	450	my ($self) = @_;
425		451
426	return if $FOCUS == $self;	452	return if $FOCUS == $self;
427	return unless $self->{can_focus};	453	return unless $self->{can_focus};
428		454
429	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
430		456
431	$self->_emit (focus_in => $focus);	457	$self->update;
432		458
433	$focus->update if $focus;	459	0
434	$FOCUS->update;
435	}	460	}
436		461
437	sub focus_out {	462	sub invoke_focus_out {
438	my ($self) = @_;	463	my ($self) = @_;
439		464
440	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
441		466
442	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
443		468
444	$self->_emit (focus_out => $focus);	469	$self->update;
445		470
446	$focus->update if $focus; #?
447
448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449	unless $FOCUS;	472	unless $FOCUS;
450	}
451		473
		474	0
		475	}
		476
		477	sub grab_focus {
		478	my ($self) = @_;
		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
		481	$self->emit ("focus_in");
		482	}
		483
452	sub mouse_motion { 0 }	484	sub invoke_mouse_motion { 0 }
453	sub button_up { 0 }	485	sub invoke_button_up { 0 }
454	sub key_down { 0 }	486	sub invoke_key_down { 0 }
455	sub key_up { 0 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
456		489
457	sub button_down {	490	sub invoke_button_down {
458	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
459		492
460	$self->focus_in;	493	$self->grab_focus;
461		494
462	0	495	0
		496	}
		497
		498	sub connect {
		499	my ($self, $signal, $cb) = @_;
		500
		501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
		507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
		515
		516	sub emit {
		517	my ($self, $signal, @args) = @_;
		518
		519	# I do not really like this solution, but I do not like duplication
		520	# and needlessly verbose code, either.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
		528	if ($self->{tooltip} =~ /Apply.*audio/) {
		529	warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
		530	warn "3 $self->{parent}\n";#d#
		531	}
		532
		533	#d##TODO# stop propagating at first true, do not use sum
		534	my $res =
		535	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
		536	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
		537	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
		538	;
		539	if ($self->{tooltip} =~ /Apply.*audio/) {
		540	warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
		541	warn "5 $self->{parent}\n";#d#
		542	}
		543
		544	$res
463	}	545	}
464		546
465	sub find_widget {	547	sub find_widget {
466	my ($self, $x, $y) = @_;	548	my ($self, $x, $y) = @_;
467		549
…		…
477	sub set_parent {	559	sub set_parent {
478	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
479		561
480	Scalar::Util::weaken ($self->{parent} = $parent);	562	Scalar::Util::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	563	$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	}	564	}
506		565
507	sub realloc {	566	sub realloc {
508	my ($self) = @_;	567	my ($self) = @_;
509		568
…		…
542	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
543		602
544	# update screen rectangle	603	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};	604	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};	605	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549		606
550	# skip widgets that are entirely outside the drawing area	607	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553		610
…		…
576	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
577	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
578	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
579	glEnd;	636	glEnd;
580	glPopMatrix;	637	glPopMatrix;
581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582	}	639	}
583		640
584	$self->_draw;	641	$self->_draw;
585	glPopMatrix;	642	glPopMatrix;
586	}	643	}
…		…
592	}	649	}
593		650
594	sub DESTROY {	651	sub DESTROY {
595	my ($self) = @_;	652	my ($self) = @_;
596		653
		654	return if CFPlus::in_destruct;
		655
597	delete $WIDGET{$self+0};	656	delete $WIDGET{$self+0};
598	#$self->deactivate;	657
		658	eval { $self->destroy };
		659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599	}	660	}
600		661
601	#############################################################################	662	#############################################################################
602		663
603	package CFClient::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
604		665
605	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
606		667
607	use strict;	668	use strict;
608	use CFClient::OpenGL;	669	use CFPlus::OpenGL;
609		670
610	sub new {	671	sub new {
611	my $class = shift;	672	my $class = shift;
612		673
613	# range [value, low, high, page]	674	# range [value, low, high, page]
…		…
644	}	705	}
645	}	706	}
646		707
647	#############################################################################	708	#############################################################################
648		709
649	package CFClient::UI::Empty;	710	package CFPlus::UI::Empty;
650		711
651	our @ISA = CFClient::UI::Base::;	712	our @ISA = CFPlus::UI::Base::;
652		713
653	sub new {	714	sub new {
654	my ($class, %arg) = @_;	715	my ($class, %arg) = @_;
655	$class->SUPER::new (can_events => 0, %arg);	716	$class->SUPER::new (can_events => 0, %arg);
656	}	717	}
…		…
663		724
664	sub draw { }	725	sub draw { }
665		726
666	#############################################################################	727	#############################################################################
667		728
668	package CFClient::UI::Container;	729	package CFPlus::UI::Container;
669		730
670	our @ISA = CFClient::UI::Base::;	731	our @ISA = CFPlus::UI::Base::;
671		732
672	sub new {	733	sub new {
673	my ($class, %arg) = @_;	734	my ($class, %arg) = @_;
674		735
675	my $children = delete $arg{children};	736	my $children = delete $arg{children};
…		…
684	if $children;	745	if $children;
685		746
686	$self	747	$self
687	}	748	}
688		749
		750	sub realloc {
		751	my ($self) = @_;
		752
		753	$self->{force_realloc} = 1;
		754	$self->{force_size_alloc} = 1;
		755	$self->SUPER::realloc;
		756	}
		757
689	sub add {	758	sub add {
690	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
691		760
692	$_->set_parent ($self)	761	$_->set_parent ($self)
693	for @widgets;	762	for @widgets;
…		…
753	$_->draw for @{$self->{children}};	822	$_->draw for @{$self->{children}};
754	}	823	}
755		824
756	#############################################################################	825	#############################################################################
757		826
758	package CFClient::UI::Bin;	827	package CFPlus::UI::Bin;
759		828
760	our @ISA = CFClient::UI::Container::;	829	our @ISA = CFPlus::UI::Container::;
761		830
762	sub new {	831	sub new {
763	my ($class, %arg) = @_;	832	my ($class, %arg) = @_;
764		833
765	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	834	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766		835
767	$class->SUPER::new (children => [$child], %arg)	836	$class->SUPER::new (children => [$child], %arg)
768	}	837	}
769		838
770	sub add {	839	sub add {
771	my ($self, $child) = @_;	840	my ($self, $child) = @_;
772		841
773	$self->{children} = [];	842	$self->SUPER::remove ($_) for @{ $self->{children} };
774
775	$self->SUPER::add ($child);	843	$self->SUPER::add ($child);
776	}	844	}
777		845
778	sub remove {	846	sub remove {
779	my ($self, $widget) = @_;	847	my ($self, $widget) = @_;
780		848
781	$self->SUPER::remove ($widget);	849	$self->SUPER::remove ($widget);
782		850
783	$self->{children} = [new CFClient::UI::Empty]	851	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	852	unless @{$self->{children}};
785	}	853	}
786		854
787	sub child { $_[0]->{children}[0] }	855	sub child { $_[0]->{children}[0] }
788		856
789	sub size_request {	857	sub size_request {
790	$_[0]{children}[0]->size_request	858	$_[0]{children}[0]->size_request
791	}	859	}
792		860
793	sub size_allocate {	861	sub invoke_size_allocate {
794	my ($self, $w, $h) = @_;	862	my ($self, $w, $h) = @_;
795		863
796	$self->{children}[0]->configure (0, 0, $w, $h);	864	$self->{children}[0]->configure (0, 0, $w, $h);
		865
		866	1
797	}	867	}
798		868
799	#############################################################################	869	#############################################################################
800		870
801	# back-buffered drawing area	871	# back-buffered drawing area
802		872
803	package CFClient::UI::Window;	873	package CFPlus::UI::Window;
804		874
805	our @ISA = CFClient::UI::Bin::;	875	our @ISA = CFPlus::UI::Bin::;
806		876
807	use CFClient::OpenGL;	877	use CFPlus::OpenGL;
808		878
809	sub new {	879	sub new {
810	my ($class, %arg) = @_;	880	my ($class, %arg) = @_;
811		881
812	my $self = $class->SUPER::new (%arg);	882	my $self = $class->SUPER::new (%arg);
…		…
817		887
818	$ROOT->on_post_alloc ($self => sub { $self->render_child });	888	$ROOT->on_post_alloc ($self => sub { $self->render_child });
819	$self->SUPER::update;	889	$self->SUPER::update;
820	}	890	}
821		891
822	sub size_allocate {	892	sub invoke_size_allocate {
823	my ($self, $w, $h) = @_;	893	my ($self, $w, $h) = @_;
824		894
825	$self->SUPER::size_allocate ($w, $h);
826	$self->update;	895	$self->update;
		896
		897	$self->SUPER::invoke_size_allocate ($w, $h)
827	}	898	}
828		899
829	sub _render {	900	sub _render {
830	my ($self) = @_;	901	my ($self) = @_;
831		902
…		…
833	}	904	}
834		905
835	sub render_child {	906	sub render_child {
836	my ($self) = @_;	907	my ($self) = @_;
837		908
838	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	909	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
839	glClearColor 0, 0, 0, 0;	910	glClearColor 0, 0, 0, 0;
840	glClear GL_COLOR_BUFFER_BIT;	911	glClear GL_COLOR_BUFFER_BIT;
841		912
842	{	913	{
843	package CFClient::UI::Base;	914	package CFPlus::UI::Base;
844		915
845	($draw_x, $draw_y, $draw_w, $draw_h) =	916	local ($draw_x, $draw_y, $draw_w, $draw_h) =
846	(0, 0, $self->{w}, $self->{h});	917	(0, 0, $self->{w}, $self->{h});
		918
		919	$self->_render;
847	}	920	}
848
849	$self->_render;
850	};	921	};
851	}	922	}
852		923
853	sub _draw {	924	sub _draw {
854	my ($self) = @_;	925	my ($self) = @_;
855
856	my ($w, $h) = @$self{qw(w h)};
857		926
858	my $tex = $self->{texture}	927	my $tex = $self->{texture}
859	or return;	928	or return;
860		929
861	glEnable GL_TEXTURE_2D;	930	glEnable GL_TEXTURE_2D;
862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	931	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863	glColor 0, 0, 0, 1;	932	glColor 0, 0, 0, 1;
864		933
865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	934	$tex->draw_quad_alpha_premultiplied (0, 0);
866		935
867	glDisable GL_TEXTURE_2D;	936	glDisable GL_TEXTURE_2D;
868	}	937	}
869		938
870	#############################################################################	939	#############################################################################
871		940
872	package CFClient::UI::ViewPort;	941	package CFPlus::UI::ViewPort;
873		942
874	our @ISA = CFClient::UI::Window::;	943	our @ISA = CFPlus::UI::Window::;
875		944
876	sub new {	945	sub new {
877	my $class = shift;	946	my $class = shift;
878		947
879	$class->SUPER::new (	948	$class->SUPER::new (
…		…
892	$h = 10 if $self->{scroll_y};	961	$h = 10 if $self->{scroll_y};
893		962
894	($w, $h)	963	($w, $h)
895	}	964	}
896		965
897	sub size_allocate {	966	sub invoke_size_allocate {
898	my ($self, $w, $h) = @_;	967	my ($self, $w, $h) = @_;
899		968
900	my $child = $self->child;	969	my $child = $self->child;
901		970
902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	971	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	972	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904		973
905	$self->child->configure (0, 0, $w, $h);	974	$self->child->configure (0, 0, $w, $h);
906	$self->update;	975	$self->update;
		976
		977	1
907	}	978	}
908		979
909	sub set_offset {	980	sub set_offset {
910	my ($self, $x, $y) = @_;	981	my ($self, $x, $y) = @_;
911		982
…		…
937	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1008	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1009	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
939	) {	1010	) {
940	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1011	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941	} else {	1012	} else {
942	$self->CFClient::UI::Base::find_widget ($x, $y)	1013	$self->CFPlus::UI::Base::find_widget ($x, $y)
943	}	1014	}
944	}	1015	}
945		1016
946	sub _render {	1017	sub _render {
947	my ($self) = @_;	1018	my ($self) = @_;
948		1019
949	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1020	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};	1021	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951		1022
952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1023	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953		1024
954	$self->SUPER::_render;	1025	$self->SUPER::_render;
955	}	1026	}
956		1027
957	#############################################################################	1028	#############################################################################
958		1029
959	package CFClient::UI::ScrolledWindow;	1030	package CFPlus::UI::ScrolledWindow;
960		1031
961	our @ISA = CFClient::UI::HBox::;	1032	our @ISA = CFPlus::UI::HBox::;
962		1033
963	sub new {	1034	sub new {
964	my ($class, %arg) = @_;	1035	my ($class, %arg) = @_;
965		1036
966	my $child = delete $arg{child};	1037	my $child = delete $arg{child};
967		1038
968	my $self;	1039	my $self;
969		1040
970	my $slider = new CFClient::UI::Slider	1041	my $slider = new CFPlus::UI::Slider
971	vertical => 1,	1042	vertical => 1,
972	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
973	on_changed => sub {	1044	on_changed => sub {
974	$self->{vp}->set_offset (0, $_[1]);	1045	$self->{vp}->set_offset (0, $_[1]);
975	},	1046	},
976	;	1047	;
977		1048
978	$self = $class->SUPER::new (	1049	$self = $class->SUPER::new (
979	vp => (new CFClient::UI::ViewPort expand => 1),	1050	vp => (new CFPlus::UI::ViewPort expand => 1),
		1051	can_events => 1,
980	slider => $slider,	1052	slider => $slider,
981	%arg,	1053	%arg,
982	);	1054	);
983		1055
984	$self->SUPER::add ($self->{vp}, $self->{slider});	1056	$self->SUPER::add ($self->{vp}, $self->{slider});
985	$self->add ($child) if $child;	1057	$self->add ($child) if $child;
986		1058
987	$self	1059	$self
988	}	1060	}
989		1061
		1062	#TODO# update range on size_allocate depending on child
		1063
990	sub add {	1064	sub add {
991	my ($self, $widget) = @_;	1065	my ($self, $widget) = @_;
992		1066
993	$self->{vp}->add ($self->{child} = $widget);	1067	$self->{vp}->add ($self->{child} = $widget);
994	}	1068	}
995		1069
		1070	sub invoke_mouse_wheel {
		1071	my ($self, $ev) = @_;
		1072
		1073	return 0 unless $ev->{dy}; # only vertical movements
		1074
		1075	$self->{slider}->emit (mouse_wheel => $ev);
		1076
		1077	1
		1078	}
		1079
		1080	sub update_slider {
		1081	my ($self) = @_;
		1082
		1083	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1084	}
		1085
996	sub update {	1086	sub update {
997	my ($self) = @_;	1087	my ($self) = @_;
998		1088
999	$self->SUPER::update;	1089	$self->SUPER::update;
1000		1090
1001	# todo: overwrite size_allocate of child	1091	$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	}	1092	}
1005		1093
1006	sub size_allocate {	1094	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1095	my ($self, $w, $h) = @_;
1008		1096
		1097	$self->update_slider;
		1098
1009	$self->SUPER::size_allocate ($w, $h);	1099	$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	}	1100	}
1014
1015	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll
1017		1101
1018	#############################################################################	1102	#############################################################################
1019		1103
1020	package CFClient::UI::Frame;	1104	package CFPlus::UI::Frame;
1021		1105
1022	our @ISA = CFClient::UI::Bin::;	1106	our @ISA = CFPlus::UI::Bin::;
1023		1107
1024	use CFClient::OpenGL;	1108	use CFPlus::OpenGL;
1025		1109
1026	sub new {	1110	sub new {
1027	my $class = shift;	1111	my $class = shift;
1028		1112
1029	$class->SUPER::new (	1113	$class->SUPER::new (
…		…
1055	$self->SUPER::_draw;	1139	$self->SUPER::_draw;
1056	}	1140	}
1057		1141
1058	#############################################################################	1142	#############################################################################
1059		1143
1060	package CFClient::UI::FancyFrame;	1144	package CFPlus::UI::FancyFrame;
1061		1145
1062	our @ISA = CFClient::UI::Bin::;	1146	our @ISA = CFPlus::UI::Bin::;
1063		1147
1064	use CFClient::OpenGL;	1148	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		1149
1074	sub new {	1150	sub new {
1075	my ($class, %arg) = @_;	1151	my ($class, %arg) = @_;
1076		1152
1077	my $title = delete $arg{title};	1153	if ((exists $arg{label}) && !ref $arg{label}) {
		1154	$arg{label} = new CFPlus::UI::Label
		1155	align => 1,
		1156	valign => 0,
		1157	text => $arg{label},
		1158	fontsize => ($arg{border} || 0.8) * 0.75;
		1159	}
		1160
		1161	my $self = $class->SUPER::new (
		1162	# label => "",
		1163	fg => [0.6, 0.3, 0.1],
		1164	border => 0.8,
		1165	style => 'single',
		1166	%arg,
		1167	);
		1168
		1169	$self
		1170	}
		1171
		1172	sub add {
		1173	my ($self, @widgets) = @_;
		1174
		1175	$self->SUPER::add (@widgets);
		1176	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1177	}
		1178
		1179	sub border {
		1180	int $_[0]{border} * $::FONTSIZE
		1181	}
		1182
		1183	sub size_request {
		1184	my ($self) = @_;
		1185
		1186	($self->{label_w}, undef) = $self->{label}->size_request
		1187	if $self->{label};
		1188
		1189	my ($w, $h) = $self->SUPER::size_request;
		1190
		1191	(
		1192	$w + $self->border * 2,
		1193	$h + $self->border * 2,
		1194	)
		1195	}
		1196
		1197	sub invoke_size_allocate {
		1198	my ($self, $w, $h) = @_;
		1199
		1200	my $border = $self->border;
		1201
		1202	$w -= List::Util::max 0, $border * 2;
		1203	$h -= List::Util::max 0, $border * 2;
		1204
		1205	if (my $label = $self->{label}) {
		1206	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1207	$label->{h} = List::Util::min $h, $border;
		1208	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1209	}
		1210
		1211	$self->child->configure ($border, $border, $w, $h);
		1212
		1213	1
		1214	}
		1215
		1216	sub _draw {
		1217	my ($self) = @_;
		1218
		1219	my $child = $self->{children}[0];
		1220
		1221	my $border = $self->border;
		1222	my ($w, $h) = ($self->{w}, $self->{h});
		1223
		1224	$child->draw;
		1225
		1226	glColor @{$self->{fg}};
		1227	glBegin GL_LINE_STRIP;
		1228	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1229	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1230	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1231	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1232	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1233	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1234	glEnd;
		1235
		1236	if ($self->{label}) {
		1237	glTranslate $border * 2, 0;
		1238	$self->{label}->_draw;
		1239	}
		1240	}
		1241
		1242	#############################################################################
		1243
		1244	package CFPlus::UI::Toplevel;
		1245
		1246	our @ISA = CFPlus::UI::Bin::;
		1247
		1248	use CFPlus::OpenGL;
		1249
		1250	my $bg =
		1251	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1252	mipmap => 1, wrap => 1;
		1253
		1254	my @border =
		1255	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1256	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1257
		1258	sub new {
		1259	my ($class, %arg) = @_;
1078		1260
1079	my $self = $class->SUPER::new (	1261	my $self = $class->SUPER::new (
1080	bg => [1, 1, 1, 1],	1262	bg => [1, 1, 1, 1],
1081	border_bg => [1, 1, 1, 1],	1263	border_bg => [1, 1, 1, 1],
1082	border => 0.6,	1264	border => 0.6,
1083	can_events => 1,	1265	can_events => 1,
1084	min_w => 16,	1266	min_w => 64,
1085	min_h => 16,	1267	min_h => 32,
1086	%arg,	1268	%arg,
1087	);	1269	);
1088		1270
1089	$self->{title} = new CFClient::UI::Label	1271	$self->{title_widget} = new CFPlus::UI::Label
1090	align => 0,	1272	align => 0,
1091	valign => 1,	1273	valign => 1,
1092	text => $title,	1274	text => $self->{title},
1093	fontsize => $self->{border}	1275	fontsize => $self->{border},
1094	if defined $title;	1276	if exists $self->{title};
		1277
		1278	if ($self->{has_close_button}) {
		1279	$self->{close_button} =
		1280	new CFPlus::UI::ImageButton
		1281	path => 'x1_close.png',
		1282	on_activate => sub { $self->emit ("delete") };
		1283
		1284	$self->CFPlus::UI::Container::add ($self->{close_button});
		1285	}
1095		1286
1096	$self	1287	$self
1097	}	1288	}
1098		1289
1099	sub add {	1290	sub add {
1100	my ($self, @widgets) = @_;	1291	my ($self, @widgets) = @_;
1101		1292
1102	$self->SUPER::add (@widgets);	1293	$self->SUPER::add (@widgets);
		1294	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1295	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104	}	1296	}
1105		1297
1106	sub border {	1298	sub border {
1107	int $_[0]{border} * $::FONTSIZE	1299	int $_[0]{border} * $::FONTSIZE
1108	}	1300	}
1109		1301
1110	sub size_request {	1302	sub size_request {
1111	my ($self) = @_;	1303	my ($self) = @_;
1112		1304
1113	$self->{title}->size_request	1305	$self->{title_widget}->size_request
1114	if $self->{title};	1306	if $self->{title_widget};
		1307
		1308	$self->{close_button}->size_request
		1309	if $self->{close_button};
1115		1310
1116	my ($w, $h) = $self->SUPER::size_request;	1311	my ($w, $h) = $self->SUPER::size_request;
1117		1312
1118	(	1313	(
1119	$w + $self->border * 2,	1314	$w + $self->border * 2,
1120	$h + $self->border * 2,	1315	$h + $self->border * 2,
1121	)	1316	)
1122	}	1317	}
1123		1318
1124	sub size_allocate {	1319	sub invoke_size_allocate {
1125	my ($self, $w, $h) = @_;	1320	my ($self, $w, $h) = @_;
1126		1321
1127	if ($self->{title}) {	1322	if ($self->{title_widget}) {
1128	$self->{title}{w} = $w;	1323	$self->{title_widget}{w} = $w;
1129	$self->{title}{h} = $h;	1324	$self->{title_widget}{h} = $h;
1130	$self->{title}->size_allocate ($w, $h);	1325	$self->{title_widget}->invoke_size_allocate ($w, $h);
1131	}	1326	}
1132		1327
1133	my $border = $self->border;	1328	my $border = $self->border;
1134		1329
1135	$h -= List::Util::max 0, $border * 2;	1330	$h -= List::Util::max 0, $border * 2;
1136	$w -= List::Util::max 0, $border * 2;	1331	$w -= List::Util::max 0, $border * 2;
		1332
		1333	$self->child->configure ($border, $border, $w, $h);
		1334
		1335	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1336	if $self->{close_button};
		1337
		1338	1
		1339	}
		1340
		1341	sub invoke_delete {
		1342	my ($self) = @_;
		1343
		1344	$self->hide;
1137		1345
1138	$self->child->configure ($border, $border, $w, $h);	1346	1
1139	}	1347	}
1140		1348
1141	sub button_down {	1349	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1350	my ($self, $ev, $x, $y) = @_;
1143		1351
1144	my ($w, $h) = @$self{qw(w h)};	1352	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1353	my $border = $self->border;
1146		1354
…		…
1177		1385
1178	($x, $y) = ($ev->{x}, $ev->{y});	1386	($x, $y) = ($ev->{x}, $ev->{y});
1179		1387
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1388	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1389	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1390	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1391	};
1184	} else {	1392	} else {
1185	return 0;	1393	return 0;
1186	}	1394	}
1187		1395
1188	1	1396	1
1189	}	1397	}
1190		1398
1191	sub button_up {	1399	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1400	my ($self, $ev, $x, $y) = @_;
1193		1401
1194	!!delete $self->{motion}	1402	! ! delete $self->{motion}
1195	}	1403	}
1196		1404
1197	sub mouse_motion {	1405	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1406	my ($self, $ev, $x, $y) = @_;
1199		1407
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1408	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1409
1202	!!$self->{motion}	1410	! ! $self->{motion}
		1411	}
		1412
		1413	sub invoke_visibility_change {
		1414	my ($self, $visible) = @_;
		1415
		1416	delete $self->{motion} unless $visible;
		1417
		1418	0
1203	}	1419	}
1204		1420
1205	sub _draw {	1421	sub _draw {
1206	my ($self) = @_;	1422	my ($self) = @_;
1207		1423
…		…
1233		1449
1234	glDisable GL_TEXTURE_2D;	1450	glDisable GL_TEXTURE_2D;
1235		1451
1236	$child->draw;	1452	$child->draw;
1237		1453
1238	if ($self->{title}) {	1454	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1455	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1456	$self->{title_widget}->_draw;
		1457
		1458	glTranslate 0, - ($border - $self->{h});
1241	}	1459	}
		1460
		1461	$self->{close_button}->draw
		1462	if $self->{close_button};
1242	}	1463	}
1243		1464
1244	#############################################################################	1465	#############################################################################
1245		1466
1246	package CFClient::UI::Table;	1467	package CFPlus::UI::Table;
1247		1468
1248	our @ISA = CFClient::UI::Base::;	1469	our @ISA = CFPlus::UI::Base::;
1249		1470
1250	use List::Util qw(max sum);	1471	use List::Util qw(max sum);
1251		1472
1252	use CFClient::OpenGL;	1473	use CFPlus::OpenGL;
1253		1474
1254	sub new {	1475	sub new {
1255	my $class = shift;	1476	my $class = shift;
1256		1477
1257	$class->SUPER::new (	1478	$class->SUPER::new (
…		…
1263	sub children {	1484	sub children {
1264	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1485	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265	}	1486	}
1266		1487
1267	sub add {	1488	sub add {
1268	my ($self, $x, $y, $child) = @_;	1489	my ($self) = shift;
1269		1490
		1491	while (@_) {
		1492	my ($x, $y, $child) = splice @_, 0, 3, ();
1270	$child->set_parent ($self);	1493	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;	1494	$self->{children}[$y][$x] = $child;
		1495	}
1272		1496
		1497	$self->{force_realloc} = 1;
		1498	$self->{force_size_alloc} = 1;
1273	$self->realloc;	1499	$self->realloc;
		1500	}
		1501
		1502	sub remove {
		1503	my ($self, $child) = @_;
		1504
		1505	# TODO: not yet implemented
1274	}	1506	}
1275		1507
1276	# TODO: move to container class maybe? send children a signal on removal?	1508	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {	1509	sub clear {
1278	my ($self) = @_;	1510	my ($self) = @_;
…		…
1319	(sum @$ws),	1551	(sum @$ws),
1320	(sum @$hs),	1552	(sum @$hs),
1321	)	1553	)
1322	}	1554	}
1323		1555
1324	sub size_allocate {	1556	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1557	my ($self, $w, $h) = @_;
1326		1558
1327	my ($ws, $hs) = $self->get_wh;	1559	my ($ws, $hs) = $self->get_wh;
1328		1560
1329	my $req_w = (sum @$ws) || 1;	1561	my $req_w = (sum @$ws) || 1;
…		…
1336		1568
1337	# linearly scale sizes	1569	# linearly scale sizes
1338	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1570	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1571	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340		1572
1341	CFClient::UI::harmonize $ws;	1573	CFPlus::UI::harmonize $ws;
1342	CFClient::UI::harmonize $hs;	1574	CFPlus::UI::harmonize $hs;
1343		1575
1344	my $y;	1576	my $y;
1345		1577
1346	for my $r (0 .. $#{$self->{children}}) {	1578	for my $r (0 .. $#{$self->{children}}) {
1347	my $row = $self->{children}[$r]	1579	my $row = $self->{children}[$r]
…		…
1361	}	1593	}
1362		1594
1363	$y += $row_h;	1595	$y += $row_h;
1364	}	1596	}
1365		1597
		1598	1
1366	}	1599	}
1367		1600
1368	sub find_widget {	1601	sub find_widget {
1369	my ($self, $x, $y) = @_;	1602	my ($self, $x, $y) = @_;
1370		1603
…		…
1389	}	1622	}
1390	}	1623	}
1391		1624
1392	#############################################################################	1625	#############################################################################
1393		1626
1394	package CFClient::UI::Box;	1627	package CFPlus::UI::Box;
1395		1628
1396	our @ISA = CFClient::UI::Container::;	1629	our @ISA = CFPlus::UI::Container::;
1397		1630
1398	sub size_request {	1631	sub size_request {
1399	my ($self) = @_;	1632	my ($self) = @_;
1400		1633
1401	$self->{vertical}	1634	$self->{vertical}
…		…
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1640	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1641	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1409	)	1642	)
1410	}	1643	}
1411		1644
1412	sub size_allocate {	1645	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1646	my ($self, $w, $h) = @_;
1414		1647
1415	my $space = $self->{vertical} ? $h : $w;	1648	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1649	my @children = $self->visible_children;
1417		1650
1418	my @req;	1651	my @req;
1419		1652
1420	if ($self->{homogeneous}) {	1653	if ($self->{homogeneous}) {
1421	@req = ($space / (@$children || 1)) x @$children;	1654	@req = ($space / (@children || 1)) x @children;
1422	} else {	1655	} else {
1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1656	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424	my $req = List::Util::sum @req;	1657	my $req = List::Util::sum @req;
1425		1658
1426	if ($req > $space) {	1659	if ($req > $space) {
1427	# ah well, not enough space	1660	# ah well, not enough space
1428	$_ *= $space / $req for @req;	1661	$_ *= $space / $req for @req;
1429	} else {	1662	} else {
1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1663	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431		1664
1432	$space = ($space - $req) / $expand; # remaining space to give away	1665	$space = ($space - $req) / $expand; # remaining space to give away
1433		1666
1434	$req[$_] += $space * $children->[$_]{expand}	1667	$req[$_] += $space * $children[$_]{expand}
1435	for 0 .. $#$children;	1668	for 0 .. $#children;
1436	}	1669	}
1437	}	1670	}
1438		1671
1439	CFClient::UI::harmonize \@req;	1672	CFPlus::UI::harmonize \@req;
1440		1673
1441	my $pos = 0;	1674	my $pos = 0;
1442	for (0 .. $#$children) {	1675	for (0 .. $#children) {
1443	my $alloc = $req[$_];	1676	my $alloc = $req[$_];
1444	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1677	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445		1678
1446	$pos += $alloc;	1679	$pos += $alloc;
1447	}	1680	}
1448		1681
1449	1	1682	1
1450	}	1683	}
1451		1684
1452	#############################################################################	1685	#############################################################################
1453		1686
1454	package CFClient::UI::HBox;	1687	package CFPlus::UI::HBox;
1455		1688
1456	our @ISA = CFClient::UI::Box::;	1689	our @ISA = CFPlus::UI::Box::;
1457		1690
1458	sub new {	1691	sub new {
1459	my $class = shift;	1692	my $class = shift;
1460		1693
1461	$class->SUPER::new (	1694	$class->SUPER::new (
…		…
1464	)	1697	)
1465	}	1698	}
1466		1699
1467	#############################################################################	1700	#############################################################################
1468		1701
1469	package CFClient::UI::VBox;	1702	package CFPlus::UI::VBox;
1470		1703
1471	our @ISA = CFClient::UI::Box::;	1704	our @ISA = CFPlus::UI::Box::;
1472		1705
1473	sub new {	1706	sub new {
1474	my $class = shift;	1707	my $class = shift;
1475		1708
1476	$class->SUPER::new (	1709	$class->SUPER::new (
…		…
1479	)	1712	)
1480	}	1713	}
1481		1714
1482	#############################################################################	1715	#############################################################################
1483		1716
1484	package CFClient::UI::Label;	1717	package CFPlus::UI::Label;
1485		1718
1486	our @ISA = CFClient::UI::DrawBG::;	1719	our @ISA = CFPlus::UI::DrawBG::;
1487		1720
1488	use CFClient::OpenGL;	1721	use CFPlus::OpenGL;
1489		1722
1490	sub new {	1723	sub new {
1491	my ($class, %arg) = @_;	1724	my ($class, %arg) = @_;
1492		1725
1493	my $self = $class->SUPER::new (	1726	my $self = $class->SUPER::new (
…		…
1496	#active_bg => none	1729	#active_bg => none
1497	#font => default_font	1730	#font => default_font
1498	#text => initial text	1731	#text => initial text
1499	#markup => initial narkup	1732	#markup => initial narkup
1500	#max_w => maximum pixel width	1733	#max_w => maximum pixel width
		1734	#style => 0, # render flags
1501	ellipsise => 3, # end	1735	ellipsise => 3, # end
1502	layout => (new CFClient::Layout),	1736	layout => (new CFPlus::Layout),
1503	fontsize => 1,	1737	fontsize => 1,
1504	align => -1,	1738	align => -1,
1505	valign => -1,	1739	valign => -1,
1506	padding_x => 2,	1740	padding_x => 2,
1507	padding_y => 2,	1741	padding_y => 2,
1508	can_events => 0,	1742	can_events => 0,
1509	%arg	1743	%arg
1510	);	1744	);
1511		1745
1512	if (exists $self->{template}) {	1746	if (exists $self->{template}) {
1513	my $layout = new CFClient::Layout;	1747	my $layout = new CFPlus::Layout;
1514	$layout->set_text (delete $self->{template});	1748	$layout->set_text (delete $self->{template});
1515	$self->{template} = $layout;	1749	$self->{template} = $layout;
1516	}	1750	}
1517		1751
1518	if (exists $self->{markup}) {	1752	if (exists $self->{markup}) {
…		…
1522	}	1756	}
1523		1757
1524	$self	1758	$self
1525	}	1759	}
1526		1760
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 {	1761	sub update {
1538	my ($self) = @_;	1762	my ($self) = @_;
1539		1763
1540	delete $self->{texture};	1764	delete $self->{texture};
1541	$self->SUPER::update;	1765	$self->SUPER::update;
…		…
1552	my ($self, $text) = @_;	1776	my ($self, $text) = @_;
1553		1777
1554	return if $self->{text} eq "T$text";	1778	return if $self->{text} eq "T$text";
1555	$self->{text} = "T$text";	1779	$self->{text} = "T$text";
1556		1780
1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558	$self->{layout}->set_text ($text);	1781	$self->{layout}->set_text ($text);
1559		1782
1560	delete $self->{size_req};	1783	delete $self->{size_req};
1561	$self->realloc;	1784	$self->realloc;
1562	$self->update;	1785	$self->update;
…		…
1568	return if $self->{text} eq "M$markup";	1791	return if $self->{text} eq "M$markup";
1569	$self->{text} = "M$markup";	1792	$self->{text} = "M$markup";
1570		1793
1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1794	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572		1795
1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574	$self->{layout}->set_markup ($markup);	1796	$self->{layout}->set_markup ($markup);
1575		1797
1576	delete $self->{size_req};	1798	delete $self->{size_req};
1577	$self->realloc;	1799	$self->realloc;
1578	$self->update;	1800	$self->update;
…		…
1590		1812
1591	my ($w, $h) = $self->{layout}->size;	1813	my ($w, $h) = $self->{layout}->size;
1592		1814
1593	if (exists $self->{template}) {	1815	if (exists $self->{template}) {
1594	$self->{template}->set_font ($self->{font}) if $self->{font};	1816	$self->{template}->set_font ($self->{font}) if $self->{font};
		1817	$self->{template}->set_width ($self->{max_w} || -1);
1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1818	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596		1819
1597	my ($w2, $h2) = $self->{template}->size;	1820	my ($w2, $h2) = $self->{template}->size;
1598		1821
1599	$w = List::Util::max $w, $w2;	1822	$w = List::Util::max $w, $w2;
…		…
1604	};	1827	};
1605		1828
1606	@{ $self->{size_req} }	1829	@{ $self->{size_req} }
1607	}	1830	}
1608		1831
		1832	sub baseline_shift {
		1833	$_[0]{layout}->descent
		1834	}
		1835
1609	sub size_allocate {	1836	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	1837	my ($self, $w, $h) = @_;
1611		1838
1612	delete $self->{ox};	1839	delete $self->{ox};
1613		1840
1614	delete $self->{texture}	1841	delete $self->{texture}
1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1842	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1843
		1844	1
1616	}	1845	}
1617		1846
1618	sub set_fontsize {	1847	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	1848	my ($self, $fontsize) = @_;
1620		1849
1621	$self->{fontsize} = $fontsize;	1850	$self->{fontsize} = $fontsize;
		1851	delete $self->{size_req};
1622	delete $self->{texture};	1852	delete $self->{texture};
1623		1853
1624	$self->realloc;	1854	$self->realloc;
1625	}	1855	}
1626		1856
1627	sub reconfigure {	1857	sub reconfigure {
1628	my ($self) = @_;	1858	my ($self) = @_;
1629		1859
1630	delete $self->{size_req};	1860	delete $self->{size_req};
		1861	delete $self->{texture};
1631		1862
1632	$self->SUPER::reconfigure;	1863	$self->SUPER::reconfigure;
1633	}	1864	}
1634		1865
1635	sub _draw {	1866	sub _draw {
1636	my ($self) = @_;	1867	my ($self) = @_;
1637		1868
1638	$self->SUPER::_draw; # draw background, if applicable	1869	$self->SUPER::_draw; # draw background, if applicable
1639		1870
1640	my $tex = $self->{texture} ||= do {	1871	my $size = $self->{texture} ||= do {
1641	$self->{layout}->set_foreground (@{$self->{fg}});	1872	$self->{layout}->set_foreground (@{$self->{fg}});
1642	$self->{layout}->set_font ($self->{font}) if $self->{font};	1873	$self->{layout}->set_font ($self->{font}) if $self->{font};
1643	$self->{layout}->set_width ($self->{w});	1874	$self->{layout}->set_width ($self->{w});
1644	$self->{layout}->set_ellipsise ($self->{ellipsise});	1875	$self->{layout}->set_ellipsise ($self->{ellipsise});
1645	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1876	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1877	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647		1878
1648	new_from_layout CFClient::Texture $self->{layout}	1879	[$self->{layout}->size]
1649	};	1880	};
1650		1881
1651	unless (exists $self->{ox}) {	1882	unless (exists $self->{ox}) {
1652	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1883	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1884	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654	: ($self->{w} - $tex->{w}) * 0.5);	1885	: ($self->{w} - $size->[0]) * 0.5);
1655		1886
1656	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1887	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1888	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658	: ($self->{h} - $tex->{h}) * 0.5);	1889	: ($self->{h} - $size->[1]) * 0.5);
1659	};	1890	};
1660		1891
1661	glEnable GL_TEXTURE_2D;
1662
1663	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1892	my $w = List::Util::min $self->{w} + 4, $size->[0];
1664	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1893	my $h = List::Util::min $self->{h} + 2, $size->[1];
1665		1894
1666	if ($tex->{format} == GL_ALPHA) {	1895	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1667	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1668	glColor @{$self->{fg}};
1669	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1670	} else {
1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1673	}
1674
1675	glDisable GL_TEXTURE_2D;
1676	}	1896	}
1677		1897
1678	#############################################################################	1898	#############################################################################
1679		1899
1680	package CFClient::UI::EntryBase;	1900	package CFPlus::UI::EntryBase;
1681		1901
1682	our @ISA = CFClient::UI::Label::;	1902	our @ISA = CFPlus::UI::Label::;
1683		1903
1684	use CFClient::OpenGL;	1904	use CFPlus::OpenGL;
1685		1905
1686	sub new {	1906	sub new {
1687	my $class = shift;	1907	my $class = shift;
1688		1908
1689	$class->SUPER::new (	1909	$class->SUPER::new (
…		…
1713		1933
1714	$text =~ s/./*/g if $self->{hidden};	1934	$text =~ s/./*/g if $self->{hidden};
1715	$self->{layout}->set_text ("$text ");	1935	$self->{layout}->set_text ("$text ");
1716	delete $self->{size_req};	1936	delete $self->{size_req};
1717		1937
1718	$self->_emit (changed => $self->{text});	1938	$self->emit (changed => $self->{text});
1719		1939
1720	$self->realloc;	1940	$self->realloc;
1721	$self->update;	1941	$self->update;
1722	}	1942	}
1723		1943
…		…
1738	my ($w, $h) = $self->SUPER::size_request;	1958	my ($w, $h) = $self->SUPER::size_request;
1739		1959
1740	($w + 1, $h) # add 1 for cursor	1960	($w + 1, $h) # add 1 for cursor
1741	}	1961	}
1742		1962
1743	sub key_down {	1963	sub invoke_key_down {
1744	my ($self, $ev) = @_;	1964	my ($self, $ev) = @_;
1745		1965
1746	my $mod = $ev->{mod};	1966	my $mod = $ev->{mod};
1747	my $sym = $ev->{sym};	1967	my $sym = $ev->{sym};
1748	my $uni = $ev->{unicode};	1968	my $uni = $ev->{unicode};
…		…
1751		1971
1752	if ($uni == 8) {	1972	if ($uni == 8) {
1753	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1754	} elsif ($uni == 127) {	1974	} elsif ($uni == 127) {
1755	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1756	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1757	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1758	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1759	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1760	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
1761	$self->{cursor} = 0;	1981	$self->{cursor} = 0;
1762	} elsif ($sym == CFClient::SDLK_END) {	1982	} elsif ($sym == CFPlus::SDLK_END) {
1763	$self->{cursor} = length $text;	1983	$self->{cursor} = length $text;
		1984	} elsif ($uni == 21) { # ctrl-u
		1985	$text = "";
		1986	$self->{cursor} = 0;
1764	} elsif ($uni == 27) {	1987	} elsif ($uni == 27) {
1765	$self->_emit ('escape');	1988	$self->emit ('escape');
1766	} elsif ($uni) {	1989	} elsif ($uni) {
1767	substr $text, $self->{cursor}++, 0, chr $uni;	1990	substr $text, $self->{cursor}++, 0, chr $uni;
1768	} else {	1991	} else {
1769	return 0;	1992	return 0;
1770	}	1993	}
…		…
1774	$self->realloc;	1997	$self->realloc;
1775		1998
1776	1	1999	1
1777	}	2000	}
1778		2001
1779	sub focus_in {	2002	sub invoke_focus_in {
1780	my ($self) = @_;	2003	my ($self) = @_;
1781		2004
1782	$self->{last_activity} = $::NOW;	2005	$self->{last_activity} = $::NOW;
1783		2006
1784	$self->SUPER::focus_in;	2007	$self->SUPER::invoke_focus_in
1785	}	2008	}
1786		2009
1787	sub button_down {	2010	sub invoke_button_down {
1788	my ($self, $ev, $x, $y) = @_;	2011	my ($self, $ev, $x, $y) = @_;
1789		2012
1790	$self->SUPER::button_down ($ev, $x, $y);	2013	$self->SUPER::invoke_button_down ($ev, $x, $y);
1791		2014
1792	my $idx = $self->{layout}->xy_to_index ($x, $y);	2015	my $idx = $self->{layout}->xy_to_index ($x, $y);
1793		2016
1794	# byte-index to char-index	2017	# byte-index to char-index
1795	my $text = $self->{text};	2018	my $text = $self->{text};
1796	utf8::encode $text;	2019	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1797	$self->{cursor} = length substr $text, 0, $idx;	2020	$self->{cursor} = length $text;
1798		2021
1799	$self->_set_text ($self->{text});	2022	$self->_set_text ($self->{text});
1800	$self->update;	2023	$self->update;
1801		2024
1802	1	2025	1
1803	}	2026	}
1804		2027
1805	sub mouse_motion {	2028	sub invoke_mouse_motion {
1806	my ($self, $ev, $x, $y) = @_;	2029	my ($self, $ev, $x, $y) = @_;
1807	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2030	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808		2031
1809	0	2032	1
1810	}	2033	}
1811		2034
1812	sub _draw {	2035	sub _draw {
1813	my ($self) = @_;	2036	my ($self) = @_;
1814		2037
…		…
1841	utf8::encode $text;	2064	utf8::encode $text;
1842		2065
1843	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2066	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1844	}	2067	}
1845		2068
1846	glColor @{$self->{fg}};
1847	glBegin GL_LINES;	2069	glBegin GL_LINES;
1848	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2070	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1849	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2071	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1850	glEnd;	2072	glEnd;
1851	}	2073	}
1852	}	2074	}
1853		2075
1854	package CFClient::UI::Entry;	2076	package CFPlus::UI::Entry;
1855		2077
1856	our @ISA = CFClient::UI::EntryBase::;	2078	our @ISA = CFPlus::UI::EntryBase::;
1857		2079
1858	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1859		2081
1860	sub key_down {	2082	sub invoke_key_down {
1861	my ($self, $ev) = @_;	2083	my ($self, $ev) = @_;
1862		2084
1863	my $sym = $ev->{sym};	2085	my $sym = $ev->{sym};
1864		2086
1865	if ($sym == 13) {	2087	if ($sym == 13) {
1866	unshift @{$self->{history}},	2088	unshift @{$self->{history}},
1867	my $txt = $self->get_text;	2089	my $txt = $self->get_text;
		2090
1868	$self->{history_pointer} = -1;	2091	$self->{history_pointer} = -1;
1869	$self->{history_saveback} = '';	2092	$self->{history_saveback} = '';
1870	$self->_emit (activate => $txt);	2093	$self->emit (activate => $txt);
1871	$self->update;	2094	$self->update;
1872		2095
1873	} elsif ($sym == CFClient::SDLK_UP) {	2096	} elsif ($sym == CFPlus::SDLK_UP) {
1874	if ($self->{history_pointer} < 0) {	2097	if ($self->{history_pointer} < 0) {
1875	$self->{history_saveback} = $self->get_text;	2098	$self->{history_saveback} = $self->get_text;
1876	}	2099	}
1877	if (@{$self->{history} || []} > 0) {	2100	if (@{$self->{history} || []} > 0) {
1878	$self->{history_pointer}++;	2101	$self->{history_pointer}++;
…		…
1880	$self->{history_pointer} = @{$self->{history} || []} - 1;	2103	$self->{history_pointer} = @{$self->{history} || []} - 1;
1881	}	2104	}
1882	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2105	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1883	}	2106	}
1884		2107
1885	} elsif ($sym == CFClient::SDLK_DOWN) {	2108	} elsif ($sym == CFPlus::SDLK_DOWN) {
1886	$self->{history_pointer}--;	2109	$self->{history_pointer}--;
1887	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2110	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1888		2111
1889	if ($self->{history_pointer} >= 0) {	2112	if ($self->{history_pointer} >= 0) {
1890	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2113	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1891	} else {	2114	} else {
1892	$self->set_text ($self->{history_saveback});	2115	$self->set_text ($self->{history_saveback});
1893	}	2116	}
1894		2117
1895	} else {	2118	} else {
1896	return $self->SUPER::key_down ($ev)	2119	return $self->SUPER::invoke_key_down ($ev)
1897	}	2120	}
1898		2121
1899	1	2122	1
1900	}	2123	}
1901		2124
1902	#############################################################################	2125	#############################################################################
1903		2126
1904	package CFClient::UI::Button;	2127	package CFPlus::UI::Button;
1905		2128
1906	our @ISA = CFClient::UI::Label::;	2129	our @ISA = CFPlus::UI::Label::;
1907		2130
1908	use CFClient::OpenGL;	2131	use CFPlus::OpenGL;
1909		2132
1910	my @tex =	2133	my @tex =
1911	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2134	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1912	qw(b1_button_active.png);	2135	qw(b1_button_active.png);
1913		2136
1914	sub new {	2137	sub new {
1915	my $class = shift;	2138	my $class = shift;
1916		2139
…		…
1925	can_events => 1,	2148	can_events => 1,
1926	@_	2149	@_
1927	)	2150	)
1928	}	2151	}
1929		2152
1930	sub activate { }
1931
1932	sub button_up {	2153	sub invoke_button_up {
1933	my ($self, $ev, $x, $y) = @_;	2154	my ($self, $ev, $x, $y) = @_;
1934		2155
1935	$self->emit ("activate")	2156	$self->emit ("activate")
1936	if $x >= 0 && $x < $self->{w}	2157	if $x >= 0 && $x < $self->{w}
1937	&& $y >= 0 && $y < $self->{h};	2158	&& $y >= 0 && $y < $self->{h};
…		…
1955	$self->SUPER::_draw;	2176	$self->SUPER::_draw;
1956	}	2177	}
1957		2178
1958	#############################################################################	2179	#############################################################################
1959		2180
1960	package CFClient::UI::CheckBox;	2181	package CFPlus::UI::CheckBox;
1961		2182
1962	our @ISA = CFClient::UI::DrawBG::;	2183	our @ISA = CFPlus::UI::DrawBG::;
1963		2184
1964	my @tex =	2185	my @tex =
1965	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1966	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2187	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1967		2188
1968	use CFClient::OpenGL;	2189	use CFPlus::OpenGL;
1969		2190
1970	sub new {	2191	sub new {
1971	my $class = shift;	2192	my $class = shift;
1972		2193
1973	$class->SUPER::new (	2194	$class->SUPER::new (
…		…
1987	my ($self) = @_;	2208	my ($self) = @_;
1988		2209
1989	(6) x 2	2210	(6) x 2
1990	}	2211	}
1991		2212
		2213	sub toggle {
		2214	my ($self) = @_;
		2215
		2216	$self->{state} = !$self->{state};
		2217	$self->emit (changed => $self->{state});
		2218	$self->update;
		2219	}
		2220
1992	sub button_down {	2221	sub invoke_button_down {
1993	my ($self, $ev, $x, $y) = @_;	2222	my ($self, $ev, $x, $y) = @_;
1994		2223
1995	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2224	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2225	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997	$self->{state} = !$self->{state};	2226	$self->toggle;
1998	$self->_emit (changed => $self->{state});
1999	} else {	2227	} else {
2000	return 0	2228	return 0
2001	}	2229	}
2002		2230
2003	1	2231	1
…		…
2023	glDisable GL_TEXTURE_2D;	2251	glDisable GL_TEXTURE_2D;
2024	}	2252	}
2025		2253
2026	#############################################################################	2254	#############################################################################
2027		2255
2028	package CFClient::UI::Image;	2256	package CFPlus::UI::Image;
2029		2257
2030	our @ISA = CFClient::UI::Base::;	2258	our @ISA = CFPlus::UI::Base::;
2031		2259
2032	use CFClient::OpenGL;	2260	use CFPlus::OpenGL;
2033	use Carp qw/confess/;
2034		2261
2035	our %loaded_images;	2262	our %texture_cache;
2036		2263
2037	sub new {	2264	sub new {
2038	my $class = shift;	2265	my $class = shift;
2039		2266
2040	my $self = $class->SUPER::new (can_events => 0, @_);	2267	my $self = $class->SUPER::new (
		2268	can_events => 0,
		2269	@_,
		2270	);
2041		2271
2042	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2272	$self->{path} || $self->{tex}
		2273	or Carp::croak "'path' or 'tex' attributes required";
2043		2274
2044	$loaded_images{$self->{image}} ||=	2275	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2045	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2276	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2046		2277
2047	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2278	Scalar::Util::weaken $texture_cache{$self->{path}};
2048		2279
2049	Scalar::Util::weaken $loaded_images{$self->{image}};	2280	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051	$self->{aspect} = $tex->{w} / $tex->{h};
2052		2281
2053	$self	2282	$self
2054	}	2283	}
2055		2284
		2285	sub STORABLE_freeze {
		2286	my ($self, $cloning) = @_;
		2287
		2288	$self->{path}
		2289	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2290
		2291	$self->{path}
		2292	}
		2293
		2294	sub STORABLE_attach {
		2295	my ($self, $cloning, $path) = @_;
		2296
		2297	$self->new (path => $path)
		2298	}
		2299
2056	sub size_request {	2300	sub size_request {
2057	my ($self) = @_;	2301	my ($self) = @_;
2058		2302
2059	($self->{tex}->{w}, $self->{tex}->{h})	2303	($self->{tex}{w}, $self->{tex}{h})
2060	}	2304	}
2061		2305
2062	sub _draw {	2306	sub _draw {
2063	my ($self) = @_;	2307	my ($self) = @_;
2064		2308
…		…
2074	}	2318	}
2075		2319
2076	glEnable GL_TEXTURE_2D;	2320	glEnable GL_TEXTURE_2D;
2077	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2321	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2078		2322
2079	$tex->draw_quad_alpha (0, 0, $w, $h);	2323	$tex->draw_quad (0, 0, $w, $h);
2080		2324
2081	glDisable GL_TEXTURE_2D;	2325	glDisable GL_TEXTURE_2D;
2082	}	2326	}
2083		2327
2084	#############################################################################	2328	#############################################################################
2085		2329
		2330	package CFPlus::UI::ImageButton;
		2331
		2332	our @ISA = CFPlus::UI::Image::;
		2333
		2334	use CFPlus::OpenGL;
		2335
		2336	my %textures;
		2337
		2338	sub new {
		2339	my $class = shift;
		2340
		2341	my $self = $class->SUPER::new (
		2342	padding_x => 4,
		2343	padding_y => 4,
		2344	fg => [1, 1, 1],
		2345	active_fg => [0, 0, 1],
		2346	can_hover => 1,
		2347	align => 0,
		2348	valign => 0,
		2349	can_events => 1,
		2350	@_
		2351	);
		2352	}
		2353
		2354	sub invoke_button_up {
		2355	my ($self, $ev, $x, $y) = @_;
		2356
		2357	$self->emit ("activate")
		2358	if $x >= 0 && $x < $self->{w}
		2359	&& $y >= 0 && $y < $self->{h};
		2360
		2361	1
		2362	}
		2363
		2364	#############################################################################
		2365
2086	package CFClient::UI::VGauge;	2366	package CFPlus::UI::VGauge;
2087		2367
2088	our @ISA = CFClient::UI::Base::;	2368	our @ISA = CFPlus::UI::Base::;
2089		2369
2090	use List::Util qw(min max);	2370	use List::Util qw(min max);
2091		2371
2092	use CFClient::OpenGL;	2372	use CFPlus::OpenGL;
2093		2373
2094	my %tex = (	2374	my %tex = (
2095	food => [	2375	food => [
2096	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2376	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2377	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2098	],	2378	],
2099	grace => [	2379	grace => [
2100	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2380	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2101	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2381	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2102	],	2382	],
2103	hp => [	2383	hp => [
2104	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2384	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2105	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2385	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2106	],	2386	],
2107	mana => [	2387	mana => [
2108	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2388	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2109	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2389	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2110	],	2390	],
2111	);	2391	);
2112		2392
2113	# eg. VGauge->new (gauge => 'food'), default gauge: food	2393	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2173	my $ycut1 = max 0, min 1, $ycut;	2453	my $ycut1 = max 0, min 1, $ycut;
2174	my $ycut2 = max 0, min 1, $ycut - 1;	2454	my $ycut2 = max 0, min 1, $ycut - 1;
2175		2455
2176	my $h1 = $self->{h} * (1 - $ycut1);	2456	my $h1 = $self->{h} * (1 - $ycut1);
2177	my $h2 = $self->{h} * (1 - $ycut2);	2457	my $h2 = $self->{h} * (1 - $ycut2);
		2458	my $h3 = $self->{h};
		2459
		2460	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2178		2461
2179	glEnable GL_BLEND;	2462	glEnable GL_BLEND;
2180	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2463	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2464	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2182	glEnable GL_TEXTURE_2D;	2465	glEnable GL_TEXTURE_2D;
…		…
2201		2484
2202	if ($t3) {	2485	if ($t3) {
2203	glBindTexture GL_TEXTURE_2D, $t3->{name};	2486	glBindTexture GL_TEXTURE_2D, $t3->{name};
2204	glBegin GL_QUADS;	2487	glBegin GL_QUADS;
2205	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2488	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2206	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2489	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2207	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2490	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2208	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2491	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2209	glEnd;	2492	glEnd;
2210	}	2493	}
2211		2494
2212	glDisable GL_BLEND;	2495	glDisable GL_BLEND;
2213	glDisable GL_TEXTURE_2D;	2496	glDisable GL_TEXTURE_2D;
2214	}	2497	}
2215		2498
2216	#############################################################################	2499	#############################################################################
2217		2500
2218	package CFClient::UI::Gauge;	2501	package CFPlus::UI::Gauge;
2219		2502
2220	our @ISA = CFClient::UI::VBox::;	2503	our @ISA = CFPlus::UI::VBox::;
2221		2504
2222	sub new {	2505	sub new {
2223	my ($class, %arg) = @_;	2506	my ($class, %arg) = @_;
2224		2507
2225	my $self = $class->SUPER::new (	2508	my $self = $class->SUPER::new (
…		…
2227	can_hover => 1,	2510	can_hover => 1,
2228	can_events => 1,	2511	can_events => 1,
2229	%arg,	2512	%arg,
2230	);	2513	);
2231		2514
2232	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2515	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2233	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2516	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2234	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2517	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2235		2518
2236	$self	2519	$self
2237	}	2520	}
2238		2521
2239	sub set_fontsize {	2522	sub set_fontsize {
…		…
2260	$self->{value}->set_text ($val);	2543	$self->{value}->set_text ($val);
2261	}	2544	}
2262		2545
2263	#############################################################################	2546	#############################################################################
2264		2547
2265	package CFClient::UI::Slider;	2548	package CFPlus::UI::Slider;
2266		2549
2267	use strict;	2550	use strict;
2268		2551
2269	use CFClient::OpenGL;	2552	use CFPlus::OpenGL;
2270		2553
2271	our @ISA = CFClient::UI::DrawBG::;	2554	our @ISA = CFPlus::UI::DrawBG::;
2272		2555
2273	my @tex =	2556	my @tex =
2274	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2557	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2275	qw(s1_slider.png s1_slider_bg.png);	2558	qw(s1_slider.png s1_slider_bg.png);
2276		2559
2277	sub new {	2560	sub new {
2278	my $class = shift;	2561	my $class = shift;
2279		2562
…		…
2300	$self->update;	2583	$self->update;
2301		2584
2302	$self	2585	$self
2303	}	2586	}
2304		2587
2305	sub changed { }
2306
2307	sub set_range {	2588	sub set_range {
2308	my ($self, $range) = @_;	2589	my ($self, $range) = @_;
2309		2590
2310	($range, $self->{range}) = ($self->{range}, $range);	2591	($range, $self->{range}) = ($self->{range}, $range);
2311		2592
…		…
2331	if $unit;	2612	if $unit;
2332		2613
2333	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2614	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2334		2615
2335	if ($value != $old_value) {	2616	if ($value != $old_value) {
2336	$self->_emit (changed => $value);	2617	$self->emit (changed => $value);
2337	$self->update;	2618	$self->update;
2338	}	2619	}
2339	}	2620	}
2340		2621
2341	sub size_request {	2622	sub size_request {
2342	my ($self) = @_;	2623	my ($self) = @_;
2343		2624
2344	($self->{req_w}, $self->{req_h})	2625	($self->{req_w}, $self->{req_h})
2345	}	2626	}
2346		2627
2347	sub button_down {	2628	sub invoke_button_down {
2348	my ($self, $ev, $x, $y) = @_;	2629	my ($self, $ev, $x, $y) = @_;
2349		2630
2350	$self->SUPER::button_down ($ev, $x, $y);	2631	$self->SUPER::invoke_button_down ($ev, $x, $y);
2351		2632
2352	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2633	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2353		2634
2354	$self->mouse_motion ($ev, $x, $y)	2635	$self->invoke_mouse_motion ($ev, $x, $y)
2355	}	2636	}
2356		2637
2357	sub mouse_motion {	2638	sub invoke_mouse_motion {
2358	my ($self, $ev, $x, $y) = @_;	2639	my ($self, $ev, $x, $y) = @_;
2359		2640
2360	if ($GRAB == $self) {	2641	if ($GRAB == $self) {
2361	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2642	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2362		2643
…		…
2368	} else {	2649	} else {
2369	return 0;	2650	return 0;
2370	}	2651	}
2371		2652
2372	1	2653	1
		2654	}
		2655
		2656	sub invoke_mouse_wheel {
		2657	my ($self, $ev) = @_;
		2658
		2659	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2660
		2661	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2662
		2663	! ! $delta
2373	}	2664	}
2374		2665
2375	sub update {	2666	sub update {
2376	my ($self) = @_;	2667	my ($self) = @_;
2377		2668
…		…
2426	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2427	}	2718	}
2428		2719
2429	#############################################################################	2720	#############################################################################
2430		2721
2431	package CFClient::UI::ValSlider;	2722	package CFPlus::UI::ValSlider;
2432		2723
2433	our @ISA = CFClient::UI::HBox::;	2724	our @ISA = CFPlus::UI::HBox::;
2434		2725
2435	sub new {	2726	sub new {
2436	my ($class, %arg) = @_;	2727	my ($class, %arg) = @_;
2437		2728
2438	my $range = delete $arg{range};	2729	my $range = delete $arg{range};
2439		2730
2440	my $self = $class->SUPER::new (	2731	my $self = $class->SUPER::new (
2441	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2732	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2442	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2733	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2443	to_value => sub { shift },	2734	to_value => sub { shift },
2444	from_value => sub { shift },	2735	from_value => sub { shift },
2445	%arg,	2736	%arg,
2446	);	2737	);
2447		2738
…		…
2467	sub set_range { shift->{slider}->set_range (@_) }	2758	sub set_range { shift->{slider}->set_range (@_) }
2468	sub set_value { shift->{slider}->set_value (@_) }	2759	sub set_value { shift->{slider}->set_value (@_) }
2469		2760
2470	#############################################################################	2761	#############################################################################
2471		2762
2472	package CFClient::UI::TextView;	2763	package CFPlus::UI::TextScroller;
2473		2764
2474	our @ISA = CFClient::UI::HBox::;	2765	our @ISA = CFPlus::UI::HBox::;
2475		2766
2476	use CFClient::OpenGL;	2767	use CFPlus::OpenGL;
2477		2768
2478	sub new {	2769	sub new {
2479	my $class = shift;	2770	my $class = shift;
2480		2771
2481	my $self = $class->SUPER::new (	2772	my $self = $class->SUPER::new (
2482	fontsize => 1,	2773	fontsize => 1,
2483	can_events => 0,	2774	can_events => 1,
2484	indent => 0,	2775	indent => 0,
2485	#font => default_font	2776	#font => default_font
2486	@_,	2777	@_,
2487		2778
2488	layout => (new CFClient::Layout 1),	2779	layout => (new CFPlus::Layout),
2489	par => [],	2780	par => [],
2490	height => 0,	2781	height => 0,
2491	children => [	2782	children => [
2492	(new CFClient::UI::Empty expand => 1),	2783	(new CFPlus::UI::Empty expand => 1),
2493	(new CFClient::UI::Slider vertical => 1),	2784	(new CFPlus::UI::Slider vertical => 1),
2494	],	2785	],
2495	);	2786	);
2496		2787
2497	$self->{children}[1]->connect (changed => sub { $self->update });	2788	$self->{children}[1]->connect (changed => sub { $self->update });
2498		2789
…		…
2504		2795
2505	$self->{fontsize} = $fontsize;	2796	$self->{fontsize} = $fontsize;
2506	$self->reflow;	2797	$self->reflow;
2507	}	2798	}
2508		2799
		2800	sub size_request {
		2801	my ($self) = @_;
		2802
		2803	my ($empty, $slider) = @{ $self->{children} };
		2804
		2805	local $self->{children} = [$empty, $slider];
		2806	$self->SUPER::size_request
		2807	}
		2808
2509	sub size_allocate {	2809	sub invoke_size_allocate {
2510	my ($self, $w, $h) = @_;	2810	my ($self, $w, $h) = @_;
2511		2811
2512	$self->SUPER::size_allocate ($w, $h);	2812	my ($empty, $slider, @other) = @{ $self->{children} };
		2813	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2513		2814
2514	$self->{layout}->set_font ($self->{font}) if $self->{font};	2815	$self->{layout}->set_font ($self->{font}) if $self->{font};
2515	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2816	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2516	$self->{layout}->set_width ($self->{children}[0]{w});	2817	$self->{layout}->set_width ($empty->{w});
2517	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2818	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2518		2819
2519	$self->reflow;	2820	$self->reflow;
2520	}
2521		2821
2522	sub text_size {	2822	local $self->{children} = [$empty, $slider];
		2823	$self->SUPER::invoke_size_allocate ($w, $h)
		2824	}
		2825
		2826	sub invoke_mouse_wheel {
2523	my ($self, $text, $indent) = @_;	2827	my ($self, $ev) = @_;
		2828
		2829	return 0 unless $ev->{dy}; # only vertical movements
		2830
		2831	$self->{children}[1]->emit (mouse_wheel => $ev);
		2832
		2833	1
		2834	}
		2835
		2836	sub get_layout {
		2837	my ($self, $para) = @_;
2524		2838
2525	my $layout = $self->{layout};	2839	my $layout = $self->{layout};
2526		2840
		2841	$layout->set_font ($self->{font}) if $self->{font};
		2842	$layout->set_foreground (@{$para->{fg}});
2527	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2843	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2528	$layout->set_width ($self->{children}[0]{w} - $indent);	2844	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2529	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2845	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2530	$layout->set_markup ($text);	2846	$layout->set_markup ($para->{markup});
		2847
		2848	$layout->set_shapes (
		2849	map
		2850	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2851	@{$para->{widget}}
2531		2852	);
		2853
2532	$layout->size	2854	$layout
2533	}	2855	}
2534		2856
2535	sub reflow {	2857	sub reflow {
2536	my ($self) = @_;	2858	my ($self) = @_;
2537		2859
…		…
2544		2866
2545	# todo: base offset on lines or so, not on pixels	2867	# todo: base offset on lines or so, not on pixels
2546	$self->{children}[1]->set_value ($offset);	2868	$self->{children}[1]->set_value ($offset);
2547	}	2869	}
2548		2870
		2871	sub current_paragraph {
		2872	my ($self) = @_;
		2873
		2874	$self->{top_paragraph} - 1
		2875	}
		2876
		2877	sub scroll_to {
		2878	my ($self, $para) = @_;
		2879
		2880	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2881
		2882	$self->{scroll_to} = $para;
		2883	$self->update;
		2884	}
		2885
2549	sub clear {	2886	sub clear {
2550	my ($self) = @_;	2887	my ($self) = @_;
		2888
		2889	my (undef, undef, @other) = @{ $self->{children} };
		2890	$self->remove ($_) for @other;
2551		2891
2552	$self->{par} = [];	2892	$self->{par} = [];
2553	$self->{height} = 0;	2893	$self->{height} = 0;
2554	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2894	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2555	}	2895	}
2556		2896
2557	sub add_paragraph {	2897	sub add_paragraph {
2558	my ($self, $color, $text, $indent) = @_;	2898	my $self = shift;
2559		2899
2560	for my $line (split /\n/, $text) {	2900	for my $para (@_) {
2561	my ($w, $h) = $self->text_size ($line);	2901	$para = {
		2902	fg => [1, 1, 1, 1],
		2903	indent => 0,
		2904	markup => "",
		2905	widget => [],
		2906	ref $para ? %$para : (markup => $para),
		2907	w => 1e10,
		2908	wrapped => 1,
		2909	};
		2910
		2911	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2912	push @{$self->{par}}, $para;
		2913	}
		2914
		2915	$self->{need_reflow}++;
		2916	$self->update;
		2917	}
		2918
		2919	sub scroll_to_bottom {
		2920	my ($self) = @_;
		2921
		2922	$self->{scroll_to} = $#{$self->{par}};
		2923	$self->update;
		2924	}
		2925
		2926	sub force_uptodate {
		2927	my ($self) = @_;
		2928
		2929	if (delete $self->{need_reflow}) {
		2930	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2931
		2932	my $height = 0;
		2933
		2934	for my $para (@{$self->{par}}) {
		2935	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2936	my $layout = $self->get_layout ($para);
		2937	my ($w, $h) = $layout->size;
		2938
		2939	$para->{w} = $w + $para->{indent};
		2940	$para->{h} = $h;
		2941	$para->{wrapped} = $layout->has_wrapped;
		2942	}
		2943
		2944	$para->{y} = $height;
		2945	$height += $para->{h};
		2946	}
		2947
2562	$self->{height} += $h;	2948	$self->{height} = $height;
2563	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2949	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2564	}
2565		2950
2566	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2951	delete $self->{texture};
		2952	}
		2953
		2954	if (my $paridx = delete $self->{scroll_to}) {
		2955	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2956	}
2567	}	2957	}
2568		2958
2569	sub update {	2959	sub update {
2570	my ($self) = @_;	2960	my ($self) = @_;
2571		2961
…		…
2574	return unless $self->{h} > 0;	2964	return unless $self->{h} > 0;
2575		2965
2576	delete $self->{texture};	2966	delete $self->{texture};
2577		2967
2578	$ROOT->on_post_alloc ($self => sub {	2968	$ROOT->on_post_alloc ($self => sub {
		2969	$self->force_uptodate;
		2970
2579	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2971	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2580		2972
2581	if (delete $self->{need_reflow}) {
2582	my $height = 0;
2583
2584	my $layout = $self->{layout};
2585
2586	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2587
2588	for (@{$self->{par}}) {
2589	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2590	$layout->set_width ($W - $_->[3]);
2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592	$layout->set_markup ($_->[4]);
2593	my ($w, $h) = $layout->size;
2594	$_->[0] = $w + $_->[3];
2595	$_->[1] = $h;
2596	}
2597
2598	$height += $_->[1];
2599	}
2600
2601	$self->{height} = $height;
2602
2603	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2604
2605	delete $self->{texture};
2606	}
2607
2608	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2973	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2609	glClearColor 0, 0, 0, 0;	2974	glClearColor 0, 0, 0, 0;
2610	glClear GL_COLOR_BUFFER_BIT;	2975	glClear GL_COLOR_BUFFER_BIT;
2611		2976
		2977	package CFPlus::UI::Base;
		2978	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		2979	(0, 0, $self->{w}, $self->{h});
		2980
		2981	my $top = int $self->{children}[1]{range}[0];
		2982
		2983	my $paridx = 0;
		2984	my $top_paragraph;
2612	my $top = int $self->{children}[1]{range}[0];	2985	my $top = int $self->{children}[1]{range}[0];
2613		2986
2614	my $y0 = $top;	2987	my $y0 = $top;
2615	my $y1 = $top + $H;	2988	my $y1 = $top + $H;
2616		2989
2617	my $y = 0;
2618
2619	my $layout = $self->{layout};
2620
2621	$layout->set_font ($self->{font}) if $self->{font};
2622
2623	glEnable GL_BLEND;
2624	#TODO# not correct in windows where rgba is forced off
2625	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2626
2627	for my $par (@{$self->{par}}) {	2990	for my $para (@{$self->{par}}) {
2628	my $h = $par->[1];	2991	my $h = $para->{h};
		2992	my $y = $para->{y};
2629		2993
2630	if ($y0 < $y + $h && $y < $y1) {	2994	if ($y0 < $y + $h && $y < $y1) {
2631	$layout->set_foreground (@{ $par->[2] });	2995	my $layout = $self->get_layout ($para);
2632	$layout->set_width ($W - $par->[3]);
2633	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2634	$layout->set_markup ($par->[4]);
2635		2996
2636	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2997	$layout->render ($para->{indent}, $y - $y0);
2637		2998
2638	glRasterPos $par->[3], $y - $y0;	2999	if (my @w = @{ $para->{widget} }) {
2639	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3000	my @s = $layout->get_shapes;
		3001
		3002	for (@w) {
		3003	my ($dx, $dy) = splice @s, 0, 2, ();
		3004
		3005	$_->{x} = $dx + $para->{indent};
		3006	$_->{y} = $dy + $y - $y0;
		3007
		3008	$_->draw;
		3009	}
		3010	}
2640	}	3011	}
2641		3012
2642	$y += $h;	3013	$paridx++;
		3014	$top_paragraph ||= $paridx if $y >= $top;
2643	}	3015	}
2644		3016
2645	glDisable GL_BLEND;	3017	$self->{top_paragraph} = $top_paragraph;
2646	};	3018	};
2647	});	3019	});
		3020	}
		3021
		3022	sub reconfigure {
		3023	my ($self) = @_;
		3024
		3025	$self->SUPER::reconfigure;
		3026
		3027	$_->{w} = 1e10 for @{ $self->{par} };
		3028	$self->reflow;
2648	}	3029	}
2649		3030
2650	sub _draw {	3031	sub _draw {
2651	my ($self) = @_;	3032	my ($self) = @_;
2652		3033
…		…
2655	glColor 0, 0, 0, 1;	3036	glColor 0, 0, 0, 1;
2656	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3037	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2657	glDisable GL_TEXTURE_2D;	3038	glDisable GL_TEXTURE_2D;
2658		3039
2659	$self->{children}[1]->draw;	3040	$self->{children}[1]->draw;
2660
2661	}	3041	}
2662		3042
2663	#############################################################################	3043	#############################################################################
2664		3044
2665	package CFClient::UI::Animator;	3045	package CFPlus::UI::Animator;
2666		3046
2667	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2668		3048
2669	our @ISA = CFClient::UI::Bin::;	3049	our @ISA = CFPlus::UI::Bin::;
2670		3050
2671	sub moveto {	3051	sub moveto {
2672	my ($self, $x, $y) = @_;	3052	my ($self, $x, $y) = @_;
2673		3053
2674	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3054	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2702	glPopMatrix;	3082	glPopMatrix;
2703	}	3083	}
2704		3084
2705	#############################################################################	3085	#############################################################################
2706		3086
2707	package CFClient::UI::Flopper;	3087	package CFPlus::UI::Flopper;
2708		3088
2709	our @ISA = CFClient::UI::Button::;	3089	our @ISA = CFPlus::UI::Button::;
2710		3090
2711	sub new {	3091	sub new {
2712	my $class = shift;	3092	my $class = shift;
2713		3093
2714	my $self = $class->SUPER::new (	3094	my $self = $class->SUPER::new (
…		…
2726	$self->{other}->toggle_visibility;	3106	$self->{other}->toggle_visibility;
2727	}	3107	}
2728		3108
2729	#############################################################################	3109	#############################################################################
2730		3110
2731	package CFClient::UI::Tooltip;	3111	package CFPlus::UI::Tooltip;
2732		3112
2733	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2734		3114
2735	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2736		3116
2737	sub new {	3117	sub new {
2738	my $class = shift;	3118	my $class = shift;
2739		3119
2740	$class->SUPER::new (	3120	$class->SUPER::new (
…		…
2743	)	3123	)
2744	}	3124	}
2745		3125
2746	sub set_tooltip_from {	3126	sub set_tooltip_from {
2747	my ($self, $widget) = @_;	3127	my ($self, $widget) = @_;
		3128
		3129	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3130	if $widget->{tooltip} =~ /^#(.*)$/;
2748		3131
2749	my $tooltip = $widget->{tooltip};	3132	my $tooltip = $widget->{tooltip};
2750		3133
2751	if ($ENV{CFPLUS_DEBUG} & 2) {	3134	if ($ENV{CFPLUS_DEBUG} & 2) {
2752	$tooltip .= "\n\n" . (ref $widget) . "\n"	3135	$tooltip .= "\n\n" . (ref $widget) . "\n"
2753	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3136	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754	. "req $widget->{req_w} $widget->{req_h}\n"	3137	. "req $widget->{req_w} $widget->{req_h}\n"
2755	. "visible $widget->{visible}";	3138	. "visible $widget->{visible}";
2756	}	3139	}
2757		3140
		3141	$tooltip =~ s/^\n+//;
		3142	$tooltip =~ s/\n+$//;
		3143
2758	$self->add (new CFClient::UI::Label	3144	$self->add (new CFPlus::UI::Label
2759	markup => $tooltip,	3145	markup => $tooltip,
2760	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3146	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2761	fontsize => 0.8,	3147	fontsize => 0.8,
2762	fg => [0, 0, 0, 1],	3148	style => 1, # FLAG_INVERSE
2763	ellipsise => 0,	3149	ellipsise => 0,
2764	font => ($widget->{tooltip_font} || $::FONT_PROP),	3150	font => ($widget->{tooltip_font} || $::FONT_PROP),
2765	);	3151	);
2766	}	3152	}
2767		3153
…		…
2771	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3157	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2772		3158
2773	($w + 4, $h + 4)	3159	($w + 4, $h + 4)
2774	}	3160	}
2775		3161
2776	sub size_allocate {	3162	sub invoke_size_allocate {
2777	my ($self, $w, $h) = @_;	3163	my ($self, $w, $h) = @_;
2778		3164
2779	$self->SUPER::size_allocate ($w - 4, $h - 4);	3165	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2780	}	3166	}
2781		3167
2782	sub visibility_change {	3168	sub invoke_visibility_change {
2783	my ($self, $visible) = @_;	3169	my ($self, $visible) = @_;
2784		3170
2785	return unless $visible;	3171	return unless $visible;
2786		3172
2787	$self->{root}->on_post_alloc ("move_$self" => sub {	3173	$self->{root}->on_post_alloc ("move_$self" => sub {
2788	my $widget = $self->{owner}	3174	my $widget = $self->{owner}
2789	or return;	3175	or return;
2790		3176
		3177	if ($widget->{visible}) {
2791	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3178	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2792		3179
2793	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3180	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2794	if $x + $self->{w} > $::WIDTH;	3181	if $x + $self->{w} > $self->{root}{w};
2795		3182
2796	$self->move_abs ($x, $y);	3183	$self->move_abs ($x, $y);
		3184	} else {
		3185	$self->hide;
		3186	}
2797	});	3187	});
2798	}	3188	}
2799		3189
2800	sub _draw {	3190	sub _draw {
2801	my ($self) = @_;	3191	my ($self) = @_;
…		…
2825	$self->SUPER::_draw;	3215	$self->SUPER::_draw;
2826	}	3216	}
2827		3217
2828	#############################################################################	3218	#############################################################################
2829		3219
2830	package CFClient::UI::Face;	3220	package CFPlus::UI::Face;
2831		3221
2832	our @ISA = CFClient::UI::Base::;	3222	our @ISA = CFPlus::UI::DrawBG::;
2833		3223
2834	use CFClient::OpenGL;	3224	use CFPlus::OpenGL;
2835		3225
2836	sub new {	3226	sub new {
2837	my $class = shift;	3227	my $class = shift;
2838		3228
2839	my $self = $class->SUPER::new (	3229	my $self = $class->SUPER::new (
…		…
2874	sub _draw {	3264	sub _draw {
2875	my ($self) = @_;	3265	my ($self) = @_;
2876		3266
2877	return unless $::CONN;	3267	return unless $::CONN;
2878		3268
		3269	$self->SUPER::_draw;
		3270
2879	my $face;	3271	my $face;
2880		3272
2881	if ($self->{frame}) {	3273	if ($self->{frame}) {
2882	my $anim = $::CONN->{anim}[$self->{anim}];	3274	my $anim = $::CONN->{anim}[$self->{anim}];
2883		3275
…		…
2894	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3286	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2895	glDisable GL_TEXTURE_2D;	3287	glDisable GL_TEXTURE_2D;
2896	}	3288	}
2897	}	3289	}
2898		3290
2899	sub DESTROY {	3291	sub destroy {
2900	my ($self) = @_;	3292	my ($self) = @_;
2901		3293
2902	$self->{timer}->cancel	3294	$self->{timer}->cancel
2903	if $self->{timer};	3295	if $self->{timer};
2904		3296
2905	$self->SUPER::DESTROY;	3297	$self->SUPER::destroy;
2906	}	3298	}
2907		3299
2908	#############################################################################	3300	#############################################################################
2909		3301
2910	package CFClient::UI::Buttonbar;	3302	package CFPlus::UI::Buttonbar;
2911		3303
2912	our @ISA = CFClient::UI::HBox::;	3304	our @ISA = CFPlus::UI::HBox::;
2913		3305
2914	# TODO: should actualyl wrap buttons and other goodies.	3306	# TODO: should actually wrap buttons and other goodies.
2915		3307
2916	#############################################################################	3308	#############################################################################
2917		3309
2918	package CFClient::UI::Menu;	3310	package CFPlus::UI::Menu;
2919		3311
2920	our @ISA = CFClient::UI::FancyFrame::;	3312	our @ISA = CFPlus::UI::Toplevel::;
2921		3313
2922	use CFClient::OpenGL;	3314	use CFPlus::OpenGL;
2923		3315
2924	sub new {	3316	sub new {
2925	my $class = shift;	3317	my $class = shift;
2926		3318
2927	my $self = $class->SUPER::new (	3319	my $self = $class->SUPER::new (
2928	items => [],	3320	items => [],
2929	z => 100,	3321	z => 100,
2930	@_,	3322	@_,
2931	);	3323	);
2932		3324
2933	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3325	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2934		3326
2935	for my $item (@{ $self->{items} }) {	3327	for my $item (@{ $self->{items} }) {
2936	my ($widget, $cb, $tooltip) = @$item;	3328	my ($widget, $cb, $tooltip) = @$item;
2937		3329
2938	# handle various types of items, only text for now	3330	# handle various types of items, only text for now
2939	if (!ref $widget) {	3331	if (!ref $widget) {
		3332	if ($widget =~ /\t/) {
		3333	my ($left, $right) = split /\t/, $widget, 2;
		3334
2940	$widget = new CFClient::UI::Label	3335	$widget = new CFPlus::UI::HBox
2941	can_hover => 1,	3336	can_hover => 1,
2942	can_events => 1,	3337	can_events => 1,
2943	text => $widget,
2944	tooltip => $tooltip	3338	tooltip => $tooltip,
		3339	children => [
		3340	(new CFPlus::UI::Label markup => $left, expand => 1),
		3341	(new CFPlus::UI::Label markup => $right, align => +1),
		3342	],
		3343	;
		3344
		3345	} else {
		3346	$widget = new CFPlus::UI::Label
		3347	can_hover => 1,
		3348	can_events => 1,
		3349	markup => $widget,
		3350	tooltip => $tooltip;
		3351	}
2945	}	3352	}
2946		3353
2947	$self->{item}{$widget} = $item;	3354	$self->{item}{$widget} = $item;
2948		3355
2949	$self->{vbox}->add ($widget);	3356	$self->{vbox}->add ($widget);
…		…
2954		3361
2955	# popup given the event (must be a mouse button down event currently)	3362	# popup given the event (must be a mouse button down event currently)
2956	sub popup {	3363	sub popup {
2957	my ($self, $ev) = @_;	3364	my ($self, $ev) = @_;
2958		3365
2959	$self->_emit ("popdown");	3366	$self->emit ("popdown");
2960		3367
2961	# maybe save $GRAB? must be careful about events...	3368	# maybe save $GRAB? must be careful about events...
2962	$GRAB = $self;	3369	$GRAB = $self;
2963	$self->{button} = $ev->{button};	3370	$self->{button} = $ev->{button};
2964		3371
2965	$self->show;	3372	$self->show;
2966	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3373	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2967	}	3374	}
2968		3375
2969	sub mouse_motion {	3376	sub invoke_mouse_motion {
2970	my ($self, $ev, $x, $y) = @_;	3377	my ($self, $ev, $x, $y) = @_;
2971		3378
2972	# TODO: should use vbox->find_widget or so	3379	# TODO: should use vbox->find_widget or so
2973	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3380	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2974	$self->{hover} = $self->{item}{$HOVER};	3381	$self->{hover} = $self->{item}{$HOVER};
2975		3382
2976	0	3383	0
2977	}	3384	}
2978		3385
2979	sub button_up {	3386	sub invoke_button_up {
2980	my ($self, $ev, $x, $y) = @_;	3387	my ($self, $ev, $x, $y) = @_;
2981		3388
2982	if ($ev->{button} == $self->{button}) {	3389	if ($ev->{button} == $self->{button}) {
2983	undef $GRAB;	3390	undef $GRAB;
2984	$self->hide;	3391	$self->hide;
2985		3392
2986	$self->_emit ("popdown");	3393	$self->emit ("popdown");
2987	$self->{hover}[1]->() if $self->{hover};	3394	$self->{hover}[1]->() if $self->{hover};
2988	} else {	3395	} else {
2989	return 0	3396	return 0
2990	}	3397	}
2991		3398
2992	1	3399	1
2993	}	3400	}
2994		3401
2995	#############################################################################	3402	#############################################################################
2996		3403
2997	package CFClient::UI::Multiplexer;	3404	package CFPlus::UI::Multiplexer;
2998		3405
2999	our @ISA = CFClient::UI::Container::;	3406	our @ISA = CFPlus::UI::Container::;
3000		3407
3001	sub new {	3408	sub new {
3002	my $class = shift;	3409	my $class = shift;
3003		3410
3004	my $self = $class->SUPER::new (	3411	my $self = $class->SUPER::new (
…		…
3018		3425
3019	$self->{current} = $self->{children}[0]	3426	$self->{current} = $self->{children}[0]
3020	if @{ $self->{children} };	3427	if @{ $self->{children} };
3021	}	3428	}
3022		3429
		3430	sub get_current_page {
		3431	my ($self) = @_;
		3432
		3433	$self->{current}
		3434	}
		3435
3023	sub set_current_page {	3436	sub set_current_page {
3024	my ($self, $page_or_widget) = @_;	3437	my ($self, $page_or_widget) = @_;
3025		3438
3026	my $widget = ref $page_or_widget	3439	my $widget = ref $page_or_widget
3027	? $page_or_widget	3440	? $page_or_widget
3028	: $self->{children}[$page_or_widget];	3441	: $self->{children}[$page_or_widget];
3029		3442
3030	$self->{current} = $widget;	3443	$self->{current} = $widget;
3031	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3444	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032		3445
3033	$self->_emit (page_changed => $self->{current});	3446	$self->emit (page_changed => $self->{current});
3034		3447
3035	$self->realloc;	3448	$self->realloc;
3036	}	3449	}
3037		3450
3038	sub visible_children {	3451	sub visible_children {
…		…
3043	my ($self) = @_;	3456	my ($self) = @_;
3044		3457
3045	$self->{current}->size_request	3458	$self->{current}->size_request
3046	}	3459	}
3047		3460
3048	sub size_allocate {	3461	sub invoke_size_allocate {
3049	my ($self, $w, $h) = @_;	3462	my ($self, $w, $h) = @_;
3050		3463
3051	$self->{current}->configure (0, 0, $w, $h);	3464	$self->{current}->configure (0, 0, $w, $h);
		3465
		3466	1
3052	}	3467	}
3053		3468
3054	sub _draw {	3469	sub _draw {
3055	my ($self) = @_;	3470	my ($self) = @_;
3056		3471
3057	$self->{current}->draw;	3472	$self->{current}->draw;
3058	}	3473	}
3059		3474
3060	#############################################################################	3475	#############################################################################
3061		3476
3062	package CFClient::UI::Notebook;	3477	package CFPlus::UI::Notebook;
3063		3478
3064	our @ISA = CFClient::UI::VBox::;	3479	our @ISA = CFPlus::UI::VBox::;
3065		3480
3066	sub new {	3481	sub new {
3067	my $class = shift;	3482	my $class = shift;
3068		3483
3069	my $self = $class->SUPER::new (	3484	my $self = $class->SUPER::new (
3070	buttonbar => (new CFClient::UI::Buttonbar),	3485	buttonbar => (new CFPlus::UI::Buttonbar),
3071	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3486	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3072	# filter => # will be put between multiplexer and $self	3487	# filter => # will be put between multiplexer and $self
3073	@_,	3488	@_,
3074	);	3489	);
3075		3490
3076	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3491	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3082	sub add {	3497	sub add {
3083	my ($self, $title, $widget, $tooltip) = @_;	3498	my ($self, $title, $widget, $tooltip) = @_;
3084		3499
3085	Scalar::Util::weaken $self;	3500	Scalar::Util::weaken $self;
3086		3501
3087	$self->{buttonbar}->add (new CFClient::UI::Button	3502	$self->{buttonbar}->add (new CFPlus::UI::Button
3088	markup => $title,	3503	markup => $title,
3089	tooltip => $tooltip,	3504	tooltip => $tooltip,
3090	on_activate => sub { $self->set_current_page ($widget) },	3505	on_activate => sub { $self->set_current_page ($widget) },
3091	);	3506	);
3092		3507
3093	$self->{multiplexer}->add ($widget);	3508	$self->{multiplexer}->add ($widget);
3094	}	3509	}
3095		3510
		3511	sub get_current_page {
		3512	my ($self) = @_;
		3513
		3514	$self->{multiplexer}->get_current_page
		3515	}
		3516
3096	sub set_current_page {	3517	sub set_current_page {
3097	my ($self, $page) = @_;	3518	my ($self, $page) = @_;
3098		3519
3099	$self->{multiplexer}->set_current_page ($page);	3520	$self->{multiplexer}->set_current_page ($page);
3100	$self->_emit (page_changed => $self->{multiplexer}{current});	3521	$self->emit (page_changed => $self->{multiplexer}{current});
3101	}	3522	}
3102		3523
3103	#############################################################################	3524	#############################################################################
3104		3525
3105	package CFClient::UI::Combobox;	3526	package CFPlus::UI::Selector;
3106		3527
3107	use utf8;	3528	use utf8;
3108		3529
3109	our @ISA = CFClient::UI::Button::;	3530	our @ISA = CFPlus::UI::Button::;
3110		3531
3111	sub new {	3532	sub new {
3112	my $class = shift;	3533	my $class = shift;
3113		3534
3114	my $self = $class->SUPER::new (	3535	my $self = $class->SUPER::new (
3115	options => [], # [title, value, tooltip], ...	3536	options => [], # [value, title, longdesc], ...
3116	value => undef,	3537	value => undef,
3117	@_,	3538	@_,
3118	);	3539	);
3119		3540
3120	$self->_set_value ($self->{value});	3541	$self->_set_value ($self->{value});
3121		3542
3122	$self	3543	$self
3123	}	3544	}
3124		3545
3125	sub button_down {	3546	sub invoke_button_down {
3126	my ($self, $ev) = @_;	3547	my ($self, $ev) = @_;
3127		3548
3128	my @menu_items;	3549	my @menu_items;
3129		3550
3130	for (@{ $self->{options} }) {	3551	for (@{ $self->{options} }) {
3131	my ($title, $value, $tooltip) = @$_;	3552	my ($value, $title, $tooltip) = @$_;
3132		3553
3133	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];	3554	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3134	}	3555	}
3135		3556
3136	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3557	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137	}	3558	}
3138		3559
3139	sub _set_value {	3560	sub _set_value {
3140	my ($self, $value) = @_;	3561	my ($self, $value) = @_;
3141		3562
3142	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }	3563	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3143	or return;	3564	or return;
3144		3565
3145	$self->{value} = $item->[1];	3566	$self->{value} = $item->[0];
3146	$self->set_markup ("$item->[0] ⇓");	3567	$self->set_markup ("$item->[1] ⇓");
3147	$self->set_tooltip ($item->[2]);	3568	$self->set_tooltip ($item->[2]);
3148	}	3569	}
3149		3570
3150	sub set_value {	3571	sub set_value {
3151	my ($self, $value) = @_;	3572	my ($self, $value) = @_;
3152		3573
3153	return unless $self->{value} ne $value;	3574	return unless $self->{value} ne $value;
3154		3575
3155	$self->_set_value ($value);	3576	$self->_set_value ($value);
3156	$self->_emit (changed => $value);	3577	$self->emit (changed => $value);
3157	}	3578	}
3158		3579
3159	#############################################################################	3580	#############################################################################
3160		3581
3161	package CFClient::UI::Statusbox;	3582	package CFPlus::UI::Statusbox;
3162		3583
3163	our @ISA = CFClient::UI::VBox::;	3584	our @ISA = CFPlus::UI::VBox::;
3164		3585
3165	sub new {	3586	sub new {
3166	my $class = shift;	3587	my $class = shift;
3167		3588
3168	my $self = $class->SUPER::new (	3589	my $self = $class->SUPER::new (
…		…
3180	sub reorder {	3601	sub reorder {
3181	my ($self) = @_;	3602	my ($self) = @_;
3182	my $NOW = Time::HiRes::time;	3603	my $NOW = Time::HiRes::time;
3183		3604
3184	# freeze display when hovering over any label	3605	# freeze display when hovering over any label
3185	return if $CFClient::UI::TOOLTIP->{owner}	3606	return if $CFPlus::UI::TOOLTIP->{owner}
3186	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3607	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3187	values %{ $self->{item} };	3608	values %{ $self->{item} };
3188		3609
3189	while (my ($k, $v) = each %{ $self->{item} }) {	3610	while (my ($k, $v) = each %{ $self->{item} }) {
3190	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3611	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3191	}	3612	}
…		…
3212	for ($short) {	3633	for ($short) {
3213	s/^\s+//;	3634	s/^\s+//;
3214	s/\s+/ /g;	3635	s/\s+/ /g;
3215	}	3636	}
3216		3637
3217	new CFClient::UI::Label	3638	new CFPlus::UI::Label
3218	markup => $short,	3639	markup => $short,
3219	tooltip => $item->{tooltip},	3640	tooltip => $item->{tooltip},
3220	tooltip_font => $::FONT_PROP,	3641	tooltip_font => $::FONT_PROP,
3221	tooltip_width => 0.67,	3642	tooltip_width => 0.67,
3222	fontsize => $item->{fontsize} || $self->{fontsize},	3643	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3260	$item->{count}++;	3681	$item->{count}++;
3261	} else {	3682	} else {
3262	$item->{count} = 1;	3683	$item->{count} = 1;
3263	$item->{text} = $item->{tooltip} = $text;	3684	$item->{text} = $item->{tooltip} = $text;
3264	}	3685	}
3265	$item->{id} = ++$self->{id};	3686	$item->{id} += 0.2;#d#
3266	$item->{timeout} = $timeout;	3687	$item->{timeout} = $timeout;
3267	delete $item->{label};	3688	delete $item->{label};
3268	} else {	3689	} else {
3269	$self->{item}{$group} = {	3690	$self->{item}{$group} = {
3270	id => ++$self->{id},	3691	id => ++$self->{id},
…		…
3276	count => 1,	3697	count => 1,
3277	%arg,	3698	%arg,
3278	};	3699	};
3279	}	3700	}
3280		3701
		3702	$ROOT->on_refresh (reorder => sub {
3281	$self->reorder;	3703	$self->reorder;
		3704	});
3282	}	3705	}
3283		3706
3284	sub reconfigure {	3707	sub reconfigure {
3285	my ($self) = @_;	3708	my ($self) = @_;
3286		3709
…		…
3289		3712
3290	$self->reorder;	3713	$self->reorder;
3291	$self->SUPER::reconfigure;	3714	$self->SUPER::reconfigure;
3292	}	3715	}
3293		3716
3294	sub DESTROY {	3717	sub destroy {
3295	my ($self) = @_;	3718	my ($self) = @_;
3296		3719
3297	$self->{timer}->cancel;	3720	$self->{timer}->cancel;
3298		3721
3299	$self->SUPER::DESTROY;	3722	$self->SUPER::destroy;
3300	}	3723	}
3301		3724
3302	#############################################################################	3725	#############################################################################
3303		3726
3304	package CFClient::UI::Inventory;	3727	package CFPlus::UI::Inventory;
3305		3728
3306	our @ISA = CFClient::UI::ScrolledWindow::;	3729	our @ISA = CFPlus::UI::Table::;
3307		3730
3308	sub new {	3731	sub new {
3309	my $class = shift;	3732	my $class = shift;
3310		3733
3311	my $self = $class->SUPER::new (	3734	my $self = $class->SUPER::new (
3312	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3735	col_expand => [0, 1, 0],
		3736	items => [],
3313	@_,	3737	@_,
3314	);	3738	);
3315		3739
		3740	$self->set_sort_order (undef);
		3741
3316	$self	3742	$self
		3743	}
		3744
		3745	sub update_items {
		3746	my ($self) = @_;
		3747
		3748	$self->clear;
		3749
		3750	my @item = $self->{sort}->(@{ $self->{items} });
		3751
		3752	my @adds;
		3753	my $row = 0;
		3754	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3755	CFPlus::Item::update_widgets $item;
		3756
		3757	push @adds, 0, $row, $item->{face_widget};
		3758	push @adds, 1, $row, $item->{desc_widget};
		3759	push @adds, 2, $row, $item->{weight_widget};
		3760
		3761	$row++;
		3762	}
		3763
		3764	$self->add (@adds);
		3765	}
		3766
		3767	sub set_sort_order {
		3768	my ($self, $order) = @_;
		3769
		3770	$self->{sort} = $order ||= sub {
		3771	sort {
		3772	$a->{type} <=> $b->{type}
		3773	or $a->{name} cmp $b->{name}
		3774	} @_
		3775	};
		3776
		3777	$self->update_items;
3317	}	3778	}
3318		3779
3319	sub set_items {	3780	sub set_items {
3320	my ($self, $items) = @_;	3781	my ($self, $items) = @_;
3321		3782
3322	$self->{child}->clear;	3783	$self->{items} = [$items ? values %$items : ()];
3323	return unless $items;	3784	$self->update_items;
3324
3325	my @items = sort {
3326	($a->{type} <=> $b->{type})
3327	or ($a->{name} cmp $b->{name})
3328	} @$items;
3329
3330	$self->{real_items} = \@items;
3331
3332	my $row = 0;
3333	for my $item (@items) {
3334	CFClient::Item::update_widgets $item;
3335
3336	$self->{child}->add (0, $row, $item->{face_widget});
3337	$self->{child}->add (1, $row, $item->{desc_widget});
3338	$self->{child}->add (2, $row, $item->{weight_widget});
3339
3340	$row++;
3341	}
3342	}	3785	}
3343		3786
3344	#############################################################################	3787	#############################################################################
3345		3788
3346	package CFClient::UI::BindEditor;
3347
3348	our @ISA = CFClient::UI::FancyFrame::;
3349
3350	sub new {
3351	my $class = shift;
3352
3353	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3354
3355	$self->add (my $vb = new CFClient::UI::VBox);
3356
3357
3358	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3359	text => "start recording",
3360	tooltip => "Start/Stops recording of actions."
3361	."All subsequent actions after the recording started will be captured."
3362	."The actions are displayed after the record was stopped."
3363	."To bind the action you have to click on the 'Bind' button",
3364	on_activate => sub {
3365	unless ($self->{recording}) {
3366	$self->start;
3367	} else {
3368	$self->stop;
3369	}
3370	});
3371
3372	$vb->add (new CFClient::UI::Label text => "Actions:");
3373	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3374
3375	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3376	$vb->add (my $hb = new CFClient::UI::HBox);
3377	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3378	$hb->add (new CFClient::UI::Button
3379	text => "bind",
3380	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3381	on_activate => sub {
3382	$self->ask_for_bind;
3383	});
3384
3385	$vb->add (my $hb = new CFClient::UI::HBox);
3386	$hb->add (new CFClient::UI::Button
3387	text => "ok",
3388	expand => 1,
3389	tooltip => "This closes the binding editor and saves the binding",
3390	on_activate => sub {
3391	$self->hide;
3392	$self->commit;
3393	});
3394
3395	$hb->add (new CFClient::UI::Button
3396	text => "cancel",
3397	expand => 1,
3398	tooltip => "This closes the binding editor without saving",
3399	on_activate => sub {
3400	$self->hide;
3401	$self->{binding_cancel}->()
3402	if $self->{binding_cancel};
3403	});
3404
3405	$self->update_binding_widgets;
3406
3407	$self
3408	}
3409
3410	sub commit {
3411	my ($self) = @_;
3412	my ($mod, $sym, $cmds) = $self->get_binding;
3413	if ($sym != 0 && @$cmds > 0) {
3414	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3415	."'. Don't forget 'Save Config'!");
3416	$self->{binding_change}->($mod, $sym, $cmds)
3417	if $self->{binding_change};
3418	} else {
3419	$::STATUSBOX->add ("No action bound, no key or action specified!");
3420	$self->{binding_cancel}->()
3421	if $self->{binding_cancel};
3422	}
3423	}
3424
3425	sub start {
3426	my ($self) = @_;
3427
3428	$self->{rec_btn}->set_text ("stop recording");
3429	$self->{recording} = 1;
3430	$self->clear_command_list;
3431	$::CONN->start_record if $::CONN;
3432	}
3433
3434	sub stop {
3435	my ($self) = @_;
3436
3437	$self->{rec_btn}->set_text ("start recording");
3438	$self->{recording} = 0;
3439
3440	my $rec;
3441	$rec = $::CONN->stop_record if $::CONN;
3442	return unless ref $rec eq 'ARRAY';
3443	$self->set_command_list ($rec);
3444	}
3445
3446
3447	sub ask_for_bind_and_commit {
3448	my ($self) = @_;
3449	$self->ask_for_bind (1);
3450	}
3451
3452	sub ask_for_bind {
3453	my ($self, $commit) = @_;
3454
3455	CFClient::Binder::open_binding_dialog (sub {
3456	my ($mod, $sym) = @_;
3457	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3458	$self->update_binding_widgets;
3459	$self->commit if $commit;
3460	});
3461	}
3462
3463	# $mod and $sym are the modifiers and key symbol
3464	# $cmds is a array ref of strings (the commands)
3465	# $cb is the callback that is executed on OK
3466	# $ccb is the callback that is executed on CANCEL and
3467	# when the binding was unsuccessful on OK
3468	sub set_binding {
3469	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3470
3471	$self->clear_command_list;
3472	$self->{recording} = 0;
3473	$self->{rec_btn}->set_text ("start recording");
3474
3475	$self->{binding} = [$mod, $sym];
3476	$self->{commands} = $cmds;
3477
3478	$self->{binding_change} = $cb;
3479	$self->{binding_cancel} = $ccb;
3480
3481	$self->update_binding_widgets;
3482	}
3483
3484	# this is a shortcut method that asks for a binding
3485	# and then just binds it.
3486	sub do_quick_binding {
3487	my ($self, $cmds) = @_;
3488	$self->set_binding (undef, undef, $cmds, sub {
3489	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3490	});
3491	$self->ask_for_bind (1);
3492	}
3493
3494	sub update_binding_widgets {
3495	my ($self) = @_;
3496	my ($mod, $sym, $cmds) = $self->get_binding;
3497	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3498	$self->set_command_list ($cmds);
3499	}
3500
3501	sub get_binding {
3502	my ($self) = @_;
3503	return (
3504	$self->{binding}->[0],
3505	$self->{binding}->[1],
3506	[ grep { defined $_ } @{$self->{commands}} ]
3507	);
3508	}
3509
3510	sub clear_command_list {
3511	my ($self) = @_;
3512	$self->{cmdbox}->clear ();
3513	}
3514
3515	sub set_command_list {
3516	my ($self, $cmds) = @_;
3517
3518	$self->{cmdbox}->clear ();
3519	$self->{commands} = $cmds;
3520
3521	my $idx = 0;
3522
3523	for (@$cmds) {
3524	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3525
3526	my $i = $idx;
3527	$hb->add (new CFClient::UI::Label text => $_);
3528	$hb->add (new CFClient::UI::Button
3529	text => "delete",
3530	tooltip => "Deletes the action from the record",
3531	on_activate => sub {
3532	$self->{cmdbox}->remove ($hb);
3533	$cmds->[$i] = undef;
3534	});
3535
3536
3537	$idx++
3538	}
3539	}
3540
3541	#############################################################################
3542
3543	package CFClient::UI::SpellList;	3789	package CFPlus::UI::SpellList;
3544		3790
3545	our @ISA = CFClient::UI::Table::;	3791	our @ISA = CFPlus::UI::Table::;
3546		3792
3547	sub new {	3793	sub new {
3548	my $class = shift;	3794	my $class = shift;
3549		3795
3550	my $self = $class->SUPER::new (	3796	my $self = $class->SUPER::new (
…		…
3552	commands => [],	3798	commands => [],
3553	@_,	3799	@_,
3554	)	3800	)
3555	}	3801	}
3556		3802
		3803	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3804
		3805	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3806	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3807	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3808	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3557	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3809	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");	3810	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3559	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3811	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");	3812	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3561	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3813	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562	"<b>Damage</b>. The amount of damage the spell deals when it hits.");	3814	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3563		3815
3564	sub rebuild_spell_list {	3816	sub rebuild_spell_list {
3565	my ($self) = @_;	3817	my ($self) = @_;
3566		3818
3567	$CFClient::UI::ROOT->on_refresh ($self => sub {	3819	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3568	$self->clear;	3820	$self->clear;
3569		3821
		3822	return unless $::CONN;
		3823
3570	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");	3824	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3825	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3571	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3826	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3827	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3828	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574		3829
3575	my $row = 0;	3830	my $row = 0;
3576		3831
3577	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3832	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578	my $spell = $self->{spell}{$_};	3833	my $spell = $self->{spell}{$_};
3579		3834
3580	$row++;	3835	$row++;
3581		3836
		3837	my $spell_cb = sub {
		3838	my ($widget, $ev) = @_;
		3839
		3840	if ($ev->{button} == 1) {
		3841	$::CONN->user_send ("cast $spell->{name}");
		3842	} elsif ($ev->{button} == 2) {
		3843	$::CONN->user_send ("invoke $spell->{name}");
		3844	} elsif ($ev->{button} == 3) {
		3845	(new CFPlus::UI::Menu
		3846	items => [
		3847	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3848	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3849	],
		3850	)->popup ($ev);
		3851	} else {
		3852	return 0;
		3853	}
		3854
		3855	1
		3856	};
		3857
		3858	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
		3859
		3860	#TODO: add path info to tooltip
		3861	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
		3862
3582	$self->add (0, $row, new CFClient::UI::Face	3863	$self->add (0, $row, new CFPlus::UI::Face
3583	face => $spell->{face},	3864	face => $spell->{face},
3584	can_hover => 1,	3865	can_hover => 1,
3585	can_events => 1,	3866	can_events => 1,
3586	tooltip => $spell->{message},	3867	tooltip => $tooltip,
		3868	on_button_down => $spell_cb,
3587	);	3869	);
3588		3870
3589	$self->add (1, $row, new CFClient::UI::Label	3871	$self->add (1, $row, new CFPlus::UI::Label
3590	expand => 1,	3872	expand => 1,
3591	text => $spell->{name},	3873	text => $spell->{name},
3592	can_hover => 1,	3874	can_hover => 1,
3593	can_events => 1,	3875	can_events => 1,
3594	tooltip => $spell->{message},	3876	tooltip => $tooltip,
		3877	on_button_down => $spell_cb,
3595	);	3878	);
3596		3879
		3880	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3881	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3882	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3883	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601	# TODO: should be done via popup
3602	$self->add (5, $row, new CFClient::UI::Button
3603	text => "bind",
3604	tooltip => "bind spell readying (cast command) to key",
3605	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606	);
3607	}	3884	}
3608	});	3885	});
3609	}	3886	}
3610		3887
3611	sub add_spell {	3888	sub add_spell {
…		…
3620		3897
3621	delete $self->{spell}->{$spell->{name}};	3898	delete $self->{spell}->{$spell->{name}};
3622	$self->rebuild_spell_list;	3899	$self->rebuild_spell_list;
3623	}	3900	}
3624		3901
		3902	sub clear_spells {
		3903	my ($self) = @_;
		3904
		3905	$self->{spell} = {};
		3906	$self->rebuild_spell_list;
		3907	}
		3908
3625	#############################################################################	3909	#############################################################################
3626		3910
3627	package CFClient::UI::Root;	3911	package CFPlus::UI::Root;
3628		3912
3629	our @ISA = CFClient::UI::Container::;	3913	our @ISA = CFPlus::UI::Container::;
3630		3914
3631	use List::Util qw(min max);	3915	use List::Util qw(min max);
3632		3916
3633	use CFClient::OpenGL;	3917	use CFPlus::OpenGL;
3634		3918
3635	sub new {	3919	sub new {
3636	my $class = shift;	3920	my $class = shift;
3637		3921
3638	my $self = $class->SUPER::new (	3922	my $self = $class->SUPER::new (
…		…
3663	$coord = $max - $size if $coord > $max - $size;	3947	$coord = $max - $size if $coord > $max - $size;
3664		3948
3665	int $coord + 0.5	3949	int $coord + 0.5
3666	}	3950	}
3667		3951
3668	sub size_allocate {	3952	sub invoke_size_allocate {
3669	my ($self, $w, $h) = @_;	3953	my ($self, $w, $h) = @_;
3670		3954
3671	for my $child ($self->children) {	3955	for my $child ($self->children) {
3672	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3956	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3673		3957
…		…
3677	$X = _to_pixel $X, $W, $self->{w};	3961	$X = _to_pixel $X, $W, $self->{w};
3678	$Y = _to_pixel $Y, $H, $self->{h};	3962	$Y = _to_pixel $Y, $H, $self->{h};
3679		3963
3680	$child->configure ($X, $Y, $W, $H);	3964	$child->configure ($X, $Y, $W, $H);
3681	}	3965	}
		3966
		3967	1
3682	}	3968	}
3683		3969
3684	sub coord2local {	3970	sub coord2local {
3685	my ($self, $x, $y) = @_;	3971	my ($self, $x, $y) = @_;
3686		3972
…		…
3812	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4098	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3813		4099
3814	$w = 0 if $w < 0;	4100	$w = 0 if $w < 0;
3815	$h = 0 if $h < 0;	4101	$h = 0 if $h < 0;
3816		4102
		4103	$w = max $widget->{min_w}, $w;
		4104	$h = max $widget->{min_h}, $h;
		4105
		4106	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4107	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4108
		4109	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4110	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4111
3817	$w = int $w + 0.5;	4112	$w = int $w + 0.5;
3818	$h = int $h + 0.5;	4113	$h = int $h + 0.5;
3819		4114
3820	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4115	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3821	$widget->{old_w} = $widget->{w};	4116	$widget->{old_w} = $widget->{w};
…		…
3844	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4139	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3845	glMatrixMode GL_MODELVIEW;	4140	glMatrixMode GL_MODELVIEW;
3846	glLoadIdentity;	4141	glLoadIdentity;
3847		4142
3848	{	4143	{
3849	package CFClient::UI::Base;	4144	package CFPlus::UI::Base;
3850		4145
3851	($draw_x, $draw_y, $draw_w, $draw_h) =	4146	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3852	(0, 0, $self->{w}, $self->{h});	4147	(0, 0, $self->{w}, $self->{h});
3853	}
3854		4148
3855	$self->_draw;	4149	$self->_draw;
		4150	}
3856	}	4151	}
3857		4152
3858	#############################################################################	4153	#############################################################################
3859		4154
3860	package CFClient::UI;	4155	package CFPlus::UI;
3861		4156
3862	$ROOT = new CFClient::UI::Root;	4157	$ROOT = new CFPlus::UI::Root;
3863	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4158	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3864		4159
3865	1	4160	1
3866		4161

Diff Legend

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