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.290 by root, Mon Jun 5 22:30:35 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;	1892	my $w = List::Util::min $self->{w} + 4, $size->[0];
		1893	my $h = List::Util::min $self->{h} + 2, $size->[1];
1662		1894
1663	if ($tex->{format} == GL_ALPHA) {	1895	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665	glColor @{$self->{fg}};
1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667	} else {
1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670	}
1671
1672	glDisable GL_TEXTURE_2D;
1673	}	1896	}
1674		1897
1675	#############################################################################	1898	#############################################################################
1676		1899
1677	package CFClient::UI::EntryBase;	1900	package CFPlus::UI::EntryBase;
1678		1901
1679	our @ISA = CFClient::UI::Label::;	1902	our @ISA = CFPlus::UI::Label::;
1680		1903
1681	use CFClient::OpenGL;	1904	use CFPlus::OpenGL;
1682		1905
1683	sub new {	1906	sub new {
1684	my $class = shift;	1907	my $class = shift;
1685		1908
1686	$class->SUPER::new (	1909	$class->SUPER::new (
…		…
1691	can_hover => 1,	1914	can_hover => 1,
1692	can_focus => 1,	1915	can_focus => 1,
1693	valign => 0,	1916	valign => 0,
1694	can_events => 1,	1917	can_events => 1,
1695	#text => ...	1918	#text => ...
		1919	#hidden => "*",
1696	@_	1920	@_
1697	)	1921	)
1698	}	1922	}
1699		1923
1700	sub _set_text {	1924	sub _set_text {
…		…
1709		1933
1710	$text =~ s/./*/g if $self->{hidden};	1934	$text =~ s/./*/g if $self->{hidden};
1711	$self->{layout}->set_text ("$text ");	1935	$self->{layout}->set_text ("$text ");
1712	delete $self->{size_req};	1936	delete $self->{size_req};
1713		1937
1714	$self->_emit (changed => $self->{text});	1938	$self->emit (changed => $self->{text});
1715		1939
1716	$self->realloc;	1940	$self->realloc;
1717	$self->update;	1941	$self->update;
1718	}	1942	}
1719		1943
…		…
1734	my ($w, $h) = $self->SUPER::size_request;	1958	my ($w, $h) = $self->SUPER::size_request;
1735		1959
1736	($w + 1, $h) # add 1 for cursor	1960	($w + 1, $h) # add 1 for cursor
1737	}	1961	}
1738		1962
1739	sub key_down {	1963	sub invoke_key_down {
1740	my ($self, $ev) = @_;	1964	my ($self, $ev) = @_;
1741		1965
1742	my $mod = $ev->{mod};	1966	my $mod = $ev->{mod};
1743	my $sym = $ev->{sym};	1967	my $sym = $ev->{sym};
1744	my $uni = $ev->{unicode};	1968	my $uni = $ev->{unicode};
…		…
1747		1971
1748	if ($uni == 8) {	1972	if ($uni == 8) {
1749	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1750	} elsif ($uni == 127) {	1974	} elsif ($uni == 127) {
1751	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1752	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1753	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1754	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1755	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1756	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
1757	$self->{cursor} = 0;	1981	$self->{cursor} = 0;
1758	} elsif ($sym == CFClient::SDLK_END) {	1982	} elsif ($sym == CFPlus::SDLK_END) {
1759	$self->{cursor} = length $text;	1983	$self->{cursor} = length $text;
		1984	} elsif ($uni == 21) { # ctrl-u
		1985	$text = "";
		1986	$self->{cursor} = 0;
1760	} elsif ($uni == 27) {	1987	} elsif ($uni == 27) {
1761	$self->_emit ('escape');	1988	$self->emit ('escape');
1762	} elsif ($uni) {	1989	} elsif ($uni) {
1763	substr $text, $self->{cursor}++, 0, chr $uni;	1990	substr $text, $self->{cursor}++, 0, chr $uni;
1764	} else {	1991	} else {
1765	return 0;	1992	return 0;
1766	}	1993	}
…		…
1770	$self->realloc;	1997	$self->realloc;
1771		1998
1772	1	1999	1
1773	}	2000	}
1774		2001
1775	sub focus_in {	2002	sub invoke_focus_in {
1776	my ($self) = @_;	2003	my ($self) = @_;
1777		2004
1778	$self->{last_activity} = $::NOW;	2005	$self->{last_activity} = $::NOW;
1779		2006
1780	$self->SUPER::focus_in;	2007	$self->SUPER::invoke_focus_in
1781	}	2008	}
1782		2009
1783	sub button_down {	2010	sub invoke_button_down {
1784	my ($self, $ev, $x, $y) = @_;	2011	my ($self, $ev, $x, $y) = @_;
1785		2012
1786	$self->SUPER::button_down ($ev, $x, $y);	2013	$self->SUPER::invoke_button_down ($ev, $x, $y);
1787		2014
1788	my $idx = $self->{layout}->xy_to_index ($x, $y);	2015	my $idx = $self->{layout}->xy_to_index ($x, $y);
1789		2016
1790	# byte-index to char-index	2017	# byte-index to char-index
1791	my $text = $self->{text};	2018	my $text = $self->{text};
1792	utf8::encode $text;	2019	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1793	$self->{cursor} = length substr $text, 0, $idx;	2020	$self->{cursor} = length $text;
1794		2021
1795	$self->_set_text ($self->{text});	2022	$self->_set_text ($self->{text});
1796	$self->update;	2023	$self->update;
1797		2024
1798	1	2025	1
1799	}	2026	}
1800		2027
1801	sub mouse_motion {	2028	sub invoke_mouse_motion {
1802	my ($self, $ev, $x, $y) = @_;	2029	my ($self, $ev, $x, $y) = @_;
1803	# 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#
1804		2031
1805	0	2032	1
1806	}	2033	}
1807		2034
1808	sub _draw {	2035	sub _draw {
1809	my ($self) = @_;	2036	my ($self) = @_;
1810		2037
…		…
1837	utf8::encode $text;	2064	utf8::encode $text;
1838		2065
1839	@$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)
1840	}	2067	}
1841		2068
1842	glColor @{$self->{fg}};
1843	glBegin GL_LINES;	2069	glBegin GL_LINES;
1844	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};
1845	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};
1846	glEnd;	2072	glEnd;
1847	}	2073	}
1848	}	2074	}
1849		2075
1850	package CFClient::UI::Entry;	2076	package CFPlus::UI::Entry;
1851		2077
1852	our @ISA = CFClient::UI::EntryBase::;	2078	our @ISA = CFPlus::UI::EntryBase::;
1853		2079
1854	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1855		2081
1856	sub key_down {	2082	sub invoke_key_down {
1857	my ($self, $ev) = @_;	2083	my ($self, $ev) = @_;
1858		2084
1859	my $sym = $ev->{sym};	2085	my $sym = $ev->{sym};
1860		2086
1861	if ($sym == 13) {	2087	if ($sym == 13) {
1862	unshift @{$self->{history}},	2088	unshift @{$self->{history}},
1863	my $txt = $self->get_text;	2089	my $txt = $self->get_text;
		2090
1864	$self->{history_pointer} = -1;	2091	$self->{history_pointer} = -1;
1865	$self->{history_saveback} = '';	2092	$self->{history_saveback} = '';
1866	$self->_emit (activate => $txt);	2093	$self->emit (activate => $txt);
1867	$self->update;	2094	$self->update;
1868		2095
1869	} elsif ($sym == CFClient::SDLK_UP) {	2096	} elsif ($sym == CFPlus::SDLK_UP) {
1870	if ($self->{history_pointer} < 0) {	2097	if ($self->{history_pointer} < 0) {
1871	$self->{history_saveback} = $self->get_text;	2098	$self->{history_saveback} = $self->get_text;
1872	}	2099	}
1873	if (@{$self->{history} || []} > 0) {	2100	if (@{$self->{history} || []} > 0) {
1874	$self->{history_pointer}++;	2101	$self->{history_pointer}++;
…		…
1876	$self->{history_pointer} = @{$self->{history} || []} - 1;	2103	$self->{history_pointer} = @{$self->{history} || []} - 1;
1877	}	2104	}
1878	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2105	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1879	}	2106	}
1880		2107
1881	} elsif ($sym == CFClient::SDLK_DOWN) {	2108	} elsif ($sym == CFPlus::SDLK_DOWN) {
1882	$self->{history_pointer}--;	2109	$self->{history_pointer}--;
1883	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2110	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1884		2111
1885	if ($self->{history_pointer} >= 0) {	2112	if ($self->{history_pointer} >= 0) {
1886	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2113	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1887	} else {	2114	} else {
1888	$self->set_text ($self->{history_saveback});	2115	$self->set_text ($self->{history_saveback});
1889	}	2116	}
1890		2117
1891	} else {	2118	} else {
1892	return $self->SUPER::key_down ($ev)	2119	return $self->SUPER::invoke_key_down ($ev)
1893	}	2120	}
1894		2121
1895	1	2122	1
1896	}	2123	}
1897		2124
1898	#############################################################################	2125	#############################################################################
1899		2126
1900	package CFClient::UI::Button;	2127	package CFPlus::UI::Button;
1901		2128
1902	our @ISA = CFClient::UI::Label::;	2129	our @ISA = CFPlus::UI::Label::;
1903		2130
1904	use CFClient::OpenGL;	2131	use CFPlus::OpenGL;
1905		2132
1906	my @tex =	2133	my @tex =
1907	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2134	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1908	qw(b1_button_active.png);	2135	qw(b1_button_active.png);
1909		2136
1910	sub new {	2137	sub new {
1911	my $class = shift;	2138	my $class = shift;
1912		2139
…		…
1921	can_events => 1,	2148	can_events => 1,
1922	@_	2149	@_
1923	)	2150	)
1924	}	2151	}
1925		2152
1926	sub activate { }
1927
1928	sub button_up {	2153	sub invoke_button_up {
1929	my ($self, $ev, $x, $y) = @_;	2154	my ($self, $ev, $x, $y) = @_;
1930		2155
1931	$self->emit ("activate")	2156	$self->emit ("activate")
1932	if $x >= 0 && $x < $self->{w}	2157	if $x >= 0 && $x < $self->{w}
1933	&& $y >= 0 && $y < $self->{h};	2158	&& $y >= 0 && $y < $self->{h};
…		…
1951	$self->SUPER::_draw;	2176	$self->SUPER::_draw;
1952	}	2177	}
1953		2178
1954	#############################################################################	2179	#############################################################################
1955		2180
1956	package CFClient::UI::CheckBox;	2181	package CFPlus::UI::CheckBox;
1957		2182
1958	our @ISA = CFClient::UI::DrawBG::;	2183	our @ISA = CFPlus::UI::DrawBG::;
1959		2184
1960	my @tex =	2185	my @tex =
1961	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1962	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2187	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1963		2188
1964	use CFClient::OpenGL;	2189	use CFPlus::OpenGL;
1965		2190
1966	sub new {	2191	sub new {
1967	my $class = shift;	2192	my $class = shift;
1968		2193
1969	$class->SUPER::new (	2194	$class->SUPER::new (
…		…
1983	my ($self) = @_;	2208	my ($self) = @_;
1984		2209
1985	(6) x 2	2210	(6) x 2
1986	}	2211	}
1987		2212
		2213	sub toggle {
		2214	my ($self) = @_;
		2215
		2216	$self->{state} = !$self->{state};
		2217	$self->emit (changed => $self->{state});
		2218	$self->update;
		2219	}
		2220
1988	sub button_down {	2221	sub invoke_button_down {
1989	my ($self, $ev, $x, $y) = @_;	2222	my ($self, $ev, $x, $y) = @_;
1990		2223
1991	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2224	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1992	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2225	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1993	$self->{state} = !$self->{state};	2226	$self->toggle;
1994	$self->_emit (changed => $self->{state});
1995	} else {	2227	} else {
1996	return 0	2228	return 0
1997	}	2229	}
1998		2230
1999	1	2231	1
…		…
2019	glDisable GL_TEXTURE_2D;	2251	glDisable GL_TEXTURE_2D;
2020	}	2252	}
2021		2253
2022	#############################################################################	2254	#############################################################################
2023		2255
2024	package CFClient::UI::Image;	2256	package CFPlus::UI::Image;
2025		2257
2026	our @ISA = CFClient::UI::Base::;	2258	our @ISA = CFPlus::UI::Base::;
2027		2259
2028	use CFClient::OpenGL;	2260	use CFPlus::OpenGL;
2029	use Carp qw/confess/;
2030		2261
2031	our %loaded_images;	2262	our %texture_cache;
2032		2263
2033	sub new {	2264	sub new {
2034	my $class = shift;	2265	my $class = shift;
2035		2266
2036	my $self = $class->SUPER::new (can_events => 0, @_);	2267	my $self = $class->SUPER::new (
		2268	can_events => 0,
		2269	@_,
		2270	);
2037		2271
2038	$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";
2039		2274
2040	$loaded_images{$self->{image}} ||=	2275	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2041	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;
2042		2277
2043	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2278	Scalar::Util::weaken $texture_cache{$self->{path}};
2044		2279
2045	Scalar::Util::weaken $loaded_images{$self->{image}};	2280	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2046
2047	$self->{aspect} = $tex->{w} / $tex->{h};
2048		2281
2049	$self	2282	$self
2050	}	2283	}
2051		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
2052	sub size_request {	2300	sub size_request {
2053	my ($self) = @_;	2301	my ($self) = @_;
2054		2302
2055	($self->{tex}->{w}, $self->{tex}->{h})	2303	($self->{tex}{w}, $self->{tex}{h})
2056	}	2304	}
2057		2305
2058	sub _draw {	2306	sub _draw {
2059	my ($self) = @_;	2307	my ($self) = @_;
2060		2308
…		…
2070	}	2318	}
2071		2319
2072	glEnable GL_TEXTURE_2D;	2320	glEnable GL_TEXTURE_2D;
2073	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2321	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2074		2322
2075	$tex->draw_quad_alpha (0, 0, $w, $h);	2323	$tex->draw_quad (0, 0, $w, $h);
2076		2324
2077	glDisable GL_TEXTURE_2D;	2325	glDisable GL_TEXTURE_2D;
2078	}	2326	}
2079		2327
2080	#############################################################################	2328	#############################################################################
2081		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
2082	package CFClient::UI::VGauge;	2366	package CFPlus::UI::VGauge;
2083		2367
2084	our @ISA = CFClient::UI::Base::;	2368	our @ISA = CFPlus::UI::Base::;
2085		2369
2086	use List::Util qw(min max);	2370	use List::Util qw(min max);
2087		2371
2088	use CFClient::OpenGL;	2372	use CFPlus::OpenGL;
2089		2373
2090	my %tex = (	2374	my %tex = (
2091	food => [	2375	food => [
2092	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2376	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2093	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2377	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2094	],	2378	],
2095	grace => [	2379	grace => [
2096	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2380	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097	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/
2098	],	2382	],
2099	hp => [	2383	hp => [
2100	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2384	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2101	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2385	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2102	],	2386	],
2103	mana => [	2387	mana => [
2104	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2388	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2105	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/
2106	],	2390	],
2107	);	2391	);
2108		2392
2109	# eg. VGauge->new (gauge => 'food'), default gauge: food	2393	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2169	my $ycut1 = max 0, min 1, $ycut;	2453	my $ycut1 = max 0, min 1, $ycut;
2170	my $ycut2 = max 0, min 1, $ycut - 1;	2454	my $ycut2 = max 0, min 1, $ycut - 1;
2171		2455
2172	my $h1 = $self->{h} * (1 - $ycut1);	2456	my $h1 = $self->{h} * (1 - $ycut1);
2173	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);
2174		2461
2175	glEnable GL_BLEND;	2462	glEnable GL_BLEND;
2176	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2463	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2464	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2178	glEnable GL_TEXTURE_2D;	2465	glEnable GL_TEXTURE_2D;
…		…
2197		2484
2198	if ($t3) {	2485	if ($t3) {
2199	glBindTexture GL_TEXTURE_2D, $t3->{name};	2486	glBindTexture GL_TEXTURE_2D, $t3->{name};
2200	glBegin GL_QUADS;	2487	glBegin GL_QUADS;
2201	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2488	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2202	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2489	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2203	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2490	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2204	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2491	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2205	glEnd;	2492	glEnd;
2206	}	2493	}
2207		2494
2208	glDisable GL_BLEND;	2495	glDisable GL_BLEND;
2209	glDisable GL_TEXTURE_2D;	2496	glDisable GL_TEXTURE_2D;
2210	}	2497	}
2211		2498
2212	#############################################################################	2499	#############################################################################
2213		2500
2214	package CFClient::UI::Gauge;	2501	package CFPlus::UI::Gauge;
2215		2502
2216	our @ISA = CFClient::UI::VBox::;	2503	our @ISA = CFPlus::UI::VBox::;
2217		2504
2218	sub new {	2505	sub new {
2219	my ($class, %arg) = @_;	2506	my ($class, %arg) = @_;
2220		2507
2221	my $self = $class->SUPER::new (	2508	my $self = $class->SUPER::new (
…		…
2223	can_hover => 1,	2510	can_hover => 1,
2224	can_events => 1,	2511	can_events => 1,
2225	%arg,	2512	%arg,
2226	);	2513	);
2227		2514
2228	$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");
2229	$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);
2230	$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");
2231		2518
2232	$self	2519	$self
2233	}	2520	}
2234		2521
2235	sub set_fontsize {	2522	sub set_fontsize {
…		…
2256	$self->{value}->set_text ($val);	2543	$self->{value}->set_text ($val);
2257	}	2544	}
2258		2545
2259	#############################################################################	2546	#############################################################################
2260		2547
2261	package CFClient::UI::Slider;	2548	package CFPlus::UI::Slider;
2262		2549
2263	use strict;	2550	use strict;
2264		2551
2265	use CFClient::OpenGL;	2552	use CFPlus::OpenGL;
2266		2553
2267	our @ISA = CFClient::UI::DrawBG::;	2554	our @ISA = CFPlus::UI::DrawBG::;
2268		2555
2269	my @tex =	2556	my @tex =
2270	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2557	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2271	qw(s1_slider.png s1_slider_bg.png);	2558	qw(s1_slider.png s1_slider_bg.png);
2272		2559
2273	sub new {	2560	sub new {
2274	my $class = shift;	2561	my $class = shift;
2275		2562
…		…
2296	$self->update;	2583	$self->update;
2297		2584
2298	$self	2585	$self
2299	}	2586	}
2300		2587
2301	sub changed { }
2302
2303	sub set_range {	2588	sub set_range {
2304	my ($self, $range) = @_;	2589	my ($self, $range) = @_;
2305		2590
2306	($range, $self->{range}) = ($self->{range}, $range);	2591	($range, $self->{range}) = ($self->{range}, $range);
2307		2592
2308	$self->update
2309	if "@$range" ne "@{$self->{range}}";	2593	if ("@$range" ne "@{$self->{range}}") {
		2594	$self->update;
		2595	$self->set_value ($self->{range}[0]);
		2596	}
2310	}	2597	}
2311		2598
2312	sub set_value {	2599	sub set_value {
2313	my ($self, $value) = @_;	2600	my ($self, $value) = @_;
2314		2601
…		…
2325	if $unit;	2612	if $unit;
2326		2613
2327	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2614	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2328		2615
2329	if ($value != $old_value) {	2616	if ($value != $old_value) {
2330	$self->_emit (changed => $value);	2617	$self->emit (changed => $value);
2331	$self->update;	2618	$self->update;
2332	}	2619	}
2333	}	2620	}
2334		2621
2335	sub size_request {	2622	sub size_request {
2336	my ($self) = @_;	2623	my ($self) = @_;
2337		2624
2338	($self->{req_w}, $self->{req_h})	2625	($self->{req_w}, $self->{req_h})
2339	}	2626	}
2340		2627
2341	sub button_down {	2628	sub invoke_button_down {
2342	my ($self, $ev, $x, $y) = @_;	2629	my ($self, $ev, $x, $y) = @_;
2343		2630
2344	$self->SUPER::button_down ($ev, $x, $y);	2631	$self->SUPER::invoke_button_down ($ev, $x, $y);
2345		2632
2346	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2633	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2347		2634
2348	$self->mouse_motion ($ev, $x, $y)	2635	$self->invoke_mouse_motion ($ev, $x, $y)
2349	}	2636	}
2350		2637
2351	sub mouse_motion {	2638	sub invoke_mouse_motion {
2352	my ($self, $ev, $x, $y) = @_;	2639	my ($self, $ev, $x, $y) = @_;
2353		2640
2354	if ($GRAB == $self) {	2641	if ($GRAB == $self) {
2355	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2642	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2356		2643
…		…
2362	} else {	2649	} else {
2363	return 0;	2650	return 0;
2364	}	2651	}
2365		2652
2366	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
2367	}	2664	}
2368		2665
2369	sub update {	2666	sub update {
2370	my ($self) = @_;	2667	my ($self) = @_;
2371		2668
…		…
2420	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2421	}	2718	}
2422		2719
2423	#############################################################################	2720	#############################################################################
2424		2721
2425	package CFClient::UI::ValSlider;	2722	package CFPlus::UI::ValSlider;
2426		2723
2427	our @ISA = CFClient::UI::HBox::;	2724	our @ISA = CFPlus::UI::HBox::;
2428		2725
2429	sub new {	2726	sub new {
2430	my ($class, %arg) = @_;	2727	my ($class, %arg) = @_;
2431		2728
2432	my $range = delete $arg{range};	2729	my $range = delete $arg{range};
2433		2730
2434	my $self = $class->SUPER::new (	2731	my $self = $class->SUPER::new (
2435	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2732	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2436	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2733	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2437	to_value => sub { shift },	2734	to_value => sub { shift },
2438	from_value => sub { shift },	2735	from_value => sub { shift },
2439	%arg,	2736	%arg,
2440	);	2737	);
2441		2738
…		…
2461	sub set_range { shift->{slider}->set_range (@_) }	2758	sub set_range { shift->{slider}->set_range (@_) }
2462	sub set_value { shift->{slider}->set_value (@_) }	2759	sub set_value { shift->{slider}->set_value (@_) }
2463		2760
2464	#############################################################################	2761	#############################################################################
2465		2762
2466	package CFClient::UI::TextView;	2763	package CFPlus::UI::TextScroller;
2467		2764
2468	our @ISA = CFClient::UI::HBox::;	2765	our @ISA = CFPlus::UI::HBox::;
2469		2766
2470	use CFClient::OpenGL;	2767	use CFPlus::OpenGL;
2471		2768
2472	sub new {	2769	sub new {
2473	my $class = shift;	2770	my $class = shift;
2474		2771
2475	my $self = $class->SUPER::new (	2772	my $self = $class->SUPER::new (
2476	fontsize => 1,	2773	fontsize => 1,
2477	can_events => 0,	2774	can_events => 1,
		2775	indent => 0,
2478	#font => default_font	2776	#font => default_font
2479	@_,	2777	@_,
2480		2778
2481	layout => (new CFClient::Layout 1),	2779	layout => (new CFPlus::Layout),
2482	par => [],	2780	par => [],
2483	height => 0,	2781	height => 0,
2484	children => [	2782	children => [
2485	(new CFClient::UI::Empty expand => 1),	2783	(new CFPlus::UI::Empty expand => 1),
2486	(new CFClient::UI::Slider vertical => 1),	2784	(new CFPlus::UI::Slider vertical => 1),
2487	],	2785	],
2488	);	2786	);
2489		2787
2490	$self->{children}[1]->connect (changed => sub { $self->update });	2788	$self->{children}[1]->connect (changed => sub { $self->update });
2491		2789
…		…
2497		2795
2498	$self->{fontsize} = $fontsize;	2796	$self->{fontsize} = $fontsize;
2499	$self->reflow;	2797	$self->reflow;
2500	}	2798	}
2501		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
2502	sub size_allocate {	2809	sub invoke_size_allocate {
2503	my ($self, $w, $h) = @_;	2810	my ($self, $w, $h) = @_;
2504		2811
2505	$self->SUPER::size_allocate ($w, $h);	2812	my ($empty, $slider, @other) = @{ $self->{children} };
		2813	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2506		2814
2507	$self->{layout}->set_font ($self->{font}) if $self->{font};	2815	$self->{layout}->set_font ($self->{font}) if $self->{font};
2508	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2816	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2509	$self->{layout}->set_width ($self->{children}[0]{w});	2817	$self->{layout}->set_width ($empty->{w});
		2818	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510		2819
2511	$self->reflow;	2820	$self->reflow;
2512	}
2513		2821
2514	sub text_size {	2822	local $self->{children} = [$empty, $slider];
		2823	$self->SUPER::invoke_size_allocate ($w, $h)
		2824	}
		2825
		2826	sub invoke_mouse_wheel {
2515	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) = @_;
2516		2838
2517	my $layout = $self->{layout};	2839	my $layout = $self->{layout};
2518		2840
		2841	$layout->set_font ($self->{font}) if $self->{font};
		2842	$layout->set_foreground (@{$para->{fg}});
2519	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2843	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2520	$layout->set_width ($self->{children}[0]{w} - $indent);	2844	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2845	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2521	$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}}
2522		2852	);
		2853
2523	$layout->size	2854	$layout
2524	}	2855	}
2525		2856
2526	sub reflow {	2857	sub reflow {
2527	my ($self) = @_;	2858	my ($self) = @_;
2528		2859
…		…
2535		2866
2536	# todo: base offset on lines or so, not on pixels	2867	# todo: base offset on lines or so, not on pixels
2537	$self->{children}[1]->set_value ($offset);	2868	$self->{children}[1]->set_value ($offset);
2538	}	2869	}
2539		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
2540	sub clear {	2886	sub clear {
2541	my ($self) = @_;	2887	my ($self) = @_;
		2888
		2889	my (undef, undef, @other) = @{ $self->{children} };
		2890	$self->remove ($_) for @other;
2542		2891
2543	$self->{par} = [];	2892	$self->{par} = [];
2544	$self->{height} = 0;	2893	$self->{height} = 0;
2545	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2894	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2546	}	2895	}
2547		2896
2548	sub add_paragraph {	2897	sub add_paragraph {
2549	my ($self, $color, $text, $indent) = @_;	2898	my $self = shift;
2550		2899
2551	for my $line (split /\n/, $text) {	2900	for my $para (@_) {
2552	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
2553	$self->{height} += $h;	2948	$self->{height} = $height;
2554	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2949	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2555	}
2556		2950
2557	$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	}
2558	}	2957	}
2559		2958
2560	sub update {	2959	sub update {
2561	my ($self) = @_;	2960	my ($self) = @_;
2562		2961
…		…
2564		2963
2565	return unless $self->{h} > 0;	2964	return unless $self->{h} > 0;
2566		2965
2567	delete $self->{texture};	2966	delete $self->{texture};
2568		2967
2569	$ROOT->on_post_alloc ($self, sub {	2968	$ROOT->on_post_alloc ($self => sub {
		2969	$self->force_uptodate;
		2970
2570	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2971	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2571		2972
2572	if (delete $self->{need_reflow}) {
2573	my $height = 0;
2574
2575	my $layout = $self->{layout};
2576
2577	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2578
2579	for (@{$self->{par}}) {
2580	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2581	$layout->set_width ($W - $_->[3]);
2582	$layout->set_markup ($_->[4]);
2583	my ($w, $h) = $layout->size;
2584	$_->[0] = $w + $_->[3];
2585	$_->[1] = $h;
2586	}
2587
2588	$height += $_->[1];
2589	}
2590
2591	$self->{height} = $height;
2592
2593	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2594
2595	delete $self->{texture};
2596	}
2597
2598	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2973	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2599	glClearColor 0, 0, 0, 0;	2974	glClearColor 0, 0, 0, 0;
2600	glClear GL_COLOR_BUFFER_BIT;	2975	glClear GL_COLOR_BUFFER_BIT;
2601		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;
2602	my $top = int $self->{children}[1]{range}[0];	2985	my $top = int $self->{children}[1]{range}[0];
2603		2986
2604	my $y0 = $top;	2987	my $y0 = $top;
2605	my $y1 = $top + $H;	2988	my $y1 = $top + $H;
2606		2989
2607	my $y = 0;
2608
2609	my $layout = $self->{layout};
2610
2611	$layout->set_font ($self->{font}) if $self->{font};
2612
2613	glEnable GL_BLEND;
2614	#TODO# not correct in windows where rgba is forced off
2615	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2616
2617	for my $par (@{$self->{par}}) {	2990	for my $para (@{$self->{par}}) {
2618	my $h = $par->[1];	2991	my $h = $para->{h};
		2992	my $y = $para->{y};
2619		2993
2620	if ($y0 < $y + $h && $y < $y1) {	2994	if ($y0 < $y + $h && $y < $y1) {
2621	$layout->set_foreground (@{ $par->[2] });	2995	my $layout = $self->get_layout ($para);
2622	$layout->set_width ($W - $par->[3]);
2623	$layout->set_markup ($par->[4]);
2624		2996
2625	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2997	$layout->render ($para->{indent}, $y - $y0);
2626		2998
2627	glRasterPos $par->[3], $y - $y0;	2999	if (my @w = @{ $para->{widget} }) {
2628	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	}
2629	}	3011	}
2630		3012
2631	$y += $h;	3013	$paridx++;
		3014	$top_paragraph ||= $paridx if $y >= $top;
2632	}	3015	}
2633		3016
2634	glDisable GL_BLEND;	3017	$self->{top_paragraph} = $top_paragraph;
2635	};	3018	};
2636	});	3019	});
		3020	}
		3021
		3022	sub reconfigure {
		3023	my ($self) = @_;
		3024
		3025	$self->SUPER::reconfigure;
		3026
		3027	$_->{w} = 1e10 for @{ $self->{par} };
		3028	$self->reflow;
2637	}	3029	}
2638		3030
2639	sub _draw {	3031	sub _draw {
2640	my ($self) = @_;	3032	my ($self) = @_;
2641		3033
…		…
2644	glColor 0, 0, 0, 1;	3036	glColor 0, 0, 0, 1;
2645	$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});
2646	glDisable GL_TEXTURE_2D;	3038	glDisable GL_TEXTURE_2D;
2647		3039
2648	$self->{children}[1]->draw;	3040	$self->{children}[1]->draw;
2649
2650	}	3041	}
2651		3042
2652	#############################################################################	3043	#############################################################################
2653		3044
2654	package CFClient::UI::Animator;	3045	package CFPlus::UI::Animator;
2655		3046
2656	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2657		3048
2658	our @ISA = CFClient::UI::Bin::;	3049	our @ISA = CFPlus::UI::Bin::;
2659		3050
2660	sub moveto {	3051	sub moveto {
2661	my ($self, $x, $y) = @_;	3052	my ($self, $x, $y) = @_;
2662		3053
2663	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3054	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2691	glPopMatrix;	3082	glPopMatrix;
2692	}	3083	}
2693		3084
2694	#############################################################################	3085	#############################################################################
2695		3086
2696	package CFClient::UI::Flopper;	3087	package CFPlus::UI::Flopper;
2697		3088
2698	our @ISA = CFClient::UI::Button::;	3089	our @ISA = CFPlus::UI::Button::;
2699		3090
2700	sub new {	3091	sub new {
2701	my $class = shift;	3092	my $class = shift;
2702		3093
2703	my $self = $class->SUPER::new (	3094	my $self = $class->SUPER::new (
…		…
2715	$self->{other}->toggle_visibility;	3106	$self->{other}->toggle_visibility;
2716	}	3107	}
2717		3108
2718	#############################################################################	3109	#############################################################################
2719		3110
2720	package CFClient::UI::Tooltip;	3111	package CFPlus::UI::Tooltip;
2721		3112
2722	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2723		3114
2724	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2725		3116
2726	sub new {	3117	sub new {
2727	my $class = shift;	3118	my $class = shift;
2728		3119
2729	$class->SUPER::new (	3120	$class->SUPER::new (
…		…
2732	)	3123	)
2733	}	3124	}
2734		3125
2735	sub set_tooltip_from {	3126	sub set_tooltip_from {
2736	my ($self, $widget) = @_;	3127	my ($self, $widget) = @_;
		3128
		3129	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3130	if $widget->{tooltip} =~ /^#(.*)$/;
2737		3131
2738	my $tooltip = $widget->{tooltip};	3132	my $tooltip = $widget->{tooltip};
2739		3133
2740	if ($ENV{CFPLUS_DEBUG} & 2) {	3134	if ($ENV{CFPLUS_DEBUG} & 2) {
2741	$tooltip .= "\n\n" . (ref $widget) . "\n"	3135	$tooltip .= "\n\n" . (ref $widget) . "\n"
2742	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3136	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743	. "req $widget->{req_w} $widget->{req_h}\n"	3137	. "req $widget->{req_w} $widget->{req_h}\n"
2744	. "visible $widget->{visible}";	3138	. "visible $widget->{visible}";
2745	}	3139	}
2746		3140
		3141	$tooltip =~ s/^\n+//;
		3142	$tooltip =~ s/\n+$//;
		3143
2747	$self->add (new CFClient::UI::Label	3144	$self->add (new CFPlus::UI::Label
2748	markup => $tooltip,	3145	markup => $tooltip,
2749	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3146	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2750	fontsize => 0.8,	3147	fontsize => 0.8,
2751	fg => [0, 0, 0, 1],	3148	style => 1, # FLAG_INVERSE
2752	ellipsise => 0,	3149	ellipsise => 0,
2753	font => ($widget->{tooltip_font} || $::FONT_PROP),	3150	font => ($widget->{tooltip_font} || $::FONT_PROP),
2754	);	3151	);
2755	}	3152	}
2756		3153
…		…
2760	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3157	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2761		3158
2762	($w + 4, $h + 4)	3159	($w + 4, $h + 4)
2763	}	3160	}
2764		3161
2765	sub size_allocate {	3162	sub invoke_size_allocate {
2766	my ($self, $w, $h) = @_;	3163	my ($self, $w, $h) = @_;
2767		3164
2768	$self->SUPER::size_allocate ($w - 4, $h - 4);	3165	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2769	}	3166	}
2770		3167
2771	sub visibility_change {	3168	sub invoke_visibility_change {
2772	my ($self, $visible) = @_;	3169	my ($self, $visible) = @_;
2773		3170
2774	return unless $visible;	3171	return unless $visible;
2775		3172
2776	$self->{root}->on_post_alloc ("move_$self" => sub {	3173	$self->{root}->on_post_alloc ("move_$self" => sub {
2777	my $widget = $self->{owner}	3174	my $widget = $self->{owner}
2778	or return;	3175	or return;
2779		3176
		3177	if ($widget->{visible}) {
2780	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3178	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781		3179
2782	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3180	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783	if $x + $self->{w} > $::WIDTH;	3181	if $x + $self->{w} > $self->{root}{w};
2784		3182
2785	$self->move_abs ($x, $y);	3183	$self->move_abs ($x, $y);
		3184	} else {
		3185	$self->hide;
		3186	}
2786	});	3187	});
2787	}	3188	}
2788		3189
2789	sub _draw {	3190	sub _draw {
2790	my ($self) = @_;	3191	my ($self) = @_;
…		…
2814	$self->SUPER::_draw;	3215	$self->SUPER::_draw;
2815	}	3216	}
2816		3217
2817	#############################################################################	3218	#############################################################################
2818		3219
2819	package CFClient::UI::Face;	3220	package CFPlus::UI::Face;
2820		3221
2821	our @ISA = CFClient::UI::Base::;	3222	our @ISA = CFPlus::UI::DrawBG::;
2822		3223
2823	use CFClient::OpenGL;	3224	use CFPlus::OpenGL;
2824		3225
2825	sub new {	3226	sub new {
2826	my $class = shift;	3227	my $class = shift;
2827		3228
2828	my $self = $class->SUPER::new (	3229	my $self = $class->SUPER::new (
…		…
2863	sub _draw {	3264	sub _draw {
2864	my ($self) = @_;	3265	my ($self) = @_;
2865		3266
2866	return unless $::CONN;	3267	return unless $::CONN;
2867		3268
		3269	$self->SUPER::_draw;
		3270
2868	my $face;	3271	my $face;
2869		3272
2870	if ($self->{frame}) {	3273	if ($self->{frame}) {
2871	my $anim = $::CONN->{anim}[$self->{anim}];	3274	my $anim = $::CONN->{anim}[$self->{anim}];
2872		3275
…		…
2883	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3286	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2884	glDisable GL_TEXTURE_2D;	3287	glDisable GL_TEXTURE_2D;
2885	}	3288	}
2886	}	3289	}
2887		3290
2888	sub DESTROY {	3291	sub destroy {
2889	my ($self) = @_;	3292	my ($self) = @_;
2890		3293
2891	$self->{timer}->cancel	3294	$self->{timer}->cancel
2892	if $self->{timer};	3295	if $self->{timer};
2893		3296
2894	$self->SUPER::DESTROY;	3297	$self->SUPER::destroy;
2895	}	3298	}
2896		3299
2897	#############################################################################	3300	#############################################################################
2898		3301
2899	package CFClient::UI::Buttonbar;	3302	package CFPlus::UI::Buttonbar;
2900		3303
2901	our @ISA = CFClient::UI::HBox::;	3304	our @ISA = CFPlus::UI::HBox::;
2902		3305
2903	# TODO: should actualyl wrap buttons and other goodies.	3306	# TODO: should actually wrap buttons and other goodies.
2904		3307
2905	#############################################################################	3308	#############################################################################
2906		3309
2907	package CFClient::UI::Menu;	3310	package CFPlus::UI::Menu;
2908		3311
2909	our @ISA = CFClient::UI::FancyFrame::;	3312	our @ISA = CFPlus::UI::Toplevel::;
2910		3313
2911	use CFClient::OpenGL;	3314	use CFPlus::OpenGL;
2912		3315
2913	sub new {	3316	sub new {
2914	my $class = shift;	3317	my $class = shift;
2915		3318
2916	my $self = $class->SUPER::new (	3319	my $self = $class->SUPER::new (
2917	items => [],	3320	items => [],
2918	z => 100,	3321	z => 100,
2919	@_,	3322	@_,
2920	);	3323	);
2921		3324
2922	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3325	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2923		3326
2924	for my $item (@{ $self->{items} }) {	3327	for my $item (@{ $self->{items} }) {
2925	my ($widget, $cb) = @$item;	3328	my ($widget, $cb, $tooltip) = @$item;
2926		3329
2927	# handle various types of items, only text for now	3330	# handle various types of items, only text for now
2928	if (!ref $widget) {	3331	if (!ref $widget) {
		3332	if ($widget =~ /\t/) {
		3333	my ($left, $right) = split /\t/, $widget, 2;
		3334
2929	$widget = new CFClient::UI::Label	3335	$widget = new CFPlus::UI::HBox
2930	can_hover => 1,	3336	can_hover => 1,
2931	can_events => 1,	3337	can_events => 1,
		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,
2932	text => $widget;	3349	markup => $widget,
		3350	tooltip => $tooltip;
		3351	}
2933	}	3352	}
2934		3353
2935	$self->{item}{$widget} = $item;	3354	$self->{item}{$widget} = $item;
2936		3355
2937	$self->{vbox}->add ($widget);	3356	$self->{vbox}->add ($widget);
…		…
2942		3361
2943	# 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)
2944	sub popup {	3363	sub popup {
2945	my ($self, $ev) = @_;	3364	my ($self, $ev) = @_;
2946		3365
2947	$self->_emit ("popdown");	3366	$self->emit ("popdown");
2948		3367
2949	# maybe save $GRAB? must be careful about events...	3368	# maybe save $GRAB? must be careful about events...
2950	$GRAB = $self;	3369	$GRAB = $self;
2951	$self->{button} = $ev->{button};	3370	$self->{button} = $ev->{button};
2952		3371
2953	$self->show;	3372	$self->show;
2954	$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);
2955	}	3374	}
2956		3375
2957	sub mouse_motion {	3376	sub invoke_mouse_motion {
2958	my ($self, $ev, $x, $y) = @_;	3377	my ($self, $ev, $x, $y) = @_;
2959		3378
2960	# TODO: should use vbox->find_widget or so	3379	# TODO: should use vbox->find_widget or so
2961	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3380	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2962	$self->{hover} = $self->{item}{$HOVER};	3381	$self->{hover} = $self->{item}{$HOVER};
2963		3382
2964	0	3383	0
2965	}	3384	}
2966		3385
2967	sub button_up {	3386	sub invoke_button_up {
2968	my ($self, $ev, $x, $y) = @_;	3387	my ($self, $ev, $x, $y) = @_;
2969		3388
2970	if ($ev->{button} == $self->{button}) {	3389	if ($ev->{button} == $self->{button}) {
2971	undef $GRAB;	3390	undef $GRAB;
2972	$self->hide;	3391	$self->hide;
2973		3392
2974	$self->_emit ("popdown");	3393	$self->emit ("popdown");
2975	$self->{hover}[1]->() if $self->{hover};	3394	$self->{hover}[1]->() if $self->{hover};
2976	} else {	3395	} else {
2977	return 0	3396	return 0
2978	}	3397	}
2979		3398
2980	1	3399	1
2981	}	3400	}
2982		3401
2983	#############################################################################	3402	#############################################################################
2984		3403
2985	package CFClient::UI::Multiplexer;	3404	package CFPlus::UI::Multiplexer;
2986		3405
2987	our @ISA = CFClient::UI::Container::;	3406	our @ISA = CFPlus::UI::Container::;
2988		3407
2989	sub new {	3408	sub new {
2990	my $class = shift;	3409	my $class = shift;
2991		3410
2992	my $self = $class->SUPER::new (	3411	my $self = $class->SUPER::new (
…		…
3006		3425
3007	$self->{current} = $self->{children}[0]	3426	$self->{current} = $self->{children}[0]
3008	if @{ $self->{children} };	3427	if @{ $self->{children} };
3009	}	3428	}
3010		3429
		3430	sub get_current_page {
		3431	my ($self) = @_;
		3432
		3433	$self->{current}
		3434	}
		3435
3011	sub set_current_page {	3436	sub set_current_page {
3012	my ($self, $page_or_widget) = @_;	3437	my ($self, $page_or_widget) = @_;
3013		3438
3014	my $widget = ref $page_or_widget	3439	my $widget = ref $page_or_widget
3015	? $page_or_widget	3440	? $page_or_widget
3016	: $self->{children}[$page_or_widget];	3441	: $self->{children}[$page_or_widget];
3017		3442
3018	$self->{current} = $widget;	3443	$self->{current} = $widget;
3019	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3444	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020		3445
3021	$self->_emit (page_changed => $self->{current});	3446	$self->emit (page_changed => $self->{current});
3022		3447
3023	$self->realloc;	3448	$self->realloc;
3024	}	3449	}
3025		3450
3026	sub visible_children {	3451	sub visible_children {
…		…
3031	my ($self) = @_;	3456	my ($self) = @_;
3032		3457
3033	$self->{current}->size_request	3458	$self->{current}->size_request
3034	}	3459	}
3035		3460
3036	sub size_allocate {	3461	sub invoke_size_allocate {
3037	my ($self, $w, $h) = @_;	3462	my ($self, $w, $h) = @_;
3038		3463
3039	$self->{current}->configure (0, 0, $w, $h);	3464	$self->{current}->configure (0, 0, $w, $h);
		3465
		3466	1
3040	}	3467	}
3041		3468
3042	sub _draw {	3469	sub _draw {
3043	my ($self) = @_;	3470	my ($self) = @_;
3044		3471
3045	$self->{current}->draw;	3472	$self->{current}->draw;
3046	}	3473	}
3047		3474
3048	#############################################################################	3475	#############################################################################
3049		3476
3050	package CFClient::UI::Notebook;	3477	package CFPlus::UI::Notebook;
3051		3478
3052	our @ISA = CFClient::UI::VBox::;	3479	our @ISA = CFPlus::UI::VBox::;
3053		3480
3054	sub new {	3481	sub new {
3055	my $class = shift;	3482	my $class = shift;
3056		3483
3057	my $self = $class->SUPER::new (	3484	my $self = $class->SUPER::new (
3058	buttonbar => (new CFClient::UI::Buttonbar),	3485	buttonbar => (new CFPlus::UI::Buttonbar),
3059	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3486	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3060	# filter => # will be put between multiplexer and $self	3487	# filter => # will be put between multiplexer and $self
3061	@_,	3488	@_,
3062	);	3489	);
3063		3490
3064	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3491	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3070	sub add {	3497	sub add {
3071	my ($self, $title, $widget, $tooltip) = @_;	3498	my ($self, $title, $widget, $tooltip) = @_;
3072		3499
3073	Scalar::Util::weaken $self;	3500	Scalar::Util::weaken $self;
3074		3501
3075	$self->{buttonbar}->add (new CFClient::UI::Button	3502	$self->{buttonbar}->add (new CFPlus::UI::Button
3076	markup => $title,	3503	markup => $title,
3077	tooltip => $tooltip,	3504	tooltip => $tooltip,
3078	on_activate => sub { $self->set_current_page ($widget) },	3505	on_activate => sub { $self->set_current_page ($widget) },
3079	);	3506	);
3080		3507
3081	$self->{multiplexer}->add ($widget);	3508	$self->{multiplexer}->add ($widget);
3082	}	3509	}
3083		3510
		3511	sub get_current_page {
		3512	my ($self) = @_;
		3513
		3514	$self->{multiplexer}->get_current_page
		3515	}
		3516
3084	sub set_current_page {	3517	sub set_current_page {
3085	my ($self, $page) = @_;	3518	my ($self, $page) = @_;
3086		3519
3087	$self->{multiplexer}->set_current_page ($page);	3520	$self->{multiplexer}->set_current_page ($page);
3088	$self->_emit (page_changed => $self->{multiplexer}{current});	3521	$self->emit (page_changed => $self->{multiplexer}{current});
3089	}	3522	}
3090		3523
3091	#############################################################################	3524	#############################################################################
3092		3525
		3526	package CFPlus::UI::Selector;
		3527
		3528	use utf8;
		3529
		3530	our @ISA = CFPlus::UI::Button::;
		3531
		3532	sub new {
		3533	my $class = shift;
		3534
		3535	my $self = $class->SUPER::new (
		3536	options => [], # [value, title, longdesc], ...
		3537	value => undef,
		3538	@_,
		3539	);
		3540
		3541	$self->_set_value ($self->{value});
		3542
		3543	$self
		3544	}
		3545
		3546	sub invoke_button_down {
		3547	my ($self, $ev) = @_;
		3548
		3549	my @menu_items;
		3550
		3551	for (@{ $self->{options} }) {
		3552	my ($value, $title, $tooltip) = @$_;
		3553
		3554	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3555	}
		3556
		3557	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3558	}
		3559
		3560	sub _set_value {
		3561	my ($self, $value) = @_;
		3562
		3563	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3564	or return;
		3565
		3566	$self->{value} = $item->[0];
		3567	$self->set_markup ("$item->[1] ⇓");
		3568	$self->set_tooltip ($item->[2]);
		3569	}
		3570
		3571	sub set_value {
		3572	my ($self, $value) = @_;
		3573
		3574	return unless $self->{value} ne $value;
		3575
		3576	$self->_set_value ($value);
		3577	$self->emit (changed => $value);
		3578	}
		3579
		3580	#############################################################################
		3581
3093	package CFClient::UI::Statusbox;	3582	package CFPlus::UI::Statusbox;
3094		3583
3095	our @ISA = CFClient::UI::VBox::;	3584	our @ISA = CFPlus::UI::VBox::;
3096		3585
3097	sub new {	3586	sub new {
3098	my $class = shift;	3587	my $class = shift;
3099		3588
3100	my $self = $class->SUPER::new (	3589	my $self = $class->SUPER::new (
…		…
3112	sub reorder {	3601	sub reorder {
3113	my ($self) = @_;	3602	my ($self) = @_;
3114	my $NOW = Time::HiRes::time;	3603	my $NOW = Time::HiRes::time;
3115		3604
3116	# freeze display when hovering over any label	3605	# freeze display when hovering over any label
3117	return if $CFClient::UI::TOOLTIP->{owner}	3606	return if $CFPlus::UI::TOOLTIP->{owner}
3118	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3607	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3119	values %{ $self->{item} };	3608	values %{ $self->{item} };
3120		3609
3121	while (my ($k, $v) = each %{ $self->{item} }) {	3610	while (my ($k, $v) = each %{ $self->{item} }) {
3122	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3611	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3123	}	3612	}
…		…
3144	for ($short) {	3633	for ($short) {
3145	s/^\s+//;	3634	s/^\s+//;
3146	s/\s+/ /g;	3635	s/\s+/ /g;
3147	}	3636	}
3148		3637
3149	new CFClient::UI::Label	3638	new CFPlus::UI::Label
3150	markup => $short,	3639	markup => $short,
3151	tooltip => $item->{tooltip},	3640	tooltip => $item->{tooltip},
3152	tooltip_font => $::FONT_PROP,	3641	tooltip_font => $::FONT_PROP,
3153	tooltip_width => 0.67,	3642	tooltip_width => 0.67,
3154	fontsize => $item->{fontsize} || $self->{fontsize},	3643	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3192	$item->{count}++;	3681	$item->{count}++;
3193	} else {	3682	} else {
3194	$item->{count} = 1;	3683	$item->{count} = 1;
3195	$item->{text} = $item->{tooltip} = $text;	3684	$item->{text} = $item->{tooltip} = $text;
3196	}	3685	}
3197	$item->{id} = ++$self->{id};	3686	$item->{id} += 0.2;#d#
3198	$item->{timeout} = $timeout;	3687	$item->{timeout} = $timeout;
3199	delete $item->{label};	3688	delete $item->{label};
3200	} else {	3689	} else {
3201	$self->{item}{$group} = {	3690	$self->{item}{$group} = {
3202	id => ++$self->{id},	3691	id => ++$self->{id},
…		…
3208	count => 1,	3697	count => 1,
3209	%arg,	3698	%arg,
3210	};	3699	};
3211	}	3700	}
3212		3701
		3702	$ROOT->on_refresh (reorder => sub {
3213	$self->reorder;	3703	$self->reorder;
		3704	});
3214	}	3705	}
3215		3706
3216	sub reconfigure {	3707	sub reconfigure {
3217	my ($self) = @_;	3708	my ($self) = @_;
3218		3709
…		…
3221		3712
3222	$self->reorder;	3713	$self->reorder;
3223	$self->SUPER::reconfigure;	3714	$self->SUPER::reconfigure;
3224	}	3715	}
3225		3716
3226	sub DESTROY {	3717	sub destroy {
3227	my ($self) = @_;	3718	my ($self) = @_;
3228		3719
3229	$self->{timer}->cancel;	3720	$self->{timer}->cancel;
3230		3721
3231	$self->SUPER::DESTROY;	3722	$self->SUPER::destroy;
3232	}	3723	}
3233		3724
3234	#############################################################################	3725	#############################################################################
3235		3726
3236	package CFClient::UI::Inventory;	3727	package CFPlus::UI::Inventory;
3237		3728
3238	our @ISA = CFClient::UI::ScrolledWindow::;	3729	our @ISA = CFPlus::UI::Table::;
3239		3730
3240	sub new {	3731	sub new {
3241	my $class = shift;	3732	my $class = shift;
3242		3733
3243	my $self = $class->SUPER::new (	3734	my $self = $class->SUPER::new (
3244	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3735	col_expand => [0, 1, 0],
		3736	items => [],
3245	@_,	3737	@_,
3246	);	3738	);
3247		3739
		3740	$self->set_sort_order (undef);
		3741
3248	$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;
3249	}	3778	}
3250		3779
3251	sub set_items {	3780	sub set_items {
3252	my ($self, $items) = @_;	3781	my ($self, $items) = @_;
3253		3782
3254	$self->{child}->clear;	3783	$self->{items} = [$items ? values %$items : ()];
3255	return unless $items;	3784	$self->update_items;
3256
3257	my @items = sort {
3258	($a->{type} <=> $b->{type})
3259	or ($a->{name} cmp $b->{name})
3260	} @$items;
3261
3262	$self->{real_items} = \@items;
3263
3264	my $row = 0;
3265	for my $item (@items) {
3266	CFClient::Item::update_widgets $item;
3267
3268	$self->{child}->add (0, $row, $item->{face_widget});
3269	$self->{child}->add (1, $row, $item->{desc_widget});
3270	$self->{child}->add (2, $row, $item->{weight_widget});
3271
3272	$row++;
3273	}
3274	}	3785	}
3275		3786
3276	#############################################################################	3787	#############################################################################
3277		3788
3278	package CFClient::UI::BindEditor;
3279
3280	our @ISA = CFClient::UI::FancyFrame::;
3281
3282	sub new {
3283	my $class = shift;
3284
3285	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3286
3287	$self->add (my $vb = new CFClient::UI::VBox);
3288
3289
3290	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3291	text => "start recording",
3292	tooltip => "Start/Stops recording of actions."
3293	."All subsequent actions after the recording started will be captured."
3294	."The actions are displayed after the record was stopped."
3295	."To bind the action you have to click on the 'Bind' button",
3296	on_activate => sub {
3297	unless ($self->{recording}) {
3298	$self->start;
3299	} else {
3300	$self->stop;
3301	}
3302	});
3303
3304	$vb->add (new CFClient::UI::Label text => "Actions:");
3305	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3306
3307	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3308	$vb->add (my $hb = new CFClient::UI::HBox);
3309	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3310	$hb->add (new CFClient::UI::Button
3311	text => "bind",
3312	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3313	on_activate => sub {
3314	$self->ask_for_bind;
3315	});
3316
3317	$vb->add (my $hb = new CFClient::UI::HBox);
3318	$hb->add (new CFClient::UI::Button
3319	text => "ok",
3320	expand => 1,
3321	tooltip => "This closes the binding editor and saves the binding",
3322	on_activate => sub {
3323	$self->hide;
3324	$self->commit;
3325	});
3326
3327	$hb->add (new CFClient::UI::Button
3328	text => "cancel",
3329	expand => 1,
3330	tooltip => "This closes the binding editor without saving",
3331	on_activate => sub {
3332	$self->hide;
3333	$self->{binding_cancel}->()
3334	if $self->{binding_cancel};
3335	});
3336
3337	$self->update_binding_widgets;
3338
3339	$self
3340	}
3341
3342	sub commit {
3343	my ($self) = @_;
3344	my ($mod, $sym, $cmds) = $self->get_binding;
3345	if ($sym != 0 && @$cmds > 0) {
3346	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3347	."'. Don't forget 'Save Config'!");
3348	$self->{binding_change}->($mod, $sym, $cmds)
3349	if $self->{binding_change};
3350	} else {
3351	$::STATUSBOX->add ("No action bound, no key or action specified!");
3352	$self->{binding_cancel}->()
3353	if $self->{binding_cancel};
3354	}
3355	}
3356
3357	sub start {
3358	my ($self) = @_;
3359
3360	$self->{rec_btn}->set_text ("stop recording");
3361	$self->{recording} = 1;
3362	$self->clear_command_list;
3363	$::CONN->start_record if $::CONN;
3364	}
3365
3366	sub stop {
3367	my ($self) = @_;
3368
3369	$self->{rec_btn}->set_text ("start recording");
3370	$self->{recording} = 0;
3371
3372	my $rec;
3373	$rec = $::CONN->stop_record if $::CONN;
3374	return unless ref $rec eq 'ARRAY';
3375	$self->set_command_list ($rec);
3376	}
3377
3378
3379	sub ask_for_bind_and_commit {
3380	my ($self) = @_;
3381	$self->ask_for_bind (1);
3382	}
3383
3384	sub ask_for_bind {
3385	my ($self, $commit) = @_;
3386
3387	CFClient::Binder::open_binding_dialog (sub {
3388	my ($mod, $sym) = @_;
3389	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3390	$self->update_binding_widgets;
3391	$self->commit if $commit;
3392	});
3393	}
3394
3395	# $mod and $sym are the modifiers and key symbol
3396	# $cmds is a array ref of strings (the commands)
3397	# $cb is the callback that is executed on OK
3398	# $ccb is the callback that is executed on CANCEL and
3399	# when the binding was unsuccessful on OK
3400	sub set_binding {
3401	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3402
3403	$self->clear_command_list;
3404	$self->{recording} = 0;
3405	$self->{rec_btn}->set_text ("start recording");
3406
3407	$self->{binding} = [$mod, $sym];
3408	$self->{commands} = $cmds;
3409
3410	$self->{binding_change} = $cb;
3411	$self->{binding_cancel} = $ccb;
3412
3413	$self->update_binding_widgets;
3414	}
3415
3416	# this is a shortcut method that asks for a binding
3417	# and then just binds it.
3418	sub do_quick_binding {
3419	my ($self, $cmds) = @_;
3420	$self->set_binding (undef, undef, $cmds, sub {
3421	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3422	});
3423	$self->ask_for_bind (1);
3424	}
3425
3426	sub update_binding_widgets {
3427	my ($self) = @_;
3428	my ($mod, $sym, $cmds) = $self->get_binding;
3429	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3430	$self->set_command_list ($cmds);
3431	}
3432
3433	sub get_binding {
3434	my ($self) = @_;
3435	return (
3436	$self->{binding}->[0],
3437	$self->{binding}->[1],
3438	[ grep { defined $_ } @{$self->{commands}} ]
3439	);
3440	}
3441
3442	sub clear_command_list {
3443	my ($self) = @_;
3444	$self->{cmdbox}->clear ();
3445	}
3446
3447	sub set_command_list {
3448	my ($self, $cmds) = @_;
3449
3450	$self->{cmdbox}->clear ();
3451	$self->{commands} = $cmds;
3452
3453	my $idx = 0;
3454
3455	for (@$cmds) {
3456	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3457
3458	my $i = $idx;
3459	$hb->add (new CFClient::UI::Label text => $_);
3460	$hb->add (new CFClient::UI::Button
3461	text => "delete",
3462	tooltip => "Deletes the action from the record",
3463	on_activate => sub {
3464	$self->{cmdbox}->remove ($hb);
3465	$cmds->[$i] = undef;
3466	});
3467
3468
3469	$idx++
3470	}
3471	}
3472
3473	#############################################################################
3474
3475	package CFClient::UI::SpellList;	3789	package CFPlus::UI::SpellList;
3476		3790
3477	our @ISA = CFClient::UI::Table::;	3791	our @ISA = CFPlus::UI::Table::;
3478		3792
3479	sub new {	3793	sub new {
3480	my $class = shift;	3794	my $class = shift;
3481		3795
3482	my $self = $class->SUPER::new (	3796	my $self = $class->SUPER::new (
…		…
3484	commands => [],	3798	commands => [],
3485	@_,	3799	@_,
3486	)	3800	)
3487	}	3801	}
3488		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");
3489	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 =>
3490	"<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");
3491	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 =>
3492	"<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");
3493	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 =>
3494	"<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");
3495		3815
3496	sub rebuild_spell_list {	3816	sub rebuild_spell_list {
3497	my ($self) = @_;	3817	my ($self) = @_;
3498		3818
3499	$CFClient::UI::ROOT->on_refresh ($self => sub {	3819	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3500	$self->clear;	3820	$self->clear;
3501		3821
		3822	return unless $::CONN;
		3823
3502	$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);
3503	$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);
3504	$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);
3505	$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);
3506		3829
3507	my $row = 0;	3830	my $row = 0;
3508		3831
3509	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3832	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510	my $spell = $self->{spell}{$_};	3833	my $spell = $self->{spell}{$_};
3511		3834
3512	$row++;	3835	$row++;
3513		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
3514	$self->add (0, $row, new CFClient::UI::Face	3863	$self->add (0, $row, new CFPlus::UI::Face
3515	face => $spell->{face},	3864	face => $spell->{face},
3516	can_hover => 1,	3865	can_hover => 1,
3517	can_events => 1,	3866	can_events => 1,
3518	tooltip => $spell->{message},	3867	tooltip => $tooltip,
		3868	on_button_down => $spell_cb,
3519	);	3869	);
3520		3870
3521	$self->add (1, $row, new CFClient::UI::Label	3871	$self->add (1, $row, new CFPlus::UI::Label
3522	expand => 1,	3872	expand => 1,
3523	text => $spell->{name},	3873	text => $spell->{name},
3524	can_hover => 1,	3874	can_hover => 1,
3525	can_events => 1,	3875	can_events => 1,
3526	tooltip => $spell->{message},	3876	tooltip => $tooltip,
		3877	on_button_down => $spell_cb,
3527	);	3878	);
3528		3879
		3880	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3529	$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);
3530	$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);
3531	$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);
3532
3533	# TODO: should be done via popup
3534	$self->add (5, $row, new CFClient::UI::Button
3535	text => "bind",
3536	tooltip => "bind spell readying (cast command) to key",
3537	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538	);
3539	}	3884	}
3540	});	3885	});
3541	}	3886	}
3542		3887
3543	sub add_spell {	3888	sub add_spell {
…		…
3552		3897
3553	delete $self->{spell}->{$spell->{name}};	3898	delete $self->{spell}->{$spell->{name}};
3554	$self->rebuild_spell_list;	3899	$self->rebuild_spell_list;
3555	}	3900	}
3556		3901
		3902	sub clear_spells {
		3903	my ($self) = @_;
		3904
		3905	$self->{spell} = {};
		3906	$self->rebuild_spell_list;
		3907	}
		3908
3557	#############################################################################	3909	#############################################################################
3558		3910
3559	package CFClient::UI::Root;	3911	package CFPlus::UI::Root;
3560		3912
3561	our @ISA = CFClient::UI::Container::;	3913	our @ISA = CFPlus::UI::Container::;
3562		3914
3563	use List::Util qw(min max);	3915	use List::Util qw(min max);
3564		3916
3565	use CFClient::OpenGL;	3917	use CFPlus::OpenGL;
3566		3918
3567	sub new {	3919	sub new {
3568	my $class = shift;	3920	my $class = shift;
3569		3921
3570	my $self = $class->SUPER::new (	3922	my $self = $class->SUPER::new (
…		…
3595	$coord = $max - $size if $coord > $max - $size;	3947	$coord = $max - $size if $coord > $max - $size;
3596		3948
3597	int $coord + 0.5	3949	int $coord + 0.5
3598	}	3950	}
3599		3951
3600	sub size_allocate {	3952	sub invoke_size_allocate {
3601	my ($self, $w, $h) = @_;	3953	my ($self, $w, $h) = @_;
3602		3954
3603	for my $child ($self->children) {	3955	for my $child ($self->children) {
3604	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)};
3605		3957
…		…
3609	$X = _to_pixel $X, $W, $self->{w};	3961	$X = _to_pixel $X, $W, $self->{w};
3610	$Y = _to_pixel $Y, $H, $self->{h};	3962	$Y = _to_pixel $Y, $H, $self->{h};
3611		3963
3612	$child->configure ($X, $Y, $W, $H);	3964	$child->configure ($X, $Y, $W, $H);
3613	}	3965	}
		3966
		3967	1
3614	}	3968	}
3615		3969
3616	sub coord2local {	3970	sub coord2local {
3617	my ($self, $x, $y) = @_;	3971	my ($self, $x, $y) = @_;
3618		3972
…		…
3744	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4098	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3745		4099
3746	$w = 0 if $w < 0;	4100	$w = 0 if $w < 0;
3747	$h = 0 if $h < 0;	4101	$h = 0 if $h < 0;
3748		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
3749	$w = int $w + 0.5;	4112	$w = int $w + 0.5;
3750	$h = int $h + 0.5;	4113	$h = int $h + 0.5;
3751		4114
3752	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}) {
3753	$widget->{old_w} = $widget->{w};	4116	$widget->{old_w} = $widget->{w};
…		…
3776	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4139	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3777	glMatrixMode GL_MODELVIEW;	4140	glMatrixMode GL_MODELVIEW;
3778	glLoadIdentity;	4141	glLoadIdentity;
3779		4142
3780	{	4143	{
3781	package CFClient::UI::Base;	4144	package CFPlus::UI::Base;
3782		4145
3783	($draw_x, $draw_y, $draw_w, $draw_h) =	4146	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3784	(0, 0, $self->{w}, $self->{h});	4147	(0, 0, $self->{w}, $self->{h});
3785	}
3786		4148
3787	$self->_draw;	4149	$self->_draw;
		4150	}
3788	}	4151	}
3789		4152
3790	#############################################################################	4153	#############################################################################
3791		4154
3792	package CFClient::UI;	4155	package CFPlus::UI;
3793		4156
3794	$ROOT = new CFClient::UI::Root;	4157	$ROOT = new CFPlus::UI::Root;
3795	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4158	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3796		4159
3797	1	4160	1
3798		4161

Diff Legend

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