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.306 by root, Sun Jun 18 17:39:36 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	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before	536	# I do not really like this solution, but I do not like duplication
		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
476	($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
477	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
478	}	554	}
479		555
480	sub find_widget {	556	#sub find_widget {
481	my ($self, $x, $y) = @_;	557	# in .xs
482
483	return () unless $self->{can_events};
484
485	return $self
486	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
487	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
488
489	()
490	}
491		558
492	sub set_parent {	559	sub set_parent {
493	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
494		561
495	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
496	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
497	}	564	}
498		565
499	sub realloc {	566	sub realloc {
500	my ($self) = @_;	567	my ($self) = @_;
…		…
534	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
535		602
536	# update screen rectangle	603	# update screen rectangle
537	local $draw_x = $draw_x + $self->{x};	604	local $draw_x = $draw_x + $self->{x};
538	local $draw_y = $draw_y + $self->{y};	605	local $draw_y = $draw_y + $self->{y};
539	local $draw_w = $draw_x + $self->{w};
540	local $draw_h = $draw_y + $self->{h};
541		606
542	# skip widgets that are entirely outside the drawing area	607	# skip widgets that are entirely outside the drawing area
543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545		610
…		…
568	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
569	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
570	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
571	glEnd;	636	glEnd;
572	glPopMatrix;	637	glPopMatrix;
573	#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;
574	}	639	}
575		640
576	$self->_draw;	641	$self->_draw;
577	glPopMatrix;	642	glPopMatrix;
578	}	643	}
…		…
581	my ($self) = @_;	646	my ($self) = @_;
582		647
583	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
584	}	649	}
585		650
		651	my $cntx;#d#
586	sub DESTROY {	652	sub DESTROY {
587	my ($self) = @_;	653	my ($self) = @_;
588		654
589	delete $WIDGET{$self+0};	655	return if CFPlus::in_destruct;
590		656
591	eval { $self->destroy };	657	eval { $self->destroy };
592	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};
593	}	661	}
594		662
595	#############################################################################	663	#############################################################################
596		664
597	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
598		666
599	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
600		668
601	use strict;	669	use strict;
602	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
603		671
604	sub new {	672	sub new {
605	my $class = shift;	673	my $class = shift;
606		674
607	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
638	}	706	}
639	}	707	}
640		708
641	#############################################################################	709	#############################################################################
642		710
643	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
644		712
645	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
646		714
647	sub new {	715	sub new {
648	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
649	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
650	}	718	}
…		…
657		725
658	sub draw { }	726	sub draw { }
659		727
660	#############################################################################	728	#############################################################################
661		729
662	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
663		731
664	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
665		733
666	sub new {	734	sub new {
667	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
668		736
669	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
673	can_events => 0,	741	can_events => 0,
674	%arg,	742	%arg,
675	);	743	);
676		744
677	$self->add (@$children)	745	$self->add (@$children)
678	if $children;	746	if $children && @$children;
679		747
680	$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;
681	}	757	}
682		758
683	sub add {	759	sub add {
684	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
685		761
686	$_->set_parent ($self)	762	$_->set_parent ($self)
687	for @widgets;	763	for @widgets;
688		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
689	use sort 'stable';	766	use sort 'stable';
690		767
691	$self->{children} = [	768	$self->{children} = [
692	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
693	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
694	];	771	];
695		772
696	$self->realloc;	773	$self->realloc;
		774
		775	map $_+0, @widgets
697	}	776	}
698		777
699	sub children {	778	sub children {
700	@{ $_[0]{children} }	779	@{ $_[0]{children} }
701	}	780	}
…		…
712	}	791	}
713		792
714	sub clear {	793	sub clear {
715	my ($self) = @_;	794	my ($self) = @_;
716		795
717	my $children = delete $self->{children};	796	my $children = $self->{children};
718	$self->{children} = [];	797	$self->{children} = [];
719		798
720	for (@$children) {	799	for (@$children) {
721	delete $_->{parent};	800	delete $_->{parent};
722	$_->hide;	801	$_->hide;
…		…
747	$_->draw for @{$self->{children}};	826	$_->draw for @{$self->{children}};
748	}	827	}
749		828
750	#############################################################################	829	#############################################################################
751		830
752	package CFClient::UI::Bin;	831	package CFPlus::UI::Bin;
753		832
754	our @ISA = CFClient::UI::Container::;	833	our @ISA = CFPlus::UI::Container::;
755		834
756	sub new {	835	sub new {
757	my ($class, %arg) = @_;	836	my ($class, %arg) = @_;
758		837
759	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	838	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760		839
761	$class->SUPER::new (children => [$child], %arg)	840	$class->SUPER::new (children => [$child], %arg)
762	}	841	}
763		842
764	sub add {	843	sub add {
…		…
771	sub remove {	850	sub remove {
772	my ($self, $widget) = @_;	851	my ($self, $widget) = @_;
773		852
774	$self->SUPER::remove ($widget);	853	$self->SUPER::remove ($widget);
775		854
776	$self->{children} = [new CFClient::UI::Empty]	855	$self->{children} = [new CFPlus::UI::Empty]
777	unless @{$self->{children}};	856	unless @{$self->{children}};
778	}	857	}
779		858
780	sub child { $_[0]->{children}[0] }	859	sub child { $_[0]->{children}[0] }
781		860
…		…
793		872
794	#############################################################################	873	#############################################################################
795		874
796	# back-buffered drawing area	875	# back-buffered drawing area
797		876
798	package CFClient::UI::Window;	877	package CFPlus::UI::Window;
799		878
800	our @ISA = CFClient::UI::Bin::;	879	our @ISA = CFPlus::UI::Bin::;
801		880
802	use CFClient::OpenGL;	881	use CFPlus::OpenGL;
803		882
804	sub new {	883	sub new {
805	my ($class, %arg) = @_;	884	my ($class, %arg) = @_;
806		885
807	my $self = $class->SUPER::new (%arg);	886	my $self = $class->SUPER::new (%arg);
…		…
829	}	908	}
830		909
831	sub render_child {	910	sub render_child {
832	my ($self) = @_;	911	my ($self) = @_;
833		912
834	$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 {
835	glClearColor 0, 0, 0, 0;	914	glClearColor 0, 0, 0, 0;
836	glClear GL_COLOR_BUFFER_BIT;	915	glClear GL_COLOR_BUFFER_BIT;
837		916
838	{	917	{
839	package CFClient::UI::Base;	918	package CFPlus::UI::Base;
840		919
841	($draw_x, $draw_y, $draw_w, $draw_h) =	920	local ($draw_x, $draw_y, $draw_w, $draw_h) =
842	(0, 0, $self->{w}, $self->{h});	921	(0, 0, $self->{w}, $self->{h});
		922
		923	$self->_render;
843	}	924	}
844
845	$self->_render;
846	};	925	};
847	}	926	}
848		927
849	sub _draw {	928	sub _draw {
850	my ($self) = @_;	929	my ($self) = @_;
851
852	my ($w, $h) = @$self{qw(w h)};
853		930
854	my $tex = $self->{texture}	931	my $tex = $self->{texture}
855	or return;	932	or return;
856		933
857	glEnable GL_TEXTURE_2D;	934	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	935	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 0, 0, 0, 1;	936	glColor 0, 0, 0, 1;
860		937
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	938	$tex->draw_quad_alpha_premultiplied (0, 0);
862		939
863	glDisable GL_TEXTURE_2D;	940	glDisable GL_TEXTURE_2D;
864	}	941	}
865		942
866	#############################################################################	943	#############################################################################
867		944
868	package CFClient::UI::ViewPort;	945	package CFPlus::UI::ViewPort;
869		946
		947	use List::Util qw(min max);
		948
870	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
871		950
872	sub new {	951	sub new {
873	my $class = shift;	952	my $class = shift;
874		953
875	$class->SUPER::new (	954	$class->SUPER::new (
…		…
882	sub size_request {	961	sub size_request {
883	my ($self) = @_;	962	my ($self) = @_;
884		963
885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	964	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
886		965
887	$w = 10 if $self->{scroll_x};	966	$w = 1 if $self->{scroll_x};
888	$h = 10 if $self->{scroll_y};	967	$h = 1 if $self->{scroll_y};
889		968
890	($w, $h)	969	($w, $h)
891	}	970	}
892		971
893	sub invoke_size_allocate {	972	sub invoke_size_allocate {
…		…
905	}	984	}
906		985
907	sub set_offset {	986	sub set_offset {
908	my ($self, $x, $y) = @_;	987	my ($self, $x, $y) = @_;
909		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}) {
910	$self->{view_x} = int $x;	993	$self->{view_x} = $x;
911	$self->{view_y} = int $y;	994	$self->{view_y} = $y;
912		995
		996	$self->emit (changed => $x, $y);
913	$self->update;	997	$self->update;
		998	}
914	}	999	}
915		1000
916	# 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
917	sub coord2local {	1002	sub coord2local {
918	my ($self, $x, $y) = @_;	1003	my ($self, $x, $y) = @_;
…		…
933	my ($self, $x, $y) = @_;	1018	my ($self, $x, $y) = @_;
934		1019
935	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1020	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1021	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
937	) {	1022	) {
938	$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})
939	} else {	1024	} else {
940	$self->CFClient::UI::Base::find_widget ($x, $y)	1025	$self->CFPlus::UI::Base::find_widget ($x, $y)
941	}	1026	}
942	}	1027	}
943		1028
944	sub _render {	1029	sub _render {
945	my ($self) = @_;	1030	my ($self) = @_;
946		1031
947	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};
948	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};
949		1034
950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1035	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951		1036
952	$self->SUPER::_render;	1037	$self->SUPER::_render;
953	}	1038	}
954		1039
955	#############################################################################	1040	#############################################################################
956		1041
957	package CFClient::UI::ScrolledWindow;	1042	package CFPlus::UI::ScrolledWindow;
958		1043
959	our @ISA = CFClient::UI::HBox::;	1044	our @ISA = CFPlus::UI::Table::;
960		1045
961	sub new {	1046	sub new {
962	my ($class, %arg) = @_;	1047	my ($class, %arg) = @_;
963		1048
964	my $child = delete $arg{child};	1049	my $child = delete $arg{child};
965		1050
966	my $self;	1051	my $self;
967		1052
968	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,
969	vertical => 1,	1067	vertical => 1,
970	range => [0, 0, 1, 0.01], # HACK fix	1068	range => [0, 0, 1, 0.01], # HACK fix
971	on_changed => sub {	1069	on_changed => sub {
972	$self->{vp}->set_offset (0, $_[1]);	1070	$self->{vpos} = $_[1];
		1071	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
973	},	1072	},
974	;	1073	;
975		1074
976	$self = $class->SUPER::new (	1075	$self = $class->SUPER::new (
977	vp => (new CFClient::UI::ViewPort expand => 1),	1076	scroll_x => 0,
		1077	scroll_y => 1,
		1078	can_events => 1,
978	slider => $slider,	1079	hslider => $hslider,
		1080	vslider => $vslider,
		1081	col_expand => [1, 0],
		1082	row_expand => [1, 0],
979	%arg,	1083	%arg,
980	);	1084	);
981		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
982	$self->SUPER::add ($self->{vp}, $self->{slider});	1102	$self->SUPER::add ($self->{vp});
		1103
983	$self->add ($child) if $child;	1104	$self->add ($child) if $child;
984		1105
985	$self	1106	$self
986	}	1107	}
987		1108
…		…
989	my ($self, $widget) = @_;	1110	my ($self, $widget) = @_;
990		1111
991	$self->{vp}->add ($self->{child} = $widget);	1112	$self->{vp}->add ($self->{child} = $widget);
992	}	1113	}
993		1114
994	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 {
995	my ($self) = @_;	1142	my ($self, $ev) = @_;
996		1143
997	$self->SUPER::update;	1144	$self->grab_focus;
998		1145
999	# todo: overwrite size_allocate of child	1146	my $ox = $self->{vp}{view_x};
1000	my $child = $self->{vp}->child;	1147	my $oy = $self->{vp}{view_y};
1001	$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
1002	}	1198	}
1003		1199
1004	sub invoke_size_allocate {	1200	sub invoke_size_allocate {
1005	my ($self, $w, $h) = @_;	1201	my ($self, $w, $h) = @_;
1006		1202
1007	my $child = $self->{vp}->child;	1203	$self->update_slider;
1008	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010	$self->SUPER::invoke_size_allocate ($w, $h)	1204	$self->SUPER::invoke_size_allocate ($w, $h)
1011	}	1205	}
1012		1206
1013	#TODO# update range on size_allocate depending on child
1014	# update viewport offset on scroll
1015
1016	#############################################################################	1207	#############################################################################
1017		1208
1018	package CFClient::UI::Frame;	1209	package CFPlus::UI::Frame;
1019		1210
1020	our @ISA = CFClient::UI::Bin::;	1211	our @ISA = CFPlus::UI::Bin::;
1021		1212
1022	use CFClient::OpenGL;	1213	use CFPlus::OpenGL;
1023		1214
1024	sub new {	1215	sub new {
1025	my $class = shift;	1216	my $class = shift;
1026		1217
1027	$class->SUPER::new (	1218	$class->SUPER::new (
…		…
1053	$self->SUPER::_draw;	1244	$self->SUPER::_draw;
1054	}	1245	}
1055		1246
1056	#############################################################################	1247	#############################################################################
1057		1248
1058	package CFClient::UI::FancyFrame;	1249	package CFPlus::UI::FancyFrame;
1059		1250
1060	our @ISA = CFClient::UI::Bin::;	1251	our @ISA = CFPlus::UI::Bin::;
1061		1252
1062	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;
1063		1354
1064	my $bg =	1355	my $bg =
1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1356	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066	mipmap => 1, wrap => 1;	1357	mipmap => 1, wrap => 1;
1067		1358
1068	my @border =	1359	my @border =
1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1360	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1070	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);
1071		1366
1072	sub new {	1367	sub new {
1073	my ($class, %arg) = @_;	1368	my ($class, %arg) = @_;
1074		1369
1075	my $self = $class->SUPER::new (	1370	my $self = $class->SUPER::new (
1076	bg => [1, 1, 1, 1],	1371	bg => [1, 1, 1, 1],
1077	border_bg => [1, 1, 1, 1],	1372	border_bg => [1, 1, 1, 1],
1078	border => 0.6,	1373	border => 0.6,
1079	can_events => 1,	1374	can_events => 1,
1080	min_w => 16,	1375	min_w => 64,
1081	min_h => 16,	1376	min_h => 32,
1082	%arg,	1377	%arg,
1083	);	1378	);
1084		1379
1085	$self->{title_widget} = new CFClient::UI::Label	1380	$self->{title_widget} = new CFPlus::UI::Label
1086	align => 0,	1381	align => 0,
1087	valign => 1,	1382	valign => 1,
1088	text => $self->{title},	1383	text => $self->{title},
1089	fontsize => $self->{border},	1384	fontsize => $self->{border},
1090	if exists $self->{title};	1385	if exists $self->{title};
1091		1386
1092	if ($self->{has_close_button}) {	1387	if ($self->{has_close_button}) {
1093	$self->{close_button} =	1388	$self->{close_button} =
1094	new CFClient::UI::ImageButton	1389	new CFPlus::UI::ImageButton
1095	image => 'x1_close.png',	1390	path => 'x1_close.png',
1096	on_activate => sub { $self->hide };	1391	on_activate => sub { $self->emit ("delete") };
1097		1392
1098	$self->CFClient::UI::Container::add ($self->{close_button});	1393	$self->CFPlus::UI::Container::add ($self->{close_button});
1099	}	1394	}
1100		1395
1101	$self	1396	$self
1102	}	1397	}
1103		1398
1104	sub add {	1399	sub add {
1105	my ($self, @widgets) = @_;	1400	my ($self, @widgets) = @_;
1106		1401
1107	$self->SUPER::add (@widgets);	1402	$self->SUPER::add (@widgets);
1108	$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};
1109	$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};
1110	}	1405	}
1111		1406
1112	sub border {	1407	sub border {
1113	int $_[0]{border} * $::FONTSIZE	1408	int $_[0]{border} * $::FONTSIZE
1114	}	1409	}
…		…
1147	$self->child->configure ($border, $border, $w, $h);	1442	$self->child->configure ($border, $border, $w, $h);
1148		1443
1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1444	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150	if $self->{close_button};	1445	if $self->{close_button};
1151		1446
		1447	1
		1448	}
		1449
		1450	sub invoke_delete {
		1451	my ($self) = @_;
		1452
		1453	$self->hide;
		1454
1152	1	1455	1
1153	}	1456	}
1154		1457
1155	sub invoke_button_down {	1458	sub invoke_button_down {
1156	my ($self, $ev, $x, $y) = @_;	1459	my ($self, $ev, $x, $y) = @_;
…		…
1214	$self->{motion}->($ev, $x, $y) if $self->{motion};	1517	$self->{motion}->($ev, $x, $y) if $self->{motion};
1215		1518
1216	! ! $self->{motion}	1519	! ! $self->{motion}
1217	}	1520	}
1218		1521
		1522	sub invoke_visibility_change {
		1523	my ($self, $visible) = @_;
		1524
		1525	delete $self->{motion} unless $visible;
		1526
		1527	0
		1528	}
		1529
1219	sub _draw {	1530	sub _draw {
1220	my ($self) = @_;	1531	my ($self) = @_;
1221		1532
1222	my $child = $self->{children}[0];	1533	my $child = $self->{children}[0];
1223		1534
…		…
1228	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1539	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1229		1540
1230	my $border = $self->border;	1541	my $border = $self->border;
1231		1542
1232	glColor @{ $self->{border_bg} };	1543	glColor @{ $self->{border_bg} };
1233	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1544	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1234	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1545	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1235	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1546	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1236	$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);
1237		1562
1238	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1563	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1239	glColor @{ $self->{bg} };	1564	glColor @{ $self->{bg} };
1240		1565
1241	# TODO: repeat texture not scale	1566	# TODO: repeat texture not scale
…		…
1260	if $self->{close_button};	1585	if $self->{close_button};
1261	}	1586	}
1262		1587
1263	#############################################################################	1588	#############################################################################
1264		1589
1265	package CFClient::UI::Table;	1590	package CFPlus::UI::Table;
1266		1591
1267	our @ISA = CFClient::UI::Base::;	1592	our @ISA = CFPlus::UI::Container::;
1268		1593
1269	use List::Util qw(max sum);	1594	use List::Util qw(max sum);
1270		1595
1271	use CFClient::OpenGL;	1596	use CFPlus::OpenGL;
1272		1597
1273	sub new {	1598	sub new {
1274	my $class = shift;	1599	my $class = shift;
1275		1600
1276	$class->SUPER::new (	1601	$class->SUPER::new (
1277	col_expand => [],	1602	col_expand => [],
		1603	row_expand => [],
1278	@_,	1604	@_,
1279	)	1605	)
1280	}	1606	}
1281		1607
1282	sub children {
1283	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284	}
1285
1286	sub add {	1608	sub add {
1287	my ($self, $x, $y, $child) = @_;	1609	my ($self, @widgets) = @_;
1288		1610
1289	$child->set_parent ($self);	1611	for my $child (@widgets) {
1290	$self->{children}[$y][$x] = $child;	1612	$child->{rowspan} ||= 1;
		1613	$child->{colspan} ||= 1;
		1614	}
1291		1615
1292	$self->realloc;	1616	$self->SUPER::add (@widgets);
1293	}	1617	}
1294		1618
1295	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 {
1296	my ($self, $child) = @_;	1637	my ($self) = @_;
1297		1638
1298	# TODO: not yet implemented	1639	my (@w, @h);
1299	}
1300
1301	# TODO: move to container class maybe? send children a signal on removal?
1302	sub clear {
1303	my ($self) = @_;
1304		1640
1305	my @children = $self->children;	1641	my @children = $self->children;
1306	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	}
1307		1652	}
1308	for (@children) {
1309	delete $_->{parent};
1310	$_->hide;
1311	}
1312		1653
1313	$self->realloc;	1654	# second pass, rows
1314	}	1655	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1315
1316	sub get_wh {
1317	my ($self) = @_;
1318
1319	my (@w, @h);
1320
1321	for my $y (0 .. $#{$self->{children}}) {
1322	my $row = $self->{children}[$y]
1323	or next;
1324
1325	for my $x (0 .. $#$row) {
1326	my $widget = $row->[$x]
1327	or next;
1328	my ($w, $h) = @$widget{qw(req_w req_h)};	1656	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1329		1657
1330	$w[$x] = max $w[$x], $w;	1658	my $sh = sum @h[$r .. $r + $rs - 1];
1331	$h[$y] = max $h[$y], $h;	1659
		1660	if ($h > $sh) {
		1661	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1332	}	1662	}
1333	}	1663	}
1334		1664
1335	(\@w, \@h)	1665	(\@w, \@h)
1336	}	1666	}
…		…
1352	my ($ws, $hs) = $self->get_wh;	1682	my ($ws, $hs) = $self->get_wh;
1353		1683
1354	my $req_w = (sum @$ws) || 1;	1684	my $req_w = (sum @$ws) || 1;
1355	my $req_h = (sum @$hs) || 1;	1685	my $req_h = (sum @$hs) || 1;
1356		1686
1357	# TODO: nicer code && do row_expand	1687	# now linearly scale the rows/columns to the allocated size
1358	my @col_expand = @{$self->{col_expand}};	1688	my @col_expand = @{$self->{col_expand}};
1359	@col_expand = (1) x @$ws unless @col_expand;	1689	@col_expand = (1) x @$ws unless @col_expand;
1360	my $col_expand = (sum @col_expand) || 1;	1690	my $col_expand = (sum @col_expand) || 1;
1361		1691
1362	# linearly scale sizes
1363	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1692	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365		1693
1366	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
1367	CFClient::UI::harmonize $hs;	1702	CFPlus::UI::harmonize $hs;
1368		1703
1369	my $y;	1704	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1705	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1370		1706
1371	for my $r (0 .. $#{$self->{children}}) {	1707	for my $widget ($self->children) {
1372	my $row = $self->{children}[$r]	1708	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1373	or next;
1374		1709
1375	my $x = 0;	1710	$widget->configure (
1376	my $row_h = $hs->[$r];	1711	$x[$c], $y[$r],
		1712	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1377		1713	);
1378	for my $c (0 .. $#$row) {	1714	}
1379	my $col_w = $ws->[$c];
1380		1715
1381	if (my $widget = $row->[$c]) {	1716	1
1382	$widget->configure ($x, $y, $col_w, $row_h);	1717	}
1383	}
1384		1718
1385	$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;
1386	}	1757	}
		1758	}
1387		1759
1388	$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);
1389	}	1796	}
1390		1797
1391	1	1798	1
1392	}	1799	}
1393		1800
1394	sub find_widget {
1395	my ($self, $x, $y) = @_;
1396
1397	$x -= $self->{x};
1398	$y -= $self->{y};
1399
1400	my $res;
1401
1402	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1403	$res = $_->find_widget ($x, $y)
1404	and return $res;
1405	}
1406
1407	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1408	}
1409
1410	sub _draw {
1411	my ($self) = @_;
1412
1413	for (grep $_, @{$self->{children}}) {
1414	$_->draw for grep $_, @$_;
1415	}
1416	}
1417
1418	#############################################################################	1801	#############################################################################
1419		1802
1420	package CFClient::UI::Box;	1803	package CFPlus::UI::Box;
1421		1804
1422	our @ISA = CFClient::UI::Container::;	1805	our @ISA = CFPlus::UI::Container::;
1423		1806
1424	sub size_request {	1807	sub size_request {
1425	my ($self) = @_;	1808	my ($self) = @_;
1426		1809
1427	$self->{vertical}	1810	$self->{vertical}
…		…
1437		1820
1438	sub invoke_size_allocate {	1821	sub invoke_size_allocate {
1439	my ($self, $w, $h) = @_;	1822	my ($self, $w, $h) = @_;
1440		1823
1441	my $space = $self->{vertical} ? $h : $w;	1824	my $space = $self->{vertical} ? $h : $w;
1442	my $children = $self->{children};	1825	my @children = $self->visible_children;
1443		1826
1444	my @req;	1827	my @req;
1445		1828
1446	if ($self->{homogeneous}) {	1829	if ($self->{homogeneous}) {
1447	@req = ($space / (@$children || 1)) x @$children;	1830	@req = ($space / (@children || 1)) x @children;
1448	} else {	1831	} else {
1449	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1832	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450	my $req = List::Util::sum @req;	1833	my $req = List::Util::sum @req;
1451		1834
1452	if ($req > $space) {	1835	if ($req > $space) {
1453	# ah well, not enough space	1836	# ah well, not enough space
1454	$_ *= $space / $req for @req;	1837	$_ *= $space / $req for @req;
1455	} else {	1838	} else {
1456	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1839	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457		1840
1458	$space = ($space - $req) / $expand; # remaining space to give away	1841	$space = ($space - $req) / $expand; # remaining space to give away
1459		1842
1460	$req[$_] += $space * $children->[$_]{expand}	1843	$req[$_] += $space * $children[$_]{expand}
1461	for 0 .. $#$children;	1844	for 0 .. $#children;
1462	}	1845	}
1463	}	1846	}
1464		1847
1465	CFClient::UI::harmonize \@req;	1848	CFPlus::UI::harmonize \@req;
1466		1849
1467	my $pos = 0;	1850	my $pos = 0;
1468	for (0 .. $#$children) {	1851	for (0 .. $#children) {
1469	my $alloc = $req[$_];	1852	my $alloc = $req[$_];
1470	$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));
1471		1854
1472	$pos += $alloc;	1855	$pos += $alloc;
1473	}	1856	}
1474		1857
1475	1	1858	1
1476	}	1859	}
1477		1860
1478	#############################################################################	1861	#############################################################################
1479		1862
1480	package CFClient::UI::HBox;	1863	package CFPlus::UI::HBox;
1481		1864
1482	our @ISA = CFClient::UI::Box::;	1865	our @ISA = CFPlus::UI::Box::;
1483		1866
1484	sub new {	1867	sub new {
1485	my $class = shift;	1868	my $class = shift;
1486		1869
1487	$class->SUPER::new (	1870	$class->SUPER::new (
…		…
1490	)	1873	)
1491	}	1874	}
1492		1875
1493	#############################################################################	1876	#############################################################################
1494		1877
1495	package CFClient::UI::VBox;	1878	package CFPlus::UI::VBox;
1496		1879
1497	our @ISA = CFClient::UI::Box::;	1880	our @ISA = CFPlus::UI::Box::;
1498		1881
1499	sub new {	1882	sub new {
1500	my $class = shift;	1883	my $class = shift;
1501		1884
1502	$class->SUPER::new (	1885	$class->SUPER::new (
…		…
1505	)	1888	)
1506	}	1889	}
1507		1890
1508	#############################################################################	1891	#############################################################################
1509		1892
1510	package CFClient::UI::Label;	1893	package CFPlus::UI::Label;
1511		1894
1512	our @ISA = CFClient::UI::DrawBG::;	1895	our @ISA = CFPlus::UI::DrawBG::;
1513		1896
1514	use CFClient::OpenGL;	1897	use CFPlus::OpenGL;
1515		1898
1516	sub new {	1899	sub new {
1517	my ($class, %arg) = @_;	1900	my ($class, %arg) = @_;
1518		1901
1519	my $self = $class->SUPER::new (	1902	my $self = $class->SUPER::new (
…		…
1522	#active_bg => none	1905	#active_bg => none
1523	#font => default_font	1906	#font => default_font
1524	#text => initial text	1907	#text => initial text
1525	#markup => initial narkup	1908	#markup => initial narkup
1526	#max_w => maximum pixel width	1909	#max_w => maximum pixel width
		1910	#style => 0, # render flags
1527	ellipsise => 3, # end	1911	ellipsise => 3, # end
1528	layout => (new CFClient::Layout),	1912	layout => (new CFPlus::Layout),
1529	fontsize => 1,	1913	fontsize => 1,
1530	align => -1,	1914	align => -1,
1531	valign => -1,	1915	valign => -1,
1532	padding_x => 2,	1916	padding_x => 2,
1533	padding_y => 2,	1917	padding_y => 2,
1534	can_events => 0,	1918	can_events => 0,
1535	%arg	1919	%arg
1536	);	1920	);
1537		1921
1538	if (exists $self->{template}) {	1922	if (exists $self->{template}) {
1539	my $layout = new CFClient::Layout;	1923	my $layout = new CFPlus::Layout;
1540	$layout->set_text (delete $self->{template});	1924	$layout->set_text (delete $self->{template});
1541	$self->{template} = $layout;	1925	$self->{template} = $layout;
1542	}	1926	}
1543		1927
1544	if (exists $self->{markup}) {	1928	if (exists $self->{markup}) {
…		…
1548	}	1932	}
1549		1933
1550	$self	1934	$self
1551	}	1935	}
1552		1936
1553	sub escape($) {
1554	local $_ = $_[0];
1555
1556	s/&/&amp;/g;
1557	s/>/&gt;/g;
1558	s/</&lt;/g;
1559
1560	$_
1561	}
1562
1563	sub update {	1937	sub update {
1564	my ($self) = @_;	1938	my ($self) = @_;
1565		1939
1566	delete $self->{texture};	1940	delete $self->{texture};
1567	$self->SUPER::update;	1941	$self->SUPER::update;
…		…
1578	my ($self, $text) = @_;	1952	my ($self, $text) = @_;
1579		1953
1580	return if $self->{text} eq "T$text";	1954	return if $self->{text} eq "T$text";
1581	$self->{text} = "T$text";	1955	$self->{text} = "T$text";
1582		1956
1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584	$self->{layout}->set_text ($text);	1957	$self->{layout}->set_text ($text);
1585		1958
1586	delete $self->{size_req};	1959	delete $self->{size_req};
1587	$self->realloc;	1960	$self->realloc;
1588	$self->update;	1961	$self->update;
…		…
1594	return if $self->{text} eq "M$markup";	1967	return if $self->{text} eq "M$markup";
1595	$self->{text} = "M$markup";	1968	$self->{text} = "M$markup";
1596		1969
1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1970	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598		1971
1599	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600	$self->{layout}->set_markup ($markup);	1972	$self->{layout}->set_markup ($markup);
1601		1973
1602	delete $self->{size_req};	1974	delete $self->{size_req};
1603	$self->realloc;	1975	$self->realloc;
1604	$self->update;	1976	$self->update;
…		…
1616		1988
1617	my ($w, $h) = $self->{layout}->size;	1989	my ($w, $h) = $self->{layout}->size;
1618		1990
1619	if (exists $self->{template}) {	1991	if (exists $self->{template}) {
1620	$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);
1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1994	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622		1995
1623	my ($w2, $h2) = $self->{template}->size;	1996	my ($w2, $h2) = $self->{template}->size;
1624		1997
1625	$w = List::Util::max $w, $w2;	1998	$w = List::Util::max $w, $w2;
…		…
1630	};	2003	};
1631		2004
1632	@{ $self->{size_req} }	2005	@{ $self->{size_req} }
1633	}	2006	}
1634		2007
		2008	sub baseline_shift {
		2009	$_[0]{layout}->descent
		2010	}
		2011
1635	sub invoke_size_allocate {	2012	sub invoke_size_allocate {
1636	my ($self, $w, $h) = @_;	2013	my ($self, $w, $h) = @_;
1637		2014
1638	delete $self->{ox};	2015	delete $self->{ox};
1639		2016
…		…
1645		2022
1646	sub set_fontsize {	2023	sub set_fontsize {
1647	my ($self, $fontsize) = @_;	2024	my ($self, $fontsize) = @_;
1648		2025
1649	$self->{fontsize} = $fontsize;	2026	$self->{fontsize} = $fontsize;
		2027	delete $self->{size_req};
1650	delete $self->{texture};	2028	delete $self->{texture};
1651		2029
1652	$self->realloc;	2030	$self->realloc;
1653	}	2031	}
1654		2032
1655	sub reconfigure {	2033	sub reconfigure {
1656	my ($self) = @_;	2034	my ($self) = @_;
1657		2035
1658	delete $self->{size_req};	2036	delete $self->{size_req};
		2037	delete $self->{texture};
1659		2038
1660	$self->SUPER::reconfigure;	2039	$self->SUPER::reconfigure;
1661	}	2040	}
1662		2041
1663	sub _draw {	2042	sub _draw {
1664	my ($self) = @_;	2043	my ($self) = @_;
1665		2044
1666	$self->SUPER::_draw; # draw background, if applicable	2045	$self->SUPER::_draw; # draw background, if applicable
1667		2046
1668	my $tex = $self->{texture} ||= do {	2047	my $size = $self->{texture} ||= do {
1669	$self->{layout}->set_foreground (@{$self->{fg}});	2048	$self->{layout}->set_foreground (@{$self->{fg}});
1670	$self->{layout}->set_font ($self->{font}) if $self->{font};	2049	$self->{layout}->set_font ($self->{font}) if $self->{font};
1671	$self->{layout}->set_width ($self->{w});	2050	$self->{layout}->set_width ($self->{w});
1672	$self->{layout}->set_ellipsise ($self->{ellipsise});	2051	$self->{layout}->set_ellipsise ($self->{ellipsise});
1673	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2052	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2053	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675		2054
1676	new_from_layout CFClient::Texture $self->{layout}	2055	[$self->{layout}->size]
1677	};	2056	};
1678		2057
1679	unless (exists $self->{ox}) {	2058	unless (exists $self->{ox}) {
1680	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2059	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2060	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682	: ($self->{w} - $tex->{w}) * 0.5);	2061	: ($self->{w} - $size->[0]) * 0.5);
1683		2062
1684	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2063	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2064	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686	: ($self->{h} - $tex->{h}) * 0.5);	2065	: ($self->{h} - $size->[1]) * 0.5);
1687	};	2066	};
1688		2067
1689	glEnable GL_TEXTURE_2D;
1690
1691	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2068	my $w = List::Util::min $self->{w} + 4, $size->[0];
1692	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2069	my $h = List::Util::min $self->{h} + 2, $size->[1];
1693		2070
1694	if ($tex->{format} == GL_ALPHA) {	2071	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1696	glColor @{$self->{fg}};
1697	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1698	} else {
1699	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1700	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1701	}
1702
1703	glDisable GL_TEXTURE_2D;
1704	}	2072	}
1705		2073
1706	#############################################################################	2074	#############################################################################
1707		2075
1708	package CFClient::UI::EntryBase;	2076	package CFPlus::UI::EntryBase;
1709		2077
1710	our @ISA = CFClient::UI::Label::;	2078	our @ISA = CFPlus::UI::Label::;
1711		2079
1712	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1713		2081
1714	sub new {	2082	sub new {
1715	my $class = shift;	2083	my $class = shift;
1716		2084
1717	$class->SUPER::new (	2085	$class->SUPER::new (
…		…
1721	active_fg => [0, 0, 0],	2089	active_fg => [0, 0, 0],
1722	can_hover => 1,	2090	can_hover => 1,
1723	can_focus => 1,	2091	can_focus => 1,
1724	valign => 0,	2092	valign => 0,
1725	can_events => 1,	2093	can_events => 1,
		2094	ellipsise => 0,
1726	#text => ...	2095	#text => ...
1727	#hidden => "*",	2096	#hidden => "*",
1728	@_	2097	@_
1729	)	2098	)
1730	}	2099	}
…		…
1775	my $sym = $ev->{sym};	2144	my $sym = $ev->{sym};
1776	my $uni = $ev->{unicode};	2145	my $uni = $ev->{unicode};
1777		2146
1778	my $text = $self->get_text;	2147	my $text = $self->get_text;
1779		2148
		2149	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2150
1780	if ($uni == 8) {	2151	if ($uni == 8) {
1781	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2152	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782	} elsif ($uni == 127) {	2153	} elsif ($uni == 127) {
1783	substr $text, $self->{cursor}, 1, "";	2154	substr $text, $self->{cursor}, 1, "";
1784	} elsif ($sym == CFClient::SDLK_LEFT) {	2155	} elsif ($sym == CFPlus::SDLK_LEFT) {
1785	--$self->{cursor} if $self->{cursor};	2156	--$self->{cursor} if $self->{cursor};
1786	} elsif ($sym == CFClient::SDLK_RIGHT) {	2157	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1787	++$self->{cursor} if $self->{cursor} < length $self->{text};	2158	++$self->{cursor} if $self->{cursor} < length $self->{text};
1788	} 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 = "";
1789	$self->{cursor} = 0;	2173	$self->{cursor} = 0;
1790	} elsif ($sym == CFClient::SDLK_END) {
1791	$self->{cursor} = length $text;
1792	} elsif ($uni == 27) {	2174	} elsif ($uni == 27) {
1793	$self->emit ('escape');	2175	$self->emit ('escape');
1794	} elsif ($uni) {	2176	} elsif ($uni == 0x0d) {
		2177	substr $text, $self->{cursor}++, 0, "\012";
		2178	} elsif ($uni >= 0x20) {
1795	substr $text, $self->{cursor}++, 0, chr $uni;	2179	substr $text, $self->{cursor}++, 0, chr $uni;
1796	} else {	2180	} else {
1797	return 0;	2181	return 0;
1798	}	2182	}
1799		2183
1800	$self->_set_text ($text);	2184	$self->_set_text ($text);
1801		2185
1802	$self->realloc;	2186	$self->realloc;
		2187	$self->update;
1803		2188
1804	1	2189	1
1805	}	2190	}
1806		2191
1807	sub invoke_focus_in {	2192	sub invoke_focus_in {
…		…
1819		2204
1820	my $idx = $self->{layout}->xy_to_index ($x, $y);	2205	my $idx = $self->{layout}->xy_to_index ($x, $y);
1821		2206
1822	# byte-index to char-index	2207	# byte-index to char-index
1823	my $text = $self->{text};	2208	my $text = $self->{text};
1824	utf8::encode $text;	2209	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825	$self->{cursor} = length substr $text, 0, $idx;	2210	$self->{cursor} = length $text;
1826		2211
1827	$self->_set_text ($self->{text});	2212	$self->_set_text ($self->{text});
1828	$self->update;	2213	$self->update;
1829		2214
1830	1	2215	1
…		…
1869	utf8::encode $text;	2254	utf8::encode $text;
1870		2255
1871	@$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)
1872	}	2257	}
1873		2258
1874	glColor @{$self->{fg}};
1875	glBegin GL_LINES;	2259	glBegin GL_LINES;
1876	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};
1877	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};
1878	glEnd;	2262	glEnd;
1879	}	2263	}
1880	}	2264	}
1881		2265
		2266	#############################################################################
		2267
1882	package CFClient::UI::Entry;	2268	package CFPlus::UI::Entry;
1883		2269
1884	our @ISA = CFClient::UI::EntryBase::;	2270	our @ISA = CFPlus::UI::EntryBase::;
1885		2271
1886	use CFClient::OpenGL;	2272	use CFPlus::OpenGL;
1887		2273
1888	sub invoke_key_down {	2274	sub invoke_key_down {
1889	my ($self, $ev) = @_;	2275	my ($self, $ev) = @_;
1890		2276
1891	my $sym = $ev->{sym};	2277	my $sym = $ev->{sym};
1892		2278
1893	if ($sym == 13) {	2279	if ($ev->{uni} == 0x0d || $sym == 13) {
1894	unshift @{$self->{history}},	2280	unshift @{$self->{history}},
1895	my $txt = $self->get_text;	2281	my $txt = $self->get_text;
1896		2282
1897	$self->{history_pointer} = -1;	2283	$self->{history_pointer} = -1;
1898	$self->{history_saveback} = '';	2284	$self->{history_saveback} = '';
1899	$self->emit (activate => $txt);	2285	$self->emit (activate => $txt);
1900	$self->update;	2286	$self->update;
1901		2287
1902	} elsif ($sym == CFClient::SDLK_UP) {	2288	} elsif ($sym == CFPlus::SDLK_UP) {
1903	if ($self->{history_pointer} < 0) {	2289	if ($self->{history_pointer} < 0) {
1904	$self->{history_saveback} = $self->get_text;	2290	$self->{history_saveback} = $self->get_text;
1905	}	2291	}
1906	if (@{$self->{history} || []} > 0) {	2292	if (@{$self->{history} || []} > 0) {
1907	$self->{history_pointer}++;	2293	$self->{history_pointer}++;
…		…
1909	$self->{history_pointer} = @{$self->{history} || []} - 1;	2295	$self->{history_pointer} = @{$self->{history} || []} - 1;
1910	}	2296	}
1911	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2297	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1912	}	2298	}
1913		2299
1914	} elsif ($sym == CFClient::SDLK_DOWN) {	2300	} elsif ($sym == CFPlus::SDLK_DOWN) {
1915	$self->{history_pointer}--;	2301	$self->{history_pointer}--;
1916	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2302	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917		2303
1918	if ($self->{history_pointer} >= 0) {	2304	if ($self->{history_pointer} >= 0) {
1919	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2305	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1928	1	2314	1
1929	}	2315	}
1930		2316
1931	#############################################################################	2317	#############################################################################
1932		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
1933	package CFClient::UI::Button;	2358	package CFPlus::UI::Button;
1934		2359
1935	our @ISA = CFClient::UI::Label::;	2360	our @ISA = CFPlus::UI::Label::;
1936		2361
1937	use CFClient::OpenGL;	2362	use CFPlus::OpenGL;
1938		2363
1939	my @tex =	2364	my @tex =
1940	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2365	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941	qw(b1_button_active.png);	2366	qw(b1_button_inactive.png b1_button_active.png);
1942		2367
1943	sub new {	2368	sub new {
1944	my $class = shift;	2369	my $class = shift;
1945		2370
1946	$class->SUPER::new (	2371	$class->SUPER::new (
1947	padding_x => 4,	2372	padding_x => 4,
1948	padding_y => 4,	2373	padding_y => 4,
1949	fg => [1, 1, 1],	2374	fg => [1.0, 1.0, 1.0],
1950	active_fg => [0, 0, 1],	2375	active_fg => [0.8, 0.8, 0.8],
1951	can_hover => 1,	2376	can_hover => 1,
1952	align => 0,	2377	align => 0,
1953	valign => 0,	2378	valign => 0,
1954	can_events => 1,	2379	can_events => 1,
1955	@_	2380	@_
…		…
1973		2398
1974	glEnable GL_TEXTURE_2D;	2399	glEnable GL_TEXTURE_2D;
1975	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1976	glColor 0, 0, 0, 1;	2401	glColor 0, 0, 0, 1;
1977		2402
		2403	my $tex = $tex[$GRAB == $self];
1978	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2404	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1979		2405
1980	glDisable GL_TEXTURE_2D;	2406	glDisable GL_TEXTURE_2D;
1981		2407
1982	$self->SUPER::_draw;	2408	$self->SUPER::_draw;
1983	}	2409	}
1984		2410
1985	#############################################################################	2411	#############################################################################
1986		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
1987	package CFClient::UI::ImageButton;	2562	package CFPlus::UI::ImageButton;
1988		2563
1989	our @ISA = CFClient::UI::Image::;	2564	our @ISA = CFPlus::UI::Image::;
1990		2565
1991	use CFClient::OpenGL;	2566	use CFPlus::OpenGL;
1992		2567
1993	my %textures;	2568	my %textures;
1994		2569
1995	sub new {	2570	sub new {
1996	my $class = shift;	2571	my $class = shift;
…		…
2018	1	2593	1
2019	}	2594	}
2020		2595
2021	#############################################################################	2596	#############################################################################
2022		2597
2023	package CFClient::UI::CheckBox;
2024
2025	our @ISA = CFClient::UI::DrawBG::;
2026
2027	my @tex =
2028	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2029	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2030
2031	use CFClient::OpenGL;
2032
2033	sub new {
2034	my $class = shift;
2035
2036	$class->SUPER::new (
2037	padding_x => 2,
2038	padding_y => 2,
2039	fg => [1, 1, 1],
2040	active_fg => [1, 1, 0],
2041	bg => [0, 0, 0, 0.2],
2042	active_bg => [1, 1, 1, 0.5],
2043	state => 0,
2044	can_hover => 1,
2045	@_
2046	)
2047	}
2048
2049	sub size_request {
2050	my ($self) = @_;
2051
2052	(6) x 2
2053	}
2054
2055	sub invoke_button_down {
2056	my ($self, $ev, $x, $y) = @_;
2057
2058	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2059	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2060	$self->{state} = !$self->{state};
2061	$self->emit (changed => $self->{state});
2062	} else {
2063	return 0
2064	}
2065
2066	1
2067	}
2068
2069	sub _draw {
2070	my ($self) = @_;
2071
2072	$self->SUPER::_draw;
2073
2074	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2075
2076	my ($w, $h) = @$self{qw(w h)};
2077
2078	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2079
2080	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2081
2082	my $tex = $self->{state} ? $tex[1] : $tex[0];
2083
2084	glEnable GL_TEXTURE_2D;
2085	$tex->draw_quad_alpha (0, 0, $s, $s);
2086	glDisable GL_TEXTURE_2D;
2087	}
2088
2089	#############################################################################
2090
2091	package CFClient::UI::Image;	2598	package CFPlus::UI::VGauge;
2092		2599
2093	our @ISA = CFClient::UI::Base::;	2600	our @ISA = CFPlus::UI::Base::;
2094
2095	use CFClient::OpenGL;
2096	use Carp qw/confess/;
2097
2098	our %loaded_images;
2099
2100	sub new {
2101	my $class = shift;
2102
2103	my $self = $class->SUPER::new (can_events => 0, @_);
2104
2105	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2106
2107	$loaded_images{$self->{image}} ||=
2108	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2109
2110	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2111
2112	Scalar::Util::weaken $loaded_images{$self->{image}};
2113
2114	$self->{aspect} = $tex->{w} / $tex->{h};
2115
2116	$self
2117	}
2118
2119	sub size_request {
2120	my ($self) = @_;
2121
2122	($self->{tex}->{w}, $self->{tex}->{h})
2123	}
2124
2125	sub _draw {
2126	my ($self) = @_;
2127
2128	my $tex = $self->{tex};
2129
2130	my ($w, $h) = ($self->{w}, $self->{h});
2131
2132	if ($self->{rot90}) {
2133	glRotate 90, 0, 0, 1;
2134	glTranslate 0, -$self->{w}, 0;
2135
2136	($w, $h) = ($h, $w);
2137	}
2138
2139	glEnable GL_TEXTURE_2D;
2140	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141
2142	$tex->draw_quad_alpha (0, 0, $w, $h);
2143
2144	glDisable GL_TEXTURE_2D;
2145	}
2146
2147	#############################################################################
2148
2149	package CFClient::UI::VGauge;
2150
2151	our @ISA = CFClient::UI::Base::;
2152		2601
2153	use List::Util qw(min max);	2602	use List::Util qw(min max);
2154		2603
2155	use CFClient::OpenGL;	2604	use CFPlus::OpenGL;
2156		2605
2157	my %tex = (	2606	my %tex = (
2158	food => [	2607	food => [
2159	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2608	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2160	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2609	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2161	],	2610	],
2162	grace => [	2611	grace => [
2163	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164	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/
2165	],	2614	],
2166	hp => [	2615	hp => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2617	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2169	],	2618	],
2170	mana => [	2619	mana => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172	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/
2173	],	2622	],
2174	);	2623	);
2175		2624
2176	# eg. VGauge->new (gauge => 'food'), default gauge: food	2625	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2236	my $ycut1 = max 0, min 1, $ycut;	2685	my $ycut1 = max 0, min 1, $ycut;
2237	my $ycut2 = max 0, min 1, $ycut - 1;	2686	my $ycut2 = max 0, min 1, $ycut - 1;
2238		2687
2239	my $h1 = $self->{h} * (1 - $ycut1);	2688	my $h1 = $self->{h} * (1 - $ycut1);
2240	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);
2241		2693
2242	glEnable GL_BLEND;	2694	glEnable GL_BLEND;
2243	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2695	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2696	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2245	glEnable GL_TEXTURE_2D;	2697	glEnable GL_TEXTURE_2D;
…		…
2264		2716
2265	if ($t3) {	2717	if ($t3) {
2266	glBindTexture GL_TEXTURE_2D, $t3->{name};	2718	glBindTexture GL_TEXTURE_2D, $t3->{name};
2267	glBegin GL_QUADS;	2719	glBegin GL_QUADS;
2268	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2720	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2269	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2721	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2270	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2722	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2271	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2723	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2272	glEnd;	2724	glEnd;
2273	}	2725	}
2274		2726
2275	glDisable GL_BLEND;	2727	glDisable GL_BLEND;
2276	glDisable GL_TEXTURE_2D;	2728	glDisable GL_TEXTURE_2D;
2277	}	2729	}
2278		2730
2279	#############################################################################	2731	#############################################################################
2280		2732
2281	package CFClient::UI::Gauge;	2733	package CFPlus::UI::Gauge;
2282		2734
2283	our @ISA = CFClient::UI::VBox::;	2735	our @ISA = CFPlus::UI::VBox::;
2284		2736
2285	sub new {	2737	sub new {
2286	my ($class, %arg) = @_;	2738	my ($class, %arg) = @_;
2287		2739
2288	my $self = $class->SUPER::new (	2740	my $self = $class->SUPER::new (
…		…
2290	can_hover => 1,	2742	can_hover => 1,
2291	can_events => 1,	2743	can_events => 1,
2292	%arg,	2744	%arg,
2293	);	2745	);
2294		2746
2295	$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");
2296	$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);
2297	$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");
2298		2750
2299	$self	2751	$self
2300	}	2752	}
2301		2753
2302	sub set_fontsize {	2754	sub set_fontsize {
…		…
2323	$self->{value}->set_text ($val);	2775	$self->{value}->set_text ($val);
2324	}	2776	}
2325		2777
2326	#############################################################################	2778	#############################################################################
2327		2779
2328	package CFClient::UI::Slider;	2780	package CFPlus::UI::Slider;
2329		2781
2330	use strict;	2782	use strict;
2331		2783
2332	use CFClient::OpenGL;	2784	use CFPlus::OpenGL;
2333		2785
2334	our @ISA = CFClient::UI::DrawBG::;	2786	our @ISA = CFPlus::UI::DrawBG::;
2335		2787
2336	my @tex =	2788	my @tex =
2337	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2789	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2338	qw(s1_slider.png s1_slider_bg.png);	2790	qw(s1_slider.png s1_slider_bg.png);
2339		2791
2340	sub new {	2792	sub new {
2341	my $class = shift;	2793	my $class = shift;
2342		2794
…		…
2410		2862
2411	$self->SUPER::invoke_button_down ($ev, $x, $y);	2863	$self->SUPER::invoke_button_down ($ev, $x, $y);
2412		2864
2413	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2865	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2414		2866
2415	$self->mouse_motion ($ev, $x, $y)	2867	$self->invoke_mouse_motion ($ev, $x, $y)
2416	}	2868	}
2417		2869
2418	sub invoke_mouse_motion {	2870	sub invoke_mouse_motion {
2419	my ($self, $ev, $x, $y) = @_;	2871	my ($self, $ev, $x, $y) = @_;
2420		2872
…		…
2429	} else {	2881	} else {
2430	return 0;	2882	return 0;
2431	}	2883	}
2432		2884
2433	1	2885	1
		2886	}
		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
2434	}	2898	}
2435		2899
2436	sub update {	2900	sub update {
2437	my ($self) = @_;	2901	my ($self) = @_;
2438		2902
…		…
2487	glDisable GL_TEXTURE_2D;	2951	glDisable GL_TEXTURE_2D;
2488	}	2952	}
2489		2953
2490	#############################################################################	2954	#############################################################################
2491		2955
2492	package CFClient::UI::ValSlider;	2956	package CFPlus::UI::ValSlider;
2493		2957
2494	our @ISA = CFClient::UI::HBox::;	2958	our @ISA = CFPlus::UI::HBox::;
2495		2959
2496	sub new {	2960	sub new {
2497	my ($class, %arg) = @_;	2961	my ($class, %arg) = @_;
2498		2962
2499	my $range = delete $arg{range};	2963	my $range = delete $arg{range};
2500		2964
2501	my $self = $class->SUPER::new (	2965	my $self = $class->SUPER::new (
2502	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2966	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2503	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2967	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2504	to_value => sub { shift },	2968	to_value => sub { shift },
2505	from_value => sub { shift },	2969	from_value => sub { shift },
2506	%arg,	2970	%arg,
2507	);	2971	);
2508		2972
…		…
2528	sub set_range { shift->{slider}->set_range (@_) }	2992	sub set_range { shift->{slider}->set_range (@_) }
2529	sub set_value { shift->{slider}->set_value (@_) }	2993	sub set_value { shift->{slider}->set_value (@_) }
2530		2994
2531	#############################################################################	2995	#############################################################################
2532		2996
2533	package CFClient::UI::TextScroller;	2997	package CFPlus::UI::TextScroller;
2534		2998
2535	our @ISA = CFClient::UI::HBox::;	2999	our @ISA = CFPlus::UI::HBox::;
2536		3000
2537	use CFClient::OpenGL;	3001	use CFPlus::OpenGL;
2538		3002
2539	sub new {	3003	sub new {
2540	my $class = shift;	3004	my $class = shift;
2541		3005
2542	my $self = $class->SUPER::new (	3006	my $self = $class->SUPER::new (
2543	fontsize => 1,	3007	fontsize => 1,
2544	can_events => 0,	3008	can_events => 1,
2545	indent => 0,	3009	indent => 0,
2546	#font => default_font	3010	#font => default_font
2547	@_,	3011	@_,
2548		3012
2549	layout => (new CFClient::Layout 1),	3013	layout => (new CFPlus::Layout),
2550	par => [],	3014	par => [],
		3015	max_par => 0,
2551	height => 0,	3016	height => 0,
2552	children => [	3017	children => [
2553	(new CFClient::UI::Empty expand => 1),	3018	(new CFPlus::UI::Empty expand => 1),
2554	(new CFClient::UI::Slider vertical => 1),	3019	(new CFPlus::UI::Slider vertical => 1),
2555	],	3020	],
2556	);	3021	);
2557		3022
2558	$self->{children}[1]->connect (changed => sub { $self->update });	3023	$self->{children}[1]->connect (changed => sub { $self->update });
2559		3024
…		…
2565		3030
2566	$self->{fontsize} = $fontsize;	3031	$self->{fontsize} = $fontsize;
2567	$self->reflow;	3032	$self->reflow;
2568	}	3033	}
2569		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
2570	sub invoke_size_allocate {	3044	sub invoke_size_allocate {
2571	my ($self, $w, $h) = @_;	3045	my ($self, $w, $h) = @_;
2572		3046
		3047	my ($empty, $slider, @other) = @{ $self->{children} };
		3048	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		3049
2573	$self->{layout}->set_font ($self->{font}) if $self->{font};	3050	$self->{layout}->set_font ($self->{font}) if $self->{font};
2574	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3051	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2575	$self->{layout}->set_width ($self->{children}[0]{w});	3052	$self->{layout}->set_width ($empty->{w});
2576	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3053	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2577		3054
2578	$self->reflow;	3055	$self->reflow;
2579		3056
		3057	local $self->{children} = [$empty, $slider];
2580	$self->SUPER::invoke_size_allocate ($w, $h)	3058	$self->SUPER::invoke_size_allocate ($w, $h)
2581	}	3059	}
2582		3060
2583	sub text_size {	3061	sub invoke_mouse_wheel {
2584	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) = @_;
2585		3073
2586	my $layout = $self->{layout};	3074	my $layout = $self->{layout};
2587		3075
		3076	$layout->set_font ($self->{font}) if $self->{font};
		3077	$layout->set_foreground (@{$para->{fg}});
2588	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3078	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2589	$layout->set_width ($self->{children}[0]{w} - $indent);	3079	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2590	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3080	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2591	$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}}
2592		3087	);
		3088
2593	$layout->size	3089	$layout
2594	}	3090	}
2595		3091
2596	sub reflow {	3092	sub reflow {
2597	my ($self) = @_;	3093	my ($self) = @_;
2598		3094
…		…
2605		3101
2606	# todo: base offset on lines or so, not on pixels	3102	# todo: base offset on lines or so, not on pixels
2607	$self->{children}[1]->set_value ($offset);	3103	$self->{children}[1]->set_value ($offset);
2608	}	3104	}
2609		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
2610	sub clear {	3121	sub clear {
2611	my ($self) = @_;	3122	my ($self) = @_;
		3123
		3124	my (undef, undef, @other) = @{ $self->{children} };
		3125	$self->remove ($_) for @other;
2612		3126
2613	$self->{par} = [];	3127	$self->{par} = [];
2614	$self->{height} = 0;	3128	$self->{height} = 0;
2615	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3129	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616	}	3130	}
2617		3131
2618	sub add_paragraph {	3132	sub add_paragraph {
2619	my ($self, $color, $text, $indent) = @_;	3133	my $self = shift;
2620		3134
2621	for my $line (split /\n/, $text) {	3135	for my $para (@_) {
2622	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
2623	$self->{height} += $h;	3187	$self->{height} = $height;
2624	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3188	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2625	}
2626		3189
2627	$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	}
2628	}	3196	}
2629		3197
2630	sub update {	3198	sub update {
2631	my ($self) = @_;	3199	my ($self) = @_;
2632		3200
…		…
2635	return unless $self->{h} > 0;	3203	return unless $self->{h} > 0;
2636		3204
2637	delete $self->{texture};	3205	delete $self->{texture};
2638		3206
2639	$ROOT->on_post_alloc ($self => sub {	3207	$ROOT->on_post_alloc ($self => sub {
		3208	$self->force_uptodate;
		3209
2640	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3210	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641		3211
2642	if (delete $self->{need_reflow}) {
2643	my $height = 0;
2644
2645	my $layout = $self->{layout};
2646
2647	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2648
2649	for (@{$self->{par}}) {
2650	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2651	$layout->set_width ($W - $_->[3]);
2652	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2653	$layout->set_markup ($_->[4]);
2654	my ($w, $h) = $layout->size;
2655	$_->[0] = $w + $_->[3];
2656	$_->[1] = $h;
2657	}
2658
2659	$height += $_->[1];
2660	}
2661
2662	$self->{height} = $height;
2663
2664	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2665
2666	delete $self->{texture};
2667	}
2668
2669	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3212	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2670	glClearColor 0, 0, 0, 0;	3213	glClearColor 0, 0, 0, 0;
2671	glClear GL_COLOR_BUFFER_BIT;	3214	glClear GL_COLOR_BUFFER_BIT;
2672		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;
2673	my $top = int $self->{children}[1]{range}[0];	3224	my $top = int $self->{children}[1]{range}[0];
2674		3225
2675	my $y0 = $top;	3226	my $y0 = $top;
2676	my $y1 = $top + $H;	3227	my $y1 = $top + $H;
2677		3228
2678	my $y = 0;
2679
2680	my $layout = $self->{layout};
2681
2682	$layout->set_font ($self->{font}) if $self->{font};
2683
2684	glEnable GL_BLEND;
2685	#TODO# not correct in windows where rgba is forced off
2686	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2687
2688	for my $par (@{$self->{par}}) {	3229	for my $para (@{$self->{par}}) {
2689	my $h = $par->[1];	3230	my $h = $para->{h};
		3231	my $y = $para->{y};
2690		3232
2691	if ($y0 < $y + $h && $y < $y1) {	3233	if ($y0 < $y + $h && $y < $y1) {
2692	$layout->set_foreground (@{ $par->[2] });	3234	my $layout = $self->get_layout ($para);
2693	$layout->set_width ($W - $par->[3]);
2694	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2695	$layout->set_markup ($par->[4]);
2696		3235
2697	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3236	$layout->render ($para->{indent}, $y - $y0);
2698		3237
2699	glRasterPos $par->[3], $y - $y0;	3238	if (my @w = @{ $para->{widget} }) {
2700	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	}
2701	}	3250	}
2702		3251
2703	$y += $h;	3252	$paridx++;
		3253	$top_paragraph ||= $paridx if $y >= $top;
2704	}	3254	}
2705		3255
2706	glDisable GL_BLEND;	3256	$self->{top_paragraph} = $top_paragraph;
2707	};	3257	};
2708	});	3258	});
		3259	}
		3260
		3261	sub reconfigure {
		3262	my ($self) = @_;
		3263
		3264	$self->SUPER::reconfigure;
		3265
		3266	$_->{w} = 1e10 for @{ $self->{par} };
		3267	$self->reflow;
2709	}	3268	}
2710		3269
2711	sub _draw {	3270	sub _draw {
2712	my ($self) = @_;	3271	my ($self) = @_;
2713		3272
…		…
2716	glColor 0, 0, 0, 1;	3275	glColor 0, 0, 0, 1;
2717	$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});
2718	glDisable GL_TEXTURE_2D;	3277	glDisable GL_TEXTURE_2D;
2719		3278
2720	$self->{children}[1]->draw;	3279	$self->{children}[1]->draw;
2721
2722	}	3280	}
2723		3281
2724	#############################################################################	3282	#############################################################################
2725		3283
2726	package CFClient::UI::Animator;	3284	package CFPlus::UI::Animator;
2727		3285
2728	use CFClient::OpenGL;	3286	use CFPlus::OpenGL;
2729		3287
2730	our @ISA = CFClient::UI::Bin::;	3288	our @ISA = CFPlus::UI::Bin::;
2731		3289
2732	sub moveto {	3290	sub moveto {
2733	my ($self, $x, $y) = @_;	3291	my ($self, $x, $y) = @_;
2734		3292
2735	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3293	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2763	glPopMatrix;	3321	glPopMatrix;
2764	}	3322	}
2765		3323
2766	#############################################################################	3324	#############################################################################
2767		3325
2768	package CFClient::UI::Flopper;	3326	package CFPlus::UI::Flopper;
2769		3327
2770	our @ISA = CFClient::UI::Button::;	3328	our @ISA = CFPlus::UI::Button::;
2771		3329
2772	sub new {	3330	sub new {
2773	my $class = shift;	3331	my $class = shift;
2774		3332
2775	my $self = $class->SUPER::new (	3333	my $self = $class->SUPER::new (
…		…
2787	$self->{other}->toggle_visibility;	3345	$self->{other}->toggle_visibility;
2788	}	3346	}
2789		3347
2790	#############################################################################	3348	#############################################################################
2791		3349
2792	package CFClient::UI::Tooltip;	3350	package CFPlus::UI::Tooltip;
2793		3351
2794	our @ISA = CFClient::UI::Bin::;	3352	our @ISA = CFPlus::UI::Bin::;
2795		3353
2796	use CFClient::OpenGL;	3354	use CFPlus::OpenGL;
2797		3355
2798	sub new {	3356	sub new {
2799	my $class = shift;	3357	my $class = shift;
2800		3358
2801	$class->SUPER::new (	3359	$class->SUPER::new (
…		…
2804	)	3362	)
2805	}	3363	}
2806		3364
2807	sub set_tooltip_from {	3365	sub set_tooltip_from {
2808	my ($self, $widget) = @_;	3366	my ($self, $widget) = @_;
		3367
		3368	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3369	if $widget->{tooltip} =~ /^#(.*)$/;
2809		3370
2810	my $tooltip = $widget->{tooltip};	3371	my $tooltip = $widget->{tooltip};
2811		3372
2812	if ($ENV{CFPLUS_DEBUG} & 2) {	3373	if ($ENV{CFPLUS_DEBUG} & 2) {
2813	$tooltip .= "\n\n" . (ref $widget) . "\n"	3374	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2817	}	3378	}
2818		3379
2819	$tooltip =~ s/^\n+//;	3380	$tooltip =~ s/^\n+//;
2820	$tooltip =~ s/\n+$//;	3381	$tooltip =~ s/\n+$//;
2821		3382
2822	$self->add (new CFClient::UI::Label	3383	$self->add (new CFPlus::UI::Label
2823	markup => $tooltip,	3384	markup => $tooltip,
2824	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3385	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2825	fontsize => 0.8,	3386	fontsize => 0.8,
2826	fg => [0, 0, 0, 1],	3387	style => 1, # FLAG_INVERSE
2827	ellipsise => 0,	3388	ellipsise => 0,
2828	font => ($widget->{tooltip_font} || $::FONT_PROP),	3389	font => ($widget->{tooltip_font} || $::FONT_PROP),
2829	);	3390	);
2830	}	3391	}
2831		3392
…		…
2850		3411
2851	$self->{root}->on_post_alloc ("move_$self" => sub {	3412	$self->{root}->on_post_alloc ("move_$self" => sub {
2852	my $widget = $self->{owner}	3413	my $widget = $self->{owner}
2853	or return;	3414	or return;
2854		3415
		3416	if ($widget->{visible}) {
2855	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3417	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856		3418
2857	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3419	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858	if $x + $self->{w} > $self->{root}{w};	3420	if $x + $self->{w} > $self->{root}{w};
2859		3421
2860	$self->move_abs ($x, $y);	3422	$self->move_abs ($x, $y);
		3423	} else {
		3424	$self->hide;
		3425	}
2861	});	3426	});
2862	}	3427	}
2863		3428
2864	sub _draw {	3429	sub _draw {
2865	my ($self) = @_;	3430	my ($self) = @_;
…		…
2889	$self->SUPER::_draw;	3454	$self->SUPER::_draw;
2890	}	3455	}
2891		3456
2892	#############################################################################	3457	#############################################################################
2893		3458
2894	package CFClient::UI::Face;	3459	package CFPlus::UI::Face;
2895		3460
2896	our @ISA = CFClient::UI::Base::;	3461	our @ISA = CFPlus::UI::DrawBG::;
2897		3462
2898	use CFClient::OpenGL;	3463	use CFPlus::OpenGL;
2899		3464
2900	sub new {	3465	sub new {
2901	my $class = shift;	3466	my $class = shift;
2902		3467
2903	my $self = $class->SUPER::new (	3468	my $self = $class->SUPER::new (
		3469	size_w => 32,
		3470	size_h => 8,
2904	aspect => 1,	3471	aspect => 1,
2905	can_events => 0,	3472	can_events => 0,
2906	@_,	3473	@_,
2907	);	3474	);
2908		3475
2909	if ($self->{anim} && $self->{animspeed}) {	3476	if ($self->{anim} && $self->{animspeed}) {
2910	Scalar::Util::weaken (my $widget = $self);	3477	CFPlus::weaken (my $widget = $self);
2911		3478
		3479	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3480	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2912	$self->{timer} = Event->timer (	3481	$self->{timer} = Event->timer (
2913	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2914	hard => 1,	3482	parked => 1,
2915	interval => $self->{animspeed},
2916	cb => sub {	3483	cb => sub {
		3484	return unless $::CONN && $widget;
		3485
2917	++$widget->{frame};	3486	++$widget->{frame};
		3487	$widget->update_face;
2918	$widget->update;	3488	$widget->update;
		3489
		3490	$widget->update_timer;
2919	},	3491	},
2920	);	3492	);
		3493
		3494	$self->update_face;
		3495	$self->update_timer;
2921	}	3496	}
2922		3497
2923	$self	3498	$self
2924	}	3499	}
2925		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
2926	sub size_request {	3531	sub size_request {
2927	(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)
2928	}	3547	}
2929		3548
2930	sub update {	3549	sub update {
2931	my ($self) = @_;	3550	my ($self) = @_;
2932		3551
2933	return unless $self->{visible};	3552	return unless $self->{visible};
2934		3553
2935	$self->SUPER::update;	3554	$self->SUPER::update;
2936	}	3555	}
2937		3556
		3557	sub invoke_visibility_change {
		3558	my ($self) = @_;
		3559
		3560	$self->update_timer;
		3561
		3562	0
		3563	}
		3564
2938	sub _draw {	3565	sub _draw {
2939	my ($self) = @_;	3566	my ($self) = @_;
2940		3567
2941	return unless $::CONN;	3568	return unless $::CONN;
2942		3569
2943	my $face;	3570	$self->SUPER::_draw;
2944		3571
2945	if ($self->{frame}) {
2946	my $anim = $::CONN->{anim}[$self->{anim}];	3572	my $faceid = $::CONN->{faceid}[$self->{face}]
2947		3573	or return;
2948	$face = $anim->[ $self->{frame} % @$anim ]
2949	if $anim && @$anim;
2950	}
2951		3574
2952	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3575	my $tex = $::CONN->{texture}[$faceid];
2953		3576
2954	if ($tex) {	3577	if ($tex) {
2955	glEnable GL_TEXTURE_2D;	3578	glEnable GL_TEXTURE_2D;
2956	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3579	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2957	glColor 0, 0, 0, 1;	3580	glColor 0, 0, 0, 1;
…		…
2961	}	3584	}
2962		3585
2963	sub destroy {	3586	sub destroy {
2964	my ($self) = @_;	3587	my ($self) = @_;
2965		3588
2966	$self->{timer}->cancel	3589	(delete $self->{timer})->cancel
2967	if $self->{timer};	3590	if $self->{timer};
2968		3591
2969	$self->SUPER::destroy;	3592	$self->SUPER::destroy;
2970	}	3593	}
2971		3594
2972	#############################################################################	3595	#############################################################################
2973		3596
2974	package CFClient::UI::Buttonbar;	3597	package CFPlus::UI::Buttonbar;
2975		3598
2976	our @ISA = CFClient::UI::HBox::;	3599	our @ISA = CFPlus::UI::HBox::;
2977		3600
2978	# TODO: should actualyl wrap buttons and other goodies.	3601	# TODO: should actually wrap buttons and other goodies.
2979		3602
2980	#############################################################################	3603	#############################################################################
2981		3604
2982	package CFClient::UI::Menu;	3605	package CFPlus::UI::Menu;
2983		3606
2984	our @ISA = CFClient::UI::FancyFrame::;	3607	our @ISA = CFPlus::UI::Toplevel::;
2985		3608
2986	use CFClient::OpenGL;	3609	use CFPlus::OpenGL;
2987		3610
2988	sub new {	3611	sub new {
2989	my $class = shift;	3612	my $class = shift;
2990		3613
2991	my $self = $class->SUPER::new (	3614	my $self = $class->SUPER::new (
2992	items => [],	3615	items => [],
2993	z => 100,	3616	z => 100,
2994	@_,	3617	@_,
2995	);	3618	);
2996		3619
2997	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3620	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2998		3621
2999	for my $item (@{ $self->{items} }) {	3622	for my $item (@{ $self->{items} }) {
3000	my ($widget, $cb, $tooltip) = @$item;	3623	my ($widget, $cb, $tooltip) = @$item;
3001		3624
3002	# handle various types of items, only text for now	3625	# handle various types of items, only text for now
3003	if (!ref $widget) {	3626	if (!ref $widget) {
		3627	if ($widget =~ /\t/) {
		3628	my ($left, $right) = split /\t/, $widget, 2;
		3629
3004	$widget = new CFClient::UI::Label	3630	$widget = new CFPlus::UI::HBox
3005	can_hover => 1,	3631	can_hover => 1,
3006	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,
3007	markup => $widget,	3644	markup => $widget,
3008	tooltip => $tooltip	3645	tooltip => $tooltip;
		3646	}
3009	}	3647	}
3010		3648
3011	$self->{item}{$widget} = $item;	3649	$self->{item}{$widget} = $item;
3012		3650
3013	$self->{vbox}->add ($widget);	3651	$self->{vbox}->add ($widget);
…		…
3056	1	3694	1
3057	}	3695	}
3058		3696
3059	#############################################################################	3697	#############################################################################
3060		3698
3061	package CFClient::UI::Multiplexer;	3699	package CFPlus::UI::Multiplexer;
3062		3700
3063	our @ISA = CFClient::UI::Container::;	3701	our @ISA = CFPlus::UI::Container::;
3064		3702
3065	sub new {	3703	sub new {
3066	my $class = shift;	3704	my $class = shift;
3067		3705
3068	my $self = $class->SUPER::new (	3706	my $self = $class->SUPER::new (
…		…
3082		3720
3083	$self->{current} = $self->{children}[0]	3721	$self->{current} = $self->{children}[0]
3084	if @{ $self->{children} };	3722	if @{ $self->{children} };
3085	}	3723	}
3086		3724
		3725	sub get_current_page {
		3726	my ($self) = @_;
		3727
		3728	$self->{current}
		3729	}
		3730
3087	sub set_current_page {	3731	sub set_current_page {
3088	my ($self, $page_or_widget) = @_;	3732	my ($self, $page_or_widget) = @_;
3089		3733
3090	my $widget = ref $page_or_widget	3734	my $widget = ref $page_or_widget
3091	? $page_or_widget	3735	? $page_or_widget
…		…
3123	$self->{current}->draw;	3767	$self->{current}->draw;
3124	}	3768	}
3125		3769
3126	#############################################################################	3770	#############################################################################
3127		3771
3128	package CFClient::UI::Notebook;	3772	package CFPlus::UI::Notebook;
3129		3773
3130	our @ISA = CFClient::UI::VBox::;	3774	our @ISA = CFPlus::UI::VBox::;
3131		3775
3132	sub new {	3776	sub new {
3133	my $class = shift;	3777	my $class = shift;
3134		3778
3135	my $self = $class->SUPER::new (	3779	my $self = $class->SUPER::new (
3136	buttonbar => (new CFClient::UI::Buttonbar),	3780	buttonbar => (new CFPlus::UI::Buttonbar),
3137	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3781	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3138	# filter => # will be put between multiplexer and $self	3782	# filter => # will be put between multiplexer and $self
3139	@_,	3783	@_,
3140	);	3784	);
3141		3785
3142	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3786	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3146	}	3790	}
3147		3791
3148	sub add {	3792	sub add {
3149	my ($self, $title, $widget, $tooltip) = @_;	3793	my ($self, $title, $widget, $tooltip) = @_;
3150		3794
3151	Scalar::Util::weaken $self;	3795	CFPlus::weaken $self;
3152		3796
3153	$self->{buttonbar}->add (new CFClient::UI::Button	3797	$self->{buttonbar}->add (new CFPlus::UI::Button
3154	markup => $title,	3798	markup => $title,
3155	tooltip => $tooltip,	3799	tooltip => $tooltip,
3156	on_activate => sub { $self->set_current_page ($widget) },	3800	on_activate => sub { $self->set_current_page ($widget) },
3157	);	3801	);
3158		3802
3159	$self->{multiplexer}->add ($widget);	3803	$self->{multiplexer}->add ($widget);
3160	}	3804	}
3161		3805
		3806	sub get_current_page {
		3807	my ($self) = @_;
		3808
		3809	$self->{multiplexer}->get_current_page
		3810	}
		3811
3162	sub set_current_page {	3812	sub set_current_page {
3163	my ($self, $page) = @_;	3813	my ($self, $page) = @_;
3164		3814
3165	$self->{multiplexer}->set_current_page ($page);	3815	$self->{multiplexer}->set_current_page ($page);
3166	$self->emit (page_changed => $self->{multiplexer}{current});	3816	$self->emit (page_changed => $self->{multiplexer}{current});
3167	}	3817	}
3168		3818
3169	#############################################################################	3819	#############################################################################
3170		3820
3171	package CFClient::UI::Combobox;	3821	package CFPlus::UI::Selector;
3172		3822
3173	use utf8;	3823	use utf8;
3174		3824
3175	our @ISA = CFClient::UI::Button::;	3825	our @ISA = CFPlus::UI::Button::;
3176		3826
3177	sub new {	3827	sub new {
3178	my $class = shift;	3828	my $class = shift;
3179		3829
3180	my $self = $class->SUPER::new (	3830	my $self = $class->SUPER::new (
…		…
3197	my ($value, $title, $tooltip) = @$_;	3847	my ($value, $title, $tooltip) = @$_;
3198		3848
3199	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3849	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200	}	3850	}
3201		3851
3202	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3852	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203	}	3853	}
3204		3854
3205	sub _set_value {	3855	sub _set_value {
3206	my ($self, $value) = @_;	3856	my ($self, $value) = @_;
3207		3857
…		…
3222	$self->emit (changed => $value);	3872	$self->emit (changed => $value);
3223	}	3873	}
3224		3874
3225	#############################################################################	3875	#############################################################################
3226		3876
3227	package CFClient::UI::Statusbox;	3877	package CFPlus::UI::Statusbox;
3228		3878
3229	our @ISA = CFClient::UI::VBox::;	3879	our @ISA = CFPlus::UI::VBox::;
3230		3880
3231	sub new {	3881	sub new {
3232	my $class = shift;	3882	my $class = shift;
3233		3883
3234	my $self = $class->SUPER::new (	3884	my $self = $class->SUPER::new (
3235	fontsize => 0.8,	3885	fontsize => 0.8,
3236	@_,	3886	@_,
3237	);	3887	);
3238		3888
3239	Scalar::Util::weaken (my $this = $self);	3889	CFPlus::weaken (my $this = $self);
3240		3890
3241	$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 });
3242		3892
3243	$self	3893	$self
3244	}	3894	}
…		…
3246	sub reorder {	3896	sub reorder {
3247	my ($self) = @_;	3897	my ($self) = @_;
3248	my $NOW = Time::HiRes::time;	3898	my $NOW = Time::HiRes::time;
3249		3899
3250	# freeze display when hovering over any label	3900	# freeze display when hovering over any label
3251	return if $CFClient::UI::TOOLTIP->{owner}	3901	return if $CFPlus::UI::TOOLTIP->{owner}
3252	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3902	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3253	values %{ $self->{item} };	3903	values %{ $self->{item} };
3254		3904
3255	while (my ($k, $v) = each %{ $self->{item} }) {	3905	while (my ($k, $v) = each %{ $self->{item} }) {
3256	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3906	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3257	}	3907	}
…		…
3278	for ($short) {	3928	for ($short) {
3279	s/^\s+//;	3929	s/^\s+//;
3280	s/\s+/ /g;	3930	s/\s+/ /g;
3281	}	3931	}
3282		3932
3283	new CFClient::UI::Label	3933	new CFPlus::UI::Label
3284	markup => $short,	3934	markup => $short,
3285	tooltip => $item->{tooltip},	3935	tooltip => $item->{tooltip},
3286	tooltip_font => $::FONT_PROP,	3936	tooltip_font => $::FONT_PROP,
3287	tooltip_width => 0.67,	3937	tooltip_width => 0.67,
3288	fontsize => $item->{fontsize} || $self->{fontsize},	3938	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3342	count => 1,	3992	count => 1,
3343	%arg,	3993	%arg,
3344	};	3994	};
3345	}	3995	}
3346		3996
		3997	$ROOT->on_refresh (reorder => sub {
3347	$self->reorder;	3998	$self->reorder;
		3999	});
3348	}	4000	}
3349		4001
3350	sub reconfigure {	4002	sub reconfigure {
3351	my ($self) = @_;	4003	my ($self) = @_;
3352		4004
…		…
3365	$self->SUPER::destroy;	4017	$self->SUPER::destroy;
3366	}	4018	}
3367		4019
3368	#############################################################################	4020	#############################################################################
3369		4021
3370	package CFClient::UI::Inventory;
3371
3372	our @ISA = CFClient::UI::ScrolledWindow::;
3373
3374	sub new {
3375	my $class = shift;
3376
3377	my $self = $class->SUPER::new (
3378	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3379	@_,
3380	);
3381
3382	$self
3383	}
3384
3385	sub set_items {
3386	my ($self, $items) = @_;
3387
3388	$self->{child}->clear;
3389	return unless $items;
3390
3391	my @items = sort {
3392	($a->{type} <=> $b->{type})
3393	or ($a->{name} cmp $b->{name})
3394	} @$items;
3395
3396	$self->{real_items} = \@items;
3397
3398	my $row = 0;
3399	for my $item (@items) {
3400	CFClient::Item::update_widgets $item;
3401
3402	$self->{child}->add (0, $row, $item->{face_widget});
3403	$self->{child}->add (1, $row, $item->{desc_widget});
3404	$self->{child}->add (2, $row, $item->{weight_widget});
3405
3406	$row++;
3407	}
3408	}
3409
3410	#############################################################################
3411
3412	package CFClient::UI::BindEditor;
3413
3414	our @ISA = CFClient::UI::FancyFrame::;
3415
3416	sub new {
3417	my $class = shift;
3418
3419	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421	$self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425	text => "start recording",
3426	tooltip => "Start/Stops recording of actions."
3427	."All subsequent actions after the recording started will be captured."
3428	."The actions are displayed after the record was stopped."
3429	."To bind the action you have to click on the 'Bind' button",
3430	on_activate => sub {
3431	unless ($self->{recording}) {
3432	$self->start;
3433	} else {
3434	$self->stop;
3435	}
3436	});
3437
3438	$vb->add (new CFClient::UI::Label text => "Actions:");
3439	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3442	$vb->add (my $hb = new CFClient::UI::HBox);
3443	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444	$hb->add (new CFClient::UI::Button
3445	text => "bind",
3446	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447	on_activate => sub {
3448	$self->ask_for_bind;
3449	});
3450
3451	$vb->add (my $hb = new CFClient::UI::HBox);
3452	$hb->add (new CFClient::UI::Button
3453	text => "ok",
3454	expand => 1,
3455	tooltip => "This closes the binding editor and saves the binding",
3456	on_activate => sub {
3457	$self->hide;
3458	$self->commit;
3459	});
3460
3461	$hb->add (new CFClient::UI::Button
3462	text => "cancel",
3463	expand => 1,
3464	tooltip => "This closes the binding editor without saving",
3465	on_activate => sub {
3466	$self->hide;
3467	$self->{binding_cancel}->()
3468	if $self->{binding_cancel};
3469	});
3470
3471	$self->update_binding_widgets;
3472
3473	$self
3474	}
3475
3476	sub commit {
3477	my ($self) = @_;
3478	my ($mod, $sym, $cmds) = $self->get_binding;
3479	if ($sym != 0 && @$cmds > 0) {
3480	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481	."'. Don't forget 'Save Config'!");
3482	$self->{binding_change}->($mod, $sym, $cmds)
3483	if $self->{binding_change};
3484	} else {
3485	$::STATUSBOX->add ("No action bound, no key or action specified!");
3486	$self->{binding_cancel}->()
3487	if $self->{binding_cancel};
3488	}
3489	}
3490
3491	sub start {
3492	my ($self) = @_;
3493
3494	$self->{rec_btn}->set_text ("stop recording");
3495	$self->{recording} = 1;
3496	$self->clear_command_list;
3497	$::CONN->start_record if $::CONN;
3498	}
3499
3500	sub stop {
3501	my ($self) = @_;
3502
3503	$self->{rec_btn}->set_text ("start recording");
3504	$self->{recording} = 0;
3505
3506	my $rec;
3507	$rec = $::CONN->stop_record if $::CONN;
3508	return unless ref $rec eq 'ARRAY';
3509	$self->set_command_list ($rec);
3510	}
3511
3512
3513	sub ask_for_bind_and_commit {
3514	my ($self) = @_;
3515	$self->ask_for_bind (1);
3516	}
3517
3518	sub ask_for_bind {
3519	my ($self, $commit, $end_cb) = @_;
3520
3521	CFClient::Binder::open_binding_dialog (sub {
3522	my ($mod, $sym) = @_;
3523	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524	$self->update_binding_widgets;
3525	$self->commit if $commit;
3526	$end_cb->() if $end_cb;
3527	});
3528	}
3529
3530	# $mod and $sym are the modifiers and key symbol
3531	# $cmds is a array ref of strings (the commands)
3532	# $cb is the callback that is executed on OK
3533	# $ccb is the callback that is executed on CANCEL and
3534	# when the binding was unsuccessful on OK
3535	sub set_binding {
3536	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538	$self->clear_command_list;
3539	$self->{recording} = 0;
3540	$self->{rec_btn}->set_text ("start recording");
3541
3542	$self->{binding} = [$mod, $sym];
3543	$self->{commands} = $cmds;
3544
3545	$self->{binding_change} = $cb;
3546	$self->{binding_cancel} = $ccb;
3547
3548	$self->update_binding_widgets;
3549	}
3550
3551	# this is a shortcut method that asks for a binding
3552	# and then just binds it.
3553	sub do_quick_binding {
3554	my ($self, $cmds, $end_cb) = @_;
3555	$self->set_binding (undef, undef, $cmds, sub {
3556	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557	});
3558	$self->ask_for_bind (1, $end_cb);
3559	}
3560
3561	sub update_binding_widgets {
3562	my ($self) = @_;
3563	my ($mod, $sym, $cmds) = $self->get_binding;
3564	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565	$self->set_command_list ($cmds);
3566	}
3567
3568	sub get_binding {
3569	my ($self) = @_;
3570	return (
3571	$self->{binding}->[0],
3572	$self->{binding}->[1],
3573	[ grep { defined $_ } @{$self->{commands}} ]
3574	);
3575	}
3576
3577	sub clear_command_list {
3578	my ($self) = @_;
3579	$self->{cmdbox}->clear ();
3580	}
3581
3582	sub set_command_list {
3583	my ($self, $cmds) = @_;
3584
3585	$self->{cmdbox}->clear ();
3586	$self->{commands} = $cmds;
3587
3588	my $idx = 0;
3589
3590	for (@$cmds) {
3591	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593	my $i = $idx;
3594	$hb->add (new CFClient::UI::Label text => $_);
3595	$hb->add (new CFClient::UI::Button
3596	text => "delete",
3597	tooltip => "Deletes the action from the record",
3598	on_activate => sub {
3599	$self->{cmdbox}->remove ($hb);
3600	$cmds->[$i] = undef;
3601	});
3602
3603
3604	$idx++
3605	}
3606	}
3607
3608	#############################################################################
3609
3610	package CFClient::UI::SpellList;
3611
3612	our @ISA = CFClient::UI::Table::;
3613
3614	sub new {
3615	my $class = shift;
3616
3617	my $self = $class->SUPER::new (
3618	binding => [],
3619	commands => [],
3620	@_,
3621	)
3622	}
3623
3624	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3625
3626	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3627	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3628	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3629	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3630	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3631	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3632	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3633	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3634	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3636
3637	sub rebuild_spell_list {
3638	my ($self) = @_;
3639
3640	$CFClient::UI::ROOT->on_refresh ($self => sub {
3641	$self->clear;
3642
3643	return unless $::CONN;
3644
3645	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3647	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3648	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3649	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650
3651	my $row = 0;
3652
3653	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654	my $spell = $self->{spell}{$_};
3655
3656	$row++;
3657
3658	my $spell_cb = sub {
3659	my ($widget, $ev) = @_;
3660
3661	if ($ev->{button} == 1) {
3662	$::CONN->user_send ("cast $spell->{name}");
3663	} elsif ($ev->{button} == 2) {
3664	$::CONN->user_send ("invoke $spell->{name}");
3665	} elsif ($ev->{button} == 3) {
3666	(new CFClient::UI::Menu
3667	items => [
3668	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670	],
3671	)->popup ($ev);
3672	} else {
3673	return 0;
3674	}
3675
3676	1
3677	};
3678
3679	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3680
3681	#TODO: add path info to tooltip
3682	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3683
3684	$self->add (0, $row, new CFClient::UI::Face
3685	face => $spell->{face},
3686	can_hover => 1,
3687	can_events => 1,
3688	tooltip => $tooltip,
3689	on_button_down => $spell_cb,
3690	);
3691
3692	$self->add (1, $row, new CFClient::UI::Label
3693	expand => 1,
3694	text => $spell->{name},
3695	can_hover => 1,
3696	can_events => 1,
3697	tooltip => $tooltip,
3698	on_button_down => $spell_cb,
3699	);
3700
3701	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3702	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3703	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3704	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705	}
3706	});
3707	}
3708
3709	sub add_spell {
3710	my ($self, $spell) = @_;
3711
3712	$self->{spell}->{$spell->{name}} = $spell;
3713	$self->rebuild_spell_list;
3714	}
3715
3716	sub remove_spell {
3717	my ($self, $spell) = @_;
3718
3719	delete $self->{spell}->{$spell->{name}};
3720	$self->rebuild_spell_list;
3721	}
3722
3723	sub clear_spells {
3724	my ($self) = @_;
3725
3726	$self->{spell} = {};
3727	$self->rebuild_spell_list;
3728	}
3729
3730	#############################################################################
3731
3732	package CFClient::UI::Root;	4022	package CFPlus::UI::Root;
3733		4023
3734	our @ISA = CFClient::UI::Container::;	4024	our @ISA = CFPlus::UI::Container::;
3735		4025
3736	use List::Util qw(min max);	4026	use List::Util qw(min max);
3737		4027
3738	use CFClient::OpenGL;	4028	use CFPlus::OpenGL;
3739		4029
3740	sub new {	4030	sub new {
3741	my $class = shift;	4031	my $class = shift;
3742		4032
3743	my $self = $class->SUPER::new (	4033	my $self = $class->SUPER::new (
3744	visible => 1,	4034	visible => 1,
3745	@_,	4035	@_,
3746	);	4036	);
3747		4037
3748	Scalar::Util::weaken ($self->{root} = $self);	4038	CFPlus::weaken ($self->{root} = $self);
3749		4039
3750	$self	4040	$self
3751	}	4041	}
3752		4042
3753	sub size_request {	4043	sub size_request {
…		…
3919	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4209	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3920		4210
3921	$w = 0 if $w < 0;	4211	$w = 0 if $w < 0;
3922	$h = 0 if $h < 0;	4212	$h = 0 if $h < 0;
3923		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
3924	$w = int $w + 0.5;	4223	$w = int $w + 0.5;
3925	$h = int $h + 0.5;	4224	$h = int $h + 0.5;
3926		4225
3927	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}) {
3928	$widget->{old_w} = $widget->{w};	4227	$widget->{old_w} = $widget->{w};
…		…
3938		4237
3939	while ($self->{post_alloc_hook}) {	4238	while ($self->{post_alloc_hook}) {
3940	$_->()	4239	$_->()
3941	for values %{delete $self->{post_alloc_hook}};	4240	for values %{delete $self->{post_alloc_hook}};
3942	}	4241	}
3943
3944		4242
3945	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4243	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3946	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4244	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3947	glClear GL_COLOR_BUFFER_BIT;	4245	glClear GL_COLOR_BUFFER_BIT;
3948		4246
…		…
3951	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4249	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3952	glMatrixMode GL_MODELVIEW;	4250	glMatrixMode GL_MODELVIEW;
3953	glLoadIdentity;	4251	glLoadIdentity;
3954		4252
3955	{	4253	{
3956	package CFClient::UI::Base;	4254	package CFPlus::UI::Base;
3957		4255
3958	($draw_x, $draw_y, $draw_w, $draw_h) =	4256	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3959	(0, 0, $self->{w}, $self->{h});	4257	(0, 0, $self->{w}, $self->{h});
3960	}
3961		4258
3962	$self->_draw;	4259	$self->_draw;
		4260	}
3963	}	4261	}
3964		4262
3965	#############################################################################	4263	#############################################################################
3966		4264
3967	package CFClient::UI;	4265	package CFPlus::UI;
3968		4266
3969	$ROOT = new CFClient::UI::Root;	4267	$ROOT = new CFPlus::UI::Root;
3970	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4268	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3971		4269
3972	1	4270	1
3973		4271

Diff Legend

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