ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.156 by elmex, Sun Apr 23 02:50:42 2006 UTC vs.
Revision 1.261 by elmex, Tue May 30 14:45:56 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
16sub check_tooltip { 44sub check_tooltip {
17 if (!$GRAB) { 45 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
20 48
21 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
22 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
23 53
24 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
25 55
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 57
28 $TOOLTIP->set_text ($widget->{tooltip}); 58 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31 } 60 }
32 61
33 return; 62 return;
34 } 63 }
… …
39 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
40} 69}
41 70
42# class methods for events 71# class methods for events
43sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 73 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS;
45} 75}
46 76
47sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 78 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS;
49} 80}
50 81
51sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
52 my ($ev) = @_; 83 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 92 check_tooltip;
62 } 93 }
63 94
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 96
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
98 if $GRAB;
67} 99}
68 100
69sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
70 my ($ev) = @_; 102 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
72 104
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 106
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 108
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
110 if $GRAB;
78 111
79 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 114 $grab->update if $grab;
82 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 132
100 check_tooltip; 133 check_tooltip;
101 } 134 }
102 135
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER;
104} 138}
105 139
106# convert position array to integers 140# convert position array to integers
107sub harmonize { 141sub harmonize {
108 my ($vals) = @_; 142 my ($vals) = @_;
… …
114 $rem += $_ - $i; 148 $rem += $_ - $i;
115 $_ = $i; 149 $_ = $i;
116 } 150 }
117} 151}
118 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
119############################################################################# 194#############################################################################
120 195
121package CFClient::UI::Base; 196package CFClient::UI::Base;
122 197
123use strict; 198use strict;
… …
126 201
127sub new { 202sub new {
128 my $class = shift; 203 my $class = shift;
129 204
130 my $self = bless { 205 my $self = bless {
131 x => 0, 206 x => "center",
132 y => 0, 207 y => "center",
133 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
134 can_events => 1, 211 can_events => 1,
135 @_ 212 @_
136 }, $class; 213 }, $class;
137 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
138 for (keys %$self) { 217 for (keys %$self) {
139 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
141 } 220 }
142 } 221 }
143 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
144 $self 235 $self
145} 236}
146 237
238sub destroy {
239 my ($self) = @_;
240
241 $self->hide;
242 %$self = ();
243}
244
147sub show { 245sub show {
148 my ($self) = @_; 246 my ($self) = @_;
149 247
150 return if $self->{parent}; 248 return if $self->{parent};
151 249
152 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
153} 251}
154 252
253sub set_visible {
254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
277
278 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self;
280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
155sub hide { 306sub hide {
156 my ($self) = @_; 307 my ($self) = @_;
157 308
158 return unless $self->{parent}; 309 $self->set_invisible;
159 310
160 $self->{parent}->remove ($self); 311 $self->{parent}->remove ($self)
312 if $self->{parent};
161} 313}
162 314
163sub move { 315sub move_abs {
164 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
165 317
166 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
167 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
168 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
169 321
170 $self->update; 322 $self->update;
171} 323}
172 324
173sub needs_redraw { 325sub set_size {
174 0 326 my ($self, $w, $h) = @_;
327
328 $self->{force_w} = $w;
329 $self->{force_h} = $h;
330
331 $self->realloc;
175} 332}
176 333
177sub size_request { 334sub size_request {
178 require Carp; 335 require Carp;
179 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
181 338
182sub configure { 339sub configure {
183 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
184 341
185 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
186 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
187 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
188 347
189 # use alignment to adjust x, y 348 # use alignment to adjust x, y
190 349
191 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
192 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
193
194 ($w, $h) = ($w2, $h2);
195 } 352 }
196 353
197 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
198 $self->{x} = $x; 355 $self->{x} = $x;
199 $self->{y} = $y; 356 $self->{y} = $y;
200 $self->update; 357 $self->update;
201 } 358 }
202 359
203 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
362
204 $self->{w} = $w; 363 $self->{alloc_w} = $w;
205 $self->{h} = $h; 364 $self->{alloc_h} = $h;
206 365
207 $self->size_allocate ($w, $h); 366 $self->{root}{size_alloc}{$self+0} = $self;
208 $self->update;
209 } 367 }
210} 368}
211 369
212sub size_allocate { 370sub size_allocate {
213 # nothing to be done 371 # nothing to be done
214} 372}
215 373
216# return top left coordinates 374sub children {
217sub _topleft { 375}
376
377sub set_max_size {
218 my ($self, $x, $y) = @_; 378 my ($self, $w, $h) = @_;
219 379
220 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h;
382}
383
384sub set_tooltip {
385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
221} 398}
222 399
223# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
224sub coord2local { 401sub coord2local {
225 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
226 403
227 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
228 ($x - $X, $y - $Y)
229} 405}
230 406
231# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
232sub coord2global { 408sub coord2global {
233 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
234 410
235 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
236 ($x + $X, $y + $Y)
237} 412}
238 413
239sub focus_in { 414sub focus_in {
240 my ($self) = @_; 415 my ($self) = @_;
241 416
242 return if $FOCUS == $self; 417 return if $FOCUS == $self;
243 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
244 419
245 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
246 421
247 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
248 423
249 $focus->update if $focus; 424 $focus->update if $focus;
250 $FOCUS->update; 425 $FOCUS->update;
251} 426}
252 427
… …
255 430
256 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
257 432
258 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
259 434
260 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
261 436
262 $focus->update if $focus; #? 437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS;
263} 441}
264 442
265sub mouse_motion { } 443sub mouse_motion { }
266sub button_up { } 444sub button_up { }
267sub key_down { } 445sub key_down { }
268sub key_up { } 446sub key_up { }
269 447
270sub button_down { 448sub button_down {
271 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
272 450
273 $self->focus_in; 451 $self->focus_in;
… …
276sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
277sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
278sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
279sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
280sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
281 529
282sub draw { 530sub draw {
283 my ($self) = @_; 531 my ($self) = @_;
284 532
285 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
301 glVertex $x + $self->{w}, $y + $self->{h}; 549 glVertex $x + $self->{w}, $y + $self->{h};
302 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
303 glEnd; 551 glEnd;
304 glDisable GL_BLEND; 552 glDisable GL_BLEND;
305 } 553 }
554
555 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix;
557 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
559 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1;
564 glEnd;
565 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 }
306} 568}
307 569
308sub _draw { 570sub _draw {
309 my ($self) = @_; 571 my ($self) = @_;
310 572
311 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
312} 574}
313 575
314sub find_widget {
315 my ($self, $x, $y) = @_;
316
317 return () unless $self->{can_events};
318
319 return $self
320 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
321 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
322
323 ()
324}
325
326sub set_parent {
327 my ($self, $parent) = @_;
328
329 Scalar::Util::weaken ($self->{parent} = $parent);
330}
331
332sub check_size {
333 my ($self) = @_;
334
335 return unless $self->{parent};
336
337 my ($w, $h) = $self->size_request;
338
339 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w;
341 $self->{req_h} = $h;
342
343 $self->{parent}->check_size;
344 }
345}
346
347sub update {
348 my ($self) = @_;
349
350 $self->{parent}->update
351 if $self->{parent};
352}
353
354sub connect {
355 my ($self, $signal, $cb) = @_;
356
357 push @{ $self->{signal_cb}{$signal} }, $cb;
358}
359
360sub emit {
361 my ($self, $signal, @args) = @_;
362
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
364 $cb->($self, @args);
365 }
366}
367
368sub DESTROY { 576sub DESTROY {
369 my ($self) = @_; 577 my ($self) = @_;
370 578
579 delete $WIDGET{$self+0};
371 #$self->deactivate; 580 #$self->deactivate;
372} 581}
373 582
374############################################################################# 583#############################################################################
375 584
… …
384 my $class = shift; 593 my $class = shift;
385 594
386 # range [value, low, high, page] 595 # range [value, low, high, page]
387 596
388 $class->SUPER::new ( 597 $class->SUPER::new (
389 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
390 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
391 @_ 600 @_
392 ) 601 )
393} 602}
394 603
395sub _draw { 604sub _draw {
396 my ($self) = @_; 605 my ($self) = @_;
397 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
398 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
399 613
400 glEnable GL_BLEND; 614 glEnable GL_BLEND;
401 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
402 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
403 617
404 glBegin GL_QUADS; 618 glBegin GL_QUADS;
405 glVertex 0 , 0; 619 glVertex 0 , 0;
406 glVertex 0 , $h; 620 glVertex 0 , $h;
407 glVertex $w, $h; 621 glVertex $w, $h;
408 glVertex $w, 0; 622 glVertex $w, 0;
409 glEnd; 623 glEnd;
410 624
411 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
412} 627}
413 628
414############################################################################# 629#############################################################################
415 630
416package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
421 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
422 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
423} 638}
424 639
425sub size_request { 640sub size_request {
426 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
427} 644}
428 645
429sub draw { } 646sub draw { }
430 647
431############################################################################# 648#############################################################################
… …
437sub new { 654sub new {
438 my ($class, %arg) = @_; 655 my ($class, %arg) = @_;
439 656
440 my $children = delete $arg{children} || []; 657 my $children = delete $arg{children} || [];
441 658
442 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 659 my $self = $class->SUPER::new (
660 children => [],
661 can_events => 0,
662 %arg,
663 );
443 $self->add ($_) for @$children; 664 $self->add ($_) for @$children;
444 665
445 $self 666 $self
446} 667}
447 668
448sub add { 669sub add {
449 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
450 671
451 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
452 674
453 use sort 'stable'; 675 use sort 'stable';
454 676
455 $self->{children} = [ 677 $self->{children} = [
456 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
457 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
458 ]; 680 ];
459 681
460 $child->check_size; 682 $self->realloc;
683}
684
685sub children {
686 @{ $_[0]{children} }
461} 687}
462 688
463sub remove { 689sub remove {
464 my ($self, $child) = @_; 690 my ($self, $child) = @_;
465 691
466 delete $child->{parent}; 692 delete $child->{parent};
693 $child->hide;
467 694
468 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
469 696
470 $self->check_size; 697 $self->realloc;
471 $self->update; 698}
699
700sub clear {
701 my ($self) = @_;
702
703 my $children = delete $self->{children};
704 $self->{children} = [];
705
706 for (@$children) {
707 delete $_->{parent};
708 $_->hide;
709 }
710
711 $self->realloc;
472} 712}
473 713
474sub find_widget { 714sub find_widget {
475 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
476 716
… …
551} 791}
552 792
553sub update { 793sub update {
554 my ($self) = @_; 794 my ($self) = @_;
555 795
556 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
557 $self->render_chld;
558 $self->SUPER::update; 797 $self->SUPER::update;
559}
560
561sub render_chld {
562 my ($self) = @_;
563
564 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
565 glClearColor 0, 0, 0, 1;
566 glClear GL_COLOR_BUFFER_BIT;
567 $self->child->draw;
568 };
569} 798}
570 799
571sub size_allocate { 800sub size_allocate {
572 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
573 802
574 $self->child->configure (0, 0, $w, $h); 803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
575 806
807sub _render {
808 $_[0]{children}[0]->draw;
809}
810
811sub render_child {
812 my ($self) = @_;
813
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT;
817
576 $self->render_chld; 818 $self->_render;
819 };
577} 820}
578 821
579sub _draw { 822sub _draw {
580 my ($self) = @_; 823 my ($self) = @_;
581 824
582 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
583 826
584 my $tex = $self->{texture} 827 my $tex = $self->{texture}
585 or return; 828 or return;
586 829
587 glEnable GL_BLEND;
588 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
589 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1;
591 833
592 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
593 835
594 glDisable GL_BLEND;
595 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
596} 837}
597 838
598############################################################################# 839#############################################################################
599 840
600package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
601 842
602our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
603
604sub new { die }
605
606sub size_request {
607 my ($self) = @_;
608
609 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
610 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
611
612 @$self{qw(child_w child_h)}
613}
614
615sub _draw {
616 my ($self) = @_;
617
618 $self->{children}[1]->draw;
619}
620
621
622#############################################################################
623
624package CFClient::UI::Frame;
625
626our @ISA = CFClient::UI::Bin::;
627
628use CFClient::OpenGL;
629 844
630sub new { 845sub new {
631 my $class = shift; 846 my $class = shift;
632 847
633 my $self = $class->SUPER::new ( 848 $class->SUPER::new (
634 bg => [1, 1, 1, 1], 849 scroll_x => 0,
635 border_bg => [1, 1, 1, 1], 850 scroll_y => 1,
636 border => 0.8,
637 @_ 851 @_,
638 ); 852 )
639
640 $self
641}
642
643sub set_size {
644 my ($self, $w, $h) = @_;
645 $self->{req_w} = $w;
646 $self->{req_h} = $h;
647 $self->check_size;
648} 853}
649 854
650sub size_request { 855sub size_request {
651 my ($self) = @_; 856 my ($self) = @_;
652 ($self->{req_w}, $self->{req_h}) 857
858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
859
860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
653} 864}
654 865
655sub size_allocate { 866sub size_allocate {
656 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
657 $self->{w} = $w; 868
658 $self->{h} = $h; 869 my $child = $self->child;
870
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873
659 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
875 $self->update;
660} 876}
661 877
662sub _draw { 878sub set_offset {
663 my ($self) = @_; 879 my ($self, $x, $y) = @_;
664 880
665 my ($w, $h) = ($self->{w}, $self->{h}); 881 $self->{view_x} = int $x;
882 $self->{view_y} = int $y;
666 883
667 glEnable GL_BLEND; 884 $self->update;
668 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 885}
669 glEnable GL_TEXTURE_2D;
670 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
671 886
672# glBegin GL_QUADS; 887# hmm, this does not work for topleft of $self... but we should not ask for that
673# glColor 0, 0, 0, 0; 888sub coord2local {
674# glVertex 0 , 0; 889 my ($self, $x, $y) = @_;
675# glVertex 0 , $h;
676# glVertex $w, $h;
677# glVertex $w, 0;
678# glEnd;
679 890
891 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
892}
680 893
681 $self->child->draw; 894sub coord2global {
682 glDisable GL_BLEND; 895 my ($self, $x, $y) = @_;
683 glDisable GL_TEXTURE_2D; 896
897 $x = List::Util::min $self->{w}, $x - $self->{view_x};
898 $y = List::Util::min $self->{h}, $y - $self->{view_y};
899
900 $self->SUPER::coord2global ($x, $y)
901}
902
903sub find_widget {
904 my ($self, $x, $y) = @_;
905
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y)
912 }
913}
914
915sub _render {
916 my ($self) = @_;
917
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919
920 $self->SUPER::_render;
684} 921}
685 922
686############################################################################# 923#############################################################################
687 924
688package CFClient::UI::FancyFrame; 925package CFClient::UI::ScrolledWindow;
689 926
690our @ISA = CFClient::UI::Bin::; 927our @ISA = CFClient::UI::HBox::;
691
692use CFClient::OpenGL;
693
694my @tex =
695 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
696 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
697 928
698sub new { 929sub new {
699 my $class = shift; 930 my $class = shift;
700 931
701 # TODO: user_x, user_y, overwrite moveto? 932 my $self;
933
934 my $slider = new CFClient::UI::Slider
935 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]);
939 },
940 ;
941
942 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider,
945 @_,
946 );
947
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider});
951
952 $self
953}
954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965sub size_allocate {
966 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976
977#############################################################################
978
979package CFClient::UI::Frame;
980
981our @ISA = CFClient::UI::Bin::;
982
983use CFClient::OpenGL;
984
985sub new {
986 my $class = shift;
987
988 $class->SUPER::new (
989 bg => undef,
990 @_,
991 )
992}
993
994sub _draw {
995 my ($self) = @_;
996
997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
999
1000 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} };
1003
1004 glBegin GL_QUADS;
1005 glVertex 0 , 0;
1006 glVertex 0 , $h;
1007 glVertex $w, $h;
1008 glVertex $w, 0;
1009 glEnd;
1010
1011 glDisable GL_BLEND;
1012 }
1013
1014 $self->SUPER::_draw;
1015}
1016
1017#############################################################################
1018
1019package CFClient::UI::FancyFrame;
1020
1021our @ISA = CFClient::UI::Bin::;
1022
1023use CFClient::OpenGL;
1024
1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032
1033sub new {
1034 my $class = shift;
702 1035
703 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
706 border => 0.8, 1039 border => 0.6,
707 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
708 @_ 1043 @_
709 ); 1044 );
710 1045
711 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
712 align => 0, 1047 align => 0,
713 valign => 1, 1048 valign => 1,
714 text => $self->{title}, 1049 text => $self->{title},
715 fontsize => 1; 1050 fontsize => $self->{border};
716 1051
717 $self 1052 $self
718} 1053}
719 1054
720sub border { 1055sub border {
721 int $_[0]{border} * $::FONTSIZE 1056 int $_[0]{border} * $::FONTSIZE
722} 1057}
723 1058
724sub size_request { 1059sub size_request {
725 my ($self) = @_; 1060 my ($self) = @_;
726
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728 1061
729 my ($w, $h) = $self->SUPER::size_request; 1062 my ($w, $h) = $self->SUPER::size_request;
730 1063
731 ( 1064 (
732 $w + $self->border * 2, 1065 $w + $self->border * 2,
… …
738 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
739 1072
740 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
741 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
742 1075
743 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
744 if $self->{title}; 1077 if $self->{title};
745 1078
746 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
747} 1080}
748 1081
749sub button_down { 1082sub button_down {
750 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
751 1084
1085 my ($w, $h) = @$self{qw(w h)};
752 my $border = $self->border; 1086 my $border = $self->border;
753 1087
754 if ($x < $self->{w} && $x >= $self->{w} - $border 1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
755 && $y < $self->{h} && $y >= $self->{h} - $border) { 1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
756 1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
757 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
758 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
759 1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
1098
760 $self->{motion} = sub { 1099 $self->{motion} = sub {
761 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
762 1101
763 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
764 1104
765 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
766 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
767 $self->check_size; 1107
1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
768 }; 1110 };
769 1111
770 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
771 && $y >= 0 && $y < $border) {
772
773 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
774 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
775 1115
776 $self->{motion} = sub { 1116 $self->{motion} = sub {
777 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
778 1118
779 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
780 1120
781 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
782 $self->update;
783 }; 1122 };
784 } 1123 }
785} 1124}
786 1125
787sub button_up { 1126sub button_up {
… …
800 my ($self) = @_; 1139 my ($self) = @_;
801 1140
802 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
803 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
804 1143
805 glEnable GL_BLEND;
806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
807 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
809 1146
810 my $border = $self->border; 1147 my $border = $self->border;
811 1148
812 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
813 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
814 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
815 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
816 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
817 1154
818 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
819 1157
820 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
821 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
822 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
823 1161 $bg->{t} = $ch / $bg->{h};
824 glColor @{ $self->{bg} };
825
826 $bg->{s} = $rep_x;
827 $bg->{t} = $rep_y;
828 $bg->{wrap_mode} = 1;
829 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
830 1164
831 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
832 glDisable GL_BLEND;
833 1166
834 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
1168
835 $self->child->draw; 1169 $self->child->draw;
836} 1170}
837 1171
838############################################################################# 1172#############################################################################
839 1173
… …
848sub new { 1182sub new {
849 my $class = shift; 1183 my $class = shift;
850 1184
851 $class->SUPER::new ( 1185 $class->SUPER::new (
852 col_expand => [], 1186 col_expand => [],
853 @_ 1187 @_,
854 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
855} 1193}
856 1194
857sub add { 1195sub add {
858 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
859 1197
860 $child->set_parent ($self); 1198 $child->set_parent ($self);
861 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
862 1200
863 $child->check_size; 1201 $self->realloc;
864} 1202}
865 1203
866# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
867sub clear { 1205sub clear {
868 my ($self) = @_; 1206 my ($self) = @_;
869 1207
1208 my @children = $self->children;
870 delete $self->{children}; 1209 delete $self->{children};
871 $self->update; 1210
1211 for (@children) {
1212 delete $_->{parent};
1213 $_->hide;
1214 }
1215
1216 $self->realloc;
872} 1217}
873 1218
874sub get_wh { 1219sub get_wh {
875 my ($self) = @_; 1220 my ($self) = @_;
876 1221
… …
907sub size_allocate { 1252sub size_allocate {
908 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
909 1254
910 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
911 1256
912 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
913 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
914 1259
915 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
916 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
917 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
918 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
972 } 1317 }
973} 1318}
974 1319
975############################################################################# 1320#############################################################################
976 1321
977package CFClient::UI::HBox; 1322package CFClient::UI::Box;
978
979# TODO: wrap into common Box base class
980 1323
981our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
982 1325
983sub size_request { 1326sub size_request {
984 my ($self) = @_; 1327 my ($self) = @_;
985 1328
986 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
987 1330 ? (
988 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
989 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
990 (List::Util::max map $_->[1], @alloc), 1333 )
991 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
992} 1338}
993 1339
994sub size_allocate { 1340sub size_allocate {
995 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
996 1342
997 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
998
999 my $children = $self->{children}; 1344 my $children = $self->{children};
1000 1345
1001 my @h = map $_->{req_w}, @$children; 1346 my @req;
1002 1347
1003 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1004 1349 @req = ($space / (@$children || 1)) x @$children;
1005 if ($req_h > $h) {
1006 # ah well, not enough space
1007 $_ *= $h / $req_h for @h;
1008 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1009 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1010 $exp ||= 1;
1011 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1012 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1013 my $child = $children->[$_];
1014
1015 my $alloc_h = $h[$_];
1016 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1017 $h[$_] = $alloc_h;
1018 } 1364 }
1019 } 1365 }
1020 1366
1021 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1022 1368
1023 my $y = 0; 1369 my $pos = 0;
1024 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1025 my $child = $children->[$_];
1026 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1027 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1028 1373
1029 $y += $h; 1374 $pos += $alloc;
1030 } 1375 }
1031 1376
1032 1 1377 1
1033} 1378}
1034 1379
1035############################################################################# 1380#############################################################################
1036 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
1037package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1038 1398
1039# TODO: wrap into common Box base class
1040
1041our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1042 1400
1043sub size_request { 1401sub new {
1044 my ($self) = @_; 1402 my $class = shift;
1045 1403
1046 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1047 1405 vertical => 1,
1048 ( 1406 @_,
1049 (List::Util::max map $_->[0], @alloc),
1050 (List::Util::sum map $_->[1], @alloc),
1051 ) 1407 )
1052} 1408}
1053 1409
1054sub size_allocate {
1055 my ($self, $w, $h) = @_;
1056
1057 my $children = $self->{children};
1058
1059 my @h = map $_->{req_h}, @$children;
1060
1061 my $req_h = List::Util::sum @h;
1062
1063 if ($req_h > $h) {
1064 # ah well, not enough space
1065 $_ *= $h / $req_h for @h;
1066 } else {
1067 my $exp = List::Util::sum map $_->{expand}, @$children;
1068 $exp ||= 1;
1069
1070 for (0 .. $#$children) {
1071 my $child = $children->[$_];
1072
1073 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1074 }
1075 }
1076
1077 CFClient::UI::harmonize \@h;
1078
1079 my $y = 0;
1080 for (0 .. $#$children) {
1081 my $child = $children->[$_];
1082 my $h = $h[$_];
1083 $child->configure (0, $y, $w, $h);
1084
1085 $y += $h;
1086 }
1087
1088 1
1089}
1090
1091############################################################################# 1410#############################################################################
1092 1411
1093package CFClient::UI::Label; 1412package CFClient::UI::Label;
1094 1413
1095our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1096 1415
1097use CFClient::OpenGL; 1416use CFClient::OpenGL;
1098 1417
1099sub new { 1418sub new {
1100 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1101 1420
1102 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1425 #font => default_font
1426 #text => initial text
1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1430 layout => (new CFClient::Layout),
1104 fontsize => 1, 1431 fontsize => 1,
1105 text => "",
1106 align => -1, 1432 align => -1,
1107 valign => -1, 1433 valign => -1,
1108 padding => 2, 1434 padding_x => 2,
1109 layout => new CFClient::Layout, 1435 padding_y => 2,
1110 can_events => 0, 1436 can_events => 0,
1111 %arg 1437 %arg
1112 ); 1438 );
1113 1439
1114 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1115 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1116 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1117 $self->{template} = $layout; 1443 $self->{template} = $layout;
1118 } 1444 }
1119 1445
1120 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1447 $self->set_markup (delete $self->{markup});
1448 } else {
1449 $self->set_text (delete $self->{text});
1450 }
1122 1451
1123 $self 1452 $self
1124} 1453}
1125 1454
1126sub escape_text { 1455sub escape($) {
1127 local $_ = $_[1]; 1456 local $_ = $_[0];
1128 1457
1129 s/&/&amp;/g; 1458 s/&/&amp;/g;
1130 s/>/&gt;/g; 1459 s/>/&gt;/g;
1131 s/</&lt;/g; 1460 s/</&lt;/g;
1132 1461
1133 $_[1] 1462 $_
1463}
1464
1465sub update {
1466 my ($self) = @_;
1467
1468 delete $self->{texture};
1469 $self->SUPER::update;
1134} 1470}
1135 1471
1136sub set_text { 1472sub set_text {
1137 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1138 1474
1475 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text";
1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1139 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1140 1480
1141 delete $self->{texture}; 1481 $self->realloc;
1142 $self->check_size;
1143 $self->update; 1482 $self->update;
1144} 1483}
1145 1484
1146sub set_markup { 1485sub set_markup {
1147 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1148 1487
1488 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup";
1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1149 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1150 1495
1151 delete $self->{texture}; 1496 $self->realloc;
1152 $self->check_size;
1153 $self->update; 1497 $self->update;
1154} 1498}
1155 1499
1156sub size_request { 1500sub size_request {
1157 my ($self) = @_; 1501 my ($self) = @_;
1158 1502
1159 $self->{layout}->set_width; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1508
1162 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1163 1510
1164 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1514
1167 my ($w2, $h2) = $self->{template}->size; 1515 my ($w2, $h2) = $self->{template}->size;
1168 1516
1169 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1170 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1171 } 1519 }
1172 1520
1173 ( 1521 ($w, $h)
1174 $w + $self->{padding} * 2,
1175 $h + $self->{padding} * 2,
1176 )
1177} 1522}
1178 1523
1179sub size_allocate { 1524sub size_allocate {
1180 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1181 1526
… …
1185sub set_fontsize { 1530sub set_fontsize {
1186 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1187 1532
1188 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1189 delete $self->{texture}; 1534 delete $self->{texture};
1190 $self->check_size; 1535
1191 $self->update; 1536 $self->realloc;
1192} 1537}
1193 1538
1194sub _draw { 1539sub _draw {
1195 my ($self) = @_; 1540 my ($self) = @_;
1196 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1197 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1547 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1200 new_from_layout CFClient::Texture $self->{layout} 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1553
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5);
1557
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1201 }; 1563 };
1202 1564
1203 glEnable GL_BLEND;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1207 1567
1568 if ($tex->{format} == GL_ALPHA) {
1208 glColor @{$self->{fg}}; 1569 glColor @{$self->{fg}};
1209
1210 $self->{ox} = int (
1211 $self->{align} < 0 ? $self->{padding}
1212 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1213 : ($self->{w} - $tex->{w}) * 0.5
1214 );
1215
1216 $self->{oy} = int (
1217 $self->{valign} < 0 ? $self->{padding}
1218 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1219 : ($self->{h} - $tex->{h}) * 0.5
1220 );
1221
1222 $tex->draw_quad ($self->{ox}, $self->{oy}); 1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1223 1574
1224 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1225 glDisable GL_BLEND;
1226} 1576}
1227 1577
1228############################################################################# 1578#############################################################################
1229 1579
1230package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
… …
1235 1585
1236sub new { 1586sub new {
1237 my $class = shift; 1587 my $class = shift;
1238 1588
1239 $class->SUPER::new ( 1589 $class->SUPER::new (
1240 fg => [1, 1, 1], 1590 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1591 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1592 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1244 can_hover => 1, 1594 can_hover => 1,
1245 can_focus => 1, 1595 can_focus => 1,
1246 valign => 0, 1596 valign => 0,
1247 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1248 @_ 1599 @_
1249 ) 1600 )
1250} 1601}
1251 1602
1252sub _set_text { 1603sub _set_text {
… …
1262 $self->{text} = $text; 1613 $self->{text} = $text;
1263 1614
1264 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1265 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1266 1617
1267 $self->emit (changed => $self->{text}); 1618 $self->_emit (changed => $self->{text});
1619}
1620
1621sub set_text {
1622 my ($self, $text) = @_;
1623
1624 $self->{cursor} = length $text;
1625 $self->_set_text ($text);
1626
1627 $self->realloc;
1268} 1628}
1269 1629
1270sub get_text { 1630sub get_text {
1271 $_[0]{text} 1631 $_[0]{text}
1272} 1632}
… …
1275 my ($self) = @_; 1635 my ($self) = @_;
1276 1636
1277 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1278 1638
1279 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1280}
1281
1282sub size_allocate {
1283 my ($self, $w, $h) = @_;
1284
1285 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1286}
1287
1288sub set_text {
1289 my ($self, $text) = @_;
1290
1291 $self->{cursor} = length $text;
1292 $self->_set_text ($text);
1293 $self->update;
1294} 1640}
1295 1641
1296sub key_down { 1642sub key_down {
1297 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1298 1644
… …
1300 my $sym = $ev->{sym}; 1646 my $sym = $ev->{sym};
1301 my $uni = $ev->{unicode}; 1647 my $uni = $ev->{unicode};
1302 1648
1303 my $text = $self->get_text; 1649 my $text = $self->get_text;
1304 1650
1305 if ($sym == 8) { 1651 if ($uni == 8) {
1306 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1307 } elsif ($sym == 127) { 1653 } elsif ($uni == 127) {
1308 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1309 } elsif ($sym == CFClient::SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1310 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1311 } elsif ($sym == CFClient::SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1312 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1313 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1314 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1315 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1316 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1317 } elsif ($sym == 27) { 1663 } elsif ($uni == 27) {
1318 $self->emit ('escape'); 1664 $self->_emit ('escape');
1319 } elsif ($uni) { 1665 } elsif ($uni) {
1320 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1321 } 1667 }
1322 1668
1323 $self->_set_text ($text); 1669 $self->_set_text ($text);
1324 $self->update; 1670
1671 $self->realloc;
1325} 1672}
1326 1673
1327sub focus_in { 1674sub focus_in {
1328 my ($self) = @_; 1675 my ($self) = @_;
1329 1676
… …
1405 my ($self, $ev) = @_; 1752 my ($self, $ev) = @_;
1406 1753
1407 my $sym = $ev->{sym}; 1754 my $sym = $ev->{sym};
1408 1755
1409 if ($sym == 13) { 1756 if ($sym == 13) {
1757 unshift @{$self->{history}},
1758 my $txt = $self->get_text;
1759 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1761 $self->_emit (activate => $txt);
1411 $self->update; 1762 $self->update;
1763
1764 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text;
1767 }
1768 if (@{$self->{history} || []} > 0) {
1769 $self->{history_pointer}++;
1770 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1771 $self->{history_pointer} = @{$self->{history} || []} - 1;
1772 }
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 }
1775
1776 } elsif ($sym == CFClient::SDLK_DOWN) {
1777 $self->{history_pointer}--;
1778 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1779
1780 if ($self->{history_pointer} >= 0) {
1781 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1782 } else {
1783 $self->set_text ($self->{history_saveback});
1784 }
1412 1785
1413 } else { 1786 } else {
1414 $self->SUPER::key_down ($ev); 1787 $self->SUPER::key_down ($ev);
1415 } 1788 }
1416 1789
… …
1430 1803
1431sub new { 1804sub new {
1432 my $class = shift; 1805 my $class = shift;
1433 1806
1434 $class->SUPER::new ( 1807 $class->SUPER::new (
1435 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1436 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1439 can_hover => 1, 1812 can_hover => 1,
1440 align => 0, 1813 align => 0,
1441 valign => 0, 1814 valign => 0,
1442 can_events => 1, 1815 can_events => 1,
1443 @_ 1816 @_
1444 ) 1817 )
1445} 1818}
1446 1819
1820sub activate { }
1821
1447sub button_up { 1822sub button_up {
1448 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1449 1824
1825 $self->emit ("activate")
1450 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1451 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1452 $self->emit ("activate");
1453 }
1454} 1828}
1455 1829
1456sub _draw { 1830sub _draw {
1457 my ($self) = @_; 1831 my ($self) = @_;
1458 1832
… …
1460 1834
1461 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1462 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1463 } 1837 }
1464 1838
1465 glEnable GL_BLEND;
1466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1467 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469 glColor 0, 0, 0, 1; 1841 glColor 0, 0, 0, 1;
1470 1842
1471 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1472 1844
1473 glDisable GL_TEXTURE_2D; 1845 glDisable GL_TEXTURE_2D;
1474 glDisable GL_BLEND;
1475 1846
1476 $self->SUPER::_draw; 1847 $self->SUPER::_draw;
1477} 1848}
1478 1849
1479############################################################################# 1850#############################################################################
… …
1490 1861
1491sub new { 1862sub new {
1492 my $class = shift; 1863 my $class = shift;
1493 1864
1494 $class->SUPER::new ( 1865 $class->SUPER::new (
1495 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1496 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1497 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1870 bg => [0, 0, 0, 0.2],
1871 active_bg => [1, 1, 1, 0.5],
1498 state => 0, 1872 state => 0,
1499 can_hover => 1, 1873 can_hover => 1,
1500 @_ 1874 @_
1501 ) 1875 )
1502} 1876}
1503 1877
1504sub size_request { 1878sub size_request {
1505 my ($self) = @_; 1879 my ($self) = @_;
1506 1880
1507 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1508} 1882}
1509 1883
1510sub button_down { 1884sub button_down {
1511 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1512 1886
1513 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1514 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1515 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1516 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1517 } 1891 }
1518} 1892}
1519 1893
1520sub _draw { 1894sub _draw {
1521 my ($self) = @_; 1895 my ($self) = @_;
1522 1896
1523 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1524 1898
1525 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1526 1900
1527 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1528 1904
1529 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1530 1906
1531 glEnable GL_BLEND; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1532 glEnable GL_TEXTURE_2D; 1909 glEnable GL_TEXTURE_2D;
1533 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1534
1535 my $tex = $self->{state} ? $tex[1] : $tex[0];
1536
1537 $tex->draw_quad (0, 0, $s, $s); 1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1538
1539 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1540 glDisable GL_BLEND;
1541} 1912}
1542 1913
1543############################################################################# 1914#############################################################################
1544 1915
1545package CFClient::UI::Image; 1916package CFClient::UI::Image;
… …
1588 glTranslate 0, -$self->{w}, 0; 1959 glTranslate 0, -$self->{w}, 0;
1589 1960
1590 ($w, $h) = ($h, $w); 1961 ($w, $h) = ($h, $w);
1591 } 1962 }
1592 1963
1593 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595 glEnable GL_TEXTURE_2D; 1964 glEnable GL_TEXTURE_2D;
1596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1597 1966
1598 $tex->draw_quad (0, 0, $w, $h); 1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1599 1968
1600 glDisable GL_BLEND;
1601 glDisable GL_TEXTURE_2D; 1969 glDisable GL_TEXTURE_2D;
1602} 1970}
1603 1971
1604############################################################################# 1972#############################################################################
1605 1973
1606package CFClient::UI::VGauge; 1974package CFClient::UI::VGauge;
1607 1975
1608our @ISA = CFClient::UI::Base::; 1976our @ISA = CFClient::UI::Base::;
1977
1978use List::Util qw(min max);
1609 1979
1610use CFClient::OpenGL; 1980use CFClient::OpenGL;
1611 1981
1612my %tex = ( 1982my %tex = (
1613 food => [ 1983 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1984 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1985 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1986 ],
1617 grace => [ 1987 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1988 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1989 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 1990 ],
1621 hp => [ 1991 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1992 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1993 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1994 ],
1625 mana => [ 1995 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1996 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1997 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 1998 ],
1629); 1999);
1630 2000
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 2001# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 2002sub new {
… …
1651} 2021}
1652 2022
1653sub set_max { 2023sub set_max {
1654 my ($self, $max) = @_; 2024 my ($self, $max) = @_;
1655 2025
2026 return if $self->{max_val} == $max;
2027
1656 $self->{max_val} = $max; 2028 $self->{max_val} = $max;
2029 $self->update;
1657} 2030}
1658 2031
1659sub set_value { 2032sub set_value {
1660 my ($self, $val, $max) = @_; 2033 my ($self, $val, $max) = @_;
1661 2034
1662 $self->set_max ($max) 2035 $self->set_max ($max)
1663 if defined $max; 2036 if defined $max;
1664 2037
1665 $max = $self->{max_val}; 2038 return if $self->{val} == $val;
2039
1666 $self->{val} = $val; 2040 $self->{val} = $val;
1667
1668 $self->update; 2041 $self->update;
1669} 2042}
1670 2043
1671sub _draw { 2044sub _draw {
1672 my ($self) = @_; 2045 my ($self) = @_;
1673 2046
1674 my $tex = $tex{$self->{type}}; 2047 my $tex = $tex{$self->{type}};
2048 my ($t1, $t2, $t3) = @$tex;
1675 2049
1676 my ($w, $h) = ($self->{w}, $self->{h}); 2050 my ($w, $h) = ($self->{w}, $self->{h});
1677 2051
1678 if ($self->{vertical}) { 2052 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 2053 glRotate 90, 0, 0, 1;
… …
1681 2055
1682 ($w, $h) = ($h, $w); 2056 ($w, $h) = ($h, $w);
1683 } 2057 }
1684 2058
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 2059 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 2060
1688 my $t1 = $tex->[0]; 2061 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 2062 my $ycut2 = max 0, min 1, $ycut - 1;
2063
2064 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2);
1690 2066
1691 glEnable GL_BLEND; 2067 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 2069 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 2071
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2072 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 2073 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 2074 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2075 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2076 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2077 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 2078 glEnd;
1706 2079
2080 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2081 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 2082 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2083 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2084 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2085 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2086 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 2087 glEnd;
2088
2089 if ($t3) {
2090 glBindTexture GL_TEXTURE_2D, $t3->{name};
2091 glBegin GL_QUADS;
2092 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2094 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2095 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096 glEnd;
2097 }
1714 2098
1715 glDisable GL_BLEND; 2099 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 2100 glDisable GL_TEXTURE_2D;
1717} 2101}
1718 2102
… …
1724 2108
1725sub new { 2109sub new {
1726 my ($class, %arg) = @_; 2110 my ($class, %arg) = @_;
1727 2111
1728 my $self = $class->SUPER::new ( 2112 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 2113 tooltip => $arg{type},
2114 can_hover => 1,
2115 can_events => 1,
1730 %arg, 2116 %arg,
1731 ); 2117 );
1732 2118
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2119 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1734 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 2120 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1735 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 2121 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 2122
1737 $self 2123 $self
1738} 2124}
1739 2125
1740sub set_fontsize { 2126sub set_fontsize {
… …
1742 2128
1743 $self->{value}->set_fontsize ($fsize); 2129 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 2130 $self->{max} ->set_fontsize ($fsize);
1745} 2131}
1746 2132
2133sub set_max {
2134 my ($self, $max) = @_;
2135
2136 $self->{gauge}->set_max ($max);
2137 $self->{max}->set_text ($max);
2138}
2139
1747sub set_value { 2140sub set_value {
1748 my ($self, $val, $max) = @_; 2141 my ($self, $val, $max) = @_;
1749 2142
1750 $self->set_max ($max) 2143 $self->set_max ($max)
1751 if defined $max; 2144 if defined $max;
1752 2145
1753 $self->{gauge}->set_value ($val, $max); 2146 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 2147 $self->{value}->set_text ($val);
1755}
1756
1757sub set_max {
1758 my ($self, $max) = @_;
1759
1760 $self->{gauge}->set_max ($max);
1761 $self->{max}->set_text ($max);
1762} 2148}
1763 2149
1764############################################################################# 2150#############################################################################
1765 2151
1766package CFClient::UI::Slider; 2152package CFClient::UI::Slider;
… …
1776 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
1777 2163
1778sub new { 2164sub new {
1779 my $class = shift; 2165 my $class = shift;
1780 2166
1781 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
1782 2168
1783 # TODO: 0-width page 2169 # TODO: 0-width page
1784 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
1785 # TODO: calculations are off 2171 # TODO: calculations are off
1786 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
1787 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
1788 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2175 bg => [0, 0, 0, 0.2],
2176 active_bg => [1, 1, 1, 0.5],
1789 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
1790 req_w => 20, 2178 min_w => $::WIDTH / 80,
1791 req_h => 20, 2179 min_h => $::WIDTH / 80,
1792 vertical => 0, 2180 vertical => 0,
1793 can_hover => 1, 2181 can_hover => 1,
1794 inner_pad => 5, 2182 inner_pad => 0.02,
1795 @_ 2183 @_
1796 ); 2184 );
1797 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
1798 $self 2189 $self
1799} 2190}
1800 2191
2192sub changed { }
2193
2194sub set_range {
2195 my ($self, $range) = @_;
2196
2197 ($range, $self->{range}) = ($self->{range}, $range);
2198
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}";
2201}
2202
2203sub set_value {
2204 my ($self, $value) = @_;
2205
2206 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2207
2208 $hi = $lo + 1 if $hi <= $lo;
2209
2210 $page = $hi - $lo if $page > $hi - $lo;
2211
2212 $value = $lo if $value < $lo;
2213 $value = $hi - $page if $value > $hi - $page;
2214
2215 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2216 if $unit;
2217
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219
2220 if ($value != $old_value) {
2221 $self->_emit (changed => $value);
2222 $self->update;
2223 }
2224}
2225
1801sub size_request { 2226sub size_request {
1802 my ($self) = @_; 2227 my ($self) = @_;
1803 2228
1804 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
1805 my $h = $self->{req_h};
1806
1807 $self->{vertical} ? ($h, $w) : ($w, $h)
1808} 2230}
1809 2231
1810sub button_down { 2232sub button_down {
1811 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1812 2234
1813 $self->SUPER::button_down ($ev, $x, $y); 2235 $self->SUPER::button_down ($ev, $x, $y);
2236
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238
1814 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
1815} 2240}
1816 2241
1817sub mouse_motion { 2242sub mouse_motion {
1818 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1819 2244
1820 if ($GRAB == $self) { 2245 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247
2248 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2253 }
2254}
2255
2256sub update {
2257 my ($self) = @_;
2258
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2260 $self->set_value ($self->{range}[0]);
2261
1821 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
1822 2264
1823 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1824 2266
1825 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1826 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1827 2269
1828 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
1829 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
1830 $x = $lo if $x < $lo;
1831 $x = $hi - $page if $x > $hi - $page;
1832 $self->{range}[0] = $x;
1833 2272
1834 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
1835 $self->update; 2274 $self->{knob_w} = $knob_w;
1836 } 2275 });
1837}
1838 2276
1839# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
1840# so that the handle doesn't leave the texture. This calculation isn't 100%
1841# correct propably, but it does the job for now
1842sub _calc_inner_pad_px {
1843 my ($self, $w) = @_;
1844 ($w / 100) * $self->{inner_pad} # % to pixels
1845} 2278}
1846 2279
1847sub _draw { 2280sub _draw {
1848 my ($self) = @_; 2281 my ($self) = @_;
1849 2282
1850 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
1851 2284
1852 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
1853 2286
1854 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
1855 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
1856 2289
2290 glTranslate 1, 0, 0;
1857 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
1858 glTranslate 0, -$self->{w}, 0;
1859
1860 ($w, $h) = ($h, $w);
1861 } 2292 }
1862 2293
1863 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1864 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1865 2296
1866 my ($value, $lo, $hi, $page) = @{$self->{range}};
1867
1868 $hi = $value + 1 if $lo == $hi;
1869
1870 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1871 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1872
1873 $page = int $page * $inner_w / ($hi - $lo);
1874 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1875
1876 $w -= $page;
1877 $page &= ~1;
1878 glTranslate $page * 0.5, 0, 0;
1879 $page ||= 2;
1880
1881 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1882 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1883
1884 glEnable GL_BLEND;
1885 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1886 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 2299
1889 # draw background 2300 # draw background
1890 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1891 2302
1892 # draw handle 2303 # draw handle
1893 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2304 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1894 2305
1895 glDisable GL_BLEND;
1896 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
1897} 2307}
2308
2309#############################################################################
2310
2311package CFClient::UI::ValSlider;
2312
2313our @ISA = CFClient::UI::HBox::;
2314
2315sub new {
2316 my ($class, %arg) = @_;
2317
2318 my $range = delete $arg{range};
2319
2320 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift },
2324 from_value => sub { shift },
2325 %arg,
2326 );
2327
2328 $self->{slider}->connect (changed => sub {
2329 my ($self, $value) = @_;
2330 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2331 $self->{parent}->emit (changed => $value);
2332 });
2333
2334# $self->{entry}->connect (changed => sub {
2335# my ($self, $value) = @_;
2336# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2337# $self->{parent}->emit (changed => $value);
2338# });
2339
2340 $self->add ($self->{slider}, $self->{entry});
2341
2342 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2343
2344 $self
2345}
2346
2347sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) }
1898 2349
1899############################################################################# 2350#############################################################################
1900 2351
1901package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
1902 2353
… …
1906 2357
1907sub new { 2358sub new {
1908 my $class = shift; 2359 my $class = shift;
1909 2360
1910 my $self = $class->SUPER::new ( 2361 my $self = $class->SUPER::new (
1911 fontsize => 1, 2362 fontsize => 1,
2363 can_events => 0,
2364 #font => default_font
1912 @_, 2365 @_,
1913 2366
1914 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
1915 par => [], 2368 par => [],
1916 height => 0, 2369 height => 0,
1917 children => [ 2370 children => [
1918 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
1920 ], 2373 ],
1921 ); 2374 );
1922 2375
1923 $self->{children}[1]->connect (changed => sub { 2376 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2377
1927 $self 2378 $self
1928} 2379}
1929 2380
1930sub set_fontsize { 2381sub set_fontsize {
… …
1932 2383
1933 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
1934 $self->reflow; 2385 $self->reflow;
1935} 2386}
1936 2387
2388sub size_allocate {
2389 my ($self, $w, $h) = @_;
2390
2391 $self->SUPER::size_allocate ($w, $h);
2392
2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w});
2396
2397 $self->reflow;
2398}
2399
1937sub text_height { 2400sub text_size {
1938 my ($self, $text) = @_; 2401 my ($self, $text, $indent) = @_;
1939 2402
1940 my $layout = $self->{layout}; 2403 my $layout = $self->{layout};
1941 2404
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2406 $layout->set_width ($self->{children}[0]{w} - $indent);
1944 $layout->set_text ($text); 2407 $layout->set_markup ($text);
1945 2408
1946 ($layout->size)[1] 2409 $layout->size
1947} 2410}
1948 2411
1949sub reflow { 2412sub reflow {
1950 my ($self) = @_; 2413 my ($self) = @_;
1951 2414
1952 $self->{need_reflow}++; 2415 $self->{need_reflow}++;
1953 $self->update; 2416 $self->update;
1954} 2417}
1955 2418
1956sub size_allocate { 2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
1957 my ($self, $w, $h) = @_; 2427 my ($self) = @_;
1958 2428
1959 $self->SUPER::size_allocate ($w, $h); 2429 $self->{par} = [];
1960 2430 $self->{height} = 0;
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1962 $self->{layout}->set_width ($self->{children}[0]{w});
1963
1964 $self->reflow;
1965} 2432}
1966 2433
1967sub add_paragraph { 2434sub add_paragraph {
1968 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
1969 2436
1970 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
1971 2438 my ($w, $h) = $self->text_size ($line);
1972 my $height = $self->text_height ($text);
1973
1974 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
1975 2442
1976 push @{$self->{par}}, [$height, $color, $text];
1977
1978 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1979 $self->{children}[1]->update;
1980} 2444}
1981 2445
1982sub update { 2446sub update {
1983 my ($self) = @_; 2447 my ($self) = @_;
1984 2448
… …
1986 2450
1987 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
1988 2452
1989 delete $self->{texture}; 2453 delete $self->{texture};
1990 2454
1991 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
1992 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
1993 my $height = 0; 2459 my $height = 0;
1994 2460
1995 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
1996 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
1997 2476
1998 $self->{height} = $height; 2477 $self->{height} = $height;
1999 2478
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2001 2480
2002 delete $self->{texture}; 2481 delete $self->{texture};
2003 } 2482 }
2004 2483
2005 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2006 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2008 2487
2488 my $top = int $self->{children}[1]{range}[0];
2489
2490 my $y0 = $top;
2491 my $y1 = $top + $H;
2492
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2009 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013
2014 my $top = int $self->{children}[1]{range}[0];
2015
2016 my $y0 = $top;
2017 my $y1 = $top + $self->{h};
2018
2019 my $y = 0;
2020
2021 my $layout = $self->{layout};
2022 2502
2023 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2504 my $h = $par->[1];
2025 2505
2026 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2027 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2028 2510
2029 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2030 my ($W, $H) = $layout->size; 2512
2031 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2032 } 2515 }
2033 2516
2034 $y += $h; 2517 $y += $h;
2035 } 2518 }
2036 2519
2037 glDisable GL_TEXTURE_2D;
2038 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2039 }; 2521 };
2040 }); 2522 });
2041} 2523}
2042 2524
2043sub _draw { 2525sub _draw {
2044 my ($self) = @_; 2526 my ($self) = @_;
2045 2527
2046 if ($self->{texture}) {
2047 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2050 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2051 }
2052 2533
2053 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2054 2535
2055} 2536}
2056 2537
… …
2104 2585
2105sub new { 2586sub new {
2106 my $class = shift; 2587 my $class = shift;
2107 2588
2108 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2109 state => 0, 2590 state => 0,
2110 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2592 @_
2113 ); 2593 );
2114 2594
2115 if ($self->{state}) {
2116 $self->{state} = 0;
2117 $self->toggle_flopper;
2118 }
2119
2120 $self 2595 $self
2121} 2596}
2122 2597
2123sub toggle_flopper { 2598sub toggle_flopper {
2124 my ($self) = @_; 2599 my ($self) = @_;
2125 2600
2126 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2127 if ($self->{state} = !$self->{state}) {
2128 $CFClient::UI::ROOT->add ($self->{other});
2129 $self->{other}->move ($self->coord2global (0, $self->{h}));
2130 $self->emit ("open");
2131 } else {
2132 $CFClient::UI::ROOT->remove ($self->{other});
2133 $self->emit ("close");
2134 }
2135
2136 $self->emit (changed => $self->{state});
2137} 2602}
2138 2603
2139############################################################################# 2604#############################################################################
2140 2605
2141package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2151 @_, 2616 @_,
2152 can_events => 0, 2617 can_events => 0,
2153 ) 2618 )
2154} 2619}
2155 2620
2156sub set_text { 2621sub set_tooltip_from {
2157 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2158 2623
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 my $tooltip = $widget->{tooltip};
2160 $self->{label}->set_text ($text); 2625
2161 $self->add ($self->{label}); 2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2633 $self->add (new CFClient::UI::Label
2634 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8,
2637 fg => [0, 0, 0, 1],
2638 ellipsise => 0,
2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
2640 );
2162} 2641}
2163 2642
2164sub size_request { 2643sub size_request {
2165 my ($self) = @_; 2644 my ($self) = @_;
2166 2645
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2647
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2648 ($w + 4, $h + 4)
2173} 2649}
2174 2650
2651sub size_allocate {
2652 my ($self, $w, $h) = @_;
2653
2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2655}
2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2673}
2674
2175sub _draw { 2675sub _draw {
2176 my ($self) = @_; 2676 my ($self) = @_;
2177 2677
2178 glPushMatrix;
2179 glTranslate 0.375, 0.375; 2678 glTranslate 0.375, 0.375;
2180 2679
2181 my ($w, $h) = @$self{qw(w h)}; 2680 my ($w, $h) = @$self{qw(w h)};
2182 2681
2183 glColor 1, 0.8, 0.4; 2682 glColor 1, 0.8, 0.4;
… …
2194 glVertex 0 , $h; 2693 glVertex 0 , $h;
2195 glVertex $w, $h; 2694 glVertex $w, $h;
2196 glVertex $w, 0; 2695 glVertex $w, 0;
2197 glEnd; 2696 glEnd;
2198 2697
2199 glPopMatrix; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2200 2699
2201 glTranslate 2, 2;
2202 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2203} 2701}
2204 2702
2205############################################################################# 2703#############################################################################
2206 2704
2705package CFClient::UI::Face;
2706
2707our @ISA = CFClient::UI::Base::;
2708
2709use CFClient::OpenGL;
2710
2711sub new {
2712 my $class = shift;
2713
2714 my $self = $class->SUPER::new (
2715 aspect => 1,
2716 can_events => 0,
2717 @_,
2718 );
2719
2720 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self);
2722
2723 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1,
2726 interval => $self->{animspeed},
2727 cb => sub {
2728 ++$widget->{frame};
2729 $widget->update;
2730 },
2731 );
2732 }
2733
2734 $self
2735}
2736
2737sub size_request {
2738 (32, 8)
2739}
2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2749sub _draw {
2750 my ($self) = @_;
2751
2752 return unless $::CONN;
2753
2754 my $face;
2755
2756 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}];
2758
2759 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim;
2761 }
2762
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764
2765 if ($tex) {
2766 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D;
2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2781}
2782
2783#############################################################################
2784
2785package CFClient::UI::Inventory;
2786
2787our @ISA = CFClient::UI::ScrolledWindow::;
2788
2789sub new {
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824
2825#############################################################################
2826
2827package CFClient::UI::Menu;
2828
2829our @ISA = CFClient::UI::FancyFrame::;
2830
2831use CFClient::OpenGL;
2832
2833sub new {
2834 my $class = shift;
2835
2836 my $self = $class->SUPER::new (
2837 items => [],
2838 z => 100,
2839 @_,
2840 );
2841
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843
2844 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item;
2846
2847 # handle various types of items, only text for now
2848 if (!ref $widget) {
2849 $widget = new CFClient::UI::Label
2850 can_hover => 1,
2851 can_events => 1,
2852 text => $widget;
2853 }
2854
2855 $self->{item}{$widget} = $item;
2856
2857 $self->{vbox}->add ($widget);
2858 }
2859
2860 $self
2861}
2862
2863# popup given the event (must be a mouse button down event currently)
2864sub popup {
2865 my ($self, $ev) = @_;
2866
2867 $self->_emit ("popdown");
2868
2869 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self;
2871 $self->{button} = $ev->{button};
2872
2873 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875}
2876
2877sub mouse_motion {
2878 my ($self, $ev, $x, $y) = @_;
2879
2880 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER};
2883}
2884
2885sub button_up {
2886 my ($self, $ev, $x, $y) = @_;
2887
2888 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB;
2890 $self->hide;
2891
2892 $self->_emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover};
2894 }
2895}
2896
2897#############################################################################
2898
2899package CFClient::UI::Statusbox;
2900
2901our @ISA = CFClient::UI::VBox::;
2902
2903sub new {
2904 my $class = shift;
2905
2906 $class->SUPER::new (
2907 fontsize => 0.8,
2908 @_,
2909 )
2910}
2911
2912sub reorder {
2913 my ($self) = @_;
2914 my $NOW = time;
2915
2916 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 }
2919
2920 my @widgets;
2921
2922 my @items = sort {
2923 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} };
2926
2927 my $count = 10 + 1;
2928 for my $item (@items) {
2929 last unless --$count;
2930
2931 push @widgets, $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text};
2936
2937 for ($short) {
2938 s/^\s+//;
2939 s/\s+/ /g;
2940 }
2941
2942 new CFClient::UI::Label
2943 markup => $short,
2944 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg},
2950 can_events => 1,
2951 can_hover => 1
2952 };
2953 }
2954
2955 $self->clear;
2956 $self->SUPER::add (reverse @widgets);
2957}
2958
2959sub add {
2960 my ($self, $text, %arg) = @_;
2961
2962 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//;
2964
2965 return unless $text;
2966
2967 my $timeout = time + ((delete $arg{timeout}) || 60);
2968
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970
2971 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) {
2973 $item->{count}++;
2974 } else {
2975 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text;
2977 }
2978 $item->{id} = ++$self->{id};
2979 $item->{timeout} = $timeout;
2980 delete $item->{label};
2981 } else {
2982 $self->{item}{$group} = {
2983 id => ++$self->{id},
2984 text => $text,
2985 timeout => $timeout,
2986 tooltip => $text,
2987 fg => [0.8, 0.8, 0.8, 0.8],
2988 pri => 0,
2989 count => 1,
2990 %arg,
2991 };
2992 }
2993
2994 $self->reorder;
2995}
2996
2997sub reconfigure {
2998 my ($self) = @_;
2999
3000 delete $_->{label}
3001 for values %{ $self->{item} || {} };
3002
3003 $self->reorder;
3004 $self->SUPER::reconfigure;
3005}
3006
3007#############################################################################
3008
2207package CFClient::UI::Root; 3009package CFClient::UI::Root;
2208 3010
2209our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
2210 3012
2211use CFClient::OpenGL; 3013use CFClient::OpenGL;
2212 3014
2213sub check_size { 3015sub new {
2214 my ($self) = @_; 3016 my $class = shift;
2215 3017
2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3018 my $self = $class->SUPER::new (
3019 visible => 1,
3020 @_,
3021 );
3022
3023 Scalar::Util::weaken ($self->{root} = $self);
3024
3025 $self
2217} 3026}
2218 3027
2219sub size_request { 3028sub size_request {
2220 ($::WIDTH, $::HEIGHT) 3029 my ($self) = @_;
2221}
2222 3030
2223sub configure { 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
3046}
3047
3048sub size_allocate {
2224 my ($self, $x, $y, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2225 3050
2226 $self->SUPER::configure ($x, $y, $w, $h);
2227
2228 for my $child (@{$self->{children}}) { 3051 for my $child ($self->children) {
2229 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2230 3053
2231 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3054 $X = $child->{force_x} if exists $child->{force_x};
2232 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3055 $Y = $child->{force_y} if exists $child->{force_y};
3056
3057 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h};
3059
2233 $child->configure ($X, $Y, $W,$H); 3060 $child->configure ($X, $Y, $W, $H);
2234 } 3061 }
2235} 3062}
2236 3063
2237sub _topleft { 3064sub coord2local {
2238 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2239 3066
2240 ($x, $y) 3067 ($x, $y)
2241} 3068}
2242 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
2243sub update { 3076sub update {
2244 my ($self) = @_; 3077 my ($self) = @_;
2245 3078
2246 $self->check_size; 3079 $::WANT_REFRESH++;
2247 ::refresh ();
2248} 3080}
2249 3081
2250sub add { 3082sub add {
2251 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2252 3084
2253 # integerize window positions 3085 $_->{is_toplevel} = 1
2254 $child->{x} = int $child->{x}; 3086 for @children;
2255 $child->{y} = int $child->{y};
2256 3087
2257 $self->SUPER::add ($child); 3088 $self->SUPER::add (@children);
3089}
3090
3091sub remove {
3092 my ($self, @children) = @_;
3093
3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
2258} 3104}
2259 3105
2260sub on_refresh { 3106sub on_refresh {
2261 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2262 3108
2263 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2264} 3110}
2265 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2266sub draw { 3118sub draw {
2267 my ($self) = @_; 3119 my ($self) = @_;
2268 3120
2269 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2270 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
2271 } 3124 }
3125
3126 if ($self->{realloc}) {
3127 my @queue;
3128
3129 while () {
3130 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach
3132
3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3137 }
3138
3139 my $widget = pop @queue || last;
3140
3141 $widget->{visible} or last; # do not resize invisible widgets
3142
3143 my ($w, $h) = $widget->size_request;
3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3152 || delete $widget->{force_realloc}) {
3153 $widget->{req_w} = $w;
3154 $widget->{req_h} = $h;
3155
3156 $self->{size_alloc}{$widget+0} = $widget;
3157
3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3167 }
3168 }
3169
3170 while (my $size_alloc = delete $self->{size_alloc}) {
3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178
3179 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0;
3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h);
3190 }
3191 }
3192 }
3193
3194 while ($self->{post_alloc_hook}) {
3195 $_->()
3196 for values %{delete $self->{post_alloc_hook}};
3197 }
3198
2272 3199
2273 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2274 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2275 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2276 3203
2277 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2278 glLoadIdentity; 3205 glLoadIdentity;
2279 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2280 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2281 glLoadIdentity; 3208 glLoadIdentity;
2282 3209
2283 $self->_draw; 3210 $self->_draw;
2284} 3211}
2285 3212
2286############################################################################# 3213#############################################################################
2287 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315sub ask_for_bind {
3316 my ($self, $commit) = @_;
3317
3318 CFClient::Binder::open_binding_dialog (sub {
3319 my ($mod, $sym) = @_;
3320 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3321 $self->update_binding_widgets;
3322 $self->commit if $commit;
3323 });
3324}
3325
3326sub set_binding {
3327 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3328
3329 $self->clear_command_list;
3330 $self->{recording} = 0;
3331 $self->{rec_btn}->set_text ("start recording");
3332
3333 $self->{binding} = [$mod, $sym];
3334 $self->{commands} = $cmds;
3335
3336 $self->{binding_change} = $cb;
3337 $self->{binding_cancel} = $ccb;
3338
3339 $self->update_binding_widgets;
3340}
3341
3342sub update_binding_widgets {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3346 $self->set_command_list ($cmds);
3347}
3348
3349sub get_binding {
3350 my ($self) = @_;
3351 return (
3352 $self->{binding}->[0],
3353 $self->{binding}->[1],
3354 [ grep { defined $_ } @{$self->{commands}} ]
3355 );
3356}
3357
3358sub clear_command_list {
3359 my ($self) = @_;
3360 $self->{cmdbox}->clear ();
3361}
3362
3363sub set_command_list {
3364 my ($self, $cmds) = @_;
3365
3366 $self->{cmdbox}->clear ();
3367 $self->{commands} = $cmds;
3368
3369 my $idx = 0;
3370
3371 for (@$cmds) {
3372 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3373
3374 my $i = $idx;
3375 $hb->add (new CFClient::UI::Button
3376 text => "delete",
3377 tooltip => "Deletes the action from the record",
3378 on_activate => sub {
3379 $self->{cmdbox}->remove ($hb);
3380 $cmds->[$i] = undef;
3381 });
3382
3383 $hb->add (new CFClient::UI::Label text => $_);
3384
3385 $idx++
3386 }
3387}
3388
3389
3390#############################################################################
3391
2288package CFClient::UI; 3392package CFClient::UI;
2289 3393
2290$ROOT = new CFClient::UI::Root; 3394$ROOT = new CFClient::UI::Root;
2291$TOOLTIP = new CFClient::UI::Tooltip; 3395$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2292 3396
22931 33971
2294 3398

Diff Legend

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