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

Diff Legend

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