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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.399 by root, Sat Jul 21 16:07:53 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;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		120
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
101	}	129	}
102		130
103	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	132	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		133
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		135
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		137
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
112	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		140
114	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	143	$grab->update if $grab;
117	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
118		145
		146	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	147	$TOOLTIP_WATCHER->cb->();
120	}	148	}
121	}	149	}
122		150
123	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
124	my ($ev) = @_;	152	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
126		154
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		156
129	if ($widget != $HOVER) {	157	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		158
132	$hover->update if $hover && $hover->{can_hover};	159	$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;	160	if $HOVER;
140	}	161	}
141		162
142	# convert position array to integers	163	# convert position array to integers
143	sub harmonize {	164	sub harmonize {
…		…
193	reconfigure_widgets;	214	reconfigure_widgets;
194	}	215	}
195		216
196	#############################################################################	217	#############################################################################
197		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
198	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
199		228
200	use strict;	229	use strict;
201		230
202	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
203		232
204	sub new {	233	sub new {
205	my $class = shift;	234	my $class = shift;
206		235
207	my $self = bless {	236	my $self = bless {
…		…
212	h => undef,	241	h => undef,
213	can_events => 1,	242	can_events => 1,
214	@_	243	@_
215	}, $class;	244	}, $class;
216		245
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		247
219	for (keys %$self) {	248	for (keys %$self) {
220	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
222	}	251	}
223	}	252	}
224		253
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$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};	256	$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};	257	$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};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		259
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		262
234	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
239		268
240	sub destroy {	269	sub destroy {
241	my ($self) = @_;	270	my ($self) = @_;
242		271
243	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
244	%$self = ();	274	%$self = ();
245	}	275	}
246		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
247	sub show {	281	sub show {
248	my ($self) = @_;	282	my ($self) = @_;
249		283
250	return if $self->{parent};	284	return if $self->{parent};
251		285
252	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
253	}	287	}
254		288
255	sub set_visible {	289	sub set_visible {
256	my ($self) = @_;	290	my ($self) = @_;
257		291
…		…
278	delete $self->{root};	312	delete $self->{root};
279		313
280	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
282		316
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
285		319
286	$self->emit ("focus_out");	320	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
288	}	322	}
…		…
290	sub set_visibility {	324	sub set_visibility {
291	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
292		326
293	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
294		328
295	$visible ? $self->hide	329	$visible ? $self->show
296	: $self->show;	330	: $self->hide;
297	}	331	}
298		332
299	sub toggle_visibility {	333	sub toggle_visibility {
300	my ($self) = @_;	334	my ($self) = @_;
301		335
…		…
335	sub size_request {	369	sub size_request {
336	require Carp;	370	require Carp;
337	Carp::confess "size_request is abstract";	371	Carp::confess "size_request is abstract";
338	}	372	}
339		373
		374	sub baseline_shift {
		375	0
		376	}
		377
340	sub configure {	378	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
342		380
343	if ($self->{aspect}) {	381	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
345		383
346	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		386
349	# use alignment to adjust x, y	387	# use alignment to adjust x, y
350		388
351	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
393		431
394	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
395		433
396	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
397		435
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	439	}
402	}	440	}
403		441
404	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
405	sub coord2local {	443	sub coord2local {
406	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
407		445
		446	Carp::confess unless $self->{parent};#d#
		447
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	449	}
410		450
411	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
412	sub coord2global {	452	sub coord2global {
413	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
414		454
		455	Carp::confess unless $self->{parent};#d#
		456
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	458	}
417		459
418	sub invoke_focus_in {	460	sub invoke_focus_in {
419	my ($self) = @_;	461	my ($self) = @_;
420		462
421	return if $FOCUS == $self;	463	return if $FOCUS == $self;
422	return unless $self->{can_focus};	464	return unless $self->{can_focus};
423		465
424	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
425		467
426	$focus->update if $focus;	468	$self->update;
427	$FOCUS->update;
428		469
429	0	470	0
430	}	471	}
431		472
432	sub invoke_focus_out {	473	sub invoke_focus_out {
433	my ($self) = @_;	474	my ($self) = @_;
434		475
435	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
436		477
437	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
438		479
439	$focus->update if $focus; #?	480	$self->update;
440		481
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	483	unless $FOCUS;
443		484
444	0	485	0
445	}	486	}
446		487
447	sub grab_focus {	488	sub grab_focus {
448	my ($self) = @_;	489	my ($self) = @_;
449		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	492	$self->emit ("focus_in");
451	}	493	}
452		494
453	sub invoke_mouse_motion { 1 }	495	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	496	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	497	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
457		500
458	sub invoke_button_down {	501	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
460		503
461	$self->grab_focus;	504	$self->grab_focus;
462		505
463	1	506	0
464	}	507	}
465		508
466	sub connect {	509	sub connect {
467	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
468		511
469	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
470	}	518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
471		532
472	sub emit {	533	sub emit {
473	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
474		535
475	#d##TODO# stop propagating at first true, do not use sum	536	# I do not really like this solution, but I do not like duplication
476	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
477	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
478	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
479	}	554	}
480		555
481	sub find_widget {	556	#sub find_widget {
482	my ($self, $x, $y) = @_;	557	# in .xs
483
484	return () unless $self->{can_events};
485
486	return $self
487	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
488	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
489
490	()
491	}
492		558
493	sub set_parent {	559	sub set_parent {
494	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
495		561
496	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
497	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
498	}	564	}
499		565
500	sub realloc {	566	sub realloc {
501	my ($self) = @_;	567	my ($self) = @_;
…		…
535	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
536		602
537	# update screen rectangle	603	# update screen rectangle
538	local $draw_x = $draw_x + $self->{x};	604	local $draw_x = $draw_x + $self->{x};
539	local $draw_y = $draw_y + $self->{y};	605	local $draw_y = $draw_y + $self->{y};
540	local $draw_w = $draw_x + $self->{w};
541	local $draw_h = $draw_y + $self->{h};
542		606
543	# skip widgets that are entirely outside the drawing area	607	# skip widgets that are entirely outside the drawing area
544	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546		610
…		…
569	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
570	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
571	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
572	glEnd;	636	glEnd;
573	glPopMatrix;	637	glPopMatrix;
574	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
575	}	639	}
576		640
577	$self->_draw;	641	$self->_draw;
578	glPopMatrix;	642	glPopMatrix;
579	}	643	}
…		…
582	my ($self) = @_;	646	my ($self) = @_;
583		647
584	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
585	}	649	}
586		650
		651	my $cntx;#d#
587	sub DESTROY {	652	sub DESTROY {
588	my ($self) = @_;	653	my ($self) = @_;
589		654
590	delete $WIDGET{$self+0};	655	return if CFPlus::in_destruct;
591		656
592	eval { $self->destroy };	657	eval { $self->destroy };
593	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
594	}	661	}
595		662
596	#############################################################################	663	#############################################################################
597		664
598	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
599		666
600	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
601		668
602	use strict;	669	use strict;
603	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
604		671
605	sub new {	672	sub new {
606	my $class = shift;	673	my $class = shift;
607		674
608	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
639	}	706	}
640	}	707	}
641		708
642	#############################################################################	709	#############################################################################
643		710
644	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
645		712
646	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
647		714
648	sub new {	715	sub new {
649	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
650	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
651	}	718	}
…		…
658		725
659	sub draw { }	726	sub draw { }
660		727
661	#############################################################################	728	#############################################################################
662		729
663	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
664		731
665	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
666		733
667	sub new {	734	sub new {
668	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
669		736
670	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
674	can_events => 0,	741	can_events => 0,
675	%arg,	742	%arg,
676	);	743	);
677		744
678	$self->add (@$children)	745	$self->add (@$children)
679	if $children;	746	if $children && @$children;
680		747
681	$self	748	$self
		749	}
		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
682	}	757	}
683		758
684	sub add {	759	sub add {
685	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
686		761
687	$_->set_parent ($self)	762	$_->set_parent ($self)
688	for @widgets;	763	for @widgets;
689		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
690	use sort 'stable';	766	use sort 'stable';
691		767
692	$self->{children} = [	768	$self->{children} = [
693	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
694	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
695	];	771	];
696		772
697	$self->realloc;	773	$self->realloc;
		774
		775	map $_+0, @widgets
698	}	776	}
699		777
700	sub children {	778	sub children {
701	@{ $_[0]{children} }	779	@{ $_[0]{children} }
702	}	780	}
…		…
713	}	791	}
714		792
715	sub clear {	793	sub clear {
716	my ($self) = @_;	794	my ($self) = @_;
717		795
718	my $children = delete $self->{children};	796	my $children = $self->{children};
719	$self->{children} = [];	797	$self->{children} = [];
720		798
721	for (@$children) {	799	for (@$children) {
722	delete $_->{parent};	800	delete $_->{parent};
723	$_->hide;	801	$_->hide;
…		…
748	$_->draw for @{$self->{children}};	826	$_->draw for @{$self->{children}};
749	}	827	}
750		828
751	#############################################################################	829	#############################################################################
752		830
753	package CFClient::UI::Bin;	831	package CFPlus::UI::Bin;
754		832
755	our @ISA = CFClient::UI::Container::;	833	our @ISA = CFPlus::UI::Container::;
756		834
757	sub new {	835	sub new {
758	my ($class, %arg) = @_;	836	my ($class, %arg) = @_;
759		837
760	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	838	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761		839
762	$class->SUPER::new (children => [$child], %arg)	840	$class->SUPER::new (children => [$child], %arg)
763	}	841	}
764		842
765	sub add {	843	sub add {
…		…
772	sub remove {	850	sub remove {
773	my ($self, $widget) = @_;	851	my ($self, $widget) = @_;
774		852
775	$self->SUPER::remove ($widget);	853	$self->SUPER::remove ($widget);
776		854
777	$self->{children} = [new CFClient::UI::Empty]	855	$self->{children} = [new CFPlus::UI::Empty]
778	unless @{$self->{children}};	856	unless @{$self->{children}};
779	}	857	}
780		858
781	sub child { $_[0]->{children}[0] }	859	sub child { $_[0]->{children}[0] }
782		860
…		…
794		872
795	#############################################################################	873	#############################################################################
796		874
797	# back-buffered drawing area	875	# back-buffered drawing area
798		876
799	package CFClient::UI::Window;	877	package CFPlus::UI::Window;
800		878
801	our @ISA = CFClient::UI::Bin::;	879	our @ISA = CFPlus::UI::Bin::;
802		880
803	use CFClient::OpenGL;	881	use CFPlus::OpenGL;
804		882
805	sub new {	883	sub new {
806	my ($class, %arg) = @_;	884	my ($class, %arg) = @_;
807		885
808	my $self = $class->SUPER::new (%arg);	886	my $self = $class->SUPER::new (%arg);
…		…
830	}	908	}
831		909
832	sub render_child {	910	sub render_child {
833	my ($self) = @_;	911	my ($self) = @_;
834		912
835	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	913	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836	glClearColor 0, 0, 0, 0;	914	glClearColor 0, 0, 0, 0;
837	glClear GL_COLOR_BUFFER_BIT;	915	glClear GL_COLOR_BUFFER_BIT;
838		916
839	{	917	{
840	package CFClient::UI::Base;	918	package CFPlus::UI::Base;
841		919
842	($draw_x, $draw_y, $draw_w, $draw_h) =	920	local ($draw_x, $draw_y, $draw_w, $draw_h) =
843	(0, 0, $self->{w}, $self->{h});	921	(0, 0, $self->{w}, $self->{h});
		922
		923	$self->_render;
844	}	924	}
845
846	$self->_render;
847	};	925	};
848	}	926	}
849		927
850	sub _draw {	928	sub _draw {
851	my ($self) = @_;	929	my ($self) = @_;
852
853	my ($w, $h) = @$self{qw(w h)};
854		930
855	my $tex = $self->{texture}	931	my $tex = $self->{texture}
856	or return;	932	or return;
857		933
858	glEnable GL_TEXTURE_2D;	934	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	935	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860	glColor 0, 0, 0, 1;	936	glColor 0, 0, 0, 1;
861		937
862	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	938	$tex->draw_quad_alpha_premultiplied (0, 0);
863		939
864	glDisable GL_TEXTURE_2D;	940	glDisable GL_TEXTURE_2D;
865	}	941	}
866		942
867	#############################################################################	943	#############################################################################
868		944
869	package CFClient::UI::ViewPort;	945	package CFPlus::UI::ViewPort;
870		946
		947	use List::Util qw(min max);
		948
871	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
872		950
873	sub new {	951	sub new {
874	my $class = shift;	952	my $class = shift;
875		953
876	$class->SUPER::new (	954	$class->SUPER::new (
…		…
883	sub size_request {	961	sub size_request {
884	my ($self) = @_;	962	my ($self) = @_;
885		963
886	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	964	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
887		965
888	$w = 10 if $self->{scroll_x};	966	$w = 1 if $self->{scroll_x};
889	$h = 10 if $self->{scroll_y};	967	$h = 1 if $self->{scroll_y};
890		968
891	($w, $h)	969	($w, $h)
892	}	970	}
893		971
894	sub invoke_size_allocate {	972	sub invoke_size_allocate {
…		…
906	}	984	}
907		985
908	sub set_offset {	986	sub set_offset {
909	my ($self, $x, $y) = @_;	987	my ($self, $x, $y) = @_;
910		988
		989	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		990	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		991
		992	if ($x != $self->{view_x} or $y != $self->{view_y}) {
911	$self->{view_x} = int $x;	993	$self->{view_x} = $x;
912	$self->{view_y} = int $y;	994	$self->{view_y} = $y;
913		995
		996	$self->emit (changed => $x, $y);
914	$self->update;	997	$self->update;
		998	}
915	}	999	}
916		1000
917	# hmm, this does not work for topleft of $self... but we should not ask for that	1001	# hmm, this does not work for topleft of $self... but we should not ask for that
918	sub coord2local {	1002	sub coord2local {
919	my ($self, $x, $y) = @_;	1003	my ($self, $x, $y) = @_;
…		…
934	my ($self, $x, $y) = @_;	1018	my ($self, $x, $y) = @_;
935		1019
936	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1020	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1021	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
938	) {	1022	) {
939	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1023	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940	} else {	1024	} else {
941	$self->CFClient::UI::Base::find_widget ($x, $y)	1025	$self->CFPlus::UI::Base::find_widget ($x, $y)
942	}	1026	}
943	}	1027	}
944		1028
945	sub _render {	1029	sub _render {
946	my ($self) = @_;	1030	my ($self) = @_;
947		1031
948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1032	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1033	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950		1034
951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1035	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952		1036
953	$self->SUPER::_render;	1037	$self->SUPER::_render;
954	}	1038	}
955		1039
956	#############################################################################	1040	#############################################################################
957		1041
958	package CFClient::UI::ScrolledWindow;	1042	package CFPlus::UI::ScrolledWindow;
959		1043
960	our @ISA = CFClient::UI::HBox::;	1044	our @ISA = CFPlus::UI::Table::;
961		1045
962	sub new {	1046	sub new {
963	my ($class, %arg) = @_;	1047	my ($class, %arg) = @_;
964		1048
965	my $child = delete $arg{child};	1049	my $child = delete $arg{child};
966		1050
967	my $self;	1051	my $self;
968		1052
969	my $slider = new CFClient::UI::Slider	1053	my $hslider = new CFPlus::UI::Slider
		1054	col => 0,
		1055	row => 1,
		1056	vertical => 0,
		1057	range => [0, 0, 1, 0.01], # HACK fix
		1058	on_changed => sub {
		1059	$self->{hpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1061	},
		1062	;
		1063
		1064	my $vslider = new CFPlus::UI::Slider
		1065	col => 1,
		1066	row => 0,
970	vertical => 1,	1067	vertical => 1,
971	range => [0, 0, 1, 0.01], # HACK fix	1068	range => [0, 0, 1, 0.01], # HACK fix
972	on_changed => sub {	1069	on_changed => sub {
973	$self->{vp}->set_offset (0, $_[1]);	1070	$self->{vpos} = $_[1];
		1071	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974	},	1072	},
975	;	1073	;
976		1074
977	$self = $class->SUPER::new (	1075	$self = $class->SUPER::new (
978	vp => (new CFClient::UI::ViewPort expand => 1),	1076	scroll_x => 0,
		1077	scroll_y => 1,
		1078	can_events => 1,
979	slider => $slider,	1079	hslider => $hslider,
		1080	vslider => $vslider,
		1081	col_expand => [1, 0],
		1082	row_expand => [1, 0],
980	%arg,	1083	%arg,
981	);	1084	);
982		1085
		1086	$self->{vp} = new CFPlus::UI::ViewPort
		1087	col => 0,
		1088	row => 0,
		1089	expand => 1,
		1090	scroll_x => $self->{scroll_x},
		1091	scroll_y => $self->{scroll_y},
		1092	on_changed => sub {
		1093	my ($vp, $x, $y) = @_;
		1094
		1095	$vp->{parent}{hslider}->set_value ($x);
		1096	$vp->{parent}{vslider}->set_value ($y);
		1097
		1098	0
		1099	},
		1100	;
		1101
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1102	$self->SUPER::add ($self->{vp});
		1103
984	$self->add ($child) if $child;	1104	$self->add ($child) if $child;
985		1105
986	$self	1106	$self
987	}	1107	}
988		1108
…		…
990	my ($self, $widget) = @_;	1110	my ($self, $widget) = @_;
991		1111
992	$self->{vp}->add ($self->{child} = $widget);	1112	$self->{vp}->add ($self->{child} = $widget);
993	}	1113	}
994		1114
995	sub update {	1115	sub update_slider {
		1116	my ($self) = @_;
		1117
		1118	my $child = ($self->{vp} or return)->child;
		1119
		1120	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1121	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1122
		1123	my $visible = $w1 > $w2;
		1124	if ($visible != $self->{hslider_visible}) {
		1125	$self->{hslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{hslider})
		1127	: $self->SUPER::remove ($self->{hslider});
		1128	}
		1129
		1130	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1131	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1132
		1133	my $visible = $h1 > $h2;
		1134	if ($visible != $self->{vslider_visible}) {
		1135	$self->{vslider_visible} = $visible;
		1136	$visible ? $self->SUPER::add ($self->{vslider})
		1137	: $self->SUPER::remove ($self->{vslider});
		1138	}
		1139	}
		1140
		1141	sub start_dragging {
996	my ($self) = @_;	1142	my ($self, $ev) = @_;
997		1143
998	$self->SUPER::update;	1144	$self->grab_focus;
999		1145
1000	# todo: overwrite size_allocate of child	1146	my $ox = $self->{vp}{view_x};
1001	my $child = $self->{vp}->child;	1147	my $oy = $self->{vp}{view_y};
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1148
		1149	$self->{motion} = sub {
		1150	my ($ev, $x, $y) = @_;
		1151
		1152	$ox -= $ev->{xrel};
		1153	$oy -= $ev->{yrel};
		1154
		1155	$self->{vp}->set_offset ($ox, $oy);
		1156	};
		1157	}
		1158
		1159	sub invoke_mouse_wheel {
		1160	my ($self, $ev) = @_;
		1161
		1162	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1163	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1164
		1165	1
		1166	}
		1167
		1168	sub invoke_button_down {
		1169	my ($self, $ev, $x, $y) = @_;
		1170
		1171	if ($ev->{button} == 2) {
		1172	$self->start_dragging ($ev);
		1173	return 1;
		1174	}
		1175
		1176	0
		1177	}
		1178
		1179	sub invoke_button_up {
		1180	my ($self, $ev, $x, $y) = @_;
		1181
		1182	if (delete $self->{motion}) {
		1183	return 1;
		1184	}
		1185
		1186	0
		1187	}
		1188
		1189	sub invoke_mouse_motion {
		1190	my ($self, $ev, $x, $y) = @_;
		1191
		1192	if ($self->{motion}) {
		1193	$self->{motion}->($ev, $x, $y);
		1194	return 1;
		1195	}
		1196
		1197	0
1003	}	1198	}
1004		1199
1005	sub invoke_size_allocate {	1200	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1201	my ($self, $w, $h) = @_;
1007		1202
1008	my $child = $self->{vp}->child;	1203	$self->update_slider;
1009	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011	$self->SUPER::invoke_size_allocate ($w, $h)	1204	$self->SUPER::invoke_size_allocate ($w, $h)
1012	}	1205	}
1013		1206
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016
1017	#############################################################################	1207	#############################################################################
1018		1208
1019	package CFClient::UI::Frame;	1209	package CFPlus::UI::Frame;
1020		1210
1021	our @ISA = CFClient::UI::Bin::;	1211	our @ISA = CFPlus::UI::Bin::;
1022		1212
1023	use CFClient::OpenGL;	1213	use CFPlus::OpenGL;
1024		1214
1025	sub new {	1215	sub new {
1026	my $class = shift;	1216	my $class = shift;
1027		1217
1028	$class->SUPER::new (	1218	$class->SUPER::new (
…		…
1054	$self->SUPER::_draw;	1244	$self->SUPER::_draw;
1055	}	1245	}
1056		1246
1057	#############################################################################	1247	#############################################################################
1058		1248
1059	package CFClient::UI::FancyFrame;	1249	package CFPlus::UI::FancyFrame;
1060		1250
1061	our @ISA = CFClient::UI::Bin::;	1251	our @ISA = CFPlus::UI::Bin::;
1062		1252
1063	use CFClient::OpenGL;	1253	use CFPlus::OpenGL;
		1254
		1255	sub new {
		1256	my ($class, %arg) = @_;
		1257
		1258	if ((exists $arg{label}) && !ref $arg{label}) {
		1259	$arg{label} = new CFPlus::UI::Label
		1260	align => 1,
		1261	valign => 0,
		1262	text => $arg{label},
		1263	fontsize => ($arg{border} || 0.8) * 0.75;
		1264	}
		1265
		1266	my $self = $class->SUPER::new (
		1267	# label => "",
		1268	fg => [0.6, 0.3, 0.1],
		1269	border => 0.8,
		1270	style => 'single',
		1271	%arg,
		1272	);
		1273
		1274	$self
		1275	}
		1276
		1277	sub add {
		1278	my ($self, @widgets) = @_;
		1279
		1280	$self->SUPER::add (@widgets);
		1281	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1282	}
		1283
		1284	sub border {
		1285	int $_[0]{border} * $::FONTSIZE
		1286	}
		1287
		1288	sub size_request {
		1289	my ($self) = @_;
		1290
		1291	($self->{label_w}, undef) = $self->{label}->size_request
		1292	if $self->{label};
		1293
		1294	my ($w, $h) = $self->SUPER::size_request;
		1295
		1296	(
		1297	$w + $self->border * 2,
		1298	$h + $self->border * 2,
		1299	)
		1300	}
		1301
		1302	sub invoke_size_allocate {
		1303	my ($self, $w, $h) = @_;
		1304
		1305	my $border = $self->border;
		1306
		1307	$w -= List::Util::max 0, $border * 2;
		1308	$h -= List::Util::max 0, $border * 2;
		1309
		1310	if (my $label = $self->{label}) {
		1311	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1312	$label->{h} = List::Util::min $h, $border;
		1313	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1314	}
		1315
		1316	$self->child->configure ($border, $border, $w, $h);
		1317
		1318	1
		1319	}
		1320
		1321	sub _draw {
		1322	my ($self) = @_;
		1323
		1324	my $child = $self->{children}[0];
		1325
		1326	my $border = $self->border;
		1327	my ($w, $h) = ($self->{w}, $self->{h});
		1328
		1329	$child->draw;
		1330
		1331	glColor @{$self->{fg}};
		1332	glBegin GL_LINE_STRIP;
		1333	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1334	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1335	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1336	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1337	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1338	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1339	glEnd;
		1340
		1341	if ($self->{label}) {
		1342	glTranslate $border * 2, 0;
		1343	$self->{label}->_draw;
		1344	}
		1345	}
		1346
		1347	#############################################################################
		1348
		1349	package CFPlus::UI::Toplevel;
		1350
		1351	our @ISA = CFPlus::UI::Bin::;
		1352
		1353	use CFPlus::OpenGL;
1064		1354
1065	my $bg =	1355	my $bg =
1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1356	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067	mipmap => 1, wrap => 1;	1357	mipmap => 1, wrap => 1;
1068		1358
1069	my @border =	1359	my @border =
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1360	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1361	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1362
		1363	my @icon =
		1364	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1365	qw(x1_move.png x1_resize.png);
1072		1366
1073	sub new {	1367	sub new {
1074	my ($class, %arg) = @_;	1368	my ($class, %arg) = @_;
1075		1369
1076	my $self = $class->SUPER::new (	1370	my $self = $class->SUPER::new (
1077	bg => [1, 1, 1, 1],	1371	bg => [1, 1, 1, 1],
1078	border_bg => [1, 1, 1, 1],	1372	border_bg => [1, 1, 1, 1],
1079	border => 0.6,	1373	border => 0.6,
1080	can_events => 1,	1374	can_events => 1,
1081	min_w => 16,	1375	min_w => 64,
1082	min_h => 16,	1376	min_h => 32,
1083	%arg,	1377	%arg,
1084	);	1378	);
1085		1379
1086	$self->{title_widget} = new CFClient::UI::Label	1380	$self->{title_widget} = new CFPlus::UI::Label
1087	align => 0,	1381	align => 0,
1088	valign => 1,	1382	valign => 1,
1089	text => $self->{title},	1383	text => $self->{title},
1090	fontsize => $self->{border},	1384	fontsize => $self->{border},
1091	if exists $self->{title};	1385	if exists $self->{title};
1092		1386
1093	if ($self->{has_close_button}) {	1387	if ($self->{has_close_button}) {
1094	$self->{close_button} =	1388	$self->{close_button} =
1095	new CFClient::UI::ImageButton	1389	new CFPlus::UI::ImageButton
1096	image => 'x1_close.png',	1390	path => 'x1_close.png',
1097	on_activate => sub { $self->hide };	1391	on_activate => sub { $self->emit ("delete") };
1098		1392
1099	$self->CFClient::UI::Container::add ($self->{close_button});	1393	$self->CFPlus::UI::Container::add ($self->{close_button});
1100	}	1394	}
1101		1395
1102	$self	1396	$self
1103	}	1397	}
1104		1398
1105	sub add {	1399	sub add {
1106	my ($self, @widgets) = @_;	1400	my ($self, @widgets) = @_;
1107		1401
1108	$self->SUPER::add (@widgets);	1402	$self->SUPER::add (@widgets);
1109	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1403	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1404	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111	}	1405	}
1112		1406
1113	sub border {	1407	sub border {
1114	int $_[0]{border} * $::FONTSIZE	1408	int $_[0]{border} * $::FONTSIZE
1115	}	1409	}
…		…
1148	$self->child->configure ($border, $border, $w, $h);	1442	$self->child->configure ($border, $border, $w, $h);
1149		1443
1150	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1444	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151	if $self->{close_button};	1445	if $self->{close_button};
1152		1446
		1447	1
		1448	}
		1449
		1450	sub invoke_delete {
		1451	my ($self) = @_;
		1452
		1453	$self->hide;
		1454
1153	1	1455	1
1154	}	1456	}
1155		1457
1156	sub invoke_button_down {	1458	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1459	my ($self, $ev, $x, $y) = @_;
…		…
1215	$self->{motion}->($ev, $x, $y) if $self->{motion};	1517	$self->{motion}->($ev, $x, $y) if $self->{motion};
1216		1518
1217	! ! $self->{motion}	1519	! ! $self->{motion}
1218	}	1520	}
1219		1521
		1522	sub invoke_visibility_change {
		1523	my ($self, $visible) = @_;
		1524
		1525	delete $self->{motion} unless $visible;
		1526
		1527	0
		1528	}
		1529
1220	sub _draw {	1530	sub _draw {
1221	my ($self) = @_;	1531	my ($self) = @_;
1222		1532
1223	my $child = $self->{children}[0];	1533	my $child = $self->{children}[0];
1224		1534
…		…
1229	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1539	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1230		1540
1231	my $border = $self->border;	1541	my $border = $self->border;
1232		1542
1233	glColor @{ $self->{border_bg} };	1543	glColor @{ $self->{border_bg} };
1234	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1544	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1235	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1545	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1236	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1546	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1237	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1547	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1548
		1549	# move
		1550	my $w2 = ($w - $border) * .5;
		1551	my $h2 = ($h - $border) * .5;
		1552	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1553	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1554	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1555
		1556	# resize
		1557	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1558	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1559	unless $self->{has_close_button};
		1560	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1561	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1238		1562
1239	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1563	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1240	glColor @{ $self->{bg} };	1564	glColor @{ $self->{bg} };
1241		1565
1242	# TODO: repeat texture not scale	1566	# TODO: repeat texture not scale
…		…
1261	if $self->{close_button};	1585	if $self->{close_button};
1262	}	1586	}
1263		1587
1264	#############################################################################	1588	#############################################################################
1265		1589
1266	package CFClient::UI::Table;	1590	package CFPlus::UI::Table;
1267		1591
1268	our @ISA = CFClient::UI::Base::;	1592	our @ISA = CFPlus::UI::Container::;
1269		1593
1270	use List::Util qw(max sum);	1594	use List::Util qw(max sum);
1271		1595
1272	use CFClient::OpenGL;	1596	use CFPlus::OpenGL;
1273		1597
1274	sub new {	1598	sub new {
1275	my $class = shift;	1599	my $class = shift;
1276		1600
1277	$class->SUPER::new (	1601	$class->SUPER::new (
1278	col_expand => [],	1602	col_expand => [],
		1603	row_expand => [],
1279	@_,	1604	@_,
1280	)	1605	)
1281	}	1606	}
1282		1607
1283	sub children {
1284	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285	}
1286
1287	sub add {	1608	sub add {
1288	my ($self, $x, $y, $child) = @_;	1609	my ($self, @widgets) = @_;
1289		1610
1290	$child->set_parent ($self);	1611	for my $child (@widgets) {
1291	$self->{children}[$y][$x] = $child;	1612	$child->{rowspan} ||= 1;
		1613	$child->{colspan} ||= 1;
		1614	}
1292		1615
1293	$self->realloc;	1616	$self->SUPER::add (@widgets);
1294	}	1617	}
1295		1618
1296	sub remove {	1619	sub add_at {
		1620	my $self = shift;
		1621
		1622	my @widgets;
		1623
		1624	while (@_) {
		1625	my ($col, $row, $child) = splice @_, 0, 3, ();
		1626
		1627	$child->{row} = $row;
		1628	$child->{col} = $col;
		1629
		1630	push @widgets, $child;
		1631	}
		1632
		1633	$self->add (@widgets);
		1634	}
		1635
		1636	sub get_wh {
1297	my ($self, $child) = @_;	1637	my ($self) = @_;
1298		1638
1299	# TODO: not yet implemented	1639	my (@w, @h);
1300	}
1301
1302	# TODO: move to container class maybe? send children a signal on removal?
1303	sub clear {
1304	my ($self) = @_;
1305		1640
1306	my @children = $self->children;	1641	my @children = $self->children;
1307	delete $self->{children};	1642
		1643	# first pass, columns
		1644	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1645	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1646
		1647	my $sw = sum @w[$c .. $c + $cs - 1];
		1648
		1649	if ($w > $sw) {
		1650	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1651	}
1308		1652	}
1309	for (@children) {
1310	delete $_->{parent};
1311	$_->hide;
1312	}
1313		1653
1314	$self->realloc;	1654	# second pass, rows
1315	}	1655	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1316
1317	sub get_wh {
1318	my ($self) = @_;
1319
1320	my (@w, @h);
1321
1322	for my $y (0 .. $#{$self->{children}}) {
1323	my $row = $self->{children}[$y]
1324	or next;
1325
1326	for my $x (0 .. $#$row) {
1327	my $widget = $row->[$x]
1328	or next;
1329	my ($w, $h) = @$widget{qw(req_w req_h)};	1656	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1330		1657
1331	$w[$x] = max $w[$x], $w;	1658	my $sh = sum @h[$r .. $r + $rs - 1];
1332	$h[$y] = max $h[$y], $h;	1659
		1660	if ($h > $sh) {
		1661	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1333	}	1662	}
1334	}	1663	}
1335		1664
1336	(\@w, \@h)	1665	(\@w, \@h)
1337	}	1666	}
…		…
1353	my ($ws, $hs) = $self->get_wh;	1682	my ($ws, $hs) = $self->get_wh;
1354		1683
1355	my $req_w = (sum @$ws) || 1;	1684	my $req_w = (sum @$ws) || 1;
1356	my $req_h = (sum @$hs) || 1;	1685	my $req_h = (sum @$hs) || 1;
1357		1686
1358	# TODO: nicer code && do row_expand	1687	# now linearly scale the rows/columns to the allocated size
1359	my @col_expand = @{$self->{col_expand}};	1688	my @col_expand = @{$self->{col_expand}};
1360	@col_expand = (1) x @$ws unless @col_expand;	1689	@col_expand = (1) x @$ws unless @col_expand;
1361	my $col_expand = (sum @col_expand) || 1;	1690	my $col_expand = (sum @col_expand) || 1;
1362		1691
1363	# linearly scale sizes
1364	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1692	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366		1693
1367	CFClient::UI::harmonize $ws;	1694	CFPlus::UI::harmonize $ws;
		1695
		1696	my @row_expand = @{$self->{row_expand}};
		1697	@row_expand = (1) x @$ws unless @row_expand;
		1698	my $row_expand = (sum @row_expand) || 1;
		1699
		1700	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1701
1368	CFClient::UI::harmonize $hs;	1702	CFPlus::UI::harmonize $hs;
1369		1703
1370	my $y;	1704	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1705	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1371		1706
1372	for my $r (0 .. $#{$self->{children}}) {	1707	for my $widget ($self->children) {
1373	my $row = $self->{children}[$r]	1708	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1374	or next;
1375		1709
1376	my $x = 0;	1710	$widget->configure (
1377	my $row_h = $hs->[$r];	1711	$x[$c], $y[$r],
		1712	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1378		1713	);
1379	for my $c (0 .. $#$row) {	1714	}
1380	my $col_w = $ws->[$c];
1381		1715
1382	if (my $widget = $row->[$c]) {	1716	1
1383	$widget->configure ($x, $y, $col_w, $row_h);	1717	}
1384	}
1385		1718
1386	$x += $col_w;	1719	#############################################################################
		1720
		1721	package CFPlus::UI::Fixed;
		1722
		1723	use List::Util qw(min max);
		1724
		1725	our @ISA = CFPlus::UI::Container::;
		1726
		1727	sub add {
		1728	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1729
		1730	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1731	$self->SUPER::add ($child);
		1732	}
		1733
		1734	sub _scale($$$) {
		1735	my ($mode, $val, $max) = @_;
		1736
		1737	$mode eq "abs" ? $val
		1738	: $mode eq "rel" ? $val * $max
		1739	: 0
		1740	}
		1741
		1742	sub size_request {
		1743	my ($self) = @_;
		1744
		1745	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1746
		1747	# determine overall size by querying abs widgets
		1748	for my $child ($self->visible_children) {
		1749	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1750
		1751	if ($pos eq "abs") {
		1752	$w = _scale $size, $w, $child->{req_w};
		1753	$h = _scale $size, $h, $child->{req_h};
		1754
		1755	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1756	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1387	}	1757	}
		1758	}
1388		1759
1389	$y += $row_h;	1760	my $W = $x2 - $x1;
		1761	my $H = $y2 - $y1;
		1762
		1763	# now layout remaining widgets
		1764	for my $child ($self->visible_children) {
		1765	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1766
		1767	if ($pos ne "abs") {
		1768	$x = _scale $pos, $x, $W;
		1769	$y = _scale $pos, $x, $H;
		1770	$w = _scale $size, $w, $child->{req_w};
		1771	$h = _scale $size, $h, $child->{req_h};
		1772
		1773	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1774	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1775	}
		1776	}
		1777
		1778	my $W = $x2 - $x1;
		1779	my $H = $y2 - $y1;
		1780
		1781	($W, $H)
		1782	}
		1783
		1784	sub invoke_size_allocate {
		1785	my ($self, $W, $H) = @_;
		1786
		1787	for my $child ($self->visible_children) {
		1788	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1789
		1790	$x = _scale $pos, $x, $W;
		1791	$y = _scale $pos, $x, $H;
		1792	$w = _scale $size, $w, $child->{req_w};
		1793	$h = _scale $size, $h, $child->{req_h};
		1794
		1795	$child->configure ($x, $y, $w, $h);
1390	}	1796	}
1391		1797
1392	1	1798	1
1393	}	1799	}
1394		1800
1395	sub find_widget {
1396	my ($self, $x, $y) = @_;
1397
1398	$x -= $self->{x};
1399	$y -= $self->{y};
1400
1401	my $res;
1402
1403	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1404	$res = $_->find_widget ($x, $y)
1405	and return $res;
1406	}
1407
1408	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1409	}
1410
1411	sub _draw {
1412	my ($self) = @_;
1413
1414	for (grep $_, @{$self->{children}}) {
1415	$_->draw for grep $_, @$_;
1416	}
1417	}
1418
1419	#############################################################################	1801	#############################################################################
1420		1802
1421	package CFClient::UI::Box;	1803	package CFPlus::UI::Box;
1422		1804
1423	our @ISA = CFClient::UI::Container::;	1805	our @ISA = CFPlus::UI::Container::;
1424		1806
1425	sub size_request {	1807	sub size_request {
1426	my ($self) = @_;	1808	my ($self) = @_;
1427		1809
1428	$self->{vertical}	1810	$self->{vertical}
…		…
1438		1820
1439	sub invoke_size_allocate {	1821	sub invoke_size_allocate {
1440	my ($self, $w, $h) = @_;	1822	my ($self, $w, $h) = @_;
1441		1823
1442	my $space = $self->{vertical} ? $h : $w;	1824	my $space = $self->{vertical} ? $h : $w;
1443	my $children = $self->{children};	1825	my @children = $self->visible_children;
1444		1826
1445	my @req;	1827	my @req;
1446		1828
1447	if ($self->{homogeneous}) {	1829	if ($self->{homogeneous}) {
1448	@req = ($space / (@$children || 1)) x @$children;	1830	@req = ($space / (@children || 1)) x @children;
1449	} else {	1831	} else {
1450	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1832	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451	my $req = List::Util::sum @req;	1833	my $req = List::Util::sum @req;
1452		1834
1453	if ($req > $space) {	1835	if ($req > $space) {
1454	# ah well, not enough space	1836	# ah well, not enough space
1455	$_ *= $space / $req for @req;	1837	$_ *= $space / $req for @req;
1456	} else {	1838	} else {
1457	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1839	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458		1840
1459	$space = ($space - $req) / $expand; # remaining space to give away	1841	$space = ($space - $req) / $expand; # remaining space to give away
1460		1842
1461	$req[$_] += $space * $children->[$_]{expand}	1843	$req[$_] += $space * $children[$_]{expand}
1462	for 0 .. $#$children;	1844	for 0 .. $#children;
1463	}	1845	}
1464	}	1846	}
1465		1847
1466	CFClient::UI::harmonize \@req;	1848	CFPlus::UI::harmonize \@req;
1467		1849
1468	my $pos = 0;	1850	my $pos = 0;
1469	for (0 .. $#$children) {	1851	for (0 .. $#children) {
1470	my $alloc = $req[$_];	1852	my $alloc = $req[$_];
1471	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1853	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472		1854
1473	$pos += $alloc;	1855	$pos += $alloc;
1474	}	1856	}
1475		1857
1476	1	1858	1
1477	}	1859	}
1478		1860
1479	#############################################################################	1861	#############################################################################
1480		1862
1481	package CFClient::UI::HBox;	1863	package CFPlus::UI::HBox;
1482		1864
1483	our @ISA = CFClient::UI::Box::;	1865	our @ISA = CFPlus::UI::Box::;
1484		1866
1485	sub new {	1867	sub new {
1486	my $class = shift;	1868	my $class = shift;
1487		1869
1488	$class->SUPER::new (	1870	$class->SUPER::new (
…		…
1491	)	1873	)
1492	}	1874	}
1493		1875
1494	#############################################################################	1876	#############################################################################
1495		1877
1496	package CFClient::UI::VBox;	1878	package CFPlus::UI::VBox;
1497		1879
1498	our @ISA = CFClient::UI::Box::;	1880	our @ISA = CFPlus::UI::Box::;
1499		1881
1500	sub new {	1882	sub new {
1501	my $class = shift;	1883	my $class = shift;
1502		1884
1503	$class->SUPER::new (	1885	$class->SUPER::new (
…		…
1506	)	1888	)
1507	}	1889	}
1508		1890
1509	#############################################################################	1891	#############################################################################
1510		1892
1511	package CFClient::UI::Label;	1893	package CFPlus::UI::Label;
1512		1894
1513	our @ISA = CFClient::UI::DrawBG::;	1895	our @ISA = CFPlus::UI::DrawBG::;
1514		1896
1515	use CFClient::OpenGL;	1897	use CFPlus::OpenGL;
1516		1898
1517	sub new {	1899	sub new {
1518	my ($class, %arg) = @_;	1900	my ($class, %arg) = @_;
1519		1901
1520	my $self = $class->SUPER::new (	1902	my $self = $class->SUPER::new (
…		…
1523	#active_bg => none	1905	#active_bg => none
1524	#font => default_font	1906	#font => default_font
1525	#text => initial text	1907	#text => initial text
1526	#markup => initial narkup	1908	#markup => initial narkup
1527	#max_w => maximum pixel width	1909	#max_w => maximum pixel width
		1910	#style => 0, # render flags
1528	ellipsise => 3, # end	1911	ellipsise => 3, # end
1529	layout => (new CFClient::Layout),	1912	layout => (new CFPlus::Layout),
1530	fontsize => 1,	1913	fontsize => 1,
1531	align => -1,	1914	align => -1,
1532	valign => -1,	1915	valign => -1,
1533	padding_x => 2,	1916	padding_x => 2,
1534	padding_y => 2,	1917	padding_y => 2,
1535	can_events => 0,	1918	can_events => 0,
1536	%arg	1919	%arg
1537	);	1920	);
1538		1921
1539	if (exists $self->{template}) {	1922	if (exists $self->{template}) {
1540	my $layout = new CFClient::Layout;	1923	my $layout = new CFPlus::Layout;
1541	$layout->set_text (delete $self->{template});	1924	$layout->set_text (delete $self->{template});
1542	$self->{template} = $layout;	1925	$self->{template} = $layout;
1543	}	1926	}
1544		1927
1545	if (exists $self->{markup}) {	1928	if (exists $self->{markup}) {
…		…
1549	}	1932	}
1550		1933
1551	$self	1934	$self
1552	}	1935	}
1553		1936
1554	sub escape($) {
1555	local $_ = $_[0];
1556
1557	s/&/&amp;/g;
1558	s/>/&gt;/g;
1559	s/</&lt;/g;
1560
1561	$_
1562	}
1563
1564	sub update {	1937	sub update {
1565	my ($self) = @_;	1938	my ($self) = @_;
1566		1939
1567	delete $self->{texture};	1940	delete $self->{texture};
1568	$self->SUPER::update;	1941	$self->SUPER::update;
…		…
1579	my ($self, $text) = @_;	1952	my ($self, $text) = @_;
1580		1953
1581	return if $self->{text} eq "T$text";	1954	return if $self->{text} eq "T$text";
1582	$self->{text} = "T$text";	1955	$self->{text} = "T$text";
1583		1956
1584	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585	$self->{layout}->set_text ($text);	1957	$self->{layout}->set_text ($text);
1586		1958
1587	delete $self->{size_req};	1959	delete $self->{size_req};
1588	$self->realloc;	1960	$self->realloc;
1589	$self->update;	1961	$self->update;
…		…
1595	return if $self->{text} eq "M$markup";	1967	return if $self->{text} eq "M$markup";
1596	$self->{text} = "M$markup";	1968	$self->{text} = "M$markup";
1597		1969
1598	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1970	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599		1971
1600	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601	$self->{layout}->set_markup ($markup);	1972	$self->{layout}->set_markup ($markup);
1602		1973
1603	delete $self->{size_req};	1974	delete $self->{size_req};
1604	$self->realloc;	1975	$self->realloc;
1605	$self->update;	1976	$self->update;
…		…
1617		1988
1618	my ($w, $h) = $self->{layout}->size;	1989	my ($w, $h) = $self->{layout}->size;
1619		1990
1620	if (exists $self->{template}) {	1991	if (exists $self->{template}) {
1621	$self->{template}->set_font ($self->{font}) if $self->{font};	1992	$self->{template}->set_font ($self->{font}) if $self->{font};
		1993	$self->{template}->set_width ($self->{max_w} || -1);
1622	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1994	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623		1995
1624	my ($w2, $h2) = $self->{template}->size;	1996	my ($w2, $h2) = $self->{template}->size;
1625		1997
1626	$w = List::Util::max $w, $w2;	1998	$w = List::Util::max $w, $w2;
…		…
1631	};	2003	};
1632		2004
1633	@{ $self->{size_req} }	2005	@{ $self->{size_req} }
1634	}	2006	}
1635		2007
		2008	sub baseline_shift {
		2009	$_[0]{layout}->descent
		2010	}
		2011
1636	sub invoke_size_allocate {	2012	sub invoke_size_allocate {
1637	my ($self, $w, $h) = @_;	2013	my ($self, $w, $h) = @_;
1638		2014
1639	delete $self->{ox};	2015	delete $self->{ox};
1640		2016
…		…
1646		2022
1647	sub set_fontsize {	2023	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	2024	my ($self, $fontsize) = @_;
1649		2025
1650	$self->{fontsize} = $fontsize;	2026	$self->{fontsize} = $fontsize;
		2027	delete $self->{size_req};
1651	delete $self->{texture};	2028	delete $self->{texture};
1652		2029
1653	$self->realloc;	2030	$self->realloc;
1654	}	2031	}
1655		2032
1656	sub reconfigure {	2033	sub reconfigure {
1657	my ($self) = @_;	2034	my ($self) = @_;
1658		2035
1659	delete $self->{size_req};	2036	delete $self->{size_req};
		2037	delete $self->{texture};
1660		2038
1661	$self->SUPER::reconfigure;	2039	$self->SUPER::reconfigure;
1662	}	2040	}
1663		2041
1664	sub _draw {	2042	sub _draw {
1665	my ($self) = @_;	2043	my ($self) = @_;
1666		2044
1667	$self->SUPER::_draw; # draw background, if applicable	2045	$self->SUPER::_draw; # draw background, if applicable
1668		2046
1669	my $tex = $self->{texture} ||= do {	2047	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	2048	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	2049	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	2050	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	2051	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2052	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2053	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		2054
1677	new_from_layout CFClient::Texture $self->{layout}	2055	[$self->{layout}->size]
1678	};	2056	};
1679		2057
1680	unless (exists $self->{ox}) {	2058	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2059	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2060	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	2061	: ($self->{w} - $size->[0]) * 0.5);
1684		2062
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2063	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2064	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	2065	: ($self->{h} - $size->[1]) * 0.5);
1688	};	2066	};
1689		2067
1690	glEnable GL_TEXTURE_2D;
1691
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2068	my $w = List::Util::min $self->{w} + 4, $size->[0];
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2069	my $h = List::Util::min $self->{h} + 2, $size->[1];
1694		2070
1695	if ($tex->{format} == GL_ALPHA) {	2071	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697	glColor @{$self->{fg}};
1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699	} else {
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702	}
1703
1704	glDisable GL_TEXTURE_2D;
1705	}	2072	}
1706		2073
1707	#############################################################################	2074	#############################################################################
1708		2075
1709	package CFClient::UI::EntryBase;	2076	package CFPlus::UI::EntryBase;
1710		2077
1711	our @ISA = CFClient::UI::Label::;	2078	our @ISA = CFPlus::UI::Label::;
1712		2079
1713	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1714		2081
1715	sub new {	2082	sub new {
1716	my $class = shift;	2083	my $class = shift;
1717		2084
1718	$class->SUPER::new (	2085	$class->SUPER::new (
…		…
1722	active_fg => [0, 0, 0],	2089	active_fg => [0, 0, 0],
1723	can_hover => 1,	2090	can_hover => 1,
1724	can_focus => 1,	2091	can_focus => 1,
1725	valign => 0,	2092	valign => 0,
1726	can_events => 1,	2093	can_events => 1,
		2094	ellipsise => 0,
1727	#text => ...	2095	#text => ...
1728	#hidden => "*",	2096	#hidden => "*",
1729	@_	2097	@_
1730	)	2098	)
1731	}	2099	}
…		…
1776	my $sym = $ev->{sym};	2144	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	2145	my $uni = $ev->{unicode};
1778		2146
1779	my $text = $self->get_text;	2147	my $text = $self->get_text;
1780		2148
		2149	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2150
1781	if ($uni == 8) {	2151	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2152	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	2153	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	2154	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	2155	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	2156	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	2157	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	2158	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} elsif ($sym == CFClient::SDLK_HOME) {	2159	} elsif ($sym == CFPlus::SDLK_HOME) {
		2160	# what a hack
		2161	$self->{cursor} =
		2162	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2163	? length $1
		2164	: 0;
		2165	} elsif ($sym == CFPlus::SDLK_END) {
		2166	# uh, again
		2167	$self->{cursor} =
		2168	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2169	? $self->{cursor} + length $1
		2170	: length $self->{text};
		2171	} elsif ($uni == 21) { # ctrl-u
		2172	$text = "";
1790	$self->{cursor} = 0;	2173	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {
1792	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	2174	} elsif ($uni == 27) {
1794	$self->emit ('escape');	2175	$self->emit ('escape');
1795	} elsif ($uni) {	2176	} elsif ($uni == 0x0d) {
		2177	substr $text, $self->{cursor}++, 0, "\012";
		2178	} elsif ($uni >= 0x20) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	2179	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	2180	} else {
1798	return 0;	2181	return 0;
1799	}	2182	}
1800		2183
1801	$self->_set_text ($text);	2184	$self->_set_text ($text);
1802		2185
1803	$self->realloc;	2186	$self->realloc;
		2187	$self->update;
1804		2188
1805	1	2189	1
1806	}	2190	}
1807		2191
1808	sub invoke_focus_in {	2192	sub invoke_focus_in {
…		…
1820		2204
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	2205	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		2206
1823	# byte-index to char-index	2207	# byte-index to char-index
1824	my $text = $self->{text};	2208	my $text = $self->{text};
1825	utf8::encode $text;	2209	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	2210	$self->{cursor} = length $text;
1827		2211
1828	$self->_set_text ($self->{text});	2212	$self->_set_text ($self->{text});
1829	$self->update;	2213	$self->update;
1830		2214
1831	1	2215	1
…		…
1870	utf8::encode $text;	2254	utf8::encode $text;
1871		2255
1872	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2256	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873	}	2257	}
1874		2258
1875	glColor @{$self->{fg}};
1876	glBegin GL_LINES;	2259	glBegin GL_LINES;
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2260	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2261	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	2262	glEnd;
1880	}	2263	}
1881	}	2264	}
1882		2265
		2266	#############################################################################
		2267
1883	package CFClient::UI::Entry;	2268	package CFPlus::UI::Entry;
1884		2269
1885	our @ISA = CFClient::UI::EntryBase::;	2270	our @ISA = CFPlus::UI::EntryBase::;
1886		2271
1887	use CFClient::OpenGL;	2272	use CFPlus::OpenGL;
1888		2273
1889	sub invoke_key_down {	2274	sub invoke_key_down {
1890	my ($self, $ev) = @_;	2275	my ($self, $ev) = @_;
1891		2276
1892	my $sym = $ev->{sym};	2277	my $sym = $ev->{sym};
1893		2278
1894	if ($sym == 13) {	2279	if ($ev->{uni} == 0x0d || $sym == 13) {
1895	unshift @{$self->{history}},	2280	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	2281	my $txt = $self->get_text;
1897		2282
1898	$self->{history_pointer} = -1;	2283	$self->{history_pointer} = -1;
1899	$self->{history_saveback} = '';	2284	$self->{history_saveback} = '';
1900	$self->emit (activate => $txt);	2285	$self->emit (activate => $txt);
1901	$self->update;	2286	$self->update;
1902		2287
1903	} elsif ($sym == CFClient::SDLK_UP) {	2288	} elsif ($sym == CFPlus::SDLK_UP) {
1904	if ($self->{history_pointer} < 0) {	2289	if ($self->{history_pointer} < 0) {
1905	$self->{history_saveback} = $self->get_text;	2290	$self->{history_saveback} = $self->get_text;
1906	}	2291	}
1907	if (@{$self->{history} || []} > 0) {	2292	if (@{$self->{history} || []} > 0) {
1908	$self->{history_pointer}++;	2293	$self->{history_pointer}++;
…		…
1910	$self->{history_pointer} = @{$self->{history} || []} - 1;	2295	$self->{history_pointer} = @{$self->{history} || []} - 1;
1911	}	2296	}
1912	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2297	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1913	}	2298	}
1914		2299
1915	} elsif ($sym == CFClient::SDLK_DOWN) {	2300	} elsif ($sym == CFPlus::SDLK_DOWN) {
1916	$self->{history_pointer}--;	2301	$self->{history_pointer}--;
1917	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2302	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918		2303
1919	if ($self->{history_pointer} >= 0) {	2304	if ($self->{history_pointer} >= 0) {
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2305	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1929	1	2314	1
1930	}	2315	}
1931		2316
1932	#############################################################################	2317	#############################################################################
1933		2318
		2319	package CFPlus::UI::TextEdit;
		2320
		2321	our @ISA = CFPlus::UI::EntryBase::;
		2322
		2323	use CFPlus::OpenGL;
		2324
		2325	sub move_cursor_ver {
		2326	my ($self, $dy) = @_;
		2327
		2328	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2329
		2330	$y += $dy;
		2331
		2332	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2333	$self->{cursor} = $index;
		2334	delete $self->{cur_h};
		2335	$self->update;
		2336	return;
		2337	}
		2338	}
		2339
		2340	sub invoke_key_down {
		2341	my ($self, $ev) = @_;
		2342
		2343	my $sym = $ev->{sym};
		2344
		2345	if ($sym == CFPlus::SDLK_UP) {
		2346	$self->move_cursor_ver (-1);
		2347	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2348	$self->move_cursor_ver (+1);
		2349	} else {
		2350	return $self->SUPER::invoke_key_down ($ev)
		2351	}
		2352
		2353	1
		2354	}
		2355
		2356	#############################################################################
		2357
1934	package CFClient::UI::Button;	2358	package CFPlus::UI::Button;
1935		2359
1936	our @ISA = CFClient::UI::Label::;	2360	our @ISA = CFPlus::UI::Label::;
1937		2361
1938	use CFClient::OpenGL;	2362	use CFPlus::OpenGL;
1939		2363
1940	my @tex =	2364	my @tex =
1941	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2365	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942	qw(b1_button_active.png);	2366	qw(b1_button_inactive.png b1_button_active.png);
1943		2367
1944	sub new {	2368	sub new {
1945	my $class = shift;	2369	my $class = shift;
1946		2370
1947	$class->SUPER::new (	2371	$class->SUPER::new (
1948	padding_x => 4,	2372	padding_x => 4,
1949	padding_y => 4,	2373	padding_y => 4,
1950	fg => [1, 1, 1],	2374	fg => [1.0, 1.0, 1.0],
1951	active_fg => [0, 0, 1],	2375	active_fg => [0.8, 0.8, 0.8],
1952	can_hover => 1,	2376	can_hover => 1,
1953	align => 0,	2377	align => 0,
1954	valign => 0,	2378	valign => 0,
1955	can_events => 1,	2379	can_events => 1,
1956	@_	2380	@_
…		…
1974		2398
1975	glEnable GL_TEXTURE_2D;	2399	glEnable GL_TEXTURE_2D;
1976	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1977	glColor 0, 0, 0, 1;	2401	glColor 0, 0, 0, 1;
1978		2402
		2403	my $tex = $tex[$GRAB == $self];
1979	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2404	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1980		2405
1981	glDisable GL_TEXTURE_2D;	2406	glDisable GL_TEXTURE_2D;
1982		2407
1983	$self->SUPER::_draw;	2408	$self->SUPER::_draw;
1984	}	2409	}
1985		2410
1986	#############################################################################	2411	#############################################################################
1987		2412
		2413	package CFPlus::UI::CheckBox;
		2414
		2415	our @ISA = CFPlus::UI::DrawBG::;
		2416
		2417	my @tex =
		2418	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2419	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2420
		2421	use CFPlus::OpenGL;
		2422
		2423	sub new {
		2424	my $class = shift;
		2425
		2426	$class->SUPER::new (
		2427	padding_x => 2,
		2428	padding_y => 2,
		2429	fg => [1, 1, 1],
		2430	active_fg => [1, 1, 0],
		2431	bg => [0, 0, 0, 0.2],
		2432	active_bg => [1, 1, 1, 0.5],
		2433	state => 0,
		2434	can_hover => 1,
		2435	@_
		2436	)
		2437	}
		2438
		2439	sub size_request {
		2440	my ($self) = @_;
		2441
		2442	(6) x 2
		2443	}
		2444
		2445	sub toggle {
		2446	my ($self) = @_;
		2447
		2448	$self->{state} = !$self->{state};
		2449	$self->emit (changed => $self->{state});
		2450	$self->update;
		2451	}
		2452
		2453	sub invoke_button_down {
		2454	my ($self, $ev, $x, $y) = @_;
		2455
		2456	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2457	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2458	$self->toggle;
		2459	} else {
		2460	return 0
		2461	}
		2462
		2463	1
		2464	}
		2465
		2466	sub _draw {
		2467	my ($self) = @_;
		2468
		2469	$self->SUPER::_draw;
		2470
		2471	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2472
		2473	my ($w, $h) = @$self{qw(w h)};
		2474
		2475	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2476
		2477	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2478
		2479	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2480
		2481	glEnable GL_TEXTURE_2D;
		2482	$tex->draw_quad_alpha (0, 0, $s, $s);
		2483	glDisable GL_TEXTURE_2D;
		2484	}
		2485
		2486	#############################################################################
		2487
		2488	package CFPlus::UI::Image;
		2489
		2490	our @ISA = CFPlus::UI::Base::;
		2491
		2492	use CFPlus::OpenGL;
		2493
		2494	our %texture_cache;
		2495
		2496	sub new {
		2497	my $class = shift;
		2498
		2499	my $self = $class->SUPER::new (
		2500	can_events => 0,
		2501	@_,
		2502	);
		2503
		2504	$self->{path} || $self->{tex}
		2505	or Carp::croak "'path' or 'tex' attributes required";
		2506
		2507	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2508	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2509
		2510	CFPlus::weaken $texture_cache{$self->{path}};
		2511
		2512	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2513
		2514	$self
		2515	}
		2516
		2517	sub STORABLE_freeze {
		2518	my ($self, $cloning) = @_;
		2519
		2520	$self->{path}
		2521	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2522
		2523	$self->{path}
		2524	}
		2525
		2526	sub STORABLE_attach {
		2527	my ($self, $cloning, $path) = @_;
		2528
		2529	$self->new (path => $path)
		2530	}
		2531
		2532	sub size_request {
		2533	my ($self) = @_;
		2534
		2535	($self->{tex}{w}, $self->{tex}{h})
		2536	}
		2537
		2538	sub _draw {
		2539	my ($self) = @_;
		2540
		2541	my $tex = $self->{tex};
		2542
		2543	my ($w, $h) = ($self->{w}, $self->{h});
		2544
		2545	if ($self->{rot90}) {
		2546	glRotate 90, 0, 0, 1;
		2547	glTranslate 0, -$self->{w}, 0;
		2548
		2549	($w, $h) = ($h, $w);
		2550	}
		2551
		2552	glEnable GL_TEXTURE_2D;
		2553	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2554
		2555	$tex->draw_quad (0, 0, $w, $h);
		2556
		2557	glDisable GL_TEXTURE_2D;
		2558	}
		2559
		2560	#############################################################################
		2561
1988	package CFClient::UI::ImageButton;	2562	package CFPlus::UI::ImageButton;
1989		2563
1990	our @ISA = CFClient::UI::Image::;	2564	our @ISA = CFPlus::UI::Image::;
1991		2565
1992	use CFClient::OpenGL;	2566	use CFPlus::OpenGL;
1993		2567
1994	my %textures;	2568	my %textures;
1995		2569
1996	sub new {	2570	sub new {
1997	my $class = shift;	2571	my $class = shift;
…		…
2019	1	2593	1
2020	}	2594	}
2021		2595
2022	#############################################################################	2596	#############################################################################
2023		2597
2024	package CFClient::UI::CheckBox;
2025
2026	our @ISA = CFClient::UI::DrawBG::;
2027
2028	my @tex =
2029	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2030	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031
2032	use CFClient::OpenGL;
2033
2034	sub new {
2035	my $class = shift;
2036
2037	$class->SUPER::new (
2038	padding_x => 2,
2039	padding_y => 2,
2040	fg => [1, 1, 1],
2041	active_fg => [1, 1, 0],
2042	bg => [0, 0, 0, 0.2],
2043	active_bg => [1, 1, 1, 0.5],
2044	state => 0,
2045	can_hover => 1,
2046	@_
2047	)
2048	}
2049
2050	sub size_request {
2051	my ($self) = @_;
2052
2053	(6) x 2
2054	}
2055
2056	sub invoke_button_down {
2057	my ($self, $ev, $x, $y) = @_;
2058
2059	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061	$self->{state} = !$self->{state};
2062	$self->emit (changed => $self->{state});
2063	} else {
2064	return 0
2065	}
2066
2067	1
2068	}
2069
2070	sub _draw {
2071	my ($self) = @_;
2072
2073	$self->SUPER::_draw;
2074
2075	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2076
2077	my ($w, $h) = @$self{qw(w h)};
2078
2079	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2080
2081	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2082
2083	my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
2085	glEnable GL_TEXTURE_2D;
2086	$tex->draw_quad_alpha (0, 0, $s, $s);
2087	glDisable GL_TEXTURE_2D;
2088	}
2089
2090	#############################################################################
2091
2092	package CFClient::UI::Image;	2598	package CFPlus::UI::VGauge;
2093		2599
2094	our @ISA = CFClient::UI::Base::;	2600	our @ISA = CFPlus::UI::Base::;
2095
2096	use CFClient::OpenGL;
2097	use Carp qw/confess/;
2098
2099	our %loaded_images;
2100
2101	sub new {
2102	my $class = shift;
2103
2104	my $self = $class->SUPER::new (can_events => 0, @_);
2105
2106	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2107
2108	$loaded_images{$self->{image}} ||=
2109	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2110
2111	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2112
2113	Scalar::Util::weaken $loaded_images{$self->{image}};
2114
2115	$self->{aspect} = $tex->{w} / $tex->{h};
2116
2117	$self
2118	}
2119
2120	sub size_request {
2121	my ($self) = @_;
2122
2123	($self->{tex}->{w}, $self->{tex}->{h})
2124	}
2125
2126	sub _draw {
2127	my ($self) = @_;
2128
2129	my $tex = $self->{tex};
2130
2131	my ($w, $h) = ($self->{w}, $self->{h});
2132
2133	if ($self->{rot90}) {
2134	glRotate 90, 0, 0, 1;
2135	glTranslate 0, -$self->{w}, 0;
2136
2137	($w, $h) = ($h, $w);
2138	}
2139
2140	glEnable GL_TEXTURE_2D;
2141	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2142
2143	$tex->draw_quad_alpha (0, 0, $w, $h);
2144
2145	glDisable GL_TEXTURE_2D;
2146	}
2147
2148	#############################################################################
2149
2150	package CFClient::UI::VGauge;
2151
2152	our @ISA = CFClient::UI::Base::;
2153		2601
2154	use List::Util qw(min max);	2602	use List::Util qw(min max);
2155		2603
2156	use CFClient::OpenGL;	2604	use CFPlus::OpenGL;
2157		2605
2158	my %tex = (	2606	my %tex = (
2159	food => [	2607	food => [
2160	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2608	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2161	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2609	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2162	],	2610	],
2163	grace => [	2611	grace => [
2164	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2613	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2166	],	2614	],
2167	hp => [	2615	hp => [
2168	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2169	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2617	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2170	],	2618	],
2171	mana => [	2619	mana => [
2172	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2173	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2621	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2174	],	2622	],
2175	);	2623	);
2176		2624
2177	# eg. VGauge->new (gauge => 'food'), default gauge: food	2625	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2237	my $ycut1 = max 0, min 1, $ycut;	2685	my $ycut1 = max 0, min 1, $ycut;
2238	my $ycut2 = max 0, min 1, $ycut - 1;	2686	my $ycut2 = max 0, min 1, $ycut - 1;
2239		2687
2240	my $h1 = $self->{h} * (1 - $ycut1);	2688	my $h1 = $self->{h} * (1 - $ycut1);
2241	my $h2 = $self->{h} * (1 - $ycut2);	2689	my $h2 = $self->{h} * (1 - $ycut2);
		2690	my $h3 = $self->{h};
		2691
		2692	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242		2693
2243	glEnable GL_BLEND;	2694	glEnable GL_BLEND;
2244	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2695	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2696	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246	glEnable GL_TEXTURE_2D;	2697	glEnable GL_TEXTURE_2D;
…		…
2265		2716
2266	if ($t3) {	2717	if ($t3) {
2267	glBindTexture GL_TEXTURE_2D, $t3->{name};	2718	glBindTexture GL_TEXTURE_2D, $t3->{name};
2268	glBegin GL_QUADS;	2719	glBegin GL_QUADS;
2269	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2720	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2721	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2722	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2723	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273	glEnd;	2724	glEnd;
2274	}	2725	}
2275		2726
2276	glDisable GL_BLEND;	2727	glDisable GL_BLEND;
2277	glDisable GL_TEXTURE_2D;	2728	glDisable GL_TEXTURE_2D;
2278	}	2729	}
2279		2730
2280	#############################################################################	2731	#############################################################################
2281		2732
2282	package CFClient::UI::Gauge;	2733	package CFPlus::UI::Gauge;
2283		2734
2284	our @ISA = CFClient::UI::VBox::;	2735	our @ISA = CFPlus::UI::VBox::;
2285		2736
2286	sub new {	2737	sub new {
2287	my ($class, %arg) = @_;	2738	my ($class, %arg) = @_;
2288		2739
2289	my $self = $class->SUPER::new (	2740	my $self = $class->SUPER::new (
…		…
2291	can_hover => 1,	2742	can_hover => 1,
2292	can_events => 1,	2743	can_events => 1,
2293	%arg,	2744	%arg,
2294	);	2745	);
2295		2746
2296	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2747	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2297	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2748	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2298	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2749	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2299		2750
2300	$self	2751	$self
2301	}	2752	}
2302		2753
2303	sub set_fontsize {	2754	sub set_fontsize {
…		…
2324	$self->{value}->set_text ($val);	2775	$self->{value}->set_text ($val);
2325	}	2776	}
2326		2777
2327	#############################################################################	2778	#############################################################################
2328		2779
2329	package CFClient::UI::Slider;	2780	package CFPlus::UI::Slider;
2330		2781
2331	use strict;	2782	use strict;
2332		2783
2333	use CFClient::OpenGL;	2784	use CFPlus::OpenGL;
2334		2785
2335	our @ISA = CFClient::UI::DrawBG::;	2786	our @ISA = CFPlus::UI::DrawBG::;
2336		2787
2337	my @tex =	2788	my @tex =
2338	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2789	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2339	qw(s1_slider.png s1_slider_bg.png);	2790	qw(s1_slider.png s1_slider_bg.png);
2340		2791
2341	sub new {	2792	sub new {
2342	my $class = shift;	2793	my $class = shift;
2343		2794
…		…
2432	}	2883	}
2433		2884
2434	1	2885	1
2435	}	2886	}
2436		2887
		2888	sub invoke_mouse_wheel {
		2889	my ($self, $ev) = @_;
		2890
		2891	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2892
		2893	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2894
		2895	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2896
		2897	! ! $delta
		2898	}
		2899
2437	sub update {	2900	sub update {
2438	my ($self) = @_;	2901	my ($self) = @_;
2439		2902
2440	delete $self->{knob_w};	2903	delete $self->{knob_w};
2441	$self->SUPER::update;	2904	$self->SUPER::update;
…		…
2488	glDisable GL_TEXTURE_2D;	2951	glDisable GL_TEXTURE_2D;
2489	}	2952	}
2490		2953
2491	#############################################################################	2954	#############################################################################
2492		2955
2493	package CFClient::UI::ValSlider;	2956	package CFPlus::UI::ValSlider;
2494		2957
2495	our @ISA = CFClient::UI::HBox::;	2958	our @ISA = CFPlus::UI::HBox::;
2496		2959
2497	sub new {	2960	sub new {
2498	my ($class, %arg) = @_;	2961	my ($class, %arg) = @_;
2499		2962
2500	my $range = delete $arg{range};	2963	my $range = delete $arg{range};
2501		2964
2502	my $self = $class->SUPER::new (	2965	my $self = $class->SUPER::new (
2503	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2966	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2504	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2967	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2505	to_value => sub { shift },	2968	to_value => sub { shift },
2506	from_value => sub { shift },	2969	from_value => sub { shift },
2507	%arg,	2970	%arg,
2508	);	2971	);
2509		2972
…		…
2529	sub set_range { shift->{slider}->set_range (@_) }	2992	sub set_range { shift->{slider}->set_range (@_) }
2530	sub set_value { shift->{slider}->set_value (@_) }	2993	sub set_value { shift->{slider}->set_value (@_) }
2531		2994
2532	#############################################################################	2995	#############################################################################
2533		2996
2534	package CFClient::UI::TextScroller;	2997	package CFPlus::UI::TextScroller;
2535		2998
2536	our @ISA = CFClient::UI::HBox::;	2999	our @ISA = CFPlus::UI::HBox::;
2537		3000
2538	use CFClient::OpenGL;	3001	use CFPlus::OpenGL;
2539		3002
2540	sub new {	3003	sub new {
2541	my $class = shift;	3004	my $class = shift;
2542		3005
2543	my $self = $class->SUPER::new (	3006	my $self = $class->SUPER::new (
2544	fontsize => 1,	3007	fontsize => 1,
2545	can_events => 0,	3008	can_events => 1,
2546	indent => 0,	3009	indent => 0,
2547	#font => default_font	3010	#font => default_font
2548	@_,	3011	@_,
2549		3012
2550	layout => (new CFClient::Layout 1),	3013	layout => (new CFPlus::Layout),
2551	par => [],	3014	par => [],
		3015	max_par => 0,
2552	height => 0,	3016	height => 0,
2553	children => [	3017	children => [
2554	(new CFClient::UI::Empty expand => 1),	3018	(new CFPlus::UI::Empty expand => 1),
2555	(new CFClient::UI::Slider vertical => 1),	3019	(new CFPlus::UI::Slider vertical => 1),
2556	],	3020	],
2557	);	3021	);
2558		3022
2559	$self->{children}[1]->connect (changed => sub { $self->update });	3023	$self->{children}[1]->connect (changed => sub { $self->update });
2560		3024
…		…
2566		3030
2567	$self->{fontsize} = $fontsize;	3031	$self->{fontsize} = $fontsize;
2568	$self->reflow;	3032	$self->reflow;
2569	}	3033	}
2570		3034
		3035	sub size_request {
		3036	my ($self) = @_;
		3037
		3038	my ($empty, $slider) = @{ $self->{children} };
		3039
		3040	local $self->{children} = [$empty, $slider];
		3041	$self->SUPER::size_request
		3042	}
		3043
2571	sub invoke_size_allocate {	3044	sub invoke_size_allocate {
2572	my ($self, $w, $h) = @_;	3045	my ($self, $w, $h) = @_;
2573		3046
		3047	my ($empty, $slider, @other) = @{ $self->{children} };
		3048	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		3049
2574	$self->{layout}->set_font ($self->{font}) if $self->{font};	3050	$self->{layout}->set_font ($self->{font}) if $self->{font};
2575	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3051	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576	$self->{layout}->set_width ($self->{children}[0]{w});	3052	$self->{layout}->set_width ($empty->{w});
2577	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3053	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578		3054
2579	$self->reflow;	3055	$self->reflow;
2580		3056
		3057	local $self->{children} = [$empty, $slider];
2581	$self->SUPER::invoke_size_allocate ($w, $h)	3058	$self->SUPER::invoke_size_allocate ($w, $h)
2582	}	3059	}
2583		3060
2584	sub text_size {	3061	sub invoke_mouse_wheel {
2585	my ($self, $text, $indent) = @_;	3062	my ($self, $ev) = @_;
		3063
		3064	return 0 unless $ev->{dy}; # only vertical movements
		3065
		3066	$self->{children}[1]->emit (mouse_wheel => $ev);
		3067
		3068	1
		3069	}
		3070
		3071	sub get_layout {
		3072	my ($self, $para) = @_;
2586		3073
2587	my $layout = $self->{layout};	3074	my $layout = $self->{layout};
2588		3075
		3076	$layout->set_font ($self->{font}) if $self->{font};
		3077	$layout->set_foreground (@{$para->{fg}});
2589	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3078	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590	$layout->set_width ($self->{children}[0]{w} - $indent);	3079	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3080	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592	$layout->set_markup ($text);	3081	$layout->set_markup ($para->{markup});
		3082
		3083	$layout->set_shapes (
		3084	map
		3085	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3086	@{$para->{widget}}
2593		3087	);
		3088
2594	$layout->size	3089	$layout
2595	}	3090	}
2596		3091
2597	sub reflow {	3092	sub reflow {
2598	my ($self) = @_;	3093	my ($self) = @_;
2599		3094
…		…
2606		3101
2607	# todo: base offset on lines or so, not on pixels	3102	# todo: base offset on lines or so, not on pixels
2608	$self->{children}[1]->set_value ($offset);	3103	$self->{children}[1]->set_value ($offset);
2609	}	3104	}
2610		3105
		3106	sub current_paragraph {
		3107	my ($self) = @_;
		3108
		3109	$self->{top_paragraph} - 1
		3110	}
		3111
		3112	sub scroll_to {
		3113	my ($self, $para) = @_;
		3114
		3115	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3116
		3117	$self->{scroll_to} = $para;
		3118	$self->update;
		3119	}
		3120
2611	sub clear {	3121	sub clear {
2612	my ($self) = @_;	3122	my ($self) = @_;
		3123
		3124	my (undef, undef, @other) = @{ $self->{children} };
		3125	$self->remove ($_) for @other;
2613		3126
2614	$self->{par} = [];	3127	$self->{par} = [];
2615	$self->{height} = 0;	3128	$self->{height} = 0;
2616	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3129	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617	}	3130	}
2618		3131
2619	sub add_paragraph {	3132	sub add_paragraph {
2620	my ($self, $color, $text, $indent) = @_;	3133	my $self = shift;
2621		3134
2622	for my $line (split /\n/, $text) {	3135	for my $para (@_) {
2623	my ($w, $h) = $self->text_size ($line);	3136	$para = {
		3137	fg => [1, 1, 1, 1],
		3138	indent => 0,
		3139	markup => "",
		3140	widget => [],
		3141	ref $para ? %$para : (markup => $para),
		3142	w => 1e10,
		3143	wrapped => 1,
		3144	};
		3145
		3146	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3147	push @{$self->{par}}, $para;
		3148	}
		3149
		3150	if (my $max = $self->{max_par}) {
		3151	shift @{$self->{par}} while @{$self->{par}} > $max;
		3152	}
		3153
		3154	$self->{need_reflow}++;
		3155	$self->update;
		3156	}
		3157
		3158	sub scroll_to_bottom {
		3159	my ($self) = @_;
		3160
		3161	$self->{scroll_to} = $#{$self->{par}};
		3162	$self->update;
		3163	}
		3164
		3165	sub force_uptodate {
		3166	my ($self) = @_;
		3167
		3168	if (delete $self->{need_reflow}) {
		3169	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3170
		3171	my $height = 0;
		3172
		3173	for my $para (@{$self->{par}}) {
		3174	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3175	my $layout = $self->get_layout ($para);
		3176	my ($w, $h) = $layout->size;
		3177
		3178	$para->{w} = $w + $para->{indent};
		3179	$para->{h} = $h;
		3180	$para->{wrapped} = $layout->has_wrapped;
		3181	}
		3182
		3183	$para->{y} = $height;
		3184	$height += $para->{h};
		3185	}
		3186
2624	$self->{height} += $h;	3187	$self->{height} = $height;
2625	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3188	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2626	}
2627		3189
2628	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3190	delete $self->{texture};
		3191	}
		3192
		3193	if (my $paridx = delete $self->{scroll_to}) {
		3194	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3195	}
2629	}	3196	}
2630		3197
2631	sub update {	3198	sub update {
2632	my ($self) = @_;	3199	my ($self) = @_;
2633		3200
…		…
2636	return unless $self->{h} > 0;	3203	return unless $self->{h} > 0;
2637		3204
2638	delete $self->{texture};	3205	delete $self->{texture};
2639		3206
2640	$ROOT->on_post_alloc ($self => sub {	3207	$ROOT->on_post_alloc ($self => sub {
		3208	$self->force_uptodate;
		3209
2641	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3210	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642		3211
2643	if (delete $self->{need_reflow}) {
2644	my $height = 0;
2645
2646	my $layout = $self->{layout};
2647
2648	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650	for (@{$self->{par}}) {
2651	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2652	$layout->set_width ($W - $_->[3]);
2653	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654	$layout->set_markup ($_->[4]);
2655	my ($w, $h) = $layout->size;
2656	$_->[0] = $w + $_->[3];
2657	$_->[1] = $h;
2658	}
2659
2660	$height += $_->[1];
2661	}
2662
2663	$self->{height} = $height;
2664
2665	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2666
2667	delete $self->{texture};
2668	}
2669
2670	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3212	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2671	glClearColor 0, 0, 0, 0;	3213	glClearColor 0, 0, 0, 0;
2672	glClear GL_COLOR_BUFFER_BIT;	3214	glClear GL_COLOR_BUFFER_BIT;
2673		3215
		3216	package CFPlus::UI::Base;
		3217	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3218	(0, 0, $self->{w}, $self->{h});
		3219
		3220	my $top = int $self->{children}[1]{range}[0];
		3221
		3222	my $paridx = 0;
		3223	my $top_paragraph;
2674	my $top = int $self->{children}[1]{range}[0];	3224	my $top = int $self->{children}[1]{range}[0];
2675		3225
2676	my $y0 = $top;	3226	my $y0 = $top;
2677	my $y1 = $top + $H;	3227	my $y1 = $top + $H;
2678		3228
2679	my $y = 0;
2680
2681	my $layout = $self->{layout};
2682
2683	$layout->set_font ($self->{font}) if $self->{font};
2684
2685	glEnable GL_BLEND;
2686	#TODO# not correct in windows where rgba is forced off
2687	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688
2689	for my $par (@{$self->{par}}) {	3229	for my $para (@{$self->{par}}) {
2690	my $h = $par->[1];	3230	my $h = $para->{h};
		3231	my $y = $para->{y};
2691		3232
2692	if ($y0 < $y + $h && $y < $y1) {	3233	if ($y0 < $y + $h && $y < $y1) {
2693	$layout->set_foreground (@{ $par->[2] });	3234	my $layout = $self->get_layout ($para);
2694	$layout->set_width ($W - $par->[3]);
2695	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696	$layout->set_markup ($par->[4]);
2697		3235
2698	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3236	$layout->render ($para->{indent}, $y - $y0);
2699		3237
2700	glRasterPos $par->[3], $y - $y0;	3238	if (my @w = @{ $para->{widget} }) {
2701	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3239	my @s = $layout->get_shapes;
		3240
		3241	for (@w) {
		3242	my ($dx, $dy) = splice @s, 0, 2, ();
		3243
		3244	$_->{x} = $dx + $para->{indent};
		3245	$_->{y} = $dy + $y - $y0;
		3246
		3247	$_->draw;
		3248	}
		3249	}
2702	}	3250	}
2703		3251
2704	$y += $h;	3252	$paridx++;
		3253	$top_paragraph ||= $paridx if $y >= $top;
2705	}	3254	}
2706		3255
2707	glDisable GL_BLEND;	3256	$self->{top_paragraph} = $top_paragraph;
2708	};	3257	};
2709	});	3258	});
		3259	}
		3260
		3261	sub reconfigure {
		3262	my ($self) = @_;
		3263
		3264	$self->SUPER::reconfigure;
		3265
		3266	$_->{w} = 1e10 for @{ $self->{par} };
		3267	$self->reflow;
2710	}	3268	}
2711		3269
2712	sub _draw {	3270	sub _draw {
2713	my ($self) = @_;	3271	my ($self) = @_;
2714		3272
…		…
2717	glColor 0, 0, 0, 1;	3275	glColor 0, 0, 0, 1;
2718	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3276	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719	glDisable GL_TEXTURE_2D;	3277	glDisable GL_TEXTURE_2D;
2720		3278
2721	$self->{children}[1]->draw;	3279	$self->{children}[1]->draw;
2722
2723	}	3280	}
2724		3281
2725	#############################################################################	3282	#############################################################################
2726		3283
2727	package CFClient::UI::Animator;	3284	package CFPlus::UI::Animator;
2728		3285
2729	use CFClient::OpenGL;	3286	use CFPlus::OpenGL;
2730		3287
2731	our @ISA = CFClient::UI::Bin::;	3288	our @ISA = CFPlus::UI::Bin::;
2732		3289
2733	sub moveto {	3290	sub moveto {
2734	my ($self, $x, $y) = @_;	3291	my ($self, $x, $y) = @_;
2735		3292
2736	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3293	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2764	glPopMatrix;	3321	glPopMatrix;
2765	}	3322	}
2766		3323
2767	#############################################################################	3324	#############################################################################
2768		3325
2769	package CFClient::UI::Flopper;	3326	package CFPlus::UI::Flopper;
2770		3327
2771	our @ISA = CFClient::UI::Button::;	3328	our @ISA = CFPlus::UI::Button::;
2772		3329
2773	sub new {	3330	sub new {
2774	my $class = shift;	3331	my $class = shift;
2775		3332
2776	my $self = $class->SUPER::new (	3333	my $self = $class->SUPER::new (
…		…
2788	$self->{other}->toggle_visibility;	3345	$self->{other}->toggle_visibility;
2789	}	3346	}
2790		3347
2791	#############################################################################	3348	#############################################################################
2792		3349
2793	package CFClient::UI::Tooltip;	3350	package CFPlus::UI::Tooltip;
2794		3351
2795	our @ISA = CFClient::UI::Bin::;	3352	our @ISA = CFPlus::UI::Bin::;
2796		3353
2797	use CFClient::OpenGL;	3354	use CFPlus::OpenGL;
2798		3355
2799	sub new {	3356	sub new {
2800	my $class = shift;	3357	my $class = shift;
2801		3358
2802	$class->SUPER::new (	3359	$class->SUPER::new (
…		…
2805	)	3362	)
2806	}	3363	}
2807		3364
2808	sub set_tooltip_from {	3365	sub set_tooltip_from {
2809	my ($self, $widget) = @_;	3366	my ($self, $widget) = @_;
		3367
		3368	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3369	if $widget->{tooltip} =~ /^#(.*)$/;
2810		3370
2811	my $tooltip = $widget->{tooltip};	3371	my $tooltip = $widget->{tooltip};
2812		3372
2813	if ($ENV{CFPLUS_DEBUG} & 2) {	3373	if ($ENV{CFPLUS_DEBUG} & 2) {
2814	$tooltip .= "\n\n" . (ref $widget) . "\n"	3374	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2818	}	3378	}
2819		3379
2820	$tooltip =~ s/^\n+//;	3380	$tooltip =~ s/^\n+//;
2821	$tooltip =~ s/\n+$//;	3381	$tooltip =~ s/\n+$//;
2822		3382
2823	$self->add (new CFClient::UI::Label	3383	$self->add (new CFPlus::UI::Label
2824	markup => $tooltip,	3384	markup => $tooltip,
2825	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3385	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2826	fontsize => 0.8,	3386	fontsize => 0.8,
2827	fg => [0, 0, 0, 1],	3387	style => 1, # FLAG_INVERSE
2828	ellipsise => 0,	3388	ellipsise => 0,
2829	font => ($widget->{tooltip_font} || $::FONT_PROP),	3389	font => ($widget->{tooltip_font} || $::FONT_PROP),
2830	);	3390	);
2831	}	3391	}
2832		3392
…		…
2851		3411
2852	$self->{root}->on_post_alloc ("move_$self" => sub {	3412	$self->{root}->on_post_alloc ("move_$self" => sub {
2853	my $widget = $self->{owner}	3413	my $widget = $self->{owner}
2854	or return;	3414	or return;
2855		3415
		3416	if ($widget->{visible}) {
2856	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3417	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857		3418
2858	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3419	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859	if $x + $self->{w} > $self->{root}{w};	3420	if $x + $self->{w} > $self->{root}{w};
2860		3421
2861	$self->move_abs ($x, $y);	3422	$self->move_abs ($x, $y);
		3423	} else {
		3424	$self->hide;
		3425	}
2862	});	3426	});
2863	}	3427	}
2864		3428
2865	sub _draw {	3429	sub _draw {
2866	my ($self) = @_;	3430	my ($self) = @_;
…		…
2890	$self->SUPER::_draw;	3454	$self->SUPER::_draw;
2891	}	3455	}
2892		3456
2893	#############################################################################	3457	#############################################################################
2894		3458
2895	package CFClient::UI::Face;	3459	package CFPlus::UI::Face;
2896		3460
2897	our @ISA = CFClient::UI::Base::;	3461	our @ISA = CFPlus::UI::DrawBG::;
2898		3462
2899	use CFClient::OpenGL;	3463	use CFPlus::OpenGL;
2900		3464
2901	sub new {	3465	sub new {
2902	my $class = shift;	3466	my $class = shift;
2903		3467
2904	my $self = $class->SUPER::new (	3468	my $self = $class->SUPER::new (
		3469	size_w => 32,
		3470	size_h => 8,
2905	aspect => 1,	3471	aspect => 1,
2906	can_events => 0,	3472	can_events => 0,
2907	@_,	3473	@_,
2908	);	3474	);
2909		3475
2910	if ($self->{anim} && $self->{animspeed}) {	3476	if ($self->{anim} && $self->{animspeed}) {
2911	Scalar::Util::weaken (my $widget = $self);	3477	CFPlus::weaken (my $widget = $self);
2912		3478
		3479	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3480	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2913	$self->{timer} = Event->timer (	3481	$self->{timer} = Event->timer (
2914	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2915	hard => 1,	3482	parked => 1,
2916	interval => $self->{animspeed},
2917	cb => sub {	3483	cb => sub {
		3484	return unless $::CONN && $widget;
		3485
2918	++$widget->{frame};	3486	++$widget->{frame};
		3487	$widget->update_face;
2919	$widget->update;	3488	$widget->update;
		3489
		3490	$widget->update_timer;
2920	},	3491	},
2921	);	3492	);
		3493
		3494	$self->update_face;
		3495	$self->update_timer;
2922	}	3496	}
2923		3497
2924	$self	3498	$self
2925	}	3499	}
2926		3500
		3501	sub update_timer {
		3502	my ($self) = @_;
		3503
		3504	return unless $self->{timer};
		3505
		3506	if ($self->{visible}) {
		3507	$self->{timer}->at (
		3508	$self->{anim_start}
		3509	+ $self->{animspeed}
		3510	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3511	);
		3512	$self->{timer}->start;
		3513	} else {
		3514	$self->{timer}->stop;
		3515	}
		3516	}
		3517
		3518	sub update_face {
		3519	my ($self) = @_;
		3520
		3521	return unless $::CONN;
		3522
		3523	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3524	if ($anim && @$anim) {
		3525	delete $self->{wait_face};
		3526	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3527	}
		3528	}
		3529	}
		3530
2927	sub size_request {	3531	sub size_request {
2928	(32, 8)	3532	my ($self) = @_;
		3533
		3534	if ($::CONN) {
		3535	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3536	if (my $tex = $::CONN->{texture}[$faceid]) {
		3537	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3538	} else {
		3539	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3540	$self->realloc;
		3541	});
		3542	}
		3543	}
		3544	}
		3545
		3546	($self->{size_w} || 8, $self->{size_h} || 8)
2929	}	3547	}
2930		3548
2931	sub update {	3549	sub update {
2932	my ($self) = @_;	3550	my ($self) = @_;
2933		3551
2934	return unless $self->{visible};	3552	return unless $self->{visible};
2935		3553
2936	$self->SUPER::update;	3554	$self->SUPER::update;
2937	}	3555	}
2938		3556
		3557	sub invoke_visibility_change {
		3558	my ($self) = @_;
		3559
		3560	$self->update_timer;
		3561
		3562	0
		3563	}
		3564
2939	sub _draw {	3565	sub _draw {
2940	my ($self) = @_;	3566	my ($self) = @_;
2941		3567
2942	return unless $::CONN;	3568	return unless $::CONN;
2943		3569
2944	my $face;	3570	$self->SUPER::_draw;
2945		3571
2946	if ($self->{frame}) {
2947	my $anim = $::CONN->{anim}[$self->{anim}];	3572	my $faceid = $::CONN->{faceid}[$self->{face}]
2948		3573	or return;
2949	$face = $anim->[ $self->{frame} % @$anim ]
2950	if $anim && @$anim;
2951	}
2952		3574
2953	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3575	my $tex = $::CONN->{texture}[$faceid];
2954		3576
2955	if ($tex) {	3577	if ($tex) {
2956	glEnable GL_TEXTURE_2D;	3578	glEnable GL_TEXTURE_2D;
2957	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3579	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2958	glColor 0, 0, 0, 1;	3580	glColor 0, 0, 0, 1;
…		…
2962	}	3584	}
2963		3585
2964	sub destroy {	3586	sub destroy {
2965	my ($self) = @_;	3587	my ($self) = @_;
2966		3588
2967	$self->{timer}->cancel	3589	(delete $self->{timer})->cancel
2968	if $self->{timer};	3590	if $self->{timer};
2969		3591
2970	$self->SUPER::destroy;	3592	$self->SUPER::destroy;
2971	}	3593	}
2972		3594
2973	#############################################################################	3595	#############################################################################
2974		3596
2975	package CFClient::UI::Buttonbar;	3597	package CFPlus::UI::Buttonbar;
2976		3598
2977	our @ISA = CFClient::UI::HBox::;	3599	our @ISA = CFPlus::UI::HBox::;
2978		3600
2979	# TODO: should actualyl wrap buttons and other goodies.	3601	# TODO: should actually wrap buttons and other goodies.
2980		3602
2981	#############################################################################	3603	#############################################################################
2982		3604
2983	package CFClient::UI::Menu;	3605	package CFPlus::UI::Menu;
2984		3606
2985	our @ISA = CFClient::UI::FancyFrame::;	3607	our @ISA = CFPlus::UI::Toplevel::;
2986		3608
2987	use CFClient::OpenGL;	3609	use CFPlus::OpenGL;
2988		3610
2989	sub new {	3611	sub new {
2990	my $class = shift;	3612	my $class = shift;
2991		3613
2992	my $self = $class->SUPER::new (	3614	my $self = $class->SUPER::new (
2993	items => [],	3615	items => [],
2994	z => 100,	3616	z => 100,
2995	@_,	3617	@_,
2996	);	3618	);
2997		3619
2998	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3620	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2999		3621
3000	for my $item (@{ $self->{items} }) {	3622	for my $item (@{ $self->{items} }) {
3001	my ($widget, $cb, $tooltip) = @$item;	3623	my ($widget, $cb, $tooltip) = @$item;
3002		3624
3003	# handle various types of items, only text for now	3625	# handle various types of items, only text for now
3004	if (!ref $widget) {	3626	if (!ref $widget) {
		3627	if ($widget =~ /\t/) {
		3628	my ($left, $right) = split /\t/, $widget, 2;
		3629
3005	$widget = new CFClient::UI::Label	3630	$widget = new CFPlus::UI::HBox
3006	can_hover => 1,	3631	can_hover => 1,
3007	can_events => 1,	3632	can_events => 1,
		3633	tooltip => $tooltip,
		3634	children => [
		3635	(new CFPlus::UI::Label markup => $left, expand => 1),
		3636	(new CFPlus::UI::Label markup => $right, align => +1),
		3637	],
		3638	;
		3639
		3640	} else {
		3641	$widget = new CFPlus::UI::Label
		3642	can_hover => 1,
		3643	can_events => 1,
3008	markup => $widget,	3644	markup => $widget,
3009	tooltip => $tooltip	3645	tooltip => $tooltip;
		3646	}
3010	}	3647	}
3011		3648
3012	$self->{item}{$widget} = $item;	3649	$self->{item}{$widget} = $item;
3013		3650
3014	$self->{vbox}->add ($widget);	3651	$self->{vbox}->add ($widget);
…		…
3057	1	3694	1
3058	}	3695	}
3059		3696
3060	#############################################################################	3697	#############################################################################
3061		3698
3062	package CFClient::UI::Multiplexer;	3699	package CFPlus::UI::Multiplexer;
3063		3700
3064	our @ISA = CFClient::UI::Container::;	3701	our @ISA = CFPlus::UI::Container::;
3065		3702
3066	sub new {	3703	sub new {
3067	my $class = shift;	3704	my $class = shift;
3068		3705
3069	my $self = $class->SUPER::new (	3706	my $self = $class->SUPER::new (
…		…
3083		3720
3084	$self->{current} = $self->{children}[0]	3721	$self->{current} = $self->{children}[0]
3085	if @{ $self->{children} };	3722	if @{ $self->{children} };
3086	}	3723	}
3087		3724
		3725	sub get_current_page {
		3726	my ($self) = @_;
		3727
		3728	$self->{current}
		3729	}
		3730
3088	sub set_current_page {	3731	sub set_current_page {
3089	my ($self, $page_or_widget) = @_;	3732	my ($self, $page_or_widget) = @_;
3090		3733
3091	my $widget = ref $page_or_widget	3734	my $widget = ref $page_or_widget
3092	? $page_or_widget	3735	? $page_or_widget
…		…
3124	$self->{current}->draw;	3767	$self->{current}->draw;
3125	}	3768	}
3126		3769
3127	#############################################################################	3770	#############################################################################
3128		3771
3129	package CFClient::UI::Notebook;	3772	package CFPlus::UI::Notebook;
3130		3773
3131	our @ISA = CFClient::UI::VBox::;	3774	our @ISA = CFPlus::UI::VBox::;
3132		3775
3133	sub new {	3776	sub new {
3134	my $class = shift;	3777	my $class = shift;
3135		3778
3136	my $self = $class->SUPER::new (	3779	my $self = $class->SUPER::new (
3137	buttonbar => (new CFClient::UI::Buttonbar),	3780	buttonbar => (new CFPlus::UI::Buttonbar),
3138	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3781	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3139	# filter => # will be put between multiplexer and $self	3782	# filter => # will be put between multiplexer and $self
3140	@_,	3783	@_,
3141	);	3784	);
3142		3785
3143	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3786	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3147	}	3790	}
3148		3791
3149	sub add {	3792	sub add {
3150	my ($self, $title, $widget, $tooltip) = @_;	3793	my ($self, $title, $widget, $tooltip) = @_;
3151		3794
3152	Scalar::Util::weaken $self;	3795	CFPlus::weaken $self;
3153		3796
3154	$self->{buttonbar}->add (new CFClient::UI::Button	3797	$self->{buttonbar}->add (new CFPlus::UI::Button
3155	markup => $title,	3798	markup => $title,
3156	tooltip => $tooltip,	3799	tooltip => $tooltip,
3157	on_activate => sub { $self->set_current_page ($widget) },	3800	on_activate => sub { $self->set_current_page ($widget) },
3158	);	3801	);
3159		3802
3160	$self->{multiplexer}->add ($widget);	3803	$self->{multiplexer}->add ($widget);
3161	}	3804	}
3162		3805
		3806	sub get_current_page {
		3807	my ($self) = @_;
		3808
		3809	$self->{multiplexer}->get_current_page
		3810	}
		3811
3163	sub set_current_page {	3812	sub set_current_page {
3164	my ($self, $page) = @_;	3813	my ($self, $page) = @_;
3165		3814
3166	$self->{multiplexer}->set_current_page ($page);	3815	$self->{multiplexer}->set_current_page ($page);
3167	$self->emit (page_changed => $self->{multiplexer}{current});	3816	$self->emit (page_changed => $self->{multiplexer}{current});
3168	}	3817	}
3169		3818
3170	#############################################################################	3819	#############################################################################
3171		3820
3172	package CFClient::UI::Combobox;	3821	package CFPlus::UI::Selector;
3173		3822
3174	use utf8;	3823	use utf8;
3175		3824
3176	our @ISA = CFClient::UI::Button::;	3825	our @ISA = CFPlus::UI::Button::;
3177		3826
3178	sub new {	3827	sub new {
3179	my $class = shift;	3828	my $class = shift;
3180		3829
3181	my $self = $class->SUPER::new (	3830	my $self = $class->SUPER::new (
…		…
3198	my ($value, $title, $tooltip) = @$_;	3847	my ($value, $title, $tooltip) = @$_;
3199		3848
3200	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3849	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201	}	3850	}
3202		3851
3203	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3852	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204	}	3853	}
3205		3854
3206	sub _set_value {	3855	sub _set_value {
3207	my ($self, $value) = @_;	3856	my ($self, $value) = @_;
3208		3857
…		…
3223	$self->emit (changed => $value);	3872	$self->emit (changed => $value);
3224	}	3873	}
3225		3874
3226	#############################################################################	3875	#############################################################################
3227		3876
3228	package CFClient::UI::Statusbox;	3877	package CFPlus::UI::Statusbox;
3229		3878
3230	our @ISA = CFClient::UI::VBox::;	3879	our @ISA = CFPlus::UI::VBox::;
3231		3880
3232	sub new {	3881	sub new {
3233	my $class = shift;	3882	my $class = shift;
3234		3883
3235	my $self = $class->SUPER::new (	3884	my $self = $class->SUPER::new (
3236	fontsize => 0.8,	3885	fontsize => 0.8,
3237	@_,	3886	@_,
3238	);	3887	);
3239		3888
3240	Scalar::Util::weaken (my $this = $self);	3889	CFPlus::weaken (my $this = $self);
3241		3890
3242	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3891	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243		3892
3244	$self	3893	$self
3245	}	3894	}
…		…
3247	sub reorder {	3896	sub reorder {
3248	my ($self) = @_;	3897	my ($self) = @_;
3249	my $NOW = Time::HiRes::time;	3898	my $NOW = Time::HiRes::time;
3250		3899
3251	# freeze display when hovering over any label	3900	# freeze display when hovering over any label
3252	return if $CFClient::UI::TOOLTIP->{owner}	3901	return if $CFPlus::UI::TOOLTIP->{owner}
3253	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3902	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3254	values %{ $self->{item} };	3903	values %{ $self->{item} };
3255		3904
3256	while (my ($k, $v) = each %{ $self->{item} }) {	3905	while (my ($k, $v) = each %{ $self->{item} }) {
3257	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3906	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3258	}	3907	}
…		…
3279	for ($short) {	3928	for ($short) {
3280	s/^\s+//;	3929	s/^\s+//;
3281	s/\s+/ /g;	3930	s/\s+/ /g;
3282	}	3931	}
3283		3932
3284	new CFClient::UI::Label	3933	new CFPlus::UI::Label
3285	markup => $short,	3934	markup => $short,
3286	tooltip => $item->{tooltip},	3935	tooltip => $item->{tooltip},
3287	tooltip_font => $::FONT_PROP,	3936	tooltip_font => $::FONT_PROP,
3288	tooltip_width => 0.67,	3937	tooltip_width => 0.67,
3289	fontsize => $item->{fontsize} || $self->{fontsize},	3938	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3343	count => 1,	3992	count => 1,
3344	%arg,	3993	%arg,
3345	};	3994	};
3346	}	3995	}
3347		3996
		3997	$ROOT->on_refresh (reorder => sub {
3348	$self->reorder;	3998	$self->reorder;
		3999	});
3349	}	4000	}
3350		4001
3351	sub reconfigure {	4002	sub reconfigure {
3352	my ($self) = @_;	4003	my ($self) = @_;
3353		4004
…		…
3366	$self->SUPER::destroy;	4017	$self->SUPER::destroy;
3367	}	4018	}
3368		4019
3369	#############################################################################	4020	#############################################################################
3370		4021
3371	package CFClient::UI::Inventory;
3372
3373	our @ISA = CFClient::UI::ScrolledWindow::;
3374
3375	sub new {
3376	my $class = shift;
3377
3378	my $self = $class->SUPER::new (
3379	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3380	@_,
3381	);
3382
3383	$self
3384	}
3385
3386	sub set_items {
3387	my ($self, $items) = @_;
3388
3389	$self->{child}->clear;
3390	return unless $items;
3391
3392	my @items = sort {
3393	($a->{type} <=> $b->{type})
3394	or ($a->{name} cmp $b->{name})
3395	} @$items;
3396
3397	$self->{real_items} = \@items;
3398
3399	my $row = 0;
3400	for my $item (@items) {
3401	CFClient::Item::update_widgets $item;
3402
3403	$self->{child}->add (0, $row, $item->{face_widget});
3404	$self->{child}->add (1, $row, $item->{desc_widget});
3405	$self->{child}->add (2, $row, $item->{weight_widget});
3406
3407	$row++;
3408	}
3409	}
3410
3411	#############################################################################
3412
3413	package CFClient::UI::BindEditor;
3414
3415	our @ISA = CFClient::UI::FancyFrame::;
3416
3417	sub new {
3418	my $class = shift;
3419
3420	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422	$self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426	text => "start recording",
3427	tooltip => "Start/Stops recording of actions."
3428	."All subsequent actions after the recording started will be captured."
3429	."The actions are displayed after the record was stopped."
3430	."To bind the action you have to click on the 'Bind' button",
3431	on_activate => sub {
3432	unless ($self->{recording}) {
3433	$self->start;
3434	} else {
3435	$self->stop;
3436	}
3437	});
3438
3439	$vb->add (new CFClient::UI::Label text => "Actions:");
3440	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3443	$vb->add (my $hb = new CFClient::UI::HBox);
3444	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445	$hb->add (new CFClient::UI::Button
3446	text => "bind",
3447	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448	on_activate => sub {
3449	$self->ask_for_bind;
3450	});
3451
3452	$vb->add (my $hb = new CFClient::UI::HBox);
3453	$hb->add (new CFClient::UI::Button
3454	text => "ok",
3455	expand => 1,
3456	tooltip => "This closes the binding editor and saves the binding",
3457	on_activate => sub {
3458	$self->hide;
3459	$self->commit;
3460	});
3461
3462	$hb->add (new CFClient::UI::Button
3463	text => "cancel",
3464	expand => 1,
3465	tooltip => "This closes the binding editor without saving",
3466	on_activate => sub {
3467	$self->hide;
3468	$self->{binding_cancel}->()
3469	if $self->{binding_cancel};
3470	});
3471
3472	$self->update_binding_widgets;
3473
3474	$self
3475	}
3476
3477	sub commit {
3478	my ($self) = @_;
3479	my ($mod, $sym, $cmds) = $self->get_binding;
3480	if ($sym != 0 && @$cmds > 0) {
3481	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482	."'. Don't forget 'Save Config'!");
3483	$self->{binding_change}->($mod, $sym, $cmds)
3484	if $self->{binding_change};
3485	} else {
3486	$::STATUSBOX->add ("No action bound, no key or action specified!");
3487	$self->{binding_cancel}->()
3488	if $self->{binding_cancel};
3489	}
3490	}
3491
3492	sub start {
3493	my ($self) = @_;
3494
3495	$self->{rec_btn}->set_text ("stop recording");
3496	$self->{recording} = 1;
3497	$self->clear_command_list;
3498	$::CONN->start_record if $::CONN;
3499	}
3500
3501	sub stop {
3502	my ($self) = @_;
3503
3504	$self->{rec_btn}->set_text ("start recording");
3505	$self->{recording} = 0;
3506
3507	my $rec;
3508	$rec = $::CONN->stop_record if $::CONN;
3509	return unless ref $rec eq 'ARRAY';
3510	$self->set_command_list ($rec);
3511	}
3512
3513
3514	sub ask_for_bind_and_commit {
3515	my ($self) = @_;
3516	$self->ask_for_bind (1);
3517	}
3518
3519	sub ask_for_bind {
3520	my ($self, $commit, $end_cb) = @_;
3521
3522	CFClient::Binder::open_binding_dialog (sub {
3523	my ($mod, $sym) = @_;
3524	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525	$self->update_binding_widgets;
3526	$self->commit if $commit;
3527	$end_cb->() if $end_cb;
3528	});
3529	}
3530
3531	# $mod and $sym are the modifiers and key symbol
3532	# $cmds is a array ref of strings (the commands)
3533	# $cb is the callback that is executed on OK
3534	# $ccb is the callback that is executed on CANCEL and
3535	# when the binding was unsuccessful on OK
3536	sub set_binding {
3537	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539	$self->clear_command_list;
3540	$self->{recording} = 0;
3541	$self->{rec_btn}->set_text ("start recording");
3542
3543	$self->{binding} = [$mod, $sym];
3544	$self->{commands} = $cmds;
3545
3546	$self->{binding_change} = $cb;
3547	$self->{binding_cancel} = $ccb;
3548
3549	$self->update_binding_widgets;
3550	}
3551
3552	# this is a shortcut method that asks for a binding
3553	# and then just binds it.
3554	sub do_quick_binding {
3555	my ($self, $cmds, $end_cb) = @_;
3556	$self->set_binding (undef, undef, $cmds, sub {
3557	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558	});
3559	$self->ask_for_bind (1, $end_cb);
3560	}
3561
3562	sub update_binding_widgets {
3563	my ($self) = @_;
3564	my ($mod, $sym, $cmds) = $self->get_binding;
3565	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566	$self->set_command_list ($cmds);
3567	}
3568
3569	sub get_binding {
3570	my ($self) = @_;
3571	return (
3572	$self->{binding}->[0],
3573	$self->{binding}->[1],
3574	[ grep { defined $_ } @{$self->{commands}} ]
3575	);
3576	}
3577
3578	sub clear_command_list {
3579	my ($self) = @_;
3580	$self->{cmdbox}->clear ();
3581	}
3582
3583	sub set_command_list {
3584	my ($self, $cmds) = @_;
3585
3586	$self->{cmdbox}->clear ();
3587	$self->{commands} = $cmds;
3588
3589	my $idx = 0;
3590
3591	for (@$cmds) {
3592	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594	my $i = $idx;
3595	$hb->add (new CFClient::UI::Label text => $_);
3596	$hb->add (new CFClient::UI::Button
3597	text => "delete",
3598	tooltip => "Deletes the action from the record",
3599	on_activate => sub {
3600	$self->{cmdbox}->remove ($hb);
3601	$cmds->[$i] = undef;
3602	});
3603
3604
3605	$idx++
3606	}
3607	}
3608
3609	#############################################################################
3610
3611	package CFClient::UI::SpellList;
3612
3613	our @ISA = CFClient::UI::Table::;
3614
3615	sub new {
3616	my $class = shift;
3617
3618	my $self = $class->SUPER::new (
3619	binding => [],
3620	commands => [],
3621	@_,
3622	)
3623	}
3624
3625	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3626
3627	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3629	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3631	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637
3638	sub rebuild_spell_list {
3639	my ($self) = @_;
3640
3641	$CFClient::UI::ROOT->on_refresh ($self => sub {
3642	$self->clear;
3643
3644	return unless $::CONN;
3645
3646	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652	my $row = 0;
3653
3654	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655	my $spell = $self->{spell}{$_};
3656
3657	$row++;
3658
3659	my $spell_cb = sub {
3660	my ($widget, $ev) = @_;
3661
3662	if ($ev->{button} == 1) {
3663	$::CONN->user_send ("cast $spell->{name}");
3664	} elsif ($ev->{button} == 2) {
3665	$::CONN->user_send ("invoke $spell->{name}");
3666	} elsif ($ev->{button} == 3) {
3667	(new CFClient::UI::Menu
3668	items => [
3669	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671	],
3672	)->popup ($ev);
3673	} else {
3674	return 0;
3675	}
3676
3677	1
3678	};
3679
3680	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681
3682	#TODO: add path info to tooltip
3683	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3684
3685	$self->add (0, $row, new CFClient::UI::Face
3686	face => $spell->{face},
3687	can_hover => 1,
3688	can_events => 1,
3689	tooltip => $tooltip,
3690	on_button_down => $spell_cb,
3691	);
3692
3693	$self->add (1, $row, new CFClient::UI::Label
3694	expand => 1,
3695	text => $spell->{name},
3696	can_hover => 1,
3697	can_events => 1,
3698	tooltip => $tooltip,
3699	on_button_down => $spell_cb,
3700	);
3701
3702	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706	}
3707	});
3708	}
3709
3710	sub add_spell {
3711	my ($self, $spell) = @_;
3712
3713	$self->{spell}->{$spell->{name}} = $spell;
3714	$self->rebuild_spell_list;
3715	}
3716
3717	sub remove_spell {
3718	my ($self, $spell) = @_;
3719
3720	delete $self->{spell}->{$spell->{name}};
3721	$self->rebuild_spell_list;
3722	}
3723
3724	sub clear_spells {
3725	my ($self) = @_;
3726
3727	$self->{spell} = {};
3728	$self->rebuild_spell_list;
3729	}
3730
3731	#############################################################################
3732
3733	package CFClient::UI::Root;	4022	package CFPlus::UI::Root;
3734		4023
3735	our @ISA = CFClient::UI::Container::;	4024	our @ISA = CFPlus::UI::Container::;
3736		4025
3737	use List::Util qw(min max);	4026	use List::Util qw(min max);
3738		4027
3739	use CFClient::OpenGL;	4028	use CFPlus::OpenGL;
3740		4029
3741	sub new {	4030	sub new {
3742	my $class = shift;	4031	my $class = shift;
3743		4032
3744	my $self = $class->SUPER::new (	4033	my $self = $class->SUPER::new (
3745	visible => 1,	4034	visible => 1,
3746	@_,	4035	@_,
3747	);	4036	);
3748		4037
3749	Scalar::Util::weaken ($self->{root} = $self);	4038	CFPlus::weaken ($self->{root} = $self);
3750		4039
3751	$self	4040	$self
3752	}	4041	}
3753		4042
3754	sub size_request {	4043	sub size_request {
…		…
3920	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4209	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921		4210
3922	$w = 0 if $w < 0;	4211	$w = 0 if $w < 0;
3923	$h = 0 if $h < 0;	4212	$h = 0 if $h < 0;
3924		4213
		4214	$w = max $widget->{min_w}, $w;
		4215	$h = max $widget->{min_h}, $h;
		4216
		4217	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4218	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4219
		4220	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4221	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4222
3925	$w = int $w + 0.5;	4223	$w = int $w + 0.5;
3926	$h = int $h + 0.5;	4224	$h = int $h + 0.5;
3927		4225
3928	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4226	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929	$widget->{old_w} = $widget->{w};	4227	$widget->{old_w} = $widget->{w};
…		…
3939		4237
3940	while ($self->{post_alloc_hook}) {	4238	while ($self->{post_alloc_hook}) {
3941	$_->()	4239	$_->()
3942	for values %{delete $self->{post_alloc_hook}};	4240	for values %{delete $self->{post_alloc_hook}};
3943	}	4241	}
3944
3945		4242
3946	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4243	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3947	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4244	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3948	glClear GL_COLOR_BUFFER_BIT;	4245	glClear GL_COLOR_BUFFER_BIT;
3949		4246
…		…
3952	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4249	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953	glMatrixMode GL_MODELVIEW;	4250	glMatrixMode GL_MODELVIEW;
3954	glLoadIdentity;	4251	glLoadIdentity;
3955		4252
3956	{	4253	{
3957	package CFClient::UI::Base;	4254	package CFPlus::UI::Base;
3958		4255
3959	($draw_x, $draw_y, $draw_w, $draw_h) =	4256	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3960	(0, 0, $self->{w}, $self->{h});	4257	(0, 0, $self->{w}, $self->{h});
3961	}
3962		4258
3963	$self->_draw;	4259	$self->_draw;
		4260	}
3964	}	4261	}
3965		4262
3966	#############################################################################	4263	#############################################################################
3967		4264
3968	package CFClient::UI;	4265	package CFPlus::UI;
3969		4266
3970	$ROOT = new CFClient::UI::Root;	4267	$ROOT = new CFPlus::UI::Root;
3971	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4268	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972		4269
3973	1	4270	1
3974		4271

Diff Legend

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