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

Diff Legend

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