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.439 by root, Sun Sep 16 13:04:36 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};
34
35	$tip = $tip->($widget) if CODE:: eq ref $tip;
36
37	$TOOLTIP->set_tooltip_from ($widget);	35	$TOOLTIP->set_tooltip_from ($widget);
38	$TOOLTIP->show;	36	$TOOLTIP->show;
39	}	37	}
40		38
41	return;	39	return;
42	}	40	}
43	}	41	}
44	}	42	}
45		43
46	$TOOLTIP->hide;	44	$TOOLTIP->hide;
		45	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	46	delete $TOOLTIP->{owner};
48	});	47	});
49		48
50	sub get_layout {	49	sub get_layout {
51	my $layout;	50	my $layout;
…		…
79	sub feed_sdl_key_up_event {	78	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	79	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	80	if $FOCUS;
82	}	81	}
83		82
		83	sub check_hover {
		84	my ($widget) = @_;
		85
		86	if ($widget != $HOVER) {
		87	my $hover = $HOVER; $HOVER = $widget;
		88
		89	$hover->update if $hover && $hover->{can_hover};
		90	$HOVER->update if $HOVER && $HOVER->{can_hover};
		91
		92	$TOOLTIP_WATCHER->start;
		93	}
		94	}
		95
84	sub feed_sdl_button_down_event {	96	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	97	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	98	my ($x, $y) = ($ev->{x}, $ev->{y});
87		99
88	if (!$BUTTON_STATE) {	100	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		101
		102	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	103	my $widget = $ROOT->find_widget ($x, $y);
90		104
91	$GRAB = $widget;	105	$GRAB = $widget;
92	$GRAB->update if $GRAB;	106	$GRAB->update if $GRAB;
93		107
94	$TOOLTIP_WATCHER->cb->();	108	$TOOLTIP_WATCHER->cb->();
95	}	109	}
96		110
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	111	if ($GRAB) {
		112	if ($ev->{button} == 4 || $ev->{button} == 5) {
		113	# mousewheel
		114	my $delta = $ev->{button} * 2 - 9;
		115	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		116
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	118	$ev->{dy} = $shift ? 0 : $delta;
		119
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
101	}	125	}
102		126
103	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	128	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		129
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		131
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		133
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
112	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		136
114	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	139	$grab->update if $grab;
117	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
118		141
		142	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
120	}	144	}
121	}	145	}
122		146
123	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
124	my ($ev) = @_;	148	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
126		150
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		152
129	if ($widget != $HOVER) {	153	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		154
132	$hover->update if $hover && $hover->{can_hover};	155	$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;	156	if $HOVER;
140	}	157	}
141		158
142	# convert position array to integers	159	# convert position array to integers
143	sub harmonize {	160	sub harmonize {
…		…
193	reconfigure_widgets;	210	reconfigure_widgets;
194	}	211	}
195		212
196	#############################################################################	213	#############################################################################
197		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
198	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
199		224
200	use strict;	225	use strict;
201		226
202	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
203		228
204	sub new {	229	sub new {
205	my $class = shift;	230	my $class = shift;
206		231
207	my $self = bless {	232	my $self = bless {
…		…
212	h => undef,	237	h => undef,
213	can_events => 1,	238	can_events => 1,
214	@_	239	@_
215	}, $class;	240	}, $class;
216		241
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		243
219	for (keys %$self) {	244	for (keys %$self) {
220	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
222	}	247	}
223	}	248	}
224		249
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$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};	252	$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};	253	$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};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		255
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		258
234	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
239		264
240	sub destroy {	265	sub destroy {
241	my ($self) = @_;	266	my ($self) = @_;
242		267
243	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
244	%$self = ();	270	%$self = ();
245	}	271	}
246		272
		273	sub TO_JSON {
		274	{ "\fw" => $_[0]{s_id} }
		275	}
		276
247	sub show {	277	sub show {
248	my ($self) = @_;	278	my ($self) = @_;
249		279
250	return if $self->{parent};	280	return if $self->{parent};
251		281
252	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
253	}	283	}
254		284
255	sub set_visible {	285	sub set_visible {
256	my ($self) = @_;	286	my ($self) = @_;
257		287
…		…
278	delete $self->{root};	308	delete $self->{root};
279		309
280	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
282		312
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
285		315
286	$self->emit ("focus_out");	316	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
288	}	318	}
…		…
290	sub set_visibility {	320	sub set_visibility {
291	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
292		322
293	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
294		324
295	$visible ? $self->hide	325	$visible ? $self->show
296	: $self->show;	326	: $self->hide;
297	}	327	}
298		328
299	sub toggle_visibility {	329	sub toggle_visibility {
300	my ($self) = @_;	330	my ($self) = @_;
301		331
…		…
330	$self->{force_h} = $h;	360	$self->{force_h} = $h;
331		361
332	$self->realloc;	362	$self->realloc;
333	}	363	}
334		364
		365	# travsle the widget chain up to find the maximum "physical" size constraints
		366	sub get_max_wh {
		367	my ($self) = @_;
		368
		369	return ($self->{alloc_w}, $self->{alloc_h})
		370	if $self->{alloc_w} && !$self->{root}{realloc}{$self+0};
		371
		372	return $self->{parent}->get_max_wh
		373	if $self->{parent};
		374
		375	($::WIDTH, $::HEIGHT)
		376	}
		377
335	sub size_request {	378	sub size_request {
336	require Carp;	379	require Carp;
337	Carp::confess "size_request is abstract";	380	Carp::confess "size_request is abstract";
338	}	381	}
339		382
		383	sub baseline_shift {
		384	0
		385	}
		386
340	sub configure {	387	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	388	my ($self, $x, $y, $w, $h) = @_;
342		389
343	if ($self->{aspect}) {	390	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	391	my ($ow, $oh) = ($w, $h);
345		392
346	$w = List::Util::min $w, int $h * $self->{aspect};	393	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	394	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		395
349	# use alignment to adjust x, y	396	# use alignment to adjust x, y
350		397
351	$x += int 0.5 * ($ow - $w);	398	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	399	$y += int 0.5 * ($oh - $h);
…		…
393		440
394	return if $self->{tooltip} eq $tooltip;	441	return if $self->{tooltip} eq $tooltip;
395		442
396	$self->{tooltip} = $tooltip;	443	$self->{tooltip} = $tooltip;
397		444
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	445	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	446	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	447	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	448	}
402	}	449	}
403		450
404	# translate global coordinates to local coordinate system	451	# translate global coordinates to local coordinate system
405	sub coord2local {	452	sub coord2local {
406	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
407		454
		455	Carp::confess unless $self->{parent};#d#
		456
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	457	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	458	}
410		459
411	# translate local coordinates to global coordinate system	460	# translate local coordinates to global coordinate system
412	sub coord2global {	461	sub coord2global {
413	my ($self, $x, $y) = @_;	462	my ($self, $x, $y) = @_;
414		463
		464	Carp::confess unless $self->{parent};#d#
		465
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	466	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	467	}
417		468
418	sub invoke_focus_in {	469	sub invoke_focus_in {
419	my ($self) = @_;	470	my ($self) = @_;
420		471
421	return if $FOCUS == $self;	472	return if $FOCUS == $self;
422	return unless $self->{can_focus};	473	return unless $self->{can_focus};
423		474
424	my $focus = $FOCUS; $FOCUS = $self;	475	$FOCUS = $self;
425		476
426	$focus->update if $focus;	477	$self->update;
427	$FOCUS->update;
428		478
429	0	479	0
430	}	480	}
431		481
432	sub invoke_focus_out {	482	sub invoke_focus_out {
433	my ($self) = @_;	483	my ($self) = @_;
434		484
435	return unless $FOCUS == $self;	485	return unless $FOCUS == $self;
436		486
437	my $focus = $FOCUS; undef $FOCUS;	487	undef $FOCUS;
438		488
439	$focus->update if $focus; #?	489	$self->update;
440		490
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	491	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	492	unless $FOCUS;
443		493
444	0	494	0
445	}	495	}
446		496
447	sub grab_focus {	497	sub grab_focus {
448	my ($self) = @_;	498	my ($self) = @_;
449		499
		500	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	501	$self->emit ("focus_in");
451	}	502	}
452		503
453	sub invoke_mouse_motion { 1 }	504	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	505	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	506	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	507	sub invoke_key_up { 0 }
		508	sub invoke_mouse_wheel { 0 }
457		509
458	sub invoke_button_down {	510	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	511	my ($self, $ev, $x, $y) = @_;
460		512
461	$self->grab_focus;	513	$self->grab_focus;
462		514
463	1	515	0
464	}	516	}
465		517
466	sub connect {	518	sub connect {
467	my ($self, $signal, $cb) = @_;	519	my ($self, $signal, $cb) = @_;
468		520
469	push @{ $self->{signal_cb}{$signal} }, $cb;	521	push @{ $self->{signal_cb}{$signal} }, $cb;
		522
		523	defined wantarray and CFPlus::guard {
		524	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		525	@{ $self->{signal_cb}{$signal} };
		526	}
470	}	527	}
		528
		529	sub disconnect_all {
		530	my ($self, $signal) = @_;
		531
		532	delete $self->{signal_cb}{$signal};
		533	}
		534
		535	my %has_coords = (
		536	button_down => 1,
		537	button_up => 1,
		538	mouse_motion => 1,
		539	mouse_wheel => 1,
		540	);
471		541
472	sub emit {	542	sub emit {
473	my ($self, $signal, @args) = @_;	543	my ($self, $signal, @args) = @_;
474		544
475	#d##TODO# stop propagating at first true, do not use sum	545	# 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	546	# and needlessly verbose code, either.
		547	my @append
		548	= $has_coords{$signal}
		549	? $args[0]->xy ($self)
		550	: ();
		551
		552	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		553
		554	for my $cb (
		555	@{$self->{signal_cb}{$signal} || []}, # before
477	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	556	($self->can ("invoke_$signal") || sub { 1 }), # closure
		557	) {
		558	return $cb->($self, @args, @append) || next;
		559	}
		560
		561	# parent
478	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	562	$self->{parent} && $self->{parent}->emit ($signal, @args)
479	}	563	}
480		564
481	sub find_widget {	565	#sub find_widget {
482	my ($self, $x, $y) = @_;	566	# 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		567
493	sub set_parent {	568	sub set_parent {
494	my ($self, $parent) = @_;	569	my ($self, $parent) = @_;
495		570
496	Scalar::Util::weaken ($self->{parent} = $parent);	571	CFPlus::weaken ($self->{parent} = $parent);
497	$self->set_visible if $parent->{visible};	572	$self->set_visible if $parent->{visible};
498	}	573	}
499		574
500	sub realloc {	575	sub realloc {
501	my ($self) = @_;	576	my ($self) = @_;
…		…
527		602
528	# using global variables seems a bit hacky, but passing through all drawing	603	# using global variables seems a bit hacky, but passing through all drawing
529	# functions seems pointless.	604	# functions seems pointless.
530	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	605	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
531		606
532	sub draw {	607	#sub draw {
533	my ($self) = @_;	608	#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		609
581	sub _draw {	610	sub _draw {
582	my ($self) = @_;	611	my ($self) = @_;
583		612
584	warn "no draw defined for $self\n";	613	warn "no draw defined for $self\n";
585	}	614	}
586		615
587	sub DESTROY {	616	sub DESTROY {
588	my ($self) = @_;	617	my ($self) = @_;
589		618
590	delete $WIDGET{$self+0};	619	return if CFPlus::in_destruct;
591		620
		621	local $@;
592	eval { $self->destroy };	622	eval { $self->destroy };
593	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	623	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		624
		625	delete $WIDGET{$self+0};
594	}	626	}
595		627
596	#############################################################################	628	#############################################################################
597		629
598	package CFClient::UI::DrawBG;	630	package CFPlus::UI::DrawBG;
599		631
600	our @ISA = CFClient::UI::Base::;	632	our @ISA = CFPlus::UI::Base::;
601		633
602	use strict;	634	use strict;
603	use CFClient::OpenGL;	635	use CFPlus::OpenGL;
604		636
605	sub new {	637	sub new {
606	my $class = shift;	638	my $class = shift;
607
608	# range [value, low, high, page]
609		639
610	$class->SUPER::new (	640	$class->SUPER::new (
611	#bg => [0, 0, 0, 0.2],	641	#bg => [0, 0, 0, 0.2],
612	#active_bg => [1, 1, 1, 0.5],	642	#active_bg => [1, 1, 1, 0.5],
613	@_	643	@_
…		…
625	my ($w, $h) = @$self{qw(w h)};	655	my ($w, $h) = @$self{qw(w h)};
626		656
627	glEnable GL_BLEND;	657	glEnable GL_BLEND;
628	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	658	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
629	glColor_premultiply @$color;	659	glColor_premultiply @$color;
630
631	glBegin GL_QUADS;
632	glVertex 0 , 0;
633	glVertex 0 , $h;
634	glVertex $w, $h;	660	glRect 0, 0, $w, $h;
635	glVertex $w, 0;
636	glEnd;
637
638	glDisable GL_BLEND;	661	glDisable GL_BLEND;
639	}	662	}
640	}	663	}
641		664
642	#############################################################################	665	#############################################################################
643		666
644	package CFClient::UI::Empty;	667	package CFPlus::UI::Empty;
645		668
646	our @ISA = CFClient::UI::Base::;	669	our @ISA = CFPlus::UI::Base::;
647		670
648	sub new {	671	sub new {
649	my ($class, %arg) = @_;	672	my ($class, %arg) = @_;
650	$class->SUPER::new (can_events => 0, %arg);	673	$class->SUPER::new (can_events => 0, %arg);
651	}	674	}
…		…
658		681
659	sub draw { }	682	sub draw { }
660		683
661	#############################################################################	684	#############################################################################
662		685
663	package CFClient::UI::Container;	686	package CFPlus::UI::Container;
664		687
665	our @ISA = CFClient::UI::Base::;	688	our @ISA = CFPlus::UI::Base::;
666		689
667	sub new {	690	sub new {
668	my ($class, %arg) = @_;	691	my ($class, %arg) = @_;
669		692
670	my $children = delete $arg{children};	693	my $children = delete $arg{children};
…		…
674	can_events => 0,	697	can_events => 0,
675	%arg,	698	%arg,
676	);	699	);
677		700
678	$self->add (@$children)	701	$self->add (@$children)
679	if $children;	702	if $children && @$children;
680		703
681	$self	704	$self
		705	}
		706
		707	sub realloc {
		708	my ($self) = @_;
		709
		710	$self->{force_realloc} = 1;
		711	$self->{force_size_alloc} = 1;
		712	$self->SUPER::realloc;
682	}	713	}
683		714
684	sub add {	715	sub add {
685	my ($self, @widgets) = @_;	716	my ($self, @widgets) = @_;
686		717
687	$_->set_parent ($self)	718	$_->set_parent ($self)
688	for @widgets;	719	for @widgets;
689		720
		721	# TODO: only do this in widgets that need it, e.g. root, fixed
690	use sort 'stable';	722	use sort 'stable';
691		723
692	$self->{children} = [	724	$self->{children} = [
693	sort { $a->{z} <=> $b->{z} }	725	sort { $a->{z} <=> $b->{z} }
694	@{$self->{children}}, @widgets	726	@{$self->{children}}, @widgets
695	];	727	];
696		728
697	$self->realloc;	729	$self->realloc;
		730
		731	$self->emit (c_add => \@widgets);
		732
		733	map $_+0, @widgets
698	}	734	}
699		735
700	sub children {	736	sub children {
701	@{ $_[0]{children} }	737	@{ $_[0]{children} }
702	}	738	}
703		739
704	sub remove {	740	sub remove {
705	my ($self, $child) = @_;	741	my ($self, @widgets) = @_;
706		742
		743	$self->emit (c_remove => \@widgets);
		744
		745	for my $child (@widgets) {
707	delete $child->{parent};	746	delete $child->{parent};
708	$child->hide;	747	$child->hide;
709
710	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	748	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		749	}
711		750
712	$self->realloc;	751	$self->realloc;
713	}	752	}
714		753
715	sub clear {	754	sub clear {
716	my ($self) = @_;	755	my ($self) = @_;
717		756
718	my $children = delete $self->{children};	757	my $children = $self->{children};
719	$self->{children} = [];	758	$self->{children} = [];
720		759
721	for (@$children) {	760	for (@$children) {
722	delete $_->{parent};	761	delete $_->{parent};
723	$_->hide;	762	$_->hide;
…		…
743	}	782	}
744		783
745	sub _draw {	784	sub _draw {
746	my ($self) = @_;	785	my ($self) = @_;
747		786
748	$_->draw for @{$self->{children}};	787	$_->draw for $self->visible_children;
749	}	788	}
750		789
751	#############################################################################	790	#############################################################################
752		791
753	package CFClient::UI::Bin;	792	package CFPlus::UI::Bin;
754		793
755	our @ISA = CFClient::UI::Container::;	794	our @ISA = CFPlus::UI::Container::;
756		795
757	sub new {	796	sub new {
758	my ($class, %arg) = @_;	797	my ($class, %arg) = @_;
759		798
760	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	799	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761		800
762	$class->SUPER::new (children => [$child], %arg)	801	$class->SUPER::new (children => [$child], %arg)
763	}	802	}
764		803
765	sub add {	804	sub add {
766	my ($self, $child) = @_;	805	my ($self, $child) = @_;
767		806
768	$self->SUPER::remove ($_) for @{ $self->{children} };	807	$self->clear;
769	$self->SUPER::add ($child);	808	$self->SUPER::add ($child);
770	}	809	}
771		810
772	sub remove {	811	sub remove {
773	my ($self, $widget) = @_;	812	my ($self, $widget) = @_;
774		813
775	$self->SUPER::remove ($widget);	814	$self->SUPER::remove ($widget);
776		815
777	$self->{children} = [new CFClient::UI::Empty]	816	$self->{children} = [new CFPlus::UI::Empty]
778	unless @{$self->{children}};	817	unless @{$self->{children}};
779	}	818	}
780		819
781	sub child { $_[0]->{children}[0] }	820	sub child { $_[0]->{children}[0] }
782		821
…		…
791		830
792	1	831	1
793	}	832	}
794		833
795	#############################################################################	834	#############################################################################
796
797	# back-buffered drawing area	835	# back-buffered drawing area
798		836
799	package CFClient::UI::Window;	837	package CFPlus::UI::Window;
800		838
801	our @ISA = CFClient::UI::Bin::;	839	our @ISA = CFPlus::UI::Bin::;
802		840
803	use CFClient::OpenGL;	841	use CFPlus::OpenGL;
804		842
805	sub new {	843	sub new {
806	my ($class, %arg) = @_;	844	my ($class, %arg) = @_;
807		845
808	my $self = $class->SUPER::new (%arg);	846	my $self = $class->SUPER::new (%arg);
…		…
830	}	868	}
831		869
832	sub render_child {	870	sub render_child {
833	my ($self) = @_;	871	my ($self) = @_;
834		872
835	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	873	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836	glClearColor 0, 0, 0, 0;	874	glClearColor 0, 0, 0, 0;
837	glClear GL_COLOR_BUFFER_BIT;	875	glClear GL_COLOR_BUFFER_BIT;
838		876
839	{	877	{
840	package CFClient::UI::Base;	878	package CFPlus::UI::Base;
841		879
842	($draw_x, $draw_y, $draw_w, $draw_h) =	880	local ($draw_x, $draw_y, $draw_w, $draw_h) =
843	(0, 0, $self->{w}, $self->{h});	881	(0, 0, $self->{w}, $self->{h});
		882
		883	$self->_render;
844	}	884	}
845
846	$self->_render;
847	};	885	};
848	}	886	}
849		887
850	sub _draw {	888	sub _draw {
851	my ($self) = @_;	889	my ($self) = @_;
852
853	my ($w, $h) = @$self{qw(w h)};
854		890
855	my $tex = $self->{texture}	891	my $tex = $self->{texture}
856	or return;	892	or return;
857		893
858	glEnable GL_TEXTURE_2D;	894	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	895	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860	glColor 0, 0, 0, 1;	896	glColor 0, 0, 0, 1;
861		897
862	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	898	$tex->draw_quad_alpha_premultiplied (0, 0);
863		899
864	glDisable GL_TEXTURE_2D;	900	glDisable GL_TEXTURE_2D;
865	}	901	}
866		902
867	#############################################################################	903	#############################################################################
868		904
869	package CFClient::UI::ViewPort;	905	package CFPlus::UI::ViewPort;
870		906
		907	use List::Util qw(min max);
		908
871	our @ISA = CFClient::UI::Window::;	909	our @ISA = CFPlus::UI::Window::;
872		910
873	sub new {	911	sub new {
874	my $class = shift;	912	my $class = shift;
875		913
876	$class->SUPER::new (	914	$class->SUPER::new (
…		…
883	sub size_request {	921	sub size_request {
884	my ($self) = @_;	922	my ($self) = @_;
885		923
886	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	924	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
887		925
888	$w = 10 if $self->{scroll_x};	926	$w = 1 if $self->{scroll_x};
889	$h = 10 if $self->{scroll_y};	927	$h = 1 if $self->{scroll_y};
890		928
891	($w, $h)	929	($w, $h)
892	}	930	}
893		931
894	sub invoke_size_allocate {	932	sub invoke_size_allocate {
…		…
906	}	944	}
907		945
908	sub set_offset {	946	sub set_offset {
909	my ($self, $x, $y) = @_;	947	my ($self, $x, $y) = @_;
910		948
		949	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		950	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		951
		952	if ($x != $self->{view_x} or $y != $self->{view_y}) {
911	$self->{view_x} = int $x;	953	$self->{view_x} = $x;
912	$self->{view_y} = int $y;	954	$self->{view_y} = $y;
913		955
		956	$self->emit (changed => $x, $y);
914	$self->update;	957	$self->update;
		958	}
		959	}
		960
		961	sub set_center {
		962	my ($self, $x, $y) = @_;
		963
		964	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		965	}
		966
		967	sub make_visible {
		968	my ($self, $x, $y, $border) = @_;
		969
		970	if ( $x < $self->{view_x} + $self->{w} * $border
		971	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		972	|| $y < $self->{view_y} + $self->{h} * $border
		973	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		974	) {
		975	$self->set_center ($x, $y);
		976	}
915	}	977	}
916		978
917	# hmm, this does not work for topleft of $self... but we should not ask for that	979	# hmm, this does not work for topleft of $self... but we should not ask for that
918	sub coord2local {	980	sub coord2local {
919	my ($self, $x, $y) = @_;	981	my ($self, $x, $y) = @_;
…		…
934	my ($self, $x, $y) = @_;	996	my ($self, $x, $y) = @_;
935		997
936	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	998	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	999	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
938	) {	1000	) {
939	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1001	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940	} else {	1002	} else {
941	$self->CFClient::UI::Base::find_widget ($x, $y)	1003	$self->CFPlus::UI::Base::find_widget ($x, $y)
942	}	1004	}
943	}	1005	}
944		1006
945	sub _render {	1007	sub _render {
946	my ($self) = @_;	1008	my ($self) = @_;
947		1009
948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1010	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};	1011	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950		1012
951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1013	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952		1014
953	$self->SUPER::_render;	1015	$self->SUPER::_render;
954	}	1016	}
955		1017
956	#############################################################################	1018	#############################################################################
957		1019
958	package CFClient::UI::ScrolledWindow;	1020	package CFPlus::UI::ScrolledWindow;
959		1021
960	our @ISA = CFClient::UI::HBox::;	1022	our @ISA = CFPlus::UI::Table::;
961		1023
962	sub new {	1024	sub new {
963	my ($class, %arg) = @_;	1025	my ($class, %arg) = @_;
964		1026
965	my $child = delete $arg{child};	1027	my $child = delete $arg{child};
966		1028
967	my $self;	1029	my $self;
968		1030
969	my $slider = new CFClient::UI::Slider	1031	my $hslider = new CFPlus::UI::Slider
		1032	c_col => 0,
		1033	c_row => 1,
		1034	vertical => 0,
		1035	range => [0, 0, 1, 0.01], # HACK fix
		1036	on_changed => sub {
		1037	$self->{hpos} = $_[1];
		1038	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1039	},
		1040	;
		1041
		1042	my $vslider = new CFPlus::UI::Slider
		1043	c_col => 1,
		1044	c_row => 0,
970	vertical => 1,	1045	vertical => 1,
971	range => [0, 0, 1, 0.01], # HACK fix	1046	range => [0, 0, 1, 0.01], # HACK fix
972	on_changed => sub {	1047	on_changed => sub {
973	$self->{vp}->set_offset (0, $_[1]);	1048	$self->{vpos} = $_[1];
		1049	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974	},	1050	},
975	;	1051	;
976		1052
977	$self = $class->SUPER::new (	1053	$self = $class->SUPER::new (
978	vp => (new CFClient::UI::ViewPort expand => 1),	1054	scroll_x => 0,
		1055	scroll_y => 1,
		1056	can_events => 1,
979	slider => $slider,	1057	hslider => $hslider,
		1058	vslider => $vslider,
		1059	col_expand => [1, 0],
		1060	row_expand => [1, 0],
980	%arg,	1061	%arg,
981	);	1062	);
982		1063
		1064	$self->{vp} = new CFPlus::UI::ViewPort
		1065	c_col => 0,
		1066	c_row => 0,
		1067	expand => 1,
		1068	scroll_x => $self->{scroll_x},
		1069	scroll_y => $self->{scroll_y},
		1070	on_changed => sub {
		1071	my ($vp, $x, $y) = @_;
		1072
		1073	$vp->{parent}{hslider}->set_value ($x);
		1074	$vp->{parent}{vslider}->set_value ($y);
		1075
		1076	0
		1077	},
		1078	on_size_allocate => sub {
		1079	my ($vp, $w, $h) = @_;
		1080	$vp->{parent}->update_slider;
		1081	0
		1082	},
		1083	;
		1084
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1085	$self->SUPER::add ($self->{vp});
		1086
984	$self->add ($child) if $child;	1087	$self->add ($child) if $child;
985		1088
986	$self	1089	$self
987	}	1090	}
988		1091
…		…
990	my ($self, $widget) = @_;	1093	my ($self, $widget) = @_;
991		1094
992	$self->{vp}->add ($self->{child} = $widget);	1095	$self->{vp}->add ($self->{child} = $widget);
993	}	1096	}
994		1097
		1098	sub set_offset { shift->{vp}->set_offset (@_) }
		1099	sub set_center { shift->{vp}->set_center (@_) }
		1100	sub make_visible { shift->{vp}->make_visible (@_) }
		1101
995	sub update {	1102	sub update_slider {
		1103	my ($self) = @_;
		1104
		1105	my $child = ($self->{vp} or return)->child;
		1106
		1107	if ($self->{scroll_x}) {
		1108	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1109	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1110
		1111	my $visible = $w1 > $w2;
		1112	if ($visible != $self->{hslider_visible}) {
		1113	$self->{hslider_visible} = $visible;
		1114	$visible ? $self->SUPER::add ($self->{hslider})
		1115	: $self->SUPER::remove ($self->{hslider});
		1116	}
		1117	}
		1118
		1119	if ($self->{scroll_y}) {
		1120	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1121	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1122
		1123	my $visible = $h1 > $h2;
		1124	if ($visible != $self->{vslider_visible}) {
		1125	$self->{vslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{vslider})
		1127	: $self->SUPER::remove ($self->{vslider});
		1128	}
		1129	}
		1130	}
		1131
		1132	sub start_dragging {
996	my ($self) = @_;	1133	my ($self, $ev) = @_;
997		1134
998	$self->SUPER::update;	1135	$self->grab_focus;
999		1136
1000	# todo: overwrite size_allocate of child	1137	my $ox = $self->{vp}{view_x};
1001	my $child = $self->{vp}->child;	1138	my $oy = $self->{vp}{view_y};
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1139
		1140	$self->{motion} = sub {
		1141	my ($ev, $x, $y) = @_;
		1142
		1143	$ox -= $ev->{xrel};
		1144	$oy -= $ev->{yrel};
		1145
		1146	$self->{vp}->set_offset ($ox, $oy);
		1147	};
		1148	}
		1149
		1150	sub invoke_mouse_wheel {
		1151	my ($self, $ev) = @_;
		1152
		1153	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1154	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1155
		1156	1
		1157	}
		1158
		1159	sub invoke_button_down {
		1160	my ($self, $ev, $x, $y) = @_;
		1161
		1162	if ($ev->{button} == 2) {
		1163	$self->start_dragging ($ev);
		1164	return 1;
		1165	}
		1166
		1167	0
		1168	}
		1169
		1170	sub invoke_button_up {
		1171	my ($self, $ev, $x, $y) = @_;
		1172
		1173	if (delete $self->{motion}) {
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_mouse_motion {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if ($self->{motion}) {
		1184	$self->{motion}->($ev, $x, $y);
		1185	return 1;
		1186	}
		1187
		1188	0
1003	}	1189	}
1004		1190
1005	sub invoke_size_allocate {	1191	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
1007		1193
1008	my $child = $self->{vp}->child;	1194	$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)	1195	$self->SUPER::invoke_size_allocate ($w, $h)
1012	}	1196	}
1013		1197
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016
1017	#############################################################################	1198	#############################################################################
1018		1199
1019	package CFClient::UI::Frame;	1200	package CFPlus::UI::Frame;
1020		1201
1021	our @ISA = CFClient::UI::Bin::;	1202	our @ISA = CFPlus::UI::Bin::;
1022		1203
1023	use CFClient::OpenGL;	1204	use CFPlus::OpenGL;
1024		1205
1025	sub new {	1206	sub new {
1026	my $class = shift;	1207	my $class = shift;
1027		1208
1028	$class->SUPER::new (	1209	$class->SUPER::new (
…		…
1038	my ($w, $h) = @$self{qw(w h)};	1219	my ($w, $h) = @$self{qw(w h)};
1039		1220
1040	glEnable GL_BLEND;	1221	glEnable GL_BLEND;
1041	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1222	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1042	glColor_premultiply @{ $self->{bg} };	1223	glColor_premultiply @{ $self->{bg} };
1043
1044	glBegin GL_QUADS;
1045	glVertex 0 , 0;
1046	glVertex 0 , $h;
1047	glVertex $w, $h;	1224	glRect 0, 0, $w, $h;
1048	glVertex $w, 0;
1049	glEnd;
1050
1051	glDisable GL_BLEND;	1225	glDisable GL_BLEND;
1052	}	1226	}
1053		1227
1054	$self->SUPER::_draw;	1228	$self->SUPER::_draw;
1055	}	1229	}
1056		1230
1057	#############################################################################	1231	#############################################################################
1058		1232
1059	package CFClient::UI::FancyFrame;	1233	package CFPlus::UI::FancyFrame;
1060		1234
1061	our @ISA = CFClient::UI::Bin::;	1235	our @ISA = CFPlus::UI::Bin::;
1062		1236
1063	use CFClient::OpenGL;	1237	use CFPlus::OpenGL;
		1238
		1239	sub new {
		1240	my ($class, %arg) = @_;
		1241
		1242	if ((exists $arg{label}) && !ref $arg{label}) {
		1243	$arg{label} = new CFPlus::UI::Label
		1244	align => 1,
		1245	valign => 0,
		1246	text => $arg{label},
		1247	fontsize => ($arg{border} || 0.8) * 0.75;
		1248	}
		1249
		1250	my $self = $class->SUPER::new (
		1251	# label => "",
		1252	fg => [0.6, 0.3, 0.1],
		1253	border => 0.8,
		1254	style => 'single',
		1255	%arg,
		1256	);
		1257
		1258	$self
		1259	}
		1260
		1261	sub add {
		1262	my ($self, @widgets) = @_;
		1263
		1264	$self->SUPER::add (@widgets);
		1265	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1266	}
		1267
		1268	sub border {
		1269	int $_[0]{border} * $::FONTSIZE
		1270	}
		1271
		1272	sub size_request {
		1273	my ($self) = @_;
		1274
		1275	($self->{label_w}, undef) = $self->{label}->size_request
		1276	if $self->{label};
		1277
		1278	my ($w, $h) = $self->SUPER::size_request;
		1279
		1280	(
		1281	$w + $self->border * 2,
		1282	$h + $self->border * 2,
		1283	)
		1284	}
		1285
		1286	sub invoke_size_allocate {
		1287	my ($self, $w, $h) = @_;
		1288
		1289	my $border = $self->border;
		1290
		1291	$w -= List::Util::max 0, $border * 2;
		1292	$h -= List::Util::max 0, $border * 2;
		1293
		1294	if (my $label = $self->{label}) {
		1295	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1296	$label->{h} = List::Util::min $h, $border;
		1297	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1298	}
		1299
		1300	$self->child->configure ($border, $border, $w, $h);
		1301
		1302	1
		1303	}
		1304
		1305	sub _draw {
		1306	my ($self) = @_;
		1307
		1308	my $child = $self->{children}[0];
		1309
		1310	my $border = $self->border;
		1311	my ($w, $h) = ($self->{w}, $self->{h});
		1312
		1313	$child->draw;
		1314
		1315	glColor @{$self->{fg}};
		1316	glBegin GL_LINE_STRIP;
		1317	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1318	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1319	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1320	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1321	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1322	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1323	glEnd;
		1324
		1325	if ($self->{label}) {
		1326	glTranslate $border * 2, 0;
		1327	$self->{label}->_draw;
		1328	}
		1329	}
		1330
		1331	#############################################################################
		1332
		1333	package CFPlus::UI::Toplevel;
		1334
		1335	our @ISA = CFPlus::UI::Bin::;
		1336
		1337	use CFPlus::OpenGL;
1064		1338
1065	my $bg =	1339	my $bg =
1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1340	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067	mipmap => 1, wrap => 1;	1341	mipmap => 1, wrap => 1;
1068		1342
1069	my @border =	1343	my @border =
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1344	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);	1345	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1346
		1347	my @icon =
		1348	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1349	qw(x1_move.png x1_resize.png);
1072		1350
1073	sub new {	1351	sub new {
1074	my ($class, %arg) = @_;	1352	my ($class, %arg) = @_;
1075		1353
1076	my $self = $class->SUPER::new (	1354	my $self = $class->SUPER::new (
1077	bg => [1, 1, 1, 1],	1355	bg => [1, 1, 1, 1],
1078	border_bg => [1, 1, 1, 1],	1356	border_bg => [1, 1, 1, 1],
1079	border => 0.6,	1357	border => 0.6,
1080	can_events => 1,	1358	can_events => 1,
1081	min_w => 16,	1359	min_w => 64,
1082	min_h => 16,	1360	min_h => 32,
1083	%arg,	1361	%arg,
1084	);	1362	);
1085		1363
1086	$self->{title_widget} = new CFClient::UI::Label	1364	$self->{title_widget} = new CFPlus::UI::Label
1087	align => 0,	1365	align => 0,
1088	valign => 1,	1366	valign => 1,
1089	text => $self->{title},	1367	text => $self->{title},
1090	fontsize => $self->{border},	1368	fontsize => $self->{border},
1091	if exists $self->{title};	1369	if exists $self->{title};
1092		1370
1093	if ($self->{has_close_button}) {	1371	if ($self->{has_close_button}) {
1094	$self->{close_button} =	1372	$self->{close_button} =
1095	new CFClient::UI::ImageButton	1373	new CFPlus::UI::ImageButton
1096	path => 'x1_close.png',	1374	path => 'x1_close.png',
1097	on_activate => sub { $self->hide };	1375	on_activate => sub { $self->emit ("delete") };
1098		1376
1099	$self->CFClient::UI::Container::add ($self->{close_button});	1377	$self->CFPlus::UI::Container::add ($self->{close_button});
1100	}	1378	}
1101		1379
1102	$self	1380	$self
1103	}	1381	}
1104		1382
1105	sub add {	1383	sub add {
1106	my ($self, @widgets) = @_;	1384	my ($self, @widgets) = @_;
1107		1385
1108	$self->SUPER::add (@widgets);	1386	$self->SUPER::add (@widgets);
1109	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1387	$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};	1388	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111	}	1389	}
1112		1390
1113	sub border {	1391	sub border {
1114	int $_[0]{border} * $::FONTSIZE	1392	int $_[0]{border} * $::FONTSIZE
1115	}	1393	}
…		…
1148	$self->child->configure ($border, $border, $w, $h);	1426	$self->child->configure ($border, $border, $w, $h);
1149		1427
1150	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1428	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151	if $self->{close_button};	1429	if $self->{close_button};
1152		1430
		1431	1
		1432	}
		1433
		1434	sub invoke_delete {
		1435	my ($self) = @_;
		1436
		1437	$self->hide;
		1438
1153	1	1439	1
1154	}	1440	}
1155		1441
1156	sub invoke_button_down {	1442	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1443	my ($self, $ev, $x, $y) = @_;
…		…
1215	$self->{motion}->($ev, $x, $y) if $self->{motion};	1501	$self->{motion}->($ev, $x, $y) if $self->{motion};
1216		1502
1217	! ! $self->{motion}	1503	! ! $self->{motion}
1218	}	1504	}
1219		1505
		1506	sub invoke_visibility_change {
		1507	my ($self, $visible) = @_;
		1508
		1509	delete $self->{motion} unless $visible;
		1510
		1511	0
		1512	}
		1513
1220	sub _draw {	1514	sub _draw {
1221	my ($self) = @_;	1515	my ($self) = @_;
1222		1516
1223	my $child = $self->{children}[0];	1517	my $child = $self->{children}[0];
1224		1518
…		…
1229	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1523	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1230		1524
1231	my $border = $self->border;	1525	my $border = $self->border;
1232		1526
1233	glColor @{ $self->{border_bg} };	1527	glColor @{ $self->{border_bg} };
1234	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1528	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1235	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1529	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1236	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1530	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1237	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1531	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1532
		1533	# move
		1534	my $w2 = ($w - $border) * .5;
		1535	my $h2 = ($h - $border) * .5;
		1536	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1537	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1538	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1539
		1540	# resize
		1541	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1542	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1543	unless $self->{has_close_button};
		1544	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1545	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1238		1546
1239	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1547	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1240	glColor @{ $self->{bg} };	1548	glColor @{ $self->{bg} };
1241		1549
1242	# TODO: repeat texture not scale	1550	# TODO: repeat texture not scale
…		…
1261	if $self->{close_button};	1569	if $self->{close_button};
1262	}	1570	}
1263		1571
1264	#############################################################################	1572	#############################################################################
1265		1573
1266	package CFClient::UI::Table;	1574	package CFPlus::UI::Table;
1267		1575
1268	our @ISA = CFClient::UI::Base::;	1576	our @ISA = CFPlus::UI::Container::;
1269		1577
1270	use List::Util qw(max sum);	1578	use List::Util qw(max sum);
1271		1579
1272	use CFClient::OpenGL;	1580	use CFPlus::OpenGL;
1273		1581
1274	sub new {	1582	sub new {
1275	my $class = shift;	1583	my $class = shift;
1276		1584
1277	$class->SUPER::new (	1585	$class->SUPER::new (
1278	col_expand => [],	1586	col_expand => [],
		1587	row_expand => [],
1279	@_,	1588	@_,
1280	)	1589	)
1281	}	1590	}
1282		1591
1283	sub children {
1284	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285	}
1286
1287	sub add {	1592	sub add {
1288	my ($self, $x, $y, $child) = @_;	1593	my ($self, @widgets) = @_;
1289		1594
1290	$child->set_parent ($self);	1595	for my $child (@widgets) {
1291	$self->{children}[$y][$x] = $child;	1596	$child->{c_rowspan} ||= 1;
		1597	$child->{c_colspan} ||= 1;
		1598	}
1292		1599
1293	$self->realloc;	1600	$self->SUPER::add (@widgets);
1294	}	1601	}
1295		1602
1296	sub remove {	1603	sub add_at {
		1604	my $self = shift;
		1605
		1606	my @widgets;
		1607
		1608	while (@_) {
		1609	my ($col, $row, $child) = splice @_, 0, 3, ();
		1610
		1611	$child->{c_row} = $row;
		1612	$child->{c_col} = $col;
		1613
		1614	push @widgets, $child;
		1615	}
		1616
		1617	$self->add (@widgets);
		1618	}
		1619
		1620	sub get_wh {
1297	my ($self, $child) = @_;	1621	my ($self) = @_;
1298		1622
1299	# TODO: not yet implemented	1623	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		1624
1306	my @children = $self->children;	1625	my @children = $self->children;
1307	delete $self->{children};	1626
		1627	# first pass, columns
		1628	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1629	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1630
		1631	my $sw = sum @w[$c .. $c + $cs - 1];
		1632
		1633	if ($w > $sw) {
		1634	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1635	}
1308		1636	}
1309	for (@children) {
1310	delete $_->{parent};
1311	$_->hide;
1312	}
1313		1637
1314	$self->realloc;	1638	# second pass, rows
1315	}	1639	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)};	1640	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1330		1641
1331	$w[$x] = max $w[$x], $w;	1642	my $sh = sum @h[$r .. $r + $rs - 1];
1332	$h[$y] = max $h[$y], $h;	1643
		1644	if ($h > $sh) {
		1645	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1333	}	1646	}
1334	}	1647	}
1335		1648
1336	(\@w, \@h)	1649	(\@w, \@h)
1337	}	1650	}
…		…
1353	my ($ws, $hs) = $self->get_wh;	1666	my ($ws, $hs) = $self->get_wh;
1354		1667
1355	my $req_w = (sum @$ws) || 1;	1668	my $req_w = (sum @$ws) || 1;
1356	my $req_h = (sum @$hs) || 1;	1669	my $req_h = (sum @$hs) || 1;
1357		1670
1358	# TODO: nicer code && do row_expand	1671	# now linearly scale the rows/columns to the allocated size
1359	my @col_expand = @{$self->{col_expand}};	1672	my @col_expand = @{$self->{col_expand}};
1360	@col_expand = (1) x @$ws unless @col_expand;	1673	@col_expand = (1) x @$ws unless @col_expand;
1361	my $col_expand = (sum @col_expand) || 1;	1674	my $col_expand = (sum @col_expand) || 1;
1362		1675
1363	# linearly scale sizes
1364	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1676	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366		1677
1367	CFClient::UI::harmonize $ws;	1678	CFPlus::UI::harmonize $ws;
		1679
		1680	my @row_expand = @{$self->{row_expand}};
		1681	@row_expand = (1) x @$ws unless @row_expand;
		1682	my $row_expand = (sum @row_expand) || 1;
		1683
		1684	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1685
1368	CFClient::UI::harmonize $hs;	1686	CFPlus::UI::harmonize $hs;
1369		1687
1370	my $y;	1688	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1689	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1371		1690
1372	for my $r (0 .. $#{$self->{children}}) {	1691	for my $widget ($self->children) {
1373	my $row = $self->{children}[$r]	1692	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		1693
1376	my $x = 0;	1694	$widget->configure (
1377	my $row_h = $hs->[$r];	1695	$x[$c], $y[$r],
		1696	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1378		1697	);
1379	for my $c (0 .. $#$row) {	1698	}
1380	my $col_w = $ws->[$c];
1381		1699
1382	if (my $widget = $row->[$c]) {	1700	1
1383	$widget->configure ($x, $y, $col_w, $row_h);	1701	}
1384	}
1385		1702
1386	$x += $col_w;	1703	#############################################################################
		1704
		1705	package CFPlus::UI::Fixed;
		1706
		1707	use List::Util qw(min max);
		1708
		1709	our @ISA = CFPlus::UI::Container::;
		1710
		1711	sub _scale($$$) {
		1712	my ($rel, $val, $max) = @_;
		1713
		1714	$rel ? $val * $max : $val
		1715	}
		1716
		1717	sub size_request {
		1718	my ($self) = @_;
		1719
		1720	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1721
		1722	# determine overall size by querying abs widgets
		1723	for my $child ($self->visible_children) {
		1724	unless ($child->{c_rel}) {
		1725	my $x = $child->{c_x};
		1726	my $y = $child->{c_y};
		1727
		1728	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1729	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1387	}	1730	}
		1731	}
1388		1732
1389	$y += $row_h;	1733	my $W = $x2 - $x1;
		1734	my $H = $y2 - $y1;
		1735
		1736	# now layout remaining widgets
		1737	for my $child ($self->visible_children) {
		1738	if ($child->{c_rel}) {
		1739	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1740	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1741
		1742	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1743	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1744	}
		1745	}
		1746
		1747	my $W = $x2 - $x1;
		1748	my $H = $y2 - $y1;
		1749
		1750	($W, $H)
		1751	}
		1752
		1753	sub invoke_size_allocate {
		1754	my ($self, $W, $H) = @_;
		1755
		1756	for my $child ($self->visible_children) {
		1757	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1758	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1759
		1760	$x += $child->{c_halign} * $child->{req_w};
		1761	$y += $child->{c_valign} * $child->{req_h};
		1762
		1763	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1390	}	1764	}
1391		1765
1392	1	1766	1
1393	}	1767	}
1394		1768
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	#############################################################################	1769	#############################################################################
1420		1770
1421	package CFClient::UI::Box;	1771	package CFPlus::UI::Box;
1422		1772
1423	our @ISA = CFClient::UI::Container::;	1773	our @ISA = CFPlus::UI::Container::;
1424		1774
1425	sub size_request {	1775	sub size_request {
1426	my ($self) = @_;	1776	my ($self) = @_;
		1777
		1778	my @children = $self->visible_children;
1427		1779
1428	$self->{vertical}	1780	$self->{vertical}
1429	? (	1781	? (
1430	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1782	(List::Util::max map $_->{req_w}, @children),
1431	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1783	(List::Util::sum map $_->{req_h}, @children),
1432	)	1784	)
1433	: (	1785	: (
1434	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1786	(List::Util::sum map $_->{req_w}, @children),
1435	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1787	(List::Util::max map $_->{req_h}, @children),
1436	)	1788	)
1437	}	1789	}
1438		1790
1439	sub invoke_size_allocate {	1791	sub invoke_size_allocate {
1440	my ($self, $w, $h) = @_;	1792	my ($self, $w, $h) = @_;
…		…
1461	$req[$_] += $space * $children[$_]{expand}	1813	$req[$_] += $space * $children[$_]{expand}
1462	for 0 .. $#children;	1814	for 0 .. $#children;
1463	}	1815	}
1464	}	1816	}
1465		1817
1466	CFClient::UI::harmonize \@req;	1818	CFPlus::UI::harmonize \@req;
1467		1819
1468	my $pos = 0;	1820	my $pos = 0;
1469	for (0 .. $#children) {	1821	for (0 .. $#children) {
1470	my $alloc = $req[$_];	1822	my $alloc = $req[$_];
1471	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1823	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1476	1	1828	1
1477	}	1829	}
1478		1830
1479	#############################################################################	1831	#############################################################################
1480		1832
1481	package CFClient::UI::HBox;	1833	package CFPlus::UI::HBox;
1482		1834
1483	our @ISA = CFClient::UI::Box::;	1835	our @ISA = CFPlus::UI::Box::;
1484		1836
1485	sub new {	1837	sub new {
1486	my $class = shift;	1838	my $class = shift;
1487		1839
1488	$class->SUPER::new (	1840	$class->SUPER::new (
…		…
1491	)	1843	)
1492	}	1844	}
1493		1845
1494	#############################################################################	1846	#############################################################################
1495		1847
1496	package CFClient::UI::VBox;	1848	package CFPlus::UI::VBox;
1497		1849
1498	our @ISA = CFClient::UI::Box::;	1850	our @ISA = CFPlus::UI::Box::;
1499		1851
1500	sub new {	1852	sub new {
1501	my $class = shift;	1853	my $class = shift;
1502		1854
1503	$class->SUPER::new (	1855	$class->SUPER::new (
…		…
1506	)	1858	)
1507	}	1859	}
1508		1860
1509	#############################################################################	1861	#############################################################################
1510		1862
1511	package CFClient::UI::Label;	1863	package CFPlus::UI::Label;
1512		1864
1513	our @ISA = CFClient::UI::DrawBG::;	1865	our @ISA = CFPlus::UI::DrawBG::;
1514		1866
1515	use CFClient::OpenGL;	1867	use CFPlus::OpenGL;
1516		1868
1517	sub new {	1869	sub new {
1518	my ($class, %arg) = @_;	1870	my ($class, %arg) = @_;
1519		1871
1520	my $self = $class->SUPER::new (	1872	my $self = $class->SUPER::new (
…		…
1523	#active_bg => none	1875	#active_bg => none
1524	#font => default_font	1876	#font => default_font
1525	#text => initial text	1877	#text => initial text
1526	#markup => initial narkup	1878	#markup => initial narkup
1527	#max_w => maximum pixel width	1879	#max_w => maximum pixel width
		1880	#style => 0, # render flags
1528	ellipsise => 3, # end	1881	ellipsise => 3, # end
1529	layout => (new CFClient::Layout),	1882	layout => (new CFPlus::Layout),
1530	fontsize => 1,	1883	fontsize => 1,
1531	align => -1,	1884	align => -1,
1532	valign => -1,	1885	valign => -1,
1533	padding_x => 2,	1886	padding_x => 2,
1534	padding_y => 2,	1887	padding_y => 2,
1535	can_events => 0,	1888	can_events => 0,
1536	%arg	1889	%arg
1537	);	1890	);
1538		1891
1539	if (exists $self->{template}) {	1892	if (exists $self->{template}) {
1540	my $layout = new CFClient::Layout;	1893	my $layout = new CFPlus::Layout;
1541	$layout->set_text (delete $self->{template});	1894	$layout->set_text (delete $self->{template});
1542	$self->{template} = $layout;	1895	$self->{template} = $layout;
1543	}	1896	}
1544		1897
1545	if (exists $self->{markup}) {	1898	if (exists $self->{markup}) {
…		…
1549	}	1902	}
1550		1903
1551	$self	1904	$self
1552	}	1905	}
1553		1906
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 {	1907	sub update {
1565	my ($self) = @_;	1908	my ($self) = @_;
1566		1909
1567	delete $self->{texture};	1910	delete $self->{texture};
1568	$self->SUPER::update;	1911	$self->SUPER::update;
…		…
1573		1916
1574	delete $self->{ox};	1917	delete $self->{ox};
1575	$self->SUPER::realloc;	1918	$self->SUPER::realloc;
1576	}	1919	}
1577		1920
		1921	sub clear {
		1922	my ($self) = @_;
		1923
		1924	$self->set_text ("");
		1925	}
		1926
1578	sub set_text {	1927	sub set_text {
1579	my ($self, $text) = @_;	1928	my ($self, $text) = @_;
1580		1929
1581	return if $self->{text} eq "T$text";	1930	return if $self->{text} eq "T$text";
1582	$self->{text} = "T$text";	1931	$self->{text} = "T$text";
1583		1932
1584	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585	$self->{layout}->set_text ($text);	1933	$self->{layout}->set_text ($text);
1586		1934
1587	delete $self->{size_req};	1935	delete $self->{size_req};
1588	$self->realloc;	1936	$self->realloc;
1589	$self->update;	1937	$self->update;
…		…
1595	return if $self->{text} eq "M$markup";	1943	return if $self->{text} eq "M$markup";
1596	$self->{text} = "M$markup";	1944	$self->{text} = "M$markup";
1597		1945
1598	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1946	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599		1947
1600	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601	$self->{layout}->set_markup ($markup);	1948	$self->{layout}->set_markup ($markup);
1602		1949
1603	delete $self->{size_req};	1950	delete $self->{size_req};
1604	$self->realloc;	1951	$self->realloc;
1605	$self->update;	1952	$self->update;
…		…
1607		1954
1608	sub size_request {	1955	sub size_request {
1609	my ($self) = @_;	1956	my ($self) = @_;
1610		1957
1611	$self->{size_req} ||= do {	1958	$self->{size_req} ||= do {
		1959	my ($max_w, $max_h) = $self->get_max_wh;
		1960
1612	$self->{layout}->set_font ($self->{font}) if $self->{font};	1961	$self->{layout}->set_font ($self->{font}) if $self->{font};
1613	$self->{layout}->set_width ($self->{max_w} || -1);	1962	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1614	$self->{layout}->set_ellipsise ($self->{ellipsise});	1963	$self->{layout}->set_ellipsise ($self->{ellipsise});
1615	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1964	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1616	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1965	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1617		1966
1618	my ($w, $h) = $self->{layout}->size;	1967	my ($w, $h) = $self->{layout}->size;
1619		1968
1620	if (exists $self->{template}) {	1969	if (exists $self->{template}) {
1621	$self->{template}->set_font ($self->{font}) if $self->{font};	1970	$self->{template}->set_font ($self->{font}) if $self->{font};
		1971	$self->{template}->set_width ($self->{max_w} || -1);
1622	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1972	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623		1973
1624	my ($w2, $h2) = $self->{template}->size;	1974	my ($w2, $h2) = $self->{template}->size;
1625		1975
1626	$w = List::Util::max $w, $w2;	1976	$w = List::Util::max $w, $w2;
…		…
1631	};	1981	};
1632		1982
1633	@{ $self->{size_req} }	1983	@{ $self->{size_req} }
1634	}	1984	}
1635		1985
		1986	sub baseline_shift {
		1987	$_[0]{layout}->descent
		1988	}
		1989
1636	sub invoke_size_allocate {	1990	sub invoke_size_allocate {
1637	my ($self, $w, $h) = @_;	1991	my ($self, $w, $h) = @_;
1638		1992
1639	delete $self->{ox};	1993	delete $self->{ox};
1640		1994
…		…
1646		2000
1647	sub set_fontsize {	2001	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	2002	my ($self, $fontsize) = @_;
1649		2003
1650	$self->{fontsize} = $fontsize;	2004	$self->{fontsize} = $fontsize;
		2005	delete $self->{size_req};
1651	delete $self->{texture};	2006	delete $self->{texture};
1652		2007
1653	$self->realloc;	2008	$self->realloc;
1654	}	2009	}
1655		2010
1656	sub reconfigure {	2011	sub reconfigure {
1657	my ($self) = @_;	2012	my ($self) = @_;
1658		2013
1659	delete $self->{size_req};	2014	delete $self->{size_req};
		2015	delete $self->{texture};
1660		2016
1661	$self->SUPER::reconfigure;	2017	$self->SUPER::reconfigure;
1662	}	2018	}
1663		2019
1664	sub _draw {	2020	sub _draw {
1665	my ($self) = @_;	2021	my ($self) = @_;
1666		2022
1667	$self->SUPER::_draw; # draw background, if applicable	2023	$self->SUPER::_draw; # draw background, if applicable
1668		2024
1669	my $tex = $self->{texture} ||= do {	2025	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	2026	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	2027	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	2028	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	2029	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2030	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2031	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		2032
1677	new_from_layout CFClient::Texture $self->{layout}	2033	[$self->{layout}->size]
1678	};	2034	};
1679		2035
1680	unless (exists $self->{ox}) {	2036	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2037	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2038	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	2039	: ($self->{w} - $size->[0]) * 0.5);
1684		2040
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2041	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2042	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	2043	: ($self->{h} - $size->[1]) * 0.5);
		2044
		2045	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1688	};	2046	};
1689		2047
1690	glEnable GL_TEXTURE_2D;	2048	# unless ($self->{list}) {
1691		2049	# $self->{list} = CFPlus::OpenGL::glGenList;
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2050	# CFPlus::OpenGL::glNewList $self->{list};
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2051	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1694		2052	# 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	}	2053	# }
		2054	#
		2055	# CFPlus::OpenGL::glCallList $self->{list};
1703		2056
1704	glDisable GL_TEXTURE_2D;	2057	$self->{layout}->draw;
1705	}	2058	}
		2059
		2060	#sub destroy {
		2061	# my ($self) = @_;
		2062	#
		2063	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2064	#
		2065	# $self->SUPER::destroy;
		2066	#}
1706		2067
1707	#############################################################################	2068	#############################################################################
1708		2069
1709	package CFClient::UI::EntryBase;	2070	package CFPlus::UI::EntryBase;
1710		2071
1711	our @ISA = CFClient::UI::Label::;	2072	our @ISA = CFPlus::UI::Label::;
1712		2073
1713	use CFClient::OpenGL;	2074	use CFPlus::OpenGL;
1714		2075
1715	sub new {	2076	sub new {
1716	my $class = shift;	2077	my $class = shift;
1717		2078
1718	$class->SUPER::new (	2079	$class->SUPER::new (
1719	fg => [1, 1, 1],	2080	fg => [1, 1, 1],
1720	bg => [0, 0, 0, 0.2],	2081	bg => [0, 0, 0, 0.2],
		2082	outline => [0.6, 0.3, 0.1],
1721	active_bg => [1, 1, 1, 0.5],	2083	active_bg => [0, 0, 1, .2],
1722	active_fg => [0, 0, 0],	2084	active_fg => [1, 1, 1],
		2085	active_outline => [1, 1, 0],
1723	can_hover => 1,	2086	can_hover => 1,
1724	can_focus => 1,	2087	can_focus => 1,
1725	valign => 0,	2088	valign => 0,
1726	can_events => 1,	2089	can_events => 1,
		2090	ellipsise => 0,
1727	#text => ...	2091	#text => ...
1728	#hidden => "*",	2092	#hidden => "*",
1729	@_	2093	@_
1730	)	2094	)
1731	}	2095	}
…		…
1776	my $sym = $ev->{sym};	2140	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	2141	my $uni = $ev->{unicode};
1778		2142
1779	my $text = $self->get_text;	2143	my $text = $self->get_text;
1780		2144
		2145	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2146
1781	if ($uni == 8) {	2147	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2148	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	2149	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	2150	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	2151	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	2152	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	2153	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	2154	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} elsif ($sym == CFClient::SDLK_HOME) {	2155	} elsif ($sym == CFPlus::SDLK_HOME) {
		2156	# what a hack
		2157	$self->{cursor} =
		2158	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2159	? length $1
		2160	: 0;
		2161	} elsif ($sym == CFPlus::SDLK_END) {
		2162	# uh, again
		2163	$self->{cursor} =
		2164	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2165	? $self->{cursor} + length $1
		2166	: length $self->{text};
		2167	} elsif ($uni == 21) { # ctrl-u
		2168	$text = "";
1790	$self->{cursor} = 0;	2169	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {
1792	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	2170	} elsif ($uni == 27) {
1794	$self->emit ('escape');	2171	$self->emit ('escape');
1795	} elsif ($uni) {	2172	} elsif ($uni == 0x0d) {
		2173	substr $text, $self->{cursor}++, 0, "\012";
		2174	} elsif ($uni >= 0x20) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	2175	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	2176	} else {
1798	return 0;	2177	return 0;
1799	}	2178	}
1800		2179
1801	$self->_set_text ($text);	2180	$self->_set_text ($text);
1802		2181
1803	$self->realloc;	2182	$self->realloc;
		2183	$self->update;
1804		2184
1805	1	2185	1
1806	}	2186	}
1807		2187
1808	sub invoke_focus_in {	2188	sub invoke_focus_in {
…		…
1820		2200
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	2201	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		2202
1823	# byte-index to char-index	2203	# byte-index to char-index
1824	my $text = $self->{text};	2204	my $text = $self->{text};
1825	utf8::encode $text;	2205	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	2206	$self->{cursor} = length $text;
1827		2207
1828	$self->_set_text ($self->{text});	2208	$self->_set_text ($self->{text});
1829	$self->update;	2209	$self->update;
1830		2210
1831	1	2211	1
…		…
1850	glColor_premultiply @{$self->{bg}};	2230	glColor_premultiply @{$self->{bg}};
1851	}	2231	}
1852		2232
1853	glEnable GL_BLEND;	2233	glEnable GL_BLEND;
1854	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2234	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};	2235	glRect 0, 0, $self->{w}, $self->{h};
1859	glVertex $self->{w}, 0;
1860	glEnd;
1861	glDisable GL_BLEND;	2236	glDisable GL_BLEND;
1862		2237
1863	$self->SUPER::_draw;	2238	$self->SUPER::_draw;
1864		2239
1865	#TODO: force update every cursor change :(	2240	#TODO: force update every cursor change :(
…		…
1867		2242
1868	unless (exists $self->{cur_h}) {	2243	unless (exists $self->{cur_h}) {
1869	my $text = substr $self->{text}, 0, $self->{cursor};	2244	my $text = substr $self->{text}, 0, $self->{cursor};
1870	utf8::encode $text;	2245	utf8::encode $text;
1871		2246
1872	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2247	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1873	}	2248	}
1874		2249
1875	glColor @{$self->{fg}};	2250	glColor_premultiply @{$self->{active_fg}};
1876	glBegin GL_LINES;	2251	glBegin GL_LINES;
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2252	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1878	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2253	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	2254	glEnd;
1880	}
1881	}
1882		2255
		2256	glLineWidth 3;
		2257	glColor @{$self->{active_outline}};
		2258	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2259	glLineWidth 1;
		2260
		2261	} else {
		2262	glColor @{$self->{outline}};
		2263	glBegin GL_LINE_STRIP;
		2264	glVertex .5, $self->{h} * .5;
		2265	glVertex .5, $self->{h} - 2.5;
		2266	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2267	glVertex $self->{w} - .5, $self->{h} * .5;
		2268	glEnd;
		2269	}
		2270	}
		2271
		2272	#############################################################################
		2273
1883	package CFClient::UI::Entry;	2274	package CFPlus::UI::Entry;
1884		2275
1885	our @ISA = CFClient::UI::EntryBase::;	2276	our @ISA = CFPlus::UI::EntryBase::;
1886		2277
1887	use CFClient::OpenGL;	2278	use CFPlus::OpenGL;
1888		2279
1889	sub invoke_key_down {	2280	sub invoke_key_down {
1890	my ($self, $ev) = @_;	2281	my ($self, $ev) = @_;
1891		2282
1892	my $sym = $ev->{sym};	2283	my $sym = $ev->{sym};
1893		2284
1894	if ($sym == 13) {	2285	if ($ev->{uni} == 0x0d || $sym == 13) {
1895	unshift @{$self->{history}},	2286	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	2287	my $txt = $self->get_text;
1897		2288
1898	$self->{history_pointer} = -1;	2289	$self->{history_pointer} = -1;
1899	$self->{history_saveback} = '';	2290	$self->{history_saveback} = '';
1900	$self->emit (activate => $txt);	2291	$self->emit (activate => $txt);
1901	$self->update;	2292	$self->update;
1902		2293
1903	} elsif ($sym == CFClient::SDLK_UP) {	2294	} elsif ($sym == CFPlus::SDLK_UP) {
1904	if ($self->{history_pointer} < 0) {	2295	if ($self->{history_pointer} < 0) {
1905	$self->{history_saveback} = $self->get_text;	2296	$self->{history_saveback} = $self->get_text;
1906	}	2297	}
1907	if (@{$self->{history} || []} > 0) {	2298	if (@{$self->{history} || []} > 0) {
1908	$self->{history_pointer}++;	2299	$self->{history_pointer}++;
…		…
1910	$self->{history_pointer} = @{$self->{history} || []} - 1;	2301	$self->{history_pointer} = @{$self->{history} || []} - 1;
1911	}	2302	}
1912	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2303	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1913	}	2304	}
1914		2305
1915	} elsif ($sym == CFClient::SDLK_DOWN) {	2306	} elsif ($sym == CFPlus::SDLK_DOWN) {
1916	$self->{history_pointer}--;	2307	$self->{history_pointer}--;
1917	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2308	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918		2309
1919	if ($self->{history_pointer} >= 0) {	2310	if ($self->{history_pointer} >= 0) {
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2311	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1929	1	2320	1
1930	}	2321	}
1931		2322
1932	#############################################################################	2323	#############################################################################
1933		2324
		2325	package CFPlus::UI::TextEdit;
		2326
		2327	our @ISA = CFPlus::UI::EntryBase::;
		2328
		2329	use CFPlus::OpenGL;
		2330
		2331	sub move_cursor_ver {
		2332	my ($self, $dy) = @_;
		2333
		2334	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2335
		2336	$y += $dy;
		2337
		2338	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2339	$self->{cursor} = $index;
		2340	delete $self->{cur_h};
		2341	$self->update;
		2342	return;
		2343	}
		2344	}
		2345
		2346	sub invoke_key_down {
		2347	my ($self, $ev) = @_;
		2348
		2349	my $sym = $ev->{sym};
		2350
		2351	if ($sym == CFPlus::SDLK_UP) {
		2352	$self->move_cursor_ver (-1);
		2353	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2354	$self->move_cursor_ver (+1);
		2355	} else {
		2356	return $self->SUPER::invoke_key_down ($ev)
		2357	}
		2358
		2359	1
		2360	}
		2361
		2362	#############################################################################
		2363
1934	package CFClient::UI::Button;	2364	package CFPlus::UI::ButtonBin;
1935		2365
1936	our @ISA = CFClient::UI::Label::;	2366	our @ISA = CFPlus::UI::Bin::;
1937		2367
1938	use CFClient::OpenGL;	2368	use CFPlus::OpenGL;
1939		2369
1940	my @tex =	2370	my @tex =
1941	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2371	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942	qw(b1_button_active.png);	2372	qw(b1_button_inactive.png b1_button_active.png);
1943		2373
1944	sub new {	2374	sub new {
1945	my $class = shift;	2375	my $class = shift;
1946		2376
1947	$class->SUPER::new (	2377	$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,	2378	can_hover => 1,
1953	align => 0,	2379	align => 0,
1954	valign => 0,	2380	valign => 0,
1955	can_events => 1,	2381	can_events => 1,
1956	@_	2382	@_
…		…
1968	}	2394	}
1969		2395
1970	sub _draw {	2396	sub _draw {
1971	my ($self) = @_;	2397	my ($self) = @_;
1972		2398
1973	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1974
1975	glEnable GL_TEXTURE_2D;	2399	glEnable GL_TEXTURE_2D;
1976	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1977	glColor 0, 0, 0, 1;	2401	glColor 0, 0, 0, 1;
1978		2402
		2403	my $tex = $tex[$GRAB == $self];
1979	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2404	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1980		2405
1981	glDisable GL_TEXTURE_2D;	2406	glDisable GL_TEXTURE_2D;
1982		2407
1983	$self->SUPER::_draw;	2408	$self->SUPER::_draw;
1984	}	2409	}
1985		2410
1986	#############################################################################	2411	#############################################################################
1987		2412
		2413	package CFPlus::UI::Button;
		2414
		2415	our @ISA = CFPlus::UI::Label::;
		2416
		2417	use CFPlus::OpenGL;
		2418
		2419	my @tex =
		2420	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2421	qw(b1_button_inactive.png b1_button_active.png);
		2422
		2423	sub new {
		2424	my $class = shift;
		2425
		2426	$class->SUPER::new (
		2427	padding_x => 4,
		2428	padding_y => 4,
		2429	fg => [1.0, 1.0, 1.0],
		2430	active_fg => [0.8, 0.8, 0.8],
		2431	can_hover => 1,
		2432	align => 0,
		2433	valign => 0,
		2434	can_events => 1,
		2435	@_
		2436	)
		2437	}
		2438
		2439	sub invoke_button_up {
		2440	my ($self, $ev, $x, $y) = @_;
		2441
		2442	$self->emit ("activate")
		2443	if $x >= 0 && $x < $self->{w}
		2444	&& $y >= 0 && $y < $self->{h};
		2445
		2446	1
		2447	}
		2448
		2449	sub _draw {
		2450	my ($self) = @_;
		2451
		2452	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2453
		2454	glEnable GL_TEXTURE_2D;
		2455	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2456	glColor 0, 0, 0, 1;
		2457
		2458	my $tex = $tex[$GRAB == $self];
		2459	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2460
		2461	glDisable GL_TEXTURE_2D;
		2462
		2463	$self->SUPER::_draw;
		2464	}
		2465
		2466	#############################################################################
		2467
		2468	package CFPlus::UI::CheckBox;
		2469
		2470	our @ISA = CFPlus::UI::DrawBG::;
		2471
		2472	my @tex =
		2473	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2474	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2475
		2476	use CFPlus::OpenGL;
		2477
		2478	sub new {
		2479	my $class = shift;
		2480
		2481	$class->SUPER::new (
		2482	padding_x => 2,
		2483	padding_y => 2,
		2484	fg => [1, 1, 1],
		2485	active_fg => [1, 1, 0],
		2486	bg => [0, 0, 0, 0.2],
		2487	active_bg => [1, 1, 1, 0.5],
		2488	state => 0,
		2489	can_hover => 1,
		2490	@_
		2491	)
		2492	}
		2493
		2494	sub size_request {
		2495	my ($self) = @_;
		2496
		2497	(6) x 2
		2498	}
		2499
		2500	sub toggle {
		2501	my ($self) = @_;
		2502
		2503	$self->{state} = !$self->{state};
		2504	$self->emit (changed => $self->{state});
		2505	$self->update;
		2506	}
		2507
		2508	sub invoke_button_down {
		2509	my ($self, $ev, $x, $y) = @_;
		2510
		2511	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2512	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2513	$self->toggle;
		2514	} else {
		2515	return 0
		2516	}
		2517
		2518	1
		2519	}
		2520
		2521	sub _draw {
		2522	my ($self) = @_;
		2523
		2524	$self->SUPER::_draw;
		2525
		2526	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
		2527
		2528	my ($w, $h) = @$self{qw(w h)};
		2529
		2530	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2531
		2532	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2533
		2534	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2535
		2536	glEnable GL_TEXTURE_2D;
		2537	$tex->draw_quad_alpha (0, 0, $s, $s);
		2538	glDisable GL_TEXTURE_2D;
		2539	}
		2540
		2541	#############################################################################
		2542
		2543	package CFPlus::UI::Image;
		2544
		2545	our @ISA = CFPlus::UI::Base::;
		2546
		2547	use CFPlus::OpenGL;
		2548
		2549	our %texture_cache;
		2550
		2551	sub new {
		2552	my $class = shift;
		2553
		2554	my $self = $class->SUPER::new (
		2555	can_events => 0,
		2556	scale => 1,
		2557	@_,
		2558	);
		2559
		2560	$self->{path} || $self->{tex}
		2561	or Carp::croak "'path' or 'tex' attributes required";
		2562
		2563	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2564	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2565
		2566	CFPlus::weaken $texture_cache{$self->{path}};
		2567
		2568	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2569
		2570	$self
		2571	}
		2572
		2573	sub STORABLE_freeze {
		2574	my ($self, $cloning) = @_;
		2575
		2576	$self->{path}
		2577	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2578
		2579	$self->{path}
		2580	}
		2581
		2582	sub STORABLE_attach {
		2583	my ($self, $cloning, $path) = @_;
		2584
		2585	$self->new (path => $path)
		2586	}
		2587
		2588	sub size_request {
		2589	my ($self) = @_;
		2590
		2591	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
		2592	}
		2593
		2594	sub _draw {
		2595	my ($self) = @_;
		2596
		2597	my $tex = $self->{tex};
		2598
		2599	my ($w, $h) = ($self->{w}, $self->{h});
		2600
		2601	if ($self->{rot90}) {
		2602	glRotate 90, 0, 0, 1;
		2603	glTranslate 0, -$self->{w}, 0;
		2604
		2605	($w, $h) = ($h, $w);
		2606	}
		2607
		2608	glEnable GL_TEXTURE_2D;
		2609	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2610
		2611	$tex->draw_quad_alpha (0, 0, $w, $h);
		2612
		2613	glDisable GL_TEXTURE_2D;
		2614	}
		2615
		2616	#############################################################################
		2617
1988	package CFClient::UI::ImageButton;	2618	package CFPlus::UI::ImageButton;
1989		2619
1990	our @ISA = CFClient::UI::Image::;	2620	our @ISA = CFPlus::UI::Image::;
1991		2621
1992	use CFClient::OpenGL;	2622	use CFPlus::OpenGL;
1993		2623
1994	my %textures;	2624	my %textures;
1995		2625
1996	sub new {	2626	sub new {
1997	my $class = shift;	2627	my $class = shift;
…		…
2007	can_events => 1,	2637	can_events => 1,
2008	@_	2638	@_
2009	);	2639	);
2010	}	2640	}
2011		2641
		2642	sub invoke_button_down {
		2643	my ($self, $ev, $x, $y) = @_;
		2644
		2645	1
		2646	}
		2647
2012	sub invoke_button_up {	2648	sub invoke_button_up {
2013	my ($self, $ev, $x, $y) = @_;	2649	my ($self, $ev, $x, $y) = @_;
2014		2650
2015	$self->emit ("activate")	2651	$self->emit ("activate")
2016	if $x >= 0 && $x < $self->{w}	2652	if $x >= 0 && $x < $self->{w}
…		…
2019	1	2655	1
2020	}	2656	}
2021		2657
2022	#############################################################################	2658	#############################################################################
2023		2659
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;	2660	package CFPlus::UI::VGauge;
2093		2661
2094	our @ISA = CFClient::UI::Base::;	2662	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		2663
2155	use List::Util qw(min max);	2664	use List::Util qw(min max);
2156		2665
2157	use CFClient::OpenGL;	2666	use CFPlus::OpenGL;
2158		2667
2159	my %tex = (	2668	my %tex = (
2160	food => [	2669	food => [
2161	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2670	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2162	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2671	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2163	],	2672	],
2164	grace => [	2673	grace => [
2165	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2674	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/	2675	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2167	],	2676	],
2168	hp => [	2677	hp => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2678	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2679	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2171	],	2680	],
2172	mana => [	2681	mana => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2682	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/	2683	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2175	],	2684	],
2176	);	2685	);
2177		2686
2178	# eg. VGauge->new (gauge => 'food'), default gauge: food	2687	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2238	my $ycut1 = max 0, min 1, $ycut;	2747	my $ycut1 = max 0, min 1, $ycut;
2239	my $ycut2 = max 0, min 1, $ycut - 1;	2748	my $ycut2 = max 0, min 1, $ycut - 1;
2240		2749
2241	my $h1 = $self->{h} * (1 - $ycut1);	2750	my $h1 = $self->{h} * (1 - $ycut1);
2242	my $h2 = $self->{h} * (1 - $ycut2);	2751	my $h2 = $self->{h} * (1 - $ycut2);
		2752	my $h3 = $self->{h};
		2753
		2754	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243		2755
2244	glEnable GL_BLEND;	2756	glEnable GL_BLEND;
2245	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2757	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2758	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247	glEnable GL_TEXTURE_2D;	2759	glEnable GL_TEXTURE_2D;
…		…
2266		2778
2267	if ($t3) {	2779	if ($t3) {
2268	glBindTexture GL_TEXTURE_2D, $t3->{name};	2780	glBindTexture GL_TEXTURE_2D, $t3->{name};
2269	glBegin GL_QUADS;	2781	glBegin GL_QUADS;
2270	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2782	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2783	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2784	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2785	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274	glEnd;	2786	glEnd;
2275	}	2787	}
2276		2788
2277	glDisable GL_BLEND;	2789	glDisable GL_BLEND;
2278	glDisable GL_TEXTURE_2D;	2790	glDisable GL_TEXTURE_2D;
2279	}	2791	}
2280		2792
2281	#############################################################################	2793	#############################################################################
2282		2794
		2795	package CFPlus::UI::Progress;
		2796
		2797	our @ISA = CFPlus::UI::Label::;
		2798
		2799	use CFPlus::OpenGL;
		2800
		2801	sub new {
		2802	my ($class, %arg) = @_;
		2803
		2804	my $self = $class->SUPER::new (
		2805	fg => [1, 1, 1],
		2806	bg => [0, 0, 1, 0.2],
		2807	bar => [0.7, 0.5, 0.1, 0.8],
		2808	outline => [0.4, 0.3, 0],
		2809	fontsize => 0.9,
		2810	valign => 0,
		2811	align => 0,
		2812	can_events => 1,
		2813	ellipsise => 1,
		2814	label => "%d%%",
		2815	%arg,
		2816	);
		2817
		2818	$self->set_value ($arg{value} || -1);
		2819
		2820	$self
		2821	}
		2822
		2823	sub set_label {
		2824	my ($self, $label) = @_;
		2825
		2826	return if $self->{label} eq $label;
		2827	$self->{label} = $label;
		2828
		2829	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2830	}
		2831
		2832	sub set_value {
		2833	my ($self, $value) = @_;
		2834
		2835	if ($self->{value} ne $value) {
		2836	$self->{value} = $value;
		2837
		2838	if ($value < 0) {
		2839	$self->set_text ("-");
		2840	} else {
		2841	$self->set_text (sprintf $self->{label}, $value * 100);
		2842	}
		2843
		2844	$self->update;
		2845	}
		2846	}
		2847
		2848	sub _draw {
		2849	my ($self) = @_;
		2850
		2851	glEnable GL_BLEND;
		2852	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2853
		2854	if ($self->{value} >= 0) {
		2855	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2856
		2857	glColor_premultiply @{$self->{bar}};
		2858	glRect 2, 2, $s, $self->{h} - 2;
		2859	glColor_premultiply @{$self->{bg}};
		2860	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2861	}
		2862
		2863	glColor_premultiply @{$self->{outline}};
		2864	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2865
		2866	glDisable GL_BLEND;
		2867
		2868	{
		2869	local $self->{bg}; # do not draw background
		2870	$self->SUPER::_draw;
		2871	}
		2872	}
		2873
		2874	#############################################################################
		2875
		2876	package CFPlus::UI::ExperienceProgress;
		2877
		2878	our @ISA = CFPlus::UI::Progress::;
		2879
		2880	sub new {
		2881	my ($class, %arg) = @_;
		2882
		2883	my $self = $class->SUPER::new (
		2884	tooltip => sub {
		2885	my ($self) = @_;
		2886
		2887	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2888	$self->{lvl},
		2889	::formsep ($self->{exp}),
		2890	::formsep ($self->{nxt}),
		2891	::formsep ($self->{nxt} - $self->{exp}),
		2892	},
		2893	%arg
		2894	);
		2895
		2896	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2897	if $::CONN;
		2898
		2899	$self
		2900	}
		2901
		2902	sub DESTROY {
		2903	my ($self) = @_;
		2904
		2905	delete $::CONN->{on_exp_update}{$self+0}
		2906	if $::CONN;
		2907
		2908	$self->SUPER::DESTROY;
		2909	}
		2910
		2911	sub set_value {
		2912	my ($self, $lvl, $exp) = @_;
		2913
		2914	$self->{lvl} = $lvl;
		2915	$self->{exp} = $exp;
		2916
		2917	my $v = -1;
		2918
		2919	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2920	my $l0 = $table->[$lvl - 1];
		2921	my $l1 = $table->[$lvl];
		2922
		2923	$self->{nxt} = $l1;
		2924
		2925	$v = ($exp - $l0) / ($l1 - $l0);
		2926	}
		2927
		2928	$self->SUPER::set_value ($v);
		2929	}
		2930
		2931	#############################################################################
		2932
2283	package CFClient::UI::Gauge;	2933	package CFPlus::UI::Gauge;
2284		2934
2285	our @ISA = CFClient::UI::VBox::;	2935	our @ISA = CFPlus::UI::VBox::;
2286		2936
2287	sub new {	2937	sub new {
2288	my ($class, %arg) = @_;	2938	my ($class, %arg) = @_;
2289		2939
2290	my $self = $class->SUPER::new (	2940	my $self = $class->SUPER::new (
…		…
2292	can_hover => 1,	2942	can_hover => 1,
2293	can_events => 1,	2943	can_events => 1,
2294	%arg,	2944	%arg,
2295	);	2945	);
2296		2946
2297	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2947	$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);	2948	$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");	2949	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2300		2950
2301	$self	2951	$self
2302	}	2952	}
2303		2953
2304	sub set_fontsize {	2954	sub set_fontsize {
…		…
2325	$self->{value}->set_text ($val);	2975	$self->{value}->set_text ($val);
2326	}	2976	}
2327		2977
2328	#############################################################################	2978	#############################################################################
2329		2979
2330	package CFClient::UI::Slider;	2980	package CFPlus::UI::Slider;
2331		2981
2332	use strict;	2982	use strict;
2333		2983
2334	use CFClient::OpenGL;	2984	use CFPlus::OpenGL;
2335		2985
2336	our @ISA = CFClient::UI::DrawBG::;	2986	our @ISA = CFPlus::UI::DrawBG::;
2337		2987
2338	my @tex =	2988	my @tex =
2339	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2989	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2340	qw(s1_slider.png s1_slider_bg.png);	2990	qw(s1_slider.png s1_slider_bg.png);
2341		2991
2342	sub new {	2992	sub new {
2343	my $class = shift;	2993	my $class = shift;
2344		2994
…		…
2412		3062
2413	$self->SUPER::invoke_button_down ($ev, $x, $y);	3063	$self->SUPER::invoke_button_down ($ev, $x, $y);
2414		3064
2415	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3065	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2416		3066
2417	$self->invoke_mouse_motion ($ev, $x, $y)	3067	$self->invoke_mouse_motion ($ev, $x, $y);
		3068
		3069	1
2418	}	3070	}
2419		3071
2420	sub invoke_mouse_motion {	3072	sub invoke_mouse_motion {
2421	my ($self, $ev, $x, $y) = @_;	3073	my ($self, $ev, $x, $y) = @_;
2422		3074
…		…
2429		3081
2430	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3082	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2431	} else {	3083	} else {
2432	return 0;	3084	return 0;
2433	}	3085	}
		3086
		3087	1
		3088	}
		3089
		3090	sub invoke_mouse_wheel {
		3091	my ($self, $ev) = @_;
		3092
		3093	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		3094
		3095	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3096
		3097	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2434		3098
2435	1	3099	1
2436	}	3100	}
2437		3101
2438	sub update {	3102	sub update {
…		…
2489	glDisable GL_TEXTURE_2D;	3153	glDisable GL_TEXTURE_2D;
2490	}	3154	}
2491		3155
2492	#############################################################################	3156	#############################################################################
2493		3157
2494	package CFClient::UI::ValSlider;	3158	package CFPlus::UI::ValSlider;
2495		3159
2496	our @ISA = CFClient::UI::HBox::;	3160	our @ISA = CFPlus::UI::HBox::;
2497		3161
2498	sub new {	3162	sub new {
2499	my ($class, %arg) = @_;	3163	my ($class, %arg) = @_;
2500		3164
2501	my $range = delete $arg{range};	3165	my $range = delete $arg{range};
2502		3166
2503	my $self = $class->SUPER::new (	3167	my $self = $class->SUPER::new (
2504	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3168	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2505	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3169	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2506	to_value => sub { shift },	3170	to_value => sub { shift },
2507	from_value => sub { shift },	3171	from_value => sub { shift },
2508	%arg,	3172	%arg,
2509	);	3173	);
2510		3174
…		…
2530	sub set_range { shift->{slider}->set_range (@_) }	3194	sub set_range { shift->{slider}->set_range (@_) }
2531	sub set_value { shift->{slider}->set_value (@_) }	3195	sub set_value { shift->{slider}->set_value (@_) }
2532		3196
2533	#############################################################################	3197	#############################################################################
2534		3198
2535	package CFClient::UI::TextScroller;	3199	package CFPlus::UI::TextScroller;
2536		3200
2537	our @ISA = CFClient::UI::HBox::;	3201	our @ISA = CFPlus::UI::HBox::;
2538		3202
2539	use CFClient::OpenGL;	3203	use CFPlus::OpenGL;
2540		3204
2541	sub new {	3205	sub new {
2542	my $class = shift;	3206	my $class = shift;
2543		3207
2544	my $self = $class->SUPER::new (	3208	my $self = $class->SUPER::new (
2545	fontsize => 1,	3209	fontsize => 1,
2546	can_events => 0,	3210	can_events => 1,
2547	indent => 0,	3211	indent => 0,
2548	#font => default_font	3212	#font => default_font
2549	@_,	3213	@_,
2550		3214
2551	layout => (new CFClient::Layout 1),	3215	layout => (new CFPlus::Layout),
2552	par => [],	3216	par => [],
		3217	max_par => 0,
2553	height => 0,	3218	height => 0,
2554	children => [	3219	children => [
2555	(new CFClient::UI::Empty expand => 1),	3220	(new CFPlus::UI::Empty expand => 1),
2556	(new CFClient::UI::Slider vertical => 1),	3221	(new CFPlus::UI::Slider vertical => 1),
2557	],	3222	],
2558	);	3223	);
2559		3224
2560	$self->{children}[1]->connect (changed => sub { $self->update });	3225	$self->{children}[1]->connect (changed => sub { $self->update });
2561		3226
…		…
2567		3232
2568	$self->{fontsize} = $fontsize;	3233	$self->{fontsize} = $fontsize;
2569	$self->reflow;	3234	$self->reflow;
2570	}	3235	}
2571		3236
2572	sub visible_children {	3237	sub size_request {
2573	my ($self) = @_;	3238	my ($self) = @_;
2574		3239
2575	@{$self->{children}}[0,1]	3240	my ($empty, $slider) = $self->visible_children;
		3241
		3242	local $self->{children} = [$empty, $slider];
		3243	$self->SUPER::size_request
2576	}	3244	}
2577		3245
2578	sub invoke_size_allocate {	3246	sub invoke_size_allocate {
2579	my ($self, $w, $h) = @_;	3247	my ($self, $w, $h) = @_;
2580		3248
2581	my (undef, undef, @other) = @{ $self->{children} };	3249	my ($empty, $slider, @other) = @{ $self->{children} };
2582	$_->configure (@$_{qw(x y req_w req_h)}) for @other;	3250	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583		3251
2584	$self->{layout}->set_font ($self->{font}) if $self->{font};	3252	$self->{layout}->set_font ($self->{font}) if $self->{font};
2585	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3253	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586	$self->{layout}->set_width ($self->{children}[0]{w});	3254	$self->{layout}->set_width ($empty->{w});
2587	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3255	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588		3256
2589	$self->reflow;	3257	$self->reflow;
2590		3258
		3259	local $self->{children} = [$empty, $slider];
2591	$self->SUPER::invoke_size_allocate ($w, $h)	3260	$self->SUPER::invoke_size_allocate ($w, $h)
		3261	}
		3262
		3263	sub invoke_mouse_wheel {
		3264	my ($self, $ev) = @_;
		3265
		3266	return 0 unless $ev->{dy}; # only vertical movements
		3267
		3268	$self->{children}[1]->emit (mouse_wheel => $ev);
		3269
		3270	1
2592	}	3271	}
2593		3272
2594	sub get_layout {	3273	sub get_layout {
2595	my ($self, $para) = @_;	3274	my ($self, $para) = @_;
2596		3275
2597	my $layout = $self->{layout};	3276	my $layout = $self->{layout};
2598		3277
2599	$layout->set_font ($self->{font}) if $self->{font};	3278	$layout->set_font ($self->{font}) if $self->{font};
		3279	$layout->set_foreground (@{$para->{fg}});
2600	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3280	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601	$layout->set_width ($self->{children}[0]{w} - $para->{indent});	3281	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3282	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603	$layout->set_markup ($para->{markup});	3283	$layout->set_markup ($para->{markup});
2604	$layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});	3284
		3285	$layout->set_shapes (
		3286	map
		3287	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3288	@{$para->{widget}}
		3289	);
2605		3290
2606	$layout	3291	$layout
2607	}	3292	}
2608		3293
2609	sub reflow {	3294	sub reflow {
…		…
2616	sub set_offset {	3301	sub set_offset {
2617	my ($self, $offset) = @_;	3302	my ($self, $offset) = @_;
2618		3303
2619	# todo: base offset on lines or so, not on pixels	3304	# todo: base offset on lines or so, not on pixels
2620	$self->{children}[1]->set_value ($offset);	3305	$self->{children}[1]->set_value ($offset);
		3306	}
		3307
		3308	sub current_paragraph {
		3309	my ($self) = @_;
		3310
		3311	$self->{top_paragraph} - 1
		3312	}
		3313
		3314	sub scroll_to {
		3315	my ($self, $para) = @_;
		3316
		3317	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3318
		3319	$self->{scroll_to} = $para;
		3320	$self->update;
2621	}	3321	}
2622		3322
2623	sub clear {	3323	sub clear {
2624	my ($self) = @_;	3324	my ($self) = @_;
2625		3325
…		…
2630	$self->{height} = 0;	3330	$self->{height} = 0;
2631	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3331	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2632	}	3332	}
2633		3333
2634	sub add_paragraph {	3334	sub add_paragraph {
2635	my ($self, $color, $para, $indent) = @_;	3335	my $self = shift;
2636		3336
2637	my ($text, @w) = ref $para ? @$para : $para;	3337	for my $para (@_) {
2638
2639	$para = {	3338	$para = {
		3339	fg => [1, 1, 1, 1],
		3340	indent => 0,
		3341	markup => "",
		3342	widget => [],
		3343	ref $para ? %$para : (markup => $para),
2640	w => 1e10,	3344	w => 1e10,
2641	wrapped => 1,	3345	wrapped => 1,
2642	fg => $color,
2643	indent => $indent,
2644	markup => $text,
2645	widget => \@w,
2646	};	3346	};
2647		3347
2648	$self->add (@w) if @w;	3348	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2649	push @{$self->{par}}, $para;	3349	push @{$self->{par}}, $para;
		3350	}
		3351
		3352	if (my $max = $self->{max_par}) {
		3353	shift @{$self->{par}} while @{$self->{par}} > $max;
		3354	}
2650		3355
2651	$self->{need_reflow}++;	3356	$self->{need_reflow}++;
2652	$self->update;	3357	$self->update;
2653	}	3358	}
2654		3359
2655	sub scroll_to_bottom {	3360	sub scroll_to_bottom {
2656	my ($self) = @_;	3361	my ($self) = @_;
2657		3362
2658	$self->{scroll_to_bottom} = 1;	3363	$self->{scroll_to} = $#{$self->{par}};
2659	$self->update;	3364	$self->update;
2660	}	3365	}
2661		3366
		3367	sub force_uptodate {
		3368	my ($self) = @_;
		3369
		3370	if (delete $self->{need_reflow}) {
		3371	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3372
		3373	my $height = 0;
		3374
		3375	for my $para (@{$self->{par}}) {
		3376	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3377	my $layout = $self->get_layout ($para);
		3378	my ($w, $h) = $layout->size;
		3379
		3380	$para->{w} = $w + $para->{indent};
		3381	$para->{h} = $h;
		3382	$para->{wrapped} = $layout->has_wrapped;
		3383	}
		3384
		3385	$para->{y} = $height;
		3386	$height += $para->{h};
		3387	}
		3388
		3389	$self->{height} = $height;
		3390	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3391
		3392	delete $self->{texture};
		3393	}
		3394
		3395	if (my $paridx = delete $self->{scroll_to}) {
		3396	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3397	}
		3398	}
		3399
2662	sub update {	3400	sub update {
2663	my ($self) = @_;	3401	my ($self) = @_;
2664		3402
2665	$self->SUPER::update;	3403	$self->SUPER::update;
2666		3404
2667	return unless $self->{h} > 0;	3405	return unless $self->{h} > 0;
2668		3406
2669	delete $self->{texture};	3407	delete $self->{texture};
2670		3408
2671	$ROOT->on_post_alloc ($self => sub {	3409	$ROOT->on_post_alloc ($self => sub {
		3410	$self->force_uptodate;
		3411
2672	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3412	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2673		3413
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 {	3414	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2702	glClearColor 0, 0, 0, 0;	3415	glClearColor 0, 0, 0, 0;
2703	glClear GL_COLOR_BUFFER_BIT;	3416	glClear GL_COLOR_BUFFER_BIT;
2704		3417
		3418	package CFPlus::UI::Base;
		3419	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3420	(0, 0, $self->{w}, $self->{h});
		3421
		3422	my $top = int $self->{children}[1]{range}[0];
		3423
		3424	my $paridx = 0;
		3425	my $top_paragraph;
2705	my $top = int $self->{children}[1]{range}[0];	3426	my $top = int $self->{children}[1]{range}[0];
2706		3427
2707	my $y0 = $top;	3428	my $y0 = $top;
2708	my $y1 = $top + $H;	3429	my $y1 = $top + $H;
2709		3430
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}}) {	3431	for my $para (@{$self->{par}}) {
2717	my $h = $para->{h};	3432	my $h = $para->{h};
		3433	my $y = $para->{y};
2718		3434
2719	if ($y0 < $y + $h && $y < $y1) {	3435	if ($y0 < $y + $h && $y < $y1) {
2720
2721	my $layout = $self->get_layout ($para);	3436	my $layout = $self->get_layout ($para);
2722		3437
2723	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725	glRasterPos $para->{indent}, $y - $y0;	3438	$layout->render ($para->{indent}, $y - $y0);
2726	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3439	$layout->draw;
2727		3440
2728	if (my @w = @{ $para->{widget} }) {	3441	if (my @w = @{ $para->{widget} }) {
2729	my @s = $layout->get_shapes;	3442	my @s = $layout->get_shapes;
2730		3443
2731	for (@w) {	3444	for (@w) {
…		…
2737	$_->draw;	3450	$_->draw;
2738	}	3451	}
2739	}	3452	}
2740	}	3453	}
2741		3454
2742	$y += $h;	3455	$paridx++;
		3456	$top_paragraph ||= $paridx if $y >= $top;
2743	}	3457	}
2744		3458
2745	glDisable GL_BLEND;	3459	$self->{top_paragraph} = $top_paragraph;
2746	};	3460	};
2747	});	3461	});
2748	}	3462	}
2749		3463
2750	sub reconfigure {	3464	sub reconfigure {
…		…
2768	$self->{children}[1]->draw;	3482	$self->{children}[1]->draw;
2769	}	3483	}
2770		3484
2771	#############################################################################	3485	#############################################################################
2772		3486
2773	package CFClient::UI::Animator;	3487	package CFPlus::UI::Animator;
2774		3488
2775	use CFClient::OpenGL;	3489	use CFPlus::OpenGL;
2776		3490
2777	our @ISA = CFClient::UI::Bin::;	3491	our @ISA = CFPlus::UI::Bin::;
2778		3492
2779	sub moveto {	3493	sub moveto {
2780	my ($self, $x, $y) = @_;	3494	my ($self, $x, $y) = @_;
2781		3495
2782	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3496	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2810	glPopMatrix;	3524	glPopMatrix;
2811	}	3525	}
2812		3526
2813	#############################################################################	3527	#############################################################################
2814		3528
2815	package CFClient::UI::Flopper;	3529	package CFPlus::UI::Flopper;
2816		3530
2817	our @ISA = CFClient::UI::Button::;	3531	our @ISA = CFPlus::UI::Button::;
2818		3532
2819	sub new {	3533	sub new {
2820	my $class = shift;	3534	my $class = shift;
2821		3535
2822	my $self = $class->SUPER::new (	3536	my $self = $class->SUPER::new (
…		…
2834	$self->{other}->toggle_visibility;	3548	$self->{other}->toggle_visibility;
2835	}	3549	}
2836		3550
2837	#############################################################################	3551	#############################################################################
2838		3552
2839	package CFClient::UI::Tooltip;	3553	package CFPlus::UI::Tooltip;
2840		3554
2841	our @ISA = CFClient::UI::Bin::;	3555	our @ISA = CFPlus::UI::Bin::;
2842		3556
2843	use CFClient::OpenGL;	3557	use CFPlus::OpenGL;
2844		3558
2845	sub new {	3559	sub new {
2846	my $class = shift;	3560	my $class = shift;
2847		3561
2848	$class->SUPER::new (	3562	$class->SUPER::new (
…		…
2852	}	3566	}
2853		3567
2854	sub set_tooltip_from {	3568	sub set_tooltip_from {
2855	my ($self, $widget) = @_;	3569	my ($self, $widget) = @_;
2856		3570
2857	my $tooltip = $widget->{tooltip};	3571	my $tip = $widget->{tooltip};
		3572	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3573
		3574	$tip = CFPlus::Pod::section_label tooltip => $1
		3575	if $tip =~ /^#(.*)$/;
2858		3576
2859	if ($ENV{CFPLUS_DEBUG} & 2) {	3577	if ($ENV{CFPLUS_DEBUG} & 2) {
2860	$tooltip .= "\n\n" . (ref $widget) . "\n"	3578	$tip .= "\n\n" . (ref $widget) . "\n"
2861	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3579	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2862	. "req $widget->{req_w} $widget->{req_h}\n"	3580	. "req $widget->{req_w} $widget->{req_h}\n"
2863	. "visible $widget->{visible}";	3581	. "visible $widget->{visible}";
2864	}	3582	}
2865		3583
2866	$tooltip =~ s/^\n+//;	3584	$tip =~ s/^\n+//;
2867	$tooltip =~ s/\n+$//;	3585	$tip =~ s/\n+$//;
2868		3586
2869	$self->add (new CFClient::UI::Label	3587	$self->add (new CFPlus::UI::Label
2870	markup => $tooltip,	3588	markup => $tip,
2871	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3589	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2872	fontsize => 0.8,	3590	fontsize => 0.8,
2873	fg => [0, 0, 0, 1],	3591	style => 1, # FLAG_INVERSE
2874	ellipsise => 0,	3592	ellipsise => 0,
2875	font => ($widget->{tooltip_font} || $::FONT_PROP),	3593	font => ($widget->{tooltip_font} || $::FONT_PROP),
2876	);	3594	);
2877	}	3595	}
2878		3596
…		…
2897		3615
2898	$self->{root}->on_post_alloc ("move_$self" => sub {	3616	$self->{root}->on_post_alloc ("move_$self" => sub {
2899	my $widget = $self->{owner}	3617	my $widget = $self->{owner}
2900	or return;	3618	or return;
2901		3619
		3620	if ($widget->{visible}) {
2902	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3621	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2903		3622
2904	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3623	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2905	if $x + $self->{w} > $self->{root}{w};	3624	if $x + $self->{w} > $self->{root}{w};
2906		3625
2907	$self->move_abs ($x, $y);	3626	$self->move_abs ($x, $y);
		3627	} else {
		3628	$self->hide;
		3629	}
2908	});	3630	});
2909	}	3631	}
2910		3632
2911	sub _draw {	3633	sub _draw {
2912	my ($self) = @_;	3634	my ($self) = @_;
2913		3635
2914	glTranslate 0.375, 0.375;
2915
2916	my ($w, $h) = @$self{qw(w h)};	3636	my ($w, $h) = @$self{qw(w h)};
2917		3637
2918	glColor 1, 0.8, 0.4;	3638	glColor 1, 0.8, 0.4;
2919	glBegin GL_QUADS;	3639	glRect 0, 0, $w, $h;
2920	glVertex 0 , 0;
2921	glVertex 0 , $h;
2922	glVertex $w, $h;
2923	glVertex $w, 0;
2924	glEnd;
2925		3640
2926	glColor 0, 0, 0;	3641	glColor 0, 0, 0;
2927	glBegin GL_LINE_LOOP;	3642	glRect_lineloop .5, .5, $w + .5, $h + .5;
2928	glVertex 0 , 0;
2929	glVertex 0 , $h;
2930	glVertex $w, $h;
2931	glVertex $w, 0;
2932	glEnd;
2933		3643
2934	glTranslate 2 - 0.375, 2 - 0.375;	3644	glTranslate 2, 2;
2935		3645
2936	$self->SUPER::_draw;	3646	$self->SUPER::_draw;
2937	}	3647	}
2938		3648
2939	#############################################################################	3649	#############################################################################
2940		3650
2941	package CFClient::UI::Face;	3651	package CFPlus::UI::Face;
2942		3652
2943	our @ISA = CFClient::UI::Base::;	3653	our @ISA = CFPlus::UI::DrawBG::;
2944		3654
2945	use CFClient::OpenGL;	3655	use CFPlus::OpenGL;
2946		3656
2947	sub new {	3657	sub new {
2948	my $class = shift;	3658	my $class = shift;
2949		3659
2950	my $self = $class->SUPER::new (	3660	my $self = $class->SUPER::new (
		3661	size_w => 32,
		3662	size_h => 8,
2951	aspect => 1,	3663	aspect => 1,
2952	can_events => 0,	3664	can_events => 0,
2953	@_,	3665	@_,
2954	);	3666	);
2955		3667
2956	if ($self->{anim} && $self->{animspeed}) {	3668	if ($self->{anim} && $self->{animspeed}) {
2957	Scalar::Util::weaken (my $widget = $self);	3669	CFPlus::weaken (my $widget = $self);
2958		3670
		3671	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3672	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2959	$self->{timer} = Event->timer (	3673	$self->{timer} = Event->timer (
2960	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2961	hard => 1,	3674	parked => 1,
2962	interval => $self->{animspeed},
2963	cb => sub {	3675	cb => sub {
		3676	return unless $::CONN;
		3677
		3678	my $w = $widget
		3679	or return;
		3680
2964	++$widget->{frame};	3681	++$w->{frame};
		3682	$w->update_face;
		3683
		3684	# somehow, $widget can go away
2965	$widget->update;	3685	$w->update;
		3686	$w->update_timer;
2966	},	3687	},
2967	);	3688	);
		3689
		3690	$self->update_face;
		3691	$self->update_timer;
2968	}	3692	}
2969		3693
2970	$self	3694	$self
2971	}	3695	}
2972		3696
		3697	sub update_timer {
		3698	my ($self) = @_;
		3699
		3700	return unless $self->{timer};
		3701
		3702	if ($self->{visible}) {
		3703	$self->{timer}->at (
		3704	$self->{anim_start}
		3705	+ $self->{animspeed}
		3706	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3707	);
		3708	$self->{timer}->start;
		3709	} else {
		3710	$self->{timer}->stop;
		3711	}
		3712	}
		3713
		3714	sub update_face {
		3715	my ($self) = @_;
		3716
		3717	if ($::CONN) {
		3718	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3719	if ($anim && @$anim) {
		3720	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3721	delete $self->{face_change_cb};
		3722
		3723	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3724	unless ($tex->{name} || $tex->{loading}) {
		3725	$tex->upload (sub { $self->reconfigure });
		3726	}
		3727	}
		3728	}
		3729	}
		3730	}
		3731	}
		3732
2973	sub size_request {	3733	sub size_request {
2974	(32, 8)	3734	my ($self) = @_;
		3735
		3736	if ($::CONN) {
		3737	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3738	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3739	if ($tex->{name}) {
		3740	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3741	} elsif (!$tex->{loading}) {
		3742	$tex->upload (sub { $self->reconfigure });
		3743	}
		3744	}
		3745
		3746	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3747	}
		3748	}
		3749
		3750	($self->{size_w} || 8, $self->{size_h} || 8)
2975	}	3751	}
2976		3752
2977	sub update {	3753	sub update {
2978	my ($self) = @_;	3754	my ($self) = @_;
2979		3755
2980	return unless $self->{visible};	3756	return unless $self->{visible};
2981		3757
2982	$self->SUPER::update;	3758	$self->SUPER::update;
2983	}	3759	}
2984		3760
		3761	sub invoke_visibility_change {
		3762	my ($self) = @_;
		3763
		3764	$self->update_timer;
		3765
		3766	0
		3767	}
		3768
2985	sub _draw {	3769	sub _draw {
2986	my ($self) = @_;	3770	my ($self) = @_;
2987		3771
2988	return unless $::CONN;	3772	$self->SUPER::_draw;
2989		3773
2990	my $face;	3774	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;	3775	glEnable GL_TEXTURE_2D;
3003	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3776	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3004	glColor 0, 0, 0, 1;	3777	glColor 0, 0, 0, 1;
3005	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3778	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3006	glDisable GL_TEXTURE_2D;	3779	glDisable GL_TEXTURE_2D;
…		…
3008	}	3781	}
3009		3782
3010	sub destroy {	3783	sub destroy {
3011	my ($self) = @_;	3784	my ($self) = @_;
3012		3785
3013	$self->{timer}->cancel	3786	(delete $self->{timer})->cancel
3014	if $self->{timer};	3787	if $self->{timer};
3015		3788
3016	$self->SUPER::destroy;	3789	$self->SUPER::destroy;
3017	}	3790	}
3018		3791
3019	#############################################################################	3792	#############################################################################
3020		3793
3021	package CFClient::UI::Buttonbar;	3794	package CFPlus::UI::Buttonbar;
3022		3795
3023	our @ISA = CFClient::UI::HBox::;	3796	our @ISA = CFPlus::UI::HBox::;
3024		3797
3025	# TODO: should actualyl wrap buttons and other goodies.	3798	# TODO: should actually wrap buttons and other goodies.
3026		3799
3027	#############################################################################	3800	#############################################################################
3028		3801
3029	package CFClient::UI::Menu;	3802	package CFPlus::UI::Menu;
3030		3803
3031	our @ISA = CFClient::UI::FancyFrame::;	3804	our @ISA = CFPlus::UI::Toplevel::;
3032		3805
3033	use CFClient::OpenGL;	3806	use CFPlus::OpenGL;
3034		3807
3035	sub new {	3808	sub new {
3036	my $class = shift;	3809	my $class = shift;
3037		3810
3038	my $self = $class->SUPER::new (	3811	my $self = $class->SUPER::new (
3039	items => [],	3812	items => [],
3040	z => 100,	3813	z => 100,
3041	@_,	3814	@_,
3042	);	3815	);
3043		3816
3044	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3817	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3045		3818
3046	for my $item (@{ $self->{items} }) {	3819	for my $item (@{ $self->{items} }) {
3047	my ($widget, $cb, $tooltip) = @$item;	3820	my ($widget, $cb, $tooltip) = @$item;
3048		3821
3049	# handle various types of items, only text for now	3822	# handle various types of items, only text for now
3050	if (!ref $widget) {	3823	if (!ref $widget) {
		3824	if ($widget =~ /\t/) {
		3825	my ($left, $right) = split /\t/, $widget, 2;
		3826
3051	$widget = new CFClient::UI::Label	3827	$widget = new CFPlus::UI::HBox
3052	can_hover => 1,	3828	can_hover => 1,
3053	can_events => 1,	3829	can_events => 1,
		3830	tooltip => $tooltip,
		3831	children => [
		3832	(new CFPlus::UI::Label markup => $left, expand => 1),
		3833	(new CFPlus::UI::Label markup => $right, align => +1),
		3834	],
		3835	;
		3836
		3837	} else {
		3838	$widget = new CFPlus::UI::Label
		3839	can_hover => 1,
		3840	can_events => 1,
3054	markup => $widget,	3841	markup => $widget,
3055	tooltip => $tooltip	3842	tooltip => $tooltip;
		3843	}
3056	}	3844	}
3057		3845
3058	$self->{item}{$widget} = $item;	3846	$self->{item}{$widget} = $item;
3059		3847
3060	$self->{vbox}->add ($widget);	3848	$self->{vbox}->add ($widget);
…		…
3103	1	3891	1
3104	}	3892	}
3105		3893
3106	#############################################################################	3894	#############################################################################
3107		3895
3108	package CFClient::UI::Multiplexer;	3896	package CFPlus::UI::Multiplexer;
3109		3897
3110	our @ISA = CFClient::UI::Container::;	3898	our @ISA = CFPlus::UI::Container::;
3111		3899
3112	sub new {	3900	sub new {
3113	my $class = shift;	3901	my $class = shift;
3114		3902
3115	my $self = $class->SUPER::new (	3903	my $self = $class->SUPER::new (
…		…
3129		3917
3130	$self->{current} = $self->{children}[0]	3918	$self->{current} = $self->{children}[0]
3131	if @{ $self->{children} };	3919	if @{ $self->{children} };
3132	}	3920	}
3133		3921
		3922	sub get_current_page {
		3923	my ($self) = @_;
		3924
		3925	$self->{current}
		3926	}
		3927
3134	sub set_current_page {	3928	sub set_current_page {
3135	my ($self, $page_or_widget) = @_;	3929	my ($self, $page_or_widget) = @_;
3136		3930
3137	my $widget = ref $page_or_widget	3931	my $widget = ref $page_or_widget
3138	? $page_or_widget	3932	? $page_or_widget
…		…
3170	$self->{current}->draw;	3964	$self->{current}->draw;
3171	}	3965	}
3172		3966
3173	#############################################################################	3967	#############################################################################
3174		3968
3175	package CFClient::UI::Notebook;	3969	package CFPlus::UI::Notebook;
3176		3970
		3971	use CFPlus::OpenGL;
		3972
3177	our @ISA = CFClient::UI::VBox::;	3973	our @ISA = CFPlus::UI::VBox::;
3178		3974
3179	sub new {	3975	sub new {
3180	my $class = shift;	3976	my $class = shift;
3181		3977
3182	my $self = $class->SUPER::new (	3978	my $self = $class->SUPER::new (
3183	buttonbar => (new CFClient::UI::Buttonbar),	3979	buttonbar => (new CFPlus::UI::Buttonbar),
3184	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3980	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3981	active_outline => [.7, .7, 0.2],
3185	# filter => # will be put between multiplexer and $self	3982	# filter => # will be put between multiplexer and $self
3186	@_,	3983	@_,
3187	);	3984	);
3188		3985
3189	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3986	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3190	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3987	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3191		3988
		3989	{
		3990	Scalar::Util::weaken (my $wself = $self);
		3991
		3992	$self->{multiplexer}->connect (c_add => sub {
		3993	my ($mplex, $widgets) = @_;
		3994
		3995	for my $child (@$widgets) {
		3996	Scalar::Util::weaken $child;
		3997	$child->{c_tab_} ||= do {
		3998	my $tab =
		3999	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		4000	? $child->{c_tab}
		4001	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4002
		4003	$tab->connect (activate => sub {
		4004	$wself->set_current_page ($child);
		4005	});
		4006
		4007	$tab
		4008	};
		4009
		4010	$self->{buttonbar}->add ($child->{c_tab_});
		4011	}
		4012	});
		4013
		4014	$self->{multiplexer}->connect (c_remove => sub {
		4015	my ($mplex, $widgets) = @_;
		4016
		4017	for my $child (@$widgets) {
		4018	$wself->{buttonbar}->remove ($child->{c_tab_});
		4019	}
		4020	});
		4021	}
		4022
3192	$self	4023	$self
3193	}	4024	}
3194		4025
3195	sub add {	4026	sub add {
		4027	my ($self, @widgets) = @_;
		4028
		4029	$self->{multiplexer}->add (@widgets)
		4030	}
		4031
		4032	sub remove {
		4033	my ($self, @widgets) = @_;
		4034
		4035	$self->{multiplexer}->remove (@widgets)
		4036	}
		4037
		4038	sub pages {
		4039	my ($self) = @_;
		4040	$self->{multiplexer}->children
		4041	}
		4042
		4043	sub add_tab {
3196	my ($self, $title, $widget, $tooltip) = @_;	4044	my ($self, $title, $widget, $tooltip) = @_;
3197		4045
3198	Scalar::Util::weaken $self;	4046	$title = [$title, $tooltip] unless ref $title;
		4047	$widget->{c_tab} = $title;
3199		4048
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);	4049	$self->add ($widget);
		4050	}
		4051
		4052	sub get_current_page {
		4053	my ($self) = @_;
		4054
		4055	$self->{multiplexer}->get_current_page
3207	}	4056	}
3208		4057
3209	sub set_current_page {	4058	sub set_current_page {
3210	my ($self, $page) = @_;	4059	my ($self, $page) = @_;
3211		4060
3212	$self->{multiplexer}->set_current_page ($page);	4061	$self->{multiplexer}->set_current_page ($page);
3213	$self->emit (page_changed => $self->{multiplexer}{current});	4062	$self->emit (page_changed => $self->{multiplexer}{current});
3214	}	4063	}
3215		4064
		4065	sub _draw {
		4066	my ($self) = @_;
		4067
		4068	$self->SUPER::_draw ();
		4069
		4070	if (my $cur = $self->{multiplexer}{current}) {
		4071	if ($cur = $cur->{c_tab_}) {
		4072	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4073	$self->{buttonbar}{y} + $cur->{y};
		4074	glLineWidth 3;
		4075	#glEnable GL_BLEND;
		4076	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4077	glColor @{$self->{active_outline}};
		4078	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4079	glLineWidth 1;
		4080	#glDisable GL_BLEND;
		4081	}
		4082	}
		4083	}
		4084
3216	#############################################################################	4085	#############################################################################
3217		4086
3218	package CFClient::UI::Combobox;	4087	package CFPlus::UI::Selector;
3219		4088
3220	use utf8;	4089	use utf8;
3221		4090
3222	our @ISA = CFClient::UI::Button::;	4091	our @ISA = CFPlus::UI::Button::;
3223		4092
3224	sub new {	4093	sub new {
3225	my $class = shift;	4094	my $class = shift;
3226		4095
3227	my $self = $class->SUPER::new (	4096	my $self = $class->SUPER::new (
…		…
3244	my ($value, $title, $tooltip) = @$_;	4113	my ($value, $title, $tooltip) = @$_;
3245		4114
3246	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4115	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247	}	4116	}
3248		4117
3249	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4118	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250	}	4119	}
3251		4120
3252	sub _set_value {	4121	sub _set_value {
3253	my ($self, $value) = @_;	4122	my ($self, $value) = @_;
3254		4123
…		…
3269	$self->emit (changed => $value);	4138	$self->emit (changed => $value);
3270	}	4139	}
3271		4140
3272	#############################################################################	4141	#############################################################################
3273		4142
3274	package CFClient::UI::Statusbox;	4143	package CFPlus::UI::Statusbox;
3275		4144
3276	our @ISA = CFClient::UI::VBox::;	4145	our @ISA = CFPlus::UI::VBox::;
3277		4146
3278	sub new {	4147	sub new {
3279	my $class = shift;	4148	my $class = shift;
3280		4149
3281	my $self = $class->SUPER::new (	4150	my $self = $class->SUPER::new (
3282	fontsize => 0.8,	4151	fontsize => 0.8,
3283	@_,	4152	@_,
3284	);	4153	);
3285		4154
3286	Scalar::Util::weaken (my $this = $self);	4155	CFPlus::weaken (my $this = $self);
3287		4156
3288	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4157	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3289		4158
3290	$self	4159	$self
3291	}	4160	}
…		…
3293	sub reorder {	4162	sub reorder {
3294	my ($self) = @_;	4163	my ($self) = @_;
3295	my $NOW = Time::HiRes::time;	4164	my $NOW = Time::HiRes::time;
3296		4165
3297	# freeze display when hovering over any label	4166	# freeze display when hovering over any label
3298	return if $CFClient::UI::TOOLTIP->{owner}	4167	return if $CFPlus::UI::TOOLTIP->{owner}
3299	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4168	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3300	values %{ $self->{item} };	4169	values %{ $self->{item} };
3301		4170
3302	while (my ($k, $v) = each %{ $self->{item} }) {	4171	while (my ($k, $v) = each %{ $self->{item} }) {
3303	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4172	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3304	}	4173	}
…		…
3325	for ($short) {	4194	for ($short) {
3326	s/^\s+//;	4195	s/^\s+//;
3327	s/\s+/ /g;	4196	s/\s+/ /g;
3328	}	4197	}
3329		4198
3330	new CFClient::UI::Label	4199	new CFPlus::UI::Label
3331	markup => $short,	4200	markup => $short,
3332	tooltip => $item->{tooltip},	4201	tooltip => $item->{tooltip},
3333	tooltip_font => $::FONT_PROP,	4202	tooltip_font => $::FONT_PROP,
3334	tooltip_width => 0.67,	4203	tooltip_width => 0.67,
3335	fontsize => $item->{fontsize} || $self->{fontsize},	4204	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3389	count => 1,	4258	count => 1,
3390	%arg,	4259	%arg,
3391	};	4260	};
3392	}	4261	}
3393		4262
		4263	$ROOT->on_refresh (reorder => sub {
3394	$self->reorder;	4264	$self->reorder;
		4265	});
3395	}	4266	}
3396		4267
3397	sub reconfigure {	4268	sub reconfigure {
3398	my ($self) = @_;	4269	my ($self) = @_;
3399		4270
…		…
3412	$self->SUPER::destroy;	4283	$self->SUPER::destroy;
3413	}	4284	}
3414		4285
3415	#############################################################################	4286	#############################################################################
3416		4287
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;	4288	package CFPlus::UI::Root;
3790		4289
3791	our @ISA = CFClient::UI::Container::;	4290	our @ISA = CFPlus::UI::Container::;
3792		4291
3793	use List::Util qw(min max);	4292	use List::Util qw(min max);
3794		4293
3795	use CFClient::OpenGL;	4294	use CFPlus::OpenGL;
3796		4295
3797	sub new {	4296	sub new {
3798	my $class = shift;	4297	my $class = shift;
3799		4298
3800	my $self = $class->SUPER::new (	4299	my $self = $class->SUPER::new (
3801	visible => 1,	4300	visible => 1,
3802	@_,	4301	@_,
3803	);	4302	);
3804		4303
3805	Scalar::Util::weaken ($self->{root} = $self);	4304	CFPlus::weaken ($self->{root} = $self);
3806		4305
3807	$self	4306	$self
3808	}	4307	}
3809		4308
3810	sub size_request {	4309	sub size_request {
…		…
3858	}	4357	}
3859		4358
3860	sub update {	4359	sub update {
3861	my ($self) = @_;	4360	my ($self) = @_;
3862		4361
3863	$::WANT_REFRESH++;	4362	$::WANT_REFRESH->start;
3864	}	4363	}
3865		4364
3866	sub add {	4365	sub add {
3867	my ($self, @children) = @_;	4366	my ($self, @children) = @_;
3868		4367
…		…
3905	while ($self->{refresh_hook}) {	4404	while ($self->{refresh_hook}) {
3906	$_->()	4405	$_->()
3907	for values %{delete $self->{refresh_hook}};	4406	for values %{delete $self->{refresh_hook}};
3908	}	4407	}
3909		4408
3910	if ($self->{realloc}) {	4409	while ($self->{realloc}) {
3911	my %queue;	4410	my %queue;
3912	my @queue;	4411	my @queue;
3913	my $widget;	4412	my $widget;
3914		4413
3915	outer:	4414	outer:
…		…
3962	}	4461	}
3963	}	4462	}
3964		4463
3965	delete $self->{realloc}{$widget+0};	4464	delete $self->{realloc}{$widget+0};
3966	}	4465	}
3967	}
3968		4466
3969	while (my $size_alloc = delete $self->{size_alloc}) {	4467	while (my $size_alloc = delete $self->{size_alloc}) {
3970	my @queue = sort { $b->{visible} <=> $a->{visible} }	4468	my @queue = sort { $a->{visible} <=> $b->{visible} }
3971	values %$size_alloc;	4469	values %$size_alloc;
3972		4470
3973	while () {	4471	while () {
3974	my $widget = pop @queue || last;	4472	my $widget = pop @queue || last;
3975		4473
3976	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4474	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977		4475
3978	$w = 0 if $w < 0;	4476	$w = max $widget->{min_w}, $w;
3979	$h = 0 if $h < 0;	4477	$h = max $widget->{min_h}, $h;
3980		4478
		4479	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4480	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4481
		4482	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4483	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4484
3981	$w = int $w + 0.5;	4485	$w = int $w + 0.5;
3982	$h = int $h + 0.5;	4486	$h = int $h + 0.5;
3983		4487
3984	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4488	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985	$widget->{old_w} = $widget->{w};	4489	$widget->{old_w} = $widget->{w};
3986	$widget->{old_h} = $widget->{h};	4490	$widget->{old_h} = $widget->{h};
3987		4491
3988	$widget->{w} = $w;	4492	$widget->{w} = $w;
3989	$widget->{h} = $h;	4493	$widget->{h} = $h;
3990		4494
3991	$widget->emit (size_allocate => $w, $h);	4495	$widget->emit (size_allocate => $w, $h);
		4496	}
3992	}	4497	}
3993	}	4498	}
3994	}	4499	}
3995		4500
3996	while ($self->{post_alloc_hook}) {	4501	while ($self->{post_alloc_hook}) {
3997	$_->()	4502	$_->()
3998	for values %{delete $self->{post_alloc_hook}};	4503	for values %{delete $self->{post_alloc_hook}};
3999	}	4504	}
4000
4001		4505
4002	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4506	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4003	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4507	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4004	glClear GL_COLOR_BUFFER_BIT;	4508	glClear GL_COLOR_BUFFER_BIT;
4005		4509
…		…
4008	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4512	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4009	glMatrixMode GL_MODELVIEW;	4513	glMatrixMode GL_MODELVIEW;
4010	glLoadIdentity;	4514	glLoadIdentity;
4011		4515
4012	{	4516	{
4013	package CFClient::UI::Base;	4517	package CFPlus::UI::Base;
4014		4518
4015	($draw_x, $draw_y, $draw_w, $draw_h) =	4519	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4016	(0, 0, $self->{w}, $self->{h});	4520	(0, 0, $self->{w}, $self->{h});
4017	}
4018		4521
4019	$self->_draw;	4522	$self->_draw;
		4523	}
4020	}	4524	}
4021		4525
4022	#############################################################################	4526	#############################################################################
4023		4527
4024	package CFClient::UI;	4528	package CFPlus::UI;
4025		4529
4026	$ROOT = new CFClient::UI::Root;	4530	$ROOT = new CFPlus::UI::Root;
4027	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4531	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4028		4532
4029	1	4533	1
4030		4534

Diff Legend

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