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

Diff Legend

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