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.388 by root, Fri Jul 20 18:30:03 2007 UTC

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

Diff Legend

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