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.313 by root, Sat Jun 24 00:24:09 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 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	label => "%d%%",
		2806	%arg,
		2807	);
		2808
		2809	$self->set_value ($arg{value} || -1);
		2810
		2811	$self
		2812	}
		2813
		2814	sub set_label {
		2815	my ($self, $label) = @_;
		2816
		2817	return if $self->{label} eq $label;
		2818	$self->{label} = $label;
		2819
		2820	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2821	}
		2822
		2823	sub set_value {
		2824	my ($self, $value) = @_;
		2825
		2826	if ($self->{value} ne $value) {
		2827	$self->{value} = $value;
		2828
		2829	if ($value < 0) {
		2830	$self->set_text ("-");
		2831	} else {
		2832	$self->set_text (sprintf $self->{label}, $value * 100);
		2833	}
		2834
		2835	$self->update;
		2836	}
		2837	}
		2838
		2839	sub _draw {
		2840	my ($self) = @_;
		2841
		2842	glEnable GL_BLEND;
		2843	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2844
		2845	if ($self->{value} >= 0) {
		2846	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2847
		2848	glColor_premultiply @{$self->{bar}};
		2849	glRect 2, 2, $s, $self->{h} - 2;
		2850	glColor_premultiply @{$self->{bg}};
		2851	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2852	}
		2853
		2854	glColor_premultiply @{$self->{outline}};
		2855	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2856
		2857	glDisable GL_BLEND;
		2858
		2859	{
		2860	local $self->{bg}; # do not draw background
		2861	$self->SUPER::_draw;
		2862	}
		2863	}
		2864
		2865	#############################################################################
		2866
		2867	package CFPlus::UI::ExperienceProgress;
		2868
		2869	our @ISA = CFPlus::UI::Progress::;
		2870
		2871	sub new {
		2872	my ($class, %arg) = @_;
		2873
		2874	my $self = $class->SUPER::new (
		2875	%arg
		2876	);
		2877
		2878	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2879	if $::CONN;
		2880
		2881	$self
		2882	}
		2883
		2884	sub DESTROY {
		2885	my ($self) = @_;
		2886
		2887	delete $::CONN->{on_exp_update}{$self+0}
		2888	if $::CONN;
		2889
		2890	$self->SUPER::DESTROY;
		2891	}
		2892
		2893	sub set_value {
		2894	my ($self, $lvl, $exp) = @_;
		2895
		2896	my $v = -1;
		2897
		2898	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2899	my $l0 = $table->[$lvl - 1];
		2900	my $l1 = $table->[$lvl];
		2901
		2902	$v = ($exp - $l0) / ($l1 - $l0);
		2903	}
		2904
		2905	$self->SUPER::set_value ($v);
		2906	}
		2907
		2908	#############################################################################
		2909
2289	package CFClient::UI::Gauge;	2910	package CFPlus::UI::Gauge;
2290		2911
2291	our @ISA = CFClient::UI::VBox::;	2912	our @ISA = CFPlus::UI::VBox::;
2292		2913
2293	sub new {	2914	sub new {
2294	my ($class, %arg) = @_;	2915	my ($class, %arg) = @_;
2295		2916
2296	my $self = $class->SUPER::new (	2917	my $self = $class->SUPER::new (
…		…
2298	can_hover => 1,	2919	can_hover => 1,
2299	can_events => 1,	2920	can_events => 1,
2300	%arg,	2921	%arg,
2301	);	2922	);
2302		2923
2303	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2924	$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);	2925	$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");	2926	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306		2927
2307	$self	2928	$self
2308	}	2929	}
2309		2930
2310	sub set_fontsize {	2931	sub set_fontsize {
…		…
2331	$self->{value}->set_text ($val);	2952	$self->{value}->set_text ($val);
2332	}	2953	}
2333		2954
2334	#############################################################################	2955	#############################################################################
2335		2956
2336	package CFClient::UI::Slider;	2957	package CFPlus::UI::Slider;
2337		2958
2338	use strict;	2959	use strict;
2339		2960
2340	use CFClient::OpenGL;	2961	use CFPlus::OpenGL;
2341		2962
2342	our @ISA = CFClient::UI::DrawBG::;	2963	our @ISA = CFPlus::UI::DrawBG::;
2343		2964
2344	my @tex =	2965	my @tex =
2345	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2966	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346	qw(s1_slider.png s1_slider_bg.png);	2967	qw(s1_slider.png s1_slider_bg.png);
2347		2968
2348	sub new {	2969	sub new {
2349	my $class = shift;	2970	my $class = shift;
2350		2971
…		…
2418		3039
2419	$self->SUPER::invoke_button_down ($ev, $x, $y);	3040	$self->SUPER::invoke_button_down ($ev, $x, $y);
2420		3041
2421	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3042	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2422		3043
2423	$self->invoke_mouse_motion ($ev, $x, $y)	3044	$self->invoke_mouse_motion ($ev, $x, $y);
		3045
		3046	1
2424	}	3047	}
2425		3048
2426	sub invoke_mouse_motion {	3049	sub invoke_mouse_motion {
2427	my ($self, $ev, $x, $y) = @_;	3050	my ($self, $ev, $x, $y) = @_;
2428		3051
…		…
2435		3058
2436	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3059	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437	} else {	3060	} else {
2438	return 0;	3061	return 0;
2439	}	3062	}
		3063
		3064	1
		3065	}
		3066
		3067	sub invoke_mouse_wheel {
		3068	my ($self, $ev) = @_;
		3069
		3070	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		3071
		3072	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3073
		3074	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2440		3075
2441	1	3076	1
2442	}	3077	}
2443		3078
2444	sub update {	3079	sub update {
…		…
2495	glDisable GL_TEXTURE_2D;	3130	glDisable GL_TEXTURE_2D;
2496	}	3131	}
2497		3132
2498	#############################################################################	3133	#############################################################################
2499		3134
2500	package CFClient::UI::ValSlider;	3135	package CFPlus::UI::ValSlider;
2501		3136
2502	our @ISA = CFClient::UI::HBox::;	3137	our @ISA = CFPlus::UI::HBox::;
2503		3138
2504	sub new {	3139	sub new {
2505	my ($class, %arg) = @_;	3140	my ($class, %arg) = @_;
2506		3141
2507	my $range = delete $arg{range};	3142	my $range = delete $arg{range};
2508		3143
2509	my $self = $class->SUPER::new (	3144	my $self = $class->SUPER::new (
2510	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3145	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3146	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512	to_value => sub { shift },	3147	to_value => sub { shift },
2513	from_value => sub { shift },	3148	from_value => sub { shift },
2514	%arg,	3149	%arg,
2515	);	3150	);
2516		3151
…		…
2536	sub set_range { shift->{slider}->set_range (@_) }	3171	sub set_range { shift->{slider}->set_range (@_) }
2537	sub set_value { shift->{slider}->set_value (@_) }	3172	sub set_value { shift->{slider}->set_value (@_) }
2538		3173
2539	#############################################################################	3174	#############################################################################
2540		3175
2541	package CFClient::UI::TextScroller;	3176	package CFPlus::UI::TextScroller;
2542		3177
2543	our @ISA = CFClient::UI::HBox::;	3178	our @ISA = CFPlus::UI::HBox::;
2544		3179
2545	use CFClient::OpenGL;	3180	use CFPlus::OpenGL;
2546		3181
2547	sub new {	3182	sub new {
2548	my $class = shift;	3183	my $class = shift;
2549		3184
2550	my $self = $class->SUPER::new (	3185	my $self = $class->SUPER::new (
2551	fontsize => 1,	3186	fontsize => 1,
2552	can_events => 0,	3187	can_events => 1,
2553	indent => 0,	3188	indent => 0,
2554	#font => default_font	3189	#font => default_font
2555	@_,	3190	@_,
2556		3191
2557	layout => (new CFClient::Layout 1),	3192	layout => (new CFPlus::Layout),
2558	par => [],	3193	par => [],
		3194	max_par => 0,
2559	height => 0,	3195	height => 0,
2560	children => [	3196	children => [
2561	(new CFClient::UI::Empty expand => 1),	3197	(new CFPlus::UI::Empty expand => 1),
2562	(new CFClient::UI::Slider vertical => 1),	3198	(new CFPlus::UI::Slider vertical => 1),
2563	],	3199	],
2564	);	3200	);
2565		3201
2566	$self->{children}[1]->connect (changed => sub { $self->update });	3202	$self->{children}[1]->connect (changed => sub { $self->update });
2567		3203
…		…
2576	}	3212	}
2577		3213
2578	sub size_request {	3214	sub size_request {
2579	my ($self) = @_;	3215	my ($self) = @_;
2580		3216
2581	my ($empty, $slider) = @{ $self->{children} };	3217	my ($empty, $slider) = $self->visible_children;
2582		3218
2583	local $self->{children} = [$empty, $slider];	3219	local $self->{children} = [$empty, $slider];
2584	$self->SUPER::size_request	3220	$self->SUPER::size_request
2585	}	3221	}
2586		3222
…		…
2597		3233
2598	$self->reflow;	3234	$self->reflow;
2599		3235
2600	local $self->{children} = [$empty, $slider];	3236	local $self->{children} = [$empty, $slider];
2601	$self->SUPER::invoke_size_allocate ($w, $h)	3237	$self->SUPER::invoke_size_allocate ($w, $h)
		3238	}
		3239
		3240	sub invoke_mouse_wheel {
		3241	my ($self, $ev) = @_;
		3242
		3243	return 0 unless $ev->{dy}; # only vertical movements
		3244
		3245	$self->{children}[1]->emit (mouse_wheel => $ev);
		3246
		3247	1
2602	}	3248	}
2603		3249
2604	sub get_layout {	3250	sub get_layout {
2605	my ($self, $para) = @_;	3251	my ($self, $para) = @_;
2606		3252
…		…
2634		3280
2635	# todo: base offset on lines or so, not on pixels	3281	# todo: base offset on lines or so, not on pixels
2636	$self->{children}[1]->set_value ($offset);	3282	$self->{children}[1]->set_value ($offset);
2637	}	3283	}
2638		3284
		3285	sub current_paragraph {
		3286	my ($self) = @_;
		3287
		3288	$self->{top_paragraph} - 1
		3289	}
		3290
		3291	sub scroll_to {
		3292	my ($self, $para) = @_;
		3293
		3294	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3295
		3296	$self->{scroll_to} = $para;
		3297	$self->update;
		3298	}
		3299
2639	sub clear {	3300	sub clear {
2640	my ($self) = @_;	3301	my ($self) = @_;
2641		3302
2642	my (undef, undef, @other) = @{ $self->{children} };	3303	my (undef, undef, @other) = @{ $self->{children} };
2643	$self->remove ($_) for @other;	3304	$self->remove ($_) for @other;
…		…
2646	$self->{height} = 0;	3307	$self->{height} = 0;
2647	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3308	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648	}	3309	}
2649		3310
2650	sub add_paragraph {	3311	sub add_paragraph {
2651	my ($self, $color, $para, $indent) = @_;	3312	my $self = shift;
2652		3313
2653	my ($text, @w) = ref $para ? @$para : $para;	3314	for my $para (@_) {
2654
2655	$para = {	3315	$para = {
		3316	fg => [1, 1, 1, 1],
		3317	indent => 0,
		3318	markup => "",
		3319	widget => [],
		3320	ref $para ? %$para : (markup => $para),
2656	w => 1e10,	3321	w => 1e10,
2657	wrapped => 1,	3322	wrapped => 1,
2658	fg => $color,
2659	indent => $indent,
2660	markup => $text,
2661	widget => \@w,
2662	};	3323	};
2663		3324
2664	$self->add (@w) if @w;	3325	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665	push @{$self->{par}}, $para;	3326	push @{$self->{par}}, $para;
		3327	}
		3328
		3329	if (my $max = $self->{max_par}) {
		3330	shift @{$self->{par}} while @{$self->{par}} > $max;
		3331	}
2666		3332
2667	$self->{need_reflow}++;	3333	$self->{need_reflow}++;
2668	$self->update;	3334	$self->update;
2669	}	3335	}
2670		3336
2671	sub scroll_to_bottom {	3337	sub scroll_to_bottom {
2672	my ($self) = @_;	3338	my ($self) = @_;
2673		3339
2674	$self->{scroll_to_bottom} = 1;	3340	$self->{scroll_to} = $#{$self->{par}};
2675	$self->update;	3341	$self->update;
2676	}	3342	}
2677		3343
		3344	sub force_uptodate {
		3345	my ($self) = @_;
		3346
		3347	if (delete $self->{need_reflow}) {
		3348	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3349
		3350	my $height = 0;
		3351
		3352	for my $para (@{$self->{par}}) {
		3353	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3354	my $layout = $self->get_layout ($para);
		3355	my ($w, $h) = $layout->size;
		3356
		3357	$para->{w} = $w + $para->{indent};
		3358	$para->{h} = $h;
		3359	$para->{wrapped} = $layout->has_wrapped;
		3360	}
		3361
		3362	$para->{y} = $height;
		3363	$height += $para->{h};
		3364	}
		3365
		3366	$self->{height} = $height;
		3367	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3368
		3369	delete $self->{texture};
		3370	}
		3371
		3372	if (my $paridx = delete $self->{scroll_to}) {
		3373	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3374	}
		3375	}
		3376
2678	sub update {	3377	sub update {
2679	my ($self) = @_;	3378	my ($self) = @_;
2680		3379
2681	$self->SUPER::update;	3380	$self->SUPER::update;
2682		3381
2683	return unless $self->{h} > 0;	3382	return unless $self->{h} > 0;
2684		3383
2685	delete $self->{texture};	3384	delete $self->{texture};
2686		3385
2687	$ROOT->on_post_alloc ($self => sub {	3386	$ROOT->on_post_alloc ($self => sub {
		3387	$self->force_uptodate;
		3388
2688	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3389	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689		3390
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 {	3391	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718	glClearColor 0, 0, 0, 0;	3392	glClearColor 0, 0, 0, 0;
2719	glClear GL_COLOR_BUFFER_BIT;	3393	glClear GL_COLOR_BUFFER_BIT;
2720		3394
		3395	package CFPlus::UI::Base;
		3396	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3397	(0, 0, $self->{w}, $self->{h});
		3398
		3399	my $top = int $self->{children}[1]{range}[0];
		3400
		3401	my $paridx = 0;
		3402	my $top_paragraph;
2721	my $top = int $self->{children}[1]{range}[0];	3403	my $top = int $self->{children}[1]{range}[0];
2722		3404
2723	my $y0 = $top;	3405	my $y0 = $top;
2724	my $y1 = $top + $H;	3406	my $y1 = $top + $H;
2725		3407
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}}) {	3408	for my $para (@{$self->{par}}) {
2733	my $h = $para->{h};	3409	my $h = $para->{h};
		3410	my $y = $para->{y};
2734		3411
2735	if ($y0 < $y + $h && $y < $y1) {	3412	if ($y0 < $y + $h && $y < $y1) {
2736
2737	my $layout = $self->get_layout ($para);	3413	my $layout = $self->get_layout ($para);
2738		3414
2739	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741	glRasterPos $para->{indent}, $y - $y0;	3415	$layout->render ($para->{indent}, $y - $y0);
2742	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3416	$layout->draw;
2743		3417
2744	if (my @w = @{ $para->{widget} }) {	3418	if (my @w = @{ $para->{widget} }) {
2745	my @s = $layout->get_shapes;	3419	my @s = $layout->get_shapes;
2746		3420
2747	glDisable GL_BLEND;
2748	for (@w) {	3421	for (@w) {
2749	my ($dx, $dy) = splice @s, 0, 2, ();	3422	my ($dx, $dy) = splice @s, 0, 2, ();
2750		3423
2751	$_->{x} = $dx + $para->{indent};	3424	$_->{x} = $dx + $para->{indent};
2752	$_->{y} = $dy + $y - $y0;	3425	$_->{y} = $dy + $y - $y0;
2753		3426
2754	$_->draw;	3427	$_->draw;
2755	}	3428	}
2756	glEnable GL_BLEND;
2757	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2758	}	3429	}
2759	}	3430	}
2760		3431
2761	$y += $h;	3432	$paridx++;
		3433	$top_paragraph ||= $paridx if $y >= $top;
2762	}	3434	}
2763		3435
2764	glDisable GL_BLEND;	3436	$self->{top_paragraph} = $top_paragraph;
2765	};	3437	};
2766	});	3438	});
2767	}	3439	}
2768		3440
2769	sub reconfigure {	3441	sub reconfigure {
…		…
2787	$self->{children}[1]->draw;	3459	$self->{children}[1]->draw;
2788	}	3460	}
2789		3461
2790	#############################################################################	3462	#############################################################################
2791		3463
2792	package CFClient::UI::Animator;	3464	package CFPlus::UI::Animator;
2793		3465
2794	use CFClient::OpenGL;	3466	use CFPlus::OpenGL;
2795		3467
2796	our @ISA = CFClient::UI::Bin::;	3468	our @ISA = CFPlus::UI::Bin::;
2797		3469
2798	sub moveto {	3470	sub moveto {
2799	my ($self, $x, $y) = @_;	3471	my ($self, $x, $y) = @_;
2800		3472
2801	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3473	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2829	glPopMatrix;	3501	glPopMatrix;
2830	}	3502	}
2831		3503
2832	#############################################################################	3504	#############################################################################
2833		3505
2834	package CFClient::UI::Flopper;	3506	package CFPlus::UI::Flopper;
2835		3507
2836	our @ISA = CFClient::UI::Button::;	3508	our @ISA = CFPlus::UI::Button::;
2837		3509
2838	sub new {	3510	sub new {
2839	my $class = shift;	3511	my $class = shift;
2840		3512
2841	my $self = $class->SUPER::new (	3513	my $self = $class->SUPER::new (
…		…
2853	$self->{other}->toggle_visibility;	3525	$self->{other}->toggle_visibility;
2854	}	3526	}
2855		3527
2856	#############################################################################	3528	#############################################################################
2857		3529
2858	package CFClient::UI::Tooltip;	3530	package CFPlus::UI::Tooltip;
2859		3531
2860	our @ISA = CFClient::UI::Bin::;	3532	our @ISA = CFPlus::UI::Bin::;
2861		3533
2862	use CFClient::OpenGL;	3534	use CFPlus::OpenGL;
2863		3535
2864	sub new {	3536	sub new {
2865	my $class = shift;	3537	my $class = shift;
2866		3538
2867	$class->SUPER::new (	3539	$class->SUPER::new (
…		…
2870	)	3542	)
2871	}	3543	}
2872		3544
2873	sub set_tooltip_from {	3545	sub set_tooltip_from {
2874	my ($self, $widget) = @_;	3546	my ($self, $widget) = @_;
		3547
		3548	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3549	if $widget->{tooltip} =~ /^#(.*)$/;
2875		3550
2876	my $tooltip = $widget->{tooltip};	3551	my $tooltip = $widget->{tooltip};
2877		3552
2878	if ($ENV{CFPLUS_DEBUG} & 2) {	3553	if ($ENV{CFPLUS_DEBUG} & 2) {
2879	$tooltip .= "\n\n" . (ref $widget) . "\n"	3554	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2883	}	3558	}
2884		3559
2885	$tooltip =~ s/^\n+//;	3560	$tooltip =~ s/^\n+//;
2886	$tooltip =~ s/\n+$//;	3561	$tooltip =~ s/\n+$//;
2887		3562
2888	$self->add (new CFClient::UI::Label	3563	$self->add (new CFPlus::UI::Label
2889	markup => $tooltip,	3564	markup => $tooltip,
2890	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3565	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891	fontsize => 0.8,	3566	fontsize => 0.8,
2892	fg => [0, 0, 0, 1],	3567	style => 1, # FLAG_INVERSE
2893	ellipsise => 0,	3568	ellipsise => 0,
2894	font => ($widget->{tooltip_font} || $::FONT_PROP),	3569	font => ($widget->{tooltip_font} || $::FONT_PROP),
2895	);	3570	);
2896	}	3571	}
2897		3572
…		…
2916		3591
2917	$self->{root}->on_post_alloc ("move_$self" => sub {	3592	$self->{root}->on_post_alloc ("move_$self" => sub {
2918	my $widget = $self->{owner}	3593	my $widget = $self->{owner}
2919	or return;	3594	or return;
2920		3595
		3596	if ($widget->{visible}) {
2921	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3597	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922		3598
2923	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3599	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924	if $x + $self->{w} > $self->{root}{w};	3600	if $x + $self->{w} > $self->{root}{w};
2925		3601
2926	$self->move_abs ($x, $y);	3602	$self->move_abs ($x, $y);
		3603	} else {
		3604	$self->hide;
		3605	}
2927	});	3606	});
2928	}	3607	}
2929		3608
2930	sub _draw {	3609	sub _draw {
2931	my ($self) = @_;	3610	my ($self) = @_;
…		…
2933	glTranslate 0.375, 0.375;	3612	glTranslate 0.375, 0.375;
2934		3613
2935	my ($w, $h) = @$self{qw(w h)};	3614	my ($w, $h) = @$self{qw(w h)};
2936		3615
2937	glColor 1, 0.8, 0.4;	3616	glColor 1, 0.8, 0.4;
2938	glBegin GL_QUADS;	3617	glRect 0, 0, $w, $h;
2939	glVertex 0 , 0;
2940	glVertex 0 , $h;
2941	glVertex $w, $h;
2942	glVertex $w, 0;
2943	glEnd;
2944		3618
2945	glColor 0, 0, 0;	3619	glColor 0, 0, 0;
2946	glBegin GL_LINE_LOOP;	3620	glRect_lineloop 0, 0, $w, $h;
2947	glVertex 0 , 0;
2948	glVertex 0 , $h;
2949	glVertex $w, $h;
2950	glVertex $w, 0;
2951	glEnd;
2952		3621
2953	glTranslate 2 - 0.375, 2 - 0.375;	3622	glTranslate 2 - 0.375, 2 - 0.375;
2954		3623
2955	$self->SUPER::_draw;	3624	$self->SUPER::_draw;
2956	}	3625	}
2957		3626
2958	#############################################################################	3627	#############################################################################
2959		3628
2960	package CFClient::UI::Face;	3629	package CFPlus::UI::Face;
2961		3630
2962	our @ISA = CFClient::UI::Base::;	3631	our @ISA = CFPlus::UI::DrawBG::;
2963		3632
2964	use CFClient::OpenGL;	3633	use CFPlus::OpenGL;
2965		3634
2966	sub new {	3635	sub new {
2967	my $class = shift;	3636	my $class = shift;
2968		3637
2969	my $self = $class->SUPER::new (	3638	my $self = $class->SUPER::new (
		3639	size_w => 32,
		3640	size_h => 8,
2970	aspect => 1,	3641	aspect => 1,
2971	can_events => 0,	3642	can_events => 0,
2972	@_,	3643	@_,
2973	);	3644	);
2974		3645
2975	if ($self->{anim} && $self->{animspeed}) {	3646	if ($self->{anim} && $self->{animspeed}) {
2976	Scalar::Util::weaken (my $widget = $self);	3647	CFPlus::weaken (my $widget = $self);
2977		3648
		3649	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3650	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2978	$self->{timer} = Event->timer (	3651	$self->{timer} = Event->timer (
2979	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980	hard => 1,	3652	parked => 1,
2981	interval => $self->{animspeed},
2982	cb => sub {	3653	cb => sub {
		3654	return unless $::CONN;
		3655
		3656	my $w = $widget
		3657	or return;
		3658
2983	++$widget->{frame};	3659	++$w->{frame};
		3660	$w->update_face;
		3661
		3662	# somehow, $widget can go away
2984	$widget->update;	3663	$w->update;
		3664	$w->update_timer;
2985	},	3665	},
2986	);	3666	);
		3667
		3668	$self->update_face;
		3669	$self->update_timer;
2987	}	3670	}
2988		3671
2989	$self	3672	$self
2990	}	3673	}
2991		3674
		3675	sub update_timer {
		3676	my ($self) = @_;
		3677
		3678	return unless $self->{timer};
		3679
		3680	if ($self->{visible}) {
		3681	$self->{timer}->at (
		3682	$self->{anim_start}
		3683	+ $self->{animspeed}
		3684	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3685	);
		3686	$self->{timer}->start;
		3687	} else {
		3688	$self->{timer}->stop;
		3689	}
		3690	}
		3691
		3692	sub update_face {
		3693	my ($self) = @_;
		3694
		3695	if ($::CONN) {
		3696	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3697	if ($anim && @$anim) {
		3698	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3699	delete $self->{face_change_cb};
		3700
		3701	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3702	unless ($tex->{name} || $tex->{loading}) {
		3703	$tex->upload (sub { $self->reconfigure });
		3704	}
		3705	}
		3706	}
		3707	}
		3708	}
		3709	}
		3710
2992	sub size_request {	3711	sub size_request {
2993	(32, 8)	3712	my ($self) = @_;
		3713
		3714	if ($::CONN) {
		3715	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3716	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3717	if ($tex->{name}) {
		3718	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3719	} elsif (!$tex->{loading}) {
		3720	$tex->upload (sub { $self->reconfigure });
		3721	}
		3722	}
		3723
		3724	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3725	}
		3726	}
		3727
		3728	($self->{size_w} || 8, $self->{size_h} || 8)
2994	}	3729	}
2995		3730
2996	sub update {	3731	sub update {
2997	my ($self) = @_;	3732	my ($self) = @_;
2998		3733
2999	return unless $self->{visible};	3734	return unless $self->{visible};
3000		3735
3001	$self->SUPER::update;	3736	$self->SUPER::update;
3002	}	3737	}
3003		3738
		3739	sub invoke_visibility_change {
		3740	my ($self) = @_;
		3741
		3742	$self->update_timer;
		3743
		3744	0
		3745	}
		3746
3004	sub _draw {	3747	sub _draw {
3005	my ($self) = @_;	3748	my ($self) = @_;
3006		3749
3007	return unless $::CONN;	3750	$self->SUPER::_draw;
3008		3751
3009	my $face;	3752	if (my $tex = $self->{tex}) {
3010
3011	if ($self->{frame}) {
3012	my $anim = $::CONN->{anim}[$self->{anim}];
3013
3014	$face = $anim->[ $self->{frame} % @$anim ]
3015	if $anim && @$anim;
3016	}
3017
3018	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3019
3020	if ($tex) {
3021	glEnable GL_TEXTURE_2D;	3753	glEnable GL_TEXTURE_2D;
3022	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3754	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3023	glColor 0, 0, 0, 1;	3755	glColor 0, 0, 0, 1;
3024	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3756	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3025	glDisable GL_TEXTURE_2D;	3757	glDisable GL_TEXTURE_2D;
…		…
3027	}	3759	}
3028		3760
3029	sub destroy {	3761	sub destroy {
3030	my ($self) = @_;	3762	my ($self) = @_;
3031		3763
3032	$self->{timer}->cancel	3764	(delete $self->{timer})->cancel
3033	if $self->{timer};	3765	if $self->{timer};
3034		3766
3035	$self->SUPER::destroy;	3767	$self->SUPER::destroy;
3036	}	3768	}
3037		3769
3038	#############################################################################	3770	#############################################################################
3039		3771
3040	package CFClient::UI::Buttonbar;	3772	package CFPlus::UI::Buttonbar;
3041		3773
3042	our @ISA = CFClient::UI::HBox::;	3774	our @ISA = CFPlus::UI::HBox::;
3043		3775
3044	# TODO: should actualyl wrap buttons and other goodies.	3776	# TODO: should actually wrap buttons and other goodies.
3045		3777
3046	#############################################################################	3778	#############################################################################
3047		3779
3048	package CFClient::UI::Menu;	3780	package CFPlus::UI::Menu;
3049		3781
3050	our @ISA = CFClient::UI::FancyFrame::;	3782	our @ISA = CFPlus::UI::Toplevel::;
3051		3783
3052	use CFClient::OpenGL;	3784	use CFPlus::OpenGL;
3053		3785
3054	sub new {	3786	sub new {
3055	my $class = shift;	3787	my $class = shift;
3056		3788
3057	my $self = $class->SUPER::new (	3789	my $self = $class->SUPER::new (
3058	items => [],	3790	items => [],
3059	z => 100,	3791	z => 100,
3060	@_,	3792	@_,
3061	);	3793	);
3062		3794
3063	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3795	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064		3796
3065	for my $item (@{ $self->{items} }) {	3797	for my $item (@{ $self->{items} }) {
3066	my ($widget, $cb, $tooltip) = @$item;	3798	my ($widget, $cb, $tooltip) = @$item;
3067		3799
3068	# handle various types of items, only text for now	3800	# handle various types of items, only text for now
3069	if (!ref $widget) {	3801	if (!ref $widget) {
		3802	if ($widget =~ /\t/) {
		3803	my ($left, $right) = split /\t/, $widget, 2;
		3804
3070	$widget = new CFClient::UI::Label	3805	$widget = new CFPlus::UI::HBox
3071	can_hover => 1,	3806	can_hover => 1,
3072	can_events => 1,	3807	can_events => 1,
		3808	tooltip => $tooltip,
		3809	children => [
		3810	(new CFPlus::UI::Label markup => $left, expand => 1),
		3811	(new CFPlus::UI::Label markup => $right, align => +1),
		3812	],
		3813	;
		3814
		3815	} else {
		3816	$widget = new CFPlus::UI::Label
		3817	can_hover => 1,
		3818	can_events => 1,
3073	markup => $widget,	3819	markup => $widget,
3074	tooltip => $tooltip	3820	tooltip => $tooltip;
		3821	}
3075	}	3822	}
3076		3823
3077	$self->{item}{$widget} = $item;	3824	$self->{item}{$widget} = $item;
3078		3825
3079	$self->{vbox}->add ($widget);	3826	$self->{vbox}->add ($widget);
…		…
3122	1	3869	1
3123	}	3870	}
3124		3871
3125	#############################################################################	3872	#############################################################################
3126		3873
3127	package CFClient::UI::Multiplexer;	3874	package CFPlus::UI::Multiplexer;
3128		3875
3129	our @ISA = CFClient::UI::Container::;	3876	our @ISA = CFPlus::UI::Container::;
3130		3877
3131	sub new {	3878	sub new {
3132	my $class = shift;	3879	my $class = shift;
3133		3880
3134	my $self = $class->SUPER::new (	3881	my $self = $class->SUPER::new (
…		…
3148		3895
3149	$self->{current} = $self->{children}[0]	3896	$self->{current} = $self->{children}[0]
3150	if @{ $self->{children} };	3897	if @{ $self->{children} };
3151	}	3898	}
3152		3899
		3900	sub get_current_page {
		3901	my ($self) = @_;
		3902
		3903	$self->{current}
		3904	}
		3905
3153	sub set_current_page {	3906	sub set_current_page {
3154	my ($self, $page_or_widget) = @_;	3907	my ($self, $page_or_widget) = @_;
3155		3908
3156	my $widget = ref $page_or_widget	3909	my $widget = ref $page_or_widget
3157	? $page_or_widget	3910	? $page_or_widget
…		…
3189	$self->{current}->draw;	3942	$self->{current}->draw;
3190	}	3943	}
3191		3944
3192	#############################################################################	3945	#############################################################################
3193		3946
3194	package CFClient::UI::Notebook;	3947	package CFPlus::UI::Notebook;
3195		3948
		3949	use CFPlus::OpenGL;
		3950
3196	our @ISA = CFClient::UI::VBox::;	3951	our @ISA = CFPlus::UI::VBox::;
3197		3952
3198	sub new {	3953	sub new {
3199	my $class = shift;	3954	my $class = shift;
3200		3955
3201	my $self = $class->SUPER::new (	3956	my $self = $class->SUPER::new (
3202	buttonbar => (new CFClient::UI::Buttonbar),	3957	buttonbar => (new CFPlus::UI::Buttonbar),
3203	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3958	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3959	active_outline => [1, 1, 0],
3204	# filter => # will be put between multiplexer and $self	3960	# filter => # will be put between multiplexer and $self
3205	@_,	3961	@_,
3206	);	3962	);
3207		3963
3208	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3964	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3209	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3965	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3210		3966
		3967	{
		3968	Scalar::Util::weaken (my $wself = $self);
		3969
		3970	$self->{multiplexer}->connect (c_add => sub {
		3971	my ($mplex, $widgets) = @_;
		3972
		3973	for my $child (@$widgets) {
		3974	Scalar::Util::weaken $child;
		3975	$child->{c_tab_} ||= do {
		3976	my $tab =
		3977	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3978	? $child->{c_tab}
		3979	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3980
		3981	$tab->connect (activate => sub {
		3982	$wself->set_current_page ($child);
		3983	});
		3984
		3985	$tab
		3986	};
		3987
		3988	$self->{buttonbar}->add ($child->{c_tab_});
		3989	}
		3990	});
		3991
		3992	$self->{multiplexer}->connect (c_remove => sub {
		3993	my ($mplex, $widgets) = @_;
		3994
		3995	for my $child (@$widgets) {
		3996	$wself->{buttonbar}->remove ($child->{c_tab_});
		3997	}
		3998	});
		3999	}
		4000
3211	$self	4001	$self
3212	}	4002	}
3213		4003
3214	sub add {	4004	sub add {
		4005	my ($self, @widgets) = @_;
		4006
		4007	$self->{multiplexer}->add (@widgets)
		4008	}
		4009
		4010	sub remove {
		4011	my ($self, @widgets) = @_;
		4012
		4013	$self->{multiplexer}->remove (@widgets)
		4014	}
		4015
		4016	sub pages {
		4017	my ($self) = @_;
		4018	$self->{multiplexer}->children
		4019	}
		4020
		4021	sub add_tab {
3215	my ($self, $title, $widget, $tooltip) = @_;	4022	my ($self, $title, $widget, $tooltip) = @_;
3216		4023
3217	Scalar::Util::weaken $self;	4024	$title = [$title, $tooltip] unless ref $title;
		4025	$widget->{c_tab} = $title;
3218		4026
3219	$self->{buttonbar}->add (new CFClient::UI::Button
3220	markup => $title,
3221	tooltip => $tooltip,
3222	on_activate => sub { $self->set_current_page ($widget) },
3223	);
3224
3225	$self->{multiplexer}->add ($widget);	4027	$self->add ($widget);
		4028	}
		4029
		4030	sub get_current_page {
		4031	my ($self) = @_;
		4032
		4033	$self->{multiplexer}->get_current_page
3226	}	4034	}
3227		4035
3228	sub set_current_page {	4036	sub set_current_page {
3229	my ($self, $page) = @_;	4037	my ($self, $page) = @_;
3230		4038
3231	$self->{multiplexer}->set_current_page ($page);	4039	$self->{multiplexer}->set_current_page ($page);
3232	$self->emit (page_changed => $self->{multiplexer}{current});	4040	$self->emit (page_changed => $self->{multiplexer}{current});
3233	}	4041	}
3234		4042
		4043	sub _draw {
		4044	my ($self) = @_;
		4045
		4046	$self->SUPER::_draw ();
		4047
		4048	if (my $cur = $self->{multiplexer}{current}) {
		4049	if ($cur = $cur->{c_tab_}) {
		4050	glTranslate $cur->{x}, $cur->{y};
		4051	glLineWidth 3;
		4052	glColor @{$self->{active_outline}};
		4053	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4054	glLineWidth 1;
		4055	}
		4056	}
		4057	}
		4058
3235	#############################################################################	4059	#############################################################################
3236		4060
3237	package CFClient::UI::Combobox;	4061	package CFPlus::UI::Selector;
3238		4062
3239	use utf8;	4063	use utf8;
3240		4064
3241	our @ISA = CFClient::UI::Button::;	4065	our @ISA = CFPlus::UI::Button::;
3242		4066
3243	sub new {	4067	sub new {
3244	my $class = shift;	4068	my $class = shift;
3245		4069
3246	my $self = $class->SUPER::new (	4070	my $self = $class->SUPER::new (
…		…
3263	my ($value, $title, $tooltip) = @$_;	4087	my ($value, $title, $tooltip) = @$_;
3264		4088
3265	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4089	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3266	}	4090	}
3267		4091
3268	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4092	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3269	}	4093	}
3270		4094
3271	sub _set_value {	4095	sub _set_value {
3272	my ($self, $value) = @_;	4096	my ($self, $value) = @_;
3273		4097
…		…
3288	$self->emit (changed => $value);	4112	$self->emit (changed => $value);
3289	}	4113	}
3290		4114
3291	#############################################################################	4115	#############################################################################
3292		4116
3293	package CFClient::UI::Statusbox;	4117	package CFPlus::UI::Statusbox;
3294		4118
3295	our @ISA = CFClient::UI::VBox::;	4119	our @ISA = CFPlus::UI::VBox::;
3296		4120
3297	sub new {	4121	sub new {
3298	my $class = shift;	4122	my $class = shift;
3299		4123
3300	my $self = $class->SUPER::new (	4124	my $self = $class->SUPER::new (
3301	fontsize => 0.8,	4125	fontsize => 0.8,
3302	@_,	4126	@_,
3303	);	4127	);
3304		4128
3305	Scalar::Util::weaken (my $this = $self);	4129	CFPlus::weaken (my $this = $self);
3306		4130
3307	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4131	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3308		4132
3309	$self	4133	$self
3310	}	4134	}
…		…
3312	sub reorder {	4136	sub reorder {
3313	my ($self) = @_;	4137	my ($self) = @_;
3314	my $NOW = Time::HiRes::time;	4138	my $NOW = Time::HiRes::time;
3315		4139
3316	# freeze display when hovering over any label	4140	# freeze display when hovering over any label
3317	return if $CFClient::UI::TOOLTIP->{owner}	4141	return if $CFPlus::UI::TOOLTIP->{owner}
3318	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4142	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3319	values %{ $self->{item} };	4143	values %{ $self->{item} };
3320		4144
3321	while (my ($k, $v) = each %{ $self->{item} }) {	4145	while (my ($k, $v) = each %{ $self->{item} }) {
3322	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4146	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3323	}	4147	}
…		…
3344	for ($short) {	4168	for ($short) {
3345	s/^\s+//;	4169	s/^\s+//;
3346	s/\s+/ /g;	4170	s/\s+/ /g;
3347	}	4171	}
3348		4172
3349	new CFClient::UI::Label	4173	new CFPlus::UI::Label
3350	markup => $short,	4174	markup => $short,
3351	tooltip => $item->{tooltip},	4175	tooltip => $item->{tooltip},
3352	tooltip_font => $::FONT_PROP,	4176	tooltip_font => $::FONT_PROP,
3353	tooltip_width => 0.67,	4177	tooltip_width => 0.67,
3354	fontsize => $item->{fontsize} || $self->{fontsize},	4178	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3408	count => 1,	4232	count => 1,
3409	%arg,	4233	%arg,
3410	};	4234	};
3411	}	4235	}
3412		4236
		4237	$ROOT->on_refresh (reorder => sub {
3413	$self->reorder;	4238	$self->reorder;
		4239	});
3414	}	4240	}
3415		4241
3416	sub reconfigure {	4242	sub reconfigure {
3417	my ($self) = @_;	4243	my ($self) = @_;
3418		4244
…		…
3431	$self->SUPER::destroy;	4257	$self->SUPER::destroy;
3432	}	4258	}
3433		4259
3434	#############################################################################	4260	#############################################################################
3435		4261
3436	package CFClient::UI::Inventory;
3437
3438	our @ISA = CFClient::UI::ScrolledWindow::;
3439
3440	sub new {
3441	my $class = shift;
3442
3443	my $self = $class->SUPER::new (
3444	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3445	@_,
3446	);
3447
3448	$self
3449	}
3450
3451	sub set_items {
3452	my ($self, $items) = @_;
3453
3454	$self->{child}->clear;
3455	return unless $items;
3456
3457	my @items = sort {
3458	($a->{type} <=> $b->{type})
3459	or ($a->{name} cmp $b->{name})
3460	} @$items;
3461
3462	$self->{real_items} = \@items;
3463
3464	my $row = 0;
3465	for my $item (@items) {
3466	CFClient::Item::update_widgets $item;
3467
3468	$self->{child}->add (0, $row, $item->{face_widget});
3469	$self->{child}->add (1, $row, $item->{desc_widget});
3470	$self->{child}->add (2, $row, $item->{weight_widget});
3471
3472	$row++;
3473	}
3474	}
3475
3476	#############################################################################
3477
3478	package CFClient::UI::BindEditor;
3479
3480	our @ISA = CFClient::UI::FancyFrame::;
3481
3482	sub new {
3483	my $class = shift;
3484
3485	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3486
3487	$self->add (my $vb = new CFClient::UI::VBox);
3488
3489
3490	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3491	text => "start recording",
3492	tooltip => "Start/Stops recording of actions."
3493	."All subsequent actions after the recording started will be captured."
3494	."The actions are displayed after the record was stopped."
3495	."To bind the action you have to click on the 'Bind' button",
3496	on_activate => sub {
3497	unless ($self->{recording}) {
3498	$self->start;
3499	} else {
3500	$self->stop;
3501	}
3502	});
3503
3504	$vb->add (new CFClient::UI::Label text => "Actions:");
3505	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3506
3507	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3508	$vb->add (my $hb = new CFClient::UI::HBox);
3509	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3510	$hb->add (new CFClient::UI::Button
3511	text => "bind",
3512	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3513	on_activate => sub {
3514	$self->ask_for_bind;
3515	});
3516
3517	$vb->add (my $hb = new CFClient::UI::HBox);
3518	$hb->add (new CFClient::UI::Button
3519	text => "ok",
3520	expand => 1,
3521	tooltip => "This closes the binding editor and saves the binding",
3522	on_activate => sub {
3523	$self->hide;
3524	$self->commit;
3525	});
3526
3527	$hb->add (new CFClient::UI::Button
3528	text => "cancel",
3529	expand => 1,
3530	tooltip => "This closes the binding editor without saving",
3531	on_activate => sub {
3532	$self->hide;
3533	$self->{binding_cancel}->()
3534	if $self->{binding_cancel};
3535	});
3536
3537	$self->update_binding_widgets;
3538
3539	$self
3540	}
3541
3542	sub cfg_bind {
3543	my ($self, $mod, $sym, $cmds) = @_;
3544	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3545	::update_bindings ();
3546	}
3547
3548	sub cfg_unbind {
3549	my ($self, $mod, $sym, $cmds) = @_;
3550	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3551	::update_bindings ();
3552	}
3553
3554	sub commit {
3555	my ($self) = @_;
3556	my ($mod, $sym, $cmds) = $self->get_binding;
3557	if ($sym != 0 && @$cmds > 0) {
3558	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3559	."'. Don't forget 'Save Config'!");
3560	$self->{binding_change}->($mod, $sym, $cmds)
3561	if $self->{binding_change};
3562	} else {
3563	$::STATUSBOX->add ("No action bound, no key or action specified!");
3564	$self->{binding_cancel}->()
3565	if $self->{binding_cancel};
3566	}
3567	}
3568
3569	sub start {
3570	my ($self) = @_;
3571
3572	$self->{rec_btn}->set_text ("stop recording");
3573	$self->{recording} = 1;
3574	$self->clear_command_list;
3575	$::CONN->start_record if $::CONN;
3576	}
3577
3578	sub stop {
3579	my ($self) = @_;
3580
3581	$self->{rec_btn}->set_text ("start recording");
3582	$self->{recording} = 0;
3583
3584	my $rec;
3585	$rec = $::CONN->stop_record if $::CONN;
3586	return unless ref $rec eq 'ARRAY';
3587	$self->set_command_list ($rec);
3588	}
3589
3590
3591	sub ask_for_bind_and_commit {
3592	my ($self) = @_;
3593	$self->ask_for_bind (1);
3594	}
3595
3596	sub ask_for_bind {
3597	my ($self, $commit, $end_cb) = @_;
3598
3599	CFClient::Binder::open_binding_dialog (sub {
3600	my ($mod, $sym) = @_;
3601	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3602	$self->update_binding_widgets;
3603	$self->commit if $commit;
3604	$end_cb->() if $end_cb;
3605	});
3606	}
3607
3608	# $mod and $sym are the modifiers and key symbol
3609	# $cmds is a array ref of strings (the commands)
3610	# $cb is the callback that is executed on OK
3611	# $ccb is the callback that is executed on CANCEL and
3612	# when the binding was unsuccessful on OK
3613	sub set_binding {
3614	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3615
3616	$self->clear_command_list;
3617	$self->{recording} = 0;
3618	$self->{rec_btn}->set_text ("start recording");
3619
3620	$self->{binding} = [$mod, $sym];
3621	$self->{commands} = $cmds;
3622
3623	$self->{binding_change} = $cb;
3624	$self->{binding_cancel} = $ccb;
3625
3626	$self->update_binding_widgets;
3627	}
3628
3629	# this is a shortcut method that asks for a binding
3630	# and then just binds it.
3631	sub do_quick_binding {
3632	my ($self, $cmds, $end_cb) = @_;
3633	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3634	$self->ask_for_bind (1, $end_cb);
3635	}
3636
3637	sub update_binding_widgets {
3638	my ($self) = @_;
3639	my ($mod, $sym, $cmds) = $self->get_binding;
3640	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3641	$self->set_command_list ($cmds);
3642	}
3643
3644	sub get_binding {
3645	my ($self) = @_;
3646	return (
3647	$self->{binding}->[0],
3648	$self->{binding}->[1],
3649	[ grep { defined $_ } @{$self->{commands}} ]
3650	);
3651	}
3652
3653	sub clear_command_list {
3654	my ($self) = @_;
3655	$self->{cmdbox}->clear ();
3656	}
3657
3658	sub set_command_list {
3659	my ($self, $cmds) = @_;
3660
3661	$self->{cmdbox}->clear ();
3662	$self->{commands} = $cmds;
3663
3664	my $idx = 0;
3665
3666	for (@$cmds) {
3667	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3668
3669	my $i = $idx;
3670	$hb->add (new CFClient::UI::Label text => $_);
3671	$hb->add (new CFClient::UI::Button
3672	text => "delete",
3673	tooltip => "Deletes the action from the record",
3674	on_activate => sub {
3675	$self->{cmdbox}->remove ($hb);
3676	$cmds->[$i] = undef;
3677	});
3678
3679
3680	$idx++
3681	}
3682	}
3683
3684	#############################################################################
3685
3686	package CFClient::UI::SpellList;
3687
3688	our @ISA = CFClient::UI::Table::;
3689
3690	sub new {
3691	my $class = shift;
3692
3693	my $self = $class->SUPER::new (
3694	binding => [],
3695	commands => [],
3696	@_,
3697	)
3698	}
3699
3700	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3701
3702	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3703	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3704	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3705	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3706	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3707	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3708	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3709	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3710	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3711	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3712
3713	sub rebuild_spell_list {
3714	my ($self) = @_;
3715
3716	$CFClient::UI::ROOT->on_refresh ($self => sub {
3717	$self->clear;
3718
3719	return unless $::CONN;
3720
3721	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3722	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3723	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3724	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3725	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3726
3727	my $row = 0;
3728
3729	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3730	my $spell = $self->{spell}{$_};
3731
3732	$row++;
3733
3734	my $spell_cb = sub {
3735	my ($widget, $ev) = @_;
3736
3737	if ($ev->{button} == 1) {
3738	$::CONN->user_send ("cast $spell->{name}");
3739	} elsif ($ev->{button} == 2) {
3740	$::CONN->user_send ("invoke $spell->{name}");
3741	} elsif ($ev->{button} == 3) {
3742	(new CFClient::UI::Menu
3743	items => [
3744	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3745	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3746	],
3747	)->popup ($ev);
3748	} else {
3749	return 0;
3750	}
3751
3752	1
3753	};
3754
3755	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3756
3757	#TODO: add path info to tooltip
3758	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3759
3760	$self->add (0, $row, new CFClient::UI::Face
3761	face => $spell->{face},
3762	can_hover => 1,
3763	can_events => 1,
3764	tooltip => $tooltip,
3765	on_button_down => $spell_cb,
3766	);
3767
3768	$self->add (1, $row, new CFClient::UI::Label
3769	expand => 1,
3770	text => $spell->{name},
3771	can_hover => 1,
3772	can_events => 1,
3773	tooltip => $tooltip,
3774	on_button_down => $spell_cb,
3775	);
3776
3777	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3778	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3779	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3780	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3781	}
3782	});
3783	}
3784
3785	sub add_spell {
3786	my ($self, $spell) = @_;
3787
3788	$self->{spell}->{$spell->{name}} = $spell;
3789	$self->rebuild_spell_list;
3790	}
3791
3792	sub remove_spell {
3793	my ($self, $spell) = @_;
3794
3795	delete $self->{spell}->{$spell->{name}};
3796	$self->rebuild_spell_list;
3797	}
3798
3799	sub clear_spells {
3800	my ($self) = @_;
3801
3802	$self->{spell} = {};
3803	$self->rebuild_spell_list;
3804	}
3805
3806	#############################################################################
3807
3808	package CFClient::UI::Root;	4262	package CFPlus::UI::Root;
3809		4263
3810	our @ISA = CFClient::UI::Container::;	4264	our @ISA = CFPlus::UI::Container::;
3811		4265
3812	use List::Util qw(min max);	4266	use List::Util qw(min max);
3813		4267
3814	use CFClient::OpenGL;	4268	use CFPlus::OpenGL;
3815		4269
3816	sub new {	4270	sub new {
3817	my $class = shift;	4271	my $class = shift;
3818		4272
3819	my $self = $class->SUPER::new (	4273	my $self = $class->SUPER::new (
3820	visible => 1,	4274	visible => 1,
3821	@_,	4275	@_,
3822	);	4276	);
3823		4277
3824	Scalar::Util::weaken ($self->{root} = $self);	4278	CFPlus::weaken ($self->{root} = $self);
3825		4279
3826	$self	4280	$self
3827	}	4281	}
3828		4282
3829	sub size_request {	4283	sub size_request {
…		…
3877	}	4331	}
3878		4332
3879	sub update {	4333	sub update {
3880	my ($self) = @_;	4334	my ($self) = @_;
3881		4335
3882	$::WANT_REFRESH++;	4336	$::WANT_REFRESH->start;
3883	}	4337	}
3884		4338
3885	sub add {	4339	sub add {
3886	my ($self, @children) = @_;	4340	my ($self, @children) = @_;
3887		4341
…		…
3924	while ($self->{refresh_hook}) {	4378	while ($self->{refresh_hook}) {
3925	$_->()	4379	$_->()
3926	for values %{delete $self->{refresh_hook}};	4380	for values %{delete $self->{refresh_hook}};
3927	}	4381	}
3928		4382
3929	if ($self->{realloc}) {	4383	while ($self->{realloc}) {
3930	my %queue;	4384	my %queue;
3931	my @queue;	4385	my @queue;
3932	my $widget;	4386	my $widget;
3933		4387
3934	outer:	4388	outer:
…		…
3981	}	4435	}
3982	}	4436	}
3983		4437
3984	delete $self->{realloc}{$widget+0};	4438	delete $self->{realloc}{$widget+0};
3985	}	4439	}
3986	}
3987		4440
3988	while (my $size_alloc = delete $self->{size_alloc}) {	4441	while (my $size_alloc = delete $self->{size_alloc}) {
3989	my @queue = sort { $b->{visible} <=> $a->{visible} }	4442	my @queue = sort { $a->{visible} <=> $b->{visible} }
3990	values %$size_alloc;	4443	values %$size_alloc;
3991		4444
3992	while () {	4445	while () {
3993	my $widget = pop @queue || last;	4446	my $widget = pop @queue || last;
3994		4447
3995	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4448	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3996		4449
3997	$w = 0 if $w < 0;	4450	$w = max $widget->{min_w}, $w;
3998	$h = 0 if $h < 0;	4451	$h = max $widget->{min_h}, $h;
3999		4452
		4453	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4454	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4455
		4456	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4457	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4458
4000	$w = int $w + 0.5;	4459	$w = int $w + 0.5;
4001	$h = int $h + 0.5;	4460	$h = int $h + 0.5;
4002		4461
4003	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4462	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4004	$widget->{old_w} = $widget->{w};	4463	$widget->{old_w} = $widget->{w};
4005	$widget->{old_h} = $widget->{h};	4464	$widget->{old_h} = $widget->{h};
4006		4465
4007	$widget->{w} = $w;	4466	$widget->{w} = $w;
4008	$widget->{h} = $h;	4467	$widget->{h} = $h;
4009		4468
4010	$widget->emit (size_allocate => $w, $h);	4469	$widget->emit (size_allocate => $w, $h);
		4470	}
4011	}	4471	}
4012	}	4472	}
4013	}	4473	}
4014		4474
4015	while ($self->{post_alloc_hook}) {	4475	while ($self->{post_alloc_hook}) {
4016	$_->()	4476	$_->()
4017	for values %{delete $self->{post_alloc_hook}};	4477	for values %{delete $self->{post_alloc_hook}};
4018	}	4478	}
4019
4020		4479
4021	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4480	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4022	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4481	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4023	glClear GL_COLOR_BUFFER_BIT;	4482	glClear GL_COLOR_BUFFER_BIT;
4024		4483
…		…
4027	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4486	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4028	glMatrixMode GL_MODELVIEW;	4487	glMatrixMode GL_MODELVIEW;
4029	glLoadIdentity;	4488	glLoadIdentity;
4030		4489
4031	{	4490	{
4032	package CFClient::UI::Base;	4491	package CFPlus::UI::Base;
4033		4492
4034	($draw_x, $draw_y, $draw_w, $draw_h) =	4493	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4035	(0, 0, $self->{w}, $self->{h});	4494	(0, 0, $self->{w}, $self->{h});
4036	}
4037		4495
4038	$self->_draw;	4496	$self->_draw;
		4497	}
4039	}	4498	}
4040		4499
4041	#############################################################################	4500	#############################################################################
4042		4501
4043	package CFClient::UI;	4502	package CFPlus::UI;
4044		4503
4045	$ROOT = new CFClient::UI::Root;	4504	$ROOT = new CFPlus::UI::Root;
4046	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4505	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4047		4506
4048	1	4507	1
4049		4508

Diff Legend

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