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

Diff Legend

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