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

Diff Legend

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