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

Diff Legend

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