ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.403 by root, Sat Jul 21 21:25:23 2007 UTC

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

Diff Legend

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