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.294 by root, Tue Jun 6 03:19:26 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

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

Diff Legend

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