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.310 by root, Fri Jun 23 20:28:20 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
…		…
335	sub size_request {	369	sub size_request {
336	require Carp;	370	require Carp;
337	Carp::confess "size_request is abstract";	371	Carp::confess "size_request is abstract";
338	}	372	}
339		373
		374	sub baseline_shift {
		375	0
		376	}
		377
340	sub configure {	378	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
342		380
343	if ($self->{aspect}) {	381	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
345		383
346	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		386
349	# use alignment to adjust x, y	387	# use alignment to adjust x, y
350		388
351	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
393		431
394	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
395		433
396	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
397		435
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	439	}
402	}	440	}
403		441
404	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
405	sub coord2local {	443	sub coord2local {
406	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
407		445
		446	Carp::confess unless $self->{parent};#d#
		447
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	449	}
410		450
411	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
412	sub coord2global {	452	sub coord2global {
413	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
414		454
		455	Carp::confess unless $self->{parent};#d#
		456
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	458	}
417		459
418	sub invoke_focus_in {	460	sub invoke_focus_in {
419	my ($self) = @_;	461	my ($self) = @_;
420		462
421	return if $FOCUS == $self;	463	return if $FOCUS == $self;
422	return unless $self->{can_focus};	464	return unless $self->{can_focus};
423		465
424	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
425		467
426	$focus->update if $focus;	468	$self->update;
427	$FOCUS->update;
428		469
429	0	470	0
430	}	471	}
431		472
432	sub invoke_focus_out {	473	sub invoke_focus_out {
433	my ($self) = @_;	474	my ($self) = @_;
434		475
435	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
436		477
437	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
438		479
439	$focus->update if $focus; #?	480	$self->update;
440		481
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	483	unless $FOCUS;
443		484
444	0	485	0
445	}	486	}
446		487
447	sub grab_focus {	488	sub grab_focus {
448	my ($self) = @_;	489	my ($self) = @_;
449		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	492	$self->emit ("focus_in");
451	}	493	}
452		494
453	sub invoke_mouse_motion { 1 }	495	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	496	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	497	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
457		500
458	sub invoke_button_down {	501	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
460		503
461	$self->grab_focus;	504	$self->grab_focus;
462		505
463	1	506	0
464	}	507	}
465		508
466	sub connect {	509	sub connect {
467	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
468		511
469	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
470	}	518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
471		532
472	sub emit {	533	sub emit {
473	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
474		535
475	#d##TODO# stop propagating at first true, do not use sum	536	# I do not really like this solution, but I do not like duplication
476	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
477	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
478	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
479	}	554	}
480		555
481	sub find_widget {	556	#sub find_widget {
482	my ($self, $x, $y) = @_;	557	# in .xs
483
484	return () unless $self->{can_events};
485
486	return $self
487	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
488	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
489
490	()
491	}
492		558
493	sub set_parent {	559	sub set_parent {
494	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
495		561
496	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
497	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
498	}	564	}
499		565
500	sub realloc {	566	sub realloc {
501	my ($self) = @_;	567	my ($self) = @_;
…		…
527		593
528	# 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
529	# functions seems pointless.	595	# functions seems pointless.
530	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
531		597
532	sub draw {	598	#sub draw {
533	my ($self) = @_;	599	#CFPlus.xs
534
535	return unless $self->{h} && $self->{w};
536
537	# update screen rectangle
538	local $draw_x = $draw_x + $self->{x};
539	local $draw_y = $draw_y + $self->{y};
540	local $draw_w = $draw_x + $self->{w};
541	local $draw_h = $draw_y + $self->{h};
542
543	# skip widgets that are entirely outside the drawing area
544	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546
547	glPushMatrix;
548	glTranslate $self->{x}, $self->{y}, 0;
549
550	if ($self == $HOVER && $self->{can_hover}) {
551	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
552	glEnable GL_BLEND;
553	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
554	glBegin GL_QUADS;
555	glVertex 0 , 0;
556	glVertex $self->{w}, 0;
557	glVertex $self->{w}, $self->{h};
558	glVertex 0 , $self->{h};
559	glEnd;
560	glDisable GL_BLEND;
561	}
562
563	if ($ENV{CFPLUS_DEBUG} & 1) {
564	glPushMatrix;
565	glColor 1, 1, 0, 1;
566	glTranslate 0.375, 0.375;
567	glBegin GL_LINE_LOOP;
568	glVertex 0 , 0;
569	glVertex $self->{w} - 1, 0;
570	glVertex $self->{w} - 1, $self->{h} - 1;
571	glVertex 0 , $self->{h} - 1;
572	glEnd;
573	glPopMatrix;
574	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
575	}
576
577	$self->_draw;
578	glPopMatrix;
579	}
580		600
581	sub _draw {	601	sub _draw {
582	my ($self) = @_;	602	my ($self) = @_;
583		603
584	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
585	}	605	}
586		606
587	sub DESTROY {	607	sub DESTROY {
588	my ($self) = @_;	608	my ($self) = @_;
589		609
590	delete $WIDGET{$self+0};	610	return if CFPlus::in_destruct;
591		611
		612	local $@;
592	eval { $self->destroy };	613	eval { $self->destroy };
593	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};
594	}	617	}
595		618
596	#############################################################################	619	#############################################################################
597		620
598	package CFClient::UI::DrawBG;	621	package CFPlus::UI::DrawBG;
599		622
600	our @ISA = CFClient::UI::Base::;	623	our @ISA = CFPlus::UI::Base::;
601		624
602	use strict;	625	use strict;
603	use CFClient::OpenGL;	626	use CFPlus::OpenGL;
604		627
605	sub new {	628	sub new {
606	my $class = shift;	629	my $class = shift;
607
608	# range [value, low, high, page]
609		630
610	$class->SUPER::new (	631	$class->SUPER::new (
611	#bg => [0, 0, 0, 0.2],	632	#bg => [0, 0, 0, 0.2],
612	#active_bg => [1, 1, 1, 0.5],	633	#active_bg => [1, 1, 1, 0.5],
613	@_	634	@_
…		…
625	my ($w, $h) = @$self{qw(w h)};	646	my ($w, $h) = @$self{qw(w h)};
626		647
627	glEnable GL_BLEND;	648	glEnable GL_BLEND;
628	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	649	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
629	glColor_premultiply @$color;	650	glColor_premultiply @$color;
630
631	glBegin GL_QUADS;
632	glVertex 0 , 0;
633	glVertex 0 , $h;
634	glVertex $w, $h;	651	glRect 0, 0, $w, $h;
635	glVertex $w, 0;
636	glEnd;
637
638	glDisable GL_BLEND;	652	glDisable GL_BLEND;
639	}	653	}
640	}	654	}
641		655
642	#############################################################################	656	#############################################################################
643		657
644	package CFClient::UI::Empty;	658	package CFPlus::UI::Empty;
645		659
646	our @ISA = CFClient::UI::Base::;	660	our @ISA = CFPlus::UI::Base::;
647		661
648	sub new {	662	sub new {
649	my ($class, %arg) = @_;	663	my ($class, %arg) = @_;
650	$class->SUPER::new (can_events => 0, %arg);	664	$class->SUPER::new (can_events => 0, %arg);
651	}	665	}
…		…
658		672
659	sub draw { }	673	sub draw { }
660		674
661	#############################################################################	675	#############################################################################
662		676
663	package CFClient::UI::Container;	677	package CFPlus::UI::Container;
664		678
665	our @ISA = CFClient::UI::Base::;	679	our @ISA = CFPlus::UI::Base::;
666		680
667	sub new {	681	sub new {
668	my ($class, %arg) = @_;	682	my ($class, %arg) = @_;
669		683
670	my $children = delete $arg{children};	684	my $children = delete $arg{children};
…		…
674	can_events => 0,	688	can_events => 0,
675	%arg,	689	%arg,
676	);	690	);
677		691
678	$self->add (@$children)	692	$self->add (@$children)
679	if $children;	693	if $children && @$children;
680		694
681	$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;
682	}	704	}
683		705
684	sub add {	706	sub add {
685	my ($self, @widgets) = @_;	707	my ($self, @widgets) = @_;
686		708
687	$_->set_parent ($self)	709	$_->set_parent ($self)
688	for @widgets;	710	for @widgets;
689		711
		712	# TODO: only do this in widgets that need it, e.g. root, fixed
690	use sort 'stable';	713	use sort 'stable';
691		714
692	$self->{children} = [	715	$self->{children} = [
693	sort { $a->{z} <=> $b->{z} }	716	sort { $a->{z} <=> $b->{z} }
694	@{$self->{children}}, @widgets	717	@{$self->{children}}, @widgets
695	];	718	];
696		719
697	$self->realloc;	720	$self->realloc;
		721
		722	$self->emit (c_add => \@widgets);
		723
		724	map $_+0, @widgets
698	}	725	}
699		726
700	sub children {	727	sub children {
701	@{ $_[0]{children} }	728	@{ $_[0]{children} }
702	}	729	}
703		730
704	sub remove {	731	sub remove {
705	my ($self, $child) = @_;	732	my ($self, @widgets) = @_;
706		733
		734	$self->emit (c_remove => \@widgets);
		735
		736	for my $child (@widgets) {
707	delete $child->{parent};	737	delete $child->{parent};
708	$child->hide;	738	$child->hide;
709
710	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	739	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		740	}
711		741
712	$self->realloc;	742	$self->realloc;
713	}	743	}
714		744
715	sub clear {	745	sub clear {
716	my ($self) = @_;	746	my ($self) = @_;
717		747
718	my $children = delete $self->{children};	748	my $children = $self->{children};
719	$self->{children} = [];	749	$self->{children} = [];
720		750
721	for (@$children) {	751	for (@$children) {
722	delete $_->{parent};	752	delete $_->{parent};
723	$_->hide;	753	$_->hide;
…		…
743	}	773	}
744		774
745	sub _draw {	775	sub _draw {
746	my ($self) = @_;	776	my ($self) = @_;
747		777
748	$_->draw for @{$self->{children}};	778	$_->draw for $self->visible_children;
749	}	779	}
750		780
751	#############################################################################	781	#############################################################################
752		782
753	package CFClient::UI::Bin;	783	package CFPlus::UI::Bin;
754		784
755	our @ISA = CFClient::UI::Container::;	785	our @ISA = CFPlus::UI::Container::;
756		786
757	sub new {	787	sub new {
758	my ($class, %arg) = @_;	788	my ($class, %arg) = @_;
759		789
760	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	790	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761		791
762	$class->SUPER::new (children => [$child], %arg)	792	$class->SUPER::new (children => [$child], %arg)
763	}	793	}
764		794
765	sub add {	795	sub add {
766	my ($self, $child) = @_;	796	my ($self, $child) = @_;
767		797
768	$self->SUPER::remove ($_) for @{ $self->{children} };	798	$self->clear;
769	$self->SUPER::add ($child);	799	$self->SUPER::add ($child);
770	}	800	}
771		801
772	sub remove {	802	sub remove {
773	my ($self, $widget) = @_;	803	my ($self, $widget) = @_;
774		804
775	$self->SUPER::remove ($widget);	805	$self->SUPER::remove ($widget);
776		806
777	$self->{children} = [new CFClient::UI::Empty]	807	$self->{children} = [new CFPlus::UI::Empty]
778	unless @{$self->{children}};	808	unless @{$self->{children}};
779	}	809	}
780		810
781	sub child { $_[0]->{children}[0] }	811	sub child { $_[0]->{children}[0] }
782		812
…		…
794		824
795	#############################################################################	825	#############################################################################
796		826
797	# back-buffered drawing area	827	# back-buffered drawing area
798		828
799	package CFClient::UI::Window;	829	package CFPlus::UI::Window;
800		830
801	our @ISA = CFClient::UI::Bin::;	831	our @ISA = CFPlus::UI::Bin::;
802		832
803	use CFClient::OpenGL;	833	use CFPlus::OpenGL;
804		834
805	sub new {	835	sub new {
806	my ($class, %arg) = @_;	836	my ($class, %arg) = @_;
807		837
808	my $self = $class->SUPER::new (%arg);	838	my $self = $class->SUPER::new (%arg);
…		…
830	}	860	}
831		861
832	sub render_child {	862	sub render_child {
833	my ($self) = @_;	863	my ($self) = @_;
834		864
835	$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 {
836	glClearColor 0, 0, 0, 0;	866	glClearColor 0, 0, 0, 0;
837	glClear GL_COLOR_BUFFER_BIT;	867	glClear GL_COLOR_BUFFER_BIT;
838		868
839	{	869	{
840	package CFClient::UI::Base;	870	package CFPlus::UI::Base;
841		871
842	($draw_x, $draw_y, $draw_w, $draw_h) =	872	local ($draw_x, $draw_y, $draw_w, $draw_h) =
843	(0, 0, $self->{w}, $self->{h});	873	(0, 0, $self->{w}, $self->{h});
		874
		875	$self->_render;
844	}	876	}
845
846	$self->_render;
847	};	877	};
848	}	878	}
849		879
850	sub _draw {	880	sub _draw {
851	my ($self) = @_;	881	my ($self) = @_;
852
853	my ($w, $h) = @$self{qw(w h)};
854		882
855	my $tex = $self->{texture}	883	my $tex = $self->{texture}
856	or return;	884	or return;
857		885
858	glEnable GL_TEXTURE_2D;	886	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	887	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860	glColor 0, 0, 0, 1;	888	glColor 0, 0, 0, 1;
861		889
862	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	890	$tex->draw_quad_alpha_premultiplied (0, 0);
863		891
864	glDisable GL_TEXTURE_2D;	892	glDisable GL_TEXTURE_2D;
865	}	893	}
866		894
867	#############################################################################	895	#############################################################################
868		896
869	package CFClient::UI::ViewPort;	897	package CFPlus::UI::ViewPort;
870		898
		899	use List::Util qw(min max);
		900
871	our @ISA = CFClient::UI::Window::;	901	our @ISA = CFPlus::UI::Window::;
872		902
873	sub new {	903	sub new {
874	my $class = shift;	904	my $class = shift;
875		905
876	$class->SUPER::new (	906	$class->SUPER::new (
…		…
883	sub size_request {	913	sub size_request {
884	my ($self) = @_;	914	my ($self) = @_;
885		915
886	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	916	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
887		917
888	$w = 10 if $self->{scroll_x};	918	$w = 1 if $self->{scroll_x};
889	$h = 10 if $self->{scroll_y};	919	$h = 1 if $self->{scroll_y};
890		920
891	($w, $h)	921	($w, $h)
892	}	922	}
893		923
894	sub invoke_size_allocate {	924	sub invoke_size_allocate {
…		…
906	}	936	}
907		937
908	sub set_offset {	938	sub set_offset {
909	my ($self, $x, $y) = @_;	939	my ($self, $x, $y) = @_;
910		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}) {
911	$self->{view_x} = int $x;	945	$self->{view_x} = $x;
912	$self->{view_y} = int $y;	946	$self->{view_y} = $y;
913		947
		948	$self->emit (changed => $x, $y);
914	$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	}
915	}	969	}
916		970
917	# 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
918	sub coord2local {	972	sub coord2local {
919	my ($self, $x, $y) = @_;	973	my ($self, $x, $y) = @_;
…		…
934	my ($self, $x, $y) = @_;	988	my ($self, $x, $y) = @_;
935		989
936	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	990	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	991	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
938	) {	992	) {
939	$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})
940	} else {	994	} else {
941	$self->CFClient::UI::Base::find_widget ($x, $y)	995	$self->CFPlus::UI::Base::find_widget ($x, $y)
942	}	996	}
943	}	997	}
944		998
945	sub _render {	999	sub _render {
946	my ($self) = @_;	1000	my ($self) = @_;
947		1001
948	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};
949	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};
950		1004
951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1005	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952		1006
953	$self->SUPER::_render;	1007	$self->SUPER::_render;
954	}	1008	}
955		1009
956	#############################################################################	1010	#############################################################################
957		1011
958	package CFClient::UI::ScrolledWindow;	1012	package CFPlus::UI::ScrolledWindow;
959		1013
960	our @ISA = CFClient::UI::HBox::;	1014	our @ISA = CFPlus::UI::Table::;
961		1015
962	sub new {	1016	sub new {
963	my ($class, %arg) = @_;	1017	my ($class, %arg) = @_;
964		1018
965	my $child = delete $arg{child};	1019	my $child = delete $arg{child};
966		1020
967	my $self;	1021	my $self;
968		1022
969	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,
970	vertical => 1,	1037	vertical => 1,
971	range => [0, 0, 1, 0.01], # HACK fix	1038	range => [0, 0, 1, 0.01], # HACK fix
972	on_changed => sub {	1039	on_changed => sub {
973	$self->{vp}->set_offset (0, $_[1]);	1040	$self->{vpos} = $_[1];
		1041	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974	},	1042	},
975	;	1043	;
976		1044
977	$self = $class->SUPER::new (	1045	$self = $class->SUPER::new (
978	vp => (new CFClient::UI::ViewPort expand => 1),	1046	scroll_x => 0,
		1047	scroll_y => 1,
		1048	can_events => 1,
979	slider => $slider,	1049	hslider => $hslider,
		1050	vslider => $vslider,
		1051	col_expand => [1, 0],
		1052	row_expand => [1, 0],
980	%arg,	1053	%arg,
981	);	1054	);
982		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
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1077	$self->SUPER::add ($self->{vp});
		1078
984	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
985		1080
986	$self	1081	$self
987	}	1082	}
988		1083
…		…
990	my ($self, $widget) = @_;	1085	my ($self, $widget) = @_;
991		1086
992	$self->{vp}->add ($self->{child} = $widget);	1087	$self->{vp}->add ($self->{child} = $widget);
993	}	1088	}
994		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
995	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 {
996	my ($self) = @_;	1125	my ($self, $ev) = @_;
997		1126
998	$self->SUPER::update;	1127	$self->grab_focus;
999		1128
1000	# todo: overwrite size_allocate of child	1129	my $ox = $self->{vp}{view_x};
1001	my $child = $self->{vp}->child;	1130	my $oy = $self->{vp}{view_y};
1002	$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
1003	}	1181	}
1004		1182
1005	sub invoke_size_allocate {	1183	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1184	my ($self, $w, $h) = @_;
1007		1185
1008	my $child = $self->{vp}->child;	1186	$self->update_slider;
1009	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011	$self->SUPER::invoke_size_allocate ($w, $h)	1187	$self->SUPER::invoke_size_allocate ($w, $h)
1012	}	1188	}
1013		1189
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016
1017	#############################################################################	1190	#############################################################################
1018		1191
1019	package CFClient::UI::Frame;	1192	package CFPlus::UI::Frame;
1020		1193
1021	our @ISA = CFClient::UI::Bin::;	1194	our @ISA = CFPlus::UI::Bin::;
1022		1195
1023	use CFClient::OpenGL;	1196	use CFPlus::OpenGL;
1024		1197
1025	sub new {	1198	sub new {
1026	my $class = shift;	1199	my $class = shift;
1027		1200
1028	$class->SUPER::new (	1201	$class->SUPER::new (
…		…
1038	my ($w, $h) = @$self{qw(w h)};	1211	my ($w, $h) = @$self{qw(w h)};
1039		1212
1040	glEnable GL_BLEND;	1213	glEnable GL_BLEND;
1041	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1214	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1042	glColor_premultiply @{ $self->{bg} };	1215	glColor_premultiply @{ $self->{bg} };
1043
1044	glBegin GL_QUADS;
1045	glVertex 0 , 0;
1046	glVertex 0 , $h;
1047	glVertex $w, $h;	1216	glRect 0, 0, $w, $h;
1048	glVertex $w, 0;
1049	glEnd;
1050
1051	glDisable GL_BLEND;	1217	glDisable GL_BLEND;
1052	}	1218	}
1053		1219
1054	$self->SUPER::_draw;	1220	$self->SUPER::_draw;
1055	}	1221	}
1056		1222
1057	#############################################################################	1223	#############################################################################
1058		1224
1059	package CFClient::UI::FancyFrame;	1225	package CFPlus::UI::FancyFrame;
1060		1226
1061	our @ISA = CFClient::UI::Bin::;	1227	our @ISA = CFPlus::UI::Bin::;
1062		1228
1063	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;
1064		1330
1065	my $bg =	1331	my $bg =
1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1332	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067	mipmap => 1, wrap => 1;	1333	mipmap => 1, wrap => 1;
1068		1334
1069	my @border =	1335	my @border =
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1336	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	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);
1072		1342
1073	sub new {	1343	sub new {
1074	my ($class, %arg) = @_;	1344	my ($class, %arg) = @_;
1075		1345
1076	my $self = $class->SUPER::new (	1346	my $self = $class->SUPER::new (
1077	bg => [1, 1, 1, 1],	1347	bg => [1, 1, 1, 1],
1078	border_bg => [1, 1, 1, 1],	1348	border_bg => [1, 1, 1, 1],
1079	border => 0.6,	1349	border => 0.6,
1080	can_events => 1,	1350	can_events => 1,
1081	min_w => 16,	1351	min_w => 64,
1082	min_h => 16,	1352	min_h => 32,
1083	%arg,	1353	%arg,
1084	);	1354	);
1085		1355
1086	$self->{title_widget} = new CFClient::UI::Label	1356	$self->{title_widget} = new CFPlus::UI::Label
1087	align => 0,	1357	align => 0,
1088	valign => 1,	1358	valign => 1,
1089	text => $self->{title},	1359	text => $self->{title},
1090	fontsize => $self->{border},	1360	fontsize => $self->{border},
1091	if exists $self->{title};	1361	if exists $self->{title};
1092		1362
1093	if ($self->{has_close_button}) {	1363	if ($self->{has_close_button}) {
1094	$self->{close_button} =	1364	$self->{close_button} =
1095	new CFClient::UI::ImageButton	1365	new CFPlus::UI::ImageButton
1096	path => 'x1_close.png',	1366	path => 'x1_close.png',
1097	on_activate => sub { $self->hide };	1367	on_activate => sub { $self->emit ("delete") };
1098		1368
1099	$self->CFClient::UI::Container::add ($self->{close_button});	1369	$self->CFPlus::UI::Container::add ($self->{close_button});
1100	}	1370	}
1101		1371
1102	$self	1372	$self
1103	}	1373	}
1104		1374
1105	sub add {	1375	sub add {
1106	my ($self, @widgets) = @_;	1376	my ($self, @widgets) = @_;
1107		1377
1108	$self->SUPER::add (@widgets);	1378	$self->SUPER::add (@widgets);
1109	$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};
1110	$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};
1111	}	1381	}
1112		1382
1113	sub border {	1383	sub border {
1114	int $_[0]{border} * $::FONTSIZE	1384	int $_[0]{border} * $::FONTSIZE
1115	}	1385	}
…		…
1148	$self->child->configure ($border, $border, $w, $h);	1418	$self->child->configure ($border, $border, $w, $h);
1149		1419
1150	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1420	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151	if $self->{close_button};	1421	if $self->{close_button};
1152		1422
		1423	1
		1424	}
		1425
		1426	sub invoke_delete {
		1427	my ($self) = @_;
		1428
		1429	$self->hide;
		1430
1153	1	1431	1
1154	}	1432	}
1155		1433
1156	sub invoke_button_down {	1434	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1435	my ($self, $ev, $x, $y) = @_;
…		…
1215	$self->{motion}->($ev, $x, $y) if $self->{motion};	1493	$self->{motion}->($ev, $x, $y) if $self->{motion};
1216		1494
1217	! ! $self->{motion}	1495	! ! $self->{motion}
1218	}	1496	}
1219		1497
		1498	sub invoke_visibility_change {
		1499	my ($self, $visible) = @_;
		1500
		1501	delete $self->{motion} unless $visible;
		1502
		1503	0
		1504	}
		1505
1220	sub _draw {	1506	sub _draw {
1221	my ($self) = @_;	1507	my ($self) = @_;
1222		1508
1223	my $child = $self->{children}[0];	1509	my $child = $self->{children}[0];
1224		1510
…		…
1229	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1230		1516
1231	my $border = $self->border;	1517	my $border = $self->border;
1232		1518
1233	glColor @{ $self->{border_bg} };	1519	glColor @{ $self->{border_bg} };
1234	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1520	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1235	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1521	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1236	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1522	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1237	$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);
1238		1538
1239	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1539	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1240	glColor @{ $self->{bg} };	1540	glColor @{ $self->{bg} };
1241		1541
1242	# TODO: repeat texture not scale	1542	# TODO: repeat texture not scale
…		…
1261	if $self->{close_button};	1561	if $self->{close_button};
1262	}	1562	}
1263		1563
1264	#############################################################################	1564	#############################################################################
1265		1565
1266	package CFClient::UI::Table;	1566	package CFPlus::UI::Table;
1267		1567
1268	our @ISA = CFClient::UI::Base::;	1568	our @ISA = CFPlus::UI::Container::;
1269		1569
1270	use List::Util qw(max sum);	1570	use List::Util qw(max sum);
1271		1571
1272	use CFClient::OpenGL;	1572	use CFPlus::OpenGL;
1273		1573
1274	sub new {	1574	sub new {
1275	my $class = shift;	1575	my $class = shift;
1276		1576
1277	$class->SUPER::new (	1577	$class->SUPER::new (
1278	col_expand => [],	1578	col_expand => [],
		1579	row_expand => [],
1279	@_,	1580	@_,
1280	)	1581	)
1281	}	1582	}
1282		1583
1283	sub children {
1284	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285	}
1286
1287	sub add {	1584	sub add {
1288	my ($self, $x, $y, $child) = @_;	1585	my ($self, @widgets) = @_;
1289		1586
1290	$child->set_parent ($self);	1587	for my $child (@widgets) {
1291	$self->{children}[$y][$x] = $child;	1588	$child->{c_rowspan} ||= 1;
		1589	$child->{c_colspan} ||= 1;
		1590	}
1292		1591
1293	$self->realloc;	1592	$self->SUPER::add (@widgets);
1294	}	1593	}
1295		1594
1296	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 {
1297	my ($self, $child) = @_;	1613	my ($self) = @_;
1298		1614
1299	# TODO: not yet implemented	1615	my (@w, @h);
1300	}
1301
1302	# TODO: move to container class maybe? send children a signal on removal?
1303	sub clear {
1304	my ($self) = @_;
1305		1616
1306	my @children = $self->children;	1617	my @children = $self->children;
1307	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	}
1308		1628	}
1309	for (@children) {
1310	delete $_->{parent};
1311	$_->hide;
1312	}
1313		1629
1314	$self->realloc;	1630	# second pass, rows
1315	}	1631	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1316
1317	sub get_wh {
1318	my ($self) = @_;
1319
1320	my (@w, @h);
1321
1322	for my $y (0 .. $#{$self->{children}}) {
1323	my $row = $self->{children}[$y]
1324	or next;
1325
1326	for my $x (0 .. $#$row) {
1327	my $widget = $row->[$x]
1328	or next;
1329	my ($w, $h) = @$widget{qw(req_w req_h)};	1632	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1330		1633
1331	$w[$x] = max $w[$x], $w;	1634	my $sh = sum @h[$r .. $r + $rs - 1];
1332	$h[$y] = max $h[$y], $h;	1635
		1636	if ($h > $sh) {
		1637	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1333	}	1638	}
1334	}	1639	}
1335		1640
1336	(\@w, \@h)	1641	(\@w, \@h)
1337	}	1642	}
…		…
1353	my ($ws, $hs) = $self->get_wh;	1658	my ($ws, $hs) = $self->get_wh;
1354		1659
1355	my $req_w = (sum @$ws) || 1;	1660	my $req_w = (sum @$ws) || 1;
1356	my $req_h = (sum @$hs) || 1;	1661	my $req_h = (sum @$hs) || 1;
1357		1662
1358	# TODO: nicer code && do row_expand	1663	# now linearly scale the rows/columns to the allocated size
1359	my @col_expand = @{$self->{col_expand}};	1664	my @col_expand = @{$self->{col_expand}};
1360	@col_expand = (1) x @$ws unless @col_expand;	1665	@col_expand = (1) x @$ws unless @col_expand;
1361	my $col_expand = (sum @col_expand) || 1;	1666	my $col_expand = (sum @col_expand) || 1;
1362		1667
1363	# linearly scale sizes
1364	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1668	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366		1669
1367	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
1368	CFClient::UI::harmonize $hs;	1678	CFPlus::UI::harmonize $hs;
1369		1679
1370	my $y;	1680	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1681	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1371		1682
1372	for my $r (0 .. $#{$self->{children}}) {	1683	for my $widget ($self->children) {
1373	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)};
1374	or next;
1375		1685
1376	my $x = 0;	1686	$widget->configure (
1377	my $row_h = $hs->[$r];	1687	$x[$c], $y[$r],
		1688	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1378		1689	);
1379	for my $c (0 .. $#$row) {	1690	}
1380	my $col_w = $ws->[$c];
1381		1691
1382	if (my $widget = $row->[$c]) {	1692	1
1383	$widget->configure ($x, $y, $col_w, $row_h);	1693	}
1384	}
1385		1694
1386	$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};
1387	}	1722	}
		1723	}
1388		1724
1389	$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});
1390	}	1756	}
1391		1757
1392	1	1758	1
1393	}	1759	}
1394		1760
1395	sub find_widget {
1396	my ($self, $x, $y) = @_;
1397
1398	$x -= $self->{x};
1399	$y -= $self->{y};
1400
1401	my $res;
1402
1403	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1404	$res = $_->find_widget ($x, $y)
1405	and return $res;
1406	}
1407
1408	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1409	}
1410
1411	sub _draw {
1412	my ($self) = @_;
1413
1414	for (grep $_, @{$self->{children}}) {
1415	$_->draw for grep $_, @$_;
1416	}
1417	}
1418
1419	#############################################################################	1761	#############################################################################
1420		1762
1421	package CFClient::UI::Box;	1763	package CFPlus::UI::Box;
1422		1764
1423	our @ISA = CFClient::UI::Container::;	1765	our @ISA = CFPlus::UI::Container::;
1424		1766
1425	sub size_request {	1767	sub size_request {
1426	my ($self) = @_;	1768	my ($self) = @_;
		1769
		1770	my @children = $self->visible_children;
1427		1771
1428	$self->{vertical}	1772	$self->{vertical}
1429	? (	1773	? (
1430	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::max map $_->{req_w}, @children),
1431	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::sum map $_->{req_h}, @children),
1432	)	1776	)
1433	: (	1777	: (
1434	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1778	(List::Util::sum map $_->{req_w}, @children),
1435	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1779	(List::Util::max map $_->{req_h}, @children),
1436	)	1780	)
1437	}	1781	}
1438		1782
1439	sub invoke_size_allocate {	1783	sub invoke_size_allocate {
1440	my ($self, $w, $h) = @_;	1784	my ($self, $w, $h) = @_;
…		…
1461	$req[$_] += $space * $children[$_]{expand}	1805	$req[$_] += $space * $children[$_]{expand}
1462	for 0 .. $#children;	1806	for 0 .. $#children;
1463	}	1807	}
1464	}	1808	}
1465		1809
1466	CFClient::UI::harmonize \@req;	1810	CFPlus::UI::harmonize \@req;
1467		1811
1468	my $pos = 0;	1812	my $pos = 0;
1469	for (0 .. $#children) {	1813	for (0 .. $#children) {
1470	my $alloc = $req[$_];	1814	my $alloc = $req[$_];
1471	$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));
…		…
1476	1	1820	1
1477	}	1821	}
1478		1822
1479	#############################################################################	1823	#############################################################################
1480		1824
1481	package CFClient::UI::HBox;	1825	package CFPlus::UI::HBox;
1482		1826
1483	our @ISA = CFClient::UI::Box::;	1827	our @ISA = CFPlus::UI::Box::;
1484		1828
1485	sub new {	1829	sub new {
1486	my $class = shift;	1830	my $class = shift;
1487		1831
1488	$class->SUPER::new (	1832	$class->SUPER::new (
…		…
1491	)	1835	)
1492	}	1836	}
1493		1837
1494	#############################################################################	1838	#############################################################################
1495		1839
1496	package CFClient::UI::VBox;	1840	package CFPlus::UI::VBox;
1497		1841
1498	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1499		1843
1500	sub new {	1844	sub new {
1501	my $class = shift;	1845	my $class = shift;
1502		1846
1503	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1506	)	1850	)
1507	}	1851	}
1508		1852
1509	#############################################################################	1853	#############################################################################
1510		1854
1511	package CFClient::UI::Label;	1855	package CFPlus::UI::Label;
1512		1856
1513	our @ISA = CFClient::UI::DrawBG::;	1857	our @ISA = CFPlus::UI::DrawBG::;
1514		1858
1515	use CFClient::OpenGL;	1859	use CFPlus::OpenGL;
1516		1860
1517	sub new {	1861	sub new {
1518	my ($class, %arg) = @_;	1862	my ($class, %arg) = @_;
1519		1863
1520	my $self = $class->SUPER::new (	1864	my $self = $class->SUPER::new (
…		…
1523	#active_bg => none	1867	#active_bg => none
1524	#font => default_font	1868	#font => default_font
1525	#text => initial text	1869	#text => initial text
1526	#markup => initial narkup	1870	#markup => initial narkup
1527	#max_w => maximum pixel width	1871	#max_w => maximum pixel width
		1872	#style => 0, # render flags
1528	ellipsise => 3, # end	1873	ellipsise => 3, # end
1529	layout => (new CFClient::Layout),	1874	layout => (new CFPlus::Layout),
1530	fontsize => 1,	1875	fontsize => 1,
1531	align => -1,	1876	align => -1,
1532	valign => -1,	1877	valign => -1,
1533	padding_x => 2,	1878	padding_x => 2,
1534	padding_y => 2,	1879	padding_y => 2,
1535	can_events => 0,	1880	can_events => 0,
1536	%arg	1881	%arg
1537	);	1882	);
1538		1883
1539	if (exists $self->{template}) {	1884	if (exists $self->{template}) {
1540	my $layout = new CFClient::Layout;	1885	my $layout = new CFPlus::Layout;
1541	$layout->set_text (delete $self->{template});	1886	$layout->set_text (delete $self->{template});
1542	$self->{template} = $layout;	1887	$self->{template} = $layout;
1543	}	1888	}
1544		1889
1545	if (exists $self->{markup}) {	1890	if (exists $self->{markup}) {
…		…
1549	}	1894	}
1550		1895
1551	$self	1896	$self
1552	}	1897	}
1553		1898
1554	sub escape($) {
1555	local $_ = $_[0];
1556
1557	s/&/&amp;/g;
1558	s/>/&gt;/g;
1559	s/</&lt;/g;
1560
1561	$_
1562	}
1563
1564	sub update {	1899	sub update {
1565	my ($self) = @_;	1900	my ($self) = @_;
1566		1901
1567	delete $self->{texture};	1902	delete $self->{texture};
1568	$self->SUPER::update;	1903	$self->SUPER::update;
…		…
1573		1908
1574	delete $self->{ox};	1909	delete $self->{ox};
1575	$self->SUPER::realloc;	1910	$self->SUPER::realloc;
1576	}	1911	}
1577		1912
		1913	sub clear {
		1914	my ($self) = @_;
		1915
		1916	$self->set_text ("");
		1917	}
		1918
1578	sub set_text {	1919	sub set_text {
1579	my ($self, $text) = @_;	1920	my ($self, $text) = @_;
1580		1921
1581	return if $self->{text} eq "T$text";	1922	return if $self->{text} eq "T$text";
1582	$self->{text} = "T$text";	1923	$self->{text} = "T$text";
1583		1924
1584	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585	$self->{layout}->set_text ($text);	1925	$self->{layout}->set_text ($text);
1586		1926
1587	delete $self->{size_req};	1927	delete $self->{size_req};
1588	$self->realloc;	1928	$self->realloc;
1589	$self->update;	1929	$self->update;
…		…
1595	return if $self->{text} eq "M$markup";	1935	return if $self->{text} eq "M$markup";
1596	$self->{text} = "M$markup";	1936	$self->{text} = "M$markup";
1597		1937
1598	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1938	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599		1939
1600	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601	$self->{layout}->set_markup ($markup);	1940	$self->{layout}->set_markup ($markup);
1602		1941
1603	delete $self->{size_req};	1942	delete $self->{size_req};
1604	$self->realloc;	1943	$self->realloc;
1605	$self->update;	1944	$self->update;
…		…
1617		1956
1618	my ($w, $h) = $self->{layout}->size;	1957	my ($w, $h) = $self->{layout}->size;
1619		1958
1620	if (exists $self->{template}) {	1959	if (exists $self->{template}) {
1621	$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);
1622	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1962	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623		1963
1624	my ($w2, $h2) = $self->{template}->size;	1964	my ($w2, $h2) = $self->{template}->size;
1625		1965
1626	$w = List::Util::max $w, $w2;	1966	$w = List::Util::max $w, $w2;
…		…
1631	};	1971	};
1632		1972
1633	@{ $self->{size_req} }	1973	@{ $self->{size_req} }
1634	}	1974	}
1635		1975
		1976	sub baseline_shift {
		1977	$_[0]{layout}->descent
		1978	}
		1979
1636	sub invoke_size_allocate {	1980	sub invoke_size_allocate {
1637	my ($self, $w, $h) = @_;	1981	my ($self, $w, $h) = @_;
1638		1982
1639	delete $self->{ox};	1983	delete $self->{ox};
1640		1984
…		…
1646		1990
1647	sub set_fontsize {	1991	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	1992	my ($self, $fontsize) = @_;
1649		1993
1650	$self->{fontsize} = $fontsize;	1994	$self->{fontsize} = $fontsize;
		1995	delete $self->{size_req};
1651	delete $self->{texture};	1996	delete $self->{texture};
1652		1997
1653	$self->realloc;	1998	$self->realloc;
1654	}	1999	}
1655		2000
1656	sub reconfigure {	2001	sub reconfigure {
1657	my ($self) = @_;	2002	my ($self) = @_;
1658		2003
1659	delete $self->{size_req};	2004	delete $self->{size_req};
		2005	delete $self->{texture};
1660		2006
1661	$self->SUPER::reconfigure;	2007	$self->SUPER::reconfigure;
1662	}	2008	}
1663		2009
1664	sub _draw {	2010	sub _draw {
1665	my ($self) = @_;	2011	my ($self) = @_;
1666		2012
1667	$self->SUPER::_draw; # draw background, if applicable	2013	$self->SUPER::_draw; # draw background, if applicable
1668		2014
1669	my $tex = $self->{texture} ||= do {	2015	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	2016	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	2017	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	2018	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	2019	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2020	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2021	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		2022
1677	new_from_layout CFClient::Texture $self->{layout}	2023	[$self->{layout}->size]
1678	};	2024	};
1679		2025
1680	unless (exists $self->{ox}) {	2026	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2027	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2028	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	2029	: ($self->{w} - $size->[0]) * 0.5);
1684		2030
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	2033	: ($self->{h} - $size->[1]) * 0.5);
		2034
		2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1688	};	2036	};
1689		2037
1690	glEnable GL_TEXTURE_2D;	2038	# unless ($self->{list}) {
1691		2039	# $self->{list} = CFPlus::OpenGL::glGenList;
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2040	# CFPlus::OpenGL::glNewList $self->{list};
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2041	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1694		2042	# CFPlus::OpenGL::glEndList;
1695	if ($tex->{format} == GL_ALPHA) {
1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697	glColor @{$self->{fg}};
1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699	} else {
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702	}	2043	# }
		2044	#
		2045	# CFPlus::OpenGL::glCallList $self->{list};
1703		2046
1704	glDisable GL_TEXTURE_2D;	2047	$self->{layout}->draw;
1705	}	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	#}
1706		2057
1707	#############################################################################	2058	#############################################################################
1708		2059
1709	package CFClient::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
1710		2061
1711	our @ISA = CFClient::UI::Label::;	2062	our @ISA = CFPlus::UI::Label::;
1712		2063
1713	use CFClient::OpenGL;	2064	use CFPlus::OpenGL;
1714		2065
1715	sub new {	2066	sub new {
1716	my $class = shift;	2067	my $class = shift;
1717		2068
1718	$class->SUPER::new (	2069	$class->SUPER::new (
1719	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
1720	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
1721	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
1722	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
1723	can_hover => 1,	2076	can_hover => 1,
1724	can_focus => 1,	2077	can_focus => 1,
1725	valign => 0,	2078	valign => 0,
1726	can_events => 1,	2079	can_events => 1,
		2080	ellipsise => 0,
1727	#text => ...	2081	#text => ...
1728	#hidden => "*",	2082	#hidden => "*",
1729	@_	2083	@_
1730	)	2084	)
1731	}	2085	}
…		…
1776	my $sym = $ev->{sym};	2130	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	2131	my $uni = $ev->{unicode};
1778		2132
1779	my $text = $self->get_text;	2133	my $text = $self->get_text;
1780		2134
		2135	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2136
1781	if ($uni == 8) {	2137	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2138	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	2139	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	2140	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	2141	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	2142	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	2143	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	2144	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} 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 = "";
1790	$self->{cursor} = 0;	2159	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {
1792	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	2160	} elsif ($uni == 27) {
1794	$self->emit ('escape');	2161	$self->emit ('escape');
1795	} elsif ($uni) {	2162	} elsif ($uni == 0x0d) {
		2163	substr $text, $self->{cursor}++, 0, "\012";
		2164	} elsif ($uni >= 0x20) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	2165	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	2166	} else {
1798	return 0;	2167	return 0;
1799	}	2168	}
1800		2169
1801	$self->_set_text ($text);	2170	$self->_set_text ($text);
1802		2171
1803	$self->realloc;	2172	$self->realloc;
		2173	$self->update;
1804		2174
1805	1	2175	1
1806	}	2176	}
1807		2177
1808	sub invoke_focus_in {	2178	sub invoke_focus_in {
…		…
1820		2190
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	2191	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		2192
1823	# byte-index to char-index	2193	# byte-index to char-index
1824	my $text = $self->{text};	2194	my $text = $self->{text};
1825	utf8::encode $text;	2195	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	2196	$self->{cursor} = length $text;
1827		2197
1828	$self->_set_text ($self->{text});	2198	$self->_set_text ($self->{text});
1829	$self->update;	2199	$self->update;
1830		2200
1831	1	2201	1
…		…
1850	glColor_premultiply @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
1851	}	2221	}
1852		2222
1853	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
1854	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2224	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1855	glBegin GL_QUADS;
1856	glVertex 0 , 0;
1857	glVertex 0 , $self->{h};
1858	glVertex $self->{w}, $self->{h};	2225	glRect 0, 0, $self->{w}, $self->{h};
1859	glVertex $self->{w}, 0;
1860	glEnd;
1861	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
1862		2227
1863	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
1864		2229
1865	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
1867		2232
1868	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
1869	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
1870	utf8::encode $text;	2235	utf8::encode $text;
1871		2236
1872	@$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);
1873	}	2238	}
1874		2239
1875	glColor @{$self->{fg}};	2240	glColor_premultiply @{$self->{active_fg}};
1876	glBegin GL_LINES;	2241	glBegin GL_LINES;
1877	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};
1878	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};
1879	glEnd;	2244	glEnd;
1880	}
1881	}
1882		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
1883	package CFClient::UI::Entry;	2265	package CFPlus::UI::Entry;
1884		2266
1885	our @ISA = CFClient::UI::EntryBase::;	2267	our @ISA = CFPlus::UI::EntryBase::;
1886		2268
1887	use CFClient::OpenGL;	2269	use CFPlus::OpenGL;
1888		2270
1889	sub invoke_key_down {	2271	sub invoke_key_down {
1890	my ($self, $ev) = @_;	2272	my ($self, $ev) = @_;
1891		2273
1892	my $sym = $ev->{sym};	2274	my $sym = $ev->{sym};
1893		2275
1894	if ($sym == 13) {	2276	if ($ev->{uni} == 0x0d || $sym == 13) {
1895	unshift @{$self->{history}},	2277	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	2278	my $txt = $self->get_text;
1897		2279
1898	$self->{history_pointer} = -1;	2280	$self->{history_pointer} = -1;
1899	$self->{history_saveback} = '';	2281	$self->{history_saveback} = '';
1900	$self->emit (activate => $txt);	2282	$self->emit (activate => $txt);
1901	$self->update;	2283	$self->update;
1902		2284
1903	} elsif ($sym == CFClient::SDLK_UP) {	2285	} elsif ($sym == CFPlus::SDLK_UP) {
1904	if ($self->{history_pointer} < 0) {	2286	if ($self->{history_pointer} < 0) {
1905	$self->{history_saveback} = $self->get_text;	2287	$self->{history_saveback} = $self->get_text;
1906	}	2288	}
1907	if (@{$self->{history} || []} > 0) {	2289	if (@{$self->{history} || []} > 0) {
1908	$self->{history_pointer}++;	2290	$self->{history_pointer}++;
…		…
1910	$self->{history_pointer} = @{$self->{history} || []} - 1;	2292	$self->{history_pointer} = @{$self->{history} || []} - 1;
1911	}	2293	}
1912	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2294	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1913	}	2295	}
1914		2296
1915	} elsif ($sym == CFClient::SDLK_DOWN) {	2297	} elsif ($sym == CFPlus::SDLK_DOWN) {
1916	$self->{history_pointer}--;	2298	$self->{history_pointer}--;
1917	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2299	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918		2300
1919	if ($self->{history_pointer} >= 0) {	2301	if ($self->{history_pointer} >= 0) {
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2302	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1929	1	2311	1
1930	}	2312	}
1931		2313
1932	#############################################################################	2314	#############################################################################
1933		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
1934	package CFClient::UI::Button;	2355	package CFPlus::UI::ButtonBin;
1935		2356
1936	our @ISA = CFClient::UI::Label::;	2357	our @ISA = CFPlus::UI::Bin::;
1937		2358
1938	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
1939		2360
1940	my @tex =	2361	my @tex =
1941	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942	qw(b1_button_active.png);	2363	qw(b1_button_inactive.png b1_button_active.png);
1943		2364
1944	sub new {	2365	sub new {
1945	my $class = shift;	2366	my $class = shift;
1946		2367
1947	$class->SUPER::new (	2368	$class->SUPER::new (
1948	padding_x => 4,
1949	padding_y => 4,
1950	fg => [1, 1, 1],
1951	active_fg => [0, 0, 1],
1952	can_hover => 1,	2369	can_hover => 1,
1953	align => 0,	2370	align => 0,
1954	valign => 0,	2371	valign => 0,
1955	can_events => 1,	2372	can_events => 1,
1956	@_	2373	@_
…		…
1968	}	2385	}
1969		2386
1970	sub _draw {	2387	sub _draw {
1971	my ($self) = @_;	2388	my ($self) = @_;
1972		2389
1973	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1974
1975	glEnable GL_TEXTURE_2D;	2390	glEnable GL_TEXTURE_2D;
1976	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1977	glColor 0, 0, 0, 1;	2392	glColor 0, 0, 0, 1;
1978		2393
		2394	my $tex = $tex[$GRAB == $self];
1979	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2395	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1980		2396
1981	glDisable GL_TEXTURE_2D;	2397	glDisable GL_TEXTURE_2D;
1982		2398
1983	$self->SUPER::_draw;	2399	$self->SUPER::_draw;
1984	}	2400	}
1985		2401
1986	#############################################################################	2402	#############################################################################
1987		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
1988	package CFClient::UI::ImageButton;	2609	package CFPlus::UI::ImageButton;
1989		2610
1990	our @ISA = CFClient::UI::Image::;	2611	our @ISA = CFPlus::UI::Image::;
1991		2612
1992	use CFClient::OpenGL;	2613	use CFPlus::OpenGL;
1993		2614
1994	my %textures;	2615	my %textures;
1995		2616
1996	sub new {	2617	sub new {
1997	my $class = shift;	2618	my $class = shift;
…		…
2007	can_events => 1,	2628	can_events => 1,
2008	@_	2629	@_
2009	);	2630	);
2010	}	2631	}
2011		2632
		2633	sub invoke_button_down {
		2634	my ($self, $ev, $x, $y) = @_;
		2635
		2636	1
		2637	}
		2638
2012	sub invoke_button_up {	2639	sub invoke_button_up {
2013	my ($self, $ev, $x, $y) = @_;	2640	my ($self, $ev, $x, $y) = @_;
2014		2641
2015	$self->emit ("activate")	2642	$self->emit ("activate")
2016	if $x >= 0 && $x < $self->{w}	2643	if $x >= 0 && $x < $self->{w}
…		…
2019	1	2646	1
2020	}	2647	}
2021		2648
2022	#############################################################################	2649	#############################################################################
2023		2650
2024	package CFClient::UI::CheckBox;
2025
2026	our @ISA = CFClient::UI::DrawBG::;
2027
2028	my @tex =
2029	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2030	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031
2032	use CFClient::OpenGL;
2033
2034	sub new {
2035	my $class = shift;
2036
2037	$class->SUPER::new (
2038	padding_x => 2,
2039	padding_y => 2,
2040	fg => [1, 1, 1],
2041	active_fg => [1, 1, 0],
2042	bg => [0, 0, 0, 0.2],
2043	active_bg => [1, 1, 1, 0.5],
2044	state => 0,
2045	can_hover => 1,
2046	@_
2047	)
2048	}
2049
2050	sub size_request {
2051	my ($self) = @_;
2052
2053	(6) x 2
2054	}
2055
2056	sub invoke_button_down {
2057	my ($self, $ev, $x, $y) = @_;
2058
2059	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061	$self->{state} = !$self->{state};
2062	$self->emit (changed => $self->{state});
2063	} else {
2064	return 0
2065	}
2066
2067	1
2068	}
2069
2070	sub _draw {
2071	my ($self) = @_;
2072
2073	$self->SUPER::_draw;
2074
2075	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2076
2077	my ($w, $h) = @$self{qw(w h)};
2078
2079	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2080
2081	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2082
2083	my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
2085	glEnable GL_TEXTURE_2D;
2086	$tex->draw_quad_alpha (0, 0, $s, $s);
2087	glDisable GL_TEXTURE_2D;
2088	}
2089
2090	#############################################################################
2091
2092	package CFClient::UI::Image;	2651	package CFPlus::UI::VGauge;
2093		2652
2094	our @ISA = CFClient::UI::Base::;	2653	our @ISA = CFPlus::UI::Base::;
2095
2096	use CFClient::OpenGL;
2097
2098	our %texture_cache;
2099
2100	sub new {
2101	my $class = shift;
2102
2103	my $self = $class->SUPER::new (
2104	can_events => 0,
2105	@_,
2106	);
2107
2108	$self->{path}
2109	or Carp::croak "required attribute 'path' not set";
2110
2111	$self->{tex} = $texture_cache{$self->{path}} ||=
2112	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113
2114	Scalar::Util::weaken $texture_cache{$self->{path}};
2115
2116	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118	$self
2119	}
2120
2121	sub size_request {
2122	my ($self) = @_;
2123
2124	($self->{tex}{w}, $self->{tex}{h})
2125	}
2126
2127	sub _draw {
2128	my ($self) = @_;
2129
2130	my $tex = $self->{tex};
2131
2132	my ($w, $h) = ($self->{w}, $self->{h});
2133
2134	if ($self->{rot90}) {
2135	glRotate 90, 0, 0, 1;
2136	glTranslate 0, -$self->{w}, 0;
2137
2138	($w, $h) = ($h, $w);
2139	}
2140
2141	glEnable GL_TEXTURE_2D;
2142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2143
2144	$tex->draw_quad_alpha (0, 0, $w, $h);
2145
2146	glDisable GL_TEXTURE_2D;
2147	}
2148
2149	#############################################################################
2150
2151	package CFClient::UI::VGauge;
2152
2153	our @ISA = CFClient::UI::Base::;
2154		2654
2155	use List::Util qw(min max);	2655	use List::Util qw(min max);
2156		2656
2157	use CFClient::OpenGL;	2657	use CFPlus::OpenGL;
2158		2658
2159	my %tex = (	2659	my %tex = (
2160	food => [	2660	food => [
2161	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2661	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2162	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2662	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2163	],	2663	],
2164	grace => [	2664	grace => [
2165	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2665	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2166	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/
2167	],	2667	],
2168	hp => [	2668	hp => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2669	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2670	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2171	],	2671	],
2172	mana => [	2672	mana => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2673	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	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/
2175	],	2675	],
2176	);	2676	);
2177		2677
2178	# eg. VGauge->new (gauge => 'food'), default gauge: food	2678	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2238	my $ycut1 = max 0, min 1, $ycut;	2738	my $ycut1 = max 0, min 1, $ycut;
2239	my $ycut2 = max 0, min 1, $ycut - 1;	2739	my $ycut2 = max 0, min 1, $ycut - 1;
2240		2740
2241	my $h1 = $self->{h} * (1 - $ycut1);	2741	my $h1 = $self->{h} * (1 - $ycut1);
2242	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);
2243		2746
2244	glEnable GL_BLEND;	2747	glEnable GL_BLEND;
2245	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2748	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2749	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247	glEnable GL_TEXTURE_2D;	2750	glEnable GL_TEXTURE_2D;
…		…
2266		2769
2267	if ($t3) {	2770	if ($t3) {
2268	glBindTexture GL_TEXTURE_2D, $t3->{name};	2771	glBindTexture GL_TEXTURE_2D, $t3->{name};
2269	glBegin GL_QUADS;	2772	glBegin GL_QUADS;
2270	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2773	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2774	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2775	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2776	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274	glEnd;	2777	glEnd;
2275	}	2778	}
2276		2779
2277	glDisable GL_BLEND;	2780	glDisable GL_BLEND;
2278	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
2279	}	2782	}
2280		2783
2281	#############################################################################	2784	#############################################################################
2282		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
2283	package CFClient::UI::Gauge;	2910	package CFPlus::UI::Gauge;
2284		2911
2285	our @ISA = CFClient::UI::VBox::;	2912	our @ISA = CFPlus::UI::VBox::;
2286		2913
2287	sub new {	2914	sub new {
2288	my ($class, %arg) = @_;	2915	my ($class, %arg) = @_;
2289		2916
2290	my $self = $class->SUPER::new (	2917	my $self = $class->SUPER::new (
…		…
2292	can_hover => 1,	2919	can_hover => 1,
2293	can_events => 1,	2920	can_events => 1,
2294	%arg,	2921	%arg,
2295	);	2922	);
2296		2923
2297	$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");
2298	$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);
2299	$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");
2300		2927
2301	$self	2928	$self
2302	}	2929	}
2303		2930
2304	sub set_fontsize {	2931	sub set_fontsize {
…		…
2325	$self->{value}->set_text ($val);	2952	$self->{value}->set_text ($val);
2326	}	2953	}
2327		2954
2328	#############################################################################	2955	#############################################################################
2329		2956
2330	package CFClient::UI::Slider;	2957	package CFPlus::UI::Slider;
2331		2958
2332	use strict;	2959	use strict;
2333		2960
2334	use CFClient::OpenGL;	2961	use CFPlus::OpenGL;
2335		2962
2336	our @ISA = CFClient::UI::DrawBG::;	2963	our @ISA = CFPlus::UI::DrawBG::;
2337		2964
2338	my @tex =	2965	my @tex =
2339	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2966	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2340	qw(s1_slider.png s1_slider_bg.png);	2967	qw(s1_slider.png s1_slider_bg.png);
2341		2968
2342	sub new {	2969	sub new {
2343	my $class = shift;	2970	my $class = shift;
2344		2971
…		…
2412		3039
2413	$self->SUPER::invoke_button_down ($ev, $x, $y);	3040	$self->SUPER::invoke_button_down ($ev, $x, $y);
2414		3041
2415	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3042	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2416		3043
2417	$self->invoke_mouse_motion ($ev, $x, $y)	3044	$self->invoke_mouse_motion ($ev, $x, $y);
		3045
		3046	1
2418	}	3047	}
2419		3048
2420	sub invoke_mouse_motion {	3049	sub invoke_mouse_motion {
2421	my ($self, $ev, $x, $y) = @_;	3050	my ($self, $ev, $x, $y) = @_;
2422		3051
…		…
2429		3058
2430	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3059	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2431	} else {	3060	} else {
2432	return 0;	3061	return 0;
2433	}	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);
2434		3075
2435	1	3076	1
2436	}	3077	}
2437		3078
2438	sub update {	3079	sub update {
…		…
2489	glDisable GL_TEXTURE_2D;	3130	glDisable GL_TEXTURE_2D;
2490	}	3131	}
2491		3132
2492	#############################################################################	3133	#############################################################################
2493		3134
2494	package CFClient::UI::ValSlider;	3135	package CFPlus::UI::ValSlider;
2495		3136
2496	our @ISA = CFClient::UI::HBox::;	3137	our @ISA = CFPlus::UI::HBox::;
2497		3138
2498	sub new {	3139	sub new {
2499	my ($class, %arg) = @_;	3140	my ($class, %arg) = @_;
2500		3141
2501	my $range = delete $arg{range};	3142	my $range = delete $arg{range};
2502		3143
2503	my $self = $class->SUPER::new (	3144	my $self = $class->SUPER::new (
2504	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3145	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2505	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3146	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2506	to_value => sub { shift },	3147	to_value => sub { shift },
2507	from_value => sub { shift },	3148	from_value => sub { shift },
2508	%arg,	3149	%arg,
2509	);	3150	);
2510		3151
…		…
2530	sub set_range { shift->{slider}->set_range (@_) }	3171	sub set_range { shift->{slider}->set_range (@_) }
2531	sub set_value { shift->{slider}->set_value (@_) }	3172	sub set_value { shift->{slider}->set_value (@_) }
2532		3173
2533	#############################################################################	3174	#############################################################################
2534		3175
2535	package CFClient::UI::TextScroller;	3176	package CFPlus::UI::TextScroller;
2536		3177
2537	our @ISA = CFClient::UI::HBox::;	3178	our @ISA = CFPlus::UI::HBox::;
2538		3179
2539	use CFClient::OpenGL;	3180	use CFPlus::OpenGL;
2540		3181
2541	sub new {	3182	sub new {
2542	my $class = shift;	3183	my $class = shift;
2543		3184
2544	my $self = $class->SUPER::new (	3185	my $self = $class->SUPER::new (
2545	fontsize => 1,	3186	fontsize => 1,
2546	can_events => 0,	3187	can_events => 1,
2547	indent => 0,	3188	indent => 0,
2548	#font => default_font	3189	#font => default_font
2549	@_,	3190	@_,
2550		3191
2551	layout => (new CFClient::Layout 1),	3192	layout => (new CFPlus::Layout),
2552	par => [],	3193	par => [],
		3194	max_par => 0,
2553	height => 0,	3195	height => 0,
2554	children => [	3196	children => [
2555	(new CFClient::UI::Empty expand => 1),	3197	(new CFPlus::UI::Empty expand => 1),
2556	(new CFClient::UI::Slider vertical => 1),	3198	(new CFPlus::UI::Slider vertical => 1),
2557	],	3199	],
2558	);	3200	);
2559		3201
2560	$self->{children}[1]->connect (changed => sub { $self->update });	3202	$self->{children}[1]->connect (changed => sub { $self->update });
2561		3203
…		…
2567		3209
2568	$self->{fontsize} = $fontsize;	3210	$self->{fontsize} = $fontsize;
2569	$self->reflow;	3211	$self->reflow;
2570	}	3212	}
2571		3213
2572	sub visible_children {	3214	sub size_request {
2573	my ($self) = @_;	3215	my ($self) = @_;
2574		3216
2575	@{$self->{children}}[0,1]	3217	my ($empty, $slider) = $self->visible_children;
		3218
		3219	local $self->{children} = [$empty, $slider];
		3220	$self->SUPER::size_request
2576	}	3221	}
2577		3222
2578	sub invoke_size_allocate {	3223	sub invoke_size_allocate {
2579	my ($self, $w, $h) = @_;	3224	my ($self, $w, $h) = @_;
2580		3225
2581	my (undef, undef, @other) = @{ $self->{children} };	3226	my ($empty, $slider, @other) = @{ $self->{children} };
2582	$_->configure (@$_{qw(x y req_w req_h)}) for @other;	3227	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583		3228
2584	$self->{layout}->set_font ($self->{font}) if $self->{font};	3229	$self->{layout}->set_font ($self->{font}) if $self->{font};
2585	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3230	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586	$self->{layout}->set_width ($self->{children}[0]{w});	3231	$self->{layout}->set_width ($empty->{w});
2587	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3232	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588		3233
2589	$self->reflow;	3234	$self->reflow;
2590		3235
		3236	local $self->{children} = [$empty, $slider];
2591	$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
2592	}	3248	}
2593		3249
2594	sub get_layout {	3250	sub get_layout {
2595	my ($self, $para) = @_;	3251	my ($self, $para) = @_;
2596		3252
2597	my $layout = $self->{layout};	3253	my $layout = $self->{layout};
2598		3254
2599	$layout->set_font ($self->{font}) if $self->{font};	3255	$layout->set_font ($self->{font}) if $self->{font};
		3256	$layout->set_foreground (@{$para->{fg}});
2600	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3257	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601	$layout->set_width ($self->{children}[0]{w} - $para->{indent});	3258	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3259	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603	$layout->set_markup ($para->{markup});	3260	$layout->set_markup ($para->{markup});
2604	$layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});	3261
		3262	$layout->set_shapes (
		3263	map
		3264	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3265	@{$para->{widget}}
		3266	);
2605		3267
2606	$layout	3268	$layout
2607	}	3269	}
2608		3270
2609	sub reflow {	3271	sub reflow {
…		…
2616	sub set_offset {	3278	sub set_offset {
2617	my ($self, $offset) = @_;	3279	my ($self, $offset) = @_;
2618		3280
2619	# todo: base offset on lines or so, not on pixels	3281	# todo: base offset on lines or so, not on pixels
2620	$self->{children}[1]->set_value ($offset);	3282	$self->{children}[1]->set_value ($offset);
		3283	}
		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;
2621	}	3298	}
2622		3299
2623	sub clear {	3300	sub clear {
2624	my ($self) = @_;	3301	my ($self) = @_;
2625		3302
…		…
2630	$self->{height} = 0;	3307	$self->{height} = 0;
2631	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3308	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2632	}	3309	}
2633		3310
2634	sub add_paragraph {	3311	sub add_paragraph {
2635	my ($self, $color, $para, $indent) = @_;	3312	my $self = shift;
2636		3313
2637	my ($text, @w) = ref $para ? @$para : $para;	3314	for my $para (@_) {
2638
2639	$para = {	3315	$para = {
		3316	fg => [1, 1, 1, 1],
		3317	indent => 0,
		3318	markup => "",
		3319	widget => [],
		3320	ref $para ? %$para : (markup => $para),
2640	w => 1e10,	3321	w => 1e10,
2641	wrapped => 1,	3322	wrapped => 1,
2642	fg => $color,
2643	indent => $indent,
2644	markup => $text,
2645	widget => \@w,
2646	};	3323	};
2647		3324
2648	$self->add (@w) if @w;	3325	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2649	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	}
2650		3332
2651	$self->{need_reflow}++;	3333	$self->{need_reflow}++;
2652	$self->update;	3334	$self->update;
2653	}	3335	}
2654		3336
2655	sub scroll_to_bottom {	3337	sub scroll_to_bottom {
2656	my ($self) = @_;	3338	my ($self) = @_;
2657		3339
2658	$self->{scroll_to_bottom} = 1;	3340	$self->{scroll_to} = $#{$self->{par}};
2659	$self->update;	3341	$self->update;
2660	}	3342	}
2661		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
2662	sub update {	3377	sub update {
2663	my ($self) = @_;	3378	my ($self) = @_;
2664		3379
2665	$self->SUPER::update;	3380	$self->SUPER::update;
2666		3381
2667	return unless $self->{h} > 0;	3382	return unless $self->{h} > 0;
2668		3383
2669	delete $self->{texture};	3384	delete $self->{texture};
2670		3385
2671	$ROOT->on_post_alloc ($self => sub {	3386	$ROOT->on_post_alloc ($self => sub {
		3387	$self->force_uptodate;
		3388
2672	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3389	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2673		3390
2674	if (delete $self->{need_reflow}) {
2675	my $height = 0;
2676
2677	for my $para (@{$self->{par}}) {
2678	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679	my $layout = $self->get_layout ($para);
2680	my ($w, $h) = $layout->size;
2681
2682	$para->{w} = $w + $para->{indent};
2683	$para->{h} = $h;
2684	$para->{wrapped} = $layout->has_wrapped;
2685	}
2686
2687	$height += $para->{h};
2688	}
2689
2690	$self->{height} = $height;
2691
2692	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2693
2694	delete $self->{texture};
2695	}
2696
2697	if (delete $self->{scroll_to_bottom}) {
2698	$self->{children}[1]->set_value (1e10);
2699	}
2700
2701	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3391	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2702	glClearColor 0, 0, 0, 0;	3392	glClearColor 0, 0, 0, 0;
2703	glClear GL_COLOR_BUFFER_BIT;	3393	glClear GL_COLOR_BUFFER_BIT;
2704		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;
2705	my $top = int $self->{children}[1]{range}[0];	3403	my $top = int $self->{children}[1]{range}[0];
2706		3404
2707	my $y0 = $top;	3405	my $y0 = $top;
2708	my $y1 = $top + $H;	3406	my $y1 = $top + $H;
2709		3407
2710	my $y = 0;
2711
2712	glEnable GL_BLEND;
2713	#TODO# not correct in windows where rgba is forced off
2714	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2715
2716	for my $para (@{$self->{par}}) {	3408	for my $para (@{$self->{par}}) {
2717	my $h = $para->{h};	3409	my $h = $para->{h};
		3410	my $y = $para->{y};
2718		3411
2719	if ($y0 < $y + $h && $y < $y1) {	3412	if ($y0 < $y + $h && $y < $y1) {
2720
2721	my $layout = $self->get_layout ($para);	3413	my $layout = $self->get_layout ($para);
2722		3414
2723	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725	glRasterPos $para->{indent}, $y - $y0;	3415	$layout->render ($para->{indent}, $y - $y0);
2726	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3416	$layout->draw;
2727		3417
2728	if (my @w = @{ $para->{widget} }) {	3418	if (my @w = @{ $para->{widget} }) {
2729	my @s = $layout->get_shapes;	3419	my @s = $layout->get_shapes;
2730		3420
2731	for (@w) {	3421	for (@w) {
…		…
2737	$_->draw;	3427	$_->draw;
2738	}	3428	}
2739	}	3429	}
2740	}	3430	}
2741		3431
2742	$y += $h;	3432	$paridx++;
		3433	$top_paragraph ||= $paridx if $y >= $top;
2743	}	3434	}
2744		3435
2745	glDisable GL_BLEND;	3436	$self->{top_paragraph} = $top_paragraph;
2746	};	3437	};
2747	});	3438	});
2748	}	3439	}
2749		3440
2750	sub reconfigure {	3441	sub reconfigure {
…		…
2768	$self->{children}[1]->draw;	3459	$self->{children}[1]->draw;
2769	}	3460	}
2770		3461
2771	#############################################################################	3462	#############################################################################
2772		3463
2773	package CFClient::UI::Animator;	3464	package CFPlus::UI::Animator;
2774		3465
2775	use CFClient::OpenGL;	3466	use CFPlus::OpenGL;
2776		3467
2777	our @ISA = CFClient::UI::Bin::;	3468	our @ISA = CFPlus::UI::Bin::;
2778		3469
2779	sub moveto {	3470	sub moveto {
2780	my ($self, $x, $y) = @_;	3471	my ($self, $x, $y) = @_;
2781		3472
2782	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3473	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2810	glPopMatrix;	3501	glPopMatrix;
2811	}	3502	}
2812		3503
2813	#############################################################################	3504	#############################################################################
2814		3505
2815	package CFClient::UI::Flopper;	3506	package CFPlus::UI::Flopper;
2816		3507
2817	our @ISA = CFClient::UI::Button::;	3508	our @ISA = CFPlus::UI::Button::;
2818		3509
2819	sub new {	3510	sub new {
2820	my $class = shift;	3511	my $class = shift;
2821		3512
2822	my $self = $class->SUPER::new (	3513	my $self = $class->SUPER::new (
…		…
2834	$self->{other}->toggle_visibility;	3525	$self->{other}->toggle_visibility;
2835	}	3526	}
2836		3527
2837	#############################################################################	3528	#############################################################################
2838		3529
2839	package CFClient::UI::Tooltip;	3530	package CFPlus::UI::Tooltip;
2840		3531
2841	our @ISA = CFClient::UI::Bin::;	3532	our @ISA = CFPlus::UI::Bin::;
2842		3533
2843	use CFClient::OpenGL;	3534	use CFPlus::OpenGL;
2844		3535
2845	sub new {	3536	sub new {
2846	my $class = shift;	3537	my $class = shift;
2847		3538
2848	$class->SUPER::new (	3539	$class->SUPER::new (
…		…
2851	)	3542	)
2852	}	3543	}
2853		3544
2854	sub set_tooltip_from {	3545	sub set_tooltip_from {
2855	my ($self, $widget) = @_;	3546	my ($self, $widget) = @_;
		3547
		3548	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3549	if $widget->{tooltip} =~ /^#(.*)$/;
2856		3550
2857	my $tooltip = $widget->{tooltip};	3551	my $tooltip = $widget->{tooltip};
2858		3552
2859	if ($ENV{CFPLUS_DEBUG} & 2) {	3553	if ($ENV{CFPLUS_DEBUG} & 2) {
2860	$tooltip .= "\n\n" . (ref $widget) . "\n"	3554	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2864	}	3558	}
2865		3559
2866	$tooltip =~ s/^\n+//;	3560	$tooltip =~ s/^\n+//;
2867	$tooltip =~ s/\n+$//;	3561	$tooltip =~ s/\n+$//;
2868		3562
2869	$self->add (new CFClient::UI::Label	3563	$self->add (new CFPlus::UI::Label
2870	markup => $tooltip,	3564	markup => $tooltip,
2871	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3565	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2872	fontsize => 0.8,	3566	fontsize => 0.8,
2873	fg => [0, 0, 0, 1],	3567	style => 1, # FLAG_INVERSE
2874	ellipsise => 0,	3568	ellipsise => 0,
2875	font => ($widget->{tooltip_font} || $::FONT_PROP),	3569	font => ($widget->{tooltip_font} || $::FONT_PROP),
2876	);	3570	);
2877	}	3571	}
2878		3572
…		…
2897		3591
2898	$self->{root}->on_post_alloc ("move_$self" => sub {	3592	$self->{root}->on_post_alloc ("move_$self" => sub {
2899	my $widget = $self->{owner}	3593	my $widget = $self->{owner}
2900	or return;	3594	or return;
2901		3595
		3596	if ($widget->{visible}) {
2902	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3597	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2903		3598
2904	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3599	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2905	if $x + $self->{w} > $self->{root}{w};	3600	if $x + $self->{w} > $self->{root}{w};
2906		3601
2907	$self->move_abs ($x, $y);	3602	$self->move_abs ($x, $y);
		3603	} else {
		3604	$self->hide;
		3605	}
2908	});	3606	});
2909	}	3607	}
2910		3608
2911	sub _draw {	3609	sub _draw {
2912	my ($self) = @_;	3610	my ($self) = @_;
…		…
2914	glTranslate 0.375, 0.375;	3612	glTranslate 0.375, 0.375;
2915		3613
2916	my ($w, $h) = @$self{qw(w h)};	3614	my ($w, $h) = @$self{qw(w h)};
2917		3615
2918	glColor 1, 0.8, 0.4;	3616	glColor 1, 0.8, 0.4;
2919	glBegin GL_QUADS;	3617	glRect 0, 0, $w, $h;
2920	glVertex 0 , 0;
2921	glVertex 0 , $h;
2922	glVertex $w, $h;
2923	glVertex $w, 0;
2924	glEnd;
2925		3618
2926	glColor 0, 0, 0;	3619	glColor 0, 0, 0;
2927	glBegin GL_LINE_LOOP;	3620	glRect_lineloop 0, 0, $w, $h;
2928	glVertex 0 , 0;
2929	glVertex 0 , $h;
2930	glVertex $w, $h;
2931	glVertex $w, 0;
2932	glEnd;
2933		3621
2934	glTranslate 2 - 0.375, 2 - 0.375;	3622	glTranslate 2 - 0.375, 2 - 0.375;
2935		3623
2936	$self->SUPER::_draw;	3624	$self->SUPER::_draw;
2937	}	3625	}
2938		3626
2939	#############################################################################	3627	#############################################################################
2940		3628
2941	package CFClient::UI::Face;	3629	package CFPlus::UI::Face;
2942		3630
2943	our @ISA = CFClient::UI::Base::;	3631	our @ISA = CFPlus::UI::DrawBG::;
2944		3632
2945	use CFClient::OpenGL;	3633	use CFPlus::OpenGL;
2946		3634
2947	sub new {	3635	sub new {
2948	my $class = shift;	3636	my $class = shift;
2949		3637
2950	my $self = $class->SUPER::new (	3638	my $self = $class->SUPER::new (
		3639	size_w => 32,
		3640	size_h => 8,
2951	aspect => 1,	3641	aspect => 1,
2952	can_events => 0,	3642	can_events => 0,
2953	@_,	3643	@_,
2954	);	3644	);
2955		3645
2956	if ($self->{anim} && $self->{animspeed}) {	3646	if ($self->{anim} && $self->{animspeed}) {
2957	Scalar::Util::weaken (my $widget = $self);	3647	CFPlus::weaken (my $widget = $self);
2958		3648
		3649	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3650	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2959	$self->{timer} = Event->timer (	3651	$self->{timer} = Event->timer (
2960	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2961	hard => 1,	3652	parked => 1,
2962	interval => $self->{animspeed},
2963	cb => sub {	3653	cb => sub {
		3654	return unless $::CONN;
		3655
		3656	my $w = $widget
		3657	or return;
		3658
2964	++$widget->{frame};	3659	++$w->{frame};
		3660	$w->update_face;
		3661
		3662	# somehow, $widget can go away
2965	$widget->update;	3663	$w->update;
		3664	$w->update_timer;
2966	},	3665	},
2967	);	3666	);
		3667
		3668	$self->update_face;
		3669	$self->update_timer;
2968	}	3670	}
2969		3671
2970	$self	3672	$self
2971	}	3673	}
2972		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
2973	sub size_request {	3711	sub size_request {
2974	(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)
2975	}	3729	}
2976		3730
2977	sub update {	3731	sub update {
2978	my ($self) = @_;	3732	my ($self) = @_;
2979		3733
2980	return unless $self->{visible};	3734	return unless $self->{visible};
2981		3735
2982	$self->SUPER::update;	3736	$self->SUPER::update;
2983	}	3737	}
2984		3738
		3739	sub invoke_visibility_change {
		3740	my ($self) = @_;
		3741
		3742	$self->update_timer;
		3743
		3744	0
		3745	}
		3746
2985	sub _draw {	3747	sub _draw {
2986	my ($self) = @_;	3748	my ($self) = @_;
2987		3749
2988	return unless $::CONN;	3750	$self->SUPER::_draw;
2989		3751
2990	my $face;	3752	if (my $tex = $self->{tex}) {
2991
2992	if ($self->{frame}) {
2993	my $anim = $::CONN->{anim}[$self->{anim}];
2994
2995	$face = $anim->[ $self->{frame} % @$anim ]
2996	if $anim && @$anim;
2997	}
2998
2999	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3000
3001	if ($tex) {
3002	glEnable GL_TEXTURE_2D;	3753	glEnable GL_TEXTURE_2D;
3003	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3754	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3004	glColor 0, 0, 0, 1;	3755	glColor 0, 0, 0, 1;
3005	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3756	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3006	glDisable GL_TEXTURE_2D;	3757	glDisable GL_TEXTURE_2D;
…		…
3008	}	3759	}
3009		3760
3010	sub destroy {	3761	sub destroy {
3011	my ($self) = @_;	3762	my ($self) = @_;
3012		3763
3013	$self->{timer}->cancel	3764	(delete $self->{timer})->cancel
3014	if $self->{timer};	3765	if $self->{timer};
3015		3766
3016	$self->SUPER::destroy;	3767	$self->SUPER::destroy;
3017	}	3768	}
3018		3769
3019	#############################################################################	3770	#############################################################################
3020		3771
3021	package CFClient::UI::Buttonbar;	3772	package CFPlus::UI::Buttonbar;
3022		3773
3023	our @ISA = CFClient::UI::HBox::;	3774	our @ISA = CFPlus::UI::HBox::;
3024		3775
3025	# TODO: should actualyl wrap buttons and other goodies.	3776	# TODO: should actually wrap buttons and other goodies.
3026		3777
3027	#############################################################################	3778	#############################################################################
3028		3779
3029	package CFClient::UI::Menu;	3780	package CFPlus::UI::Menu;
3030		3781
3031	our @ISA = CFClient::UI::FancyFrame::;	3782	our @ISA = CFPlus::UI::Toplevel::;
3032		3783
3033	use CFClient::OpenGL;	3784	use CFPlus::OpenGL;
3034		3785
3035	sub new {	3786	sub new {
3036	my $class = shift;	3787	my $class = shift;
3037		3788
3038	my $self = $class->SUPER::new (	3789	my $self = $class->SUPER::new (
3039	items => [],	3790	items => [],
3040	z => 100,	3791	z => 100,
3041	@_,	3792	@_,
3042	);	3793	);
3043		3794
3044	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3795	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3045		3796
3046	for my $item (@{ $self->{items} }) {	3797	for my $item (@{ $self->{items} }) {
3047	my ($widget, $cb, $tooltip) = @$item;	3798	my ($widget, $cb, $tooltip) = @$item;
3048		3799
3049	# handle various types of items, only text for now	3800	# handle various types of items, only text for now
3050	if (!ref $widget) {	3801	if (!ref $widget) {
		3802	if ($widget =~ /\t/) {
		3803	my ($left, $right) = split /\t/, $widget, 2;
		3804
3051	$widget = new CFClient::UI::Label	3805	$widget = new CFPlus::UI::HBox
3052	can_hover => 1,	3806	can_hover => 1,
3053	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,
3054	markup => $widget,	3819	markup => $widget,
3055	tooltip => $tooltip	3820	tooltip => $tooltip;
		3821	}
3056	}	3822	}
3057		3823
3058	$self->{item}{$widget} = $item;	3824	$self->{item}{$widget} = $item;
3059		3825
3060	$self->{vbox}->add ($widget);	3826	$self->{vbox}->add ($widget);
…		…
3103	1	3869	1
3104	}	3870	}
3105		3871
3106	#############################################################################	3872	#############################################################################
3107		3873
3108	package CFClient::UI::Multiplexer;	3874	package CFPlus::UI::Multiplexer;
3109		3875
3110	our @ISA = CFClient::UI::Container::;	3876	our @ISA = CFPlus::UI::Container::;
3111		3877
3112	sub new {	3878	sub new {
3113	my $class = shift;	3879	my $class = shift;
3114		3880
3115	my $self = $class->SUPER::new (	3881	my $self = $class->SUPER::new (
…		…
3129		3895
3130	$self->{current} = $self->{children}[0]	3896	$self->{current} = $self->{children}[0]
3131	if @{ $self->{children} };	3897	if @{ $self->{children} };
3132	}	3898	}
3133		3899
		3900	sub get_current_page {
		3901	my ($self) = @_;
		3902
		3903	$self->{current}
		3904	}
		3905
3134	sub set_current_page {	3906	sub set_current_page {
3135	my ($self, $page_or_widget) = @_;	3907	my ($self, $page_or_widget) = @_;
3136		3908
3137	my $widget = ref $page_or_widget	3909	my $widget = ref $page_or_widget
3138	? $page_or_widget	3910	? $page_or_widget
…		…
3170	$self->{current}->draw;	3942	$self->{current}->draw;
3171	}	3943	}
3172		3944
3173	#############################################################################	3945	#############################################################################
3174		3946
3175	package CFClient::UI::Notebook;	3947	package CFPlus::UI::Notebook;
3176		3948
		3949	use CFPlus::OpenGL;
		3950
3177	our @ISA = CFClient::UI::VBox::;	3951	our @ISA = CFPlus::UI::VBox::;
3178		3952
3179	sub new {	3953	sub new {
3180	my $class = shift;	3954	my $class = shift;
3181		3955
3182	my $self = $class->SUPER::new (	3956	my $self = $class->SUPER::new (
3183	buttonbar => (new CFClient::UI::Buttonbar),	3957	buttonbar => (new CFPlus::UI::Buttonbar),
3184	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3958	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3959	active_outline => [1, 1, 0],
3185	# filter => # will be put between multiplexer and $self	3960	# filter => # will be put between multiplexer and $self
3186	@_,	3961	@_,
3187	);	3962	);
3188		3963
3189	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3964	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3190	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3965	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3191		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
3192	$self	4001	$self
3193	}	4002	}
3194		4003
3195	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 {
3196	my ($self, $title, $widget, $tooltip) = @_;	4022	my ($self, $title, $widget, $tooltip) = @_;
3197		4023
3198	Scalar::Util::weaken $self;	4024	$title = [$title, $tooltip] unless ref $title;
		4025	$widget->{c_tab} = $title;
3199		4026
3200	$self->{buttonbar}->add (new CFClient::UI::Button
3201	markup => $title,
3202	tooltip => $tooltip,
3203	on_activate => sub { $self->set_current_page ($widget) },
3204	);
3205
3206	$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
3207	}	4034	}
3208		4035
3209	sub set_current_page {	4036	sub set_current_page {
3210	my ($self, $page) = @_;	4037	my ($self, $page) = @_;
3211		4038
3212	$self->{multiplexer}->set_current_page ($page);	4039	$self->{multiplexer}->set_current_page ($page);
3213	$self->emit (page_changed => $self->{multiplexer}{current});	4040	$self->emit (page_changed => $self->{multiplexer}{current});
3214	}	4041	}
3215		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
3216	#############################################################################	4059	#############################################################################
3217		4060
3218	package CFClient::UI::Combobox;	4061	package CFPlus::UI::Selector;
3219		4062
3220	use utf8;	4063	use utf8;
3221		4064
3222	our @ISA = CFClient::UI::Button::;	4065	our @ISA = CFPlus::UI::Button::;
3223		4066
3224	sub new {	4067	sub new {
3225	my $class = shift;	4068	my $class = shift;
3226		4069
3227	my $self = $class->SUPER::new (	4070	my $self = $class->SUPER::new (
…		…
3244	my ($value, $title, $tooltip) = @$_;	4087	my ($value, $title, $tooltip) = @$_;
3245		4088
3246	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4089	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247	}	4090	}
3248		4091
3249	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4092	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250	}	4093	}
3251		4094
3252	sub _set_value {	4095	sub _set_value {
3253	my ($self, $value) = @_;	4096	my ($self, $value) = @_;
3254		4097
…		…
3269	$self->emit (changed => $value);	4112	$self->emit (changed => $value);
3270	}	4113	}
3271		4114
3272	#############################################################################	4115	#############################################################################
3273		4116
3274	package CFClient::UI::Statusbox;	4117	package CFPlus::UI::Statusbox;
3275		4118
3276	our @ISA = CFClient::UI::VBox::;	4119	our @ISA = CFPlus::UI::VBox::;
3277		4120
3278	sub new {	4121	sub new {
3279	my $class = shift;	4122	my $class = shift;
3280		4123
3281	my $self = $class->SUPER::new (	4124	my $self = $class->SUPER::new (
3282	fontsize => 0.8,	4125	fontsize => 0.8,
3283	@_,	4126	@_,
3284	);	4127	);
3285		4128
3286	Scalar::Util::weaken (my $this = $self);	4129	CFPlus::weaken (my $this = $self);
3287		4130
3288	$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 });
3289		4132
3290	$self	4133	$self
3291	}	4134	}
…		…
3293	sub reorder {	4136	sub reorder {
3294	my ($self) = @_;	4137	my ($self) = @_;
3295	my $NOW = Time::HiRes::time;	4138	my $NOW = Time::HiRes::time;
3296		4139
3297	# freeze display when hovering over any label	4140	# freeze display when hovering over any label
3298	return if $CFClient::UI::TOOLTIP->{owner}	4141	return if $CFPlus::UI::TOOLTIP->{owner}
3299	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4142	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3300	values %{ $self->{item} };	4143	values %{ $self->{item} };
3301		4144
3302	while (my ($k, $v) = each %{ $self->{item} }) {	4145	while (my ($k, $v) = each %{ $self->{item} }) {
3303	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4146	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3304	}	4147	}
…		…
3325	for ($short) {	4168	for ($short) {
3326	s/^\s+//;	4169	s/^\s+//;
3327	s/\s+/ /g;	4170	s/\s+/ /g;
3328	}	4171	}
3329		4172
3330	new CFClient::UI::Label	4173	new CFPlus::UI::Label
3331	markup => $short,	4174	markup => $short,
3332	tooltip => $item->{tooltip},	4175	tooltip => $item->{tooltip},
3333	tooltip_font => $::FONT_PROP,	4176	tooltip_font => $::FONT_PROP,
3334	tooltip_width => 0.67,	4177	tooltip_width => 0.67,
3335	fontsize => $item->{fontsize} || $self->{fontsize},	4178	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3389	count => 1,	4232	count => 1,
3390	%arg,	4233	%arg,
3391	};	4234	};
3392	}	4235	}
3393		4236
		4237	$ROOT->on_refresh (reorder => sub {
3394	$self->reorder;	4238	$self->reorder;
		4239	});
3395	}	4240	}
3396		4241
3397	sub reconfigure {	4242	sub reconfigure {
3398	my ($self) = @_;	4243	my ($self) = @_;
3399		4244
…		…
3412	$self->SUPER::destroy;	4257	$self->SUPER::destroy;
3413	}	4258	}
3414		4259
3415	#############################################################################	4260	#############################################################################
3416		4261
3417	package CFClient::UI::Inventory;
3418
3419	our @ISA = CFClient::UI::ScrolledWindow::;
3420
3421	sub new {
3422	my $class = shift;
3423
3424	my $self = $class->SUPER::new (
3425	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3426	@_,
3427	);
3428
3429	$self
3430	}
3431
3432	sub set_items {
3433	my ($self, $items) = @_;
3434
3435	$self->{child}->clear;
3436	return unless $items;
3437
3438	my @items = sort {
3439	($a->{type} <=> $b->{type})
3440	or ($a->{name} cmp $b->{name})
3441	} @$items;
3442
3443	$self->{real_items} = \@items;
3444
3445	my $row = 0;
3446	for my $item (@items) {
3447	CFClient::Item::update_widgets $item;
3448
3449	$self->{child}->add (0, $row, $item->{face_widget});
3450	$self->{child}->add (1, $row, $item->{desc_widget});
3451	$self->{child}->add (2, $row, $item->{weight_widget});
3452
3453	$row++;
3454	}
3455	}
3456
3457	#############################################################################
3458
3459	package CFClient::UI::BindEditor;
3460
3461	our @ISA = CFClient::UI::FancyFrame::;
3462
3463	sub new {
3464	my $class = shift;
3465
3466	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468	$self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472	text => "start recording",
3473	tooltip => "Start/Stops recording of actions."
3474	."All subsequent actions after the recording started will be captured."
3475	."The actions are displayed after the record was stopped."
3476	."To bind the action you have to click on the 'Bind' button",
3477	on_activate => sub {
3478	unless ($self->{recording}) {
3479	$self->start;
3480	} else {
3481	$self->stop;
3482	}
3483	});
3484
3485	$vb->add (new CFClient::UI::Label text => "Actions:");
3486	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3489	$vb->add (my $hb = new CFClient::UI::HBox);
3490	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491	$hb->add (new CFClient::UI::Button
3492	text => "bind",
3493	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494	on_activate => sub {
3495	$self->ask_for_bind;
3496	});
3497
3498	$vb->add (my $hb = new CFClient::UI::HBox);
3499	$hb->add (new CFClient::UI::Button
3500	text => "ok",
3501	expand => 1,
3502	tooltip => "This closes the binding editor and saves the binding",
3503	on_activate => sub {
3504	$self->hide;
3505	$self->commit;
3506	});
3507
3508	$hb->add (new CFClient::UI::Button
3509	text => "cancel",
3510	expand => 1,
3511	tooltip => "This closes the binding editor without saving",
3512	on_activate => sub {
3513	$self->hide;
3514	$self->{binding_cancel}->()
3515	if $self->{binding_cancel};
3516	});
3517
3518	$self->update_binding_widgets;
3519
3520	$self
3521	}
3522
3523	sub cfg_bind {
3524	my ($self, $mod, $sym, $cmds) = @_;
3525	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526	::update_bindings ();
3527	}
3528
3529	sub cfg_unbind {
3530	my ($self, $mod, $sym, $cmds) = @_;
3531	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532	::update_bindings ();
3533	}
3534
3535	sub commit {
3536	my ($self) = @_;
3537	my ($mod, $sym, $cmds) = $self->get_binding;
3538	if ($sym != 0 && @$cmds > 0) {
3539	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540	."'. Don't forget 'Save Config'!");
3541	$self->{binding_change}->($mod, $sym, $cmds)
3542	if $self->{binding_change};
3543	} else {
3544	$::STATUSBOX->add ("No action bound, no key or action specified!");
3545	$self->{binding_cancel}->()
3546	if $self->{binding_cancel};
3547	}
3548	}
3549
3550	sub start {
3551	my ($self) = @_;
3552
3553	$self->{rec_btn}->set_text ("stop recording");
3554	$self->{recording} = 1;
3555	$self->clear_command_list;
3556	$::CONN->start_record if $::CONN;
3557	}
3558
3559	sub stop {
3560	my ($self) = @_;
3561
3562	$self->{rec_btn}->set_text ("start recording");
3563	$self->{recording} = 0;
3564
3565	my $rec;
3566	$rec = $::CONN->stop_record if $::CONN;
3567	return unless ref $rec eq 'ARRAY';
3568	$self->set_command_list ($rec);
3569	}
3570
3571
3572	sub ask_for_bind_and_commit {
3573	my ($self) = @_;
3574	$self->ask_for_bind (1);
3575	}
3576
3577	sub ask_for_bind {
3578	my ($self, $commit, $end_cb) = @_;
3579
3580	CFClient::Binder::open_binding_dialog (sub {
3581	my ($mod, $sym) = @_;
3582	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583	$self->update_binding_widgets;
3584	$self->commit if $commit;
3585	$end_cb->() if $end_cb;
3586	});
3587	}
3588
3589	# $mod and $sym are the modifiers and key symbol
3590	# $cmds is a array ref of strings (the commands)
3591	# $cb is the callback that is executed on OK
3592	# $ccb is the callback that is executed on CANCEL and
3593	# when the binding was unsuccessful on OK
3594	sub set_binding {
3595	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597	$self->clear_command_list;
3598	$self->{recording} = 0;
3599	$self->{rec_btn}->set_text ("start recording");
3600
3601	$self->{binding} = [$mod, $sym];
3602	$self->{commands} = $cmds;
3603
3604	$self->{binding_change} = $cb;
3605	$self->{binding_cancel} = $ccb;
3606
3607	$self->update_binding_widgets;
3608	}
3609
3610	# this is a shortcut method that asks for a binding
3611	# and then just binds it.
3612	sub do_quick_binding {
3613	my ($self, $cmds, $end_cb) = @_;
3614	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615	$self->ask_for_bind (1, $end_cb);
3616	}
3617
3618	sub update_binding_widgets {
3619	my ($self) = @_;
3620	my ($mod, $sym, $cmds) = $self->get_binding;
3621	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622	$self->set_command_list ($cmds);
3623	}
3624
3625	sub get_binding {
3626	my ($self) = @_;
3627	return (
3628	$self->{binding}->[0],
3629	$self->{binding}->[1],
3630	[ grep { defined $_ } @{$self->{commands}} ]
3631	);
3632	}
3633
3634	sub clear_command_list {
3635	my ($self) = @_;
3636	$self->{cmdbox}->clear ();
3637	}
3638
3639	sub set_command_list {
3640	my ($self, $cmds) = @_;
3641
3642	$self->{cmdbox}->clear ();
3643	$self->{commands} = $cmds;
3644
3645	my $idx = 0;
3646
3647	for (@$cmds) {
3648	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650	my $i = $idx;
3651	$hb->add (new CFClient::UI::Label text => $_);
3652	$hb->add (new CFClient::UI::Button
3653	text => "delete",
3654	tooltip => "Deletes the action from the record",
3655	on_activate => sub {
3656	$self->{cmdbox}->remove ($hb);
3657	$cmds->[$i] = undef;
3658	});
3659
3660
3661	$idx++
3662	}
3663	}
3664
3665	#############################################################################
3666
3667	package CFClient::UI::SpellList;
3668
3669	our @ISA = CFClient::UI::Table::;
3670
3671	sub new {
3672	my $class = shift;
3673
3674	my $self = $class->SUPER::new (
3675	binding => [],
3676	commands => [],
3677	@_,
3678	)
3679	}
3680
3681	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3685	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3687	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3688	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3689	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3690	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3691	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3693
3694	sub rebuild_spell_list {
3695	my ($self) = @_;
3696
3697	$CFClient::UI::ROOT->on_refresh ($self => sub {
3698	$self->clear;
3699
3700	return unless $::CONN;
3701
3702	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3704	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3705	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3706	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3707
3708	my $row = 0;
3709
3710	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3711	my $spell = $self->{spell}{$_};
3712
3713	$row++;
3714
3715	my $spell_cb = sub {
3716	my ($widget, $ev) = @_;
3717
3718	if ($ev->{button} == 1) {
3719	$::CONN->user_send ("cast $spell->{name}");
3720	} elsif ($ev->{button} == 2) {
3721	$::CONN->user_send ("invoke $spell->{name}");
3722	} elsif ($ev->{button} == 3) {
3723	(new CFClient::UI::Menu
3724	items => [
3725	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727	],
3728	)->popup ($ev);
3729	} else {
3730	return 0;
3731	}
3732
3733	1
3734	};
3735
3736	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738	#TODO: add path info to tooltip
3739	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3740
3741	$self->add (0, $row, new CFClient::UI::Face
3742	face => $spell->{face},
3743	can_hover => 1,
3744	can_events => 1,
3745	tooltip => $tooltip,
3746	on_button_down => $spell_cb,
3747	);
3748
3749	$self->add (1, $row, new CFClient::UI::Label
3750	expand => 1,
3751	text => $spell->{name},
3752	can_hover => 1,
3753	can_events => 1,
3754	tooltip => $tooltip,
3755	on_button_down => $spell_cb,
3756	);
3757
3758	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3759	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3760	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3761	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3762	}
3763	});
3764	}
3765
3766	sub add_spell {
3767	my ($self, $spell) = @_;
3768
3769	$self->{spell}->{$spell->{name}} = $spell;
3770	$self->rebuild_spell_list;
3771	}
3772
3773	sub remove_spell {
3774	my ($self, $spell) = @_;
3775
3776	delete $self->{spell}->{$spell->{name}};
3777	$self->rebuild_spell_list;
3778	}
3779
3780	sub clear_spells {
3781	my ($self) = @_;
3782
3783	$self->{spell} = {};
3784	$self->rebuild_spell_list;
3785	}
3786
3787	#############################################################################
3788
3789	package CFClient::UI::Root;	4262	package CFPlus::UI::Root;
3790		4263
3791	our @ISA = CFClient::UI::Container::;	4264	our @ISA = CFPlus::UI::Container::;
3792		4265
3793	use List::Util qw(min max);	4266	use List::Util qw(min max);
3794		4267
3795	use CFClient::OpenGL;	4268	use CFPlus::OpenGL;
3796		4269
3797	sub new {	4270	sub new {
3798	my $class = shift;	4271	my $class = shift;
3799		4272
3800	my $self = $class->SUPER::new (	4273	my $self = $class->SUPER::new (
3801	visible => 1,	4274	visible => 1,
3802	@_,	4275	@_,
3803	);	4276	);
3804		4277
3805	Scalar::Util::weaken ($self->{root} = $self);	4278	CFPlus::weaken ($self->{root} = $self);
3806		4279
3807	$self	4280	$self
3808	}	4281	}
3809		4282
3810	sub size_request {	4283	sub size_request {
…		…
3858	}	4331	}
3859		4332
3860	sub update {	4333	sub update {
3861	my ($self) = @_;	4334	my ($self) = @_;
3862		4335
3863	$::WANT_REFRESH++;	4336	$::WANT_REFRESH->start;
3864	}	4337	}
3865		4338
3866	sub add {	4339	sub add {
3867	my ($self, @children) = @_;	4340	my ($self, @children) = @_;
3868		4341
…		…
3905	while ($self->{refresh_hook}) {	4378	while ($self->{refresh_hook}) {
3906	$_->()	4379	$_->()
3907	for values %{delete $self->{refresh_hook}};	4380	for values %{delete $self->{refresh_hook}};
3908	}	4381	}
3909		4382
3910	if ($self->{realloc}) {	4383	while ($self->{realloc}) {
3911	my %queue;	4384	my %queue;
3912	my @queue;	4385	my @queue;
3913	my $widget;	4386	my $widget;
3914		4387
3915	outer:	4388	outer:
…		…
3962	}	4435	}
3963	}	4436	}
3964		4437
3965	delete $self->{realloc}{$widget+0};	4438	delete $self->{realloc}{$widget+0};
3966	}	4439	}
3967	}
3968		4440
3969	while (my $size_alloc = delete $self->{size_alloc}) {	4441	while (my $size_alloc = delete $self->{size_alloc}) {
3970	my @queue = sort { $b->{visible} <=> $a->{visible} }	4442	my @queue = sort { $a->{visible} <=> $b->{visible} }
3971	values %$size_alloc;	4443	values %$size_alloc;
3972		4444
3973	while () {	4445	while () {
3974	my $widget = pop @queue || last;	4446	my $widget = pop @queue || last;
3975		4447
3976	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4448	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977		4449
3978	$w = 0 if $w < 0;	4450	$w = max $widget->{min_w}, $w;
3979	$h = 0 if $h < 0;	4451	$h = max $widget->{min_h}, $h;
3980		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
3981	$w = int $w + 0.5;	4459	$w = int $w + 0.5;
3982	$h = int $h + 0.5;	4460	$h = int $h + 0.5;
3983		4461
3984	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}) {
3985	$widget->{old_w} = $widget->{w};	4463	$widget->{old_w} = $widget->{w};
3986	$widget->{old_h} = $widget->{h};	4464	$widget->{old_h} = $widget->{h};
3987		4465
3988	$widget->{w} = $w;	4466	$widget->{w} = $w;
3989	$widget->{h} = $h;	4467	$widget->{h} = $h;
3990		4468
3991	$widget->emit (size_allocate => $w, $h);	4469	$widget->emit (size_allocate => $w, $h);
		4470	}
3992	}	4471	}
3993	}	4472	}
3994	}	4473	}
3995		4474
3996	while ($self->{post_alloc_hook}) {	4475	while ($self->{post_alloc_hook}) {
3997	$_->()	4476	$_->()
3998	for values %{delete $self->{post_alloc_hook}};	4477	for values %{delete $self->{post_alloc_hook}};
3999	}	4478	}
4000
4001		4479
4002	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4480	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4003	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4481	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4004	glClear GL_COLOR_BUFFER_BIT;	4482	glClear GL_COLOR_BUFFER_BIT;
4005		4483
…		…
4008	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4486	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4009	glMatrixMode GL_MODELVIEW;	4487	glMatrixMode GL_MODELVIEW;
4010	glLoadIdentity;	4488	glLoadIdentity;
4011		4489
4012	{	4490	{
4013	package CFClient::UI::Base;	4491	package CFPlus::UI::Base;
4014		4492
4015	($draw_x, $draw_y, $draw_w, $draw_h) =	4493	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4016	(0, 0, $self->{w}, $self->{h});	4494	(0, 0, $self->{w}, $self->{h});
4017	}
4018		4495
4019	$self->_draw;	4496	$self->_draw;
		4497	}
4020	}	4498	}
4021		4499
4022	#############################################################################	4500	#############################################################################
4023		4501
4024	package CFClient::UI;	4502	package CFPlus::UI;
4025		4503
4026	$ROOT = new CFClient::UI::Root;	4504	$ROOT = new CFPlus::UI::Root;
4027	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4505	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4028		4506
4029	1	4507	1
4030		4508

Diff Legend

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