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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 2007 UTC

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

Diff Legend

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