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.285 by root, Mon Jun 5 03:07:01 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 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 ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	80	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	81	if $FOCUS;
82	}	82	}
83		83
		84	sub check_hover {
		85	my ($widget) = @_;
		86
		87	if ($widget != $HOVER) {
		88	my $hover = $HOVER; $HOVER = $widget;
		89
		90	$hover->update if $hover && $hover->{can_hover};
		91	$HOVER->update if $HOVER && $HOVER->{can_hover};
		92
		93	$TOOLTIP_WATCHER->start;
		94	}
		95	}
		96
84	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	98	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	99	my ($x, $y) = ($ev->{x}, $ev->{y});
87		100
88	if (!$BUTTON_STATE) {	101	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		102
		103	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
90		105
91	$GRAB = $widget;	106	$GRAB = $widget;
92	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
93		108
94	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->cb->();
95	}	110	}
96		111
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	112	if ($GRAB) {
98		113	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	114	# mousewheel
100	if $GRAB;	115	$ev->{dx} = 0;
		116	$ev->{dy} = $ev->{button} * 2 - 9;
		117	$GRAB->emit (mouse_wheel => $ev);
		118	} else {
		119	$GRAB->emit (button_down => $ev)
		120	}
		121	}
101	}	122	}
102		123
103	sub feed_sdl_button_up_event {	124	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	125	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		126
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	127	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		128
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	129	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		130
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	131	$GRAB->emit (button_up => $ev)
112	if $GRAB;	132	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		133
114	if (!$BUTTON_STATE) {	134	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	135	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	136	$grab->update if $grab;
117	$GRAB->update if $GRAB;	137	$GRAB->update if $GRAB;
118		138
		139	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	140	$TOOLTIP_WATCHER->cb->();
120	}	141	}
121	}	142	}
122		143
123	sub feed_sdl_motion_event {	144	sub feed_sdl_motion_event {
124	my ($ev) = @_;	145	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	146	my ($x, $y) = ($ev->{x}, $ev->{y});
126		147
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	148	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		149
129	if ($widget != $HOVER) {	150	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		151
132	$hover->update if $hover && $hover->{can_hover};	152	$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;	153	if $HOVER;
140	}	154	}
141		155
142	# convert position array to integers	156	# convert position array to integers
143	sub harmonize {	157	sub harmonize {
…		…
193	reconfigure_widgets;	207	reconfigure_widgets;
194	}	208	}
195		209
196	#############################################################################	210	#############################################################################
197		211
		212	package CFPlus::UI::Event;
		213
		214	sub xy {
		215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		216	}
		217
		218	#############################################################################
		219
198	package CFClient::UI::Base;	220	package CFPlus::UI::Base;
199		221
200	use strict;	222	use strict;
201		223
202	use CFClient::OpenGL;	224	use CFPlus::OpenGL;
203		225
204	sub new {	226	sub new {
205	my $class = shift;	227	my $class = shift;
206		228
207	my $self = bless {	229	my $self = bless {
…		…
212	h => undef,	234	h => undef,
213	can_events => 1,	235	can_events => 1,
214	@_	236	@_
215	}, $class;	237	}, $class;
216		238
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	239	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		240
219	for (keys %$self) {	241	for (keys %$self) {
220	if (/^on_(.*)$/) {	242	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	243	$self->connect ($1 => delete $self->{$_});
222	}	244	}
223	}	245	}
224		246
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	247	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	248	$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};	249	$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};	250	$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};	251	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		252
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		255
234	$self->show if $layout->{show};	256	$self->show if $layout->{show};
…		…
239		261
240	sub destroy {	262	sub destroy {
241	my ($self) = @_;	263	my ($self) = @_;
242		264
243	$self->hide;	265	$self->hide;
		266	$self->emit ("destroy");
244	%$self = ();	267	%$self = ();
245	}	268	}
246		269
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	sub disconnect_all {
		510	my ($self, $signal) = @_;
		511
		512	delete $self->{signal_cb}{$signal};
		513	}
		514
		515	my %has_coords = (
		516	button_down => 1,
		517	button_up => 1,
		518	mouse_motion => 1,
		519	mouse_wheel => 1,
		520	);
		521
		522	sub emit {
		523	my ($self, $signal, @args) = @_;
		524
		525	# I do not really like this solution, but I do not like duplication
		526	# and needlessly verbose code, either.
		527	my @append
		528	= $has_coords{$signal}
		529	? $args[0]->xy ($self)
		530	: ();
		531
		532	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		533
		534	for my $cb (
		535	@{$self->{signal_cb}{$signal} || []}, # before
		536	($self->can ("invoke_$signal") || sub { 1 }), # closure
		537	) {
		538	return $cb->($self, @args, @append) || next;
		539	}
		540
		541	# parent
		542	$self->{parent} && $self->{parent}->emit ($signal, @args)
463	}	543	}
464		544
465	sub find_widget {	545	sub find_widget {
466	my ($self, $x, $y) = @_;	546	my ($self, $x, $y) = @_;
467		547
…		…
475	}	555	}
476		556
477	sub set_parent {	557	sub set_parent {
478	my ($self, $parent) = @_;	558	my ($self, $parent) = @_;
479		559
480	Scalar::Util::weaken ($self->{parent} = $parent);	560	CFPlus::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	561	$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	}	562	}
506		563
507	sub realloc {	564	sub realloc {
508	my ($self) = @_;	565	my ($self) = @_;
509		566
…		…
542	return unless $self->{h} && $self->{w};	599	return unless $self->{h} && $self->{w};
543		600
544	# update screen rectangle	601	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};	602	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};	603	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549		604
550	# skip widgets that are entirely outside the drawing area	605	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	606	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	607	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553		608
…		…
576	glVertex $self->{w} - 1, 0;	631	glVertex $self->{w} - 1, 0;
577	glVertex $self->{w} - 1, $self->{h} - 1;	632	glVertex $self->{w} - 1, $self->{h} - 1;
578	glVertex 0 , $self->{h} - 1;	633	glVertex 0 , $self->{h} - 1;
579	glEnd;	634	glEnd;
580	glPopMatrix;	635	glPopMatrix;
581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	636	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582	}	637	}
583		638
584	$self->_draw;	639	$self->_draw;
585	glPopMatrix;	640	glPopMatrix;
586	}	641	}
…		…
589	my ($self) = @_;	644	my ($self) = @_;
590		645
591	warn "no draw defined for $self\n";	646	warn "no draw defined for $self\n";
592	}	647	}
593		648
		649	my $cntx;#d#
594	sub DESTROY {	650	sub DESTROY {
595	my ($self) = @_;	651	my ($self) = @_;
596		652
		653	return if CFPlus::in_destruct;
		654
		655	eval { $self->destroy };
		656	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		657
597	delete $WIDGET{$self+0};	658	delete $WIDGET{$self+0};
598	#$self->deactivate;
599	}	659	}
600		660
601	#############################################################################	661	#############################################################################
602		662
603	package CFClient::UI::DrawBG;	663	package CFPlus::UI::DrawBG;
604		664
605	our @ISA = CFClient::UI::Base::;	665	our @ISA = CFPlus::UI::Base::;
606		666
607	use strict;	667	use strict;
608	use CFClient::OpenGL;	668	use CFPlus::OpenGL;
609		669
610	sub new {	670	sub new {
611	my $class = shift;	671	my $class = shift;
612		672
613	# range [value, low, high, page]	673	# range [value, low, high, page]
…		…
644	}	704	}
645	}	705	}
646		706
647	#############################################################################	707	#############################################################################
648		708
649	package CFClient::UI::Empty;	709	package CFPlus::UI::Empty;
650		710
651	our @ISA = CFClient::UI::Base::;	711	our @ISA = CFPlus::UI::Base::;
652		712
653	sub new {	713	sub new {
654	my ($class, %arg) = @_;	714	my ($class, %arg) = @_;
655	$class->SUPER::new (can_events => 0, %arg);	715	$class->SUPER::new (can_events => 0, %arg);
656	}	716	}
…		…
663		723
664	sub draw { }	724	sub draw { }
665		725
666	#############################################################################	726	#############################################################################
667		727
668	package CFClient::UI::Container;	728	package CFPlus::UI::Container;
669		729
670	our @ISA = CFClient::UI::Base::;	730	our @ISA = CFPlus::UI::Base::;
671		731
672	sub new {	732	sub new {
673	my ($class, %arg) = @_;	733	my ($class, %arg) = @_;
674		734
675	my $children = delete $arg{children};	735	my $children = delete $arg{children};
…		…
684	if $children;	744	if $children;
685		745
686	$self	746	$self
687	}	747	}
688		748
		749	sub realloc {
		750	my ($self) = @_;
		751
		752	$self->{force_realloc} = 1;
		753	$self->{force_size_alloc} = 1;
		754	$self->SUPER::realloc;
		755	}
		756
689	sub add {	757	sub add {
690	my ($self, @widgets) = @_;	758	my ($self, @widgets) = @_;
691		759
692	$_->set_parent ($self)	760	$_->set_parent ($self)
693	for @widgets;	761	for @widgets;
…		…
753	$_->draw for @{$self->{children}};	821	$_->draw for @{$self->{children}};
754	}	822	}
755		823
756	#############################################################################	824	#############################################################################
757		825
758	package CFClient::UI::Bin;	826	package CFPlus::UI::Bin;
759		827
760	our @ISA = CFClient::UI::Container::;	828	our @ISA = CFPlus::UI::Container::;
761		829
762	sub new {	830	sub new {
763	my ($class, %arg) = @_;	831	my ($class, %arg) = @_;
764		832
765	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	833	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766		834
767	$class->SUPER::new (children => [$child], %arg)	835	$class->SUPER::new (children => [$child], %arg)
768	}	836	}
769		837
770	sub add {	838	sub add {
771	my ($self, $child) = @_;	839	my ($self, $child) = @_;
772		840
773	$self->{children} = [];	841	$self->SUPER::remove ($_) for @{ $self->{children} };
774
775	$self->SUPER::add ($child);	842	$self->SUPER::add ($child);
776	}	843	}
777		844
778	sub remove {	845	sub remove {
779	my ($self, $widget) = @_;	846	my ($self, $widget) = @_;
780		847
781	$self->SUPER::remove ($widget);	848	$self->SUPER::remove ($widget);
782		849
783	$self->{children} = [new CFClient::UI::Empty]	850	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	851	unless @{$self->{children}};
785	}	852	}
786		853
787	sub child { $_[0]->{children}[0] }	854	sub child { $_[0]->{children}[0] }
788		855
789	sub size_request {	856	sub size_request {
790	$_[0]{children}[0]->size_request	857	$_[0]{children}[0]->size_request
791	}	858	}
792		859
793	sub size_allocate {	860	sub invoke_size_allocate {
794	my ($self, $w, $h) = @_;	861	my ($self, $w, $h) = @_;
795		862
796	$self->{children}[0]->configure (0, 0, $w, $h);	863	$self->{children}[0]->configure (0, 0, $w, $h);
		864
		865	1
797	}	866	}
798		867
799	#############################################################################	868	#############################################################################
800		869
801	# back-buffered drawing area	870	# back-buffered drawing area
802		871
803	package CFClient::UI::Window;	872	package CFPlus::UI::Window;
804		873
805	our @ISA = CFClient::UI::Bin::;	874	our @ISA = CFPlus::UI::Bin::;
806		875
807	use CFClient::OpenGL;	876	use CFPlus::OpenGL;
808		877
809	sub new {	878	sub new {
810	my ($class, %arg) = @_;	879	my ($class, %arg) = @_;
811		880
812	my $self = $class->SUPER::new (%arg);	881	my $self = $class->SUPER::new (%arg);
…		…
817		886
818	$ROOT->on_post_alloc ($self => sub { $self->render_child });	887	$ROOT->on_post_alloc ($self => sub { $self->render_child });
819	$self->SUPER::update;	888	$self->SUPER::update;
820	}	889	}
821		890
822	sub size_allocate {	891	sub invoke_size_allocate {
823	my ($self, $w, $h) = @_;	892	my ($self, $w, $h) = @_;
824		893
825	$self->SUPER::size_allocate ($w, $h);
826	$self->update;	894	$self->update;
		895
		896	$self->SUPER::invoke_size_allocate ($w, $h)
827	}	897	}
828		898
829	sub _render {	899	sub _render {
830	my ($self) = @_;	900	my ($self) = @_;
831		901
…		…
833	}	903	}
834		904
835	sub render_child {	905	sub render_child {
836	my ($self) = @_;	906	my ($self) = @_;
837		907
838	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	908	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
839	glClearColor 0, 0, 0, 0;	909	glClearColor 0, 0, 0, 0;
840	glClear GL_COLOR_BUFFER_BIT;	910	glClear GL_COLOR_BUFFER_BIT;
841		911
842	{	912	{
843	package CFClient::UI::Base;	913	package CFPlus::UI::Base;
844		914
845	($draw_x, $draw_y, $draw_w, $draw_h) =	915	local ($draw_x, $draw_y, $draw_w, $draw_h) =
846	(0, 0, $self->{w}, $self->{h});	916	(0, 0, $self->{w}, $self->{h});
		917
		918	$self->_render;
847	}	919	}
848
849	$self->_render;
850	};	920	};
851	}	921	}
852		922
853	sub _draw {	923	sub _draw {
854	my ($self) = @_;	924	my ($self) = @_;
855
856	my ($w, $h) = @$self{qw(w h)};
857		925
858	my $tex = $self->{texture}	926	my $tex = $self->{texture}
859	or return;	927	or return;
860		928
861	glEnable GL_TEXTURE_2D;	929	glEnable GL_TEXTURE_2D;
862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	930	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863	glColor 0, 0, 0, 1;	931	glColor 0, 0, 0, 1;
864		932
865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	933	$tex->draw_quad_alpha_premultiplied (0, 0);
866		934
867	glDisable GL_TEXTURE_2D;	935	glDisable GL_TEXTURE_2D;
868	}	936	}
869		937
870	#############################################################################	938	#############################################################################
871		939
872	package CFClient::UI::ViewPort;	940	package CFPlus::UI::ViewPort;
873		941
874	our @ISA = CFClient::UI::Window::;	942	our @ISA = CFPlus::UI::Window::;
875		943
876	sub new {	944	sub new {
877	my $class = shift;	945	my $class = shift;
878		946
879	$class->SUPER::new (	947	$class->SUPER::new (
…		…
892	$h = 10 if $self->{scroll_y};	960	$h = 10 if $self->{scroll_y};
893		961
894	($w, $h)	962	($w, $h)
895	}	963	}
896		964
897	sub size_allocate {	965	sub invoke_size_allocate {
898	my ($self, $w, $h) = @_;	966	my ($self, $w, $h) = @_;
899		967
900	my $child = $self->child;	968	my $child = $self->child;
901		969
902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	970	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	971	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904		972
905	$self->child->configure (0, 0, $w, $h);	973	$self->child->configure (0, 0, $w, $h);
906	$self->update;	974	$self->update;
		975
		976	1
907	}	977	}
908		978
909	sub set_offset {	979	sub set_offset {
910	my ($self, $x, $y) = @_;	980	my ($self, $x, $y) = @_;
911		981
…		…
937	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
939	) {	1009	) {
940	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1010	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941	} else {	1011	} else {
942	$self->CFClient::UI::Base::find_widget ($x, $y)	1012	$self->CFPlus::UI::Base::find_widget ($x, $y)
943	}	1013	}
944	}	1014	}
945		1015
946	sub _render {	1016	sub _render {
947	my ($self) = @_;	1017	my ($self) = @_;
948		1018
949	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1019	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};	1020	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951		1021
952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1022	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953		1023
954	$self->SUPER::_render;	1024	$self->SUPER::_render;
955	}	1025	}
956		1026
957	#############################################################################	1027	#############################################################################
958		1028
959	package CFClient::UI::ScrolledWindow;	1029	package CFPlus::UI::ScrolledWindow;
960		1030
961	our @ISA = CFClient::UI::HBox::;	1031	our @ISA = CFPlus::UI::HBox::;
962		1032
963	sub new {	1033	sub new {
964	my ($class, %arg) = @_;	1034	my ($class, %arg) = @_;
965		1035
966	my $child = delete $arg{child};	1036	my $child = delete $arg{child};
967		1037
968	my $self;	1038	my $self;
969		1039
970	my $slider = new CFClient::UI::Slider	1040	my $slider = new CFPlus::UI::Slider
971	vertical => 1,	1041	vertical => 1,
972	range => [0, 0, 1, 0.01], # HACK fix	1042	range => [0, 0, 1, 0.01], # HACK fix
973	on_changed => sub {	1043	on_changed => sub {
974	$self->{vp}->set_offset (0, $_[1]);	1044	$self->{vp}->set_offset (0, $_[1]);
975	},	1045	},
976	;	1046	;
977		1047
978	$self = $class->SUPER::new (	1048	$self = $class->SUPER::new (
979	vp => (new CFClient::UI::ViewPort expand => 1),	1049	vp => (new CFPlus::UI::ViewPort expand => 1),
		1050	can_events => 1,
980	slider => $slider,	1051	slider => $slider,
981	%arg,	1052	%arg,
982	);	1053	);
983		1054
984	$self->SUPER::add ($self->{vp}, $self->{slider});	1055	$self->SUPER::add ($self->{vp}, $self->{slider});
985	$self->add ($child) if $child;	1056	$self->add ($child) if $child;
986		1057
987	$self	1058	$self
988	}	1059	}
989		1060
		1061	#TODO# update range on size_allocate depending on child
		1062
990	sub add {	1063	sub add {
991	my ($self, $widget) = @_;	1064	my ($self, $widget) = @_;
992		1065
993	$self->{vp}->add ($self->{child} = $widget);	1066	$self->{vp}->add ($self->{child} = $widget);
994	}	1067	}
995		1068
		1069	sub invoke_mouse_wheel {
		1070	my ($self, $ev) = @_;
		1071
		1072	return 0 unless $ev->{dy}; # only vertical movements
		1073
		1074	$self->{slider}->emit (mouse_wheel => $ev);
		1075
		1076	1
		1077	}
		1078
		1079	sub update_slider {
		1080	my ($self) = @_;
		1081
		1082	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1083	}
		1084
996	sub update {	1085	sub update {
997	my ($self) = @_;	1086	my ($self) = @_;
998		1087
999	$self->SUPER::update;	1088	$self->SUPER::update;
1000		1089
1001	# todo: overwrite size_allocate of child	1090	$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	}	1091	}
1005		1092
1006	sub size_allocate {	1093	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1094	my ($self, $w, $h) = @_;
1008		1095
		1096	$self->update_slider;
		1097
1009	$self->SUPER::size_allocate ($w, $h);	1098	$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	}	1099	}
1014
1015	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll
1017		1100
1018	#############################################################################	1101	#############################################################################
1019		1102
1020	package CFClient::UI::Frame;	1103	package CFPlus::UI::Frame;
1021		1104
1022	our @ISA = CFClient::UI::Bin::;	1105	our @ISA = CFPlus::UI::Bin::;
1023		1106
1024	use CFClient::OpenGL;	1107	use CFPlus::OpenGL;
1025		1108
1026	sub new {	1109	sub new {
1027	my $class = shift;	1110	my $class = shift;
1028		1111
1029	$class->SUPER::new (	1112	$class->SUPER::new (
…		…
1055	$self->SUPER::_draw;	1138	$self->SUPER::_draw;
1056	}	1139	}
1057		1140
1058	#############################################################################	1141	#############################################################################
1059		1142
1060	package CFClient::UI::FancyFrame;	1143	package CFPlus::UI::FancyFrame;
1061		1144
1062	our @ISA = CFClient::UI::Bin::;	1145	our @ISA = CFPlus::UI::Bin::;
1063		1146
1064	use CFClient::OpenGL;	1147	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		1148
1074	sub new {	1149	sub new {
1075	my ($class, %arg) = @_;	1150	my ($class, %arg) = @_;
1076		1151
1077	my $title = delete $arg{title};	1152	if ((exists $arg{label}) && !ref $arg{label}) {
		1153	$arg{label} = new CFPlus::UI::Label
		1154	align => 1,
		1155	valign => 0,
		1156	text => $arg{label},
		1157	fontsize => ($arg{border} || 0.8) * 0.75;
		1158	}
		1159
		1160	my $self = $class->SUPER::new (
		1161	# label => "",
		1162	fg => [0.6, 0.3, 0.1],
		1163	border => 0.8,
		1164	style => 'single',
		1165	%arg,
		1166	);
		1167
		1168	$self
		1169	}
		1170
		1171	sub add {
		1172	my ($self, @widgets) = @_;
		1173
		1174	$self->SUPER::add (@widgets);
		1175	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1176	}
		1177
		1178	sub border {
		1179	int $_[0]{border} * $::FONTSIZE
		1180	}
		1181
		1182	sub size_request {
		1183	my ($self) = @_;
		1184
		1185	($self->{label_w}, undef) = $self->{label}->size_request
		1186	if $self->{label};
		1187
		1188	my ($w, $h) = $self->SUPER::size_request;
		1189
		1190	(
		1191	$w + $self->border * 2,
		1192	$h + $self->border * 2,
		1193	)
		1194	}
		1195
		1196	sub invoke_size_allocate {
		1197	my ($self, $w, $h) = @_;
		1198
		1199	my $border = $self->border;
		1200
		1201	$w -= List::Util::max 0, $border * 2;
		1202	$h -= List::Util::max 0, $border * 2;
		1203
		1204	if (my $label = $self->{label}) {
		1205	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1206	$label->{h} = List::Util::min $h, $border;
		1207	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1208	}
		1209
		1210	$self->child->configure ($border, $border, $w, $h);
		1211
		1212	1
		1213	}
		1214
		1215	sub _draw {
		1216	my ($self) = @_;
		1217
		1218	my $child = $self->{children}[0];
		1219
		1220	my $border = $self->border;
		1221	my ($w, $h) = ($self->{w}, $self->{h});
		1222
		1223	$child->draw;
		1224
		1225	glColor @{$self->{fg}};
		1226	glBegin GL_LINE_STRIP;
		1227	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1228	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1229	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1230	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1231	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1232	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1233	glEnd;
		1234
		1235	if ($self->{label}) {
		1236	glTranslate $border * 2, 0;
		1237	$self->{label}->_draw;
		1238	}
		1239	}
		1240
		1241	#############################################################################
		1242
		1243	package CFPlus::UI::Toplevel;
		1244
		1245	our @ISA = CFPlus::UI::Bin::;
		1246
		1247	use CFPlus::OpenGL;
		1248
		1249	my $bg =
		1250	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1251	mipmap => 1, wrap => 1;
		1252
		1253	my @border =
		1254	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1255	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1256
		1257	sub new {
		1258	my ($class, %arg) = @_;
1078		1259
1079	my $self = $class->SUPER::new (	1260	my $self = $class->SUPER::new (
1080	bg => [1, 1, 1, 1],	1261	bg => [1, 1, 1, 1],
1081	border_bg => [1, 1, 1, 1],	1262	border_bg => [1, 1, 1, 1],
1082	border => 0.6,	1263	border => 0.6,
1083	can_events => 1,	1264	can_events => 1,
1084	min_w => 16,	1265	min_w => 64,
1085	min_h => 16,	1266	min_h => 32,
1086	%arg,	1267	%arg,
1087	);	1268	);
1088		1269
1089	$self->{title} = new CFClient::UI::Label	1270	$self->{title_widget} = new CFPlus::UI::Label
1090	align => 0,	1271	align => 0,
1091	valign => 1,	1272	valign => 1,
1092	text => $title,	1273	text => $self->{title},
1093	fontsize => $self->{border}	1274	fontsize => $self->{border},
1094	if defined $title;	1275	if exists $self->{title};
		1276
		1277	if ($self->{has_close_button}) {
		1278	$self->{close_button} =
		1279	new CFPlus::UI::ImageButton
		1280	path => 'x1_close.png',
		1281	on_activate => sub { $self->emit ("delete") };
		1282
		1283	$self->CFPlus::UI::Container::add ($self->{close_button});
		1284	}
1095		1285
1096	$self	1286	$self
1097	}	1287	}
1098		1288
1099	sub add {	1289	sub add {
1100	my ($self, @widgets) = @_;	1290	my ($self, @widgets) = @_;
1101		1291
1102	$self->SUPER::add (@widgets);	1292	$self->SUPER::add (@widgets);
		1293	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1294	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104	}	1295	}
1105		1296
1106	sub border {	1297	sub border {
1107	int $_[0]{border} * $::FONTSIZE	1298	int $_[0]{border} * $::FONTSIZE
1108	}	1299	}
1109		1300
1110	sub size_request {	1301	sub size_request {
1111	my ($self) = @_;	1302	my ($self) = @_;
1112		1303
1113	$self->{title}->size_request	1304	$self->{title_widget}->size_request
1114	if $self->{title};	1305	if $self->{title_widget};
		1306
		1307	$self->{close_button}->size_request
		1308	if $self->{close_button};
1115		1309
1116	my ($w, $h) = $self->SUPER::size_request;	1310	my ($w, $h) = $self->SUPER::size_request;
1117		1311
1118	(	1312	(
1119	$w + $self->border * 2,	1313	$w + $self->border * 2,
1120	$h + $self->border * 2,	1314	$h + $self->border * 2,
1121	)	1315	)
1122	}	1316	}
1123		1317
1124	sub size_allocate {	1318	sub invoke_size_allocate {
1125	my ($self, $w, $h) = @_;	1319	my ($self, $w, $h) = @_;
1126		1320
1127	if ($self->{title}) {	1321	if ($self->{title_widget}) {
1128	$self->{title}{w} = $w;	1322	$self->{title_widget}{w} = $w;
1129	$self->{title}{h} = $h;	1323	$self->{title_widget}{h} = $h;
1130	$self->{title}->size_allocate ($w, $h);	1324	$self->{title_widget}->invoke_size_allocate ($w, $h);
1131	}	1325	}
1132		1326
1133	my $border = $self->border;	1327	my $border = $self->border;
1134		1328
1135	$h -= List::Util::max 0, $border * 2;	1329	$h -= List::Util::max 0, $border * 2;
1136	$w -= List::Util::max 0, $border * 2;	1330	$w -= List::Util::max 0, $border * 2;
		1331
		1332	$self->child->configure ($border, $border, $w, $h);
		1333
		1334	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1335	if $self->{close_button};
		1336
		1337	1
		1338	}
		1339
		1340	sub invoke_delete {
		1341	my ($self) = @_;
		1342
		1343	$self->hide;
1137		1344
1138	$self->child->configure ($border, $border, $w, $h);	1345	1
1139	}	1346	}
1140		1347
1141	sub button_down {	1348	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1349	my ($self, $ev, $x, $y) = @_;
1143		1350
1144	my ($w, $h) = @$self{qw(w h)};	1351	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1352	my $border = $self->border;
1146		1353
…		…
1177		1384
1178	($x, $y) = ($ev->{x}, $ev->{y});	1385	($x, $y) = ($ev->{x}, $ev->{y});
1179		1386
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1387	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1388	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1389	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1390	};
1184	} else {	1391	} else {
1185	return 0;	1392	return 0;
1186	}	1393	}
1187		1394
1188	1	1395	1
1189	}	1396	}
1190		1397
1191	sub button_up {	1398	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1399	my ($self, $ev, $x, $y) = @_;
1193		1400
1194	!!delete $self->{motion}	1401	! ! delete $self->{motion}
1195	}	1402	}
1196		1403
1197	sub mouse_motion {	1404	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1405	my ($self, $ev, $x, $y) = @_;
1199		1406
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1407	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1408
1202	!!$self->{motion}	1409	! ! $self->{motion}
		1410	}
		1411
		1412	sub invoke_visibility_change {
		1413	my ($self, $visible) = @_;
		1414
		1415	delete $self->{motion} unless $visible;
		1416
		1417	0
1203	}	1418	}
1204		1419
1205	sub _draw {	1420	sub _draw {
1206	my ($self) = @_;	1421	my ($self) = @_;
1207		1422
…		…
1233		1448
1234	glDisable GL_TEXTURE_2D;	1449	glDisable GL_TEXTURE_2D;
1235		1450
1236	$child->draw;	1451	$child->draw;
1237		1452
1238	if ($self->{title}) {	1453	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1454	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1455	$self->{title_widget}->_draw;
		1456
		1457	glTranslate 0, - ($border - $self->{h});
1241	}	1458	}
		1459
		1460	$self->{close_button}->draw
		1461	if $self->{close_button};
1242	}	1462	}
1243		1463
1244	#############################################################################	1464	#############################################################################
1245		1465
1246	package CFClient::UI::Table;	1466	package CFPlus::UI::Table;
1247		1467
1248	our @ISA = CFClient::UI::Base::;	1468	our @ISA = CFPlus::UI::Base::;
1249		1469
1250	use List::Util qw(max sum);	1470	use List::Util qw(max sum);
1251		1471
1252	use CFClient::OpenGL;	1472	use CFPlus::OpenGL;
1253		1473
1254	sub new {	1474	sub new {
1255	my $class = shift;	1475	my $class = shift;
1256		1476
1257	$class->SUPER::new (	1477	$class->SUPER::new (
…		…
1263	sub children {	1483	sub children {
1264	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1484	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265	}	1485	}
1266		1486
1267	sub add {	1487	sub add {
1268	my ($self, $x, $y, $child) = @_;	1488	my ($self) = shift;
1269		1489
		1490	while (@_) {
		1491	my ($x, $y, $child) = splice @_, 0, 3, ();
1270	$child->set_parent ($self);	1492	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;	1493	$self->{children}[$y][$x] = $child;
		1494	}
1272		1495
		1496	$self->{force_realloc} = 1;
		1497	$self->{force_size_alloc} = 1;
1273	$self->realloc;	1498	$self->realloc;
		1499	}
		1500
		1501	sub remove {
		1502	my ($self, $child) = @_;
		1503
		1504	# TODO: not yet implemented
1274	}	1505	}
1275		1506
1276	# TODO: move to container class maybe? send children a signal on removal?	1507	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {	1508	sub clear {
1278	my ($self) = @_;	1509	my ($self) = @_;
…		…
1319	(sum @$ws),	1550	(sum @$ws),
1320	(sum @$hs),	1551	(sum @$hs),
1321	)	1552	)
1322	}	1553	}
1323		1554
1324	sub size_allocate {	1555	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1556	my ($self, $w, $h) = @_;
1326		1557
1327	my ($ws, $hs) = $self->get_wh;	1558	my ($ws, $hs) = $self->get_wh;
1328		1559
1329	my $req_w = (sum @$ws) || 1;	1560	my $req_w = (sum @$ws) || 1;
…		…
1336		1567
1337	# linearly scale sizes	1568	# linearly scale sizes
1338	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1569	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1570	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340		1571
1341	CFClient::UI::harmonize $ws;	1572	CFPlus::UI::harmonize $ws;
1342	CFClient::UI::harmonize $hs;	1573	CFPlus::UI::harmonize $hs;
1343		1574
1344	my $y;	1575	my $y;
1345		1576
1346	for my $r (0 .. $#{$self->{children}}) {	1577	for my $r (0 .. $#{$self->{children}}) {
1347	my $row = $self->{children}[$r]	1578	my $row = $self->{children}[$r]
…		…
1361	}	1592	}
1362		1593
1363	$y += $row_h;	1594	$y += $row_h;
1364	}	1595	}
1365		1596
		1597	1
1366	}	1598	}
1367		1599
1368	sub find_widget {	1600	sub find_widget {
1369	my ($self, $x, $y) = @_;	1601	my ($self, $x, $y) = @_;
1370		1602
…		…
1389	}	1621	}
1390	}	1622	}
1391		1623
1392	#############################################################################	1624	#############################################################################
1393		1625
1394	package CFClient::UI::Box;	1626	package CFPlus::UI::Box;
1395		1627
1396	our @ISA = CFClient::UI::Container::;	1628	our @ISA = CFPlus::UI::Container::;
1397		1629
1398	sub size_request {	1630	sub size_request {
1399	my ($self) = @_;	1631	my ($self) = @_;
1400		1632
1401	$self->{vertical}	1633	$self->{vertical}
…		…
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1639	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1640	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1409	)	1641	)
1410	}	1642	}
1411		1643
1412	sub size_allocate {	1644	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1645	my ($self, $w, $h) = @_;
1414		1646
1415	my $space = $self->{vertical} ? $h : $w;	1647	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1648	my @children = $self->visible_children;
1417		1649
1418	my @req;	1650	my @req;
1419		1651
1420	if ($self->{homogeneous}) {	1652	if ($self->{homogeneous}) {
1421	@req = ($space / (@$children || 1)) x @$children;	1653	@req = ($space / (@children || 1)) x @children;
1422	} else {	1654	} else {
1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1655	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424	my $req = List::Util::sum @req;	1656	my $req = List::Util::sum @req;
1425		1657
1426	if ($req > $space) {	1658	if ($req > $space) {
1427	# ah well, not enough space	1659	# ah well, not enough space
1428	$_ *= $space / $req for @req;	1660	$_ *= $space / $req for @req;
1429	} else {	1661	} else {
1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1662	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431		1663
1432	$space = ($space - $req) / $expand; # remaining space to give away	1664	$space = ($space - $req) / $expand; # remaining space to give away
1433		1665
1434	$req[$_] += $space * $children->[$_]{expand}	1666	$req[$_] += $space * $children[$_]{expand}
1435	for 0 .. $#$children;	1667	for 0 .. $#children;
1436	}	1668	}
1437	}	1669	}
1438		1670
1439	CFClient::UI::harmonize \@req;	1671	CFPlus::UI::harmonize \@req;
1440		1672
1441	my $pos = 0;	1673	my $pos = 0;
1442	for (0 .. $#$children) {	1674	for (0 .. $#children) {
1443	my $alloc = $req[$_];	1675	my $alloc = $req[$_];
1444	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1676	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445		1677
1446	$pos += $alloc;	1678	$pos += $alloc;
1447	}	1679	}
1448		1680
1449	1	1681	1
1450	}	1682	}
1451		1683
1452	#############################################################################	1684	#############################################################################
1453		1685
1454	package CFClient::UI::HBox;	1686	package CFPlus::UI::HBox;
1455		1687
1456	our @ISA = CFClient::UI::Box::;	1688	our @ISA = CFPlus::UI::Box::;
1457		1689
1458	sub new {	1690	sub new {
1459	my $class = shift;	1691	my $class = shift;
1460		1692
1461	$class->SUPER::new (	1693	$class->SUPER::new (
…		…
1464	)	1696	)
1465	}	1697	}
1466		1698
1467	#############################################################################	1699	#############################################################################
1468		1700
1469	package CFClient::UI::VBox;	1701	package CFPlus::UI::VBox;
1470		1702
1471	our @ISA = CFClient::UI::Box::;	1703	our @ISA = CFPlus::UI::Box::;
1472		1704
1473	sub new {	1705	sub new {
1474	my $class = shift;	1706	my $class = shift;
1475		1707
1476	$class->SUPER::new (	1708	$class->SUPER::new (
…		…
1479	)	1711	)
1480	}	1712	}
1481		1713
1482	#############################################################################	1714	#############################################################################
1483		1715
1484	package CFClient::UI::Label;	1716	package CFPlus::UI::Label;
1485		1717
1486	our @ISA = CFClient::UI::DrawBG::;	1718	our @ISA = CFPlus::UI::DrawBG::;
1487		1719
1488	use CFClient::OpenGL;	1720	use CFPlus::OpenGL;
1489		1721
1490	sub new {	1722	sub new {
1491	my ($class, %arg) = @_;	1723	my ($class, %arg) = @_;
1492		1724
1493	my $self = $class->SUPER::new (	1725	my $self = $class->SUPER::new (
…		…
1496	#active_bg => none	1728	#active_bg => none
1497	#font => default_font	1729	#font => default_font
1498	#text => initial text	1730	#text => initial text
1499	#markup => initial narkup	1731	#markup => initial narkup
1500	#max_w => maximum pixel width	1732	#max_w => maximum pixel width
		1733	#style => 0, # render flags
1501	ellipsise => 3, # end	1734	ellipsise => 3, # end
1502	layout => (new CFClient::Layout),	1735	layout => (new CFPlus::Layout),
1503	fontsize => 1,	1736	fontsize => 1,
1504	align => -1,	1737	align => -1,
1505	valign => -1,	1738	valign => -1,
1506	padding_x => 2,	1739	padding_x => 2,
1507	padding_y => 2,	1740	padding_y => 2,
1508	can_events => 0,	1741	can_events => 0,
1509	%arg	1742	%arg
1510	);	1743	);
1511		1744
1512	if (exists $self->{template}) {	1745	if (exists $self->{template}) {
1513	my $layout = new CFClient::Layout;	1746	my $layout = new CFPlus::Layout;
1514	$layout->set_text (delete $self->{template});	1747	$layout->set_text (delete $self->{template});
1515	$self->{template} = $layout;	1748	$self->{template} = $layout;
1516	}	1749	}
1517		1750
1518	if (exists $self->{markup}) {	1751	if (exists $self->{markup}) {
…		…
1522	}	1755	}
1523		1756
1524	$self	1757	$self
1525	}	1758	}
1526		1759
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 {	1760	sub update {
1538	my ($self) = @_;	1761	my ($self) = @_;
1539		1762
1540	delete $self->{texture};	1763	delete $self->{texture};
1541	$self->SUPER::update;	1764	$self->SUPER::update;
…		…
1552	my ($self, $text) = @_;	1775	my ($self, $text) = @_;
1553		1776
1554	return if $self->{text} eq "T$text";	1777	return if $self->{text} eq "T$text";
1555	$self->{text} = "T$text";	1778	$self->{text} = "T$text";
1556		1779
1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558	$self->{layout}->set_text ($text);	1780	$self->{layout}->set_text ($text);
		1781
1559	delete $self->{req_h};	1782	delete $self->{size_req};
1560
1561	$self->realloc;	1783	$self->realloc;
1562	$self->update;	1784	$self->update;
1563	}	1785	}
1564		1786
1565	sub set_markup {	1787	sub set_markup {
…		…
1568	return if $self->{text} eq "M$markup";	1790	return if $self->{text} eq "M$markup";
1569	$self->{text} = "M$markup";	1791	$self->{text} = "M$markup";
1570		1792
1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1793	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572		1794
1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574	$self->{layout}->set_markup ($markup);	1795	$self->{layout}->set_markup ($markup);
		1796
1575	delete $self->{req_h};	1797	delete $self->{size_req};
1576
1577	$self->realloc;	1798	$self->realloc;
1578	$self->update;	1799	$self->update;
1579	}	1800	}
1580		1801
1581	sub size_request {	1802	sub size_request {
1582	my ($self) = @_;	1803	my ($self) = @_;
1583		1804
1584	if (exists $self->{req_h}) {	1805	$self->{size_req} ||= do {
1585	@$self{qw(req_w req_h)}
1586	} else {
1587	$self->{layout}->set_font ($self->{font}) if $self->{font};	1806	$self->{layout}->set_font ($self->{font}) if $self->{font};
1588	$self->{layout}->set_width ($self->{max_w} || -1);	1807	$self->{layout}->set_width ($self->{max_w} || -1);
1589	$self->{layout}->set_ellipsise ($self->{ellipsise});	1808	$self->{layout}->set_ellipsise ($self->{ellipsise});
1590	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1809	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1810	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592		1811
1593	my ($w, $h) = $self->{layout}->size;	1812	my ($w, $h) = $self->{layout}->size;
1594		1813
1595	if (exists $self->{template}) {	1814	if (exists $self->{template}) {
1596	$self->{template}->set_font ($self->{font}) if $self->{font};	1815	$self->{template}->set_font ($self->{font}) if $self->{font};
		1816	$self->{template}->set_width ($self->{max_w} || -1);
1597	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1817	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598		1818
1599	my ($w2, $h2) = $self->{template}->size;	1819	my ($w2, $h2) = $self->{template}->size;
1600		1820
1601	$w = List::Util::max $w, $w2;	1821	$w = List::Util::max $w, $w2;
1602	$h = List::Util::max $h, $h2;	1822	$h = List::Util::max $h, $h2;
1603	}	1823	}
1604		1824
1605	($w, $h)	1825	[$w, $h]
1606	}	1826	};
1607	}
1608		1827
		1828	@{ $self->{size_req} }
		1829	}
		1830
		1831	sub baseline_shift {
		1832	$_[0]{layout}->descent
		1833	}
		1834
1609	sub size_allocate {	1835	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	1836	my ($self, $w, $h) = @_;
1611		1837
1612	delete $self->{ox};	1838	delete $self->{ox};
1613		1839
1614	delete $self->{texture}	1840	delete $self->{texture}
1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1841	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1842
		1843	1
1616	}	1844	}
1617		1845
1618	sub set_fontsize {	1846	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	1847	my ($self, $fontsize) = @_;
1620		1848
1621	$self->{fontsize} = $fontsize;	1849	$self->{fontsize} = $fontsize;
		1850	delete $self->{size_req};
1622	delete $self->{texture};	1851	delete $self->{texture};
1623		1852
1624	$self->realloc;	1853	$self->realloc;
1625	}	1854	}
1626		1855
		1856	sub reconfigure {
		1857	my ($self) = @_;
		1858
		1859	delete $self->{size_req};
		1860	delete $self->{texture};
		1861
		1862	$self->SUPER::reconfigure;
		1863	}
		1864
1627	sub _draw {	1865	sub _draw {
1628	my ($self) = @_;	1866	my ($self) = @_;
1629		1867
1630	$self->SUPER::_draw; # draw background, if applicable	1868	$self->SUPER::_draw; # draw background, if applicable
1631		1869
1632	my $tex = $self->{texture} ||= do {	1870	my $size = $self->{texture} ||= do {
1633	$self->{layout}->set_foreground (@{$self->{fg}});	1871	$self->{layout}->set_foreground (@{$self->{fg}});
1634	$self->{layout}->set_font ($self->{font}) if $self->{font};	1872	$self->{layout}->set_font ($self->{font}) if $self->{font};
1635	$self->{layout}->set_width ($self->{w});	1873	$self->{layout}->set_width ($self->{w});
1636	$self->{layout}->set_ellipsise ($self->{ellipsise});	1874	$self->{layout}->set_ellipsise ($self->{ellipsise});
1637	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1875	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1876	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639		1877
1640	new_from_layout CFClient::Texture $self->{layout}	1878	[$self->{layout}->size]
1641	};	1879	};
1642		1880
1643	unless (exists $self->{ox}) {	1881	unless (exists $self->{ox}) {
1644	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1882	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1883	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646	: ($self->{w} - $tex->{w}) * 0.5);	1884	: ($self->{w} - $size->[0]) * 0.5);
1647		1885
1648	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1886	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1887	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650	: ($self->{h} - $tex->{h}) * 0.5);	1888	: ($self->{h} - $size->[1]) * 0.5);
1651	};	1889	};
1652		1890
1653	glEnable GL_TEXTURE_2D;	1891	my $w = List::Util::min $self->{w} + 4, $size->[0];
1654	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1892	my $h = List::Util::min $self->{h} + 2, $size->[1];
1655		1893
1656	glColor_premultiply @{$self->{fg}}	1894	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1657	if $tex->{format} == GL_ALPHA;
1658
1659	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1660
1661	glDisable GL_TEXTURE_2D;
1662	}	1895	}
1663		1896
1664	#############################################################################	1897	#############################################################################
1665		1898
1666	package CFClient::UI::EntryBase;	1899	package CFPlus::UI::EntryBase;
1667		1900
1668	our @ISA = CFClient::UI::Label::;	1901	our @ISA = CFPlus::UI::Label::;
1669		1902
1670	use CFClient::OpenGL;	1903	use CFPlus::OpenGL;
1671		1904
1672	sub new {	1905	sub new {
1673	my $class = shift;	1906	my $class = shift;
1674		1907
1675	$class->SUPER::new (	1908	$class->SUPER::new (
…		…
1679	active_fg => [0, 0, 0],	1912	active_fg => [0, 0, 0],
1680	can_hover => 1,	1913	can_hover => 1,
1681	can_focus => 1,	1914	can_focus => 1,
1682	valign => 0,	1915	valign => 0,
1683	can_events => 1,	1916	can_events => 1,
		1917	ellipsise => 0,
1684	#text => ...	1918	#text => ...
		1919	#hidden => "*",
1685	@_	1920	@_
1686	)	1921	)
1687	}	1922	}
1688		1923
1689	sub _set_text {	1924	sub _set_text {
…		…
1696	$self->{last_activity} = $::NOW;	1931	$self->{last_activity} = $::NOW;
1697	$self->{text} = $text;	1932	$self->{text} = $text;
1698		1933
1699	$text =~ s/./*/g if $self->{hidden};	1934	$text =~ s/./*/g if $self->{hidden};
1700	$self->{layout}->set_text ("$text ");	1935	$self->{layout}->set_text ("$text ");
1701	delete $self->{req_h};	1936	delete $self->{size_req};
1702		1937
1703	$self->_emit (changed => $self->{text});	1938	$self->emit (changed => $self->{text});
1704		1939
1705	$self->realloc;	1940	$self->realloc;
1706	$self->update;	1941	$self->update;
1707	}	1942	}
1708		1943
…		…
1723	my ($w, $h) = $self->SUPER::size_request;	1958	my ($w, $h) = $self->SUPER::size_request;
1724		1959
1725	($w + 1, $h) # add 1 for cursor	1960	($w + 1, $h) # add 1 for cursor
1726	}	1961	}
1727		1962
1728	sub key_down {	1963	sub invoke_key_down {
1729	my ($self, $ev) = @_;	1964	my ($self, $ev) = @_;
1730		1965
1731	my $mod = $ev->{mod};	1966	my $mod = $ev->{mod};
1732	my $sym = $ev->{sym};	1967	my $sym = $ev->{sym};
1733	my $uni = $ev->{unicode};	1968	my $uni = $ev->{unicode};
…		…
1736		1971
1737	if ($uni == 8) {	1972	if ($uni == 8) {
1738	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1739	} elsif ($uni == 127) {	1974	} elsif ($uni == 127) {
1740	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1741	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1742	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1743	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1744	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1745	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
		1981	# what a hack
		1982	$self->{cursor} =
		1983	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1984	? length $1
		1985	: 0;
		1986	} elsif ($sym == CFPlus::SDLK_END) {
		1987	# uh, again
		1988	$self->{cursor} =
		1989	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1990	? $self->{cursor} + length $1
		1991	: length $self->{text};
		1992	} elsif ($uni == 21) { # ctrl-u
		1993	$text = "";
1746	$self->{cursor} = 0;	1994	$self->{cursor} = 0;
1747	} elsif ($sym == CFClient::SDLK_END) {
1748	$self->{cursor} = length $text;
1749	} elsif ($uni == 27) {	1995	} elsif ($uni == 27) {
1750	$self->_emit ('escape');	1996	$self->emit ('escape');
1751	} elsif ($uni) {	1997	} elsif ($uni == 0x0d) {
		1998	substr $text, $self->{cursor}++, 0, "\012";
		1999	} elsif ($uni >= 0x20) {
1752	substr $text, $self->{cursor}++, 0, chr $uni;	2000	substr $text, $self->{cursor}++, 0, chr $uni;
1753	} else {	2001	} else {
1754	return 0;	2002	return 0;
1755	}	2003	}
1756		2004
1757	$self->_set_text ($text);	2005	$self->_set_text ($text);
1758		2006
1759	$self->realloc;	2007	$self->realloc;
		2008	$self->update;
1760		2009
1761	1	2010	1
1762	}	2011	}
1763		2012
1764	sub focus_in {	2013	sub invoke_focus_in {
1765	my ($self) = @_;	2014	my ($self) = @_;
1766		2015
1767	$self->{last_activity} = $::NOW;	2016	$self->{last_activity} = $::NOW;
1768		2017
1769	$self->SUPER::focus_in;	2018	$self->SUPER::invoke_focus_in
1770	}	2019	}
1771		2020
1772	sub button_down {	2021	sub invoke_button_down {
1773	my ($self, $ev, $x, $y) = @_;	2022	my ($self, $ev, $x, $y) = @_;
1774		2023
1775	$self->SUPER::button_down ($ev, $x, $y);	2024	$self->SUPER::invoke_button_down ($ev, $x, $y);
1776		2025
1777	my $idx = $self->{layout}->xy_to_index ($x, $y);	2026	my $idx = $self->{layout}->xy_to_index ($x, $y);
1778		2027
1779	# byte-index to char-index	2028	# byte-index to char-index
1780	my $text = $self->{text};	2029	my $text = $self->{text};
1781	utf8::encode $text;	2030	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1782	$self->{cursor} = length substr $text, 0, $idx;	2031	$self->{cursor} = length $text;
1783		2032
1784	$self->_set_text ($self->{text});	2033	$self->_set_text ($self->{text});
1785	$self->update;	2034	$self->update;
1786		2035
1787	1	2036	1
1788	}	2037	}
1789		2038
1790	sub mouse_motion {	2039	sub invoke_mouse_motion {
1791	my ($self, $ev, $x, $y) = @_;	2040	my ($self, $ev, $x, $y) = @_;
1792	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2041	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1793		2042
1794	0	2043	1
1795	}	2044	}
1796		2045
1797	sub _draw {	2046	sub _draw {
1798	my ($self) = @_;	2047	my ($self) = @_;
1799		2048
…		…
1826	utf8::encode $text;	2075	utf8::encode $text;
1827		2076
1828	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2077	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1829	}	2078	}
1830		2079
1831	glColor @{$self->{fg}};
1832	glBegin GL_LINES;	2080	glBegin GL_LINES;
1833	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2081	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1834	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2082	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1835	glEnd;	2083	glEnd;
1836	}	2084	}
1837	}	2085	}
1838		2086
		2087	#############################################################################
		2088
1839	package CFClient::UI::Entry;	2089	package CFPlus::UI::Entry;
1840		2090
1841	our @ISA = CFClient::UI::EntryBase::;	2091	our @ISA = CFPlus::UI::EntryBase::;
1842		2092
1843	use CFClient::OpenGL;	2093	use CFPlus::OpenGL;
1844		2094
1845	sub key_down {	2095	sub invoke_key_down {
1846	my ($self, $ev) = @_;	2096	my ($self, $ev) = @_;
1847		2097
1848	my $sym = $ev->{sym};	2098	my $sym = $ev->{sym};
1849		2099
1850	if ($sym == 13) {	2100	if ($ev->{uni} == 0x0d || $sym == 13) {
1851	unshift @{$self->{history}},	2101	unshift @{$self->{history}},
1852	my $txt = $self->get_text;	2102	my $txt = $self->get_text;
		2103
1853	$self->{history_pointer} = -1;	2104	$self->{history_pointer} = -1;
1854	$self->{history_saveback} = '';	2105	$self->{history_saveback} = '';
1855	$self->_emit (activate => $txt);	2106	$self->emit (activate => $txt);
1856	$self->update;	2107	$self->update;
1857		2108
1858	} elsif ($sym == CFClient::SDLK_UP) {	2109	} elsif ($sym == CFPlus::SDLK_UP) {
1859	if ($self->{history_pointer} < 0) {	2110	if ($self->{history_pointer} < 0) {
1860	$self->{history_saveback} = $self->get_text;	2111	$self->{history_saveback} = $self->get_text;
1861	}	2112	}
1862	if (@{$self->{history} || []} > 0) {	2113	if (@{$self->{history} || []} > 0) {
1863	$self->{history_pointer}++;	2114	$self->{history_pointer}++;
…		…
1865	$self->{history_pointer} = @{$self->{history} || []} - 1;	2116	$self->{history_pointer} = @{$self->{history} || []} - 1;
1866	}	2117	}
1867	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2118	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1868	}	2119	}
1869		2120
1870	} elsif ($sym == CFClient::SDLK_DOWN) {	2121	} elsif ($sym == CFPlus::SDLK_DOWN) {
1871	$self->{history_pointer}--;	2122	$self->{history_pointer}--;
1872	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2123	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1873		2124
1874	if ($self->{history_pointer} >= 0) {	2125	if ($self->{history_pointer} >= 0) {
1875	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2126	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1876	} else {	2127	} else {
1877	$self->set_text ($self->{history_saveback});	2128	$self->set_text ($self->{history_saveback});
1878	}	2129	}
1879		2130
1880	} else {	2131	} else {
1881	return $self->SUPER::key_down ($ev)	2132	return $self->SUPER::invoke_key_down ($ev)
1882	}	2133	}
1883		2134
1884	1	2135	1
1885	}	2136	}
1886		2137
1887	#############################################################################	2138	#############################################################################
1888		2139
		2140	package CFPlus::UI::TextEdit;
		2141
		2142	our @ISA = CFPlus::UI::EntryBase::;
		2143
		2144	use CFPlus::OpenGL;
		2145
		2146	sub move_cursor_ver {
		2147	my ($self, $dy) = @_;
		2148
		2149	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2150
		2151	$y += $dy;
		2152
		2153	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2154	$self->{cursor} = $index;
		2155	delete $self->{cur_h};
		2156	$self->update;
		2157	return;
		2158	}
		2159	}
		2160
		2161	sub invoke_key_down {
		2162	my ($self, $ev) = @_;
		2163
		2164	my $sym = $ev->{sym};
		2165
		2166	if ($sym == CFPlus::SDLK_UP) {
		2167	$self->move_cursor_ver (-1);
		2168	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2169	$self->move_cursor_ver (+1);
		2170	} else {
		2171	return $self->SUPER::invoke_key_down ($ev)
		2172	}
		2173
		2174	1
		2175	}
		2176
		2177	#############################################################################
		2178
1889	package CFClient::UI::Button;	2179	package CFPlus::UI::Button;
1890		2180
1891	our @ISA = CFClient::UI::Label::;	2181	our @ISA = CFPlus::UI::Label::;
1892		2182
1893	use CFClient::OpenGL;	2183	use CFPlus::OpenGL;
1894		2184
1895	my @tex =	2185	my @tex =
1896	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1897	qw(b1_button_active.png);	2187	qw(b1_button_active.png);
1898		2188
1899	sub new {	2189	sub new {
1900	my $class = shift;	2190	my $class = shift;
1901		2191
…		…
1910	can_events => 1,	2200	can_events => 1,
1911	@_	2201	@_
1912	)	2202	)
1913	}	2203	}
1914		2204
1915	sub activate { }
1916
1917	sub button_up {	2205	sub invoke_button_up {
1918	my ($self, $ev, $x, $y) = @_;	2206	my ($self, $ev, $x, $y) = @_;
1919		2207
1920	$self->emit ("activate")	2208	$self->emit ("activate")
1921	if $x >= 0 && $x < $self->{w}	2209	if $x >= 0 && $x < $self->{w}
1922	&& $y >= 0 && $y < $self->{h};	2210	&& $y >= 0 && $y < $self->{h};
…		…
1940	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
1941	}	2229	}
1942		2230
1943	#############################################################################	2231	#############################################################################
1944		2232
1945	package CFClient::UI::CheckBox;	2233	package CFPlus::UI::CheckBox;
1946		2234
1947	our @ISA = CFClient::UI::DrawBG::;	2235	our @ISA = CFPlus::UI::DrawBG::;
1948		2236
1949	my @tex =	2237	my @tex =
1950	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2238	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2239	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1952		2240
1953	use CFClient::OpenGL;	2241	use CFPlus::OpenGL;
1954		2242
1955	sub new {	2243	sub new {
1956	my $class = shift;	2244	my $class = shift;
1957		2245
1958	$class->SUPER::new (	2246	$class->SUPER::new (
…		…
1972	my ($self) = @_;	2260	my ($self) = @_;
1973		2261
1974	(6) x 2	2262	(6) x 2
1975	}	2263	}
1976		2264
		2265	sub toggle {
		2266	my ($self) = @_;
		2267
		2268	$self->{state} = !$self->{state};
		2269	$self->emit (changed => $self->{state});
		2270	$self->update;
		2271	}
		2272
1977	sub button_down {	2273	sub invoke_button_down {
1978	my ($self, $ev, $x, $y) = @_;	2274	my ($self, $ev, $x, $y) = @_;
1979		2275
1980	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2276	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1981	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2277	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1982	$self->{state} = !$self->{state};	2278	$self->toggle;
1983	$self->_emit (changed => $self->{state});
1984	} else {	2279	} else {
1985	return 0	2280	return 0
1986	}	2281	}
1987		2282
1988	1	2283	1
…		…
2008	glDisable GL_TEXTURE_2D;	2303	glDisable GL_TEXTURE_2D;
2009	}	2304	}
2010		2305
2011	#############################################################################	2306	#############################################################################
2012		2307
2013	package CFClient::UI::Image;	2308	package CFPlus::UI::Image;
2014		2309
2015	our @ISA = CFClient::UI::Base::;	2310	our @ISA = CFPlus::UI::Base::;
2016		2311
2017	use CFClient::OpenGL;	2312	use CFPlus::OpenGL;
2018	use Carp qw/confess/;
2019		2313
2020	our %loaded_images;	2314	our %texture_cache;
2021		2315
2022	sub new {	2316	sub new {
2023	my $class = shift;	2317	my $class = shift;
2024		2318
2025	my $self = $class->SUPER::new (can_events => 0, @_);	2319	my $self = $class->SUPER::new (
		2320	can_events => 0,
		2321	@_,
		2322	);
2026		2323
2027	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2324	$self->{path} || $self->{tex}
		2325	or Carp::croak "'path' or 'tex' attributes required";
2028		2326
2029	$loaded_images{$self->{image}} ||=	2327	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2030	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2328	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2031		2329
2032	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2330	CFPlus::weaken $texture_cache{$self->{path}};
2033		2331
2034	Scalar::Util::weaken $loaded_images{$self->{image}};	2332	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2035
2036	$self->{aspect} = $tex->{w} / $tex->{h};
2037		2333
2038	$self	2334	$self
2039	}	2335	}
2040		2336
		2337	sub STORABLE_freeze {
		2338	my ($self, $cloning) = @_;
		2339
		2340	$self->{path}
		2341	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2342
		2343	$self->{path}
		2344	}
		2345
		2346	sub STORABLE_attach {
		2347	my ($self, $cloning, $path) = @_;
		2348
		2349	$self->new (path => $path)
		2350	}
		2351
2041	sub size_request {	2352	sub size_request {
2042	my ($self) = @_;	2353	my ($self) = @_;
2043		2354
2044	($self->{tex}->{w}, $self->{tex}->{h})	2355	($self->{tex}{w}, $self->{tex}{h})
2045	}	2356	}
2046		2357
2047	sub _draw {	2358	sub _draw {
2048	my ($self) = @_;	2359	my ($self) = @_;
2049		2360
…		…
2059	}	2370	}
2060		2371
2061	glEnable GL_TEXTURE_2D;	2372	glEnable GL_TEXTURE_2D;
2062	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2373	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2063		2374
2064	$tex->draw_quad_alpha (0, 0, $w, $h);	2375	$tex->draw_quad (0, 0, $w, $h);
2065		2376
2066	glDisable GL_TEXTURE_2D;	2377	glDisable GL_TEXTURE_2D;
2067	}	2378	}
2068		2379
2069	#############################################################################	2380	#############################################################################
2070		2381
		2382	package CFPlus::UI::ImageButton;
		2383
		2384	our @ISA = CFPlus::UI::Image::;
		2385
		2386	use CFPlus::OpenGL;
		2387
		2388	my %textures;
		2389
		2390	sub new {
		2391	my $class = shift;
		2392
		2393	my $self = $class->SUPER::new (
		2394	padding_x => 4,
		2395	padding_y => 4,
		2396	fg => [1, 1, 1],
		2397	active_fg => [0, 0, 1],
		2398	can_hover => 1,
		2399	align => 0,
		2400	valign => 0,
		2401	can_events => 1,
		2402	@_
		2403	);
		2404	}
		2405
		2406	sub invoke_button_up {
		2407	my ($self, $ev, $x, $y) = @_;
		2408
		2409	$self->emit ("activate")
		2410	if $x >= 0 && $x < $self->{w}
		2411	&& $y >= 0 && $y < $self->{h};
		2412
		2413	1
		2414	}
		2415
		2416	#############################################################################
		2417
2071	package CFClient::UI::VGauge;	2418	package CFPlus::UI::VGauge;
2072		2419
2073	our @ISA = CFClient::UI::Base::;	2420	our @ISA = CFPlus::UI::Base::;
2074		2421
2075	use List::Util qw(min max);	2422	use List::Util qw(min max);
2076		2423
2077	use CFClient::OpenGL;	2424	use CFPlus::OpenGL;
2078		2425
2079	my %tex = (	2426	my %tex = (
2080	food => [	2427	food => [
2081	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2428	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2429	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2083	],	2430	],
2084	grace => [	2431	grace => [
2085	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2432	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2086	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2433	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2087	],	2434	],
2088	hp => [	2435	hp => [
2089	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2436	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2090	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2437	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2091	],	2438	],
2092	mana => [	2439	mana => [
2093	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2440	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2094	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2441	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2095	],	2442	],
2096	);	2443	);
2097		2444
2098	# eg. VGauge->new (gauge => 'food'), default gauge: food	2445	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2158	my $ycut1 = max 0, min 1, $ycut;	2505	my $ycut1 = max 0, min 1, $ycut;
2159	my $ycut2 = max 0, min 1, $ycut - 1;	2506	my $ycut2 = max 0, min 1, $ycut - 1;
2160		2507
2161	my $h1 = $self->{h} * (1 - $ycut1);	2508	my $h1 = $self->{h} * (1 - $ycut1);
2162	my $h2 = $self->{h} * (1 - $ycut2);	2509	my $h2 = $self->{h} * (1 - $ycut2);
		2510	my $h3 = $self->{h};
		2511
		2512	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2163		2513
2164	glEnable GL_BLEND;	2514	glEnable GL_BLEND;
2165	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2515	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2516	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2167	glEnable GL_TEXTURE_2D;	2517	glEnable GL_TEXTURE_2D;
…		…
2186		2536
2187	if ($t3) {	2537	if ($t3) {
2188	glBindTexture GL_TEXTURE_2D, $t3->{name};	2538	glBindTexture GL_TEXTURE_2D, $t3->{name};
2189	glBegin GL_QUADS;	2539	glBegin GL_QUADS;
2190	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2540	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2191	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2541	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2192	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2542	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2193	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2543	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2194	glEnd;	2544	glEnd;
2195	}	2545	}
2196		2546
2197	glDisable GL_BLEND;	2547	glDisable GL_BLEND;
2198	glDisable GL_TEXTURE_2D;	2548	glDisable GL_TEXTURE_2D;
2199	}	2549	}
2200		2550
2201	#############################################################################	2551	#############################################################################
2202		2552
2203	package CFClient::UI::Gauge;	2553	package CFPlus::UI::Gauge;
2204		2554
2205	our @ISA = CFClient::UI::VBox::;	2555	our @ISA = CFPlus::UI::VBox::;
2206		2556
2207	sub new {	2557	sub new {
2208	my ($class, %arg) = @_;	2558	my ($class, %arg) = @_;
2209		2559
2210	my $self = $class->SUPER::new (	2560	my $self = $class->SUPER::new (
…		…
2212	can_hover => 1,	2562	can_hover => 1,
2213	can_events => 1,	2563	can_events => 1,
2214	%arg,	2564	%arg,
2215	);	2565	);
2216		2566
2217	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2567	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2218	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2568	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2219	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2569	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2220		2570
2221	$self	2571	$self
2222	}	2572	}
2223		2573
2224	sub set_fontsize {	2574	sub set_fontsize {
…		…
2245	$self->{value}->set_text ($val);	2595	$self->{value}->set_text ($val);
2246	}	2596	}
2247		2597
2248	#############################################################################	2598	#############################################################################
2249		2599
2250	package CFClient::UI::Slider;	2600	package CFPlus::UI::Slider;
2251		2601
2252	use strict;	2602	use strict;
2253		2603
2254	use CFClient::OpenGL;	2604	use CFPlus::OpenGL;
2255		2605
2256	our @ISA = CFClient::UI::DrawBG::;	2606	our @ISA = CFPlus::UI::DrawBG::;
2257		2607
2258	my @tex =	2608	my @tex =
2259	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2609	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2260	qw(s1_slider.png s1_slider_bg.png);	2610	qw(s1_slider.png s1_slider_bg.png);
2261		2611
2262	sub new {	2612	sub new {
2263	my $class = shift;	2613	my $class = shift;
2264		2614
…		…
2285	$self->update;	2635	$self->update;
2286		2636
2287	$self	2637	$self
2288	}	2638	}
2289		2639
2290	sub changed { }
2291
2292	sub set_range {	2640	sub set_range {
2293	my ($self, $range) = @_;	2641	my ($self, $range) = @_;
2294		2642
2295	($range, $self->{range}) = ($self->{range}, $range);	2643	($range, $self->{range}) = ($self->{range}, $range);
2296		2644
2297	$self->update
2298	if "@$range" ne "@{$self->{range}}";	2645	if ("@$range" ne "@{$self->{range}}") {
		2646	$self->update;
		2647	$self->set_value ($self->{range}[0]);
		2648	}
2299	}	2649	}
2300		2650
2301	sub set_value {	2651	sub set_value {
2302	my ($self, $value) = @_;	2652	my ($self, $value) = @_;
2303		2653
…		…
2314	if $unit;	2664	if $unit;
2315		2665
2316	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2666	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2317		2667
2318	if ($value != $old_value) {	2668	if ($value != $old_value) {
2319	$self->_emit (changed => $value);	2669	$self->emit (changed => $value);
2320	$self->update;	2670	$self->update;
2321	}	2671	}
2322	}	2672	}
2323		2673
2324	sub size_request {	2674	sub size_request {
2325	my ($self) = @_;	2675	my ($self) = @_;
2326		2676
2327	($self->{req_w}, $self->{req_h})	2677	($self->{req_w}, $self->{req_h})
2328	}	2678	}
2329		2679
2330	sub button_down {	2680	sub invoke_button_down {
2331	my ($self, $ev, $x, $y) = @_;	2681	my ($self, $ev, $x, $y) = @_;
2332		2682
2333	$self->SUPER::button_down ($ev, $x, $y);	2683	$self->SUPER::invoke_button_down ($ev, $x, $y);
2334		2684
2335	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2685	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2336		2686
2337	$self->mouse_motion ($ev, $x, $y)	2687	$self->invoke_mouse_motion ($ev, $x, $y)
2338	}	2688	}
2339		2689
2340	sub mouse_motion {	2690	sub invoke_mouse_motion {
2341	my ($self, $ev, $x, $y) = @_;	2691	my ($self, $ev, $x, $y) = @_;
2342		2692
2343	if ($GRAB == $self) {	2693	if ($GRAB == $self) {
2344	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2694	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2345		2695
…		…
2351	} else {	2701	} else {
2352	return 0;	2702	return 0;
2353	}	2703	}
2354		2704
2355	1	2705	1
		2706	}
		2707
		2708	sub invoke_mouse_wheel {
		2709	my ($self, $ev) = @_;
		2710
		2711	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2712
		2713	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2714
		2715	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2716
		2717	! ! $delta
2356	}	2718	}
2357		2719
2358	sub update {	2720	sub update {
2359	my ($self) = @_;	2721	my ($self) = @_;
2360		2722
…		…
2409	glDisable GL_TEXTURE_2D;	2771	glDisable GL_TEXTURE_2D;
2410	}	2772	}
2411		2773
2412	#############################################################################	2774	#############################################################################
2413		2775
2414	package CFClient::UI::ValSlider;	2776	package CFPlus::UI::ValSlider;
2415		2777
2416	our @ISA = CFClient::UI::HBox::;	2778	our @ISA = CFPlus::UI::HBox::;
2417		2779
2418	sub new {	2780	sub new {
2419	my ($class, %arg) = @_;	2781	my ($class, %arg) = @_;
2420		2782
2421	my $range = delete $arg{range};	2783	my $range = delete $arg{range};
2422		2784
2423	my $self = $class->SUPER::new (	2785	my $self = $class->SUPER::new (
2424	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2786	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2425	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2787	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2426	to_value => sub { shift },	2788	to_value => sub { shift },
2427	from_value => sub { shift },	2789	from_value => sub { shift },
2428	%arg,	2790	%arg,
2429	);	2791	);
2430		2792
…		…
2450	sub set_range { shift->{slider}->set_range (@_) }	2812	sub set_range { shift->{slider}->set_range (@_) }
2451	sub set_value { shift->{slider}->set_value (@_) }	2813	sub set_value { shift->{slider}->set_value (@_) }
2452		2814
2453	#############################################################################	2815	#############################################################################
2454		2816
2455	package CFClient::UI::TextView;	2817	package CFPlus::UI::TextScroller;
2456		2818
2457	our @ISA = CFClient::UI::HBox::;	2819	our @ISA = CFPlus::UI::HBox::;
2458		2820
2459	use CFClient::OpenGL;	2821	use CFPlus::OpenGL;
2460		2822
2461	sub new {	2823	sub new {
2462	my $class = shift;	2824	my $class = shift;
2463		2825
2464	my $self = $class->SUPER::new (	2826	my $self = $class->SUPER::new (
2465	fontsize => 1,	2827	fontsize => 1,
2466	can_events => 0,	2828	can_events => 1,
		2829	indent => 0,
2467	#font => default_font	2830	#font => default_font
2468	@_,	2831	@_,
2469		2832
2470	layout => (new CFClient::Layout 1),	2833	layout => (new CFPlus::Layout),
2471	par => [],	2834	par => [],
		2835	max_par => 0,
2472	height => 0,	2836	height => 0,
2473	children => [	2837	children => [
2474	(new CFClient::UI::Empty expand => 1),	2838	(new CFPlus::UI::Empty expand => 1),
2475	(new CFClient::UI::Slider vertical => 1),	2839	(new CFPlus::UI::Slider vertical => 1),
2476	],	2840	],
2477	);	2841	);
2478		2842
2479	$self->{children}[1]->connect (changed => sub { $self->update });	2843	$self->{children}[1]->connect (changed => sub { $self->update });
2480		2844
…		…
2486		2850
2487	$self->{fontsize} = $fontsize;	2851	$self->{fontsize} = $fontsize;
2488	$self->reflow;	2852	$self->reflow;
2489	}	2853	}
2490		2854
		2855	sub size_request {
		2856	my ($self) = @_;
		2857
		2858	my ($empty, $slider) = @{ $self->{children} };
		2859
		2860	local $self->{children} = [$empty, $slider];
		2861	$self->SUPER::size_request
		2862	}
		2863
2491	sub size_allocate {	2864	sub invoke_size_allocate {
2492	my ($self, $w, $h) = @_;	2865	my ($self, $w, $h) = @_;
2493		2866
2494	$self->SUPER::size_allocate ($w, $h);	2867	my ($empty, $slider, @other) = @{ $self->{children} };
		2868	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2495		2869
2496	$self->{layout}->set_font ($self->{font}) if $self->{font};	2870	$self->{layout}->set_font ($self->{font}) if $self->{font};
2497	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2871	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2498	$self->{layout}->set_width ($self->{children}[0]{w});	2872	$self->{layout}->set_width ($empty->{w});
		2873	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499		2874
2500	$self->reflow;	2875	$self->reflow;
2501	}
2502		2876
2503	sub text_size {	2877	local $self->{children} = [$empty, $slider];
		2878	$self->SUPER::invoke_size_allocate ($w, $h)
		2879	}
		2880
		2881	sub invoke_mouse_wheel {
2504	my ($self, $text, $indent) = @_;	2882	my ($self, $ev) = @_;
		2883
		2884	return 0 unless $ev->{dy}; # only vertical movements
		2885
		2886	$self->{children}[1]->emit (mouse_wheel => $ev);
		2887
		2888	1
		2889	}
		2890
		2891	sub get_layout {
		2892	my ($self, $para) = @_;
2505		2893
2506	my $layout = $self->{layout};	2894	my $layout = $self->{layout};
2507		2895
		2896	$layout->set_font ($self->{font}) if $self->{font};
		2897	$layout->set_foreground (@{$para->{fg}});
2508	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2898	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2509	$layout->set_width ($self->{children}[0]{w} - $indent);	2899	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2900	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510	$layout->set_markup ($text);	2901	$layout->set_markup ($para->{markup});
		2902
		2903	$layout->set_shapes (
		2904	map
		2905	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2906	@{$para->{widget}}
2511		2907	);
		2908
2512	$layout->size	2909	$layout
2513	}	2910	}
2514		2911
2515	sub reflow {	2912	sub reflow {
2516	my ($self) = @_;	2913	my ($self) = @_;
2517		2914
…		…
2524		2921
2525	# todo: base offset on lines or so, not on pixels	2922	# todo: base offset on lines or so, not on pixels
2526	$self->{children}[1]->set_value ($offset);	2923	$self->{children}[1]->set_value ($offset);
2527	}	2924	}
2528		2925
		2926	sub current_paragraph {
		2927	my ($self) = @_;
		2928
		2929	$self->{top_paragraph} - 1
		2930	}
		2931
		2932	sub scroll_to {
		2933	my ($self, $para) = @_;
		2934
		2935	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2936
		2937	$self->{scroll_to} = $para;
		2938	$self->update;
		2939	}
		2940
2529	sub clear {	2941	sub clear {
2530	my ($self) = @_;	2942	my ($self) = @_;
		2943
		2944	my (undef, undef, @other) = @{ $self->{children} };
		2945	$self->remove ($_) for @other;
2531		2946
2532	$self->{par} = [];	2947	$self->{par} = [];
2533	$self->{height} = 0;	2948	$self->{height} = 0;
2534	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2949	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2535	}	2950	}
2536		2951
2537	sub add_paragraph {	2952	sub add_paragraph {
2538	my ($self, $color, $text, $indent) = @_;	2953	my $self = shift;
2539		2954
2540	for my $line (split /\n/, $text) {	2955	for my $para (@_) {
2541	my ($w, $h) = $self->text_size ($line);	2956	$para = {
		2957	fg => [1, 1, 1, 1],
		2958	indent => 0,
		2959	markup => "",
		2960	widget => [],
		2961	ref $para ? %$para : (markup => $para),
		2962	w => 1e10,
		2963	wrapped => 1,
		2964	};
		2965
		2966	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2967	push @{$self->{par}}, $para;
		2968	}
		2969
		2970	if (my $max = $self->{max_par}) {
		2971	shift @{$self->{par}} while @{$self->{par}} > $max;
		2972	}
		2973
		2974	$self->{need_reflow}++;
		2975	$self->update;
		2976	}
		2977
		2978	sub scroll_to_bottom {
		2979	my ($self) = @_;
		2980
		2981	$self->{scroll_to} = $#{$self->{par}};
		2982	$self->update;
		2983	}
		2984
		2985	sub force_uptodate {
		2986	my ($self) = @_;
		2987
		2988	if (delete $self->{need_reflow}) {
		2989	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2990
		2991	my $height = 0;
		2992
		2993	for my $para (@{$self->{par}}) {
		2994	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2995	my $layout = $self->get_layout ($para);
		2996	my ($w, $h) = $layout->size;
		2997
		2998	$para->{w} = $w + $para->{indent};
		2999	$para->{h} = $h;
		3000	$para->{wrapped} = $layout->has_wrapped;
		3001	}
		3002
		3003	$para->{y} = $height;
		3004	$height += $para->{h};
		3005	}
		3006
2542	$self->{height} += $h;	3007	$self->{height} = $height;
2543	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3008	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2544	}
2545		3009
2546	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3010	delete $self->{texture};
		3011	}
		3012
		3013	if (my $paridx = delete $self->{scroll_to}) {
		3014	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3015	}
2547	}	3016	}
2548		3017
2549	sub update {	3018	sub update {
2550	my ($self) = @_;	3019	my ($self) = @_;
2551		3020
…		…
2553		3022
2554	return unless $self->{h} > 0;	3023	return unless $self->{h} > 0;
2555		3024
2556	delete $self->{texture};	3025	delete $self->{texture};
2557		3026
2558	$ROOT->on_post_alloc ($self, sub {	3027	$ROOT->on_post_alloc ($self => sub {
		3028	$self->force_uptodate;
		3029
2559	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3030	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2560		3031
2561	if (delete $self->{need_reflow}) {
2562	my $height = 0;
2563
2564	my $layout = $self->{layout};
2565
2566	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2567
2568	for (@{$self->{par}}) {
2569	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2570	$layout->set_width ($W - $_->[3]);
2571	$layout->set_markup ($_->[4]);
2572	my ($w, $h) = $layout->size;
2573	$_->[0] = $w + $_->[3];
2574	$_->[1] = $h;
2575	}
2576
2577	$height += $_->[1];
2578	}
2579
2580	$self->{height} = $height;
2581
2582	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2583
2584	delete $self->{texture};
2585	}
2586
2587	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3032	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2588	glClearColor 0, 0, 0, 0;	3033	glClearColor 0, 0, 0, 0;
2589	glClear GL_COLOR_BUFFER_BIT;	3034	glClear GL_COLOR_BUFFER_BIT;
2590		3035
		3036	package CFPlus::UI::Base;
		3037	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3038	(0, 0, $self->{w}, $self->{h});
		3039
		3040	my $top = int $self->{children}[1]{range}[0];
		3041
		3042	my $paridx = 0;
		3043	my $top_paragraph;
2591	my $top = int $self->{children}[1]{range}[0];	3044	my $top = int $self->{children}[1]{range}[0];
2592		3045
2593	my $y0 = $top;	3046	my $y0 = $top;
2594	my $y1 = $top + $H;	3047	my $y1 = $top + $H;
2595		3048
2596	my $y = 0;
2597
2598	my $layout = $self->{layout};
2599
2600	$layout->set_font ($self->{font}) if $self->{font};
2601
2602	glEnable GL_BLEND;
2603	#TODO# not correct in windows where rgba is forced off
2604	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2605
2606	for my $par (@{$self->{par}}) {	3049	for my $para (@{$self->{par}}) {
2607	my $h = $par->[1];	3050	my $h = $para->{h};
		3051	my $y = $para->{y};
2608		3052
2609	if ($y0 < $y + $h && $y < $y1) {	3053	if ($y0 < $y + $h && $y < $y1) {
2610	$layout->set_foreground (@{ $par->[2] });	3054	my $layout = $self->get_layout ($para);
2611	$layout->set_width ($W - $par->[3]);
2612	$layout->set_markup ($par->[4]);
2613		3055
2614	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3056	$layout->render ($para->{indent}, $y - $y0);
2615		3057
2616	glRasterPos $par->[3], $y - $y0;	3058	if (my @w = @{ $para->{widget} }) {
2617	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3059	my @s = $layout->get_shapes;
		3060
		3061	for (@w) {
		3062	my ($dx, $dy) = splice @s, 0, 2, ();
		3063
		3064	$_->{x} = $dx + $para->{indent};
		3065	$_->{y} = $dy + $y - $y0;
		3066
		3067	$_->draw;
		3068	}
		3069	}
2618	}	3070	}
2619		3071
2620	$y += $h;	3072	$paridx++;
		3073	$top_paragraph ||= $paridx if $y >= $top;
2621	}	3074	}
2622		3075
2623	glDisable GL_BLEND;	3076	$self->{top_paragraph} = $top_paragraph;
2624	};	3077	};
2625	});	3078	});
		3079	}
		3080
		3081	sub reconfigure {
		3082	my ($self) = @_;
		3083
		3084	$self->SUPER::reconfigure;
		3085
		3086	$_->{w} = 1e10 for @{ $self->{par} };
		3087	$self->reflow;
2626	}	3088	}
2627		3089
2628	sub _draw {	3090	sub _draw {
2629	my ($self) = @_;	3091	my ($self) = @_;
2630		3092
…		…
2633	glColor 0, 0, 0, 1;	3095	glColor 0, 0, 0, 1;
2634	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3096	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2635	glDisable GL_TEXTURE_2D;	3097	glDisable GL_TEXTURE_2D;
2636		3098
2637	$self->{children}[1]->draw;	3099	$self->{children}[1]->draw;
2638
2639	}	3100	}
2640		3101
2641	#############################################################################	3102	#############################################################################
2642		3103
2643	package CFClient::UI::Animator;	3104	package CFPlus::UI::Animator;
2644		3105
2645	use CFClient::OpenGL;	3106	use CFPlus::OpenGL;
2646		3107
2647	our @ISA = CFClient::UI::Bin::;	3108	our @ISA = CFPlus::UI::Bin::;
2648		3109
2649	sub moveto {	3110	sub moveto {
2650	my ($self, $x, $y) = @_;	3111	my ($self, $x, $y) = @_;
2651		3112
2652	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3113	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2680	glPopMatrix;	3141	glPopMatrix;
2681	}	3142	}
2682		3143
2683	#############################################################################	3144	#############################################################################
2684		3145
2685	package CFClient::UI::Flopper;	3146	package CFPlus::UI::Flopper;
2686		3147
2687	our @ISA = CFClient::UI::Button::;	3148	our @ISA = CFPlus::UI::Button::;
2688		3149
2689	sub new {	3150	sub new {
2690	my $class = shift;	3151	my $class = shift;
2691		3152
2692	my $self = $class->SUPER::new (	3153	my $self = $class->SUPER::new (
…		…
2704	$self->{other}->toggle_visibility;	3165	$self->{other}->toggle_visibility;
2705	}	3166	}
2706		3167
2707	#############################################################################	3168	#############################################################################
2708		3169
2709	package CFClient::UI::Tooltip;	3170	package CFPlus::UI::Tooltip;
2710		3171
2711	our @ISA = CFClient::UI::Bin::;	3172	our @ISA = CFPlus::UI::Bin::;
2712		3173
2713	use CFClient::OpenGL;	3174	use CFPlus::OpenGL;
2714		3175
2715	sub new {	3176	sub new {
2716	my $class = shift;	3177	my $class = shift;
2717		3178
2718	$class->SUPER::new (	3179	$class->SUPER::new (
…		…
2721	)	3182	)
2722	}	3183	}
2723		3184
2724	sub set_tooltip_from {	3185	sub set_tooltip_from {
2725	my ($self, $widget) = @_;	3186	my ($self, $widget) = @_;
		3187
		3188	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3189	if $widget->{tooltip} =~ /^#(.*)$/;
2726		3190
2727	my $tooltip = $widget->{tooltip};	3191	my $tooltip = $widget->{tooltip};
2728		3192
2729	if ($ENV{CFPLUS_DEBUG} & 2) {	3193	if ($ENV{CFPLUS_DEBUG} & 2) {
2730	$tooltip .= "\n\n" . (ref $widget) . "\n"	3194	$tooltip .= "\n\n" . (ref $widget) . "\n"
2731	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3195	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732	. "req $widget->{req_w} $widget->{req_h}\n"	3196	. "req $widget->{req_w} $widget->{req_h}\n"
2733	. "visible $widget->{visible}";	3197	. "visible $widget->{visible}";
2734	}	3198	}
2735		3199
		3200	$tooltip =~ s/^\n+//;
		3201	$tooltip =~ s/\n+$//;
		3202
2736	$self->add (new CFClient::UI::Label	3203	$self->add (new CFPlus::UI::Label
2737	markup => $tooltip,	3204	markup => $tooltip,
2738	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3205	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2739	fontsize => 0.8,	3206	fontsize => 0.8,
2740	fg => [0, 0, 0, 1],	3207	style => 1, # FLAG_INVERSE
2741	ellipsise => 0,	3208	ellipsise => 0,
2742	font => ($widget->{tooltip_font} || $::FONT_PROP),	3209	font => ($widget->{tooltip_font} || $::FONT_PROP),
2743	);	3210	);
2744	}	3211	}
2745		3212
…		…
2749	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3216	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2750		3217
2751	($w + 4, $h + 4)	3218	($w + 4, $h + 4)
2752	}	3219	}
2753		3220
2754	sub size_allocate {	3221	sub invoke_size_allocate {
2755	my ($self, $w, $h) = @_;	3222	my ($self, $w, $h) = @_;
2756		3223
2757	$self->SUPER::size_allocate ($w - 4, $h - 4);	3224	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2758	}	3225	}
2759		3226
2760	sub visibility_change {	3227	sub invoke_visibility_change {
2761	my ($self, $visible) = @_;	3228	my ($self, $visible) = @_;
2762		3229
2763	return unless $visible;	3230	return unless $visible;
2764		3231
2765	$self->{root}->on_post_alloc ("move_$self" => sub {	3232	$self->{root}->on_post_alloc ("move_$self" => sub {
2766	my $widget = $self->{owner}	3233	my $widget = $self->{owner}
2767	or return;	3234	or return;
2768		3235
		3236	if ($widget->{visible}) {
2769	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3237	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770		3238
2771	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3239	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772	if $x + $self->{w} > $::WIDTH;	3240	if $x + $self->{w} > $self->{root}{w};
2773		3241
2774	$self->move_abs ($x, $y);	3242	$self->move_abs ($x, $y);
		3243	} else {
		3244	$self->hide;
		3245	}
2775	});	3246	});
2776	}	3247	}
2777		3248
2778	sub _draw {	3249	sub _draw {
2779	my ($self) = @_;	3250	my ($self) = @_;
…		…
2803	$self->SUPER::_draw;	3274	$self->SUPER::_draw;
2804	}	3275	}
2805		3276
2806	#############################################################################	3277	#############################################################################
2807		3278
2808	package CFClient::UI::Face;	3279	package CFPlus::UI::Face;
2809		3280
2810	our @ISA = CFClient::UI::Base::;	3281	our @ISA = CFPlus::UI::DrawBG::;
2811		3282
2812	use CFClient::OpenGL;	3283	use CFPlus::OpenGL;
2813		3284
2814	sub new {	3285	sub new {
2815	my $class = shift;	3286	my $class = shift;
2816		3287
2817	my $self = $class->SUPER::new (	3288	my $self = $class->SUPER::new (
…		…
2819	can_events => 0,	3290	can_events => 0,
2820	@_,	3291	@_,
2821	);	3292	);
2822		3293
2823	if ($self->{anim} && $self->{animspeed}) {	3294	if ($self->{anim} && $self->{animspeed}) {
2824	Scalar::Util::weaken (my $widget = $self);	3295	CFPlus::weaken (my $widget = $self);
2825		3296
2826	$self->{timer} = Event->timer (	3297	$self->{timer} = Event->timer (
2827	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3298	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2828	hard => 1,	3299	hard => 1,
2829	interval => $self->{animspeed},	3300	interval => $self->{animspeed},
…		…
2852	sub _draw {	3323	sub _draw {
2853	my ($self) = @_;	3324	my ($self) = @_;
2854		3325
2855	return unless $::CONN;	3326	return unless $::CONN;
2856		3327
		3328	$self->SUPER::_draw;
		3329
2857	my $face;	3330	my $face;
2858		3331
2859	if ($self->{frame}) {	3332	if ($self->{frame}) {
2860	my $anim = $::CONN->{anim}[$self->{anim}];	3333	my $anim = $::CONN->{anim}[$self->{anim}];
2861		3334
…		…
2872	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3345	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2873	glDisable GL_TEXTURE_2D;	3346	glDisable GL_TEXTURE_2D;
2874	}	3347	}
2875	}	3348	}
2876		3349
2877	sub DESTROY {	3350	sub destroy {
2878	my ($self) = @_;	3351	my ($self) = @_;
2879		3352
2880	$self->{timer}->cancel	3353	$self->{timer}->cancel
2881	if $self->{timer};	3354	if $self->{timer};
2882		3355
2883	$self->SUPER::DESTROY;	3356	$self->SUPER::destroy;
2884	}	3357	}
2885		3358
2886	#############################################################################	3359	#############################################################################
2887		3360
2888	package CFClient::UI::Buttonbar;	3361	package CFPlus::UI::Buttonbar;
2889		3362
2890	our @ISA = CFClient::UI::HBox::;	3363	our @ISA = CFPlus::UI::HBox::;
2891		3364
2892	# TODO: should actualyl wrap buttons and other goodies.	3365	# TODO: should actually wrap buttons and other goodies.
2893		3366
2894	#############################################################################	3367	#############################################################################
2895		3368
2896	package CFClient::UI::Menu;	3369	package CFPlus::UI::Menu;
2897		3370
2898	our @ISA = CFClient::UI::FancyFrame::;	3371	our @ISA = CFPlus::UI::Toplevel::;
2899		3372
2900	use CFClient::OpenGL;	3373	use CFPlus::OpenGL;
2901		3374
2902	sub new {	3375	sub new {
2903	my $class = shift;	3376	my $class = shift;
2904		3377
2905	my $self = $class->SUPER::new (	3378	my $self = $class->SUPER::new (
2906	items => [],	3379	items => [],
2907	z => 100,	3380	z => 100,
2908	@_,	3381	@_,
2909	);	3382	);
2910		3383
2911	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3384	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2912		3385
2913	for my $item (@{ $self->{items} }) {	3386	for my $item (@{ $self->{items} }) {
2914	my ($widget, $cb) = @$item;	3387	my ($widget, $cb, $tooltip) = @$item;
2915		3388
2916	# handle various types of items, only text for now	3389	# handle various types of items, only text for now
2917	if (!ref $widget) {	3390	if (!ref $widget) {
		3391	if ($widget =~ /\t/) {
		3392	my ($left, $right) = split /\t/, $widget, 2;
		3393
2918	$widget = new CFClient::UI::Label	3394	$widget = new CFPlus::UI::HBox
2919	can_hover => 1,	3395	can_hover => 1,
2920	can_events => 1,	3396	can_events => 1,
		3397	tooltip => $tooltip,
		3398	children => [
		3399	(new CFPlus::UI::Label markup => $left, expand => 1),
		3400	(new CFPlus::UI::Label markup => $right, align => +1),
		3401	],
		3402	;
		3403
		3404	} else {
		3405	$widget = new CFPlus::UI::Label
		3406	can_hover => 1,
		3407	can_events => 1,
2921	text => $widget;	3408	markup => $widget,
		3409	tooltip => $tooltip;
		3410	}
2922	}	3411	}
2923		3412
2924	$self->{item}{$widget} = $item;	3413	$self->{item}{$widget} = $item;
2925		3414
2926	$self->{vbox}->add ($widget);	3415	$self->{vbox}->add ($widget);
…		…
2931		3420
2932	# popup given the event (must be a mouse button down event currently)	3421	# popup given the event (must be a mouse button down event currently)
2933	sub popup {	3422	sub popup {
2934	my ($self, $ev) = @_;	3423	my ($self, $ev) = @_;
2935		3424
2936	$self->_emit ("popdown");	3425	$self->emit ("popdown");
2937		3426
2938	# maybe save $GRAB? must be careful about events...	3427	# maybe save $GRAB? must be careful about events...
2939	$GRAB = $self;	3428	$GRAB = $self;
2940	$self->{button} = $ev->{button};	3429	$self->{button} = $ev->{button};
2941		3430
2942	$self->show;	3431	$self->show;
2943	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3432	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2944	}	3433	}
2945		3434
2946	sub mouse_motion {	3435	sub invoke_mouse_motion {
2947	my ($self, $ev, $x, $y) = @_;	3436	my ($self, $ev, $x, $y) = @_;
2948		3437
2949	# TODO: should use vbox->find_widget or so	3438	# TODO: should use vbox->find_widget or so
2950	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3439	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2951	$self->{hover} = $self->{item}{$HOVER};	3440	$self->{hover} = $self->{item}{$HOVER};
2952		3441
2953	0	3442	0
2954	}	3443	}
2955		3444
2956	sub button_up {	3445	sub invoke_button_up {
2957	my ($self, $ev, $x, $y) = @_;	3446	my ($self, $ev, $x, $y) = @_;
2958		3447
2959	if ($ev->{button} == $self->{button}) {	3448	if ($ev->{button} == $self->{button}) {
2960	undef $GRAB;	3449	undef $GRAB;
2961	$self->hide;	3450	$self->hide;
2962		3451
2963	$self->_emit ("popdown");	3452	$self->emit ("popdown");
2964	$self->{hover}[1]->() if $self->{hover};	3453	$self->{hover}[1]->() if $self->{hover};
2965	} else {	3454	} else {
2966	return 0	3455	return 0
2967	}	3456	}
2968		3457
2969	1	3458	1
2970	}	3459	}
2971		3460
2972	#############################################################################	3461	#############################################################################
2973		3462
2974	package CFClient::UI::Multiplexer;	3463	package CFPlus::UI::Multiplexer;
2975		3464
2976	our @ISA = CFClient::UI::Container::;	3465	our @ISA = CFPlus::UI::Container::;
2977		3466
2978	sub new {	3467	sub new {
2979	my $class = shift;	3468	my $class = shift;
2980		3469
2981	my $self = $class->SUPER::new (	3470	my $self = $class->SUPER::new (
…		…
2995		3484
2996	$self->{current} = $self->{children}[0]	3485	$self->{current} = $self->{children}[0]
2997	if @{ $self->{children} };	3486	if @{ $self->{children} };
2998	}	3487	}
2999		3488
		3489	sub get_current_page {
		3490	my ($self) = @_;
		3491
		3492	$self->{current}
		3493	}
		3494
3000	sub set_current_page {	3495	sub set_current_page {
3001	my ($self, $page_or_widget) = @_;	3496	my ($self, $page_or_widget) = @_;
3002		3497
3003	my $widget = ref $page_or_widget	3498	my $widget = ref $page_or_widget
3004	? $page_or_widget	3499	? $page_or_widget
3005	: $self->{children}[$page_or_widget];	3500	: $self->{children}[$page_or_widget];
3006		3501
3007	$self->{current} = $widget;	3502	$self->{current} = $widget;
3008	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3503	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009		3504
3010	$self->_emit (page_changed => $self->{current});	3505	$self->emit (page_changed => $self->{current});
3011		3506
3012	$self->realloc;	3507	$self->realloc;
3013	}	3508	}
3014		3509
3015	sub visible_children {	3510	sub visible_children {
…		…
3020	my ($self) = @_;	3515	my ($self) = @_;
3021		3516
3022	$self->{current}->size_request	3517	$self->{current}->size_request
3023	}	3518	}
3024		3519
3025	sub size_allocate {	3520	sub invoke_size_allocate {
3026	my ($self, $w, $h) = @_;	3521	my ($self, $w, $h) = @_;
3027		3522
3028	$self->{current}->configure (0, 0, $w, $h);	3523	$self->{current}->configure (0, 0, $w, $h);
		3524
		3525	1
3029	}	3526	}
3030		3527
3031	sub _draw {	3528	sub _draw {
3032	my ($self) = @_;	3529	my ($self) = @_;
3033		3530
3034	$self->{current}->draw;	3531	$self->{current}->draw;
3035	}	3532	}
3036		3533
3037	#############################################################################	3534	#############################################################################
3038		3535
3039	package CFClient::UI::Notebook;	3536	package CFPlus::UI::Notebook;
3040		3537
3041	our @ISA = CFClient::UI::VBox::;	3538	our @ISA = CFPlus::UI::VBox::;
3042		3539
3043	sub new {	3540	sub new {
3044	my $class = shift;	3541	my $class = shift;
3045		3542
3046	my $self = $class->SUPER::new (	3543	my $self = $class->SUPER::new (
3047	buttonbar => (new CFClient::UI::Buttonbar),	3544	buttonbar => (new CFPlus::UI::Buttonbar),
3048	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3545	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3049	# filter => # will be put between multiplexer and $self	3546	# filter => # will be put between multiplexer and $self
3050	@_,	3547	@_,
3051	);	3548	);
3052		3549
3053	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3550	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3057	}	3554	}
3058		3555
3059	sub add {	3556	sub add {
3060	my ($self, $title, $widget, $tooltip) = @_;	3557	my ($self, $title, $widget, $tooltip) = @_;
3061		3558
3062	Scalar::Util::weaken $self;	3559	CFPlus::weaken $self;
3063		3560
3064	$self->{buttonbar}->add (new CFClient::UI::Button	3561	$self->{buttonbar}->add (new CFPlus::UI::Button
3065	markup => $title,	3562	markup => $title,
3066	tooltip => $tooltip,	3563	tooltip => $tooltip,
3067	on_activate => sub { $self->set_current_page ($widget) },	3564	on_activate => sub { $self->set_current_page ($widget) },
3068	);	3565	);
3069		3566
3070	$self->{multiplexer}->add ($widget);	3567	$self->{multiplexer}->add ($widget);
3071	}	3568	}
3072		3569
		3570	sub get_current_page {
		3571	my ($self) = @_;
		3572
		3573	$self->{multiplexer}->get_current_page
		3574	}
		3575
3073	sub set_current_page {	3576	sub set_current_page {
3074	my ($self, $page) = @_;	3577	my ($self, $page) = @_;
3075		3578
3076	$self->{multiplexer}->set_current_page ($page);	3579	$self->{multiplexer}->set_current_page ($page);
3077	$self->_emit (page_changed => $self->{multiplexer}{current});	3580	$self->emit (page_changed => $self->{multiplexer}{current});
3078	}	3581	}
3079		3582
3080	#############################################################################	3583	#############################################################################
3081		3584
		3585	package CFPlus::UI::Selector;
		3586
		3587	use utf8;
		3588
		3589	our @ISA = CFPlus::UI::Button::;
		3590
		3591	sub new {
		3592	my $class = shift;
		3593
		3594	my $self = $class->SUPER::new (
		3595	options => [], # [value, title, longdesc], ...
		3596	value => undef,
		3597	@_,
		3598	);
		3599
		3600	$self->_set_value ($self->{value});
		3601
		3602	$self
		3603	}
		3604
		3605	sub invoke_button_down {
		3606	my ($self, $ev) = @_;
		3607
		3608	my @menu_items;
		3609
		3610	for (@{ $self->{options} }) {
		3611	my ($value, $title, $tooltip) = @$_;
		3612
		3613	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3614	}
		3615
		3616	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3617	}
		3618
		3619	sub _set_value {
		3620	my ($self, $value) = @_;
		3621
		3622	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3623	or return;
		3624
		3625	$self->{value} = $item->[0];
		3626	$self->set_markup ("$item->[1] ⇓");
		3627	$self->set_tooltip ($item->[2]);
		3628	}
		3629
		3630	sub set_value {
		3631	my ($self, $value) = @_;
		3632
		3633	return unless $self->{value} ne $value;
		3634
		3635	$self->_set_value ($value);
		3636	$self->emit (changed => $value);
		3637	}
		3638
		3639	#############################################################################
		3640
3082	package CFClient::UI::Statusbox;	3641	package CFPlus::UI::Statusbox;
3083		3642
3084	our @ISA = CFClient::UI::VBox::;	3643	our @ISA = CFPlus::UI::VBox::;
3085		3644
3086	sub new {	3645	sub new {
3087	my $class = shift;	3646	my $class = shift;
3088		3647
3089	my $self = $class->SUPER::new (	3648	my $self = $class->SUPER::new (
3090	fontsize => 0.8,	3649	fontsize => 0.8,
3091	@_,	3650	@_,
3092	);	3651	);
3093		3652
3094	Scalar::Util::weaken (my $this = $self);	3653	CFPlus::weaken (my $this = $self);
3095		3654
3096	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3655	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3097		3656
3098	$self	3657	$self
3099	}	3658	}
…		…
3101	sub reorder {	3660	sub reorder {
3102	my ($self) = @_;	3661	my ($self) = @_;
3103	my $NOW = Time::HiRes::time;	3662	my $NOW = Time::HiRes::time;
3104		3663
3105	# freeze display when hovering over any label	3664	# freeze display when hovering over any label
3106	return if $CFClient::UI::TOOLTIP->{owner}	3665	return if $CFPlus::UI::TOOLTIP->{owner}
3107	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3666	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3108	values %{ $self->{item} };	3667	values %{ $self->{item} };
3109		3668
3110	while (my ($k, $v) = each %{ $self->{item} }) {	3669	while (my ($k, $v) = each %{ $self->{item} }) {
3111	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3670	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3112	}	3671	}
…		…
3133	for ($short) {	3692	for ($short) {
3134	s/^\s+//;	3693	s/^\s+//;
3135	s/\s+/ /g;	3694	s/\s+/ /g;
3136	}	3695	}
3137		3696
3138	new CFClient::UI::Label	3697	new CFPlus::UI::Label
3139	markup => $short,	3698	markup => $short,
3140	tooltip => $item->{tooltip},	3699	tooltip => $item->{tooltip},
3141	tooltip_font => $::FONT_PROP,	3700	tooltip_font => $::FONT_PROP,
3142	tooltip_width => 0.67,	3701	tooltip_width => 0.67,
3143	fontsize => $item->{fontsize} || $self->{fontsize},	3702	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3181	$item->{count}++;	3740	$item->{count}++;
3182	} else {	3741	} else {
3183	$item->{count} = 1;	3742	$item->{count} = 1;
3184	$item->{text} = $item->{tooltip} = $text;	3743	$item->{text} = $item->{tooltip} = $text;
3185	}	3744	}
3186	$item->{id} = ++$self->{id};	3745	$item->{id} += 0.2;#d#
3187	$item->{timeout} = $timeout;	3746	$item->{timeout} = $timeout;
3188	delete $item->{label};	3747	delete $item->{label};
3189	} else {	3748	} else {
3190	$self->{item}{$group} = {	3749	$self->{item}{$group} = {
3191	id => ++$self->{id},	3750	id => ++$self->{id},
…		…
3197	count => 1,	3756	count => 1,
3198	%arg,	3757	%arg,
3199	};	3758	};
3200	}	3759	}
3201		3760
		3761	$ROOT->on_refresh (reorder => sub {
3202	$self->reorder;	3762	$self->reorder;
		3763	});
3203	}	3764	}
3204		3765
3205	sub reconfigure {	3766	sub reconfigure {
3206	my ($self) = @_;	3767	my ($self) = @_;
3207		3768
…		…
3210		3771
3211	$self->reorder;	3772	$self->reorder;
3212	$self->SUPER::reconfigure;	3773	$self->SUPER::reconfigure;
3213	}	3774	}
3214		3775
3215	sub DESTROY {	3776	sub destroy {
3216	my ($self) = @_;	3777	my ($self) = @_;
3217		3778
3218	$self->{timer}->cancel;	3779	$self->{timer}->cancel;
3219		3780
3220	$self->SUPER::DESTROY;	3781	$self->SUPER::destroy;
3221	}	3782	}
3222		3783
3223	#############################################################################	3784	#############################################################################
3224		3785
3225	package CFClient::UI::Inventory;
3226
3227	our @ISA = CFClient::UI::ScrolledWindow::;
3228
3229	sub new {
3230	my $class = shift;
3231
3232	my $self = $class->SUPER::new (
3233	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3234	@_,
3235	);
3236
3237	$self
3238	}
3239
3240	sub set_items {
3241	my ($self, $items) = @_;
3242
3243	$self->{child}->clear;
3244	return unless $items;
3245
3246	my @items = sort {
3247	($a->{type} <=> $b->{type})
3248	or ($a->{name} cmp $b->{name})
3249	} @$items;
3250
3251	$self->{real_items} = \@items;
3252
3253	my $row = 0;
3254	for my $item (@items) {
3255	CFClient::Item::update_widgets $item;
3256
3257	$self->{child}->add (0, $row, $item->{face_widget});
3258	$self->{child}->add (1, $row, $item->{desc_widget});
3259	$self->{child}->add (2, $row, $item->{weight_widget});
3260
3261	$row++;
3262	}
3263	}
3264
3265	#############################################################################
3266
3267	package CFClient::UI::BindEditor;
3268
3269	our @ISA = CFClient::UI::FancyFrame::;
3270
3271	sub new {
3272	my $class = shift;
3273
3274	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3275
3276	$self->add (my $vb = new CFClient::UI::VBox);
3277
3278
3279	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3280	text => "start recording",
3281	tooltip => "Start/Stops recording of actions."
3282	."All subsequent actions after the recording started will be captured."
3283	."The actions are displayed after the record was stopped."
3284	."To bind the action you have to click on the 'Bind' button",
3285	on_activate => sub {
3286	unless ($self->{recording}) {
3287	$self->start;
3288	} else {
3289	$self->stop;
3290	}
3291	});
3292
3293	$vb->add (new CFClient::UI::Label text => "Actions:");
3294	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3295
3296	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3297	$vb->add (my $hb = new CFClient::UI::HBox);
3298	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3299	$hb->add (new CFClient::UI::Button
3300	text => "bind",
3301	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3302	on_activate => sub {
3303	$self->ask_for_bind;
3304	});
3305
3306	$vb->add (my $hb = new CFClient::UI::HBox);
3307	$hb->add (new CFClient::UI::Button
3308	text => "ok",
3309	expand => 1,
3310	tooltip => "This closes the binding editor and saves the binding",
3311	on_activate => sub {
3312	$self->hide;
3313	$self->commit;
3314	});
3315
3316	$hb->add (new CFClient::UI::Button
3317	text => "cancel",
3318	expand => 1,
3319	tooltip => "This closes the binding editor without saving",
3320	on_activate => sub {
3321	$self->hide;
3322	$self->{binding_cancel}->()
3323	if $self->{binding_cancel};
3324	});
3325
3326	$self->update_binding_widgets;
3327
3328	$self
3329	}
3330
3331	sub commit {
3332	my ($self) = @_;
3333	my ($mod, $sym, $cmds) = $self->get_binding;
3334	if ($sym != 0 && @$cmds > 0) {
3335	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3336	."'. Don't forget 'Save Config'!");
3337	$self->{binding_change}->($mod, $sym, $cmds)
3338	if $self->{binding_change};
3339	} else {
3340	$::STATUSBOX->add ("No action bound, no key or action specified!");
3341	$self->{binding_cancel}->()
3342	if $self->{binding_cancel};
3343	}
3344	}
3345
3346	sub start {
3347	my ($self) = @_;
3348
3349	$self->{rec_btn}->set_text ("stop recording");
3350	$self->{recording} = 1;
3351	$self->clear_command_list;
3352	$::CONN->start_record if $::CONN;
3353	}
3354
3355	sub stop {
3356	my ($self) = @_;
3357
3358	$self->{rec_btn}->set_text ("start recording");
3359	$self->{recording} = 0;
3360
3361	my $rec;
3362	$rec = $::CONN->stop_record if $::CONN;
3363	return unless ref $rec eq 'ARRAY';
3364	$self->set_command_list ($rec);
3365	}
3366
3367
3368	sub ask_for_bind_and_commit {
3369	my ($self) = @_;
3370	$self->ask_for_bind (1);
3371	}
3372
3373	sub ask_for_bind {
3374	my ($self, $commit) = @_;
3375
3376	CFClient::Binder::open_binding_dialog (sub {
3377	my ($mod, $sym) = @_;
3378	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3379	$self->update_binding_widgets;
3380	$self->commit if $commit;
3381	});
3382	}
3383
3384	# $mod and $sym are the modifiers and key symbol
3385	# $cmds is a array ref of strings (the commands)
3386	# $cb is the callback that is executed on OK
3387	# $ccb is the callback that is executed on CANCEL and
3388	# when the binding was unsuccessful on OK
3389	sub set_binding {
3390	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3391
3392	$self->clear_command_list;
3393	$self->{recording} = 0;
3394	$self->{rec_btn}->set_text ("start recording");
3395
3396	$self->{binding} = [$mod, $sym];
3397	$self->{commands} = $cmds;
3398
3399	$self->{binding_change} = $cb;
3400	$self->{binding_cancel} = $ccb;
3401
3402	$self->update_binding_widgets;
3403	}
3404
3405	# this is a shortcut method that asks for a binding
3406	# and then just binds it.
3407	sub do_quick_binding {
3408	my ($self, $cmds) = @_;
3409	$self->set_binding (undef, undef, $cmds, sub {
3410	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3411	});
3412	$self->ask_for_bind (1);
3413	}
3414
3415	sub update_binding_widgets {
3416	my ($self) = @_;
3417	my ($mod, $sym, $cmds) = $self->get_binding;
3418	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3419	$self->set_command_list ($cmds);
3420	}
3421
3422	sub get_binding {
3423	my ($self) = @_;
3424	return (
3425	$self->{binding}->[0],
3426	$self->{binding}->[1],
3427	[ grep { defined $_ } @{$self->{commands}} ]
3428	);
3429	}
3430
3431	sub clear_command_list {
3432	my ($self) = @_;
3433	$self->{cmdbox}->clear ();
3434	}
3435
3436	sub set_command_list {
3437	my ($self, $cmds) = @_;
3438
3439	$self->{cmdbox}->clear ();
3440	$self->{commands} = $cmds;
3441
3442	my $idx = 0;
3443
3444	for (@$cmds) {
3445	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3446
3447	my $i = $idx;
3448	$hb->add (new CFClient::UI::Label text => $_);
3449	$hb->add (new CFClient::UI::Button
3450	text => "delete",
3451	tooltip => "Deletes the action from the record",
3452	on_activate => sub {
3453	$self->{cmdbox}->remove ($hb);
3454	$cmds->[$i] = undef;
3455	});
3456
3457
3458	$idx++
3459	}
3460	}
3461
3462	#############################################################################
3463
3464	package CFClient::UI::SpellList;
3465
3466	our @ISA = CFClient::UI::Table::;
3467
3468	sub new {
3469	my $class = shift;
3470
3471	my $self = $class->SUPER::new (
3472	binding => [],
3473	commands => [],
3474	@_,
3475	)
3476	}
3477
3478	# XXX: Do sorting? Argl...
3479	sub add_spell {
3480	my ($self, $spell) = @_;
3481	$self->{spells}->{$spell->{name}} = $spell;
3482
3483	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3484	face => $spell->{face},
3485	can_hover => 1,
3486	can_events => 1,
3487	tooltip => $spell->{message});
3488
3489	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3490	text => $spell->{name},
3491	can_hover => 1,
3492	can_events => 1,
3493	tooltip => $spell->{message},
3494	expand => 1);
3495
3496	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3497	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3498	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3499	expand => 1);
3500
3501	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3502	text => "bind to key",
3503	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3504	}
3505
3506	sub rebuild_spell_list {
3507	my ($self) = @_;
3508	$self->{tbl_idx} = 0;
3509	$self->add_spell ($_) for values %{$self->{spells}};
3510	}
3511
3512	sub remove_spell {
3513	my ($self, $spell) = @_;
3514	delete $self->{spells}->{$spell->{name}};
3515	$self->rebuild_spell_list;
3516	}
3517
3518	#############################################################################
3519
3520	package CFClient::UI::Root;	3786	package CFPlus::UI::Root;
3521		3787
3522	our @ISA = CFClient::UI::Container::;	3788	our @ISA = CFPlus::UI::Container::;
3523		3789
3524	use List::Util qw(min max);	3790	use List::Util qw(min max);
3525		3791
3526	use CFClient::OpenGL;	3792	use CFPlus::OpenGL;
3527		3793
3528	sub new {	3794	sub new {
3529	my $class = shift;	3795	my $class = shift;
3530		3796
3531	my $self = $class->SUPER::new (	3797	my $self = $class->SUPER::new (
3532	visible => 1,	3798	visible => 1,
3533	@_,	3799	@_,
3534	);	3800	);
3535		3801
3536	Scalar::Util::weaken ($self->{root} = $self);	3802	CFPlus::weaken ($self->{root} = $self);
3537		3803
3538	$self	3804	$self
3539	}	3805	}
3540		3806
3541	sub size_request {	3807	sub size_request {
…		…
3556	$coord = $max - $size if $coord > $max - $size;	3822	$coord = $max - $size if $coord > $max - $size;
3557		3823
3558	int $coord + 0.5	3824	int $coord + 0.5
3559	}	3825	}
3560		3826
3561	sub size_allocate {	3827	sub invoke_size_allocate {
3562	my ($self, $w, $h) = @_;	3828	my ($self, $w, $h) = @_;
3563		3829
3564	for my $child ($self->children) {	3830	for my $child ($self->children) {
3565	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3831	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3566		3832
…		…
3570	$X = _to_pixel $X, $W, $self->{w};	3836	$X = _to_pixel $X, $W, $self->{w};
3571	$Y = _to_pixel $Y, $H, $self->{h};	3837	$Y = _to_pixel $Y, $H, $self->{h};
3572		3838
3573	$child->configure ($X, $Y, $W, $H);	3839	$child->configure ($X, $Y, $W, $H);
3574	}	3840	}
		3841
		3842	1
3575	}	3843	}
3576		3844
3577	sub coord2local {	3845	sub coord2local {
3578	my ($self, $x, $y) = @_;	3846	my ($self, $x, $y) = @_;
3579		3847
…		…
3705	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3973	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3706		3974
3707	$w = 0 if $w < 0;	3975	$w = 0 if $w < 0;
3708	$h = 0 if $h < 0;	3976	$h = 0 if $h < 0;
3709		3977
		3978	$w = max $widget->{min_w}, $w;
		3979	$h = max $widget->{min_h}, $h;
		3980
		3981	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3982	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3983
		3984	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3985	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3986
3710	$w = int $w + 0.5;	3987	$w = int $w + 0.5;
3711	$h = int $h + 0.5;	3988	$h = int $h + 0.5;
3712		3989
3713	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3990	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3714	$widget->{old_w} = $widget->{w};	3991	$widget->{old_w} = $widget->{w};
…		…
3737	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4014	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3738	glMatrixMode GL_MODELVIEW;	4015	glMatrixMode GL_MODELVIEW;
3739	glLoadIdentity;	4016	glLoadIdentity;
3740		4017
3741	{	4018	{
3742	package CFClient::UI::Base;	4019	package CFPlus::UI::Base;
3743		4020
3744	($draw_x, $draw_y, $draw_w, $draw_h) =	4021	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3745	(0, 0, $self->{w}, $self->{h});	4022	(0, 0, $self->{w}, $self->{h});
3746	}
3747		4023
3748	$self->_draw;	4024	$self->_draw;
		4025	}
3749	}	4026	}
3750		4027
3751	#############################################################################	4028	#############################################################################
3752		4029
3753	package CFClient::UI;	4030	package CFPlus::UI;
3754		4031
3755	$ROOT = new CFClient::UI::Root;	4032	$ROOT = new CFPlus::UI::Root;
3756	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4033	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3757		4034
3758	1	4035	1
3759		4036

Diff Legend

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