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

Diff Legend

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